Merge pull request #1033 from suga0828/develop

Deploy in a sub dir

Author: mlinksva

assets/js/locale.js

@@ -5,11 +5,11 @@ $(document).ready(function() {
 });
 
 function loadLanguage(lang) {
-  base_pathname = window.location.pathname.replace(/^\/[a-z]+([_-][a-z]+)?\//, "/")
+  base_pathname = window.location.pathname.replace(/\/[a-z]+([_-][a-z]+)?\//, "/")
   if (lang === "en") {
     url = base_pathname
   } else {
-    url = "/" + lang + base_pathname
+    url = base_pathname + lang
   }
   window.location.assign(url);
 }