aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--language/Bulgarian/langinfo.xml4
-rw-r--r--language/Catalan/langinfo.xml6
-rw-r--r--language/Chinese (Simple)/langinfo.xml6
-rw-r--r--language/Chinese (Traditional)/langinfo.xml6
-rw-r--r--language/Croatian/langinfo.xml4
-rw-r--r--language/Czech/langinfo.xml4
-rw-r--r--language/Danish/langinfo.xml2
-rw-r--r--language/Dutch/langinfo.xml2
-rw-r--r--language/English (US)/langinfo.xml14
-rw-r--r--language/English/langinfo.xml18
-rw-r--r--language/Esperanto/langinfo.xml2
-rw-r--r--language/Finnish/langinfo.xml4
-rw-r--r--language/French/langinfo.xml16
-rw-r--r--language/German/langinfo.xml12
-rw-r--r--language/Greek/langinfo.xml2
-rw-r--r--language/Hebrew/langinfo.xml2
-rw-r--r--language/Hungarian/langinfo.xml10
-rw-r--r--language/Icelandic/langinfo.xml4
-rw-r--r--language/Indonesian/langinfo.xml2
-rw-r--r--language/Italian/langinfo.xml6
-rw-r--r--language/Japanese/langinfo.xml4
-rw-r--r--language/Korean/langinfo.xml6
-rw-r--r--language/Maltese/langinfo.xml4
-rw-r--r--language/Norwegian/langinfo.xml2
-rw-r--r--language/Polish/langinfo.xml4
-rw-r--r--language/Portuguese (Brazil)/langinfo.xml4
-rw-r--r--language/Portuguese/langinfo.xml4
-rw-r--r--language/Romanian/langinfo.xml4
-rw-r--r--language/Russian/langinfo.xml4
-rw-r--r--language/Serbian (Cyrillic)/langinfo.xml6
-rw-r--r--language/Serbian/langinfo.xml6
-rw-r--r--language/Slovak/langinfo.xml4
-rw-r--r--language/Slovenian/langinfo.xml2
-rw-r--r--language/Spanish (Mexico)/langinfo.xml4
-rw-r--r--language/Spanish/langinfo.xml4
-rw-r--r--language/Swedish/langinfo.xml4
-rw-r--r--language/Turkish/langinfo.xml4
-rw-r--r--language/Ukrainian/langinfo.xml2
-rw-r--r--xbmc/LangInfo.cpp29
-rw-r--r--xbmc/LangInfo.h6
40 files changed, 134 insertions, 99 deletions
diff --git a/language/Bulgarian/langinfo.xml b/language/Bulgarian/langinfo.xml
index 9cb4e992fa..9c3f5dc28e 100644
--- a/language/Bulgarian/langinfo.xml
+++ b/language/Bulgarian/langinfo.xml
@@ -46,7 +46,7 @@
-<language>
+<language locale="bgr">
<charsets>
<gui>CP1251</gui>
<subtitle>CP1251</subtitle>
@@ -59,7 +59,7 @@
</dvd>
<regions>
- <region name="Bulgaria">
+ <region name="Bulgaria" locale="BGR">
<dateshort>DD.MM.YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY 'г.'</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
diff --git a/language/Catalan/langinfo.xml b/language/Catalan/langinfo.xml
index cef5070a3a..8f3d81a24b 100644
--- a/language/Catalan/langinfo.xml
+++ b/language/Catalan/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<language>
+<language locale="cat">
<charsets>
<gui unicodefont="false">CP1252</gui>
<subtitle>CP1252</subtitle>
@@ -10,7 +10,7 @@
<subtitle>ca</subtitle>
</dvd>
<regions>
- <region name="Cataluña">
+ <region name="Cataluña" locale="ES">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D / MMMM / YYYY</datelong>
<time symbolAM="" symbolPM="">HH:mm:ss</time>
@@ -19,7 +19,7 @@
<timezone>CEST</timezone>
</region>
<regions>
- <region name="Principat d’Andorra">
+ <region name="Principat d’Andorra" locale="ES">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D / MMMM / YYYY</datelong>
<time symbolAM="" symbolPM="">HH:mm:ss</time>
diff --git a/language/Chinese (Simple)/langinfo.xml b/language/Chinese (Simple)/langinfo.xml
index 6b379e8552..3dad1dac5c 100644
--- a/language/Chinese (Simple)/langinfo.xml
+++ b/language/Chinese (Simple)/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<language>
+<language locale="chs">
<charsets>
<gui unicodefont="true">CP936</gui>
<subtitle>CP936</subtitle>
@@ -10,14 +10,14 @@
<subtitle>zh</subtitle>
</dvd>
<regions>
- <region name="Beijing (12h)">
+ <region name="Beijing (12h)" locale="china">
<dateshort>YYYY-M-D</dateshort>
<datelong>YYYY'年'M'月'D'日' DDDD</datelong>
<time symbolAM="上午" symbolPM="下午">xx h:mm:ss</time>
<tempunit>C</tempunit>
<speedunit>kmh</speedunit>
</region>
- <region name="Beijing (24h)">
+ <region name="Beijing (24h)" locale="china">
<dateshort>YYYY-M-D</dateshort>
<datelong>YYYY'年'M'月'D'日' DDDD</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
diff --git a/language/Chinese (Traditional)/langinfo.xml b/language/Chinese (Traditional)/langinfo.xml
index 2cc8b869f6..4c1de62649 100644
--- a/language/Chinese (Traditional)/langinfo.xml
+++ b/language/Chinese (Traditional)/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<language>
+<language locale="cht">
<charsets>
<gui unicodefont="true">CP950</gui>
<subtitle>CP950</subtitle>
@@ -10,14 +10,14 @@
<subtitle>zh</subtitle>
</dvd>
<regions>
- <region name="台北 (12h)">
+ <region name="台北 (12h)" locale="china">
<dateshort>YYYY/MM/DD</dateshort>
<datelong>YYYY年M月D日 DDDD</datelong>
<time symbolAM="上午" symbolPM="下午">xx h:mm:ss</time>
<tempunit>C</tempunit>
<speedunit>kmh</speedunit>
</region>
- <region name="台北 (24h)">
+ <region name="台北 (24h)" locale="china">
<dateshort>YYYY/MM/DD</dateshort>
<datelong>YYYY年M月D日 DDDD</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
diff --git a/language/Croatian/langinfo.xml b/language/Croatian/langinfo.xml
index 2faa7061fe..7b7e69f0b7 100644
--- a/language/Croatian/langinfo.xml
+++ b/language/Croatian/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<language>
+<language locale="hr">
<charsets>
<gui unicodefont="false">CP1250</gui>
<subtitle>CP1250</subtitle>
@@ -10,7 +10,7 @@
<subtitle>hr</subtitle>
</dvd>
<regions>
- <region name="CRO">
+ <region name="CRO" locale="HR">
<dateshort>YYYY-MM-DD</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
diff --git a/language/Czech/langinfo.xml b/language/Czech/langinfo.xml
index b96860346a..2286e2c5fe 100644
--- a/language/Czech/langinfo.xml
+++ b/language/Czech/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<language>
+<language locale="czech">
<charsets>
<gui>CP1250</gui>
<subtitle>CP1250</subtitle>
@@ -12,7 +12,7 @@
</dvd>
<regions>
- <region name="CZ">
+ <region name="CZ" locale="CZE">
<dateshort>D.M.YYYY</dateshort>
<datelong>D. MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
diff --git a/language/Danish/langinfo.xml b/language/Danish/langinfo.xml
index 0006b9213c..9c6772f88a 100644
--- a/language/Danish/langinfo.xml
+++ b/language/Danish/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<language>
+<language locale="danish">
<charsets>
<gui>CP1252</gui>
<subtitle>CP1252</subtitle>
diff --git a/language/Dutch/langinfo.xml b/language/Dutch/langinfo.xml
index 03542a1351..e9c68ef528 100644
--- a/language/Dutch/langinfo.xml
+++ b/language/Dutch/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<language>
+<language locale="dutch">
<charsets>
<gui unicodefont="false">CP1252</gui>
<subtitle>CP1252</subtitle>
diff --git a/language/English (US)/langinfo.xml b/language/English (US)/langinfo.xml
index fa060e565b..5b4b2f13d2 100644
--- a/language/English (US)/langinfo.xml
+++ b/language/English (US)/langinfo.xml
@@ -46,7 +46,7 @@
-<language>
+<language locale="English-us">
<charsets>
<gui>CP1252</gui>
<subtitle>CP1252</subtitle>
@@ -59,7 +59,7 @@
</dvd>
<regions>
- <region name="USA">
+ <region name="USA" locale="USA">
<dateshort>MM/DD/YYYY</dateshort>
<datelong>DDDD, MMMM D, YYYY</datelong>
<time symbolAM="AM" symbolPM="PM">h:mm:ss xx</time>
@@ -67,7 +67,7 @@
<speedunit>mph</speedunit>
</region>
- <region name="UK (12h)">
+ <region name="UK (12h)" locale="UK">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="AM" symbolPM="PM">h:mm:ss xx</time>
@@ -76,7 +76,7 @@
<timezone>GMT</timezone>
</region>
- <region name="UK (24h)">
+ <region name="UK (24h)" locale="UK">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
@@ -85,7 +85,7 @@
<timezone>GMT</timezone>
</region>
- <region name="Canada">
+ <region name="Canada" locale="Canada">
<dateshort>MM/DD/YYYY</dateshort>
<datelong>DDDD, MMMM D, YYYY</datelong>
<time symbolAM="AM" symbolPM="PM">h:mm:ss xx</time>
@@ -93,7 +93,7 @@
<speedunit>kmh</speedunit>
</region>
- <region name="Australia (12h)">
+ <region name="Australia (12h)" locale="Australia">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="AM" symbolPM="PM">h:mm:ss xx</time>
@@ -102,7 +102,7 @@
<timezone>GMT</timezone>
</region>
- <region name="Australia (24h)">
+ <region name="Australia (24h)" locale="Australia">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="AM" symbolPM="PM">H:mm:ss</time>
diff --git a/language/English/langinfo.xml b/language/English/langinfo.xml
index 5ef92e5813..996a25a0fb 100644
--- a/language/English/langinfo.xml
+++ b/language/English/langinfo.xml
@@ -46,7 +46,7 @@
-<language>
+<language locale="English">
<charsets>
<gui>CP1252</gui>
<subtitle>CP1252</subtitle>
@@ -59,7 +59,7 @@
</dvd>
<regions>
- <region name="USA">
+ <region name="USA" locale="USA">
<dateshort>MM/DD/YYYY</dateshort>
<datelong>DDDD, MMMM D, YYYY</datelong>
<time symbolAM="AM" symbolPM="PM">h:mm:ss xx</time>
@@ -67,7 +67,7 @@
<speedunit>mph</speedunit>
</region>
- <region name="UK (12h)">
+ <region name="UK (12h)" locale="UK">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="AM" symbolPM="PM">h:mm:ss xx</time>
@@ -76,7 +76,7 @@
<timezone>GMT</timezone>
</region>
- <region name="UK (24h)">
+ <region name="UK (24h)" locale="UK">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
@@ -85,7 +85,7 @@
<timezone>GMT</timezone>
</region>
- <region name="Canada">
+ <region name="Canada" locale="Canada">
<dateshort>MM/DD/YYYY</dateshort>
<datelong>DDDD, MMMM D, YYYY</datelong>
<time symbolAM="AM" symbolPM="PM">h:mm:ss xx</time>
@@ -93,7 +93,7 @@
<speedunit>kmh</speedunit>
</region>
- <region name="Australia (12h)">
+ <region name="Australia (12h)" locale="Australia">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="AM" symbolPM="PM">h:mm:ss xx</time>
@@ -102,7 +102,7 @@
<timezone>GMT</timezone>
</region>
- <region name="Australia (24h)">
+ <region name="Australia (24h)" locale="Australia">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="AM" symbolPM="PM">H:mm:ss</time>
@@ -120,7 +120,7 @@
<timezone>CET</timezone>
</region>
- <region name="India (12h)">
+ <region name="India (12h)" locale="India">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="AM" symbolPM="PM">h:mm:ss xx</time>
@@ -129,7 +129,7 @@
<timezone>GMT</timezone>
</region>
- <region name="India (24h)">
+ <region name="India (24h)" locale="India">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="AM" symbolPM="PM">H:mm:ss</time>
diff --git a/language/Esperanto/langinfo.xml b/language/Esperanto/langinfo.xml
index 6695c23579..283e0fc85e 100644
--- a/language/Esperanto/langinfo.xml
+++ b/language/Esperanto/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<language>
+<language locale="Epo">
<charsets>
<gui>CP1252</gui>
<subtitle>CP1252</subtitle>
diff --git a/language/Finnish/langinfo.xml b/language/Finnish/langinfo.xml
index 7ab71c9463..05825b0ea7 100644
--- a/language/Finnish/langinfo.xml
+++ b/language/Finnish/langinfo.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--Date of translation: 19/4/2009 -->
-<language>
+<language locale="Finnish">
<charsets>
<gui>CP1252</gui>
<subtitle>CP1252</subtitle>
@@ -13,7 +13,7 @@
</dvd>
<regions>
- <region name="Finland">
+ <region name="Finland" locale="Finland">
<dateshort>D.M.YYYY</dateshort>
<datelong>D. MMMM'ta 'YYYY</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
diff --git a/language/French/langinfo.xml b/language/French/langinfo.xml
index 1042f157a8..06a66df9bd 100644
--- a/language/French/langinfo.xml
+++ b/language/French/langinfo.xml
@@ -4,7 +4,7 @@
<!-- Link: -->
<!-- http://www.worldtimezone.com/ -->
-<language>
+<language locale="French">
<charsets>
<gui>CP1252</gui>
<subtitle>CP1252</subtitle>
@@ -17,7 +17,7 @@
</dvd>
<regions>
- <region name="France">
+ <region name="France" locale="France">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
@@ -26,7 +26,7 @@
<timezone>CEST</timezone>
</region>
- <region name="Belgique">
+ <region name="Belgique" locale="Belgium">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
@@ -35,7 +35,7 @@
<timezone>CEST</timezone>
</region>
- <region name="Luxembourg">
+ <region name="Luxembourg" locale="ltz">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
@@ -44,7 +44,7 @@
<timezone>CEST</timezone>
</region>
- <region name="Suisse">
+ <region name="Suisse" locale="che">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
@@ -62,7 +62,7 @@
<timezone>CEST</timezone>
</region>
- <region name="Canada">
+ <region name="Canada" locale="Canada">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
@@ -72,7 +72,7 @@
</region>
<!-- For USA timezone is set EST, french lang only: For peoples french stay in Florida -->
- <region name="USA">
+ <region name="USA" locale="USA">
<dateshort>MM/DD/YYYY</dateshort>
<datelong>DDDD, MMMM D, YYYY</datelong>
<time symbolAM="AM" symbolPM="PM">h:mm:ss xx</time>
@@ -81,7 +81,7 @@
<timezone>EST</timezone>
</region>
- <region name="UK">
+ <region name="UK" locale="UK">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
diff --git a/language/German/langinfo.xml b/language/German/langinfo.xml
index 1a927a1a81..e153b7a9f2 100644
--- a/language/German/langinfo.xml
+++ b/language/German/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<language>
+<language locale="german">
<charsets>
<gui unicodefont="false">CP1252</gui>
@@ -13,7 +13,7 @@
</dvd>
<regions>
- <region name="Schweiz">
+ <region name="Schweiz" locale="che">
<dateshort>DD.MM.YYYY</dateshort>
<datelong>DDDD, D. MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">HH:mm:ss</time>
@@ -37,7 +37,7 @@
<speedunit>kmh</speedunit>
<timezone>CEST</timezone>
</region>
- <region name="Südtirol">
+ <region name="Südtirol" locale="ita">
<dateshort>DD.MM.YYYY</dateshort>
<datelong>DDDD, D. MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">HH:mm:ss</time>
@@ -45,7 +45,7 @@
<speedunit>kmh</speedunit>
<timezone>CEST</timezone>
</region>
- <region name="Luxemburg">
+ <region name="Luxemburg" locale="ltz">
<dateshort>DD.MM.YYYY</dateshort>
<datelong>DDDD, D. MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">HH:mm:ss</time>
@@ -53,7 +53,7 @@
<speedunit>kmh</speedunit>
<timezone>CEST</timezone>
</region>
- <region name="Belgien">
+ <region name="Belgien" locale="Belgium">
<dateshort>DD.MM.YYYY</dateshort>
<datelong>DDDD, D. MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">HH:mm:ss</time>
@@ -61,7 +61,7 @@
<speedunit>kmh</speedunit>
<timezone>CEST</timezone>
</region>
- <region name="Deutschland">
+ <region name="Deutschland" locale="germany">
<dateshort>DD.MM.YYYY</dateshort>
<datelong>DDDD, D. MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">HH:mm:ss</time>
diff --git a/language/Greek/langinfo.xml b/language/Greek/langinfo.xml
index e4a1b5d20c..a01d3dcf59 100644
--- a/language/Greek/langinfo.xml
+++ b/language/Greek/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<language>
+<language lang="Greek">
<charsets>
<gui unicodefont="true">CP1253</gui>
<subtitle>CP1253</subtitle>
diff --git a/language/Hebrew/langinfo.xml b/language/Hebrew/langinfo.xml
index 9c6e10159b..c32e2f1320 100644
--- a/language/Hebrew/langinfo.xml
+++ b/language/Hebrew/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<language>
+<language locale="Hebrew">
<charsets>
<gui unicodefont="true">CP1255</gui>
<subtitle>CP1255</subtitle>
diff --git a/language/Hungarian/langinfo.xml b/language/Hungarian/langinfo.xml
index 92eeabbd16..b6ca006f82 100644
--- a/language/Hungarian/langinfo.xml
+++ b/language/Hungarian/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<language>
+<language locale="hungarian">
<charsets>
<gui unicodefont="true">CP1250</gui>
<subtitle>CP1250</subtitle>
@@ -10,21 +10,21 @@
<subtitle>hu</subtitle>
</dvd>
<regions>
- <region name="Budapest, Hungary">
+ <region name="Budapest, Hungary" locale="hungary">
<dateshort>YYYY.MM.DD.</dateshort>
<datelong>YYYY. MMMM D.</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
<tempunit>C</tempunit>
<speedunit>kmh</speedunit>
</region>
- <region name="Debrecen, Hungary">
+ <region name="Debrecen, Hungary" locale="hungary">
<dateshort>YYYY.MM.DD.</dateshort>
<datelong>YYYY. MMMM D.</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
<tempunit>C</tempunit>
<speedunit>kmh</speedunit>
</region>
- <region name="Nagykanizsa, Hungary">
+ <region name="Nagykanizsa, Hungary" locale="hungary">
<dateshort>YYYY.MM.DD.</dateshort>
<datelong>YYYY. MMMM D.</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
@@ -32,7 +32,7 @@
<speedunit>kmh</speedunit>
</region>
- <region name="Pecs/Pogany, Hungary">
+ <region name="Pecs/Pogany, Hungary" locale="hungary">
<dateshort>YYYY.MM.DD.</dateshort>
<datelong>YYYY. MMMM D.</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
diff --git a/language/Icelandic/langinfo.xml b/language/Icelandic/langinfo.xml
index 54666f34e2..412de9647d 100644
--- a/language/Icelandic/langinfo.xml
+++ b/language/Icelandic/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<language>
+<language locale="icelandic">
<charsets>
<gui>CP1252</gui>
<subtitle>CP1252</subtitle>
@@ -12,7 +12,7 @@
</dvd>
<regions>
- <region name="IS">
+ <region name="IS" locale="iceland">
<dateshort>D.M.YYYY</dateshort>
<datelong>DDDD, D. MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">HH:mm:ss</time>
diff --git a/language/Indonesian/langinfo.xml b/language/Indonesian/langinfo.xml
index 90e1dd3fcf..2bd726a041 100644
--- a/language/Indonesian/langinfo.xml
+++ b/language/Indonesian/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<language>
+<language locale="Indonesian">
<charsets>
<gui>CP1252</gui>
<subtitle>CP1252</subtitle>
diff --git a/language/Italian/langinfo.xml b/language/Italian/langinfo.xml
index 327ba938b9..6aa57a4d20 100644
--- a/language/Italian/langinfo.xml
+++ b/language/Italian/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<language>
+<language locale="italian">
<charsets>
<gui>CP1252</gui>
<subtitle>CP1252</subtitle>
@@ -12,7 +12,7 @@
</dvd>
<regions>
- <region name="Italia">
+ <region name="Italia" locale="italy">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD D MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
@@ -20,7 +20,7 @@
<speedunit>kmh</speedunit>
<timezone>CEST</timezone>
</region>
- <region name="Svizzera">
+ <region name="Svizzera" locale="che">
<dateshort>DD.MM.YYYY</dateshort>
<datelong>DDDD, D. MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">HH:mm:ss</time>
diff --git a/language/Japanese/langinfo.xml b/language/Japanese/langinfo.xml
index 4a07ecbff1..67400b073c 100644
--- a/language/Japanese/langinfo.xml
+++ b/language/Japanese/langinfo.xml
@@ -47,7 +47,7 @@
<!-- Link: -->
<!-- http://etext.virginia.edu/tei/iso639.html -->
-<language>
+<language locale="japanese">
<charsets>
<gui unicodefont="true">CP932</gui>
<subtitle>CP932</subtitle>
@@ -60,7 +60,7 @@
</dvd>
<regions>
- <region name="Japan">
+ <region name="Japan" locale="Japan">
<dateshort>YYYY/MM/DD</dateshort>
<datelong>YYYY'年'M'月'D'日' DDDD</datelong>
<time symbolAM="AM" symbolPM="PM">h:mm:ss xx</time>
diff --git a/language/Korean/langinfo.xml b/language/Korean/langinfo.xml
index 0c5657fad0..ed3ca1339c 100644
--- a/language/Korean/langinfo.xml
+++ b/language/Korean/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<language>
+<language locale="korean">
<charsets>
<gui unicodefont="true">CP949</gui>
<subtitle>CP949</subtitle>
@@ -10,14 +10,14 @@
<subtitle>ko</subtitle>
</dvd>
<regions>
- <region name="Korea (12h)">
+ <region name="Korea (12h)" locale="korea">
<dateshort>YYYY-MM-DD</dateshort>
<datelong>YYYY'년' M'월' D'일' DDDD</datelong>
<time symbolAM="오전" symbolPM="오후">xx h:mm:ss</time>
<tempunit>C</tempunit>
<speedunit>kmh</speedunit>
</region>
- <region name="Korea (24h)">
+ <region name="Korea (24h)" locale="korea">
<dateshort>YYYY-MM-DD</dateshort>
<datelong>YYYY'년' M'월' D'일' DDDD</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
diff --git a/language/Maltese/langinfo.xml b/language/Maltese/langinfo.xml
index 2d8fba08e8..a53bc7304d 100644
--- a/language/Maltese/langinfo.xml
+++ b/language/Maltese/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<language>
+<language locale="Mlt">
<charsets>
<gui unicodefont="true">CP1252</gui>
<subtitle>CP1252</subtitle>
@@ -10,7 +10,7 @@
<subtitle>mt</subtitle>
</dvd>
<regions>
- <region name="Malta">
+ <region name="Malta" locale="Malta">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
diff --git a/language/Norwegian/langinfo.xml b/language/Norwegian/langinfo.xml
index 2915136f4d..40641df877 100644
--- a/language/Norwegian/langinfo.xml
+++ b/language/Norwegian/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<language>
+<language locale="Norwegian">
<charsets>
<gui unicodefont="false">CP1252</gui>
<subtitle>CP1252</subtitle>
diff --git a/language/Polish/langinfo.xml b/language/Polish/langinfo.xml
index cf368da31c..5b36a7d125 100644
--- a/language/Polish/langinfo.xml
+++ b/language/Polish/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<language>
+<language locale="Polish">
<charsets>
<gui unicodefont="true">ISO-8859-2</gui>
<subtitle>CP1250</subtitle>
@@ -10,7 +10,7 @@
<subtitle>pl</subtitle>
</dvd>
<regions>
- <region name="Polska">
+ <region name="Polska" locale="Polska">
<dateshort>DD.MM.YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">HH:mm:ss</time>
diff --git a/language/Portuguese (Brazil)/langinfo.xml b/language/Portuguese (Brazil)/langinfo.xml
index 847c50194f..8aa4092f61 100644
--- a/language/Portuguese (Brazil)/langinfo.xml
+++ b/language/Portuguese (Brazil)/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<language>
+<language locale="portuguese">
<charsets>
<gui unicodefont="true">CP1252</gui>
<subtitle>CP1252</subtitle>
@@ -10,7 +10,7 @@
<subtitle>pt</subtitle>
</dvd>
<regions>
- <region name="Brazil">
+ <region name="Brazil" locale="Brazil">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D' de 'MMMM' de 'YYYY</datelong>
<time symbolAM="" symbolPM="">HH:mm:ss</time>
diff --git a/language/Portuguese/langinfo.xml b/language/Portuguese/langinfo.xml
index 4a2efd903d..30cec3baef 100644
--- a/language/Portuguese/langinfo.xml
+++ b/language/Portuguese/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<language>
+<language locale="Portuguese">
<charsets>
<gui unicodefont="true">CP1252</gui>
<subtitle>CP1252</subtitle>
@@ -12,7 +12,7 @@
</dvd>
<regions>
- <region name="Portugal">
+ <region name="Portugal" locale="Portugal">
<dateshort>DD-MM-YYYY</dateshort>
<datelong>DDDD, D' de 'MMMM' de 'YYYY</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
diff --git a/language/Romanian/langinfo.xml b/language/Romanian/langinfo.xml
index bd369ff3ef..b3c23c51b4 100644
--- a/language/Romanian/langinfo.xml
+++ b/language/Romanian/langinfo.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<language>
+<language locale="Romanian">
<charsets>
<gui>UTF-8</gui>
<subtitle>ISO-8859-2</subtitle>
@@ -13,7 +13,7 @@
</dvd>
<regions>
- <region name="România">
+ <region name="România" locale="Romania">
<dateshort>DD.MM.YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="AM" symbolPM="PM">h:mm:ss xx</time>
diff --git a/language/Russian/langinfo.xml b/language/Russian/langinfo.xml
index b103415376..646cb3d770 100644
--- a/language/Russian/langinfo.xml
+++ b/language/Russian/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<language>
+<language locale="Russian">
<charsets>
<gui unicodefont="true">utf-8</gui>
<subtitle>utf-8</subtitle>
@@ -10,7 +10,7 @@
<subtitle>ru</subtitle>
</dvd>
<regions>
- <region name="Russia">
+ <region name="Russia" locale="Russia">
<dateshort>DD.MM.YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY 'г.'</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
diff --git a/language/Serbian (Cyrillic)/langinfo.xml b/language/Serbian (Cyrillic)/langinfo.xml
index e80572ced6..50ca23f7ba 100644
--- a/language/Serbian (Cyrillic)/langinfo.xml
+++ b/language/Serbian (Cyrillic)/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<language>
+<language locale="Serbian (Cyrillic)">
<charsets>
<gui>CP1250</gui>
<subtitle>CP1250</subtitle>
@@ -12,7 +12,7 @@
</dvd>
<regions>
- <region name="Србија - пуни приказ">
+ <region name="Србија - пуни приказ" locale="Serbia">
<dateshort>DD.M.YYYY.</dateshort>
<datelong>DDDD, DD. MMMM YYYY. г.</datelong>
<time symbolAM="" symbolPM="">HH:mm:ss</time>
@@ -20,7 +20,7 @@
<speedunit>kmh</speedunit>
<timezone>CEST</timezone>
</region>
- <region name="Србија - скраћени приказ">
+ <region name="Србија - скраћени приказ" locale="Serbia">
<dateshort>D.M.YYYY.</dateshort>
<datelong>DD. M. YYYY. г.</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
diff --git a/language/Serbian/langinfo.xml b/language/Serbian/langinfo.xml
index 690ba68a72..f8e5298d86 100644
--- a/language/Serbian/langinfo.xml
+++ b/language/Serbian/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<language>
+<language locale="Serbian (Latin)">
<charsets>
<gui>CP1251</gui>
<subtitle>CP1251</subtitle>
@@ -12,7 +12,7 @@
</dvd>
<regions>
- <region name="Srbija - puni prikaz">
+ <region name="Srbija - puni prikaz" locale="Serbia">
<dateshort>DD.M.YYYY.</dateshort>
<datelong>DDDD, DD. MMMM YYYY. g.</datelong>
<time symbolAM="" symbolPM="">HH:mm:ss</time>
@@ -20,7 +20,7 @@
<speedunit>kmh</speedunit>
<timezone>CEST</timezone>
</region>
- <region name="Srbija - skraćeni prikaz">
+ <region name="Srbija - skraćeni prikaz" locale="Serbia">
<dateshort>D.M.YYYY.</dateshort>
<datelong>DD. M. YYYY. g.</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
diff --git a/language/Slovak/langinfo.xml b/language/Slovak/langinfo.xml
index 0c62a48563..3dd7935428 100644
--- a/language/Slovak/langinfo.xml
+++ b/language/Slovak/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<language>
+<language locale="Slovak">
<charsets>
<gui unicodefont="true">CP1250</gui>
<subtitle>CP1250</subtitle>
@@ -10,7 +10,7 @@
<subtitle>sk</subtitle>
</dvd>
<regions>
- <region name="Slovensko">
+ <region name="Slovensko" locale="Slovak">
<dateshort>D.M.YYYY</dateshort>
<datelong>D. MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
diff --git a/language/Slovenian/langinfo.xml b/language/Slovenian/langinfo.xml
index ff4b11d245..c807839f46 100644
--- a/language/Slovenian/langinfo.xml
+++ b/language/Slovenian/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<language>
+<language locale="Slovenian">
<charsets>
<gui>CP1250</gui>
<subtitle>CP1250</subtitle>
diff --git a/language/Spanish (Mexico)/langinfo.xml b/language/Spanish (Mexico)/langinfo.xml
index 66ef6aea60..77b863b299 100644
--- a/language/Spanish (Mexico)/langinfo.xml
+++ b/language/Spanish (Mexico)/langinfo.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--Translator: Josue Jeriel Camargo Cruz-->
<!--Email: josue.camargo@gmail.com-->
-<language>
+<language locale="spanish-mexican">
<charsets>
<gui>CP1252</gui>
<subtitle>CP1252</subtitle>
@@ -12,7 +12,7 @@
<subtitle>es</subtitle>
</dvd>
<regions>
- <region name="Mexico">
+ <region name="Mexico" locale="Mexico">
<dateshort>DD/MM/YYYY</dateshort>
<datelong>DDDD, D de MMMM de YYYY</datelong>
<time symbolAM="AM" symbolPM="PM">h:mm:ss xx</time>
diff --git a/language/Spanish/langinfo.xml b/language/Spanish/langinfo.xml
index 48a67ed102..0a6b60b81b 100644
--- a/language/Spanish/langinfo.xml
+++ b/language/Spanish/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<language>
+<language locale="spanish">
<charsets>
<gui>CP1252</gui>
<subtitle>CP1252</subtitle>
@@ -12,7 +12,7 @@
</dvd>
<regions>
- <region name="España">
+ <region name="España" locale="spain">
<dateshort>D/M/YYYY</dateshort>
<datelong>DDD, DD' de 'MMMM' de 'YYYY</datelong>
<time symbolAM="" symbolPM="">H:mm:ss</time>
diff --git a/language/Swedish/langinfo.xml b/language/Swedish/langinfo.xml
index 5307c9f5a6..83f5a8c634 100644
--- a/language/Swedish/langinfo.xml
+++ b/language/Swedish/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<language>
+<language locale="Swedish">
<charsets>
<gui>CP1252</gui>
<subtitle>CP1252</subtitle>
@@ -12,7 +12,7 @@
</dvd>
<regions>
- <region name="Sweden">
+ <region name="Sweden" locale="Sweden">
<dateshort>D.M.YYYY</dateshort>
<datelong>'den 'D MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">HH:mm:ss</time>
diff --git a/language/Turkish/langinfo.xml b/language/Turkish/langinfo.xml
index 0749de6dfb..1d1d225378 100644
--- a/language/Turkish/langinfo.xml
+++ b/language/Turkish/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<language>
+<language locale="Turkish">
<charsets>
<gui unicodefont="true">CP1254</gui>
<subtitle>CP1254</subtitle>
@@ -10,7 +10,7 @@
<subtitle>tr</subtitle>
</dvd>
<regions>
- <region name="Turkiye">
+ <region name="Turkiye" locale="turkey">
<dateshort>DD.MM.YYYY</dateshort>
<datelong>DDDD, D MMMM YYYY</datelong>
<time symbolAM="" symbolPM="">HH:mm:ss</time>
diff --git a/language/Ukrainian/langinfo.xml b/language/Ukrainian/langinfo.xml
index e08efe04ee..fd512a2303 100644
--- a/language/Ukrainian/langinfo.xml
+++ b/language/Ukrainian/langinfo.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<language>
+<language locale="Ukrainian">
<charsets>
<gui unicodefont="true">CP1251</gui>
<subtitle>CP1251</subtitle>
diff --git a/xbmc/LangInfo.cpp b/xbmc/LangInfo.cpp
index 719a688112..0442e75fc6 100644
--- a/xbmc/LangInfo.cpp
+++ b/xbmc/LangInfo.cpp
@@ -43,6 +43,8 @@ CLangInfo::CRegion::CRegion(const CRegion& region)
m_strDVDMenuLanguage=region.m_strDVDMenuLanguage;
m_strDVDAudioLanguage=region.m_strDVDAudioLanguage;
m_strDVDSubtitleLanguage=region.m_strDVDSubtitleLanguage;
+ m_strLangLocaleName = region.m_strLangLocaleName;
+ m_strRegionLocaleName = region.m_strRegionLocaleName;
m_strDateFormatShort=region.m_strDateFormatShort;
m_strDateFormatLong=region.m_strDateFormatLong;
@@ -74,6 +76,7 @@ void CLangInfo::CRegion::SetDefaults()
m_strDVDMenuLanguage="en";
m_strDVDAudioLanguage="en";
m_strDVDSubtitleLanguage="en";
+ m_strLangLocaleName = "English";
m_strDateFormatShort="DD/MM/YYYY";
m_strDateFormatLong="DDDD, D MMMM YYYY";
@@ -164,6 +167,9 @@ bool CLangInfo::Load(const CStdString& strFileName)
return false;
}
+ if (pRootElement->Attribute("locale"))
+ m_defaultRegion.m_strLangLocaleName = pRootElement->Attribute("locale");
+
const TiXmlNode *pCharSets = pRootElement->FirstChild("charsets");
if (pCharSets && !pCharSets->NoChildren())
{
@@ -210,6 +216,9 @@ bool CLangInfo::Load(const CStdString& strFileName)
if (region.m_strName.IsEmpty())
region.m_strName="N/A";
+ if (pRegion->Attribute("locale"))
+ region.m_strRegionLocaleName = pRegion->Attribute("locale");
+
const TiXmlNode *pDateLong=pRegion->FirstChild("datelong");
if (pDateLong && !pDateLong->NoChildren())
region.m_strDateFormatLong=pDateLong->FirstChild()->Value();
@@ -323,6 +332,26 @@ const CStdString& CLangInfo::GetDVDSubtitleLanguage() const
return m_currentRegion->m_strDVDSubtitleLanguage;
}
+const CStdString& CLangInfo::GetLanguageLocale() const
+{
+ return m_currentRegion->m_strLangLocaleName;
+}
+
+const CStdString& CLangInfo::GetRegionLocale() const
+{
+ return m_currentRegion->m_strRegionLocaleName;
+}
+
+const CStdString CLangInfo::GetLocale() const
+{
+ const CStdString& langLocale = GetLanguageLocale();
+ const CStdString& regionLocale = GetRegionLocale();
+ if (regionLocale.length() > 0)
+ return langLocale + "_" + regionLocale;
+ else
+ return langLocale;
+}
+
// Returns the format string for the date of the current language
const CStdString& CLangInfo::GetDateFormat(bool bLongDate/*=false*/) const
{
diff --git a/xbmc/LangInfo.h b/xbmc/LangInfo.h
index 93308690b6..4a30d882c6 100644
--- a/xbmc/LangInfo.h
+++ b/xbmc/LangInfo.h
@@ -42,6 +42,10 @@ public:
const CStdString& GetDVDSubtitleLanguage() const;
const CStdString& GetTimeZone() const;
+ const CStdString& GetRegionLocale() const;
+ const CStdString& GetLanguageLocale() const;
+ const CStdString GetLocale() const;
+
bool ForceUnicodeFont() const { return m_currentRegion->m_forceUnicodeFont; }
const CStdString& GetDateFormat(bool bLongDate=false) const;
@@ -116,6 +120,8 @@ protected:
CStdString m_strDVDMenuLanguage;
CStdString m_strDVDAudioLanguage;
CStdString m_strDVDSubtitleLanguage;
+ CStdString m_strLangLocaleName;
+ CStdString m_strRegionLocaleName;
bool m_forceUnicodeFont;
CStdString m_strName;
CStdString m_strDateFormatLong;
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-13 01:12:34 +0000