summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qlocale_p.h
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2018-10-19 16:17:44 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2018-11-02 12:40:46 +0000
commit3fbf8fbc85143e713946ece3036b7303b8268f05 (patch)
tree4992cb3f4ec52e04f744c0471d979710643acc5f /src/corelib/tools/qlocale_p.h
parent5f3518d0bfbf5018d2a56c4157cd1163be5489b5 (diff)
Update to CLDR v34
This only updates data on languages already present in 5.12; once it has merged up to dev, the scripts need to be run again to pick up a few more languages and possibly add any more new languages present in v34. Change some tests to match changes in en_AU's abbreviated day and month names. [ChangeLog][ThirdParty][CLDR] Update locale data to CLDR v34. Task-number: QTBUG-71144 Change-Id: I68402b5e7e9d3dba669b8ba31b9a8abd86675c6e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/tools/qlocale_p.h')
-rw-r--r--src/corelib/tools/qlocale_p.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h
index f2e11499c8..a9c23aed61 100644
--- a/src/corelib/tools/qlocale_p.h
+++ b/src/corelib/tools/qlocale_p.h
@@ -408,9 +408,10 @@ inline char QLocaleData::digitToCLocale(QChar in) const
if (in == m_exponential || in == QChar::toUpper(m_exponential))
return 'e';
- // In several languages group() is the char 0xA0, which looks like a space.
- // People use a regular space instead of it and complain it doesn't work.
- if (m_group == 0xA0 && in.unicode() == ' ')
+ // In several languages group() is a non-breaking space (U+00A0) or its thin
+ // version (U+202f), which look like spaces. People (and thus some of our
+ // tests) use a regular space instead and complain if it doesn't work.
+ if ((m_group == 0xA0 || m_group == 0x202f) && in.unicode() == ' ')
return ',';
return 0;