merged PRs

i18next · May 18, 2015 · 929d01c · 929d01c
1 parent f2e4311
commit 929d01c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/releasenotes.md → CHANGELOG.md b/releasenotes.md → CHANGELOG.md
@@ -1,5 +1,7 @@
 ### v1.9.0
 - fixes issue with cache control header [issue 169](https://github.com/i18next/i18next-node/issues/169)
+- Ensure language support in addRoute made optional [PR 174](https://github.com/i18next/i18next-node/pull/174)
+- Removed pluralExtensions lookup from detectLanguageFromPath [PR 181](https://github.com/i18next/i18next-node/pull/181)
 
 ### v1.7.10
 - sync.load refactor to reload not yet loaded namespaces - not break on loaded language

diff --git a/lib/i18nextWrapper.js b/lib/i18nextWrapper.js
@@ -25,8 +25,9 @@
         var parts = req.originalUrl.split('/');
         if (parts.length > options.detectLngFromPath + 1) {
             var part = parts[options.detectLngFromPath + 1];
-            var lookUp = wrapper.pluralExtensions.rules[part.split('-')[0]];
-            if (lookUp) locale = part;
+            // var lookUp = wrapper.pluralExtensions.rules[part.split('-')[0]];
+            // if (lookUp) locale = part;
+            locale = part;
         }
         if (locale) locales.push({lng: cleanLngString(locale, options), q: 1});
         return locales;

diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "cookies": ">= 0.2.2",
-    "i18next-client": "^1.8.2",
+    "i18next-client": "^1.9.0",
     "json5": "^0.2.0"
   },
   "devDependencies": {