From 683f42203051bfaf31f3f0d9ba3da20567b3b5aa Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 8 Aug 2019 19:53:30 +0000 Subject: [PATCH] update CLDR to v35.1, generated data is the same Signed-off-by: Ivailo Monev --- README | 2 +- scripts/genlocale.py | 8 ++++---- src/core/tools/qlocale.qdoc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README b/README index a7dec16d6..95007df4c 100644 --- a/README +++ b/README @@ -26,7 +26,7 @@ There are several things you should be aware before considering Katie: - moc, uic, rcc, lrelease, lupdate, etc. are linked to components - updated bundled Harfbuzz from upstream (not Harfbuzz-NG) - updated bundled FFTW and Valgrind from upstream - - updated localizations data from Common Locale Data Repository v35 + - updated localizations data from Common Locale Data Repository v35.1 - Symbian, QWS, QPA, Mac and Windows are no longer supported platforms - OpenVG is no longer supported graphics output - Blitter is no longer supported painting engine diff --git a/scripts/genlocale.py b/scripts/genlocale.py index 67f11eb75..e520c6813 100755 --- a/scripts/genlocale.py +++ b/scripts/genlocale.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 #-*- coding: UTF-8 -*- -# Data is from https://unicode.org/Public/cldr/35/core.zip +# Data is from https://unicode.org/Public/cldr/35.1/core.zip import os, sys, glob import xml.etree.ElementTree as ET @@ -216,9 +216,9 @@ def normalizestring(fromstring): # printenum prints mapped values that have unique code only, the rest are set to the enum of the # first occurence. the reason for doing so is because table lookups for figuring out language, -# script and country that is required for constructing QLocale from string (named locales) relies -# on the fact that there is only one code for each, if that is not the case constructing copy of -# locale from its name will not copy it correctly. printtable skips duplicate code entries entirely +# script and country required for constructing QLocale from string (named locales) relies on the +# fact that there is only one code for each, if that is not the case constructing copy of locale +# from its name will not copy it correctly. printtable skips duplicate code entries entirely def printenum(frommap, prefix): keyscount = 0 aliaseslist = [] diff --git a/src/core/tools/qlocale.qdoc b/src/core/tools/qlocale.qdoc index d03615026..2b2ea89f9 100644 --- a/src/core/tools/qlocale.qdoc +++ b/src/core/tools/qlocale.qdoc @@ -91,7 +91,7 @@ \note For the current keyboard input locale take a look at QApplication::keyboardInputLocale(). - QLocale's data is based on Common Locale Data Repository v35. + QLocale's data is based on Common Locale Data Repository v35.1. The double-to-string and string-to-double conversion functions are covered by the following licenses: -- 2.11.0