From 3439e88d383c331243a96b87fdee61e13bc527c9 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 9 Nov 2023 16:31:23 +0100 Subject: [PATCH] Chore: updates and generated resources --- package-lock.json | 16 +- package.json | 2 +- src/Logic/State/UserSettingsMetaTagging.ts | 48 ++++-- src/Utils/svgToPdf.ts | 2 +- src/assets/contributors.json | 8 +- src/assets/language_in_country.json | 6 + src/assets/language_native.json | 5 +- src/assets/language_translations.json | 187 ++++++++++++--------- src/assets/studio_tagrenderings_intro.json | 2 +- src/assets/translators.json | 6 +- 10 files changed, 176 insertions(+), 106 deletions(-) diff --git a/package-lock.json b/package-lock.json index c6621b901a..a840141c78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mapcomplete", - "version": "0.34.0", + "version": "0.34.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mapcomplete", - "version": "0.34.0", + "version": "0.34.4", "license": "GPL-3.0-or-later", "dependencies": { "@rgossiaux/svelte-headlessui": "^1.0.2", @@ -4982,9 +4982,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001549", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001549.tgz", - "integrity": "sha512-qRp48dPYSCYaP+KurZLhDYdVE+yEyht/3NlmcJgVQ2VMGt6JL36ndQ/7rgspdZsJuxDPFIo/OzBT2+GmIJ53BA==", + "version": "1.0.30001561", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz", + "integrity": "sha512-NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw==", "dev": true, "funding": [ { @@ -17055,9 +17055,9 @@ "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==" }, "caniuse-lite": { - "version": "1.0.30001549", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001549.tgz", - "integrity": "sha512-qRp48dPYSCYaP+KurZLhDYdVE+yEyht/3NlmcJgVQ2VMGt6JL36ndQ/7rgspdZsJuxDPFIo/OzBT2+GmIJ53BA==", + "version": "1.0.30001561", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz", + "integrity": "sha512-NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw==", "dev": true }, "canvg": { diff --git a/package.json b/package.json index fb06d88451..17b51bcfd6 100644 --- a/package.json +++ b/package.json @@ -127,8 +127,8 @@ "libphonenumber-js": "^1.10.8", "lz-string": "^1.4.4", "mangrove-reviews-typescript": "^1.1.0", - "nano-markdown": "^1.2.2", "maplibre-gl": "^3.5.0", + "nano-markdown": "^1.2.2", "opening_hours": "^3.6.0", "osm-auth": "^2.2.0", "osmtogeojson": "^3.0.0-beta.5", diff --git a/src/Logic/State/UserSettingsMetaTagging.ts b/src/Logic/State/UserSettingsMetaTagging.ts index 33a5ae85b5..6e568c5c32 100644 --- a/src/Logic/State/UserSettingsMetaTagging.ts +++ b/src/Logic/State/UserSettingsMetaTagging.ts @@ -1,14 +1,42 @@ import { Utils } from "../../Utils" /** This code is autogenerated - do not edit. Edit ./assets/layers/usersettings/usersettings.json instead */ export class ThemeMetaTagging { - public static readonly themeName = "usersettings" + public static readonly themeName = "usersettings" - public metaTaggging_for_usersettings(feat: {properties: Record}) { - Utils.AddLazyProperty(feat.properties, '_mastodon_candidate_md', () => feat.properties._description.match(/\[[^\]]*\]\((.*(mastodon|en.osm.town).*)\).*/)?.at(1) ) - Utils.AddLazyProperty(feat.properties, '_d', () => feat.properties._description?.replace(/</g,'<')?.replace(/>/g,'>') ?? '' ) - Utils.AddLazyProperty(feat.properties, '_mastodon_candidate_a', () => (feat => {const e = document.createElement('div');e.innerHTML = feat.properties._d;return Array.from(e.getElementsByTagName("a")).filter(a => a.href.match(/mastodon|en.osm.town/) !== null)[0]?.href }) (feat) ) - Utils.AddLazyProperty(feat.properties, '_mastodon_link', () => (feat => {const e = document.createElement('div');e.innerHTML = feat.properties._d;return Array.from(e.getElementsByTagName("a")).filter(a => a.getAttribute("rel")?.indexOf('me') >= 0)[0]?.href})(feat) ) - Utils.AddLazyProperty(feat.properties, '_mastodon_candidate', () => feat.properties._mastodon_candidate_md ?? feat.properties._mastodon_candidate_a ) - feat.properties['__current_backgroun'] = 'initial_value' - } -} \ No newline at end of file + public metaTaggging_for_usersettings(feat: { properties: Record }) { + Utils.AddLazyProperty(feat.properties, "_mastodon_candidate_md", () => + feat.properties._description + .match(/\[[^\]]*\]\((.*(mastodon|en.osm.town).*)\).*/) + ?.at(1) + ) + Utils.AddLazyProperty( + feat.properties, + "_d", + () => feat.properties._description?.replace(/</g, "<")?.replace(/>/g, ">") ?? "" + ) + Utils.AddLazyProperty(feat.properties, "_mastodon_candidate_a", () => + ((feat) => { + const e = document.createElement("div") + e.innerHTML = feat.properties._d + return Array.from(e.getElementsByTagName("a")).filter( + (a) => a.href.match(/mastodon|en.osm.town/) !== null + )[0]?.href + })(feat) + ) + Utils.AddLazyProperty(feat.properties, "_mastodon_link", () => + ((feat) => { + const e = document.createElement("div") + e.innerHTML = feat.properties._d + return Array.from(e.getElementsByTagName("a")).filter( + (a) => a.getAttribute("rel")?.indexOf("me") >= 0 + )[0]?.href + })(feat) + ) + Utils.AddLazyProperty( + feat.properties, + "_mastodon_candidate", + () => feat.properties._mastodon_candidate_md ?? feat.properties._mastodon_candidate_a + ) + feat.properties["__current_backgroun"] = "initial_value" + } +} diff --git a/src/Utils/svgToPdf.ts b/src/Utils/svgToPdf.ts index 3ff8f913ad..b7fb6c961f 100644 --- a/src/Utils/svgToPdf.ts +++ b/src/Utils/svgToPdf.ts @@ -872,7 +872,7 @@ class SvgToPdfPage { width, height, }).CreatePng(this.options.freeComponentId, this._state) - }/* else { + } /* else { const match = spec.match(/\$map\(([^)]*)\)$/) if (match === null) { throw "Invalid mapspec:" + spec diff --git a/src/assets/contributors.json b/src/assets/contributors.json index 33cda50b68..80e42f9e5f 100644 --- a/src/assets/contributors.json +++ b/src/assets/contributors.json @@ -1,11 +1,11 @@ { "contributors": [ { - "commits": 6178, + "commits": 6315, "contributor": "Pieter Vander Vennet" }, { - "commits": 417, + "commits": 421, "contributor": "Robin van der Linde" }, { @@ -232,6 +232,10 @@ "commits": 2, "contributor": "Stanislas Gueniffey" }, + { + "commits": 1, + "contributor": "Roman Zhukov" + }, { "commits": 1, "contributor": "Ciprian" diff --git a/src/assets/language_in_country.json b/src/assets/language_in_country.json index d0fd96be93..1ab120e364 100644 --- a/src/assets/language_in_country.json +++ b/src/assets/language_in_country.json @@ -502,6 +502,12 @@ "ur", "en" ], + "PL": [ + "pl", + "be", + "pl", + "be" + ], "PS": [ "ar" ], diff --git a/src/assets/language_native.json b/src/assets/language_native.json index cee5eb76b5..c7869833f1 100644 --- a/src/assets/language_native.json +++ b/src/assets/language_native.json @@ -12,7 +12,7 @@ "gl": "lingua galega", "he": "עברית", "hu": "magyar", - "id": "Indonesia", + "id": "bahasa Indonesia", "it": "italiano", "ja": "日本語", "nb_NO": "bokmål", @@ -23,5 +23,6 @@ "ru": "русский язык", "sl": "slovenščina", "sv": "svenska", - "zh_Hant": "簡體中文" + "zh_Hans": "简体中文", + "zh_Hant": "繁體中文" } \ No newline at end of file diff --git a/src/assets/language_translations.json b/src/assets/language_translations.json index 910f737f6b..88b1e87bb3 100644 --- a/src/assets/language_translations.json +++ b/src/assets/language_translations.json @@ -146,7 +146,7 @@ "gl": "Lingua adigue", "he": "אדיגית", "hu": "adigei", - "id": "Adyghe", + "id": "bahasa Adyghe", "it": "adighè", "ja": "アディゲ語", "nb_NO": "adygeisk", @@ -603,7 +603,7 @@ "gl": "árabe", "he": "ערבית", "hu": "arab", - "id": "Arab", + "id": "bahasa Arab", "it": "arabo", "ja": "アラビア語", "nb_NO": "arabisk", @@ -929,7 +929,7 @@ "fi": "Awadhin kieli", "fr": "awadhi", "gl": "Lingua awadhi", - "he": "אוודית", + "he": "אוודהית", "id": "Bahasa Awadhi", "it": "awadhi", "ja": "アワディー語", @@ -1603,7 +1603,7 @@ "gl": "lingua bretoa", "he": "ברטונית", "hu": "breton", - "id": "Breton", + "id": "Bahasa Breton", "it": "bretone", "ja": "ブルトン語", "nb_NO": "bretonsk", @@ -1772,7 +1772,7 @@ "gl": "Lingua buriata", "he": "בוריאטית", "hu": "burját", - "id": "Buryat", + "id": "bahasa Buryat", "it": "buriato", "ja": "ブリヤート語", "nb_NO": "burjatisk", @@ -2316,7 +2316,7 @@ "gl": "Lingua tártara de Crimea", "he": "טטרית של קרים", "hu": "krími tatár", - "id": "Tatar Krimea", + "id": "Bahasa Tatar Krimea", "it": "tataro di Crimea", "ja": "クリミア・タタール語", "nb_NO": "krimtatarisk", @@ -2442,7 +2442,6 @@ "id": "Bahasa Chittagonia", "it": "lingua chittagonian", "ja": "チッタゴン語", - "nb_NO": "Chittagong", "pl": "Język chatgaya", "pt": "Língua chittagong", "pt_BR": "Língua chittagong", @@ -2533,7 +2532,7 @@ "gl": "lingua dinamarquesa", "he": "דנית", "hu": "dán", - "id": "Denmark", + "id": "bahasa Denmark", "it": "danese", "ja": "デンマーク語", "nb_NO": "dansk", @@ -2596,7 +2595,7 @@ "gl": "lingua alemá", "he": "גרמנית", "hu": "német", - "id": "Jerman", + "id": "bahasa Jerman", "it": "tedesco", "ja": "ドイツ語", "nb_NO": "tysk", @@ -2967,8 +2966,8 @@ "ru": "новогреческий язык", "sl": "novogrščina", "sv": "nygrekiska", - "zh_Hans": "现代希腊语", - "zh_Hant": "現代希臘語", + "zh_Hans": "希腊语", + "zh_Hant": "希臘語", "_meta": { "countries": [ "CY", @@ -3584,7 +3583,7 @@ "gl": "lingua feroesa", "he": "פארואזית", "hu": "feröeri", - "id": "Faroe", + "id": "bahasa Faroe", "it": "faroese", "ja": "フェロー語", "nb_NO": "færøysk", @@ -4872,7 +4871,7 @@ "gl": "lingua indonesia", "he": "אינדונזית", "hu": "indonéz", - "id": "Indonesia", + "id": "bahasa Indonesia", "it": "indonesiano", "ja": "インドネシア語", "nb_NO": "indonesisk", @@ -5019,7 +5018,7 @@ "gl": "lingua islandesa", "he": "איסלנדית", "hu": "izlandi", - "id": "Islandia", + "id": "bahasa Islandia", "it": "islandese", "ja": "アイスランド語", "nb_NO": "islandsk", @@ -5055,7 +5054,7 @@ "gl": "lingua italiana", "he": "איטלקית", "hu": "olasz", - "id": "Italia", + "id": "bahasa Italia", "it": "italiano", "ja": "イタリア語", "nb_NO": "italiensk", @@ -5127,7 +5126,7 @@ "gl": "lingua xaponesa", "he": "יפנית", "hu": "japán", - "id": "Jepang", + "id": "bahasa Jepang", "it": "giapponese", "ja": "日本語", "nb_NO": "japansk", @@ -5210,7 +5209,7 @@ "gl": "Lingua xavanesa", "he": "ג'אווה", "hu": "jávai", - "id": "Jawa", + "id": "bahasa Jawa", "it": "giavanese", "ja": "ジャワ語", "nb_NO": "javanesisk", @@ -5247,7 +5246,7 @@ "gl": "lingua xeorxiana", "he": "גאורגית", "hu": "grúz", - "id": "Georgia", + "id": "Bahasa Georgia", "it": "georgiano", "ja": "ジョージア語", "nb_NO": "georgisk", @@ -5282,7 +5281,7 @@ "gl": "Lingua karakalpak", "he": "קראקלפקית", "hu": "karakalpak", - "id": "Karakalpak", + "id": "Bahasa Karakalpak", "it": "karakalpako", "ja": "カラカルパク語", "nl": "Karakalpaks", @@ -5466,7 +5465,6 @@ "ja": "カインガング語", "nb_NO": "Kaingang", "nl": "Kaingang", - "pl": "Języki caingang", "pt": "Língua caingangue", "pt_BR": "Língua kaingáng", "ru": "Каинганг", @@ -5637,7 +5635,7 @@ "gl": "Lingua casaca", "he": "קזחית", "hu": "kazak", - "id": "Kazakh", + "id": "bahasa Kazakh", "it": "kazako", "ja": "カザフ語", "nb_NO": "kasakhisk", @@ -5674,7 +5672,7 @@ "gl": "Lingua grenlandesa", "he": "גרינלנדית", "hu": "grönlandi", - "id": "Greenland", + "id": "bahasa Greenland", "it": "groenlandese", "ja": "グリーンランド語", "nb_NO": "grønlandsk", @@ -5706,7 +5704,7 @@ "gl": "Lingua khmer", "he": "קמרית", "hu": "khmer", - "id": "Khmer", + "id": "bahasa Khmer", "it": "khmer", "ja": "クメール語", "nb_NO": "khmer", @@ -5817,7 +5815,6 @@ "pl": "język komi-permiacki", "pt": "Língua komi-permyak", "ru": "коми-пермяцкий язык", - "sl": "permjaščina", "sv": "komi-permjakiska", "zh_Hans": "彼尔姆科米语", "zh_Hant": "彼爾姆科米語", @@ -6027,32 +6024,32 @@ } }, "ku": { - "ca": "kurd", - "cs": "kurdština", - "da": "kurdisk", - "de": "Kurdisch", - "en": "Kurdish", - "eo": "kurda lingvo", - "es": "kurdo", - "eu": "kurduera", - "fi": "kurdi", - "fr": "kurde", + "ca": "kurd del nord", + "cs": "kurmándží", + "da": "Kurmanji", + "de": "Kurmandschi", + "en": "Kurmanji", + "eo": "kurmanĝa lingvo", + "es": "kurmanji", + "eu": "Kurmanji", + "fi": "Kurmandži", + "fr": "kurmandji", "gl": "lingua kurda", - "he": "כורדית", - "hu": "kurd", - "id": "Bahasa Kurdi", - "it": "curdo", - "ja": "クルド語", + "he": "כורמנג'ית", + "hu": "kurmandzsi", + "id": "Kurmanji", + "it": "kurmanji", + "ja": "クルマンジー", "nb_NO": "kurdisk", - "nl": "Koerdisch", - "pl": "język kurdyjski", - "pt": "língua curda", - "pt_BR": "língua curda", - "ru": "курдские языки", - "sl": "kurdščina", - "sv": "kurdiska", + "nl": "Kurmançi", + "pl": "język kurmandżi", + "pt": "curmânji", + "pt_BR": "Curmânji", + "ru": "курманджи", + "sl": "kurmandži", + "sv": "nordkurdiska", "zh_Hans": "库尔德语", - "zh_Hant": "庫德語", + "zh_Hant": "北庫德語", "_meta": { "countries": [ "IQ" @@ -6129,7 +6126,7 @@ "gl": "lingua komi", "he": "קומי", "hu": "komi", - "id": "Komi", + "id": "Bahasa Komi", "it": "comi", "ja": "コミ語", "nb_NO": "syrjensk", @@ -6137,7 +6134,6 @@ "pl": "język komi", "pt": "língua komi", "ru": "коми язык", - "sl": "komijščina", "sv": "komi", "_meta": { "dir": [ @@ -6220,7 +6216,7 @@ "gl": "kirguiz", "he": "קירגיזית", "hu": "kirgiz", - "id": "Kirgiz", + "id": "bahasa Kirgiz", "it": "kirghiso", "ja": "キルギス語", "nb_NO": "kirgisisk", @@ -6306,7 +6302,7 @@ "gl": "Lingua luxemburguesa", "he": "לוקסמבורגית", "hu": "luxemburgi", - "id": "Luksemburg", + "id": "bahasa Luksemburg", "it": "lussemburghese", "ja": "ルクセンブルク語", "nb_NO": "luxembourgsk", @@ -6546,7 +6542,7 @@ "gl": "Lingua lombarda", "he": "לומברד (שפה)", "hu": "lombard", - "id": "Lombard", + "id": "bahasa Lombard", "it": "lingua lombarda", "ja": "ロンバルド語", "nb_NO": "lombardisk", @@ -6606,7 +6602,7 @@ "gl": "Lingua laosiana", "he": "לאית", "hu": "lao", - "id": "Lao", + "id": "bahasa Lao", "it": "lao", "ja": "ラーオ語", "nb_NO": "laotisk", @@ -6976,7 +6972,7 @@ "gl": "Lingua malgaxe", "he": "מלגשית", "hu": "malgas", - "id": "Malagasi", + "id": "Bahasa Malagasi", "it": "malgascio", "ja": "マダガスカル語", "nb_NO": "gassisk", @@ -7162,7 +7158,7 @@ "gl": "Lingua macedonia", "he": "מקדונית", "hu": "macedón", - "id": "Makedonia", + "id": "bahasa Makedonia", "it": "macedone", "ja": "マケドニア語", "nb_NO": "makedonsk", @@ -7230,7 +7226,7 @@ "gl": "Lingua mongol", "he": "מונגולית", "hu": "mongol", - "id": "Mongol", + "id": "bahasa Mongol", "it": "mongolo", "ja": "モンゴル語", "nb_NO": "mongolsk", @@ -7471,7 +7467,7 @@ "gl": "lingua malaia", "he": "מלאית", "hu": "maláj", - "id": "Melayu", + "id": "bahasa Melayu", "it": "malese", "ja": "マレー語", "nb_NO": "malayisk", @@ -7649,7 +7645,7 @@ "gl": "birmano", "he": "בורמזית", "hu": "burmai", - "id": "Burma", + "id": "bahasa Burma", "it": "birmano", "ja": "ビルマ語", "nb_NO": "burmesisk", @@ -8111,7 +8107,7 @@ "gl": "lingua norueguesa", "he": "נורווגית", "hu": "norvég", - "id": "Norwegia", + "id": "bahasa Norwegia", "it": "norvegese", "ja": "ノルウェー語", "nb_NO": "norsk", @@ -8438,12 +8434,12 @@ "eo": "olonec-karela lingvo", "fi": "livvinkarjala", "fr": "olonetsien", - "gl": "lingua livvi", + "gl": "Lingua livvi", "it": "lingua livvi", "ja": "リッヴィ語", "nb_NO": "livvisk", "nl": "Olonetsisch", - "pl": "dialekt ołoniecki", + "pl": "Dialekt ołoniecki", "ru": "ливвиковское наречие", "sv": "livvi", "zh_Hant": "利維卡累利阿語", @@ -8548,7 +8544,7 @@ "gl": "Lingua oseta", "he": "אוסטית", "hu": "oszét", - "id": "Ossetia", + "id": "bahasa Ossetia", "it": "osseto", "ja": "オセット語", "nb_NO": "ossetisk", @@ -8624,7 +8620,7 @@ "gl": "lingua punjabi (Shahmukhi)", "he": "פנג'אבי (אלפבית שאהמוקי)", "hu": "pandzsábi (Shahmukhi)", - "id": "Punjab (Abjad Shahmukhi)", + "id": "Bahasa Punjab (Abjad Shahmukhi)", "it": "punjabi (Shahmukhī)", "ja": "パンジャーブ語 (シャームキー文字)", "nb_NO": "panjabi (Shahmukhi)", @@ -8849,7 +8845,6 @@ "pl": "Język neosalomoński", "pt": "Língua pijin", "ru": "Пиджин Соломоновых Островов", - "sl": "salomonski pidžin", "sv": "pijin", "_meta": { "dir": [ @@ -8904,6 +8899,9 @@ "zh_Hans": "波兰语", "zh_Hant": "波蘭語", "_meta": { + "countries": [ + "PL" + ], "dir": [ "left-to-right" ] @@ -9044,7 +9042,7 @@ "gl": "lingua portuguesa", "he": "פורטוגזית", "hu": "portugál", - "id": "Portugis", + "id": "bahasa Portugis", "it": "portoghese", "ja": "ポルトガル語", "nb_NO": "portugisisk", @@ -9254,7 +9252,7 @@ "en": "Rakhine", "fr": "arakanais", "gl": "Lingua arakanesa", - "id": "Rakhine", + "id": "bahasa Rakhine", "ja": "ラカイン語", "nl": "Arakanees", "pl": "Język arakański", @@ -9502,7 +9500,7 @@ "gl": "Lingua arromanesa", "he": "ארומנית", "hu": "aromán", - "id": "Arumania", + "id": "Bahasa Arumania", "it": "arumeno", "ja": "アルーマニア語", "nb_NO": "arumensk", @@ -9897,7 +9895,7 @@ "ca": "taixelhit", "cs": "tašelhit", "de": "Taschelhit", - "en": "Tachelhit", + "en": "Shilha", "eo": "ŝelha lingvo", "es": "chilha", "fi": "Tašelhit", @@ -9997,7 +9995,7 @@ "pt": "Língua cingalesa", "pt_BR": "Língua cingalesa", "ru": "сингальский язык", - "sl": "singalščina", + "sl": "sinhalščina", "sv": "singalesiska", "zh_Hant": "僧伽羅語", "_meta": { @@ -10457,7 +10455,7 @@ "gl": "Lingua albanesa", "he": "אלבנית", "hu": "albán", - "id": "Albania", + "id": "Bahasa Albania", "it": "albanese", "ja": "アルバニア語", "nb_NO": "albansk", @@ -10700,7 +10698,7 @@ "gl": "lingua sueca", "he": "שוודית", "hu": "svéd", - "id": "Swedia", + "id": "bahasa Swedia", "it": "svedese", "ja": "スウェーデン語", "nb_NO": "svensk", @@ -10799,7 +10797,7 @@ "gl": "Lingua silesiana", "he": "שלזית", "hu": "sziléziai", - "id": "Silesia", + "id": "bahasa Silesia", "it": "slesiano", "ja": "シレジア語", "nb_NO": "schlesisk", @@ -10848,7 +10846,7 @@ "gl": "Lingua támil", "he": "טמילית", "hu": "tamil", - "id": "Tamil", + "id": "Bahasa Tamil", "it": "tamil", "ja": "タミル語", "nb_NO": "tamilsk", @@ -11035,7 +11033,7 @@ "gl": "lingua tailandesa", "he": "תאית", "hu": "thai", - "id": "Thai", + "id": "bahasa Thai", "it": "thailandese", "ja": "タイ語", "nb_NO": "thai", @@ -11105,7 +11103,7 @@ "gl": "Lingua turcomá", "he": "טורקמנית", "hu": "türkmén", - "id": "Turkmen", + "id": "bahasa Turkmen", "it": "Turkmeno", "ja": "トルクメン語", "nb_NO": "turkmensk", @@ -11633,7 +11631,7 @@ "gl": "Lingua uigur", "he": "אויגורית", "hu": "ujgur", - "id": "Uighur", + "id": "bahasa Uyghur", "it": "uiguro", "ja": "ウイグル語", "nb_NO": "uigurisk", @@ -11703,7 +11701,7 @@ "gl": "Lingua usbeka", "he": "אוזבקית", "hu": "üzbég", - "id": "Uzbek", + "id": "bahasa Uzbek", "it": "uzbeco", "ja": "ウズベク語", "nb_NO": "usbekisk", @@ -12592,7 +12590,7 @@ "gl": "lingua chinesa", "he": "סינית", "hu": "kínai", - "id": "Tionghoa", + "id": "bahasa Tionghoa", "it": "cinese", "ja": "中国語", "nb_NO": "kinesisk", @@ -12648,7 +12646,7 @@ ] } }, - "zh_Hant": { + "zh_Hans": { "ca": "xinès simplificat", "cs": "zjednodušená čínština", "da": "forenklet kinesisk", @@ -12657,7 +12655,6 @@ "eo": "simpligita ĉina skribsistemo", "es": "chino simplificado", "eu": "Txinera sinplifikatua", - "fi": "perinteinen kiina", "fr": "chinois simplifié", "gl": "chinés simplificado", "he": "סינית מפושטת", @@ -12680,6 +12677,36 @@ ] } }, + "zh_Hant": { + "ca": "xinès tradicional", + "cs": "čínština (tradiční)", + "da": "traditionel kinesisk", + "de": "traditionelles Chinesisch", + "en": "Traditional Chinese", + "eo": "ĉina lingvo de tradicia ortografio", + "es": "chino tradicional", + "eu": "Txinera tradizional", + "fi": "perinteinen kiina", + "fr": "chinois traditionnel", + "gl": "chinés tradicional", + "he": "סינית מסורתית", + "it": "cinese tradizionale", + "ja": "繁体字中国語", + "nb_NO": "tradisjonell kinesisk", + "nl": "traditioneel Chinees", + "pl": "język chiński tradycyjny", + "pt": "chinês tradicional", + "ru": "традиционный китайский", + "sl": "tradicionalna kitajščina", + "sv": "traditionell kinesiska", + "zh_Hans": "繁体中文", + "zh_Hant": "繁體中文", + "_meta": { + "dir": [ + "left-to-right" + ] + } + }, "zu": { "ca": "zulu", "cs": "zuluština", diff --git a/src/assets/studio_tagrenderings_intro.json b/src/assets/studio_tagrenderings_intro.json index 843b57db5c..45dbecde6c 100644 --- a/src/assets/studio_tagrenderings_intro.json +++ b/src/assets/studio_tagrenderings_intro.json @@ -1 +1 @@ -{"sections":["# How to work with TagRenderings\n\nThe information box shows various attributes of the selected feature in a human friendly way.\n\nThis is done by a **tagRendering** which converts attributes into text.\n\nThis can be done by using **predefined options** (mappings) or with a **render**-string\n","# Predefined options\n\nA predefined option states that, `if` a certain tag is present, `then` a certain text should be shown.\n\nFor example, a playground may be lit or not.\nIn OpenStreetMap, this is encoded with the tag `lit=yes` or `lit=no`. We might want to show `This playground is lit at night` and `This playground is not lit at night` to users of MapComplete.\n\nThis is what this will look like in the interface:\n\n\n","# Substituting attributes\n\nIf none of the predefined options match, the string given in the `render`-field is used (under the question _\"What text should be rendered?\"_).\n\nA special property about all shown texts is that, **if the name of a key appears between braces, this will be replaced by the corresponding value**.\n\nFor example, if the object has tags `min_age=3` and the text to display is `Accessible to kids older than {min_age} years`, then this will be displayed to the user as **Accessible to kids older than 3 years**\n\nNote that this also works withing predifined options\n","# Special values\n\nSpecial components can be summoned by calling them. For example, the relevant wikipedia will be displayed by entering the text `{wikipedia()}`. A table with opening hours is displayed with `{opening_hours()}`. For a full reference, [see the documentation](../SpecialRenderings.md).\n","# Requesting data with predefined options\n\nThese renderings can be turned into a way to contribute data easily. If a **question** is provided, then these renderings will be asked if unknown or gain the pencil to make changes. \n\nA predefined option will show up as an option that can be picked.\n\n","# Requesting data with an input field\n\nIt is also possible to have a text field. For this, the **key** to write into must be given (_What is the name of the attribute that should be written to?_), in this case `max_age`.\n\n","# Combining predefined options and freeform text\n\nA text field and predefined options can be combined. The contributor can then choose between a predefined option or filling out something.\n\n","# Selecting multiple values\n\nOne can set a question to allow multiple answers. This works with predefined options or a freeform text field.\n\n\n\nNote that these will be rendered as a list:\n\n\n"]} \ No newline at end of file +{"sections":["# How to work with TagRenderings\n\nThe information box shows various attributes of the selected feature in a human friendly way.\n\nThis is done by a **tagRendering** which converts attributes into text.\n\nThis can be done by using **predefined options** (mappings) or with a **render**-string\n","# Predefined options\n\nA predefined option states that, `if` a certain tag is present, `then` a certain text should be shown.\n\nFor example, a playground may be lit or not.\nIn OpenStreetMap, this is encoded with the tag `lit=yes` or `lit=no`. We might want to show `This playground is lit at night` and `This playground is not lit at night` to users of MapComplete.\n\nThis is what this will look like in the interface:\n\n\n","# Substituting attributes\n\nIf none of the predefined options match, the string given in the `render`-field is used (under the question _\"What text should be rendered?\"_).\n\nA special property about all shown texts is that, **if the name of a key appears between braces, this will be replaced by the corresponding value**.\n\nFor example, if the object has tags `min_age=3` and the text to display is `Accessible to kids older than {min_age} years`, then this will be displayed to the user as **Accessible to kids older than 3 years**\n\nNote that this also works withing predifined options\n","# Special values\n\nSpecial components can be summoned by calling them. For example, the relevant wikipedia will be displayed by entering the text `{wikipedia()}`. A table with opening hours is displayed with `{opening_hours()}`. For a full reference, [see the documentation](../SpecialRenderings.md).\n","# Requesting data with predefined options\n\nThese renderings can be turned into a way to contribute data easily. If a **question** is provided, then these renderings will be asked if unknown or gain the pencil to make changes. \n\nA predefined option will show up as an option that can be picked.\n\n","# Requesting data with an input field\n\nIt is also possible to have a text field. For this, the **key** to write into must be given (_What is the name of the attribute that should be written to?_), in this case `max_age`.\n\n","# Combining predefined options and freeform text\n\nA text field and predefined options can be combined. The contributor can then choose between a predefined option or filling out something.\n\n","# Selecting multiple values\n\nOne can set a question to allow multiple answers. This works with predefined options or a freeform text field.\n\n\n\nNote that these will be rendered as a list:\n\n\n"]} \ No newline at end of file diff --git a/src/assets/translators.json b/src/assets/translators.json index 178dcf5d61..0a9603aee4 100644 --- a/src/assets/translators.json +++ b/src/assets/translators.json @@ -5,7 +5,7 @@ "contributor": "kjon" }, { - "commits": 293, + "commits": 294, "contributor": "Pieter Vander Vennet" }, { @@ -456,6 +456,10 @@ "commits": 2, "contributor": "Leo Alcaraz" }, + { + "commits": 1, + "contributor": "Henry00572" + }, { "commits": 1, "contributor": "Julio Salas"