From e92c513699c1426169229f91ca74dc1bcdacb047 Mon Sep 17 00:00:00 2001
From: Shlomo Hakim <shlomo.hakim@gmail.com>
Date: Thu, 3 Mar 2016 23:12:38 +0200
Subject: Support language code changes between ISO639 and ISO639-1

---
 libhb/lang.c | 12 +++++++-----
 libhb/lang.h |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/libhb/lang.c b/libhb/lang.c
index c51c80ad5..7d508af51 100644
--- a/libhb/lang.c
+++ b/libhb/lang.c
@@ -74,7 +74,7 @@ static const iso639_lang_t languages[] =
   { "Gujarati", "ગુજરાતી", "gu", "guj" },
   { "Haitian", "", "ht", "hat" },
   { "Hausa", "Hausa", "ha", "hau" },
-  { "Hebrew", "עברית", "he", "heb" },
+  { "Hebrew", "עברית", "he", "heb", "", "iw" },
   { "Herero", "Otjiherero", "hz", "her" },
   { "Hindi", "हिंदी", "hi", "hin" },
   { "Hiri Motu", "", "ho", "hmo" },
@@ -85,11 +85,11 @@ static const iso639_lang_t languages[] =
   { "Inuktitut", "Inuktitut", "iu", "iku" },
   { "Interlingue", "", "ie", "ile" },
   { "Interlingua", "", "ia", "ina" },
-  { "Indonesian", "Bahasa Indonesia", "id", "ind" },
+  { "Indonesian", "Bahasa Indonesia", "id", "ind", "", "in" },
   { "Inupiaq", "", "ik", "ipk" },
   { "Irish", "Gaeilge", "ga", "gle" },
   { "Italian", "italiano", "it", "ita" },
-  { "Javanese", "Basa Jawa", "jv", "jav" },
+  { "Javanese", "Basa Jawa", "jv", "jav", "", "jw" },
   { "Japanese", "日本語", "ja", "jpn" },
   { "Kannada", "", "kn", "kan" },
   { "Kashmiri", "کٲشُر", "ks", "kas" },
@@ -194,7 +194,7 @@ static const iso639_lang_t languages[] =
   { "Walloon", "Walon", "wa", "wln" },
   { "Wolof", "Wolof", "wo", "wol" },
   { "Xhosa", "isiXhosa", "xh", "xho" },
-  { "Yiddish", "ייִדיש", "yi", "yid" },
+  { "Yiddish", "ייִדיש", "yi", "yid", "", "ji" },
   { "Yoruba", "Èdè Yorùbá", "yo", "yor" },
   { "Zhuang", "Vahcuengh", "za", "zha" },
   { "Zulu", "isiZulu", "zu", "zul" },
@@ -217,6 +217,7 @@ const int lang_lookup_index( const char * str )
     {
         lang = &languages[ii];
         if ((lang->iso639_1    != NULL && !strcasecmp(lang->iso639_1,  str)) ||
+            (lang->iso639      != NULL && !strcasecmp(lang->iso639,    str)) ||
             (lang->iso639_2    != NULL && !strcasecmp(lang->iso639_2,  str)) ||
             (lang->iso639_2b   != NULL && !strcasecmp(lang->iso639_2b, str)) ||
             (lang->eng_name    != NULL && !strcasecmp(lang->eng_name,  str)) ||
@@ -252,7 +253,8 @@ iso639_lang_t * lang_for_code( int code )
 
     for( lang = (iso639_lang_t*) languages; lang->eng_name; lang++ )
     {
-        if( !strncmp( lang->iso639_1, code_string, 2 ) )
+        if( !strncmp( lang->iso639_1, code_string, 2 ) ||
+        	(lang->iso639 != NULL && !strncmp(lang->iso639, code_string, 2)) )
         {
             return lang;
         }
diff --git a/libhb/lang.h b/libhb/lang.h
index a0db17162..69c67ec13 100644
--- a/libhb/lang.h
+++ b/libhb/lang.h
@@ -17,7 +17,7 @@ typedef struct iso639_lang_t
     char * iso639_1;        /* ISO-639-1 (2 characters) code */
     char * iso639_2;        /* ISO-639-2/t (3 character) code */
     char * iso639_2b;       /* ISO-639-2/b code (if different from above) */
-
+	char * iso639;			/* Obsolete ISO-639 code (if changed in ISO-639-1) */
 } iso639_lang_t;
 
 #ifdef __cplusplus
-- 
cgit v1.2.3