Skip to content

GitLab

T
tangled
Commit 7d8e3d29 authored by Lutz Justen's avatar Lutz Justen Committed by Commit Bot
Browse files
Options

Fix ADM/ADML folder names 

ADMX files were not loaded into the GPO editor properly for most
languages because the directory names were bad, e.g. should be 'it-IT'
instead of 'it'. This CL fixes the directory names according to the doc
mentioned in the bug below.

For a few languages the mapping was not clear:
'am', 'fil', 'ml'  - Not in doc; kept the old directory names
'ar' -> 'ar-EG'    - Picked EG as the biggest of the ~15 Arabic countries
'bn' -> 'ms-BN'    - Is this correct? There's no bn-XX in the doc.
'sr' -> 'Cy-sr-SP' - Is this correct? Translations look cyrillic.

BUG=chromium:806577
TEST=Changed components/policy/BUILD.gn to build for all platforms, ran
     ninja -C out/Release -j 2000 policy_templates
     Loaded de-DE into GPO editor on Windows

Change-Id: I574f6241b152c64943ec39442e2e23f7cae636cf
Reviewed-on: https://chromium-review.googlesource.com/893567Reviewed-by: default avatarJulian Pastarmov <pastarmovj@chromium.org>
Commit-Queue: Lutz Justen <ljusten@chromium.org>
Cr-Commit-Position: refs/heads/master@{#533231}
parent 707aac9c
Hide whitespace changes
Inline Side-by-side
Showing with 161 additions and 109 deletions
components/policy/resources/policy_templates.gni
View file @ 7d8e3d29
...@@ -11,62 +11,123 @@ ...@@ -11,62 +11,123 @@
policy_templates_base_dir = "$root_gen_dir/chrome/app/policy" policy_templates_base_dir = "$root_gen_dir/chrome/app/policy"
# Languages we're going to process. # Languages we're going to process. Should match the XX-YY of the translated
# policy_templates_XX-YY.json files, see policy_templates.grd.
policy_templates_languages = [ policy_templates_languages = [
"am", "am",
"ar", "ar-EG",
"bg", "bg-BG",
"bn", "ms-BN",
"ca", "ca-ES",
"cs", "cs-CZ",
"da", "da-DK",
"de", "de-DE",
"el", "el-GR",
"en-GB", "en-GB",
"en-US", "en-US",
"es", "es-ES",
"es-419", "es-419",
"et", "et-EE",
"fa", "fa-IR",
"fi", "fi-FI",
"fil", "fil",
"fr", "fr-FR",
"gu", "gu-IN",
"he", "he-IL",
"hi", "hi-IN",
"hr", "hr-HR",
"hu", "hu-HU",
"id", "id-ID",
"it", "it-IT",
"ja", "ja-JP",
"kn", "kn-IN",
"ko", "ko-KR",
"lt", "lt-LT",
"lv", "lv-LV",
"ml", "ml",
"mr", "mr-IN",
"ms", "ms-MY",
"nl", "nl-NL",
"nb", "nb-NO",
"pl", "pl-PL",
"pt-BR", "pt-BR",
"pt-PT", "pt-PT",
"ro", "ro-RO",
"ru", "ru-RU",
"sk", "sk-SK",
"sl", "sl-SI",
"sr", "Cy-sr-SP",
"sv", "sv-SE",
"sw", "sw-KE",
"ta", "ta-IN",
"te", "te-IN",
"th", "th-TH",
"tr", "tr-TR",
"uk", "uk-UA",
"vi", "vi-VN",
"zh-CN", "zh-CN",
"zh-TW", "zh-TW",
] ]
# Macs use a slightly different naming convention:
# - '_' instead of '-'
# - 'en' instead of 'en-US'
mac_policy_templates_languages = [
"am",
"ar_EG",
"bg_BG",
"ms_BN",
"ca_ES",
"cs_CZ",
"da_DK",
"de_DE",
"el_GR",
"en_GB",
"en",
"es_ES",
"es_419",
"et_EE",
"fa_IR",
"fi_FI",
"fil",
"fr_FR",
"gu_IN",
"he_IL",
"hi_IN",
"hr_HR",
"hu_HU",
"id_ID",
"it_IT",
"ja_JP",
"kn_IN",
"ko_KR",
"lt_LT",
"lv_LV",
"ml",
"mr_IN",
"ms_MY",
"nl_NL",
"nb_NO",
"pl_PL",
"pt_BR",
"pt_PT",
"ro_RO",
"ru_RU",
"sk_SK",
"sl_SI",
"Cy_sr_SP",
"sv_SE",
"sw_KE",
"ta_IN",
"te_IN",
"th_TH",
"tr_TR",
"uk_UA",
"vi_VN",
"zh_CN",
"zh_TW",
]
policy_templates_languages_str = "" policy_templates_languages_str = ""
foreach(lang, policy_templates_languages) { foreach(lang, policy_templates_languages) {
# Note: The final , is filtered out by scripts. There's no string.join here... # Note: The final , is filtered out by scripts. There's no string.join here...
...@@ -78,7 +139,9 @@ policy_templates_translation_json_path = ...@@ -78,7 +139,9 @@ policy_templates_translation_json_path =
"$policy_templates_base_dir/translations/policy_templates_\${lang}.json" "$policy_templates_base_dir/translations/policy_templates_\${lang}.json"
policy_templates_translation_outputs = [] policy_templates_translation_outputs = []
foreach(lang, policy_templates_languages) { foreach(lang, policy_templates_languages) {
policy_templates_translation_outputs += [ "$policy_templates_base_dir/translations/policy_templates_${lang}.json" ] policy_templates_translation_outputs += [
"$policy_templates_base_dir/translations/policy_templates_${lang}.json",
]
} }
# Android outputs. # Android outputs.
...@@ -91,7 +154,9 @@ policy_templates_doc_path = ...@@ -91,7 +154,9 @@ policy_templates_doc_path =
"$policy_templates_base_dir/common/html/\${lang}/chrome_policy_list.html" "$policy_templates_base_dir/common/html/\${lang}/chrome_policy_list.html"
policy_templates_common_outputs = [] policy_templates_common_outputs = []
foreach(lang, policy_templates_languages) { foreach(lang, policy_templates_languages) {
policy_templates_common_outputs += [ "$policy_templates_base_dir/common/html/${lang}/chrome_policy_list.html" ] policy_templates_common_outputs += [
"$policy_templates_base_dir/common/html/${lang}/chrome_policy_list.html",
]
} }
# Linux outputs. # Linux outputs.
...@@ -105,24 +170,10 @@ policy_templates_plist_path = ...@@ -105,24 +170,10 @@ policy_templates_plist_path =
policy_templates_plist_strings_path = policy_templates_plist_strings_path =
"$policy_templates_base_dir/mac/strings/\${lang}.lproj/Localizable.strings" "$policy_templates_base_dir/mac/strings/\${lang}.lproj/Localizable.strings"
policy_templates_mac_outputs = [ policy_templates_plist_path ] policy_templates_mac_outputs = [ policy_templates_plist_path ]
foreach(lang, policy_templates_languages) { foreach(lang, mac_policy_templates_languages) {
# Mac uses a slightly different naming convention for languages. policy_templates_mac_outputs += [
if (lang == "en-US") { "$policy_templates_base_dir/mac/strings/${lang}.lproj/Localizable.strings",
lang = "en" ]
} else if (lang == "en-GB") {
lang = "en_GB"
} else if (lang == "es-419") {
lang = "es_419"
} else if (lang == "pt-BR") {
lang = "pt_BR"
} else if (lang == "pt-PT") {
lang = "pt_PT"
} else if (lang == "zh-CN") {
lang = "zh_CN"
} else if (lang == "zh-TW") {
lang = "zh_TW"
}
policy_templates_mac_outputs += [ "$policy_templates_base_dir/mac/strings/${lang}.lproj/Localizable.strings" ]
} }
# Windows outputs. # Windows outputs.
......
components/policy/resources/policy_templates.grd
View file @ 7d8e3d29
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- This file contains definitions of resources that are used in policy <!-- This file contains definitions of resources that are used in policy
templates and will be translated for each locale. --> templates and will be translated for each locale.
For the mapping 'lang' to policy_templates filename see crbug.com/806577.
-->
<grit base_dir="." latest_public_release="0" current_release="1" <grit base_dir="." latest_public_release="0" current_release="1"
output_all_resource_defines="false" source_lang_id="en" enc_check="möl"> output_all_resource_defines="false" source_lang_id="en" enc_check="möl">
<outputs> <outputs>
<output filename="app/policy/translations/policy_templates_am.json" type="policy_templates" lang="am" /> <output filename="app/policy/translations/policy_templates_am.json" type="policy_templates" lang="am" />
<output filename="app/policy/translations/policy_templates_ar.json" type="policy_templates" lang="ar" /> <output filename="app/policy/translations/policy_templates_ar-EG.json" type="policy_templates" lang="ar" />
<output filename="app/policy/translations/policy_templates_bg.json" type="policy_templates" lang="bg" /> <output filename="app/policy/translations/policy_templates_bg-BG.json" type="policy_templates" lang="bg" />
<output filename="app/policy/translations/policy_templates_bn.json" type="policy_templates" lang="bn" /> <output filename="app/policy/translations/policy_templates_ms-BN.json" type="policy_templates" lang="bn" />
<output filename="app/policy/translations/policy_templates_ca.json" type="policy_templates" lang="ca" /> <output filename="app/policy/translations/policy_templates_ca-ES.json" type="policy_templates" lang="ca" />
<output filename="app/policy/translations/policy_templates_cs.json" type="policy_templates" lang="cs" /> <output filename="app/policy/translations/policy_templates_cs-CZ.json" type="policy_templates" lang="cs" />
<output filename="app/policy/translations/policy_templates_da.json" type="policy_templates" lang="da" /> <output filename="app/policy/translations/policy_templates_da-DK.json" type="policy_templates" lang="da" />
<output filename="app/policy/translations/policy_templates_de.json" type="policy_templates" lang="de" /> <output filename="app/policy/translations/policy_templates_de-DE.json" type="policy_templates" lang="de" />
<output filename="app/policy/translations/policy_templates_el.json" type="policy_templates" lang="el" /> <output filename="app/policy/translations/policy_templates_el-GR.json" type="policy_templates" lang="el" />
<output filename="app/policy/translations/policy_templates_en-GB.json" type="policy_templates" lang="en-GB" /> <output filename="app/policy/translations/policy_templates_en-GB.json" type="policy_templates" lang="en-GB" />
<output filename="app/policy/translations/policy_templates_en-US.json" type="policy_templates" lang="en" /> <output filename="app/policy/translations/policy_templates_en-US.json" type="policy_templates" lang="en" />
<output filename="app/policy/translations/policy_templates_es.json" type="policy_templates" lang="es" /> <output filename="app/policy/translations/policy_templates_es-ES.json" type="policy_templates" lang="es" />
<output filename="app/policy/translations/policy_templates_es-419.json" type="policy_templates" lang="es-419" /> <output filename="app/policy/translations/policy_templates_es-419.json" type="policy_templates" lang="es-419" />
<output filename="app/policy/translations/policy_templates_et.json" type="policy_templates" lang="et" /> <output filename="app/policy/translations/policy_templates_et-EE.json" type="policy_templates" lang="et" />
<output filename="app/policy/translations/policy_templates_fa.json" type="policy_templates" lang="fa" /> <output filename="app/policy/translations/policy_templates_fa-IR.json" type="policy_templates" lang="fa" />
<output filename="app/policy/translations/policy_templates_fi.json" type="policy_templates" lang="fi" /> <output filename="app/policy/translations/policy_templates_fi-FI.json" type="policy_templates" lang="fi" />
<output filename="app/policy/translations/policy_templates_fil.json" type="policy_templates" lang="fil" /> <output filename="app/policy/translations/policy_templates_fil.json" type="policy_templates" lang="fil" />
<output filename="app/policy/translations/policy_templates_fr.json" type="policy_templates" lang="fr" /> <output filename="app/policy/translations/policy_templates_fr-FR.json" type="policy_templates" lang="fr" />
<output filename="app/policy/translations/policy_templates_gu.json" type="policy_templates" lang="gu" /> <output filename="app/policy/translations/policy_templates_gu-IN.json" type="policy_templates" lang="gu" />
<output filename="app/policy/translations/policy_templates_he.json" type="policy_templates" lang="he" /> <output filename="app/policy/translations/policy_templates_he-IL.json" type="policy_templates" lang="he" />
<output filename="app/policy/translations/policy_templates_hi.json" type="policy_templates" lang="hi" /> <output filename="app/policy/translations/policy_templates_hi-IN.json" type="policy_templates" lang="hi" />
<output filename="app/policy/translations/policy_templates_hr.json" type="policy_templates" lang="hr" /> <output filename="app/policy/translations/policy_templates_hr-HR.json" type="policy_templates" lang="hr" />
<output filename="app/policy/translations/policy_templates_hu.json" type="policy_templates" lang="hu" /> <output filename="app/policy/translations/policy_templates_hu-HU.json" type="policy_templates" lang="hu" />
<output filename="app/policy/translations/policy_templates_id.json" type="policy_templates" lang="id" /> <output filename="app/policy/translations/policy_templates_id-ID.json" type="policy_templates" lang="id" />
<output filename="app/policy/translations/policy_templates_it.json" type="policy_templates" lang="it" /> <output filename="app/policy/translations/policy_templates_it-IT.json" type="policy_templates" lang="it" />
<output filename="app/policy/translations/policy_templates_ja.json" type="policy_templates" lang="ja" /> <output filename="app/policy/translations/policy_templates_ja-JP.json" type="policy_templates" lang="ja" />
<output filename="app/policy/translations/policy_templates_kn.json" type="policy_templates" lang="kn" /> <output filename="app/policy/translations/policy_templates_kn-IN.json" type="policy_templates" lang="kn" />
<output filename="app/policy/translations/policy_templates_ko.json" type="policy_templates" lang="ko" /> <output filename="app/policy/translations/policy_templates_ko-KR.json" type="policy_templates" lang="ko" />
<output filename="app/policy/translations/policy_templates_lt.json" type="policy_templates" lang="lt" /> <output filename="app/policy/translations/policy_templates_lt-LT.json" type="policy_templates" lang="lt" />
<output filename="app/policy/translations/policy_templates_lv.json" type="policy_templates" lang="lv" /> <output filename="app/policy/translations/policy_templates_lv-LV.json" type="policy_templates" lang="lv" />
<output filename="app/policy/translations/policy_templates_ml.json" type="policy_templates" lang="ml" /> <output filename="app/policy/translations/policy_templates_ml.json" type="policy_templates" lang="ml" />
<output filename="app/policy/translations/policy_templates_mr.json" type="policy_templates" lang="mr" /> <output filename="app/policy/translations/policy_templates_mr-IN.json" type="policy_templates" lang="mr" />
<output filename="app/policy/translations/policy_templates_ms.json" type="policy_templates" lang="ms" /> <output filename="app/policy/translations/policy_templates_ms-MY.json" type="policy_templates" lang="ms" />
<output filename="app/policy/translations/policy_templates_nl.json" type="policy_templates" lang="nl" /> <output filename="app/policy/translations/policy_templates_nl-NL.json" type="policy_templates" lang="nl" />
<output filename="app/policy/translations/policy_templates_nb.json" type="policy_templates" lang="no" /> <output filename="app/policy/translations/policy_templates_nb-NO.json" type="policy_templates" lang="no" />
<!-- 'no' for Norwegian Bokmål. It should be 'nb'. --> <output filename="app/policy/translations/policy_templates_pl-PL.json" type="policy_templates" lang="pl" />
<output filename="app/policy/translations/policy_templates_pl.json" type="policy_templates" lang="pl" />
<output filename="app/policy/translations/policy_templates_pt-BR.json" type="policy_templates" lang="pt-BR" /> <output filename="app/policy/translations/policy_templates_pt-BR.json" type="policy_templates" lang="pt-BR" />
<output filename="app/policy/translations/policy_templates_pt-PT.json" type="policy_templates" lang="pt-PT" /> <output filename="app/policy/translations/policy_templates_pt-PT.json" type="policy_templates" lang="pt-PT" />
<output filename="app/policy/translations/policy_templates_ro.json" type="policy_templates" lang="ro" /> <output filename="app/policy/translations/policy_templates_ro-RO.json" type="policy_templates" lang="ro" />
<output filename="app/policy/translations/policy_templates_ru.json" type="policy_templates" lang="ru" /> <output filename="app/policy/translations/policy_templates_ru-RU.json" type="policy_templates" lang="ru" />
<output filename="app/policy/translations/policy_templates_sk.json" type="policy_templates" lang="sk" /> <output filename="app/policy/translations/policy_templates_sk-SK.json" type="policy_templates" lang="sk" />
<output filename="app/policy/translations/policy_templates_sl.json" type="policy_templates" lang="sl" /> <output filename="app/policy/translations/policy_templates_sl-SI.json" type="policy_templates" lang="sl" />
<output filename="app/policy/translations/policy_templates_sr.json" type="policy_templates" lang="sr" /> <output filename="app/policy/translations/policy_templates_Cy-sr-SP.json" type="policy_templates" lang="sr" />
<output filename="app/policy/translations/policy_templates_sv.json" type="policy_templates" lang="sv" /> <output filename="app/policy/translations/policy_templates_sv-SE.json" type="policy_templates" lang="sv" />
<output filename="app/policy/translations/policy_templates_sw.json" type="policy_templates" lang="sw" /> <output filename="app/policy/translations/policy_templates_sw-KE.json" type="policy_templates" lang="sw" />
<output filename="app/policy/translations/policy_templates_ta.json" type="policy_templates" lang="ta" /> <output filename="app/policy/translations/policy_templates_ta-IN.json" type="policy_templates" lang="ta" />
<output filename="app/policy/translations/policy_templates_te.json" type="policy_templates" lang="te" /> <output filename="app/policy/translations/policy_templates_te-IN.json" type="policy_templates" lang="te" />
<output filename="app/policy/translations/policy_templates_th.json" type="policy_templates" lang="th" /> <output filename="app/policy/translations/policy_templates_th-TH.json" type="policy_templates" lang="th" />
<output filename="app/policy/translations/policy_templates_tr.json" type="policy_templates" lang="tr" /> <output filename="app/policy/translations/policy_templates_tr-TR.json" type="policy_templates" lang="tr" />
<output filename="app/policy/translations/policy_templates_uk.json" type="policy_templates" lang="uk" /> <output filename="app/policy/translations/policy_templates_uk-UA.json" type="policy_templates" lang="uk" />
<output filename="app/policy/translations/policy_templates_vi.json" type="policy_templates" lang="vi" /> <output filename="app/policy/translations/policy_templates_vi-VN.json" type="policy_templates" lang="vi" />
<output filename="app/policy/translations/policy_templates_zh-CN.json" type="policy_templates" lang="zh-CN" /> <output filename="app/policy/translations/policy_templates_zh-CN.json" type="policy_templates" lang="zh-CN" />
<output filename="app/policy/translations/policy_templates_zh-TW.json" type="policy_templates" lang="zh-TW" /> <output filename="app/policy/translations/policy_templates_zh-TW.json" type="policy_templates" lang="zh-TW" />
</outputs> </outputs>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment