Rename isoCode to tag (cause they are IETF tags actually)

client/components/main/layouts.js

@@ -116,7 +116,7 @@ Template.userFormsLayout.helpers({
 
   languages() {
     return TAPi18n.getSupportedLanguages()
-      .map(({ isoCode, name }) => ({ tag: isoCode, name }))
+      .map(({ tag, name }) => ({ tag: tag, name }))
       .sort((a, b) => {
         if (a.name === b.name) {
           return 0;

client/components/users/userHeader.js

@@ -259,7 +259,7 @@ Template.changePasswordPopup.onRendered(function() {
 Template.changeLanguagePopup.helpers({
   languages() {
     return TAPi18n.getSupportedLanguages()
-      .map(({ isoCode, name }) => ({ tag: isoCode, name }))
+      .map(({ tag, name }) => ({ tag: tag, name }))
       .sort((a, b) => {
         if (a.name === b.name) {
           return 0;

imports/i18n/i18n.test.js

@@ -45,7 +45,7 @@ describe('TAPi18n', () => {
       const languages = TAPi18n.getSupportedLanguages();
       expect(languages).to.be.an('array');
       for (const language of languages) {
-        expect(language).to.have.keys('name', 'code', 'isoCode');
+        expect(language).to.have.keys('name', 'code', 'tag');
       }
     });
 

imports/i18n/languages.js

@@ -1,469 +1,469 @@
 export default {
   "ar-EG": {
     code: "ar",
-    isoCode: "ar-EG",
+    tag: "ar-EG",
     name: "مَصرى",
     load: () => import('./data/ar-EG.i18n.json'),
   },
   "ar": {
     code: "ar",
-    isoCode: "ar",
+    tag: "ar",
     name: "العربية",
     load: () => import('./data/ar.i18n.json'),
   },
   "bg": {
     code: "bg",
-    isoCode: "bg",
+    tag: "bg",
     name: "Български",
     load: () => import('./data/bg.i18n.json'),
   },
   "br": {
     code: "br",
-    isoCode: "br",
+    tag: "br",
     name: "Brezhoneg",
     load: () => import('./data/xxx.i18n.json'),
   },
   "ca": {
     code: "ca",
-    isoCode: "ca",
+    tag: "ca",
     name: "Català",
     load: () => import('./data/ca.i18n.json'),
   },
   "cs": {
     code: "cs",
-    isoCode: "cs",
+    tag: "cs",
     name: "čeština",
     load: () => import('./data/cs.i18n.json'),
   },
   "da": {
     code: "da",
-    isoCode: "da",
+    tag: "da",
     name: "Dansk",
     load: () => import('./data/da.i18n.json'),
   },
   "de-AT": {
     code: "de",
-    isoCode: "de-AT",
+    tag: "de-AT",
     name: "Deutsch (Österreich)",
     load: () => import('./data/de-AT.i18n.json'),
   },
   "de-CH": {
     code: "de",
-    isoCode: "de-CH",
+    tag: "de-CH",
     name: "Deutsch (Schweiz)",
     load: () => import('./data/de-CH.i18n.json'),
   },
   "de": {
     code: "de",
-    isoCode: "de",
+    tag: "de",
     name: "Deutsch",
     load: () => import('./data/de.i18n.json'),
   },
   "el-GR": {
     code: "el",
-    isoCode: "el-GR",
+    tag: "el-GR",
     name: "Ελληνικά (Ελλάδα)",
     load: () => import('./data/el-GR.i18n.json'),
   },
   "el": {
     code: "el",
-    isoCode: "el",
+    tag: "el",
     name: "el",
     load: () => import('./data/el.i18n.json'),
   },
   "en-DE": {
     code: "en",
-    isoCode: "en-DE",
+    tag: "en-DE",
     name: "English (Germany)",
     load: () => import('./data/en-DE.i18n.json'),
   },
   "en-GB": {
     code: "en",
-    isoCode: "en-GB",
+    tag: "en-GB",
     name: "English (UK)",
     load: () => import('./data/en-GB.i18n.json'),
   },
   "en-IT": {
     code: "en",
-    isoCode: "en-IT",
+    tag: "en-IT",
     name: "English (Italy)",
     load: () => import('./data/en-IT.i18n.json'),
   },
   "en": {
     code: "en",
-    isoCode: "en",
+    tag: "en",
     name: "English",
     load: () => import('./data/en.i18n.json'),
   },
   "eo": {
     code: "eo",
-    isoCode: "eo",
+    tag: "eo",
     name: "Esperanto",
     load: () => import('./data/eo.i18n.json'),
   },
   "es-AR": {
     code: "es",
-    isoCode: "es-AR",
+    tag: "es-AR",
     name: "español de Argentina",
     load: () => import('./data/es-AR.i18n.json'),
   },
   "es-CL": {
     code: "es",
-    isoCode: "es-CL",
+    tag: "es-CL",
     name: "español de Chile",
     load: () => import('./data/es-CL.i18n.json'),
   },
   "es-LA": {
     code: "es",
-    isoCode: "es-LA",
+    tag: "es-LA",
     name: "español de América Latina",
     load: () => import('./data/es-LA.i18n.json'),
   },
   "es-MX": {
     code: "es",
-    isoCode: "es-MX",
+    tag: "es-MX",
     name: "español de México",
     load: () => import('./data/es-MX.i18n.json'),
   },
   "es-PE": {
     code: "es",
-    isoCode: "es-PE",
+    tag: "es-PE",
     name: "español de Perú",
     load: () => import('./data/es-PE.i18n.json'),
   },
   "es-PY": {
     code: "es",
-    isoCode: "es-PY",
+    tag: "es-PY",
     name: "español de Paraguayo",
     load: () => import('./data/es-PY.i18n.json'),
   },
   "es": {
     code: "es",
-    isoCode: "es",
+    tag: "es",
     name: "español",
     load: () => import('./data/es.i18n.json'),
   },
   "et-EE": {
     code: "et",
-    isoCode: "et-EE",
+    tag: "et-EE",
     name: "eesti keel (Eesti)",
     load: () => import('./data/et-EE.i18n.json'),
   },
   "eu": {
     code: "eu",
-    isoCode: "eu",
+    tag: "eu",
     name: "Euskara",
     load: () => import('./data/eu.i18n.json'),
   },
   "fa-IR": {
     code: "fa",
-    isoCode: "fa-IR",
+    tag: "fa-IR",
     name: "فارسی/پارسی (ایران\u200e)",
     load: () => import('./data/fa-IR.i18n.json'),
   },
   "fa": {
     code: "fa",
-    isoCode: "fa",
+    tag: "fa",
     name: "فارسی",
     load: () => import('./data/fa.i18n.json'),
   },
   "fi": {
     code: "fi",
-    isoCode: "fi",
+    tag: "fi",
     name: "Suomi",
     load: () => import('./data/fi-FI.i18n.json'),
   },
   "fr-BE": {
     code: "fr",
-    isoCode: "fr-BE",
+    tag: "fr-BE",
     name: "Français (Belgique)",
     load: () => import('./data/fr-BE.i18n.json'),
   },
   "fr-CA": {
     code: "fr",
-    isoCode: "fr-CA",
+    tag: "fr-CA",
     name: "Français (Canada)",
     load: () => import('./data/fr-CA.i18n.json'),
   },
   "fr-CH": {
     code: "fr",
-    isoCode: "fr-CH",
+    tag: "fr-CH",
     name: "Français (Schweiz)",
     load: () => import('./data/fr-CH.i18n.json'),
   },
   "fr": {
     code: "fr",
-    isoCode: "fr",
+    tag: "fr",
     name: "Français",
     load: () => import('./data/fr.i18n.json'),
   },
   "gl-ES": {
     code: "gl",
-    isoCode: "gl-ES",
+    tag: "gl-ES",
     name: "Galego (España)",
     load: () => import('./data/gl-ES.i18n.json'),
   },
   "gl": {
     code: "gl",
-    isoCode: "gl",
+    tag: "gl",
     name: "Galego",
     load: () => import('./data/gl.i18n.json'),
   },
   "gu-IN": {
     code: "gu",
-    isoCode: "gu-IN",
+    tag: "gu-IN",
     name: "ગુજરાતી",
     load: () => import('./data/gu-IN.i18n.json'),
   },
   "he": {
     code: "he",
-    isoCode: "he",
+    tag: "he",
     name: "עברית",
     load: () => import('./data/he.i18n.json'),
   },
   "hi-IN": {
     code: "hi",
-    isoCode: "hi-IN",
+    tag: "hi-IN",
     name: "हिंदी (भारत)",
     load: () => import('./data/hi-IN.i18n.json'),
   },
   "hi": {
     code: "hi",
-    isoCode: "hi",
+    tag: "hi",
     name: "हिन्दी",
     load: () => import('./data/hi.i18n.json'),
   },
   "hr": {
     code: "hr",
-    isoCode: "hr",
+    tag: "hr",
     name: "Hrvatski",
     load: () => import('./data/hr.i18n.json'),
   },
   "hu": {
     code: "hu",
-    isoCode: "hu",
+    tag: "hu",
     name: "Magyar",
     load: () => import('./data/hu.i18n.json'),
   },
   "hy": {
     code: "hy",
-    isoCode: "hy",
+    tag: "hy",
     name: "Հայերեն",
     load: () => import('./data/hy.i18n.json'),
   },
   "id": {
     code: "id",
-    isoCode: "id",
+    tag: "id",
     name: "Bahasa Indonesia",
     load: () => import('./data/id.i18n.json'),
   },
   "ig": {
     code: "ig",
-    isoCode: "ig",
+    tag: "ig",
     name: "Igbo",
     load: () => import('./data/ig.i18n.json'),
   },
   "it": {
     code: "it",
-    isoCode: "it",
+    tag: "it",
     name: "Italiano",
     load: () => import('./data/it.i18n.json'),
   },
   "ja": {
     code: "ja",
-    isoCode: "ja",
+    tag: "ja",
     name: "日本語",
     load: () => import('./data/ja.i18n.json'),
   },
   "ka": {
     code: "ka",
-    isoCode: "ka",
+    tag: "ka",
     name: "ქართული",
     load: () => import('./data/ka.i18n.json'),
   },
   "km": {
     code: "km",
-    isoCode: "km",
+    tag: "km",
     name: "ភាសាខ្មែរ",
     load: () => import('./data/km.i18n.json'),
   },
   "ko": {
     code: "ko",
-    isoCode: "ko",
+    tag: "ko",
     name: "한국어",
     load: () => import('./data/ko.i18n.json'),
   },
   "lt": {
     code: "lt",
-    isoCode: "lt",
+    tag: "lt",
     name: "Lietuvių kalba",
     load: () => import('./data/lt.i18n.json'),
   },
   "lv": {
     code: "lv",
-    isoCode: "lv",
+    tag: "lv",
     name: "latviešu valoda",
     load: () => import('./data/lv.i18n.json'),
   },
   "mk": {
     code: "mk",
-    isoCode: "mk",
+    tag: "mk",
     name: "македонски јазик",
     load: () => import('./data/mk.i18n.json'),
   },
   "mn": {
     code: "mn",
-    isoCode: "mn",
+    tag: "mn",
     name: "Монгол",
     load: () => import('./data/mn.i18n.json'),
   },
   "ms-MY": {
     code: "ms",
-    isoCode: "ms-MY",
+    tag: "ms-MY",
     name: "بهاس ملايو",
     load: () => import('./data/ms-MY.i18n.json'),
   },
   "nb": {
     code: "nb",
-    isoCode: "nb",
+    tag: "nb",
     name: "Norsk bokmål",
     load: () => import('./data/nb.i18n.json'),
   },
   "nl": {
     code: "nl",
-    isoCode: "nl",
+    tag: "nl",
     name: "Nederlands",
     load: () => import('./data/nl.i18n.json'),
   },
   "oc": {
     code: "oc",
-    isoCode: "oc",
+    tag: "oc",
     name: "Occitan",
     load: () => import('./data/oc.i18n.json'),
   },
   "pa": {
     code: "pa",
-    isoCode: "pa",
+    tag: "pa",
     name: "ਪੰਜਾਬੀ",
     load: () => import('./data/pa.i18n.json'),
   },
   "pl": {
     code: "pl",
-    isoCode: "pl",
+    tag: "pl",
     name: "Polski",
     load: () => import('./data/pl.i18n.json'),
   },
   "pt-BR": {
     code: "pt",
-    isoCode: "pt-BR",
+    tag: "pt-BR",
     name: "Português do Brasil",
     load: () => import('./data/pt-BR.i18n.json'),
   },
   "pt": {
     code: "pt",
-    isoCode: "pt",
+    tag: "pt",
     name: "Português",
     load: () => import('./data/pt.i18n.json'),
   },
   "ro": {
     code: "ro",
-    isoCode: "ro",
+    tag: "ro",
     name: "Română",
     load: () => import('./data/ro.i18n.json'),
   },
   "ru-UA": {
     code: "ru",
-    isoCode: "ru-UA",
+    tag: "ru-UA",
     name: "Русский (Украина)",
     load: () => import('./data/ru-UA.i18n.json'),
   },
   "ru": {
     code: "ru",
-    isoCode: "ru",
+    tag: "ru",
     name: "Русский",
     load: () => import('./data/ru.i18n.json'),
   },
   "sk": {
     code: "sk",
-    isoCode: "sk",
+    tag: "sk",
     name: "Slovenčina",
     load: () => import('./data/sk.i18n.json'),
   },
   "sl": {
     code: "sl",
-    isoCode: "sl",
+    tag: "sl",
     name: "slovenščina",
     load: () => import('./data/sl.i18n.json'),
   },
   "sr": {
     code: "sr",
-    isoCode: "sr",
+    tag: "sr",
     name: "Српски језик",
     load: () => import('./data/sr.i18n.json'),
   },
   "sv": {
     code: "sv",
-    isoCode: "sv",
+    tag: "sv",
     name: "Svenska",
     load: () => import('./data/sv.i18n.json'),
   },
   "sw": {
     code: "sw",
-    isoCode: "sw",
+    tag: "sw",
     name: "Kiswahili",
     load: () => import('./data/sw.i18n.json'),
   },
   "ta": {
     code: "ta",
-    isoCode: "ta",
+    tag: "ta",
     name: "தமிழ்",
     load: () => import('./data/ta.i18n.json'),
   },
   "th": {
     code: "th",
-    isoCode: "th",
+    tag: "th",
     name: "ไทย",
     load: () => import('./data/th.i18n.json'),
   },
   "tr": {
     code: "tr",
-    isoCode: "tr",
+    tag: "tr",
     name: "Türkçe",
     load: () => import('./data/tr.i18n.json'),
   },
   "ua-UA": {
     code: "ua",
-    isoCode: "ua-UA",
+    tag: "ua-UA",
     name: "українська (Україна)",
     load: () => import('./data/ua-UA.i18n.json'),
   },
   "ua": {
     code: "ua",
-    isoCode: "ua",
+    tag: "ua",
     name: "українська (Україна)",
     load: () => import('./data/ua.i18n.json'),
   },
   "vi": {
     code: "vi",
-    isoCode: "vi",
+    tag: "vi",
     name: "Tiếng Việt",
     load: () => import('./data/vi.i18n.json'),
   },
   "zh-CN": {
     code: "zh",
-    isoCode: "zh-CN",
+    tag: "zh-CN",
     name: "简体中文",
     load: () => import('./data/zh-CN.i18n.json'),
   },
   "zh-HK": {
     code: "zh",
-    isoCode: "zh-HK",
+    tag: "zh-HK",
     name: "繁体中文（香港）",
     load: () => import('./data/zh-HK.i18n.json'),
   },
   "zh-TW": {
     code: "zh",
-    isoCode: "zh-TW",
+    tag: "zh-TW",
     name: "繁体中文（台湾）",
     load: () => import('./data/zh-TW.i18n.json'),
   }

imports/i18n/tap.js

@@ -17,7 +17,7 @@ export const TAPi18n = {
       fallbackLng: DEFAULT_LANGUAGE,
       cleanCode: true,
       debug: Meteor.isDevelopment,
-      supportedLngs: Object.values(languages).map(({ isoCode }) => isoCode),
+      supportedLngs: Object.values(languages).map(({ tag }) => tag),
       ns: DEFAULT_NAMESPACE,
       defaultNs: DEFAULT_NAMESPACE,
       postProcess: ["sprintf"],
@@ -33,7 +33,7 @@ export const TAPi18n = {
     await TAPi18n.loadLanguage(DEFAULT_LANGUAGE);
   },
   getSupportedLanguages() {
-    return Object.values(languages).map(({ name, code, isoCode }) => ({ name, code, isoCode }));
+    return Object.values(languages).map(({ name, code, tag }) => ({ name, code, tag }));
   },
   getLanguage() {
     return this.current.get();