aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Kaijser <machine.sanctum@gmail.com>2013-04-24 02:35:07 -0700
committerMartijn Kaijser <machine.sanctum@gmail.com>2013-04-24 02:35:07 -0700
commit82a20ae0c0933ec09460c7a682c6b0afdb0b75e5 (patch)
treebd1da814516cfce81c2ba4c5785ecc5422603525
parentc0ca39c251953b96c3a1508edeb44d2267ed0295 (diff)
parent2e91e5a2a48b83908dbf1733ecaf7ec1ff427cb5 (diff)
Merge pull request #2651 from ace20022/lang_codes
Fix and extend ISO 639 lists
-rw-r--r--xbmc/utils/LangCodeExpander.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/xbmc/utils/LangCodeExpander.cpp b/xbmc/utils/LangCodeExpander.cpp
index 0f1c58525c..706beebc8b 100644
--- a/xbmc/utils/LangCodeExpander.cpp
+++ b/xbmc/utils/LangCodeExpander.cpp
@@ -32,8 +32,8 @@ typedef struct LCENTRY
const char *name;
} LCENTRY;
-extern const struct LCENTRY g_iso639_1[143];
-extern const struct LCENTRY g_iso639_2[536];
+extern const struct LCENTRY g_iso639_1[144];
+extern const struct LCENTRY g_iso639_2[537];
struct CharCodeConvertionWithHack
{
@@ -312,10 +312,11 @@ bool CLangCodeExpander::LookupInDb(CStdString& desc, const CStdString& code)
return false;
}
-extern const LCENTRY g_iso639_1[143] =
+extern const LCENTRY g_iso639_1[144] =
{
{ MAKECODE('\0','\0','c','c'), "Closed Caption" },
{ MAKECODE('\0','\0','a','a'), "Afar" },
+ { MAKECODE('\0','\0','a','b'), "Abkhaz" },
{ MAKECODE('\0','\0','a','b'), "Abkhazian" },
{ MAKECODE('\0','\0','a','f'), "Afrikaans" },
{ MAKECODE('\0','\0','a','m'), "Amharic" },
@@ -336,7 +337,7 @@ extern const LCENTRY g_iso639_1[143] =
{ MAKECODE('\0','\0','c','s'), "Czech" },
{ MAKECODE('\0','\0','c','y'), "Welsh" },
{ MAKECODE('\0','\0','d','a'), "Dansk" },
- { MAKECODE('\0','\0','d','e'), "Deutsch" },
+ { MAKECODE('\0','\0','d','e'), "German" },
{ MAKECODE('\0','\0','d','z'), "Bhutani" },
{ MAKECODE('\0','\0','e','l'), "Greek" },
{ MAKECODE('\0','\0','e','n'), "English" },
@@ -407,7 +408,7 @@ extern const LCENTRY g_iso639_1[143] =
{ MAKECODE('\0','\0','p','a'), "Punjabi" },
{ MAKECODE('\0','\0','p','l'), "Polish" },
{ MAKECODE('\0','\0','p','s'), "Pashto, Pushto" },
- { MAKECODE('\0','\0','p','t'), "Portugues" },
+ { MAKECODE('\0','\0','p','t'), "Portuguese" },
{ MAKECODE('\0','\0','q','u'), "Quechua" },
{ MAKECODE('\0','\0','r','m'), "Rhaeto-Romance" },
{ MAKECODE('\0','\0','r','n'), "Kirundi" },
@@ -459,9 +460,10 @@ extern const LCENTRY g_iso639_1[143] =
{ MAKECODE('\0','\0','z','u'), "Zulu" },
};
-extern const LCENTRY g_iso639_2[536] =
+extern const LCENTRY g_iso639_2[537] =
{
- { MAKECODE('\0','a','b','k'), "Abkhazian" },
+ { MAKECODE('\0','a','b','k'), "Abkhaz" },
+ { MAKECODE('\0','a','b','k'), "Abkhazian" },
{ MAKECODE('\0','a','c','e'), "Achinese" },
{ MAKECODE('\0','a','c','h'), "Acoli" },
{ MAKECODE('\0','a','d','a'), "Adangme" },