bug951401 - middleware setup should throw an error when unknown langu…

…age was set

i18n.js

@@ -260,11 +260,6 @@ exports.middleware = function(options) {
   }
   options.mappings = options.mappings || {};
 
-  default_lang = options.default_lang || 'en-US';
-  default_locale = localeFrom(default_lang);
-
-
-
   // Use the lang-Countries found in your locale dir without explicitly specifying them.
   if( listSupportedLang.length === 1 && listSupportedLang[0] === '*') {
 
@@ -283,6 +278,14 @@ exports.middleware = function(options) {
     throw new Error("Bad Config - Check your supported_languages field. Please see the README for more details.");
   }
 
+  if (options.default_lang && listSupportedLang.indexOf(options.default_lang) === -1) {
+    throw new Error("An unknown default_lang was passed. Please check your config or see the README for more details.")
+  }
+  default_lang = options.default_lang || "en-US";
+  default_locale = localeFrom(default_lang);
+
+
+
   function messages_file_path(locale) {
     return path.resolve(path.join(__dirname, '..', '..', '..'),
                         options.translation_directory,

test/test.js

@@ -95,7 +95,7 @@ describe("Middleware setup", function (){
 			}).throw();
 		});
 
-		it.skip("should throw an error when unknown default_lang passed", function(){
+		it("should throw an error when unknown default_lang passed", function(){
 			should(function (){
 				_.merge(localOptions, middlewareOptions);
 				localOptions.default_lang = 'unknown';