Simplified properties in language objects

Author: 1ec5

index.js

@@ -251,9 +251,9 @@ module.exports = function(version, _options) {
             if (languages.instructions[language]) return language;
 
             var codes = languages.parseLanguageIntoCodes(language);
-            var languageCode = codes.languageCode;
-            var scriptCode = codes.scriptCode;
-            var countryCode = codes.countryCode;
+            var languageCode = codes.language;
+            var scriptCode = codes.script;
+            var regionCode = codes.region;
 
             var supportedLanguageCodes = languages.supportedCodes.map(function(language) {
                 return language.toLowerCase().split('-')[0];
@@ -264,9 +264,9 @@ module.exports = function(version, _options) {
                 return languageCode + '-' + scriptCode;
             }
 
-            // Same language code and country code (lng-CC)
-            if (languages.instructions[languageCode + '-' + countryCode]) {
-                return languageCode + '-' + countryCode;
+            // Same language code and region code (lng-CC)
+            if (languages.instructions[languageCode + '-' + regionCode]) {
+                return languageCode + '-' + regionCode;
             }
 
             // Same language code (lng)
@@ -276,24 +276,24 @@ module.exports = function(version, _options) {
 
             // Same language code and any script code (lng-Scpx) and the found language contains a script
             var anyScript = languages.parsedSupportedCodes.find(function (language) {
-                return language.languageCode === languageCode && language.scriptCode;
+                return language.language === languageCode && language.script;
             });
             if (anyScript) {
                 return anyScript.locale;
             }
 
-            // Same language code and any country code (lng-CX)
+            // Same language code and any region code (lng-CX)
             var anyCountry = languages.parsedSupportedCodes.find(function (language) {
-                return language.languageCode === languageCode && language.scriptCode;
+                return language.language === languageCode && language.script;
             });
             if (anyCountry) {
                 return anyCountry.locale;
             }
 
             // Only language code provided, but we on support this language code
-            // with either script/country code.
+            // with either script/region code.
             var sameLanguage = languages.parsedSupportedCodes.find(function (language) {
-                return language.languageCode === languageCode;
+                return language.language === languageCode;
             });
             if (sameLanguage) {
                 return sameLanguage.locale;

languages.js

@@ -67,9 +67,9 @@ function parseLanguageIntoCodes (language) {
 
     return {
         locale: locale.join('-'),
-        languageCode: match[1],
-        scriptCode: match[2],
-        countryCode: match[3]
+        language: match[1],
+        script: match[2],
+        region: match[3]
     };
 }
 

test/index_test.js

@@ -287,16 +287,16 @@ tape.test('v5 compile', function(t) {
 
     /* eslint-disable */
     t.test('parseLanguageIntoCodes', function(t) {
-        t.deepEqual(languages.parseLanguageIntoCodes('foo'), { countryCode: undefined, languageCode: 'fo', locale: 'fo', scriptCode: undefined });
-        t.deepEqual(languages.parseLanguageIntoCodes('en-US'), { countryCode: 'US', languageCode: 'en', locale: 'en-US', scriptCode: undefined });
-        t.deepEqual(languages.parseLanguageIntoCodes('zh-CN'), { countryCode: 'CN', languageCode: 'zh', locale: 'zh-CN', scriptCode: undefined });
-        t.deepEqual(languages.parseLanguageIntoCodes('zh-Hant'),  { countryCode: undefined, languageCode: 'zh', locale: 'zh-Hant', scriptCode: 'Hant' });
-        t.deepEqual(languages.parseLanguageIntoCodes('zh-Hant-TW'),  { countryCode: 'TW', languageCode: 'zh', locale: 'zh-Hant-TW', scriptCode: 'Hant' });
-        t.deepEqual(languages.parseLanguageIntoCodes('zh'), { countryCode: undefined, languageCode: 'zh', locale: 'zh', scriptCode: undefined });
-        t.deepEqual(languages.parseLanguageIntoCodes('es-MX'), { countryCode: 'MX', languageCode: 'es', locale: 'es-MX', scriptCode: undefined });
-        t.deepEqual(languages.parseLanguageIntoCodes('es-ES'), { countryCode: 'ES', languageCode: 'es', locale: 'es-ES', scriptCode: undefined });
-        t.deepEqual(languages.parseLanguageIntoCodes('pt-PT'),  { countryCode: 'PT', languageCode: 'pt', locale: 'pt-PT', scriptCode: undefined });
-        t.deepEqual(languages.parseLanguageIntoCodes('pt'), { countryCode: undefined, languageCode: 'pt', locale: 'pt', scriptCode: undefined });
+        t.deepEqual(languages.parseLanguageIntoCodes('foo'), { region: undefined, language: 'fo', locale: 'fo', script: undefined });
+        t.deepEqual(languages.parseLanguageIntoCodes('en-US'), { region: 'US', language: 'en', locale: 'en-US', script: undefined });
+        t.deepEqual(languages.parseLanguageIntoCodes('zh-CN'), { region: 'CN', language: 'zh', locale: 'zh-CN', script: undefined });
+        t.deepEqual(languages.parseLanguageIntoCodes('zh-Hant'),  { region: undefined, language: 'zh', locale: 'zh-Hant', script: 'Hant' });
+        t.deepEqual(languages.parseLanguageIntoCodes('zh-Hant-TW'),  { region: 'TW', language: 'zh', locale: 'zh-Hant-TW', script: 'Hant' });
+        t.deepEqual(languages.parseLanguageIntoCodes('zh'), { region: undefined, language: 'zh', locale: 'zh', script: undefined });
+        t.deepEqual(languages.parseLanguageIntoCodes('es-MX'), { region: 'MX', language: 'es', locale: 'es-MX', script: undefined });
+        t.deepEqual(languages.parseLanguageIntoCodes('es-ES'), { region: 'ES', language: 'es', locale: 'es-ES', script: undefined });
+        t.deepEqual(languages.parseLanguageIntoCodes('pt-PT'),  { region: 'PT', language: 'pt', locale: 'pt-PT', script: undefined });
+        t.deepEqual(languages.parseLanguageIntoCodes('pt'), { region: undefined, language: 'pt', locale: 'pt', script: undefined });
         t.end();
     });
     /* eslint-enable */