diff --git a/.travis.yml b/.travis.yml index 8cd6eee4fa..041910298e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,9 @@ node_js: - "9" - "10" - "11" + - "12" + - "13" + - "14" env: - CXX=g++-4.8 before_install: diff --git a/build.properties b/build.properties index 1d07d57a57..3c546d4aea 100644 --- a/build.properties +++ b/build.properties @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -version=14.6.0 +version=14.6.1 diff --git a/build.xml b/build.xml index 9b9e7dae7a..acc1feed54 100644 --- a/build.xml +++ b/build.xml @@ -130,6 +130,11 @@ limitations under the License. + + + + + diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md index 225ffafe52..f11ee957a5 100644 --- a/docs/ReleaseNotes.md +++ b/docs/ReleaseNotes.md @@ -1,6 +1,19 @@ Release Notes for Version 14 ============================ +Build 010 +------- +Published as version 14.6.1 + +New Features: + +Bug Fixes: +* Updated to IANA time zone data 2020a +* Put base option back on ResBundle +* Fixed a few tools and dependencies so that ilib works on node v14 +* Fixed a default timezone in `my-MM` to `Asia/Yangon` +* Fixed a bug which a default script for `ky` should be `Cyrl` instead of `Arabic` + Build 009 ------- Published as version 14.6.0 diff --git a/docs/index.md b/docs/index.md index ce01b3fcb0..8718ca9477 100644 --- a/docs/index.md +++ b/docs/index.md @@ -2,6 +2,8 @@ Hello, and welcome to the iLib project! +View this documentation on [github pages](https://ilib-js.github.io/iLib/docs/) + * [Welcome](Welcome.md) * [History](History.md) * [License](License.md) @@ -10,7 +12,7 @@ Hello, and welcome to the iLib project! # Documentation # * [Getting Started](GettingStarted.md) -* [Old Tutorial](tutorial/iLib1.0JSTutorial.pdf) +* Tutorials: * [Handling Phone Numbers in iLib](tutorial/phone.md) * [Name Parsing and Formatting](tutorial/name.md) * [Glyphs, Characters, and Character Normalization](tutorial/characters.md) @@ -20,6 +22,8 @@ Hello, and welcome to the iLib project! * Architecture and Process * [Overall Architecture](Architecture.md) * [CommonJS Modularization Support](tutorial/modules.md) as of 11.0 + * For ES6-style modules, see the [ilib-es6](https://github.com/ilib-js/ilib-es6/) project + which provides wrappers for all ilib classes * [Updating the time zone information](tutorial/timezone.md) * [Running unit test on QT/QML](QtTest.md) * API Reference: diff --git a/java/build.xml b/java/build.xml index 9e5030253a..b5889044a6 100644 --- a/java/build.xml +++ b/java/build.xml @@ -57,6 +57,8 @@ limitations under the License. + + @@ -106,6 +108,7 @@ limitations under the License. + @@ -374,4 +377,17 @@ limitations under the License. + + + + + + + + + + + \ No newline at end of file diff --git a/js/build.xml b/js/build.xml index f6acc29d1c..370df34e70 100644 --- a/js/build.xml +++ b/js/build.xml @@ -30,7 +30,9 @@ limitations under the License. - + + + @@ -51,8 +53,8 @@ limitations under the License. - - + + @@ -112,6 +114,7 @@ limitations under the License. + @@ -850,7 +853,7 @@ limitations under the License. @@ -868,6 +871,16 @@ limitations under the License. + + + + + + + + diff --git a/js/data/locale/ca/AD/ctrynames.json b/js/data/locale/ca/AD/ctrynames.json deleted file mode 100644 index 266962d0aa..0000000000 --- a/js/data/locale/ca/AD/ctrynames.json +++ /dev/null @@ -1,296 +0,0 @@ -{ - "Afganistan": "AF", - "Àfrica": "002", - "Àfrica central": "017", - "Àfrica meridional": "018", - "Àfrica occidental": "011", - "Àfrica oriental": "014", - "Àfrica septentrional": "015", - "Àfrica subsahariana": "202", - "Albània": "AL", - "Alemanya": "DE", - "Algèria": "DZ", - "Amèrica": "019", - "Amèrica Central": "013", - "Amèrica del Nord": "003", - "Amèrica del Sud": "005", - "Amèrica Llatina": "419", - "Amèrica septentrional": "021", - "Andorra": "AD", - "Angola": "AO", - "Anguilla": "AI", - "Antàrtida": "AQ", - "Antigua i Barbuda": "AG", - "Aràbia Saudita": "SA", - "Argentina": "AR", - "Armènia": "AM", - "Aruba": "AW", - "Àsia": "142", - "Àsia central": "143", - "Àsia meridional": "034", - "Àsia occidental": "145", - "Àsia oriental": "030", - "Àsia sud-oriental": "035", - "Australàsia": "053", - "Austràlia": "AU", - "Àustria": "AT", - "Azerbaidjan": "AZ", - "Bahames": "BS", - "Bahrain": "BH", - "Bangladesh": "BD", - "Barbados": "BB", - "Belarús": "BY", - "Bèlgica": "BE", - "Belize": "BZ", - "Benín": "BJ", - "Bermudes": "BM", - "Bhutan": "BT", - "Bolívia": "BO", - "Bòsnia i Hercegovina": "BA", - "Botswana": "BW", - "Bouvet": "BV", - "Brasil": "BR", - "Brunei": "BN", - "Bulgària": "BG", - "Burkina Faso": "BF", - "Burundi": "BI", - "Cambodja": "KH", - "Camerun": "CM", - "Canadà": "CA", - "Cap Verd": "CV", - "Carib": "029", - "Carib Neerlandès": "BQ", - "Ceuta i Melilla": "EA", - "Ciutat del Vaticà": "VA", - "Colòmbia": "CO", - "Comores": "KM", - "Congo - Brazzaville": "CG", - "Congo - Kinshasa": "CD", - "Corea del Nord": "KP", - "Corea del Sud": "KR", - "Costa Rica": "CR", - "Côte d’Ivoire": "CI", - "Croàcia": "HR", - "Cuba": "CU", - "Curaçao": "CW", - "Diego Garcia": "DG", - "Dinamarca": "DK", - "Djibouti": "DJ", - "Dominica": "DM", - "Egipte": "EG", - "El Salvador": "SV", - "Emirats Àrabs Units": "AE", - "Equador": "EC", - "Eritrea": "ER", - "Eslovàquia": "SK", - "Eslovènia": "SI", - "Espanya": "ES", - "Estats Units": "US", - "Estònia": "EE", - "eSwatini": "SZ", - "Etiòpia": "ET", - "Europa": "150", - "Europa meridional": "039", - "Europa occidental": "155", - "Europa oriental": "151", - "Europa septentrional": "154", - "Fiji": "FJ", - "Filipines": "PH", - "Finlàndia": "FI", - "França": "FR", - "Gabon": "GA", - "Gàmbia": "GM", - "Geòrgia": "GE", - "Ghana": "GH", - "Gibraltar": "GI", - "Grècia": "GR", - "Grenada": "GD", - "Groenlàndia": "GL", - "Guadeloupe": "GP", - "Guaiana Francesa": "GF", - "Guam": "GU", - "Guatemala": "GT", - "Guernsey": "GG", - "Guinea": "GN", - "Guinea Bissau": "GW", - "Guinea Equatorial": "GQ", - "Guyana": "GY", - "Haití": "HT", - "Hondures": "HN", - "Hong Kong (RAE Xina)": "HK", - "Hongria": "HU", - "Iemen": "YE", - "Illa Christmas": "CX", - "Illa Clipperton": "CP", - "Illa de l’Ascensió": "AC", - "Illa de la Reunió": "RE", - "Illa de Man": "IM", - "Illa Heard i Illes McDonald": "HM", - "Illes Åland": "AX", - "Illes Caiman": "KY", - "Illes Canàries": "IC", - "Illes Cocos": "CC", - "Illes Cook": "CK", - "Illes Fèroe": "FO", - "Illes Geòrgia del Sud i Sandwich del Sud": "GS", - "Illes Malvines": "FK", - "Illes Mariannes del Nord": "MP", - "Illes Marshall": "MH", - "Illes Perifèriques Menors dels EUA": "UM", - "Illes Pitcairn": "PN", - "Illes Salomó": "SB", - "Illes Turks i Caicos": "TC", - "Illes Verges Britàniques": "VG", - "Illes Verges Nord-americanes": "VI", - "Índia": "IN", - "Indonèsia": "ID", - "Iran": "IR", - "Iraq": "IQ", - "Irlanda": "IE", - "Islàndia": "IS", - "Israel": "IL", - "Itàlia": "IT", - "Jamaica": "JM", - "Japó": "JP", - "Jersey": "JE", - "Jordània": "JO", - "Kazakhstan": "KZ", - "Kenya": "KE", - "Kirguizistan": "KG", - "Kiribati": "KI", - "Kosovo": "XK", - "Kuwait": "KW", - "Laos": "LA", - "Lesotho": "LS", - "Letònia": "LV", - "Líban": "LB", - "Libèria": "LR", - "Líbia": "LY", - "Liechtenstein": "LI", - "Lituània": "LT", - "Luxemburg": "LU", - "Macau (RAE Xina)": "MO", - "Macedònia del Nord": "MK", - "Madagascar": "MG", - "Malàisia": "MY", - "Malawi": "MW", - "Maldives": "MV", - "Mali": "ML", - "Malta": "MT", - "Marroc": "MA", - "Martinica": "MQ", - "Maurici": "MU", - "Mauritània": "MR", - "Mayotte": "YT", - "Melanèsia": "054", - "Mèxic": "MX", - "Micronèsia": "FM", - "Moçambic": "MZ", - "Moldàvia": "MD", - "Món": "001", - "Mònaco": "MC", - "Mongòlia": "MN", - "Montenegro": "ME", - "Montserrat": "MS", - "Myanmar (Birmània)": "MM", - "Nacions Unides": "UN", - "Namíbia": "NA", - "Nauru": "NR", - "Nepal": "NP", - "Nicaragua": "NI", - "Níger": "NE", - "Nigèria": "NG", - "Niue": "NU", - "Norfolk": "NF", - "Noruega": "NO", - "Nova Caledònia": "NC", - "Nova Zelanda": "NZ", - "Oceania": "009", - "Oman": "OM", - "Països Baixos": "NL", - "Pakistan": "PK", - "Palau": "PW", - "Panamà": "PA", - "Papua Nova Guinea": "PG", - "Paraguai": "PY", - "Perú": "PE", - "Polinèsia": "061", - "Polinèsia Francesa": "PF", - "Polònia": "PL", - "Portugal": "PT", - "pseudoaccents": "XA", - "pseudobidi": "XB", - "Puerto Rico": "PR", - "Qatar": "QA", - "Regió de la Micronèsia": "057", - "regió desconeguda": "ZZ", - "Regne Unit": "GB", - "República Centreafricana": "CF", - "República de Sud-àfrica": "ZA", - "República Dominicana": "DO", - "Romania": "RO", - "Ruanda": "RW", - "Rússia": "RU", - "Sàhara Occidental": "EH", - "Saint Barthélemy": "BL", - "Saint Christopher i Nevis": "KN", - "Saint Helena": "SH", - "Saint Lucia": "LC", - "Saint Martin": "MF", - "Saint Vincent i les Grenadines": "VC", - "Saint-Pierre-et-Miquelon": "PM", - "Samoa": "WS", - "Samoa Nord-americana": "AS", - "San Marino": "SM", - "São Tomé i Príncipe": "ST", - "Senegal": "SN", - "Sèrbia": "RS", - "Seychelles": "SC", - "Sierra Leone": "SL", - "Singapur": "SG", - "Sint Maarten": "SX", - "Síria": "SY", - "Somàlia": "SO", - "Sri Lanka": "LK", - "Sudan": "SD", - "Sudan del Sud": "SS", - "Suècia": "SE", - "Suïssa": "CH", - "Surinam": "SR", - "Svalbard i Jan Mayen": "SJ", - "Tadjikistan": "TJ", - "Tailàndia": "TH", - "Taiwan": "TW", - "Tanzània": "TZ", - "Territori Britànic de l’Oceà Índic": "IO", - "Territoris allunyats d’Oceania": "QO", - "Territoris Australs Francesos": "TF", - "Territoris palestins": "PS", - "Timor Oriental": "TL", - "Togo": "TG", - "Tokelau": "TK", - "Tonga": "TO", - "Trinitat i Tobago": "TT", - "Tristan da Cunha": "TA", - "Tunísia": "TN", - "Turkmenistan": "TM", - "Turquia": "TR", - "Tuvalu": "TV", - "Txad": "TD", - "Txèquia": "CZ", - "Ucraïna": "UA", - "Uganda": "UG", - "Unió Europea": "EU", - "Uruguai": "UY", - "Uzbekistan": "UZ", - "Vanuatu": "VU", - "Veneçuela": "VE", - "Vietnam": "VN", - "Wallis i Futuna": "WF", - "Xile": "CL", - "Xina": "CN", - "Xipre": "CY", - "Zàmbia": "ZM", - "Zimbàbue": "ZW", - "zona euro": "EZ" -} \ No newline at end of file diff --git a/js/data/locale/ca/AD/ctryreverse.json b/js/data/locale/ca/AD/ctryreverse.json deleted file mode 100644 index 9c6c027922..0000000000 --- a/js/data/locale/ca/AD/ctryreverse.json +++ /dev/null @@ -1,296 +0,0 @@ -{ - "142": "Àsia", - "143": "Àsia central", - "145": "Àsia occidental", - "150": "Europa", - "151": "Europa oriental", - "154": "Europa septentrional", - "155": "Europa occidental", - "202": "Àfrica subsahariana", - "419": "Amèrica Llatina", - "AF": "Afganistan", - "002": "Àfrica", - "017": "Àfrica central", - "018": "Àfrica meridional", - "011": "Àfrica occidental", - "014": "Àfrica oriental", - "015": "Àfrica septentrional", - "AL": "Albània", - "DE": "Alemanya", - "DZ": "Algèria", - "019": "Amèrica", - "013": "Amèrica Central", - "003": "Amèrica del Nord", - "005": "Amèrica del Sud", - "021": "Amèrica septentrional", - "AD": "Andorra", - "AO": "Angola", - "AI": "Anguilla", - "AQ": "Antàrtida", - "AG": "Antigua i Barbuda", - "SA": "Aràbia Saudita", - "AR": "Argentina", - "AM": "Armènia", - "AW": "Aruba", - "034": "Àsia meridional", - "030": "Àsia oriental", - "035": "Àsia sud-oriental", - "053": "Australàsia", - "AU": "Austràlia", - "AT": "Àustria", - "AZ": "Azerbaidjan", - "BS": "Bahames", - "BH": "Bahrain", - "BD": "Bangladesh", - "BB": "Barbados", - "BY": "Belarús", - "BE": "Bèlgica", - "BZ": "Belize", - "BJ": "Benín", - "BM": "Bermudes", - "BT": "Bhutan", - "BO": "Bolívia", - "BA": "Bòsnia i Hercegovina", - "BW": "Botswana", - "BV": "Bouvet", - "BR": "Brasil", - "BN": "Brunei", - "BG": "Bulgària", - "BF": "Burkina Faso", - "BI": "Burundi", - "KH": "Cambodja", - "CM": "Camerun", - "CA": "Canadà", - "CV": "Cap Verd", - "029": "Carib", - "BQ": "Carib Neerlandès", - "EA": "Ceuta i Melilla", - "VA": "Ciutat del Vaticà", - "CO": "Colòmbia", - "KM": "Comores", - "CG": "Congo - Brazzaville", - "CD": "Congo - Kinshasa", - "KP": "Corea del Nord", - "KR": "Corea del Sud", - "CR": "Costa Rica", - "CI": "Côte d’Ivoire", - "HR": "Croàcia", - "CU": "Cuba", - "CW": "Curaçao", - "DG": "Diego Garcia", - "DK": "Dinamarca", - "DJ": "Djibouti", - "DM": "Dominica", - "EG": "Egipte", - "SV": "El Salvador", - "AE": "Emirats Àrabs Units", - "EC": "Equador", - "ER": "Eritrea", - "SK": "Eslovàquia", - "SI": "Eslovènia", - "ES": "Espanya", - "US": "Estats Units", - "EE": "Estònia", - "SZ": "eSwatini", - "ET": "Etiòpia", - "039": "Europa meridional", - "FJ": "Fiji", - "PH": "Filipines", - "FI": "Finlàndia", - "FR": "França", - "GA": "Gabon", - "GM": "Gàmbia", - "GE": "Geòrgia", - "GH": "Ghana", - "GI": "Gibraltar", - "GR": "Grècia", - "GD": "Grenada", - "GL": "Groenlàndia", - "GP": "Guadeloupe", - "GF": "Guaiana Francesa", - "GU": "Guam", - "GT": "Guatemala", - "GG": "Guernsey", - "GN": "Guinea", - "GW": "Guinea Bissau", - "GQ": "Guinea Equatorial", - "GY": "Guyana", - "HT": "Haití", - "HN": "Hondures", - "HK": "Hong Kong (RAE Xina)", - "HU": "Hongria", - "YE": "Iemen", - "CX": "Illa Christmas", - "CP": "Illa Clipperton", - "AC": "Illa de l’Ascensió", - "RE": "Illa de la Reunió", - "IM": "Illa de Man", - "HM": "Illa Heard i Illes McDonald", - "AX": "Illes Åland", - "KY": "Illes Caiman", - "IC": "Illes Canàries", - "CC": "Illes Cocos", - "CK": "Illes Cook", - "FO": "Illes Fèroe", - "GS": "Illes Geòrgia del Sud i Sandwich del Sud", - "FK": "Illes Malvines", - "MP": "Illes Mariannes del Nord", - "MH": "Illes Marshall", - "UM": "Illes Perifèriques Menors dels EUA", - "PN": "Illes Pitcairn", - "SB": "Illes Salomó", - "TC": "Illes Turks i Caicos", - "VG": "Illes Verges Britàniques", - "VI": "Illes Verges Nord-americanes", - "IN": "Índia", - "ID": "Indonèsia", - "IR": "Iran", - "IQ": "Iraq", - "IE": "Irlanda", - "IS": "Islàndia", - "IL": "Israel", - "IT": "Itàlia", - "JM": "Jamaica", - "JP": "Japó", - "JE": "Jersey", - "JO": "Jordània", - "KZ": "Kazakhstan", - "KE": "Kenya", - "KG": "Kirguizistan", - "KI": "Kiribati", - "XK": "Kosovo", - "KW": "Kuwait", - "LA": "Laos", - "LS": "Lesotho", - "LV": "Letònia", - "LB": "Líban", - "LR": "Libèria", - "LY": "Líbia", - "LI": "Liechtenstein", - "LT": "Lituània", - "LU": "Luxemburg", - "MO": "Macau (RAE Xina)", - "MK": "Macedònia del Nord", - "MG": "Madagascar", - "MY": "Malàisia", - "MW": "Malawi", - "MV": "Maldives", - "ML": "Mali", - "MT": "Malta", - "MA": "Marroc", - "MQ": "Martinica", - "MU": "Maurici", - "MR": "Mauritània", - "YT": "Mayotte", - "054": "Melanèsia", - "MX": "Mèxic", - "FM": "Micronèsia", - "MZ": "Moçambic", - "MD": "Moldàvia", - "001": "Món", - "MC": "Mònaco", - "MN": "Mongòlia", - "ME": "Montenegro", - "MS": "Montserrat", - "MM": "Myanmar (Birmània)", - "UN": "Nacions Unides", - "NA": "Namíbia", - "NR": "Nauru", - "NP": "Nepal", - "NI": "Nicaragua", - "NE": "Níger", - "NG": "Nigèria", - "NU": "Niue", - "NF": "Norfolk", - "NO": "Noruega", - "NC": "Nova Caledònia", - "NZ": "Nova Zelanda", - "009": "Oceania", - "OM": "Oman", - "NL": "Països Baixos", - "PK": "Pakistan", - "PW": "Palau", - "PA": "Panamà", - "PG": "Papua Nova Guinea", - "PY": "Paraguai", - "PE": "Perú", - "061": "Polinèsia", - "PF": "Polinèsia Francesa", - "PL": "Polònia", - "PT": "Portugal", - "XA": "pseudoaccents", - "XB": "pseudobidi", - "PR": "Puerto Rico", - "QA": "Qatar", - "057": "Regió de la Micronèsia", - "ZZ": "regió desconeguda", - "GB": "Regne Unit", - "CF": "República Centreafricana", - "ZA": "República de Sud-àfrica", - "DO": "República Dominicana", - "RO": "Romania", - "RW": "Ruanda", - "RU": "Rússia", - "EH": "Sàhara Occidental", - "BL": "Saint Barthélemy", - "KN": "Saint Christopher i Nevis", - "SH": "Saint Helena", - "LC": "Saint Lucia", - "MF": "Saint Martin", - "VC": "Saint Vincent i les Grenadines", - "PM": "Saint-Pierre-et-Miquelon", - "WS": "Samoa", - "AS": "Samoa Nord-americana", - "SM": "San Marino", - "ST": "São Tomé i Príncipe", - "SN": "Senegal", - "RS": "Sèrbia", - "SC": "Seychelles", - "SL": "Sierra Leone", - "SG": "Singapur", - "SX": "Sint Maarten", - "SY": "Síria", - "SO": "Somàlia", - "LK": "Sri Lanka", - "SD": "Sudan", - "SS": "Sudan del Sud", - "SE": "Suècia", - "CH": "Suïssa", - "SR": "Surinam", - "SJ": "Svalbard i Jan Mayen", - "TJ": "Tadjikistan", - "TH": "Tailàndia", - "TW": "Taiwan", - "TZ": "Tanzània", - "IO": "Territori Britànic de l’Oceà Índic", - "QO": "Territoris allunyats d’Oceania", - "TF": "Territoris Australs Francesos", - "PS": "Territoris palestins", - "TL": "Timor Oriental", - "TG": "Togo", - "TK": "Tokelau", - "TO": "Tonga", - "TT": "Trinitat i Tobago", - "TA": "Tristan da Cunha", - "TN": "Tunísia", - "TM": "Turkmenistan", - "TR": "Turquia", - "TV": "Tuvalu", - "TD": "Txad", - "CZ": "Txèquia", - "UA": "Ucraïna", - "UG": "Uganda", - "EU": "Unió Europea", - "UY": "Uruguai", - "UZ": "Uzbekistan", - "VU": "Vanuatu", - "VE": "Veneçuela", - "VN": "Vietnam", - "WF": "Wallis i Futuna", - "CL": "Xile", - "CN": "Xina", - "CY": "Xipre", - "ZM": "Zàmbia", - "ZW": "Zimbàbue", - "EZ": "zona euro" -} \ No newline at end of file diff --git a/js/data/locale/ca/AD/dateformats.json b/js/data/locale/ca/AD/dateformats.json deleted file mode 100644 index df75ec8c34..0000000000 --- a/js/data/locale/ca/AD/dateformats.json +++ /dev/null @@ -1,172 +0,0 @@ -{ - "gregorian": { - "order": { - "f": "{date} 'a' 'les' {time}", - "l": "{date} 'a' 'les' {time}", - "m": "{date}, {time}", - "s": "{date} {time}" - }, - "date": { - "dmwy": { - "f": "EEEE, d MMMM 'de' yyyy", - "l": "EEE, d MMMM 'de' yyyy", - "m": "EE, d MMM yyyy", - "s": "E, d/M/yy" - }, - "dmy": { - "f": "d MMMM 'de' yyyy", - "l": "d MMMM 'de' yyyy", - "m": "d MMM yyyy", - "s": "d/M/yy" - }, - "dmw": { - "f": "EEEE, d MMMM", - "l": "EEE, d MMMM", - "m": "EE, d MMM", - "s": "E, d/M" - }, - "dm": { - "f": "d MMMM", - "l": "d MMMM", - "m": "d MMM", - "s": "d/M" - }, - "my": { - "f": "LLLL 'de' yyyy", - "l": "LLLL 'de' yyyy", - "m": "LLL yyyy", - "s": "M/yy" - }, - "dw": { - "f": "EEEE, d", - "l": "EEE, d", - "m": "EE, d", - "s": "E, d" - }, - "w": { - "f": "EEEE", - "l": "EEE", - "m": "EE", - "s": "E" - }, - "d": { - "f": "d", - "l": "d", - "m": "d", - "s": "d" - }, - "m": { - "f": "MMMM", - "l": "MMMM", - "m": "MMM", - "s": "M" - }, - "y": { - "f": "yyyy", - "l": "yyyy", - "m": "yyyy", - "s": "yy" - }, - "e": { - "f": "cccc", - "l": "ccc", - "m": "cc", - "s": "c" - }, - "l": { - "f": "LLLL", - "l": "LLLL", - "m": "LLL", - "s": "L" - } - }, - "time": { - "12": { - "h": "h", - "m": "mm", - "s": "ss", - "ah": "h a", - "hm": "h:mm", - "ms": "mm:ss", - "ahm": "h:mm a", - "hms": "h:mm:ss", - "hmz": "h:mm z", - "ahmz": "h:mm a z", - "ahms": "h:mm:ss a", - "hmsz": "h:mm:ss z", - "ahmsz": "h:mm:ss a z" - }, - "24": { - "h": "H", - "m": "mm", - "s": "ss", - "ah": "H", - "hm": "H:mm", - "ms": "mm:ss", - "ahm": "H:mm", - "hms": "H:mm:ss", - "hmz": "H:mm z", - "ahmz": "H:mm z", - "ahms": "H:mm:ss", - "hmsz": "H:mm:ss z", - "ahmsz": "H:mm:ss z" - } - }, - "range": { - "c00": { - "f": "{sd} {sm} de {sy} a les {st} – {et}", - "l": "{sd} {sm} de {sy} a les {st} – {et}", - "m": "{sd} {sm} {sy}, {st} – {et}", - "s": "{sd}/{sm}/{sy} {st} – {et}" - }, - "c01": { - "f": "{sd} {sm} de {sy} a les {st} – {ed} {em} de {ey} a les {et}", - "l": "{sd} {sm} de {sy} a les {st} – {ed} {em} de {ey} a les {et}", - "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}", - "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}" - }, - "c02": { - "f": "{sd} {sm} de {sy} a les {st} – {ed} {em} de {ey} a les {et}", - "l": "{sd} {sm} de {sy} a les {st} – {ed} {em} de {ey} a les {et}", - "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}", - "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}" - }, - "c03": { - "f": "{sd} {sm} de {sy} a les {st} – {ed} {em} de {ey} a les {et}", - "l": "{sd} {sm} de {sy} a les {st} – {ed} {em} de {ey} a les {et}", - "m": "{sd} {sm} {sy}, {st} – {ed} {em} {ey}, {et}", - "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}" - }, - "c10": { - "f": "{sd} – {ed} {em} de {ey}", - "l": "{sd} – {ed} {em} de {ey}", - "m": "{sd} – {ed} {em} {ey}", - "s": "{sd} – {ed}/{em}/{ey}" - }, - "c11": { - "f": "{sd} {sm} – {ed} {em} de {ey}", - "l": "{sd} {sm} – {ed} {em} de {ey}", - "m": "{sd} {sm} – {ed} {em} {ey}", - "s": "{sd}/{sm} – {ed}/{em}/{ey}" - }, - "c12": { - "f": "{sd} {sm} de {sy} – {ed} {em} de {ey}", - "l": "{sd} {sm} de {sy} – {ed} {em} de {ey}", - "m": "{sd} {sm} {sy} – {ed} {em} {ey}", - "s": "{sd}/{sm}/{sy} – {ed}/{em}/{ey}" - }, - "c20": { - "f": "{sm} de {sy} – {em} de {ey}", - "l": "{sm} de {sy} – {em} de {ey}", - "m": "{sm} {sy} – {em} {ey}", - "s": "{sm}/{sy} – {em}/{ey}" - }, - "c30": { - "f": "{sy} – {ey}", - "l": "{sy} – {ey}", - "m": "{sy} – {ey}", - "s": "{sy} – {ey}" - } - } - } -} \ No newline at end of file diff --git a/js/data/locale/ca/AD/unitfmt.json b/js/data/locale/ca/AD/unitfmt.json deleted file mode 100644 index d9e0c8b1b0..0000000000 --- a/js/data/locale/ca/AD/unitfmt.json +++ /dev/null @@ -1,388 +0,0 @@ -{ - "unitfmt": { - "long": { - "times": "", - "g-force": "#{n} força G", - "meter-per-second-squared": "one#{n} metre per segon al quadrat|#{n} metres per segon al quadrat", - "revolution": "one#{n} revolució|#{n} revolucions", - "radian": "one#{n} radiant|#{n} radiants", - "degree": "one#{n} grau|#{n} graus", - "arc-minute": "one#{n} minut d’arc|#{n} minuts d’arc", - "arc-second": "one#{n} segon d’arc|#{n} segons d’arc", - "square-kilometer": "one#{n} quilòmetre quadrat|#{n} quilòmetres quadrats", - "hectare": "one#{n} hectàrea|#{n} hectàrees", - "square-meter": "one#{n} metre quadrat|#{n} metres quadrats", - "square-centimeter": "one#{n} centímetre quadrat|#{n} centímetres quadrats", - "square-mile": "one#{n} milla quadrada|#{n} milles quadrades", - "acre": "one#{n} acre|#{n} acres", - "square-yard": "one#{n} iarda quadrada|#{n} iardes quadrades", - "square-foot": "one#{n} peu quadrat|#{n} peus quadrats", - "square-inch": "one#{n} polzada quadrada|#{n} polzades quadrades", - "dunam": "one#{n} dunam|#{n} dunams", - "karat": "one#{n} quirat|#{n} quirats", - "milligram-per-deciliter": "one#{n} mil·ligram per decilitre|#{n} mil·ligrams per decilitre", - "millimole-per-liter": "one#{n} mil·limol per litre|#{n} mil·limols per litre", - "part-per-million": "one#{n} part per milió|#{n} parts per milió", - "percent": "#{n} per cent", - "permille": "#{n} per mil", - "permyriad": "#{n} per deu mil", - "mole": "one#{n} mol|#{n} mols", - "liter-per-kilometer": "one#{n} litre per quilòmetre|#{n} litres per quilòmetre", - "liter-per-100kilometers": "one#{n} litre per 100 quilòmetres|#{n} litres per 100 quilòmetres", - "mile-per-gallon": "one#{n} milla per galó|#{n} milles per galó", - "mile-per-gallon-imperial": "one#{n} milla per galó imperial|#{n} milles per galó imperial", - "petabyte": "one#{n} petabyte|#{n} petabytes", - "terabyte": "one#{n} terabyte|#{n} terabytes", - "terabit": "one#{n} terabit|#{n} terabits", - "gigabyte": "one#{n} gigabyte|#{n} gigabytes", - "gigabit": "one#{n} gigabit|#{n} gigabits", - "megabyte": "one#{n} megabyte|#{n} megabytes", - "megabit": "one#{n} megabit|#{n} megabits", - "kilobyte": "one#{n} quilobyte|#{n} quilobytes", - "kilobit": "one#{n} quilobit|#{n} quilobits", - "byte": "one#{n} byte|#{n} bytes", - "bit": "one#{n} bit|#{n} bits", - "century": "one#{n} segle|#{n} segles", - "decade": "one#{n} dècada|#{n} dècades", - "year": "one#{n} any|#{n} anys", - "month": "one#{n} mes|#{n} mesos", - "week": "one#{n} setmana|#{n} setmanes", - "day": "one#{n} dia|#{n} dies", - "hour": "one#{n} hora|#{n} hores", - "minute": "one#{n} minut|#{n} minuts", - "second": "one#{n} segon|#{n} segons", - "millisecond": "one#{n} mil·lisegon|#{n} mil·lisegons", - "microsecond": "one#{n} microsegon|#{n} microsegons", - "nanosecond": "one#{n} nanosegon|#{n} nanosegons", - "ampere": "one#{n} ampere|#{n} amperes", - "milliampere": "one#{n} mil·liampere|#{n} mil·liamperes", - "ohm": "one#{n} ohm|#{n} ohms", - "volt": "one#{n} volt|#{n} volts", - "kilocalorie": "one#{n} quilocaloria|#{n} quilocalories", - "calorie": "one#{n} caloria|#{n} calories", - "foodcalorie": "one#{n} quilocaloria|#{n} quilocalories", - "kilojoule": "one#{n} quilojoule|#{n} quilojoules", - "joule": "one#{n} joule|#{n} joules", - "kilowatt-hour": "one#{n} quilowatt hora|#{n} quilowatts hora", - "electronvolt": "one#{n} electró-volt|#{n} electrons-volt", - "british-thermal-unit": "one#{n} unitat tèrmica britànica|#{n} unitats tèrmiques britàniques", - "therm-us": "one#{n} unitat tèrmica americana|#{n} unitats tèrmiques americanes", - "pound-force": "one#{n} lliura de força|#{n} lliures de força", - "newton": "one#{n} newton|#{n} newtons", - "gigahertz": "one#{n} gigahertz|#{n} gigahertzs", - "megahertz": "one#{n} megahertz|#{n} megahertzs", - "kilohertz": "one#{n} quilohertz|#{n} quilohertzs", - "hertz": "one#{n} hertz|#{n} hertzs", - "em": "#{n} em", - "pixel": "one#{n} píxel|#{n} píxels", - "megapixel": "one#{n} megapíxel|#{n} megapíxels", - "pixel-per-centimeter": "one#{n} píxel per centímetre|#{n} píxels per centímetre", - "pixel-per-inch": "one#{n} píxel per polzada|#{n} píxels per polzada", - "dot-per-centimeter": "one#{n} punt per centímetre|#{n} punts per centímetre", - "dot-per-inch": "one#{n} punt per polzada|#{n} punts per polzada", - "kilometer": "one#{n} quilòmetre|#{n} quilòmetres", - "meter": "one#{n} metre|#{n} metres", - "decimeter": "one#{n} decímetre|#{n} decímetres", - "centimeter": "one#{n} centímetre|#{n} centímetres", - "millimeter": "one#{n} mil·límetre|#{n} mil·límetres", - "micrometer": "one#{n} micròmetre|#{n} micròmetres", - "nanometer": "one#{n} nanòmetre|#{n} nanòmetres", - "picometer": "one#{n} picòmetre|#{n} picòmetres", - "mile": "one#{n} milla|#{n} milles", - "yard": "one#{n} iarda|#{n} iardes", - "foot": "one#{n} peu|#{n} peus", - "inch": "one#{n} polzada|#{n} polzades", - "parsec": "one#{n} parsec|#{n} parsecs", - "light-year": "one#{n} any llum|#{n} anys llum", - "astronomical-unit": "one#{n} unitat astronòmica|#{n} unitats astronòmiques", - "furlong": "#{n} fur", - "fathom": "#{n} fth", - "nautical-mile": "one#{n} milla nàutica|#{n} milles nàutiques", - "mile-scandinavian": "one#{n} milla escandinava|#{n} milles escandinaves", - "point": "one#{n} punt|#{n} punts", - "solar-radius": "one#{n} radi solar|#{n} radis solars", - "lux": "one#{n} lux|#{n} luxs", - "solar-luminosity": "one#{n} lluminositat solar|#{n} lluminositats solars", - "metric-ton": "one#{n} tona mètrica|#{n} tones mètriques", - "kilogram": "one#{n} quilogram|#{n} quilograms", - "gram": "one#{n} gram|#{n} grams", - "milligram": "one#{n} mil·ligram|#{n} mil·ligrams", - "microgram": "one#{n} microgram|#{n} micrograms", - "ton": "one#{n} tona|#{n} tones", - "short-ton": "one#{n} tona|#{n} tones", - "stone": "#{n} st", - "pound": "one#{n} lliura|#{n} lliures", - "ounce": "one#{n} unça|#{n} unces", - "ounce-troy": "one#{n} unça troy|#{n} unces troy", - "carat": "one#{n} quirat|#{n} quirats", - "dalton": "one#{n} dalton|#{n} daltons", - "earth-mass": "one#{n} massa de la Terra|#{n} masses de la Terra", - "solar-mass": "one#{n} massa solar|#{n} masses solars", - "gigawatt": "one#{n} gigawatt|#{n} gigawatts", - "megawatt": "one#{n} megawatt|#{n} megawatts", - "kilowatt": "one#{n} quilowatt|#{n} quilowatts", - "watt": "one#{n} watt|#{n} watts", - "milliwatt": "one#{n} mil·liwatt|#{n} mil·liwatts", - "horsepower": "one#{n} cavall de vapor|#{n} cavalls de vapor", - "millimeter-of-mercury": "one#mil·límetre de mercuri|#{n} mil·límetres de mercuri", - "pound-per-square-inch": "one#{n} lliura per polzada quadrada|#{n} lliures per polzada quadrada", - "inch-hg": "one#{n} polzada de mercuri|#{n} polzades de mercuri", - "bar": "one#{n} bar|#{n} bars", - "millibar": "one#{n} mil·libar|#{n} mil·libars", - "atmosphere": "one#{n} atmosfera|#{n} atmosferes", - "pascal": "one#{n} pascal|#{n} pascals", - "hectopascal": "one#{n} hectopascal|#{n} hectopascals", - "kilopascal": "one#{n} quilopascal|#{n} quilopascals", - "megapascal": "one#{n} megapascal|#{n} megapascals", - "kilometer-per-hour": "one#{n} quilòmetre per hora|#{n} quilòmetres per hora", - "meter-per-second": "one#{n} metre per segon|#{n} metres per segon", - "mile-per-hour": "one#{n} milla per hora|#{n} milles per hora", - "knot": "one#{n} nus|#{n} nusos", - "generic": "#{n}°", - "celsius": "one#{n} grau Celsius|#{n} graus Celsius", - "fahrenheit": "one#{n} grau Fahrenheit|#{n} graus Fahrenheit", - "kelvin": "#{n} Kelvin", - "pound-foot": "one#{n} lliura-peu|#{n} lliures-peu", - "newton-meter": "one#{n} newton-metre|#{n} newtons-metre", - "cubic-kilometer": "one#{n} quilòmetre cúbic|#{n} quilòmetres cúbics", - "cubic-meter": "one#{n} metre cúbic|#{n} metres cúbics", - "cubic-centimeter": "one#{n} centímetre cúbic|#{n} centímetres cúbics", - "cubic-mile": "one#{n} milla cúbica|#{n} milles cúbiques", - "cubic-yard": "one#{n} iarda cúbica|#{n} iardes cúbiques", - "cubic-foot": "one#{n} peu cúbic|#{n} peus cúbics", - "cubic-inch": "one#{n} polzada cúbica|#{n} polzades cúbiques", - "megaliter": "one#{n} megalitre|#{n} megalitres", - "hectoliter": "one#{n} hectolitre|#{n} hectolitres", - "liter": "one#{n} litre|#{n} litres", - "deciliter": "one#{n} decilitre|#{n} decilitres", - "centiliter": "one#{n} centilitre|#{n} centilitres", - "milliliter": "one#{n} mil·lilitre|#{n} mil·lilitres", - "pint-metric": "one#{n} pinta mètrica|#{n} pintes mètriques", - "cup-metric": "one#{n} tassa mètrica|#{n} tasses mètriques", - "acre-foot": "one#{n} acre-peu|#{n} acres-peus", - "bushel": "#{n} bu", - "gallon": "one#{n} galó|#{n} galons", - "gallon-imperial": "one#{n} galó imperial|#{n} galons imperials", - "quart": "one#{n} quart|#{n} quarts", - "pint": "one#{n} pinta|#{n} pintes", - "cup": "one#{n} tassa|#{n} tasses", - "fluid-ounce": "one#{n} unça líquida|#{n} unces líquides", - "fluid-ounce-imperial": "one#{n} unça líquida imperial|#{n} unces líquides imperials", - "tablespoon": "one#{n} cullerada|#{n} cullerades", - "teaspoon": "one#{n} culleradeta|#{n} culleradetes", - "barrel": "one#{n} barril|#{n} barrils", - "coordinateUnit": "", - "foot-per-second": "#{n} peus per segon", - "kilometer-per-second": "#{n} quilòmetres per segon", - "mile-per-second": "#{n} milles per segon", - "kilometer-per-liter": "#{n} quilòmetres per litre", - "bit-per-second": "#{n} bits per segon", - "kilobit-per-second": "#{n} quilobits per segon", - "megabit-per-second": "#{n} megabits per segon", - "gigabit-per-second": "#{n} gigabits per segon", - "terabit-per-second": "#{n} terabits per segon", - "byte-per-second": "#{n} bytes per segon", - "kilobyte-per-second": "#{n} quilobytes per segon", - "megabyte-per-second": "#{n} megabytes per segon", - "gigabyte-per-second": "#{n} gigabytes per segon", - "terabyte-per-second": "#{n} terabytes per segon", - "byte-per-hour": "#{n} bytes per hora", - "kilobyte-per-hour": "#{n} quilobytes per hora", - "megabyte-per-hour": "#{n} megabytes per hora", - "gigabyte-per-hour": "#{n} gigabytes per hora", - "terabyte-per-hour": "#{n} terabytes per hora" - }, - "short": { - "times": "", - "g-force": "#{n} G", - "meter-per-second-squared": "#{n} m/s²", - "revolution": "#{n} r", - "radian": "#{n} rad", - "degree": "#{n}°", - "arc-minute": "#{n} arcmin", - "arc-second": "#{n} arcsec", - "square-kilometer": "#{n} km²", - "hectare": "#{n} ha", - "square-meter": "#{n} m²", - "square-centimeter": "#{n} cm²", - "square-mile": "#{n} mi²", - "acre": "#{n} ac", - "square-yard": "#{n} yd²", - "square-foot": "#{n} ft²", - "square-inch": "#{n} in²", - "dunam": "one#{n} dunam|#{n} dunams", - "karat": "#{n} ct", - "milligram-per-deciliter": "#{n} mg/dl", - "millimole-per-liter": "#{n} mM/l", - "part-per-million": "#{n} ppm", - "percent": "#{n} %", - "permille": "#{n} ‰", - "permyriad": "#{n}‱", - "mole": "#{n} mol", - "liter-per-kilometer": "#{n} l/km", - "liter-per-100kilometers": "#{n} l/100 km", - "mile-per-gallon": "#{n} mi/gal", - "mile-per-gallon-imperial": "#{n} mi/gal imp.", - "petabyte": "#{n} PB", - "terabyte": "#{n} TB", - "terabit": "#{n} Tb", - "gigabyte": "#{n} GB", - "gigabit": "#{n} Gb", - "megabyte": "#{n} MB", - "megabit": "#{n} Mbit", - "kilobyte": "#{n} kB", - "kilobit": "#{n} kb", - "byte": "#{n} B", - "bit": "one#{n} bit|#{n} bits", - "century": "one#{n} segle|#{n} segles", - "decade": "#{n} dèc.", - "year": "one#{n} any|#{n} anys", - "month": "one#{n} mes|#{n} mesos", - "week": "#{n} setm.", - "day": "one#{n} dia|#{n} dies", - "hour": "#{n} h", - "minute": "#{n} min", - "second": "#{n} s", - "millisecond": "#{n} ms", - "microsecond": "#{n} μs", - "nanosecond": "#{n} ns", - "ampere": "#{n} A", - "milliampere": "#{n} mA", - "ohm": "#{n} Ω", - "volt": "#{n} V", - "kilocalorie": "#{n} kcal", - "calorie": "#{n} cal", - "foodcalorie": "#{n} kcal", - "kilojoule": "#{n} kJ", - "joule": "#{n} J", - "kilowatt-hour": "#{n} kWh", - "electronvolt": "#{n} eV", - "british-thermal-unit": "#{n} Btu", - "therm-us": "#{n} thm", - "pound-force": "#{n} lbf", - "newton": "#{n} N", - "gigahertz": "#{n} GHz", - "megahertz": "#{n} MHz", - "kilohertz": "#{n} kHz", - "hertz": "#{n} Hz", - "em": "#{n} em", - "pixel": "#{n} px", - "megapixel": "#{n} Mpx", - "pixel-per-centimeter": "#{n} píxels per cm", - "pixel-per-inch": "#{n} PPI", - "dot-per-centimeter": "#{n} ppcm", - "dot-per-inch": "#{n} ppp", - "kilometer": "#{n} km", - "meter": "#{n} m", - "decimeter": "#{n} dm", - "centimeter": "#{n} cm", - "millimeter": "#{n} mm", - "micrometer": "#{n} µm", - "nanometer": "#{n} nm", - "picometer": "#{n} pm", - "mile": "#{n} mi", - "yard": "#{n} yd", - "foot": "#{n} ft", - "inch": "#{n} in", - "parsec": "#{n} pc", - "light-year": "one#{n} any ll.|#{n} anys ll.", - "astronomical-unit": "#{n} ua", - "furlong": "#{n} fur", - "fathom": "#{n} fth", - "nautical-mile": "#{n} NM", - "mile-scandinavian": "#{n} smi", - "point": "#{n} pt", - "solar-radius": "#{n} R☉", - "lux": "#{n} lx", - "solar-luminosity": "#{n} L☉", - "metric-ton": "#{n} t mètr.", - "kilogram": "#{n} kg", - "gram": "#{n} g", - "milligram": "#{n} mg", - "microgram": "#{n} µg", - "ton": "#{n} t", - "short-ton": "#{n} t", - "stone": "#{n} st", - "pound": "#{n} lb", - "ounce": "#{n} oz", - "ounce-troy": "#{n} ozt", - "carat": "#{n} ct", - "dalton": "#{n} Da", - "earth-mass": "#{n} M⊕", - "solar-mass": "#{n} M☉", - "gigawatt": "#{n} GW", - "megawatt": "#{n} MW", - "kilowatt": "#{n} kW", - "watt": "#{n} W", - "milliwatt": "#{n} mW", - "horsepower": "#{n} CV", - "millimeter-of-mercury": "#{n} mmHg", - "pound-per-square-inch": "#{n} psi", - "inch-hg": "#{n} inHg", - "bar": "one#{n} bar|#{n} bars", - "millibar": "#{n} mbar", - "atmosphere": "#{n} atm", - "pascal": "#{n} Pa", - "hectopascal": "#{n} hPa", - "kilopascal": "#{n} kPa", - "megapascal": "#{n} MPa", - "kilometer-per-hour": "#{n} km/h", - "meter-per-second": "#{n} m/s", - "mile-per-hour": "#{n} mi/h", - "knot": "#{n} kn", - "generic": "#{n}°", - "celsius": "#{n} °C", - "fahrenheit": "#{n} °F", - "kelvin": "#{n} K", - "pound-foot": "#{n} lbf⋅ft", - "newton-meter": "#{n} N⋅m", - "cubic-kilometer": "#{n} km³", - "cubic-meter": "#{n} m³", - "cubic-centimeter": "#{n} cm³", - "cubic-mile": "#{n} mi³", - "cubic-yard": "#{n} yd³", - "cubic-foot": "#{n} ft³", - "cubic-inch": "#{n} in³", - "megaliter": "#{n} Ml", - "hectoliter": "#{n} hl", - "liter": "#{n} l", - "deciliter": "#{n} dl", - "centiliter": "#{n} cl", - "milliliter": "#{n} ml", - "pint-metric": "#{n} ptm", - "cup-metric": "#{n} mc", - "acre-foot": "#{n} ac ft", - "bushel": "#{n} bu", - "gallon": "#{n} gal", - "gallon-imperial": "#{n} gal imp.", - "quart": "#{n} qt", - "pint": "#{n} pt", - "cup": "one#{n} tassa|#{n} tasses", - "fluid-ounce": "#{n} fl oz", - "fluid-ounce-imperial": "#{n} fl oz imp.", - "tablespoon": "#{n} cull.", - "teaspoon": "#{n} cdta.", - "barrel": "#{n} bbl", - "coordinateUnit": "", - "foot-per-second": "#{n} ft/s", - "kilometer-per-second": "#{n} km/s", - "mile-per-second": "#{n} mi/s", - "kilometer-per-liter": "#{n} km/l", - "bit-per-second": "#{n} bits/s", - "kilobit-per-second": "#{n} kb/s", - "megabit-per-second": "#{n} Mbit/s", - "gigabit-per-second": "#{n} Gb/s", - "terabit-per-second": "#{n} Tb/s", - "byte-per-second": "#{n} B/s", - "kilobyte-per-second": "#{n} kB/s", - "megabyte-per-second": "#{n} MB/s", - "gigabyte-per-second": "#{n} GB/s", - "terabyte-per-second": "#{n} TB/s", - "byte-per-hour": "#{n} B/h", - "kilobyte-per-hour": "#{n} kB/h", - "megabyte-per-hour": "#{n} MB/h", - "gigabyte-per-hour": "#{n} GB/h", - "terabyte-per-hour": "#{n} TB/h" - } - } -} \ No newline at end of file diff --git a/js/data/locale/ca/ES/ctrynames.json b/js/data/locale/ca/ES/ctrynames.json deleted file mode 100644 index 266962d0aa..0000000000 --- a/js/data/locale/ca/ES/ctrynames.json +++ /dev/null @@ -1,296 +0,0 @@ -{ - "Afganistan": "AF", - "Àfrica": "002", - "Àfrica central": "017", - "Àfrica meridional": "018", - "Àfrica occidental": "011", - "Àfrica oriental": "014", - "Àfrica septentrional": "015", - "Àfrica subsahariana": "202", - "Albània": "AL", - "Alemanya": "DE", - "Algèria": "DZ", - "Amèrica": "019", - "Amèrica Central": "013", - "Amèrica del Nord": "003", - "Amèrica del Sud": "005", - "Amèrica Llatina": "419", - "Amèrica septentrional": "021", - "Andorra": "AD", - "Angola": "AO", - "Anguilla": "AI", - "Antàrtida": "AQ", - "Antigua i Barbuda": "AG", - "Aràbia Saudita": "SA", - "Argentina": "AR", - "Armènia": "AM", - "Aruba": "AW", - "Àsia": "142", - "Àsia central": "143", - "Àsia meridional": "034", - "Àsia occidental": "145", - "Àsia oriental": "030", - "Àsia sud-oriental": "035", - "Australàsia": "053", - "Austràlia": "AU", - "Àustria": "AT", - "Azerbaidjan": "AZ", - "Bahames": "BS", - "Bahrain": "BH", - "Bangladesh": "BD", - "Barbados": "BB", - "Belarús": "BY", - "Bèlgica": "BE", - "Belize": "BZ", - "Benín": "BJ", - "Bermudes": "BM", - "Bhutan": "BT", - "Bolívia": "BO", - "Bòsnia i Hercegovina": "BA", - "Botswana": "BW", - "Bouvet": "BV", - "Brasil": "BR", - "Brunei": "BN", - "Bulgària": "BG", - "Burkina Faso": "BF", - "Burundi": "BI", - "Cambodja": "KH", - "Camerun": "CM", - "Canadà": "CA", - "Cap Verd": "CV", - "Carib": "029", - "Carib Neerlandès": "BQ", - "Ceuta i Melilla": "EA", - "Ciutat del Vaticà": "VA", - "Colòmbia": "CO", - "Comores": "KM", - "Congo - Brazzaville": "CG", - "Congo - Kinshasa": "CD", - "Corea del Nord": "KP", - "Corea del Sud": "KR", - "Costa Rica": "CR", - "Côte d’Ivoire": "CI", - "Croàcia": "HR", - "Cuba": "CU", - "Curaçao": "CW", - "Diego Garcia": "DG", - "Dinamarca": "DK", - "Djibouti": "DJ", - "Dominica": "DM", - "Egipte": "EG", - "El Salvador": "SV", - "Emirats Àrabs Units": "AE", - "Equador": "EC", - "Eritrea": "ER", - "Eslovàquia": "SK", - "Eslovènia": "SI", - "Espanya": "ES", - "Estats Units": "US", - "Estònia": "EE", - "eSwatini": "SZ", - "Etiòpia": "ET", - "Europa": "150", - "Europa meridional": "039", - "Europa occidental": "155", - "Europa oriental": "151", - "Europa septentrional": "154", - "Fiji": "FJ", - "Filipines": "PH", - "Finlàndia": "FI", - "França": "FR", - "Gabon": "GA", - "Gàmbia": "GM", - "Geòrgia": "GE", - "Ghana": "GH", - "Gibraltar": "GI", - "Grècia": "GR", - "Grenada": "GD", - "Groenlàndia": "GL", - "Guadeloupe": "GP", - "Guaiana Francesa": "GF", - "Guam": "GU", - "Guatemala": "GT", - "Guernsey": "GG", - "Guinea": "GN", - "Guinea Bissau": "GW", - "Guinea Equatorial": "GQ", - "Guyana": "GY", - "Haití": "HT", - "Hondures": "HN", - "Hong Kong (RAE Xina)": "HK", - "Hongria": "HU", - "Iemen": "YE", - "Illa Christmas": "CX", - "Illa Clipperton": "CP", - "Illa de l’Ascensió": "AC", - "Illa de la Reunió": "RE", - "Illa de Man": "IM", - "Illa Heard i Illes McDonald": "HM", - "Illes Åland": "AX", - "Illes Caiman": "KY", - "Illes Canàries": "IC", - "Illes Cocos": "CC", - "Illes Cook": "CK", - "Illes Fèroe": "FO", - "Illes Geòrgia del Sud i Sandwich del Sud": "GS", - "Illes Malvines": "FK", - "Illes Mariannes del Nord": "MP", - "Illes Marshall": "MH", - "Illes Perifèriques Menors dels EUA": "UM", - "Illes Pitcairn": "PN", - "Illes Salomó": "SB", - "Illes Turks i Caicos": "TC", - "Illes Verges Britàniques": "VG", - "Illes Verges Nord-americanes": "VI", - "Índia": "IN", - "Indonèsia": "ID", - "Iran": "IR", - "Iraq": "IQ", - "Irlanda": "IE", - "Islàndia": "IS", - "Israel": "IL", - "Itàlia": "IT", - "Jamaica": "JM", - "Japó": "JP", - "Jersey": "JE", - "Jordània": "JO", - "Kazakhstan": "KZ", - "Kenya": "KE", - "Kirguizistan": "KG", - "Kiribati": "KI", - "Kosovo": "XK", - "Kuwait": "KW", - "Laos": "LA", - "Lesotho": "LS", - "Letònia": "LV", - "Líban": "LB", - "Libèria": "LR", - "Líbia": "LY", - "Liechtenstein": "LI", - "Lituània": "LT", - "Luxemburg": "LU", - "Macau (RAE Xina)": "MO", - "Macedònia del Nord": "MK", - "Madagascar": "MG", - "Malàisia": "MY", - "Malawi": "MW", - "Maldives": "MV", - "Mali": "ML", - "Malta": "MT", - "Marroc": "MA", - "Martinica": "MQ", - "Maurici": "MU", - "Mauritània": "MR", - "Mayotte": "YT", - "Melanèsia": "054", - "Mèxic": "MX", - "Micronèsia": "FM", - "Moçambic": "MZ", - "Moldàvia": "MD", - "Món": "001", - "Mònaco": "MC", - "Mongòlia": "MN", - "Montenegro": "ME", - "Montserrat": "MS", - "Myanmar (Birmània)": "MM", - "Nacions Unides": "UN", - "Namíbia": "NA", - "Nauru": "NR", - "Nepal": "NP", - "Nicaragua": "NI", - "Níger": "NE", - "Nigèria": "NG", - "Niue": "NU", - "Norfolk": "NF", - "Noruega": "NO", - "Nova Caledònia": "NC", - "Nova Zelanda": "NZ", - "Oceania": "009", - "Oman": "OM", - "Països Baixos": "NL", - "Pakistan": "PK", - "Palau": "PW", - "Panamà": "PA", - "Papua Nova Guinea": "PG", - "Paraguai": "PY", - "Perú": "PE", - "Polinèsia": "061", - "Polinèsia Francesa": "PF", - "Polònia": "PL", - "Portugal": "PT", - "pseudoaccents": "XA", - "pseudobidi": "XB", - "Puerto Rico": "PR", - "Qatar": "QA", - "Regió de la Micronèsia": "057", - "regió desconeguda": "ZZ", - "Regne Unit": "GB", - "República Centreafricana": "CF", - "República de Sud-àfrica": "ZA", - "República Dominicana": "DO", - "Romania": "RO", - "Ruanda": "RW", - "Rússia": "RU", - "Sàhara Occidental": "EH", - "Saint Barthélemy": "BL", - "Saint Christopher i Nevis": "KN", - "Saint Helena": "SH", - "Saint Lucia": "LC", - "Saint Martin": "MF", - "Saint Vincent i les Grenadines": "VC", - "Saint-Pierre-et-Miquelon": "PM", - "Samoa": "WS", - "Samoa Nord-americana": "AS", - "San Marino": "SM", - "São Tomé i Príncipe": "ST", - "Senegal": "SN", - "Sèrbia": "RS", - "Seychelles": "SC", - "Sierra Leone": "SL", - "Singapur": "SG", - "Sint Maarten": "SX", - "Síria": "SY", - "Somàlia": "SO", - "Sri Lanka": "LK", - "Sudan": "SD", - "Sudan del Sud": "SS", - "Suècia": "SE", - "Suïssa": "CH", - "Surinam": "SR", - "Svalbard i Jan Mayen": "SJ", - "Tadjikistan": "TJ", - "Tailàndia": "TH", - "Taiwan": "TW", - "Tanzània": "TZ", - "Territori Britànic de l’Oceà Índic": "IO", - "Territoris allunyats d’Oceania": "QO", - "Territoris Australs Francesos": "TF", - "Territoris palestins": "PS", - "Timor Oriental": "TL", - "Togo": "TG", - "Tokelau": "TK", - "Tonga": "TO", - "Trinitat i Tobago": "TT", - "Tristan da Cunha": "TA", - "Tunísia": "TN", - "Turkmenistan": "TM", - "Turquia": "TR", - "Tuvalu": "TV", - "Txad": "TD", - "Txèquia": "CZ", - "Ucraïna": "UA", - "Uganda": "UG", - "Unió Europea": "EU", - "Uruguai": "UY", - "Uzbekistan": "UZ", - "Vanuatu": "VU", - "Veneçuela": "VE", - "Vietnam": "VN", - "Wallis i Futuna": "WF", - "Xile": "CL", - "Xina": "CN", - "Xipre": "CY", - "Zàmbia": "ZM", - "Zimbàbue": "ZW", - "zona euro": "EZ" -} \ No newline at end of file diff --git a/js/data/locale/ca/ES/ctryreverse.json b/js/data/locale/ca/ES/ctryreverse.json deleted file mode 100644 index 9c6c027922..0000000000 --- a/js/data/locale/ca/ES/ctryreverse.json +++ /dev/null @@ -1,296 +0,0 @@ -{ - "142": "Àsia", - "143": "Àsia central", - "145": "Àsia occidental", - "150": "Europa", - "151": "Europa oriental", - "154": "Europa septentrional", - "155": "Europa occidental", - "202": "Àfrica subsahariana", - "419": "Amèrica Llatina", - "AF": "Afganistan", - "002": "Àfrica", - "017": "Àfrica central", - "018": "Àfrica meridional", - "011": "Àfrica occidental", - "014": "Àfrica oriental", - "015": "Àfrica septentrional", - "AL": "Albània", - "DE": "Alemanya", - "DZ": "Algèria", - "019": "Amèrica", - "013": "Amèrica Central", - "003": "Amèrica del Nord", - "005": "Amèrica del Sud", - "021": "Amèrica septentrional", - "AD": "Andorra", - "AO": "Angola", - "AI": "Anguilla", - "AQ": "Antàrtida", - "AG": "Antigua i Barbuda", - "SA": "Aràbia Saudita", - "AR": "Argentina", - "AM": "Armènia", - "AW": "Aruba", - "034": "Àsia meridional", - "030": "Àsia oriental", - "035": "Àsia sud-oriental", - "053": "Australàsia", - "AU": "Austràlia", - "AT": "Àustria", - "AZ": "Azerbaidjan", - "BS": "Bahames", - "BH": "Bahrain", - "BD": "Bangladesh", - "BB": "Barbados", - "BY": "Belarús", - "BE": "Bèlgica", - "BZ": "Belize", - "BJ": "Benín", - "BM": "Bermudes", - "BT": "Bhutan", - "BO": "Bolívia", - "BA": "Bòsnia i Hercegovina", - "BW": "Botswana", - "BV": "Bouvet", - "BR": "Brasil", - "BN": "Brunei", - "BG": "Bulgària", - "BF": "Burkina Faso", - "BI": "Burundi", - "KH": "Cambodja", - "CM": "Camerun", - "CA": "Canadà", - "CV": "Cap Verd", - "029": "Carib", - "BQ": "Carib Neerlandès", - "EA": "Ceuta i Melilla", - "VA": "Ciutat del Vaticà", - "CO": "Colòmbia", - "KM": "Comores", - "CG": "Congo - Brazzaville", - "CD": "Congo - Kinshasa", - "KP": "Corea del Nord", - "KR": "Corea del Sud", - "CR": "Costa Rica", - "CI": "Côte d’Ivoire", - "HR": "Croàcia", - "CU": "Cuba", - "CW": "Curaçao", - "DG": "Diego Garcia", - "DK": "Dinamarca", - "DJ": "Djibouti", - "DM": "Dominica", - "EG": "Egipte", - "SV": "El Salvador", - "AE": "Emirats Àrabs Units", - "EC": "Equador", - "ER": "Eritrea", - "SK": "Eslovàquia", - "SI": "Eslovènia", - "ES": "Espanya", - "US": "Estats Units", - "EE": "Estònia", - "SZ": "eSwatini", - "ET": "Etiòpia", - "039": "Europa meridional", - "FJ": "Fiji", - "PH": "Filipines", - "FI": "Finlàndia", - "FR": "França", - "GA": "Gabon", - "GM": "Gàmbia", - "GE": "Geòrgia", - "GH": "Ghana", - "GI": "Gibraltar", - "GR": "Grècia", - "GD": "Grenada", - "GL": "Groenlàndia", - "GP": "Guadeloupe", - "GF": "Guaiana Francesa", - "GU": "Guam", - "GT": "Guatemala", - "GG": "Guernsey", - "GN": "Guinea", - "GW": "Guinea Bissau", - "GQ": "Guinea Equatorial", - "GY": "Guyana", - "HT": "Haití", - "HN": "Hondures", - "HK": "Hong Kong (RAE Xina)", - "HU": "Hongria", - "YE": "Iemen", - "CX": "Illa Christmas", - "CP": "Illa Clipperton", - "AC": "Illa de l’Ascensió", - "RE": "Illa de la Reunió", - "IM": "Illa de Man", - "HM": "Illa Heard i Illes McDonald", - "AX": "Illes Åland", - "KY": "Illes Caiman", - "IC": "Illes Canàries", - "CC": "Illes Cocos", - "CK": "Illes Cook", - "FO": "Illes Fèroe", - "GS": "Illes Geòrgia del Sud i Sandwich del Sud", - "FK": "Illes Malvines", - "MP": "Illes Mariannes del Nord", - "MH": "Illes Marshall", - "UM": "Illes Perifèriques Menors dels EUA", - "PN": "Illes Pitcairn", - "SB": "Illes Salomó", - "TC": "Illes Turks i Caicos", - "VG": "Illes Verges Britàniques", - "VI": "Illes Verges Nord-americanes", - "IN": "Índia", - "ID": "Indonèsia", - "IR": "Iran", - "IQ": "Iraq", - "IE": "Irlanda", - "IS": "Islàndia", - "IL": "Israel", - "IT": "Itàlia", - "JM": "Jamaica", - "JP": "Japó", - "JE": "Jersey", - "JO": "Jordània", - "KZ": "Kazakhstan", - "KE": "Kenya", - "KG": "Kirguizistan", - "KI": "Kiribati", - "XK": "Kosovo", - "KW": "Kuwait", - "LA": "Laos", - "LS": "Lesotho", - "LV": "Letònia", - "LB": "Líban", - "LR": "Libèria", - "LY": "Líbia", - "LI": "Liechtenstein", - "LT": "Lituània", - "LU": "Luxemburg", - "MO": "Macau (RAE Xina)", - "MK": "Macedònia del Nord", - "MG": "Madagascar", - "MY": "Malàisia", - "MW": "Malawi", - "MV": "Maldives", - "ML": "Mali", - "MT": "Malta", - "MA": "Marroc", - "MQ": "Martinica", - "MU": "Maurici", - "MR": "Mauritània", - "YT": "Mayotte", - "054": "Melanèsia", - "MX": "Mèxic", - "FM": "Micronèsia", - "MZ": "Moçambic", - "MD": "Moldàvia", - "001": "Món", - "MC": "Mònaco", - "MN": "Mongòlia", - "ME": "Montenegro", - "MS": "Montserrat", - "MM": "Myanmar (Birmània)", - "UN": "Nacions Unides", - "NA": "Namíbia", - "NR": "Nauru", - "NP": "Nepal", - "NI": "Nicaragua", - "NE": "Níger", - "NG": "Nigèria", - "NU": "Niue", - "NF": "Norfolk", - "NO": "Noruega", - "NC": "Nova Caledònia", - "NZ": "Nova Zelanda", - "009": "Oceania", - "OM": "Oman", - "NL": "Països Baixos", - "PK": "Pakistan", - "PW": "Palau", - "PA": "Panamà", - "PG": "Papua Nova Guinea", - "PY": "Paraguai", - "PE": "Perú", - "061": "Polinèsia", - "PF": "Polinèsia Francesa", - "PL": "Polònia", - "PT": "Portugal", - "XA": "pseudoaccents", - "XB": "pseudobidi", - "PR": "Puerto Rico", - "QA": "Qatar", - "057": "Regió de la Micronèsia", - "ZZ": "regió desconeguda", - "GB": "Regne Unit", - "CF": "República Centreafricana", - "ZA": "República de Sud-àfrica", - "DO": "República Dominicana", - "RO": "Romania", - "RW": "Ruanda", - "RU": "Rússia", - "EH": "Sàhara Occidental", - "BL": "Saint Barthélemy", - "KN": "Saint Christopher i Nevis", - "SH": "Saint Helena", - "LC": "Saint Lucia", - "MF": "Saint Martin", - "VC": "Saint Vincent i les Grenadines", - "PM": "Saint-Pierre-et-Miquelon", - "WS": "Samoa", - "AS": "Samoa Nord-americana", - "SM": "San Marino", - "ST": "São Tomé i Príncipe", - "SN": "Senegal", - "RS": "Sèrbia", - "SC": "Seychelles", - "SL": "Sierra Leone", - "SG": "Singapur", - "SX": "Sint Maarten", - "SY": "Síria", - "SO": "Somàlia", - "LK": "Sri Lanka", - "SD": "Sudan", - "SS": "Sudan del Sud", - "SE": "Suècia", - "CH": "Suïssa", - "SR": "Surinam", - "SJ": "Svalbard i Jan Mayen", - "TJ": "Tadjikistan", - "TH": "Tailàndia", - "TW": "Taiwan", - "TZ": "Tanzània", - "IO": "Territori Britànic de l’Oceà Índic", - "QO": "Territoris allunyats d’Oceania", - "TF": "Territoris Australs Francesos", - "PS": "Territoris palestins", - "TL": "Timor Oriental", - "TG": "Togo", - "TK": "Tokelau", - "TO": "Tonga", - "TT": "Trinitat i Tobago", - "TA": "Tristan da Cunha", - "TN": "Tunísia", - "TM": "Turkmenistan", - "TR": "Turquia", - "TV": "Tuvalu", - "TD": "Txad", - "CZ": "Txèquia", - "UA": "Ucraïna", - "UG": "Uganda", - "EU": "Unió Europea", - "UY": "Uruguai", - "UZ": "Uzbekistan", - "VU": "Vanuatu", - "VE": "Veneçuela", - "VN": "Vietnam", - "WF": "Wallis i Futuna", - "CL": "Xile", - "CN": "Xina", - "CY": "Xipre", - "ZM": "Zàmbia", - "ZW": "Zimbàbue", - "EZ": "zona euro" -} \ No newline at end of file diff --git a/js/data/locale/ca/ES/unitfmt.json b/js/data/locale/ca/ES/unitfmt.json deleted file mode 100644 index d9e0c8b1b0..0000000000 --- a/js/data/locale/ca/ES/unitfmt.json +++ /dev/null @@ -1,388 +0,0 @@ -{ - "unitfmt": { - "long": { - "times": "", - "g-force": "#{n} força G", - "meter-per-second-squared": "one#{n} metre per segon al quadrat|#{n} metres per segon al quadrat", - "revolution": "one#{n} revolució|#{n} revolucions", - "radian": "one#{n} radiant|#{n} radiants", - "degree": "one#{n} grau|#{n} graus", - "arc-minute": "one#{n} minut d’arc|#{n} minuts d’arc", - "arc-second": "one#{n} segon d’arc|#{n} segons d’arc", - "square-kilometer": "one#{n} quilòmetre quadrat|#{n} quilòmetres quadrats", - "hectare": "one#{n} hectàrea|#{n} hectàrees", - "square-meter": "one#{n} metre quadrat|#{n} metres quadrats", - "square-centimeter": "one#{n} centímetre quadrat|#{n} centímetres quadrats", - "square-mile": "one#{n} milla quadrada|#{n} milles quadrades", - "acre": "one#{n} acre|#{n} acres", - "square-yard": "one#{n} iarda quadrada|#{n} iardes quadrades", - "square-foot": "one#{n} peu quadrat|#{n} peus quadrats", - "square-inch": "one#{n} polzada quadrada|#{n} polzades quadrades", - "dunam": "one#{n} dunam|#{n} dunams", - "karat": "one#{n} quirat|#{n} quirats", - "milligram-per-deciliter": "one#{n} mil·ligram per decilitre|#{n} mil·ligrams per decilitre", - "millimole-per-liter": "one#{n} mil·limol per litre|#{n} mil·limols per litre", - "part-per-million": "one#{n} part per milió|#{n} parts per milió", - "percent": "#{n} per cent", - "permille": "#{n} per mil", - "permyriad": "#{n} per deu mil", - "mole": "one#{n} mol|#{n} mols", - "liter-per-kilometer": "one#{n} litre per quilòmetre|#{n} litres per quilòmetre", - "liter-per-100kilometers": "one#{n} litre per 100 quilòmetres|#{n} litres per 100 quilòmetres", - "mile-per-gallon": "one#{n} milla per galó|#{n} milles per galó", - "mile-per-gallon-imperial": "one#{n} milla per galó imperial|#{n} milles per galó imperial", - "petabyte": "one#{n} petabyte|#{n} petabytes", - "terabyte": "one#{n} terabyte|#{n} terabytes", - "terabit": "one#{n} terabit|#{n} terabits", - "gigabyte": "one#{n} gigabyte|#{n} gigabytes", - "gigabit": "one#{n} gigabit|#{n} gigabits", - "megabyte": "one#{n} megabyte|#{n} megabytes", - "megabit": "one#{n} megabit|#{n} megabits", - "kilobyte": "one#{n} quilobyte|#{n} quilobytes", - "kilobit": "one#{n} quilobit|#{n} quilobits", - "byte": "one#{n} byte|#{n} bytes", - "bit": "one#{n} bit|#{n} bits", - "century": "one#{n} segle|#{n} segles", - "decade": "one#{n} dècada|#{n} dècades", - "year": "one#{n} any|#{n} anys", - "month": "one#{n} mes|#{n} mesos", - "week": "one#{n} setmana|#{n} setmanes", - "day": "one#{n} dia|#{n} dies", - "hour": "one#{n} hora|#{n} hores", - "minute": "one#{n} minut|#{n} minuts", - "second": "one#{n} segon|#{n} segons", - "millisecond": "one#{n} mil·lisegon|#{n} mil·lisegons", - "microsecond": "one#{n} microsegon|#{n} microsegons", - "nanosecond": "one#{n} nanosegon|#{n} nanosegons", - "ampere": "one#{n} ampere|#{n} amperes", - "milliampere": "one#{n} mil·liampere|#{n} mil·liamperes", - "ohm": "one#{n} ohm|#{n} ohms", - "volt": "one#{n} volt|#{n} volts", - "kilocalorie": "one#{n} quilocaloria|#{n} quilocalories", - "calorie": "one#{n} caloria|#{n} calories", - "foodcalorie": "one#{n} quilocaloria|#{n} quilocalories", - "kilojoule": "one#{n} quilojoule|#{n} quilojoules", - "joule": "one#{n} joule|#{n} joules", - "kilowatt-hour": "one#{n} quilowatt hora|#{n} quilowatts hora", - "electronvolt": "one#{n} electró-volt|#{n} electrons-volt", - "british-thermal-unit": "one#{n} unitat tèrmica britànica|#{n} unitats tèrmiques britàniques", - "therm-us": "one#{n} unitat tèrmica americana|#{n} unitats tèrmiques americanes", - "pound-force": "one#{n} lliura de força|#{n} lliures de força", - "newton": "one#{n} newton|#{n} newtons", - "gigahertz": "one#{n} gigahertz|#{n} gigahertzs", - "megahertz": "one#{n} megahertz|#{n} megahertzs", - "kilohertz": "one#{n} quilohertz|#{n} quilohertzs", - "hertz": "one#{n} hertz|#{n} hertzs", - "em": "#{n} em", - "pixel": "one#{n} píxel|#{n} píxels", - "megapixel": "one#{n} megapíxel|#{n} megapíxels", - "pixel-per-centimeter": "one#{n} píxel per centímetre|#{n} píxels per centímetre", - "pixel-per-inch": "one#{n} píxel per polzada|#{n} píxels per polzada", - "dot-per-centimeter": "one#{n} punt per centímetre|#{n} punts per centímetre", - "dot-per-inch": "one#{n} punt per polzada|#{n} punts per polzada", - "kilometer": "one#{n} quilòmetre|#{n} quilòmetres", - "meter": "one#{n} metre|#{n} metres", - "decimeter": "one#{n} decímetre|#{n} decímetres", - "centimeter": "one#{n} centímetre|#{n} centímetres", - "millimeter": "one#{n} mil·límetre|#{n} mil·límetres", - "micrometer": "one#{n} micròmetre|#{n} micròmetres", - "nanometer": "one#{n} nanòmetre|#{n} nanòmetres", - "picometer": "one#{n} picòmetre|#{n} picòmetres", - "mile": "one#{n} milla|#{n} milles", - "yard": "one#{n} iarda|#{n} iardes", - "foot": "one#{n} peu|#{n} peus", - "inch": "one#{n} polzada|#{n} polzades", - "parsec": "one#{n} parsec|#{n} parsecs", - "light-year": "one#{n} any llum|#{n} anys llum", - "astronomical-unit": "one#{n} unitat astronòmica|#{n} unitats astronòmiques", - "furlong": "#{n} fur", - "fathom": "#{n} fth", - "nautical-mile": "one#{n} milla nàutica|#{n} milles nàutiques", - "mile-scandinavian": "one#{n} milla escandinava|#{n} milles escandinaves", - "point": "one#{n} punt|#{n} punts", - "solar-radius": "one#{n} radi solar|#{n} radis solars", - "lux": "one#{n} lux|#{n} luxs", - "solar-luminosity": "one#{n} lluminositat solar|#{n} lluminositats solars", - "metric-ton": "one#{n} tona mètrica|#{n} tones mètriques", - "kilogram": "one#{n} quilogram|#{n} quilograms", - "gram": "one#{n} gram|#{n} grams", - "milligram": "one#{n} mil·ligram|#{n} mil·ligrams", - "microgram": "one#{n} microgram|#{n} micrograms", - "ton": "one#{n} tona|#{n} tones", - "short-ton": "one#{n} tona|#{n} tones", - "stone": "#{n} st", - "pound": "one#{n} lliura|#{n} lliures", - "ounce": "one#{n} unça|#{n} unces", - "ounce-troy": "one#{n} unça troy|#{n} unces troy", - "carat": "one#{n} quirat|#{n} quirats", - "dalton": "one#{n} dalton|#{n} daltons", - "earth-mass": "one#{n} massa de la Terra|#{n} masses de la Terra", - "solar-mass": "one#{n} massa solar|#{n} masses solars", - "gigawatt": "one#{n} gigawatt|#{n} gigawatts", - "megawatt": "one#{n} megawatt|#{n} megawatts", - "kilowatt": "one#{n} quilowatt|#{n} quilowatts", - "watt": "one#{n} watt|#{n} watts", - "milliwatt": "one#{n} mil·liwatt|#{n} mil·liwatts", - "horsepower": "one#{n} cavall de vapor|#{n} cavalls de vapor", - "millimeter-of-mercury": "one#mil·límetre de mercuri|#{n} mil·límetres de mercuri", - "pound-per-square-inch": "one#{n} lliura per polzada quadrada|#{n} lliures per polzada quadrada", - "inch-hg": "one#{n} polzada de mercuri|#{n} polzades de mercuri", - "bar": "one#{n} bar|#{n} bars", - "millibar": "one#{n} mil·libar|#{n} mil·libars", - "atmosphere": "one#{n} atmosfera|#{n} atmosferes", - "pascal": "one#{n} pascal|#{n} pascals", - "hectopascal": "one#{n} hectopascal|#{n} hectopascals", - "kilopascal": "one#{n} quilopascal|#{n} quilopascals", - "megapascal": "one#{n} megapascal|#{n} megapascals", - "kilometer-per-hour": "one#{n} quilòmetre per hora|#{n} quilòmetres per hora", - "meter-per-second": "one#{n} metre per segon|#{n} metres per segon", - "mile-per-hour": "one#{n} milla per hora|#{n} milles per hora", - "knot": "one#{n} nus|#{n} nusos", - "generic": "#{n}°", - "celsius": "one#{n} grau Celsius|#{n} graus Celsius", - "fahrenheit": "one#{n} grau Fahrenheit|#{n} graus Fahrenheit", - "kelvin": "#{n} Kelvin", - "pound-foot": "one#{n} lliura-peu|#{n} lliures-peu", - "newton-meter": "one#{n} newton-metre|#{n} newtons-metre", - "cubic-kilometer": "one#{n} quilòmetre cúbic|#{n} quilòmetres cúbics", - "cubic-meter": "one#{n} metre cúbic|#{n} metres cúbics", - "cubic-centimeter": "one#{n} centímetre cúbic|#{n} centímetres cúbics", - "cubic-mile": "one#{n} milla cúbica|#{n} milles cúbiques", - "cubic-yard": "one#{n} iarda cúbica|#{n} iardes cúbiques", - "cubic-foot": "one#{n} peu cúbic|#{n} peus cúbics", - "cubic-inch": "one#{n} polzada cúbica|#{n} polzades cúbiques", - "megaliter": "one#{n} megalitre|#{n} megalitres", - "hectoliter": "one#{n} hectolitre|#{n} hectolitres", - "liter": "one#{n} litre|#{n} litres", - "deciliter": "one#{n} decilitre|#{n} decilitres", - "centiliter": "one#{n} centilitre|#{n} centilitres", - "milliliter": "one#{n} mil·lilitre|#{n} mil·lilitres", - "pint-metric": "one#{n} pinta mètrica|#{n} pintes mètriques", - "cup-metric": "one#{n} tassa mètrica|#{n} tasses mètriques", - "acre-foot": "one#{n} acre-peu|#{n} acres-peus", - "bushel": "#{n} bu", - "gallon": "one#{n} galó|#{n} galons", - "gallon-imperial": "one#{n} galó imperial|#{n} galons imperials", - "quart": "one#{n} quart|#{n} quarts", - "pint": "one#{n} pinta|#{n} pintes", - "cup": "one#{n} tassa|#{n} tasses", - "fluid-ounce": "one#{n} unça líquida|#{n} unces líquides", - "fluid-ounce-imperial": "one#{n} unça líquida imperial|#{n} unces líquides imperials", - "tablespoon": "one#{n} cullerada|#{n} cullerades", - "teaspoon": "one#{n} culleradeta|#{n} culleradetes", - "barrel": "one#{n} barril|#{n} barrils", - "coordinateUnit": "", - "foot-per-second": "#{n} peus per segon", - "kilometer-per-second": "#{n} quilòmetres per segon", - "mile-per-second": "#{n} milles per segon", - "kilometer-per-liter": "#{n} quilòmetres per litre", - "bit-per-second": "#{n} bits per segon", - "kilobit-per-second": "#{n} quilobits per segon", - "megabit-per-second": "#{n} megabits per segon", - "gigabit-per-second": "#{n} gigabits per segon", - "terabit-per-second": "#{n} terabits per segon", - "byte-per-second": "#{n} bytes per segon", - "kilobyte-per-second": "#{n} quilobytes per segon", - "megabyte-per-second": "#{n} megabytes per segon", - "gigabyte-per-second": "#{n} gigabytes per segon", - "terabyte-per-second": "#{n} terabytes per segon", - "byte-per-hour": "#{n} bytes per hora", - "kilobyte-per-hour": "#{n} quilobytes per hora", - "megabyte-per-hour": "#{n} megabytes per hora", - "gigabyte-per-hour": "#{n} gigabytes per hora", - "terabyte-per-hour": "#{n} terabytes per hora" - }, - "short": { - "times": "", - "g-force": "#{n} G", - "meter-per-second-squared": "#{n} m/s²", - "revolution": "#{n} r", - "radian": "#{n} rad", - "degree": "#{n}°", - "arc-minute": "#{n} arcmin", - "arc-second": "#{n} arcsec", - "square-kilometer": "#{n} km²", - "hectare": "#{n} ha", - "square-meter": "#{n} m²", - "square-centimeter": "#{n} cm²", - "square-mile": "#{n} mi²", - "acre": "#{n} ac", - "square-yard": "#{n} yd²", - "square-foot": "#{n} ft²", - "square-inch": "#{n} in²", - "dunam": "one#{n} dunam|#{n} dunams", - "karat": "#{n} ct", - "milligram-per-deciliter": "#{n} mg/dl", - "millimole-per-liter": "#{n} mM/l", - "part-per-million": "#{n} ppm", - "percent": "#{n} %", - "permille": "#{n} ‰", - "permyriad": "#{n}‱", - "mole": "#{n} mol", - "liter-per-kilometer": "#{n} l/km", - "liter-per-100kilometers": "#{n} l/100 km", - "mile-per-gallon": "#{n} mi/gal", - "mile-per-gallon-imperial": "#{n} mi/gal imp.", - "petabyte": "#{n} PB", - "terabyte": "#{n} TB", - "terabit": "#{n} Tb", - "gigabyte": "#{n} GB", - "gigabit": "#{n} Gb", - "megabyte": "#{n} MB", - "megabit": "#{n} Mbit", - "kilobyte": "#{n} kB", - "kilobit": "#{n} kb", - "byte": "#{n} B", - "bit": "one#{n} bit|#{n} bits", - "century": "one#{n} segle|#{n} segles", - "decade": "#{n} dèc.", - "year": "one#{n} any|#{n} anys", - "month": "one#{n} mes|#{n} mesos", - "week": "#{n} setm.", - "day": "one#{n} dia|#{n} dies", - "hour": "#{n} h", - "minute": "#{n} min", - "second": "#{n} s", - "millisecond": "#{n} ms", - "microsecond": "#{n} μs", - "nanosecond": "#{n} ns", - "ampere": "#{n} A", - "milliampere": "#{n} mA", - "ohm": "#{n} Ω", - "volt": "#{n} V", - "kilocalorie": "#{n} kcal", - "calorie": "#{n} cal", - "foodcalorie": "#{n} kcal", - "kilojoule": "#{n} kJ", - "joule": "#{n} J", - "kilowatt-hour": "#{n} kWh", - "electronvolt": "#{n} eV", - "british-thermal-unit": "#{n} Btu", - "therm-us": "#{n} thm", - "pound-force": "#{n} lbf", - "newton": "#{n} N", - "gigahertz": "#{n} GHz", - "megahertz": "#{n} MHz", - "kilohertz": "#{n} kHz", - "hertz": "#{n} Hz", - "em": "#{n} em", - "pixel": "#{n} px", - "megapixel": "#{n} Mpx", - "pixel-per-centimeter": "#{n} píxels per cm", - "pixel-per-inch": "#{n} PPI", - "dot-per-centimeter": "#{n} ppcm", - "dot-per-inch": "#{n} ppp", - "kilometer": "#{n} km", - "meter": "#{n} m", - "decimeter": "#{n} dm", - "centimeter": "#{n} cm", - "millimeter": "#{n} mm", - "micrometer": "#{n} µm", - "nanometer": "#{n} nm", - "picometer": "#{n} pm", - "mile": "#{n} mi", - "yard": "#{n} yd", - "foot": "#{n} ft", - "inch": "#{n} in", - "parsec": "#{n} pc", - "light-year": "one#{n} any ll.|#{n} anys ll.", - "astronomical-unit": "#{n} ua", - "furlong": "#{n} fur", - "fathom": "#{n} fth", - "nautical-mile": "#{n} NM", - "mile-scandinavian": "#{n} smi", - "point": "#{n} pt", - "solar-radius": "#{n} R☉", - "lux": "#{n} lx", - "solar-luminosity": "#{n} L☉", - "metric-ton": "#{n} t mètr.", - "kilogram": "#{n} kg", - "gram": "#{n} g", - "milligram": "#{n} mg", - "microgram": "#{n} µg", - "ton": "#{n} t", - "short-ton": "#{n} t", - "stone": "#{n} st", - "pound": "#{n} lb", - "ounce": "#{n} oz", - "ounce-troy": "#{n} ozt", - "carat": "#{n} ct", - "dalton": "#{n} Da", - "earth-mass": "#{n} M⊕", - "solar-mass": "#{n} M☉", - "gigawatt": "#{n} GW", - "megawatt": "#{n} MW", - "kilowatt": "#{n} kW", - "watt": "#{n} W", - "milliwatt": "#{n} mW", - "horsepower": "#{n} CV", - "millimeter-of-mercury": "#{n} mmHg", - "pound-per-square-inch": "#{n} psi", - "inch-hg": "#{n} inHg", - "bar": "one#{n} bar|#{n} bars", - "millibar": "#{n} mbar", - "atmosphere": "#{n} atm", - "pascal": "#{n} Pa", - "hectopascal": "#{n} hPa", - "kilopascal": "#{n} kPa", - "megapascal": "#{n} MPa", - "kilometer-per-hour": "#{n} km/h", - "meter-per-second": "#{n} m/s", - "mile-per-hour": "#{n} mi/h", - "knot": "#{n} kn", - "generic": "#{n}°", - "celsius": "#{n} °C", - "fahrenheit": "#{n} °F", - "kelvin": "#{n} K", - "pound-foot": "#{n} lbf⋅ft", - "newton-meter": "#{n} N⋅m", - "cubic-kilometer": "#{n} km³", - "cubic-meter": "#{n} m³", - "cubic-centimeter": "#{n} cm³", - "cubic-mile": "#{n} mi³", - "cubic-yard": "#{n} yd³", - "cubic-foot": "#{n} ft³", - "cubic-inch": "#{n} in³", - "megaliter": "#{n} Ml", - "hectoliter": "#{n} hl", - "liter": "#{n} l", - "deciliter": "#{n} dl", - "centiliter": "#{n} cl", - "milliliter": "#{n} ml", - "pint-metric": "#{n} ptm", - "cup-metric": "#{n} mc", - "acre-foot": "#{n} ac ft", - "bushel": "#{n} bu", - "gallon": "#{n} gal", - "gallon-imperial": "#{n} gal imp.", - "quart": "#{n} qt", - "pint": "#{n} pt", - "cup": "one#{n} tassa|#{n} tasses", - "fluid-ounce": "#{n} fl oz", - "fluid-ounce-imperial": "#{n} fl oz imp.", - "tablespoon": "#{n} cull.", - "teaspoon": "#{n} cdta.", - "barrel": "#{n} bbl", - "coordinateUnit": "", - "foot-per-second": "#{n} ft/s", - "kilometer-per-second": "#{n} km/s", - "mile-per-second": "#{n} mi/s", - "kilometer-per-liter": "#{n} km/l", - "bit-per-second": "#{n} bits/s", - "kilobit-per-second": "#{n} kb/s", - "megabit-per-second": "#{n} Mbit/s", - "gigabit-per-second": "#{n} Gb/s", - "terabit-per-second": "#{n} Tb/s", - "byte-per-second": "#{n} B/s", - "kilobyte-per-second": "#{n} kB/s", - "megabyte-per-second": "#{n} MB/s", - "gigabyte-per-second": "#{n} GB/s", - "terabyte-per-second": "#{n} TB/s", - "byte-per-hour": "#{n} B/h", - "kilobyte-per-hour": "#{n} kB/h", - "megabyte-per-hour": "#{n} MB/h", - "gigabyte-per-hour": "#{n} GB/h", - "terabyte-per-hour": "#{n} TB/h" - } - } -} \ No newline at end of file diff --git a/js/data/locale/gl/dateformats.json b/js/data/locale/gl/dateformats.json index cdc1a66d4f..e1cc67d5a9 100644 --- a/js/data/locale/gl/dateformats.json +++ b/js/data/locale/gl/dateformats.json @@ -120,46 +120,46 @@ "s": "{st} – {et}, {sd}/{sm}/{sy}" }, "c01": { - "f": "{st} do {sd} de {sm} de {sy} – {et} do d de MMMM de yyyy", - "l": "{st} do {sd} de {sm} de {sy} – {et} do d de MMMM de yyyy", - "m": "{st}, {sd} de {sm} de {sy} – {et}, d de MMM de yyyy", - "s": "{st}, {sd}/{sm}/{sy} – {et}, dd/MM/yy" + "f": "{st} do {sd} de {sm} de {sy} – {et} do {ed} de {em} de {ey}", + "l": "{st} do {sd} de {sm} de {sy} – {et} do {ed} de {em} de {ey}", + "m": "{st}, {sd} de {sm} de {sy} – {et}, {ed} de {em} de {ey}", + "s": "{st}, {sd}/{sm}/{sy} – {et}, {ed}/{em}/{ey}" }, "c02": { - "f": "{st} do {sd} de {sm} de {sy} – {et} do d de MMMM de yyyy", - "l": "{st} do {sd} de {sm} de {sy} – {et} do d de MMMM de yyyy", - "m": "{st}, {sd} de {sm} de {sy} – {et}, d de MMM de yyyy", - "s": "{st}, {sd}/{sm}/{sy} – {et}, dd/MM/yy" + "f": "{st} do {sd} de {sm} de {sy} – {et} do {ed} de {em} de {ey}", + "l": "{st} do {sd} de {sm} de {sy} – {et} do {ed} de {em} de {ey}", + "m": "{st}, {sd} de {sm} de {sy} – {et}, {ed} de {em} de {ey}", + "s": "{st}, {sd}/{sm}/{sy} – {et}, {ed}/{em}/{ey}" }, "c03": { - "f": "{st} do {sd} de {sm} de {sy} – {et} do d de MMMM de yyyy", - "l": "{st} do {sd} de {sm} de {sy} – {et} do d de MMMM de yyyy", - "m": "{st}, {sd} de {sm} de {sy} – {et}, d de MMM de yyyy", - "s": "{st}, {sd}/{sm}/{sy} – {et}, dd/MM/yy" + "f": "{st} do {sd} de {sm} de {sy} – {et} do {ed} de {em} de {ey}", + "l": "{st} do {sd} de {sm} de {sy} – {et} do {ed} de {em} de {ey}", + "m": "{st}, {sd} de {sm} de {sy} – {et}, {ed} de {em} de {ey}", + "s": "{st}, {sd}/{sm}/{sy} – {et}, {ed}/{em}/{ey}" }, "c10": { - "f": "{date} – {date}", - "l": "{date} – {date}", - "m": "{date} – {date}", - "s": "{date} – {date}" + "f": "{sd} – {ed} de {em} de {ey}", + "l": "{sd} – {ed} de {em} de {ey}", + "m": "{sd} – {ed} de {em} de {ey}", + "s": "{sd} – {ed}/{em}/{ey}" }, "c11": { - "f": "{date} – {date}", - "l": "{date} – {date}", - "m": "{date} – {date}", - "s": "{date} – {date}" + "f": "{sd} de {sm} – {ed} de {em} de {ey}", + "l": "{sd} de {sm} – {ed} de {em} de {ey}", + "m": "{sd} de {sm} – {ed} de {em} de {ey}", + "s": "{sd}/{sm} – {ed}/{em}/{ey}" }, "c12": { - "f": "d de MMMM de yyyy – {date}", - "l": "d de MMMM de yyyy – {date}", - "m": "d de MMM de yyyy – {date}", - "s": "dd/MM/yy – {date}" + "f": "{sd} de {sm} de {sy} – {ed} de {em} de {ey}", + "l": "{sd} de {sm} de {sy} – {ed} de {em} de {ey}", + "m": "{sd} de {sm} de {sy} – {ed} de {em} de {ey}", + "s": "{sd}/{sm}/{sy} – {ed}/{em}/{ey}" }, "c20": { - "f": "d de MMMM de yyyy – {date}", - "l": "d de MMMM de yyyy – {date}", - "m": "d de MMM de yyyy – {date}", - "s": "dd/MM/yy – {date}" + "f": "{sm} de {sy} – {em} de {ey}", + "l": "{sm} de {sy} – {em} de {ey}", + "m": "{sm} de {sy} – {em} de {ey}", + "s": "{sm}/{sy} – {em}/{ey}" }, "c30": { "f": "{sy} – {ey}", diff --git a/js/data/locale/hy/unitfmt.json b/js/data/locale/hy/unitfmt.json index 832e66593d..6634afa74e 100644 --- a/js/data/locale/hy/unitfmt.json +++ b/js/data/locale/hy/unitfmt.json @@ -385,4 +385,4 @@ "terabyte-per-hour": "#{n} ՏԲ/ժ" } } -} \ No newline at end of file +} diff --git a/js/data/locale/ky/dateformats.json b/js/data/locale/ky/dateformats.json index 662df71b23..7999d42c94 100644 --- a/js/data/locale/ky/dateformats.json +++ b/js/data/locale/ky/dateformats.json @@ -3,40 +3,40 @@ "order": "{date} {time}", "date": { "dmwy": { - "f": "‏yyyy-'ж'., d-MMMM, EEEE", - "l": "‏yyyy-'ж'., d-MMMM, EEE", - "m": "‏yyyy-'ж'., d-MMM, EE", - "s": "‏d/M/yy, E" + "f": "yyyy-'ж'., d-MMMM, EEEE", + "l": "yyyy-'ж'., d-MMMM, EEE", + "m": "yyyy-'ж'., d-MMM, EE", + "s": "d/M/yy, E" }, "dmy": { - "f": "‏yyyy-'ж'., d-MMMM", - "l": "‏yyyy-'ж'., d-MMMM", - "m": "‏yyyy-'ж'., d-MMM", - "s": "‏d/M/yy" + "f": "yyyy-'ж'., d-MMMM", + "l": "yyyy-'ж'., d-MMMM", + "m": "yyyy-'ж'., d-MMM", + "s": "d/M/yy" }, "dmw": { - "f": "‏d-MMMM, EEEE", - "l": "‏d-MMMM, EEE", - "m": "‏d-MMM, EE", - "s": "‏d/M, E" + "f": "d-MMMM, EEEE", + "l": "d-MMMM, EEE", + "m": "d-MMM, EE", + "s": "d/M, E" }, "dm": { - "f": "‏d-MMMM", - "l": "‏d-MMMM", - "m": "‏d-MMM", - "s": "‏d/M" + "f": "d-MMMM", + "l": "d-MMMM", + "m": "d-MMM", + "s": "d/M" }, "my": { - "f": "‏yyyy-'ж'., LLLL", - "l": "‏yyyy-'ж'., LLLL", - "m": "‏yyyy-'ж'., LLL", - "s": "‏M/yy" + "f": "yyyy-'ж'., LLLL", + "l": "yyyy-'ж'., LLLL", + "m": "yyyy-'ж'., LLL", + "s": "M/yy" }, "dw": { - "f": "‏d-EEEE", - "l": "‏d-EEE", - "m": "‏d-EE", - "s": "‏d/E" + "f": "d-EEEE", + "l": "d-EEE", + "m": "d-EE", + "s": "d/E" }, "w": { "f": "EEEE", @@ -80,87 +80,87 @@ "h": "h", "m": "mm", "s": "ss", - "ah": "‏h a", - "hm": "‏h:mm", + "ah": "h a", + "hm": "h:mm", "ms": "mm:ss", - "ahm": "‏h:mm a", - "hms": "‏h:mm:ss", - "hmz": "‏h:mm z", - "ahmz": "‏h:mm a z", - "ahms": "‏h:mm:ss a", - "hmsz": "‏h:mm:ss z", - "ahmsz": "‏h:mm:ss a z" + "ahm": "h:mm a", + "hms": "h:mm:ss", + "hmz": "h:mm z", + "ahmz": "h:mm a z", + "ahms": "h:mm:ss a", + "hmsz": "h:mm:ss z", + "ahmsz": "h:mm:ss a z" }, "24": { "h": "HH", "m": "mm", "s": "ss", - "ah": "‏HH", - "hm": "‏HH:mm", + "ah": "HH", + "hm": "HH:mm", "ms": "mm:ss", - "ahm": "‏HH:mm", - "hms": "‏HH:mm:ss", - "hmz": "‏HH:mm z", - "ahmz": "‏HH:mm z", - "ahms": "‏HH:mm:ss", - "hmsz": "‏HH:mm:ss z", - "ahmsz": "‏HH:mm:ss z" + "ahm": "HH:mm", + "hms": "HH:mm:ss", + "hmz": "HH:mm z", + "ahmz": "HH:mm z", + "ahms": "HH:mm:ss", + "hmsz": "HH:mm:ss z", + "ahmsz": "HH:mm:ss z" } }, "range": { "c00": { - "f": "‏{sy}-ж., {sd}-{sm} {st} – {et}", - "l": "‏{sy}-ж., {sd}-{sm} {st} – {et}", - "m": "‏{sy}-ж., {sd}-{sm} {st} – {et}", - "s": "‏{sd}/{sm}/{sy} {st} – {et}" + "f": "{sy}-ж., {sd}-{sm} {st} – {et}", + "l": "{sy}-ж., {sd}-{sm} {st} – {et}", + "m": "{sy}-ж., {sd}-{sm} {st} – {et}", + "s": "{sd}/{sm}/{sy} {st} – {et}" }, "c01": { - "f": "‏{sy}-ж., {sd}-{sm} {st} – ‏{ey}-ж., {ed}-{em} {et}", - "l": "‏{sy}-ж., {sd}-{sm} {st} – ‏{ey}-ж., {ed}-{em} {et}", - "m": "‏{sy}-ж., {sd}-{sm} {st} – ‏{ey}-ж., {ed}-{em} {et}", - "s": "‏{sd}/{sm}/{sy} {st} – ‏{ed}/{em}/{ey} {et}" + "f": "{sy}-ж., {sd}-{sm} {st} – {ey}-ж., {ed}-{em} {et}", + "l": "{sy}-ж., {sd}-{sm} {st} – {ey}-ж., {ed}-{em} {et}", + "m": "{sy}-ж., {sd}-{sm} {st} – {ey}-ж., {ed}-{em} {et}", + "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}" }, "c02": { - "f": "‏{sy}-ж., {sd}-{sm} {st} – ‏{ey}-ж., {ed}-{em} {et}", - "l": "‏{sy}-ж., {sd}-{sm} {st} – ‏{ey}-ж., {ed}-{em} {et}", - "m": "‏{sy}-ж., {sd}-{sm} {st} – ‏{ey}-ж., {ed}-{em} {et}", - "s": "‏{sd}/{sm}/{sy} {st} – ‏{ed}/{em}/{ey} {et}" + "f": "{sy}-ж., {sd}-{sm} {st} – {ey}-ж., {ed}-{em} {et}", + "l": "{sy}-ж., {sd}-{sm} {st} – {ey}-ж., {ed}-{em} {et}", + "m": "{sy}-ж., {sd}-{sm} {st} – {ey}-ж., {ed}-{em} {et}", + "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}" }, "c03": { - "f": "‏{sy}-ж., {sd}-{sm} {st} – ‏{ey}-ж., {ed}-{em} {et}", - "l": "‏{sy}-ж., {sd}-{sm} {st} – ‏{ey}-ж., {ed}-{em} {et}", - "m": "‏{sy}-ж., {sd}-{sm} {st} – ‏{ey}-ж., {ed}-{em} {et}", - "s": "‏{sd}/{sm}/{sy} {st} – ‏{ed}/{em}/{ey} {et}" + "f": "{sy}-ж., {sd}-{sm} {st} – {ey}-ж., {ed}-{em} {et}", + "l": "{sy}-ж., {sd}-{sm} {st} – {ey}-ж., {ed}-{em} {et}", + "m": "{sy}-ж., {sd}-{sm} {st} – {ey}-ж., {ed}-{em} {et}", + "s": "{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}" }, "c10": { - "f": "‏{sy}-ж., {sd}-{sm} – ‏{ed}-{em}", - "l": "‏{sy}-ж., {sd}-{sm} – ‏{ed}-{em}", - "m": "‏{sy}-ж., {sd}-{sm} – ‏{ed}-{em}", - "s": "‏{sd} – ‏{ed}/{em}/{ey}" + "f": "{sy}-ж., {sd}-{sm} – {ed}-{em}", + "l": "{sy}-ж., {sd}-{sm} – {ed}-{em}", + "m": "{sy}-ж., {sd}-{sm} – {ed}-{em}", + "s": "{sd} – {ed}/{em}/{ey}" }, "c11": { - "f": "‏{sy}-ж., {sd}-{sm} – ‏{ey}-ж., {ed}-{em}", - "l": "‏{sy}-ж., {sd}-{sm} – ‏{ey}-ж., {ed}-{em}", - "m": "‏{sy}-ж., {sd}-{sm} – ‏{ey}-ж., {ed}-{em}", - "s": "‏{sd}/{sm} – ‏{ed}/{em}/{ey}" + "f": "{sy}-ж., {sd}-{sm} – {ey}-ж., {ed}-{em}", + "l": "{sy}-ж., {sd}-{sm} – {ey}-ж., {ed}-{em}", + "m": "{sy}-ж., {sd}-{sm} – {ey}-ж., {ed}-{em}", + "s": "{sd}/{sm} – {ed}/{em}/{ey}" }, "c12": { - "f": "‏{sy}-ж., {sd}-{sm} – ‏{ey}-ж., {ed}-{em}", - "l": "‏{sy}-ж., {sd}-{sm} – ‏{ey}-ж., {ed}-{em}", - "m": "‏{sy}-ж., {sd}-{sm} – ‏{ey}-ж., {ed}-{em}", - "s": "‏{sd}/{sm}/{sy} – ‏{ed}/{em}/{ey}" + "f": "{sy}-ж., {sd}-{sm} – {ey}-ж., {ed}-{em}", + "l": "{sy}-ж., {sd}-{sm} – {ey}-ж., {ed}-{em}", + "m": "{sy}-ж., {sd}-{sm} – {ey}-ж., {ed}-{em}", + "s": "{sd}/{sm}/{sy} – {ed}/{em}/{ey}" }, "c20": { - "f": "‏{sy}-ж., {sm} – ‏{ey}-ж., {em}", - "l": "‏{sy}-ж., {sm} – ‏{ey}-ж., {em}", - "m": "‏{sy}-ж., {sm} – ‏{ey}-ж., {em}", - "s": "‏{sm}/{sy} – ‏{em}/{ey}" + "f": "{sy}-ж., {sm} – {ey}-ж., {em}", + "l": "{sy}-ж., {sm} – {ey}-ж., {em}", + "m": "{sy}-ж., {sm} – {ey}-ж., {em}", + "s": "{sm}/{sy} – {em}/{ey}" }, "c30": { - "f": "‏{sy} – {ey}", - "l": "‏{sy} – {ey}", - "m": "‏{sy} – {ey}", - "s": "‏{sy} – {ey}" + "f": "{sy} – {ey}", + "l": "{sy} – {ey}", + "m": "{sy} – {ey}", + "s": "{sy} – {ey}" } } } diff --git a/js/data/locale/ky/scripts.jf b/js/data/locale/ky/scripts.jf index e7638ec9e0..9a7500e3e6 100644 --- a/js/data/locale/ky/scripts.jf +++ b/js/data/locale/ky/scripts.jf @@ -1,7 +1,7 @@ { "scripts": [ - "Arab", "Cyrl", + "Arab", "Latn" ], "generated": true diff --git a/js/data/locale/ky/sysres.json b/js/data/locale/ky/sysres.json index 4430e14c1f..11dc15ec70 100644 --- a/js/data/locale/ky/sysres.json +++ b/js/data/locale/ky/sysres.json @@ -187,48 +187,48 @@ "#{num}w": "one#{num} ап|#{num} ап", "durationShortMonths": "one#{num} ай|#{num} ай", "#{num}y": "one#{num} ж.|#{num} ж.", - "1#in 1 second|#in {num} seconds": "one#‏{num} секунддан кийин|#‏{num} секунддан кийин", - "1#in 1 minute|#in {num} minutes": "one#‏{num} мүнөттөн кийин|#‏{num} мүнөттөн кийин", - "1#in 1 hour|#in {num} hours": "one#‏{num} сааттан кийин|#‏{num} сааттан кийин", - "1#in 1 day|#in {num} days": "one#‏{num} күндөн кийин|#‏{num} күндөн кийин", - "1#in 1 week|#in {num} weeks": "one#‏{num} аптадан кийин|#‏{num} аптадан кийин", - "1#in 1 month|#in {num} months": "one#‏{num} айдан кийин|#‏{num} айдан кийин", - "1#in 1 year|#in {num} years": "one#‏{num} жылдан кийин|#‏{num} жылдан кийин", - "1#in 1 sec|#in {num} sec": "one#‏{num} секунддан кийин|#‏{num} секунддан кийин", - "1#in 1 min|#in {num} min": "one#‏{num} мүнөттөн кийин|#‏{num} мүнөттөн кийин", - "1#in 1 hr|#in {num} hrs": "one#‏{num} сааттан кийин|#‏{num} сааттан кийин", - "1#in 1 dy|#in {num} dys": "one#‏{num} күндөн кийин|#‏{num} күндөн кийин", - "1#in 1 wk|#in {num} wks": "one#‏{num} аптадан кийин|#‏{num} аптадан кийин", - "1#in 1 mon|#in {num} mons": "one#‏{num} айдан кийин|#‏{num} айдан кийин", - "1#in 1 yr|#in {num} yrs": "one#‏{num} жылдан кийин|#‏{num} жылдан кийин", - "#in {num}s": "one#‏{num} сек. кийин|#‏{num} сек. кийин", - "#in {num}mi": "one#‏{num} мүн. кийин|#‏{num} мүн. кийин", - "#in {num}h": "one#‏{num} саат. кийин|#‏{num} саат. кийин", - "#in {num}d": "one#‏{num} күн. кийин|#‏{num} күн. кийин", - "#in {num}w": "one#‏{num} апт. кийин|#‏{num} апт. кийин", - "#in {num}mo": "one#‏{num} айд. кийин|#‏{num} айд. кийин", - "#in {num}y": "one#‏{num} жыл. кийин|#‏{num} жыл. кийин", - "1#1 second ago|#{num} seconds ago": "one#‏{num} секунд мурун|#‏{num} секунд мурун", - "1#1 minute ago|#{num} minutes ago": "one#‏{num} мүнөт мурун|#‏{num} мүнөт мурун", - "1#1 hour ago|#{num} hours ago": "one#‏{num} саат мурун|#‏{num} саат мурун", - "1#1 day ago|#{num} days ago": "one#‏{num} күн мурун|#‏{num} күн мурун", - "1#1 week ago|#{num} weeks ago": "one#‏{num} апта мурун|#‏{num} апта мурун", - "1#1 month ago|#{num} months ago": "one#‏{num} ай мурун|#‏{num} ай мурун", - "1#1 year ago|#{num} years ago": "one#‏{num} жыл мурун|#‏{num} жыл мурун", - "1#1 sec ago|#{num} sec ago": "one#‏{num} секунд мурун|#‏{num} секунд мурун", - "1#1 min ago|#{num} min ago": "one#‏{num} мүнөт мурун|#‏{num} мүнөт мурун", - "1#1 hr ago|#{num} hrs ago": "one#‏{num} саат мурун|#‏{num} саат мурун", - "1#1 dy ago|#{num} dys ago": "one#‏{num} күн мурун|#‏{num} күн мурун", - "1#1 wk ago|#{num} wks ago": "one#‏{num} апта мурун|#‏{num} апта мурун", - "1#1 mon ago|#{num} mons ago": "one#‏{num} ай мурун|#‏{num} ай мурун", - "1#1 yr ago|#{num} yrs ago": "one#‏{num} жыл мурун|#‏{num} жыл мурун", - "#{num}s ago": "one#‏{num} сек. мурун|#‏{num} сек. мурун", - "#{num}mi ago": "one#‏{num} мүн. мурун|#‏{num} мүн. мурун", - "#{num}h ago": "one#‏{num} саат. мурун|#‏{num} саат. мурун", - "#{num}d ago": "one#‏{num} күн мурун|#‏{num} күн мурун", - "#{num}w ago": "one#‏{num} апт. мурун|#‏{num} апт. мурун", - "#{num}mo ago": "one#‏{num} ай мурун|#‏{num} ай мурун", - "#{num}y ago": "one#‏{num} жыл мурун|#‏{num} жыл мурун", + "1#in 1 second|#in {num} seconds": "one#{num} секунддан кийин|#{num} секунддан кийин", + "1#in 1 minute|#in {num} minutes": "one#{num} мүнөттөн кийин|#{num} мүнөттөн кийин", + "1#in 1 hour|#in {num} hours": "one#{num} сааттан кийин|#{num} сааттан кийин", + "1#in 1 day|#in {num} days": "one#{num} күндөн кийин|#{num} күндөн кийин", + "1#in 1 week|#in {num} weeks": "one#{num} аптадан кийин|#{num} аптадан кийин", + "1#in 1 month|#in {num} months": "one#{num} айдан кийин|#{num} айдан кийин", + "1#in 1 year|#in {num} years": "one#{num} жылдан кийин|#{num} жылдан кийин", + "1#in 1 sec|#in {num} sec": "one#{num} секунддан кийин|#{num} секунддан кийин", + "1#in 1 min|#in {num} min": "one#{num} мүнөттөн кийин|#{num} мүнөттөн кийин", + "1#in 1 hr|#in {num} hrs": "one#{num} сааттан кийин|#{num} сааттан кийин", + "1#in 1 dy|#in {num} dys": "one#{num} күндөн кийин|#{num} күндөн кийин", + "1#in 1 wk|#in {num} wks": "one#{num} аптадан кийин|#{num} аптадан кийин", + "1#in 1 mon|#in {num} mons": "one#{num} айдан кийин|#{num} айдан кийин", + "1#in 1 yr|#in {num} yrs": "one#{num} жылдан кийин|#{num} жылдан кийин", + "#in {num}s": "one#{num} сек. кийин|#{num} сек. кийин", + "#in {num}mi": "one#{num} мүн. кийин|#{num} мүн. кийин", + "#in {num}h": "one#{num} саат. кийин|#{num} саат. кийин", + "#in {num}d": "one#{num} күн. кийин|#{num} күн. кийин", + "#in {num}w": "one#{num} апт. кийин|#{num} апт. кийин", + "#in {num}mo": "one#{num} айд. кийин|#{num} айд. кийин", + "#in {num}y": "one#{num} жыл. кийин|#{num} жыл. кийин", + "1#1 second ago|#{num} seconds ago": "one#{num} секунд мурун|#{num} секунд мурун", + "1#1 minute ago|#{num} minutes ago": "one#{num} мүнөт мурун|#{num} мүнөт мурун", + "1#1 hour ago|#{num} hours ago": "one#{num} саат мурун|#{num} саат мурун", + "1#1 day ago|#{num} days ago": "one#{num} күн мурун|#{num} күн мурун", + "1#1 week ago|#{num} weeks ago": "one#{num} апта мурун|#{num} апта мурун", + "1#1 month ago|#{num} months ago": "one#{num} ай мурун|#{num} ай мурун", + "1#1 year ago|#{num} years ago": "one#{num} жыл мурун|#{num} жыл мурун", + "1#1 sec ago|#{num} sec ago": "one#{num} секунд мурун|#{num} секунд мурун", + "1#1 min ago|#{num} min ago": "one#{num} мүнөт мурун|#{num} мүнөт мурун", + "1#1 hr ago|#{num} hrs ago": "one#{num} саат мурун|#{num} саат мурун", + "1#1 dy ago|#{num} dys ago": "one#{num} күн мурун|#{num} күн мурун", + "1#1 wk ago|#{num} wks ago": "one#{num} апта мурун|#{num} апта мурун", + "1#1 mon ago|#{num} mons ago": "one#{num} ай мурун|#{num} ай мурун", + "1#1 yr ago|#{num} yrs ago": "one#{num} жыл мурун|#{num} жыл мурун", + "#{num}s ago": "one#{num} сек. мурун|#{num} сек. мурун", + "#{num}mi ago": "one#{num} мүн. мурун|#{num} мүн. мурун", + "#{num}h ago": "one#{num} саат. мурун|#{num} саат. мурун", + "#{num}d ago": "one#{num} күн мурун|#{num} күн мурун", + "#{num}w ago": "one#{num} апт. мурун|#{num} апт. мурун", + "#{num}mo ago": "one#{num} ай мурун|#{num} ай мурун", + "#{num}y ago": "one#{num} жыл мурун|#{num} жыл мурун", "separatorFull": ", ", "finalSeparatorFull": ", ", "separatorLong": ", ", diff --git a/js/data/locale/my/dateformats.json b/js/data/locale/my/dateformats.json index d58c81f758..c7372d3327 100644 --- a/js/data/locale/my/dateformats.json +++ b/js/data/locale/my/dateformats.json @@ -68,31 +68,31 @@ "h": "h", "m": "mm", "s": "ss", - "ah": "B h", - "hm": "B h:mm", + "ah": "a h", + "hm": "a h:mm", "ms": "mm:ss", - "ahm": "hB h:mm", - "hms": "B h:mm:ss", - "hmz": "z B h:mm", - "ahmz": "z hB h:mm", - "ahms": "hB h:mm:ss", - "hmsz": "z B h:mm:ss", - "ahmsz": "z hB h:mm:ss" + "ahm": "a h:mm", + "hms": "a h:mm:ss", + "hmz": "z a h:mm", + "ahmz": "z a h:mm", + "ahms": "a h:mm:ss", + "hmsz": "z a h:mm:ss", + "ahmsz": "z a h:mm:ss" }, "24": { "h": "HH", "m": "mm", "s": "ss", "ah": "HH", - "hm": "B H:mm", + "hm": "H:mm", "ms": "mm:ss", - "ahm": "B H:mm", - "hms": "B HH:mm:ss", - "hmz": "z B H:mm", - "ahmz": "z B H:mm", - "ahms": "B HH:mm:ss", - "hmsz": "z B HH:mm:ss", - "ahmsz": "z B HH:mm:ss" + "ahm": "H:mm", + "hms": "HH:mm:ss", + "hmz": "z H:mm", + "ahmz": "z H:mm", + "ahms": "HH:mm:ss", + "hmsz": "z HH:mm:ss", + "ahmsz": "z HH:mm:ss" } }, "range": { @@ -152,4 +152,4 @@ } } } -} \ No newline at end of file +} diff --git a/js/data/locale/und/MM/timezone.jf b/js/data/locale/und/MM/timezone.jf index 49943b650c..130cfa14b5 100644 --- a/js/data/locale/und/MM/timezone.jf +++ b/js/data/locale/und/MM/timezone.jf @@ -1 +1 @@ -{"timezone": "Asia/Rangoon"} +{"timezone": "Asia/Yangon"} diff --git a/js/data/locale/zoneinfo/Africa/Casablanca.json b/js/data/locale/zoneinfo/Africa/Casablanca.json index b216957835..7d38000603 100644 --- a/js/data/locale/zoneinfo/Africa/Casablanca.json +++ b/js/data/locale/zoneinfo/Africa/Casablanca.json @@ -1,7 +1,7 @@ { "e": { "m": 5, - "r": "24", + "r": "31", "t": "2:0" }, "f": "+01/+00", diff --git a/js/data/locale/zoneinfo/Africa/El_Aaiun.json b/js/data/locale/zoneinfo/Africa/El_Aaiun.json index 84cafccbd1..31d603ed64 100644 --- a/js/data/locale/zoneinfo/Africa/El_Aaiun.json +++ b/js/data/locale/zoneinfo/Africa/El_Aaiun.json @@ -1,7 +1,7 @@ { "e": { "m": 5, - "r": "24", + "r": "31", "t": "2:0" }, "f": "+01/+00", diff --git a/js/data/locale/zoneinfo/America/Dawson.json b/js/data/locale/zoneinfo/America/Dawson.json index aeb4e2ec1c..10e3ae118d 100644 --- a/js/data/locale/zoneinfo/America/Dawson.json +++ b/js/data/locale/zoneinfo/America/Dawson.json @@ -1,19 +1,6 @@ { - "e": { - "c": "S", - "m": 11, - "r": "0>1", - "t": "2:0" - }, - "f": "P{c}T", - "o": "-8:0", - "s": { - "c": "D", - "m": 3, - "r": "0>8", - "t": "2:0", - "v": "1:0" - }, + "f": "MST", + "o": "-7:0", "c": "CA", "n": "Pacific {c} Time" } \ No newline at end of file diff --git a/js/data/locale/zoneinfo/America/Nuuk.json b/js/data/locale/zoneinfo/America/Nuuk.json new file mode 100644 index 0000000000..c84d78469e --- /dev/null +++ b/js/data/locale/zoneinfo/America/Nuuk.json @@ -0,0 +1,18 @@ +{ + "e": { + "m": 10, + "r": "l6", + "t": "23:0" + }, + "f": "-03/-02", + "o": "-3:0", + "s": { + "c": "S", + "m": 3, + "r": "l6", + "t": "22:0", + "v": "1:0" + }, + "c": "GL", + "n": "Greenland {c} Time" +} \ No newline at end of file diff --git a/js/data/locale/zoneinfo/America/Whitehorse.json b/js/data/locale/zoneinfo/America/Whitehorse.json index aeb4e2ec1c..10e3ae118d 100644 --- a/js/data/locale/zoneinfo/America/Whitehorse.json +++ b/js/data/locale/zoneinfo/America/Whitehorse.json @@ -1,19 +1,6 @@ { - "e": { - "c": "S", - "m": 11, - "r": "0>1", - "t": "2:0" - }, - "f": "P{c}T", - "o": "-8:0", - "s": { - "c": "D", - "m": 3, - "r": "0>8", - "t": "2:0", - "v": "1:0" - }, + "f": "MST", + "o": "-7:0", "c": "CA", "n": "Pacific {c} Time" } \ No newline at end of file diff --git a/js/data/locale/zoneinfo/Canada/Yukon.json b/js/data/locale/zoneinfo/Canada/Yukon.json index e1e3a13f2c..9832f61f9e 100644 --- a/js/data/locale/zoneinfo/Canada/Yukon.json +++ b/js/data/locale/zoneinfo/Canada/Yukon.json @@ -1,18 +1,5 @@ { - "e": { - "c": "S", - "m": 11, - "r": "0>1", - "t": "2:0" - }, - "f": "P{c}T", - "o": "-8:0", - "s": { - "c": "D", - "m": 3, - "r": "0>8", - "t": "2:0", - "v": "1:0" - }, + "f": "MST", + "o": "-7:0", "c": "CA" } \ No newline at end of file diff --git a/js/data/locale/zoneinfo/zonetab.json b/js/data/locale/zoneinfo/zonetab.json index 5158eaa441..69c1230ec8 100644 --- a/js/data/locale/zoneinfo/zonetab.json +++ b/js/data/locale/zoneinfo/zonetab.json @@ -387,6 +387,7 @@ "GL": [ "America/Danmarkshavn", "America/Godthab", + "America/Nuuk", "America/Scoresbysund", "America/Thule" ], diff --git a/js/lib/AsyncNodeLoader.js b/js/lib/AsyncNodeLoader.js index 29a275daaa..30837b5eff 100644 --- a/js/lib/AsyncNodeLoader.js +++ b/js/lib/AsyncNodeLoader.js @@ -2,7 +2,7 @@ * AsyncAsyncNodeLoader.js - Loader implementation for nodejs with asynchronous calls. * Mostly this is used for testing the async calls * - * Copyright © 2018, JEDLSoft + * Copyright © 2018, 2020 JEDLSoft * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ module.exports = function (ilib) { Loader = require("./Loader.js"); var AsyncNodeLoader = function (ilib) { - // util.print("new common AsyncNodeLoader instance\n"); + // console.log("new common AsyncNodeLoader instance"); this.parent.call(this, ilib); @@ -44,8 +44,8 @@ module.exports = function (ilib) { path.join(path.dirname(module.filename), "..") : this.root; - //console.log("module.filename is " + module.filename + "\n"); - //console.log("base is defined as " + this.base + "\n"); + //console.log("module.filename is " + module.filename); + //console.log("base is defined as " + this.base); // this.includePath.push(path.join(this.root, "resources")); this._exists(this.root, "resources"); // always check the application's resources dir first diff --git a/js/lib/Loader.js b/js/lib/Loader.js index 9cdb5598b7..e3d7f808ee 100644 --- a/js/lib/Loader.js +++ b/js/lib/Loader.js @@ -98,7 +98,7 @@ Loader.prototype.loadFiles = function(paths, sync, params, callback, root) { return; } - //console.log("generic loader: attempting to load these files: " + JSON.stringify(paths) + "\n"); + //console.log("generic loader: attempting to load these files: " + JSON.stringify(paths)); if (sync) { var ret = []; diff --git a/js/lib/NodeLoader.js b/js/lib/NodeLoader.js index 5b2b6392e1..ed21af38a9 100644 --- a/js/lib/NodeLoader.js +++ b/js/lib/NodeLoader.js @@ -1,7 +1,7 @@ /* * NodeLoader.js - Loader implementation for nodejs * - * Copyright © 2015, JEDLSoft + * Copyright © 2015, 2020 JEDLSoft * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ module.exports = function (ilib) { Loader = require("./Loader.js"); var NodeLoader = function (ilib) { - // util.print("new common NodeLoader instance\n"); + // console.log("new common NodeLoader instance"); this.parent.call(this, ilib); @@ -43,8 +43,8 @@ module.exports = function (ilib) { path.join(path.dirname(module.filename), "..") : this.root; - //console.log("module.filename is " + module.filename + "\n"); - //console.log("base is defined as " + this.base + "\n"); + //console.log("module.filename is " + module.filename); + //console.log("base is defined as " + this.base); // this.includePath.push(path.join(this.root, "resources")); // always check the application's resources dir first this._exists(this.root, "resources"); // always check the application's resources dir first diff --git a/js/lib/ResBundle.js b/js/lib/ResBundle.js index be4e814f62..9f89c33b7c 100644 --- a/js/lib/ResBundle.js +++ b/js/lib/ResBundle.js @@ -250,8 +250,12 @@ var ResBundle = function (options) { if (typeof(options.loadParams) !== 'undefined') { this.loadParams = options.loadParams; - if (typeof (options.loadParams.root) !== 'undefined') { - this.path = options.loadParams.root; + if (!this.path) { + if (typeof (options.loadParams.root) !== 'undefined') { + this.path = options.loadParams.root; + } else if (typeof (options.loadParams.base) !== 'undefined') { + this.path = options.loadParams.base; + } } } if (typeof(options.missing) !== 'undefined') { diff --git a/js/lib/WebLoader.js b/js/lib/WebLoader.js index 0a8e82013c..6a86e899c9 100644 --- a/js/lib/WebLoader.js +++ b/js/lib/WebLoader.js @@ -31,7 +31,7 @@ var Locale = require("./Locale.js"); * @private */ var WebLoader = function(ilib, sync, onLoad) { - //console.log("new WebLoader instance\n"); + //console.log("new WebLoader instance"); this.parent.call(this, ilib); diff --git a/js/lib/WebpackLoader.js b/js/lib/WebpackLoader.js index 4b1ff9018f..a0c93f65dc 100644 --- a/js/lib/WebpackLoader.js +++ b/js/lib/WebpackLoader.js @@ -1,7 +1,7 @@ /* * WebpackLoader.js - Loader implementation for webpack'ed ilib on the web * - * Copyright © 2018, JEDLSoft + * Copyright © 2018, 2020 JEDLSoft * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,7 +54,7 @@ function loadLocaleData(ilib, locale, callback) { */ module.exports = function (ilib) { var WebpackLoader = function (ilib) { - // util.print("new common WebpackLoader instance\n"); + // console.log("new common WebpackLoader instance"); this.parent.call(this, ilib); this.ilib = ilib; diff --git a/js/test/calendar/testtimezoneasync.js b/js/test/calendar/testtimezoneasync.js index 132bb9c706..32e09d9348 100644 --- a/js/test/calendar/testtimezoneasync.js +++ b/js/test/calendar/testtimezoneasync.js @@ -1,7 +1,7 @@ /* * testtimezoneasync.js - test the timezone objects asynchronously * - * Copyright © 2015,2017-2018, JEDLSoft + * Copyright © 2015,2017-2018,2020 JEDLSoft * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ module.exports.testtimezoneasync = { test.ok(typeof(zones) !== "undefined"); //var util = require("util"); - //util.print("ilib._load is " + util.inspect(ilib._load) + "\n"); + //console.log("ilib._load is " + util.inspect(ilib._load)); test.contains(zones, "Europe/London"); test.contains(zones, "America/Los_Angeles"); test.contains(zones, "Australia/Sydney"); diff --git a/js/test/date/testDayOfWeek.js b/js/test/date/testDayOfWeek.js index 0aa7c5b75a..e5d595f743 100644 --- a/js/test/date/testDayOfWeek.js +++ b/js/test/date/testDayOfWeek.js @@ -1968,5 +1968,105 @@ module.exports.testweekdata = { test.equal(info.getWeekEndStart(), 6); test.equal(info.getWeekEndEnd(), 0); test.done(); + }, + testWeekData_be_BY: function(test) { + test.expect(4); + var info = new LocaleInfo("be-BY"); + test.ok(info !== null); + + test.equal(info.getFirstDayOfWeek(), 1); + test.equal(info.getWeekEndStart(), 6); + test.equal(info.getWeekEndEnd(), 0); + test.done(); + }, + testWeekData_lo_LA: function(test) { + test.expect(4); + var info = new LocaleInfo("lo-LA"); + test.ok(info !== null); + + test.equal(info.getFirstDayOfWeek(), 0); + test.equal(info.getWeekEndStart(), 6); + test.equal(info.getWeekEndEnd(), 0); + test.done(); + }, + testWeekData_ky_KG: function(test) { + test.expect(4); + var info = new LocaleInfo("ky-KG"); + test.ok(info !== null); + + test.equal(info.getFirstDayOfWeek(), 1); + test.equal(info.getWeekEndStart(), 6); + test.equal(info.getWeekEndEnd(), 0); + test.done(); + }, + testWeekData_ca_AD: function(test) { + test.expect(4); + var info = new LocaleInfo("ca-AD"); + test.ok(info !== null); + + test.equal(info.getFirstDayOfWeek(), 1); + test.equal(info.getWeekEndStart(), 6); + test.equal(info.getWeekEndEnd(), 0); + test.done(); + }, + testWeekData_ca_ES: function(test) { + test.expect(4); + var info = new LocaleInfo("ca-ES"); + test.ok(info !== null); + + test.equal(info.getFirstDayOfWeek(), 1); + test.equal(info.getWeekEndStart(), 6); + test.equal(info.getWeekEndEnd(), 0); + test.done(); + }, + testWeekData_hy_AM: function(test) { + test.expect(4); + var info = new LocaleInfo("hy-AM"); + test.ok(info !== null); + + test.equal(info.getFirstDayOfWeek(), 1); + test.equal(info.getWeekEndStart(), 6); + test.equal(info.getWeekEndEnd(), 0); + test.done(); + }, + testWeekData_gl_ES: function(test) { + test.expect(4); + var info = new LocaleInfo("gl-ES"); + test.ok(info !== null); + + test.equal(info.getFirstDayOfWeek(), 1); + test.equal(info.getWeekEndStart(), 6); + test.equal(info.getWeekEndEnd(), 0); + test.done(); + }, + testWeekData_eu_ES: function(test) { + test.expect(4); + var info = new LocaleInfo("eu-ES"); + test.ok(info !== null); + + test.equal(info.getFirstDayOfWeek(), 1); + test.equal(info.getWeekEndStart(), 6); + test.equal(info.getWeekEndEnd(), 0); + test.done(); + }, + testWeekData_my_MM: function(test) { + test.expect(4); + var info = new LocaleInfo("my-MM"); + test.ok(info !== null); + + test.equal(info.getFirstDayOfWeek(), 0); + test.equal(info.getWeekEndStart(), 6); + test.equal(info.getWeekEndEnd(), 0); + test.done(); + }, + testWeekData_ne_NP: function(test) { + test.expect(4); + var info = new LocaleInfo("ne-NP"); + test.ok(info !== null); + + test.equal(info.getFirstDayOfWeek(), 0); + test.equal(info.getWeekEndStart(), 6); + test.equal(info.getWeekEndEnd(), 0); + test.done(); } } diff --git a/js/test/date/testMeridiems.js b/js/test/date/testMeridiems.js index 44fb518658..dfd97c6fcb 100644 --- a/js/test/date/testMeridiems.js +++ b/js/test/date/testMeridiems.js @@ -1972,6 +1972,102 @@ module.exports.testmeridiems = { test.equal(fmt[0].name, "AM"); test.equal(fmt[1].name, "PM"); + test.done(); + }, + testMeridiem_be_BY: function(test) { + test.expect(3); + var fmt = DateFmt.getMeridiemsRange({locale:"be-BY"}); + test.ok(fmt !== null); + + test.equal(fmt[0].name, "AM"); + test.equal(fmt[1].name, "PM"); + test.done(); + }, + testMeridiem_lo_LA: function(test) { + test.expect(3); + var fmt = DateFmt.getMeridiemsRange({locale:"lo-LA"}); + test.ok(fmt !== null); + + test.equal(fmt[0].name, "ກ່ອນທ່ຽງ"); + test.equal(fmt[1].name, "ຫຼັງທ່ຽງ"); + + test.done(); + }, + testMeridiem_ky_KG: function(test) { + test.expect(3); + var fmt = DateFmt.getMeridiemsRange({locale:"ky-KG"}); + test.ok(fmt !== null); + + test.equal(fmt[0].name, "таңкы"); + test.equal(fmt[1].name, "түштөн кийинки"); + + test.done(); + }, + testMeridiem_ca_AD: function(test) { + test.expect(3); + var fmt = DateFmt.getMeridiemsRange({locale:"ca-AD"}); + test.ok(fmt !== null); + + test.equal(fmt[0].name, "a. m."); + test.equal(fmt[1].name, "p. m."); + + test.done(); + }, + testMeridiem_ca_ES: function(test) { + test.expect(3); + var fmt = DateFmt.getMeridiemsRange({locale:"ca-ES"}); + test.ok(fmt !== null); + + test.equal(fmt[0].name, "a. m."); + test.equal(fmt[1].name, "p. m."); + test.done(); + }, + testMeridiem_hy_AM: function(test) { + test.expect(3); + var fmt = DateFmt.getMeridiemsRange({locale:"hy-AM"}); + test.ok(fmt !== null); + + test.equal(fmt[0].name, "AM"); + test.equal(fmt[1].name, "PM"); + test.done(); + }, + testMeridiem_gl_ES: function(test) { + test.expect(3); + var fmt = DateFmt.getMeridiemsRange({locale:"gl-ES"}); + test.ok(fmt !== null); + + test.equal(fmt[0].name, "a.m."); + test.equal(fmt[1].name, "p.m."); + + test.done(); + }, + testMeridiem_en_ES: function(test) { + test.expect(3); + var fmt = DateFmt.getMeridiemsRange({locale:"eu-ES"}); + test.ok(fmt !== null); + + test.equal(fmt[0].name, "AM"); + test.equal(fmt[1].name, "PM"); + test.done(); + }, + testMeridiem_ne_NP: function(test) { + test.expect(3); + var fmt = DateFmt.getMeridiemsRange({locale:"ne-NP"}); + test.ok(fmt !== null); + + test.equal(fmt[0].name, "पूर्वाह्न"); + test.equal(fmt[1].name, "अपराह्न"); + + test.done(); + }, + testMeridiem_my_MM: function(test) { + test.expect(3); + var fmt = DateFmt.getMeridiemsRange({locale:"my-MM"}); + test.ok(fmt !== null); + + test.equal(fmt[0].name, 'နံနက်'); + test.equal(fmt[1].name, 'ညနေ'); + test.done(); } } \ No newline at end of file diff --git a/js/test/date/testMonthTranslation.js b/js/test/date/testMonthTranslation.js index d468675dc9..9357f1b775 100644 --- a/js/test/date/testMonthTranslation.js +++ b/js/test/date/testMonthTranslation.js @@ -7315,6 +7315,426 @@ module.exports.testmonthtranslation = { test.equal(value[10], "ნოე"); test.equal(value[11], "დეკ"); + test.done(); + }, + testMonthTranslate_be_BY: function(test) { + test.expect(12); + + // full, long: MMMM + // short, medium: MM + + var value = [], i; + var fmt = new DateFmt({locale:"be-BY", date:"m", length: "full", useNative:false, timezone:"local"}) + for (i=0; i < 12; i++) { + value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"})); + } + test.equal(value[0], "студзень"); + test.equal(value[1], "люты"); + test.equal(value[2], "сакавік"); + test.equal(value[3], "красавік"); + test.equal(value[4], "май"); + test.equal(value[5], "чэрвень"); + test.equal(value[6], "ліпень"); + test.equal(value[7], "жнівень"); + test.equal(value[8], "верасень"); + test.equal(value[9], "кастрычнік"); + test.equal(value[10], "лістапад"); + test.equal(value[11], "снежань"); + test.done(); + }, + testMonthTranslate_lo_LA: function(test) { + test.expect(24); + + // full, long: MMMM + // medium: MMM + // short: MM + + var value = [], i; + var fmt = new DateFmt({locale:"lo-LA", date:"m", length: "full", useNative:false, timezone:"local"}) + for (i=0; i < 12; i++) { + value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"})); + } + test.equal(value[0], "ມັງກອນ"); + test.equal(value[1], "ກຸມພາ"); + test.equal(value[2], "ມີນາ"); + test.equal(value[3], "ເມສາ"); + test.equal(value[4], "ພຶດສະພາ"); + test.equal(value[5], "ມິຖຸນາ"); + test.equal(value[6], "ກໍລະກົດ"); + test.equal(value[7], "ສິງຫາ"); + test.equal(value[8], "ກັນຍາ"); + test.equal(value[9], "ຕຸລາ"); + test.equal(value[10], "ພະຈິກ"); + test.equal(value[11], "ທັນວາ"); + + var fmt = new DateFmt({locale:"lo-LA", date:"m", length: "medium", useNative:false, timezone:"local"}) + for (i=0; i < 12; i++) { + value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"})); + } + test.equal(value[0], "ມ.ກ."); + test.equal(value[1], "ກ.ພ."); + test.equal(value[2], "ມ.ນ."); + test.equal(value[3], "ມ.ສ."); + test.equal(value[4], "ພ.ພ."); + test.equal(value[5], "ມິ.ຖ."); + test.equal(value[6], "ກ.ລ."); + test.equal(value[7], "ສ.ຫ."); + test.equal(value[8], "ກ.ຍ."); + test.equal(value[9], "ຕ.ລ."); + test.equal(value[10], "ພ.ຈ."); + test.equal(value[11], "ທ.ວ."); + test.done(); + }, + testMonthTranslate_ky_KG: function(test) { + test.expect(24); + + // full, long: MMMM + // medium: MMM + // short: M + + var value = [], i; + var fmt = new DateFmt({locale:"ky-KG", date:"m", length: "full", useNative:false, timezone:"local"}) + for (i=0; i < 12; i++) { + value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"})); + } + test.equal(value[0], "Январь"); + test.equal(value[1], "Февраль"); + test.equal(value[2], "Март"); + test.equal(value[3], "Апрель"); + test.equal(value[4], "Май"); + test.equal(value[5], "Июнь"); + test.equal(value[6], "Июль"); + test.equal(value[7], "Август"); + test.equal(value[8], "Сентябрь"); + test.equal(value[9], "Октябрь"); + test.equal(value[10], "Ноябрь"); + test.equal(value[11], "Декабрь"); + + var fmt = new DateFmt({locale:"ky-KG", date:"m", length: "medium", useNative:false, timezone:"local"}) + for (i=0; i < 12; i++) { + value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"})); + } + + test.equal(value[0], "Янв"); + test.equal(value[1], "Фев"); + test.equal(value[2], "Мар"); + test.equal(value[3], "Апр"); + test.equal(value[4], "Май"); + test.equal(value[5], "Июн"); + test.equal(value[6], "Июл"); + test.equal(value[7], "Авг"); + test.equal(value[8], "Сен"); + test.equal(value[9], "Окт"); + test.equal(value[10], "Ноя"); + test.equal(value[11], "Дек"); + test.done(); + }, + testMonthTranslate_ca_AD: function(test) { + test.expect(24); + + // full, long: MMMM + // medium: MMM + // short: M + + var value = [], i; + var fmt = new DateFmt({locale:"ca-AD", date:"m", length: "full", useNative:false, timezone:"local"}) + for (i=0; i < 12; i++) { + value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"})); + } + test.equal(value[0], "gener"); + test.equal(value[1], "febrer"); + test.equal(value[2], "març"); + test.equal(value[3], "abril"); + test.equal(value[4], "maig"); + test.equal(value[5], "juny"); + test.equal(value[6], "juliol"); + test.equal(value[7], "agost"); + test.equal(value[8], "setembre"); + test.equal(value[9], "octubre"); + test.equal(value[10], "novembre"); + test.equal(value[11], "desembre"); + + var fmt = new DateFmt({locale:"ca-AD", date:"m", length: "medium", useNative:false, timezone:"local"}) + for (i=0; i < 12; i++) { + value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"})); + } + test.equal(value[0], "gen."); + test.equal(value[1], "febr."); + test.equal(value[2], "març"); + test.equal(value[3], "abr."); + test.equal(value[4], "maig"); + test.equal(value[5], "juny"); + test.equal(value[6], "jul."); + test.equal(value[7], "ag."); + test.equal(value[8], "set."); + test.equal(value[9], "oct."); + test.equal(value[10], "nov."); + test.equal(value[11], "des."); + + test.done(); + }, + testMonthTranslate_ca_ES: function(test) { + test.expect(24); + + // full, long: MMMM + // medium: MMM + // short: M + + var value = [], i; + var fmt = new DateFmt({locale:"ca-ES", date:"m", length: "full", useNative:false, timezone:"local"}) + for (i=0; i < 12; i++) { + value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"})); + } + test.equal(value[0], "gener"); + test.equal(value[1], "febrer"); + test.equal(value[2], "març"); + test.equal(value[3], "abril"); + test.equal(value[4], "maig"); + test.equal(value[5], "juny"); + test.equal(value[6], "juliol"); + test.equal(value[7], "agost"); + test.equal(value[8], "setembre"); + test.equal(value[9], "octubre"); + test.equal(value[10], "novembre"); + test.equal(value[11], "desembre"); + + var fmt = new DateFmt({locale:"ca-AD", date:"m", length: "medium", useNative:false, timezone:"local"}) + for (i=0; i < 12; i++) { + value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"})); + } + + test.equal(value[0], "gen."); + test.equal(value[1], "febr."); + test.equal(value[2], "març"); + test.equal(value[3], "abr."); + test.equal(value[4], "maig"); + test.equal(value[5], "juny"); + test.equal(value[6], "jul."); + test.equal(value[7], "ag."); + test.equal(value[8], "set."); + test.equal(value[9], "oct."); + test.equal(value[10], "nov."); + test.equal(value[11], "des."); + test.done(); + }, + testMonthTranslate_hy_AM: function(test) { + test.expect(24); + + // full, long: MMMM + // medium: MMM + // short: MM + + var value = [], i; + var fmt = new DateFmt({locale:"hy-AM", date:"m", length: "full", useNative:false, timezone:"local"}) + for (i=0; i < 12; i++) { + value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"})); + } + test.equal(value[0], "հունվար"); + test.equal(value[1], "փետրվար"); + test.equal(value[2], "մարտ"); + test.equal(value[3], "ապրիլ"); + test.equal(value[4], "մայիս"); + test.equal(value[5], "հունիս"); + test.equal(value[6], "հուլիս"); + test.equal(value[7], "օգոստոս"); + test.equal(value[8], "սեպտեմբեր"); + test.equal(value[9], "հոկտեմբեր"); + test.equal(value[10], "նոյեմբեր"); + test.equal(value[11], "դեկտեմբեր"); + + var fmt = new DateFmt({locale:"hy-AM", date:"m", length: "medium", useNative:false, timezone:"local"}) + for (i=0; i < 12; i++) { + value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"})); + } + test.equal(value[0], "հնվ"); + test.equal(value[1], "փտվ"); + test.equal(value[2], "մրտ"); + test.equal(value[3], "ապր"); + test.equal(value[4], "մյս"); + test.equal(value[5], "հնս"); + test.equal(value[6], "հլս"); + test.equal(value[7], "օգս"); + test.equal(value[8], "սեպ"); + test.equal(value[9], "հոկ"); + test.equal(value[10], "նոյ"); + test.equal(value[11], "դեկ"); + test.done(); + }, + testMonthTranslate_gl_ES: function(test) { + test.expect(24); + + // full, long: MMMM + // medium: MMM + // short: MM + + var value = [], i; + var fmt = new DateFmt({locale:"gl-ES", date:"m", length: "full", useNative:false, timezone:"local"}) + for (i=0; i < 12; i++) { + value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"})); + } + test.equal(value[0], "Xaneiro"); + test.equal(value[1], "Febreiro"); + test.equal(value[2], "Marzo"); + test.equal(value[3], "Abril"); + test.equal(value[4], "Maio"); + test.equal(value[5], "Xuño"); + test.equal(value[6], "Xullo"); + test.equal(value[7], "Agosto"); + test.equal(value[8], "Setembro"); + test.equal(value[9], "Outubro"); + test.equal(value[10], "Novembro"); + test.equal(value[11], "Decembro"); + + var fmt = new DateFmt({locale:"gl-ES", date:"m", length: "medium", useNative:false, timezone:"local"}) + for (i=0; i < 12; i++) { + value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"})); + } + test.equal(value[0], "Xan."); + test.equal(value[1], "Feb."); + test.equal(value[2], "Mar."); + test.equal(value[3], "Abr."); + test.equal(value[4], "Maio"); + test.equal(value[5], "Xuño"); + test.equal(value[6], "Xul."); + test.equal(value[7], "Ago."); + test.equal(value[8], "Set."); + test.equal(value[9], "Out."); + test.equal(value[10], "Nov."); + test.equal(value[11], "Dec."); + test.done(); + }, + testMonthTranslate_eu_ES: function(test) { + test.expect(24); + + // full, long: MMMM + // medium: MMM + // short: M + + var value = [], i; + var fmt = new DateFmt({locale:"eu-ES", date:"m", length: "full", useNative:false, timezone:"local"}) + for (i=0; i < 12; i++) { + value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"})); + } + test.equal(value[0], "urtarrila"); + test.equal(value[1], "otsaila"); + test.equal(value[2], "martxoa"); + test.equal(value[3], "apirila"); + test.equal(value[4], "maiatza"); + test.equal(value[5], "ekaina"); + test.equal(value[6], "uztaila"); + test.equal(value[7], "abuztua"); + test.equal(value[8], "iraila"); + test.equal(value[9], "urria"); + test.equal(value[10], "azaroa"); + test.equal(value[11], "abendua"); + + var fmt = new DateFmt({locale:"eu-ES", date:"m", length: "medium", useNative:false, timezone:"local"}) + + for (i=0; i < 12; i++) { + value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"})); + } + test.equal(value[0], "urt."); + test.equal(value[1], "ots."); + test.equal(value[2], "mar."); + test.equal(value[3], "api."); + test.equal(value[4], "mai."); + test.equal(value[5], "eka."); + test.equal(value[6], "uzt."); + test.equal(value[7], "abu."); + test.equal(value[8], "ira."); + test.equal(value[9], "urr."); + test.equal(value[10], "aza."); + test.equal(value[11], "abe."); + test.done(); + }, + testMonthTranslate_ne_NP: function(test) { + test.expect(24); + + // full, long: MMMM + // medium: MMM + // short: M + + var value = [], i; + var fmt = new DateFmt({locale:"ne-NP", date:"m", length: "full", useNative:false, timezone:"local"}) + for (i=0; i < 12; i++) { + value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"})); + } + test.equal(value[0], "जनवरी"); + test.equal(value[1], "फेब्रुअरी"); + test.equal(value[2], "मार्च"); + test.equal(value[3], "अप्रिल"); + test.equal(value[4], "मे"); + test.equal(value[5], "जुन"); + test.equal(value[6], "जुलाई"); + test.equal(value[7], "अगस्ट"); + test.equal(value[8], "सेप्टेम्बर"); + test.equal(value[9], "अक्टोबर"); + test.equal(value[10], "नोभेम्बर"); + test.equal(value[11], "डिसेम्बर"); + + var fmt = new DateFmt({locale:"ne-NP", date:"m", length: "medium", useNative:false, timezone:"local"}) + for (i=0; i < 12; i++) { + value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"})); + } + + test.equal(value[0], "जनवरी"); + test.equal(value[1], "फेब्रुअरी"); + test.equal(value[2], "मार्च"); + test.equal(value[3], "अप्रिल"); + test.equal(value[4], "मे"); + test.equal(value[5], "जुन"); + test.equal(value[6], "जुलाई"); + test.equal(value[7], "अगस्ट"); + test.equal(value[8], "सेप्टेम्बर"); + test.equal(value[9], "अक्टोबर"); + test.equal(value[10], "नोभेम्बर"); + test.equal(value[11], "डिसेम्बर"); + + test.done(); + }, + testMonthTranslate_my_MM: function(test) { + test.expect(24); + + // full, long: MMMM + // medium: MMM + // short: MM + + var value = [], i; + var fmt = new DateFmt({locale:"my-MM", date:"m", length: "full", useNative:false, timezone:"local"}) + for (i=0; i < 12; i++) { + value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"})); + } + test.equal(value[0], "ဇန်နဝါရီ"); + test.equal(value[1], "ဖေဖော်ဝါရီ"); + test.equal(value[2], "မတ်"); + test.equal(value[3], "ဧပြီ"); + test.equal(value[4], "မေ"); + test.equal(value[5], "ဇွန်"); + test.equal(value[6], "ဇူလိုင်"); + test.equal(value[7], "ဩဂုတ်"); + test.equal(value[8], "စက်တင်ဘာ"); + test.equal(value[9], "အောက်တိုဘာ"); + test.equal(value[10], "နိုဝင်ဘာ"); + test.equal(value[11], "ဒီဇင်ဘာ"); + + var fmt = new DateFmt({locale:"my-MM", date:"m", length: "medium", useNative:false, timezone:"local"}) + for (i=0; i < 12; i++) { + value[i] = fmt.format(DateFactory({month:i+1, type:"gregorian"})); + } + + test.equal(value[0], "ဇန်"); + test.equal(value[1], "ဖေ"); + test.equal(value[2], "မတ်"); + test.equal(value[3], "ဧ"); + test.equal(value[4], "မေ"); + test.equal(value[5], "ဇွန်"); + test.equal(value[6], "ဇူ"); + test.equal(value[7], "ဩ"); + test.equal(value[8], "စက်"); + test.equal(value[9], "အောက်"); + test.equal(value[10], "နို"); + test.equal(value[11], "ဒီ"); + test.done(); } } diff --git a/js/test/date/testSuite.html b/js/test/date/testSuite.html index 98d7e4a687..3aa3e5948c 100644 --- a/js/test/date/testSuite.html +++ b/js/test/date/testSuite.html @@ -1,7 +1,7 @@