Merge branch 'redmine-issues/15312' into 'develop'

REDMINE_ISSUE-15312

See merge request onegeo-suite/sites/onegeo-suite-site-login-vuejs!29

src/components/LocaleChanger.vue

@@ -27,7 +27,10 @@ export default {
   watch: {
     '$i18n.locale': function(newValue, oldValue) {
       if (newValue !== oldValue) {
-        const to = this.$router.resolve({ params: { locale: newValue } })
+        const to = this.$router.resolve({
+          params: { locale: newValue },
+          query: this.$route.query
+        });
         this.$router.push(to.location);
       }
     }

src/router/index.js

@@ -4,6 +4,16 @@ import i18n from '@/i18n';
 
 Vue.use(VueRouter);
 
+function normalizePathname(pathname) {
+    const normalizedPath = decodeURI(pathname)
+      // Replaces repeated slashes in the URL.
+      .replace(/\/+/g, "/")
+      // Reference: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/normalize
+      // Note: Missing native IE support, may want to skip this step.
+      .normalize()
+  return `${normalizedPath}/`;
+};
+
 const routes = [
   {
     path: '/:locale',
@@ -11,21 +21,33 @@ const routes = [
     beforeEnter: (to, from, next) => {
       const locale = to.params.locale;
       const supported_locales = process.env.VUE_APP_I18N_SUPPORTED_LOCALE.split(',');
-      if (locale && !supported_locales.includes(locale) && locale.length !== 2) {
-        return next(`fr/${locale}`);
-      }
-      if (!supported_locales.includes(locale)) {
-        return next('fr');
+            
+      if (!locale || (locale && !supported_locales.includes(locale) && locale.length !== 2)) {
+        return next({
+          path: `${process.env.VUE_APP_I18N_DEFAULT_LOCALE}${to.path.endsWith('/') ? to.path : normalizePathname(to.path)}`,
+          query: to.query
+        });
       }
-      if (i18n.locale !== locale) {
-        i18n.locale = locale;
+
+      if (!to.path.endsWith('/')) {
+        return next({
+          path: normalizePathname(to.path),
+          query: to.query
+        });
       }
+
+      i18n.locale = locale;
+
       return next();
+
     },
     children: [
       {
         path: '',
-        redirect: { name: 'SignIn' },
+        // redirect: { name: 'SignIn' },  ==> IT DOES NOT WORK!
+        beforeEnter: (to, from, next) => {
+          return next(`${to.path}signin/`);
+        }
       },
       {
         path: 'signin',
@@ -91,9 +113,7 @@ const routes = [
   },
   {
     path: '*',
-    redirect() {
-      return process.env.VUE_APP_I18N_DEFAULT_LOCALE;
-    }
+    redirect: `${process.env.VUE_APP_I18N_DEFAULT_LOCALE}`,
   }
 ];