summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorMehdi Fekari <mfekari@rim.com>2013-01-14 20:38:12 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-18 11:56:37 (GMT)
commit614a9a435ea4b94080ea12c2fcf98d2699731e34 (patch)
tree406e980f38ae2c257468c246992dfdb0d71bf1af /util
parentf45cdeda88796830b3fe71aff7ceb1919d00400d (diff)
downloadQt-614a9a435ea4b94080ea12c2fcf98d2699731e34.zip
Qt-614a9a435ea4b94080ea12c2fcf98d2699731e34.tar.gz
Qt-614a9a435ea4b94080ea12c2fcf98d2699731e34.tar.bz2
Update the Indonisian and Catalan locales in CLDR data:
- Indonisian locale (in.xml): to return correct AM/PM text and correct time Fomat - Catalan locale (ca.xml): to return correct time Format Change-Id: I65bbabdc6311dc3c958605cbc04e7a034243e9db Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'util')
-rw-r--r--util/local_database/CLDR.README21
-rw-r--r--util/local_database/cldr2.0_fixes.diff315
2 files changed, 336 insertions, 0 deletions
diff --git a/util/local_database/CLDR.README b/util/local_database/CLDR.README
new file mode 100644
index 0000000..674bd52
--- /dev/null
+++ b/util/local_database/CLDR.README
@@ -0,0 +1,21 @@
+How To update CLDR Data in Qt4.8
+================================
+
+Please follow the steps below if you want to update CLDR2.0 data in Qt4.8
+
+- Download the CLDR v2.0 data (http://unicode.org/Public/cldr/2.0.0/core.zip)
+
+- You will need to have two separate copies of the CLDRv2.0 data. One that you will update and the other to comapre with.
+
+- Patch the CLDR v2.0 data you want to modify via the cldr2.0_fixes.diff file to apply previous fixes:
+
+patch -Np1 -i cldr2.0_fixes.diff <path_to_cldr_main>
+
+- Apply your changes and generate new qlocale data:
+
+./cldr2qlocalexml.py <path_to_modified_cldr_main> > data.xml
+./qlocalexml2cpp.py data.xml ../..
+
+- Add autotests if needed and update the cldr2.0_fixes.diff
+
+diff -ruN <path_to_original_cldr_main> <path_to_modified_cldr_main> > cldr2.0_fixes.diff
diff --git a/util/local_database/cldr2.0_fixes.diff b/util/local_database/cldr2.0_fixes.diff
new file mode 100644
index 0000000..346b179
--- /dev/null
+++ b/util/local_database/cldr2.0_fixes.diff
@@ -0,0 +1,315 @@
+diff -ruN main/ca.xml ../../main/ca.xml
+--- main/ca.xml 2011-05-10 20:52:31.000000000 +0200
++++ ../../main/ca.xml 2013-01-16 11:36:55.343546843 +0100
+@@ -1343,22 +1343,22 @@
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+- <pattern>H:mm:ss zzzz</pattern>
++ <pattern>H.mm.ss zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+- <pattern>H:mm:ss z</pattern>
++ <pattern>H.mm.ss z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+- <pattern>H:mm:ss</pattern>
++ <pattern>H.mm.ss</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+- <pattern>H:mm</pattern>
++ <pattern>H.mm</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+diff -ruN main/en_CA.xml ../../main/en_CA.xml
+--- main/en_CA.xml 2011-05-02 20:50:23.000000000 +0200
++++ ../../main/en_CA.xml 2013-01-16 11:36:55.551546840 +0100
+@@ -10,28 +10,6 @@
+ <dates>
+ <calendars>
+ <calendar type="gregorian">
+- <dateFormats>
+- <dateFormatLength type="full">
+- <dateFormat>
+- <pattern>EEEE, d MMMM, y</pattern>
+- </dateFormat>
+- </dateFormatLength>
+- <dateFormatLength type="long">
+- <dateFormat>
+- <pattern>d MMMM, y</pattern>
+- </dateFormat>
+- </dateFormatLength>
+- <dateFormatLength type="medium">
+- <dateFormat>
+- <pattern>yyyy-MM-dd</pattern>
+- </dateFormat>
+- </dateFormatLength>
+- <dateFormatLength type="short">
+- <dateFormat>
+- <pattern>yy-MM-dd</pattern>
+- </dateFormat>
+- </dateFormatLength>
+- </dateFormats>
+ <dateTimeFormats>
+ <availableFormats>
+ <dateFormatItem id="Md">M-d</dateFormatItem>
+diff -ruN main/ga.xml ../../main/ga.xml
+--- main/ga.xml 2011-05-05 21:19:19.000000000 +0200
++++ ../../main/ga.xml 2013-01-16 11:36:55.919546844 +0100
+@@ -63,14 +63,53 @@
+ <calendar type="gregorian">
+ <months>
+ <monthContext type="format">
++ <monthWidth type="abbreviated">
++ <month type="1">Ean</month>
++ <month type="2">Feabh</month>
++ <month type="3">Márta</month>
++ <month type="4">Aib</month>
++ <month type="5">Beal</month>
++ <month type="6">Meith</month>
++ <month type="7">Iúil</month>
++ <month type="8">Lún</month>
++ <month type="9">MFómh</month>
++ <month type="10">DFómh</month>
++ <month type="11">Samh</month>
++ <month type="12">Noll</month>
++ </monthWidth>
+ <monthWidth type="wide">
++ <month type="1">Eanáir</month>
+ <month type="2">Feabhra</month>
++ <month type="3">Márta</month>
++ <month type="4">Aibreán</month>
++ <month type="5">Bealtaine</month>
++ <month type="6">Meitheamh</month>
++ <month type="7">Iúil</month>
++ <month type="8">Lúnasa</month>
++ <month type="9">Meán Fómhair</month>
++ <month type="10">Deireadh Fómhair</month>
++ <month type="11">Samhain</month>
++ <month type="12">Nollaig</month>
+ </monthWidth>
+ </monthContext>
+ </months>
+ <days>
+ <dayContext type="format">
++ <dayWidth type="abbreviated">
++ <day type="sun">Domh</day>
++ <day type="mon">Luan</day>
++ <day type="tue">Máirt</day>
++ <day type="wed">Céad</day>
++ <day type="thu">Déar</day>
++ <day type="fri">Aoine</day>
++ <day type="sat">Sath</day>
++ </dayWidth>
+ <dayWidth type="wide">
++ <day type="sun">Dé Domhnaigh</day>
++ <day type="mon">Dé Luain</day>
++ <day type="tue">Dé Máirt</day>
++ <day type="wed">Dé Céadaoin</day>
++ <day type="thu">Déardaoin</day>
+ <day type="fri">Dé hAoine</day>
+ <day type="sat">Dé Sathairn</day>
+ </dayWidth>
+diff -ruN main/gu.xml ../../main/gu.xml
+--- main/gu.xml 2011-05-10 20:52:32.000000000 +0200
++++ ../../main/gu.xml 2013-01-16 11:36:55.971546844 +0100
+@@ -3652,7 +3652,7 @@
+ </timeZoneNames>
+ </dates>
+ <numbers>
+- <defaultNumberingSystem>gujr</defaultNumberingSystem>
++ <defaultNumberingSystem>latn</defaultNumberingSystem>
+ <symbols numberSystem="latn">
+ <exponential>પૂર્વ</exponential>
+ <nan>સંખ્યા નથીં</nan>
+diff -ruN main/hi.xml ../../main/hi.xml
+--- main/hi.xml 2011-05-10 20:52:32.000000000 +0200
++++ ../../main/hi.xml 2013-01-16 11:36:56.063546844 +0100
+@@ -3181,7 +3181,7 @@
+ </timeZoneNames>
+ </dates>
+ <numbers>
+- <defaultNumberingSystem>deva</defaultNumberingSystem>
++ <defaultNumberingSystem>latn</defaultNumberingSystem>
+ <symbols numberSystem="latn">
+ <decimal>.</decimal>
+ <group>,</group>
+diff -ruN main/id.xml ../../main/id.xml
+--- main/id.xml 2011-05-09 19:42:31.000000000 +0200
++++ ../../main/id.xml 2013-01-16 14:50:10.735567197 +0100
+@@ -1250,8 +1250,8 @@
+ <dayPeriods>
+ <dayPeriodContext type="format">
+ <dayPeriodWidth type="wide">
+- <dayPeriod type="am">pagi</dayPeriod>
+- <dayPeriod type="pm">malam</dayPeriod>
++ <dayPeriod type="am">AM</dayPeriod>
++ <dayPeriod type="pm">PM</dayPeriod>
+ </dayPeriodWidth>
+ </dayPeriodContext>
+ </dayPeriods>
+@@ -1286,22 +1286,22 @@
+ <timeFormats>
+ <timeFormatLength type="full">
+ <timeFormat>
+- <pattern>H:mm:ss zzzz</pattern>
++ <pattern>HH.mm.ss zzzz</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="long">
+ <timeFormat>
+- <pattern>HH:mm:ss z</pattern>
++ <pattern>HH.mm.ss z</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="medium">
+ <timeFormat>
+- <pattern>HH:mm:ss</pattern>
++ <pattern>HH.mm.ss</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ <timeFormatLength type="short">
+ <timeFormat>
+- <pattern>HH:mm</pattern>
++ <pattern>HH.mm</pattern>
+ </timeFormat>
+ </timeFormatLength>
+ </timeFormats>
+@@ -1619,7 +1619,7 @@
+ </calendar>
+ </calendars>
+ <timeZoneNames>
+- <hourFormat>+HH:mm;-HH:mm</hourFormat>
++ <hourFormat>+HH.mm;-HH.mm</hourFormat>
+ <gmtFormat>GMT{0}</gmtFormat>
+ <regionFormat>Waktu {0}</regionFormat>
+ <fallbackRegionFormat>Waktu {1} ({0})</fallbackRegionFormat>
+diff -ruN main/kn.xml ../../main/kn.xml
+--- main/kn.xml 2011-05-10 20:52:32.000000000 +0200
++++ ../../main/kn.xml 2013-01-16 11:36:56.375546845 +0100
+@@ -3592,7 +3592,7 @@
+ </timeZoneNames>
+ </dates>
+ <numbers>
+- <defaultNumberingSystem>knda</defaultNumberingSystem>
++ <defaultNumberingSystem>latn</defaultNumberingSystem>
+ <symbols numberSystem="latn">
+ <exponential>ಪೂರ್ವ</exponential>
+ <nan>ಸಂಖ್ಯೆಯಲ್ಲ</nan>
+diff -ruN main/kok.xml ../../main/kok.xml
+--- main/kok.xml 2011-05-02 08:05:35.000000000 +0200
++++ ../../main/kok.xml 2013-01-16 11:36:56.395546845 +0100
+@@ -271,7 +271,7 @@
+ </timeZoneNames>
+ </dates>
+ <numbers>
+- <defaultNumberingSystem>deva</defaultNumberingSystem>
++ <defaultNumberingSystem>latn</defaultNumberingSystem>
+ <decimalFormats>
+ <decimalFormatLength>
+ <decimalFormat>
+diff -ruN main/ml.xml ../../main/ml.xml
+--- main/ml.xml 2011-05-10 20:52:32.000000000 +0200
++++ ../../main/ml.xml 2013-01-16 11:36:56.623546845 +0100
+@@ -3827,7 +3827,7 @@
+ </timeZoneNames>
+ </dates>
+ <numbers>
+- <defaultNumberingSystem>mlym</defaultNumberingSystem>
++ <defaultNumberingSystem>latn</defaultNumberingSystem>
+ <symbols numberSystem="latn">
+ <decimal>.</decimal>
+ <group>,</group>
+diff -ruN main/mr.xml ../../main/mr.xml
+--- main/mr.xml 2011-05-10 20:52:32.000000000 +0200
++++ ../../main/mr.xml 2013-01-16 11:36:56.651546845 +0100
+@@ -3693,7 +3693,7 @@
+ </timeZoneNames>
+ </dates>
+ <numbers>
+- <defaultNumberingSystem>deva</defaultNumberingSystem>
++ <defaultNumberingSystem>latn</defaultNumberingSystem>
+ <symbols numberSystem="latn">
+ <exponential>पू</exponential>
+ <nan>नान</nan>
+diff -ruN main/ne.xml ../../main/ne.xml
+--- main/ne.xml 2011-05-02 08:05:36.000000000 +0200
++++ ../../main/ne.xml 2013-01-16 11:36:56.787546844 +0100
+@@ -1240,7 +1240,7 @@
+ </timeZoneNames>
+ </dates>
+ <numbers>
+- <defaultNumberingSystem>deva</defaultNumberingSystem>
++ <defaultNumberingSystem>latn</defaultNumberingSystem>
+ <symbols numberSystem="latn">
+ <decimal draft="contributed">.</decimal>
+ <group draft="contributed">,</group>
+diff -ruN main/pa.xml ../../main/pa.xml
+--- main/pa.xml 2011-05-02 20:50:20.000000000 +0200
++++ ../../main/pa.xml 2013-01-16 11:36:56.855546846 +0100
+@@ -299,7 +299,7 @@
+ </calendars>
+ </dates>
+ <numbers>
+- <defaultNumberingSystem>guru</defaultNumberingSystem>
++ <defaultNumberingSystem>latn</defaultNumberingSystem>
+ <decimalFormats>
+ <decimalFormatLength>
+ <decimalFormat>
+diff -ruN main/sk.xml ../../main/sk.xml
+--- main/sk.xml 2011-05-09 19:42:31.000000000 +0200
++++ ../../main/sk.xml 2013-01-16 11:36:57.119546846 +0100
+@@ -1703,7 +1703,7 @@
+ </timeZoneNames>
+ </dates>
+ <numbers>
+- <defaultNumberingSystem>arab</defaultNumberingSystem>
++ <defaultNumberingSystem>latn</defaultNumberingSystem>
+ <symbols numberSystem="latn">
+ <decimal>,</decimal>
+ <group> </group>
+diff -ruN main/ta.xml ../../main/ta.xml
+--- main/ta.xml 2011-05-09 19:42:31.000000000 +0200
++++ ../../main/ta.xml 2013-01-16 11:36:57.327546844 +0100
+@@ -3642,7 +3642,7 @@
+ </timeZoneNames>
+ </dates>
+ <numbers>
+- <defaultNumberingSystem>tamldec</defaultNumberingSystem>
++ <defaultNumberingSystem>latn</defaultNumberingSystem>
+ <symbols numberSystem="latn">
+ <decimal>.</decimal>
+ <group>,</group>
+diff -ruN main/te.xml ../../main/te.xml
+--- main/te.xml 2011-05-10 20:52:33.000000000 +0200
++++ ../../main/te.xml 2013-01-16 11:36:57.343546845 +0100
+@@ -3616,7 +3616,7 @@
+ </timeZoneNames>
+ </dates>
+ <numbers>
+- <defaultNumberingSystem>telu</defaultNumberingSystem>
++ <defaultNumberingSystem>latn</defaultNumberingSystem>
+ <symbols numberSystem="latn">
+ <exponential>తూ</exponential>
+ </symbols>
+diff -ruN main/tr.xml ../../main/tr.xml
+--- main/tr.xml 2011-05-02 08:05:38.000000000 +0200
++++ ../../main/tr.xml 2013-01-16 11:36:57.463546845 +0100
+@@ -1392,8 +1392,8 @@
+ <dayPeriods>
+ <dayPeriodContext type="format">
+ <dayPeriodWidth type="wide">
+- <dayPeriod type="am">AM</dayPeriod>
+- <dayPeriod type="pm">PM</dayPeriod>
++ <dayPeriod type="am">ÖÖ</dayPeriod>
++ <dayPeriod type="pm">ÖS</dayPeriod>
+ </dayPeriodWidth>
+ </dayPeriodContext>
+ </dayPeriods>