Add script translations to labels

data/update_locales.js

@@ -29,6 +29,8 @@ const sourceCommunity = YAML.load(fs.readFileSync('./node_modules/osm-community-
 
 const cldrMainDir = './node_modules/cldr-localenames-full/main/';
 
+var referencedScripts = [];
+
 const languageInfo = {
     dataLanguages: getLangNamesInNativeLang()
 };
@@ -50,7 +52,7 @@ asyncMap(resources, getResource, function(err, results) {
 
     // write files and fetch language info for each locale
     var dataLocales = {
-        en: { rtl: false, languageNames: foreignLanguageNamesInLanguageOf('en') }
+        en: { rtl: false, languageNames: languageNamesInLanguageOf('en'), scriptNames: scriptNamesInLanguageOf('en') }
     };
     asyncMap(Object.keys(allStrings),
         function(code, done) {
@@ -69,8 +71,11 @@ asyncMap(resources, getResource, function(err, results) {
                     } else if (code === 'ku') {
                         rtl = false;
                     }
-                    var langTranslations = foreignLanguageNamesInLanguageOf(code);
-                    dataLocales[code] = { rtl: rtl, languageNames: langTranslations || {} };
+                    dataLocales[code] = {
+                        rtl: rtl,
+                        languageNames: languageNamesInLanguageOf(code) || {},
+                        scriptNames: scriptNamesInLanguageOf(code) || {}
+                    };
                     done();
                 });
             }
@@ -230,6 +235,8 @@ function getLangNamesInNativeLang() {
 
         var script = identity.script;
         if (script) {
+            referencedScripts.push(script);
+
             info.base = identity.language;
             info.script = script;
         }
@@ -250,7 +257,7 @@ function getLangNamesInNativeLang() {
 
 var rematchCodes = { 'ar-AA': 'ar', 'zh-CN': 'zh', 'zh-HK': 'zh-Hant-HK', 'zh-TW': 'zh', 'pt-BR': 'pt', 'pt': 'pt-PT' };
 
-function foreignLanguageNamesInLanguageOf(code) {
+function languageNamesInLanguageOf(code) {
 
     if (rematchCodes[code]) code = rematchCodes[code];
 
@@ -284,3 +291,22 @@ function foreignLanguageNamesInLanguageOf(code) {
 
     return translatedLangsByCode;
 }
+
+function scriptNamesInLanguageOf(code) {
+    if (rematchCodes[code]) code = rematchCodes[code];
+
+    var languageFilePath = cldrMainDir + code + '/scripts.json';
+    if (!fs.existsSync(languageFilePath)) {
+        return null;
+    }
+    var allTranslatedScriptsByCode = JSON.parse(fs.readFileSync(languageFilePath, 'utf8')).main[code].localeDisplayNames.scripts;
+
+    var translatedScripts = {};
+    referencedScripts.forEach(function(script) {
+        if (!allTranslatedScriptsByCode[script] || script === allTranslatedScriptsByCode[script]) return;
+        
+        translatedScripts[script] = allTranslatedScriptsByCode[script];
+    });
+
+    return translatedScripts;
+}

modules/util/detect.js

@@ -1,4 +1,4 @@
-import { currentLocale, setTextDirection, setLanguageNames } from './locale';
+import { currentLocale, setTextDirection, setLanguageNames, setScriptNames } from './locale';
 import { dataLocales } from '../../data/index';
 import { utilStringQs } from './util';
 
@@ -105,6 +105,7 @@ export function utilDetect(force) {
     }
     setTextDirection(detected.textDirection);
     setLanguageNames((lang && lang.languageNames) || {});
+    setScriptNames((lang && lang.scriptNames) || {});
 
     // detect host
     var loc = window.top.location;

modules/util/locale.js

@@ -5,6 +5,7 @@ var translations = Object.create(null);
 export var currentLocale = 'en';
 export var textDirection = 'ltr';
 export var languageNames = {};
+export var scriptNames = {};
 
 export function setLocale(val) {
     if (translations[val] !== undefined) {
@@ -81,21 +82,41 @@ export function setLanguageNames(obj) {
     languageNames = obj;
 }
 
+export function setScriptNames(obj) {
+    scriptNames = obj;
+}
+
 export function languageName(code, options) {
     if (languageNames[code]) { // name in locale langauge
+
+        // e.g. German
         return languageNames[code];
     }
     // sometimes we only want the local name
     if (options && options.localOnly) return null;
 
-    if (dataLanguages[code]) { // language info
-        if (dataLanguages[code].nativeName) { // name in native language
-            return t('translate.language_and_code', { language: dataLanguages[code].nativeName, code: code });
-        } else if (dataLanguages[code].base && dataLanguages[code].script) {
-            var base = dataLanguages[code].base;
-            if (languageNames[base]) { // base name in locale langauge
-                return t('translate.language_and_code', { language: languageNames[base], code: code });
-            } else if (dataLanguages[code] && dataLanguages[code].nativeName) {
+    var langInfo = dataLanguages[code];
+
+    if (langInfo) {
+        if (langInfo.nativeName) { // name in native language
+
+            // e.g. Deutsch (de)
+            return t('translate.language_and_code', { language: langInfo.nativeName, code: code });
+
+        } else if (langInfo.base && langInfo.script) {
+
+            var base = langInfo.base; // the code of the langauge this is based on
+
+            if (languageNames[base]) { // base language name in locale langauge
+                var scriptCode = langInfo.script;
+                var script = scriptNames[scriptCode] || scriptCode;
+
+                // e.g. Serbian (Cyrillic)
+                return t('translate.language_and_code', { language: languageNames[base], code: script });
+
+            } else if (dataLanguages[base] && dataLanguages[base].nativeName) {
+
+                // e.g. српски (sr-Cyrl)
                 return t('translate.language_and_code', { language: dataLanguages[base].nativeName, code: code });
             }
         }