various bug fixes

Author: clmath

Gruntfile.js

@@ -41,6 +41,13 @@ module.exports = function (grunt) {
 		},
 
 		intern: {
+			remote: {
+				options: {
+					runType: "runner",
+					config: "tests/intern",
+					reporters: ["console"]
+				}
+			},
 			sauce: {
 				options: {
 					runType: 'runner', // defaults to 'client'

i18n.js

@@ -125,6 +125,11 @@ define(["./i18n/common", "./i18n/build", "module"], function (common, build, mod
 	return {
 		/* jshint maxcomplexity:15 */
 		load: function (name, req, onLoad, config) {
+			if (!name) {
+				onLoad();
+				return;
+			}
+			
 			config = config || {};
 
 			var moduleConfig = {},

i18n/build.js

@@ -16,6 +16,11 @@ define(["./common", "require"], function (common, requirejs) {
 			return layerMid;
 		},
 
+		getLayerPath = function (data, loc) {
+			var match = data.path.match(/^(.*\/)?(.*)\.js$/);
+			return (match[1] || "") + "nls/" + match[2] + "_" + loc + ".js";
+		},
+
 		getAllAvailableLocales = function () {
 			localesList = [];
 			bundlesList.forEach(function (name) {
@@ -124,7 +129,7 @@ define(["./common", "require"], function (common, requirejs) {
 		writeLayers: function (layersContent, data, writePluginFile) {
 			eachProp(layersContent, function (loc, content) {
 				content += "define('" + getLayerMid(data) + "_" + loc + "', true);";
-				writePluginFile(getLayerMid(data) + "_" + loc + ".js", content);
+				writePluginFile(getLayerPath(data, loc), content);
 			});
 		},
 

i18n/common.js

@@ -8,8 +8,6 @@ define(["./parentLocale"], function (parentLocale) {
 	// so, if match[3] is blank, it means this is the top bundle definition.
 	var nlsRegExp = /(^.*(?:^|\/)nls\/)([^\/]*)\/?([^\/]*)$/;
 
-	parentLocale = parentLocale;
-
 	return {
 		eachProp: function (obj, func) {
 			var prop;
@@ -24,7 +22,9 @@ define(["./parentLocale"], function (parentLocale) {
 			if (!locale) {
 				locale = typeof navigator === "undefined" ? "root" :
 					(navigator.language ||
-					navigator.userLanguage || "root");
+					// IE <= 10
+					navigator.userLanguage || 
+					"root");
 			}
 			// just to be extra-sure
 			return locale.toLowerCase();

package.json

@@ -7,7 +7,7 @@
 		"grunt-contrib-jshint": "~0.6.0",
 		"grunt-jsbeautifier": "~0.2.2",
 		"requirejs": "~2.1.10",
-		"intern": "~1.3.2",
+		"intern": "~1.6.2",
 		"grunt-lineending": "^0.2.2"
 	},
 	"licenses": [{