retain locale in URL when logging in and signing up, and ajax actions in general.

1 files changed, 12 insertions, 2 deletions

diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js
index 5217942..70d78fd 100644
--- a/app/assets/javascripts/users.js
+++ b/app/assets/javascripts/users.js
@@ -122,11 +122,21 @@
   };
 
   srp.loggedIn = function() {
-    return window.location = '/';
+    return srp.localeRedirect('/');
   };
 
   srp.updated = function() {
-    return window.location = '/users/' + srp.session.id();
+    return srp.localeRedirect('/users/' + srp.session.id());
+  };
+
+  // redirect, while preserving locale if set by url path.
+  srp.localeRedirect = function(path) {
+    var localeMatch = window.location.pathname.match(/^(\/[a-z]{2})\//)
+    if (localeMatch) {
+      return window.location = localeMatch[1] + path;
+    } else {
+      return window.location = path;
+    }
   };
 
   //