Merge pull request #10 from AnderRV/fix/unprefixed-strategy-locale

Fix unprefixed strategy when URL starts with another locale

Author: benatespina

package.json

@@ -52,7 +52,8 @@
     "README.md"
   ],
   "jest": {
-    "testRegex": "(/tests/.*|(\\.|/)(test|spec))\\.jsx?$"
+    "testRegex": "(/tests/.*|(\\.|/)(test|spec))\\.jsx?$",
+    "testURL": "http://localhost"
   },
   "babel": {
     "presets": [

src/languageStrategy/defaultUnprefixed.js

@@ -14,7 +14,7 @@ import renderTranslatedRoutes from './../renderTranslatedRoutes.js';
 import pathFromRouteForPathsAndLocale from './pathFromRouteForPathsAndLocale.js';
 
 const localeFromLocation = (locales, defaultLocale) => location => {
-  const match = /^\/([a-z]{2}).*/g.exec(location.pathname);
+  const match = /^\/([a-z]{2})(\/|$).*/g.exec(location.pathname);
   if (match && locales.indexOf(match[1]) > -1) {
     return match[1];
   }

tests/languageStrategy/defaultUnprefixed.js

@@ -28,6 +28,9 @@ test('It detects locale based in location', () => {
   expect(
     languageStrategy.localeFromLocation({pathname: '/eu/some-route'}),
   ).toBe('eu');
+  expect(
+    languageStrategy.localeFromLocation({pathname: '/estrategy-url'}),
+  ).toBe('en');
 });
 
 test('Generates valid react-router-config tree', () => {