Merge pull request #84 from chuckdumont/work2

Chuck Dumont · web-flow · commit b9e50604e8c3 · 2017-11-15T13:17:54.000-05:00
Fix i18n loader bug causing failure to load module errors for excluded locales
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
 });

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ module.exports = function(content) {`
`38`	`38`	`}`
`39`	`39`	`// Add locales with greater specificity`
`40`	`40`	`Object.keys(bundle).forEach(function(loc) {`
`41`		`- if (loc.startsWith(requestedLocale + "-")) {`
	`41`	`+ if (bundle[loc] && loc.startsWith(requestedLocale + "-")) {`
`42`	`42`	`result.push(loc);`
`43`	`43`	`}`
`44`	`44`	`});`