Bug 1308021 - Replace "iw" with "he" in cld2 detectLanguage results. …

…r=florian I have a pull request for these changes upstream: CLD2Owners/cld2#50 MozReview-Commit-ID: LUqrA4Genv0 UltraBlame original commit: df38d06ab30c18581e164677f4447a2c28b93439
marco-c · Sep 30, 2019 · 69af0e3 · 69af0e3
1 parent 620be3f
commit 69af0e3
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 116 deletions.
diff --git a/browser/components/translation/cld2/cld-worker.js b/browser/components/translation/cld2/cld-worker.js
diff --git a/browser/components/translation/cld2/cld-worker.js.mem b/browser/components/translation/cld2/cld-worker.js.mem
diff --git a/browser/components/translation/cld2/internal/cld_generated_score_quad_octa_0122_2.cc b/browser/components/translation/cld2/internal/cld_generated_score_quad_octa_0122_2.cc
@@ -637,4 +637,3 @@ extern const short kAvgDeltaOctaScore[kAvgDeltaOctaScoreSize] = {
 };
 
 }       
-
diff --git a/browser/components/translation/cld2/internal/compact_lang_det_hint_code.cc b/browser/components/translation/cld2/internal/compact_lang_det_hint_code.cc
@@ -174,7 +174,7 @@ static const LangTagLookup kCLDLangTagsHintTable1[kCLDTable1Size] = {
   {"haitian_creole", "ht", HAITIAN_CREOLE + W10, 0},
   {"hausa", "ha", HAUSA + W10, 0},
   {"hawaiian", "haw", HAWAIIAN + W10, 0},
-  {"hebrew", "iw", HEBREW + W10, 0},
+  {"hebrew", "he", HEBREW + W10, 0},
   {"hindi", "hi", HINDI + W10, MARATHI - W4},
   {"hn-in", "hi", HINDI + W10, MARATHI - W4},
   {"hungarian", "hu", HUNGARIAN + W10, 0},
@@ -447,9 +447,9 @@ static const LangTagLookup kCLDLangTagsHintTable2[kCLDTable2Size] = {
   {"ha", "ha", HAUSA + W10, 0},
   {"hat", "ht", HAITIAN_CREOLE + W10, 0},   
   {"haw", "haw", HAWAIIAN + W10, 0},
-  {"hb", "iw", HEBREW + W10, 0},
-  {"he", "iw", HEBREW + W10, 0},
-  {"heb", "iw", HEBREW + W10, 0},
+  {"hb", "he", HEBREW + W10, 0},
+  {"he", "he", HEBREW + W10, 0},
+  {"heb", "he", HEBREW + W10, 0},
   {"hi", "hi", HINDI + W10, MARATHI - W4},
   {"hk", "zhT", CHINESE_T + W10, 0},          
   {"hr", "hr", CROATIAN + W10, 0},
@@ -473,7 +473,7 @@ static const LangTagLookup kCLDLangTagsHintTable2[kCLDTable2Size] = {
   {"it", "it", ITALIAN + W10, 0},
   {"ita", "it", ITALIAN + W10, 0},
   {"iu", "iu,ik", INUKTITUT + W10, INUPIAK + W10},        
-  {"iw", "iw", HEBREW + W10, 0},
+  {"iw", "he", HEBREW + W10, 0},
 
   {"ja", "ja", JAPANESE + W10, 0},
   {"jp", "ja", JAPANESE + W10, 0},          
@@ -1647,5 +1647,3 @@ string GetLangTagsFromHtml(const char* utf8_body, int32 utf8_body_len,
 }       
 
 
-
-
diff --git a/browser/components/translation/cld2/internal/generated_language.cc b/browser/components/translation/cld2/internal/generated_language.cc
@@ -651,7 +651,7 @@ extern const char* const kLanguageToCode[kLanguageToCodeSize] = {
   "fi",    
   "fr",    
   "de",    
-  "iw",    
+  "he",    
   "it",    
   "ja",    
   "ko",    

diff --git a/browser/components/translation/test/unit/test_cld2.js b/browser/components/translation/test/unit/test_cld2.js
Original file line number	Diff line number	Diff line change
Expand Up		@@ -637,4 +637,3 @@ extern const short kAvgDeltaOctaScore[kAvgDeltaOctaScoreSize] = {
		};

		}
-Original file line number
+Diff line change
@@ Expand Up @@
       "fi",
       "fr",
       "de",
-      "iw",
+      "he",
       "it",
       "ja",
       "ko",
@@ Expand Down @@