Merge pull request #4232 from brave/maxk-fix-android-xtbs

Fix android_chrome_strings XTBs
brave · Dec 14, 2019 · f7395e6 · f7395e6
2 parents cb220f1 + 1e593b5
commit f7395e6
Show file tree

Hide file tree

Showing 53 changed files with 54,354 additions and 55,232 deletions.
diff --git a/android/java/strings/translations/android_chrome_strings_am.xtb b/android/java/strings/translations/android_chrome_strings_am.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_ar.xtb b/android/java/strings/translations/android_chrome_strings_ar.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_bg.xtb b/android/java/strings/translations/android_chrome_strings_bg.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_bn.xtb b/android/java/strings/translations/android_chrome_strings_bn.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_ca.xtb b/android/java/strings/translations/android_chrome_strings_ca.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_cs.xtb b/android/java/strings/translations/android_chrome_strings_cs.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_da.xtb b/android/java/strings/translations/android_chrome_strings_da.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_de.xtb b/android/java/strings/translations/android_chrome_strings_de.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_el.xtb b/android/java/strings/translations/android_chrome_strings_el.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_en-GB.xtb b/android/java/strings/translations/android_chrome_strings_en-GB.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_es-419.xtb b/android/java/strings/translations/android_chrome_strings_es-419.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_es.xtb b/android/java/strings/translations/android_chrome_strings_es.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_et.xtb b/android/java/strings/translations/android_chrome_strings_et.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_fa.xtb b/android/java/strings/translations/android_chrome_strings_fa.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_fi.xtb b/android/java/strings/translations/android_chrome_strings_fi.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_fil.xtb b/android/java/strings/translations/android_chrome_strings_fil.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_fr.xtb b/android/java/strings/translations/android_chrome_strings_fr.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_gu.xtb b/android/java/strings/translations/android_chrome_strings_gu.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_hi.xtb b/android/java/strings/translations/android_chrome_strings_hi.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_hr.xtb b/android/java/strings/translations/android_chrome_strings_hr.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_hu.xtb b/android/java/strings/translations/android_chrome_strings_hu.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_id.xtb b/android/java/strings/translations/android_chrome_strings_id.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_it.xtb b/android/java/strings/translations/android_chrome_strings_it.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_iw.xtb b/android/java/strings/translations/android_chrome_strings_iw.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_ja.xtb b/android/java/strings/translations/android_chrome_strings_ja.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_kn.xtb b/android/java/strings/translations/android_chrome_strings_kn.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_ko.xtb b/android/java/strings/translations/android_chrome_strings_ko.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_lt.xtb b/android/java/strings/translations/android_chrome_strings_lt.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_lv.xtb b/android/java/strings/translations/android_chrome_strings_lv.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_ml.xtb b/android/java/strings/translations/android_chrome_strings_ml.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_mr.xtb b/android/java/strings/translations/android_chrome_strings_mr.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_ms.xtb b/android/java/strings/translations/android_chrome_strings_ms.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_nl.xtb b/android/java/strings/translations/android_chrome_strings_nl.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_no.xtb b/android/java/strings/translations/android_chrome_strings_no.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_pl.xtb b/android/java/strings/translations/android_chrome_strings_pl.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_pt-BR.xtb b/android/java/strings/translations/android_chrome_strings_pt-BR.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_pt-PT.xtb b/android/java/strings/translations/android_chrome_strings_pt-PT.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_ro.xtb b/android/java/strings/translations/android_chrome_strings_ro.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_ru.xtb b/android/java/strings/translations/android_chrome_strings_ru.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_sk.xtb b/android/java/strings/translations/android_chrome_strings_sk.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_sl.xtb b/android/java/strings/translations/android_chrome_strings_sl.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_sr.xtb b/android/java/strings/translations/android_chrome_strings_sr.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_sv.xtb b/android/java/strings/translations/android_chrome_strings_sv.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_sw.xtb b/android/java/strings/translations/android_chrome_strings_sw.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_ta.xtb b/android/java/strings/translations/android_chrome_strings_ta.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_te.xtb b/android/java/strings/translations/android_chrome_strings_te.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_th.xtb b/android/java/strings/translations/android_chrome_strings_th.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_tr.xtb b/android/java/strings/translations/android_chrome_strings_tr.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_uk.xtb b/android/java/strings/translations/android_chrome_strings_uk.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_vi.xtb b/android/java/strings/translations/android_chrome_strings_vi.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_zh-CN.xtb b/android/java/strings/translations/android_chrome_strings_zh-CN.xtb
diff --git a/android/java/strings/translations/android_chrome_strings_zh-TW.xtb b/android/java/strings/translations/android_chrome_strings_zh-TW.xtb
diff --git a/script/lib/transifex.py b/script/lib/transifex.py
@@ -261,6 +261,7 @@ def get_fingerprint_for_xtb(message_tag):
     # To avoid negative ids we strip the high-order bit
     return str(fp & 0x7fffffffffffffffL)
 
+
 def is_translateable_string(grd_file_path, message_tag):
     if message_tag.get('translateable') != 'false':
         return True
@@ -284,6 +285,7 @@ def is_translateable_string(grd_file_path, message_tag):
             return True
     return False
 
+
 def get_grd_strings(grd_file_path):
     """Obtains a tubple of (name, value, FP) for each string in a GRD file"""
     strings = []
@@ -387,6 +389,7 @@ def get_xtb_files(grd_file_path):
 
 def get_original_grd(src_root, grd_file_path):
     """Obtains the Chromium GRD file for a specified Brave GRD file."""
+    # TODO: consider passing this mapping into the script from l10nUtil.js
     grd_file_name = os.path.basename(grd_file_path)
     if grd_file_name == 'components_brave_strings.grd':
         return os.path.join(src_root, 'components',
@@ -396,6 +399,9 @@ def get_original_grd(src_root, grd_file_path):
     elif grd_file_name == 'generated_resources.grd':
         return os.path.join(src_root, 'chrome', 'app',
                             'generated_resources.grd')
+    elif grd_file_name == 'android_chrome_strings.grd':
+        return os.path.join(src_root, 'chrome', 'android', 'java', 'strings',
+                            'android_chrome_strings.grd')
 
 
 def check_for_chromium_upgrade_extra_langs(src_root, grd_file_path):
@@ -515,7 +521,7 @@ def upload_missing_translations_to_transifex(source_string_path, lang_code,
                                              chromium_grd_strings, xtb_strings,
                                              chromium_xtb_strings):
     """For each chromium translation that we don't know about, upload it."""
-    lang_code = lang_code.replace('-', '_')
+    lang_code = lang_code.replace('-', '_').replace('iw', 'he')
     for idx, (string_name, string_value,
               string_fp, desc) in enumerate(grd_strings):
         string_fp = str(string_fp)