bug fixes

Author: clmath

i18n.js

@@ -120,7 +120,6 @@ define(["./i18n/common", "./i18n/build", "module"], function (common, build, mod
 			}
 		};
 
-	/* jshint -W074 */
 	return {
 		/* jshint -W074 */
 		load: function (name, req, onLoad, config) {
@@ -134,7 +133,7 @@ define(["./i18n/common", "./i18n/build", "module"], function (common, build, mod
 			mixin(moduleConfig, typeof module.config === "function" ? module.config() || {} : {});
 
 			if (config.isBuild) {
-				localesList = config.localesList;
+				localesList = moduleConfig.localesList;
 				onLoad();
 				return;
 			}
@@ -191,7 +190,7 @@ define(["./i18n/common", "./i18n/build", "module"], function (common, build, mod
 					bundle._pseudoRoot = {};
 					bundle._flattened = true;
 				}
-				write.asModule(moduleName, "define(" + JSON.stringify(bundle) + ")");
+				write.asModule(pluginName + "!" + moduleName, "define(" + JSON.stringify(bundle) + ")");
 			} else {
 				build.addBundleToNlsLayer(name);
 			}
@@ -210,8 +209,5 @@ define(["./i18n/common", "./i18n/build", "module"], function (common, build, mod
 			}
 			build.reset();
 		}
-
-
 	};
-	/* jshint +W074 */
 });

i18n/build.js

@@ -132,7 +132,7 @@ define(["./common", "require"], function (common, requirejs) {
 						var parts = path.split("/"),
 							tmp = [];
 
-						while (!fs.existsSync(parts.join("/"))) {
+						while (parts.length && !fs.existsSync(parts.join("/"))) {
 							tmp.push(parts.pop());
 						}
 						while (tmp.length) {

i18n/common.js

@@ -1,4 +1,4 @@
-define(["../maybe!./parentLocale"], function (parentLocale) {
+define(["./parentLocale"], function (parentLocale) {
 
 	// regexp for reconstructing the master bundle name from parts of the regexp match
 	// "foo/bar/baz/nls/en-ca/foo".match(nlsRegExp) gives:
@@ -8,7 +8,7 @@ define(["../maybe!./parentLocale"], function (parentLocale) {
 	// so, if match[3] is blank, it means this is the top bundle definition.
 	var nlsRegExp = /(^.*(?:^|\/)nls\/)([^\/]*)\/?([^\/]*)$/;
 
-	parentLocale = parentLocale || {};
+	parentLocale = parentLocale;
 
 	return {
 		eachProp: function (obj, func) {