Merge pull request #84 from chuckdumont/work2

Fix i18n loader bug causing failure to load module errors for excluded locales
OpenNTF · Nov 15, 2017 · b9e5060 · b9e5060
2 parents ebccf5d + db982b2
commit b9e5060
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/loaders/dojo/i18n/index.js b/loaders/dojo/i18n/index.js
@@ -38,7 +38,7 @@ module.exports = function(content) {
 		}
 		// Add locales with greater specificity
 		Object.keys(bundle).forEach(function(loc) {
-			if (loc.startsWith(requestedLocale + "-")) {
+			if (bundle[loc] && loc.startsWith(requestedLocale + "-")) {
 				result.push(loc);
 			}
 		});

diff --git a/test/TestCases/loaders/i18n/nls/strings1.js b/test/TestCases/loaders/i18n/nls/strings1.js
@@ -4,6 +4,7 @@ define({
   }),
 	"en-au":true,
 	"fr":true,
+	"fr-fr": false,
 	"es":true,
 	"de":false
 });