Commit graph

2329 commits

Author SHA1 Message Date
Ivailo Monev
39f75c5aa4 slightly better locale to script mappings
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 21:41:52 +00:00
Ivailo Monev
683f422030 update CLDR to v35.1, generated data is the same
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 19:53:30 +00:00
Ivailo Monev
bc46e3f608 Merge branch 'master' of https://github.com/fluxer/katie into locale 2019-08-08 18:40:55 +00:00
Ivailo Monev
fdfe2e6da4 remove unused local variables in QDateTimeParser::parseSection()
upstream commit:
a3421d1ba6

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 18:39:29 +00:00
Ivailo Monev
bdfa8d774d avoid temporary variable shadowing in QDateTimeParser::parseFormat()
upstream commits:
57e024cc81

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 18:36:06 +00:00
Ivailo Monev
e6b2d72b7d properly construct QString in DateTimeParser::parseSection()
upstream commit:
7abb90a70a

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 18:30:07 +00:00
Ivailo Monev
e03aa32c3f avoid shadowing in QDateTimeParser::findAmPm()
upstream commit:
54ece34283

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 18:26:48 +00:00
Ivailo Monev
e89b1768fd use QLocale::toString() for date/time formatting
upstream commit:
35af88b37e

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 16:41:19 +00:00
Ivailo Monev
d33c79484d use iconv codec as fallback, if possible
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 16:13:44 +00:00
Ivailo Monev
8943e37e91 Merge branch 'master' of https://github.com/fluxer/katie into locale 2019-08-08 15:12:25 +00:00
Ivailo Monev
420df9fe9c remove redundant default cases from QDate short/long month/day getters
upstream commits:
0b77e1b611
613449a58d

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 15:11:56 +00:00
Ivailo Monev
5604299ba8 use consistent name for temporary QLocalePrivate pointer
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 14:49:07 +00:00
Ivailo Monev
ec38edacf5 Merge branch 'master' of https://github.com/fluxer/katie into locale 2019-08-08 14:24:47 +00:00
Ivailo Monev
069d7b62cc remove redundant checks from QDate short/long month/day getters
upstream commit:
e7f962d271

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 14:23:51 +00:00
Ivailo Monev
142dfd9a22 mark QDate::getDate() const
upstream commit:
a44d7862c8

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 14:22:11 +00:00
Ivailo Monev
1bc049b45a fix system locale and defalt to C, not system locale
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 13:19:12 +00:00
Ivailo Monev
fdacf22672 compare language to enum instead of integer in systemPrivate() function
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 12:14:00 +00:00
Ivailo Monev
3866d5dfbb move qlocale_data_p header inclusion to the top of qlocale source
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 12:12:53 +00:00
Ivailo Monev
a0d3ba069a correct date/time format parsing and adjust some test cases
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 11:21:20 +00:00
Ivailo Monev
215ced5fb8 use iconv codec as fallback, not default
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-07 22:07:12 +00:00
Ivailo Monev
147ab650e1 locale data table should not have Default entry
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-07 19:26:34 +00:00
Ivailo Monev
6ceb674ac4 make QLocale::matchingLocales() behave as documented
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-07 19:25:26 +00:00
Ivailo Monev
b8487a6cb0 map duplicate language, script and country codes as aliases
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-07 14:48:16 +00:00
Ivailo Monev
9800c4f9b7 replace QLocale::LastScript with scriptTblSize for consistency
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-07 11:11:03 +00:00
Ivailo Monev
51d52cc3a9 fix language, script and country code detection from non-null termiated strings
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-06 21:18:54 +00:00
Ivailo Monev
a2efc6e396 fix default locale fallback
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-06 19:47:06 +00:00
Ivailo Monev
da78dcfc1c revert back to non-root defaults for Default and C
for compatibility and because root uses UTF-8 characters for quotation for
an example

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-06 19:36:36 +00:00
Ivailo Monev
5898e3a13a fix QLocale::standaloneDayName()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-06 19:09:41 +00:00
Ivailo Monev
16a34d4589 use somewhat correct defaults only for parent locales
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-06 18:22:12 +00:00
Ivailo Monev
806a6990b3 correct default alternate quotations
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-06 18:04:00 +00:00
Ivailo Monev
68b8f2e29d QLocale::name() should separate language from country with underscore, not dash
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-06 16:40:57 +00:00
Ivailo Monev
d008a8e038 use Q_NULLPTR for empty char array values in genlocale script
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-06 15:33:59 +00:00
Ivailo Monev
43d7bddc5f update linguist numerus tables
upstream commits:
5145bed0b5
72c62e2df1
28df30fccd
c2937bd62e

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-06 14:30:13 +00:00
Ivailo Monev
4552efa29c discard non-territory locale entries
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-06 14:09:10 +00:00
Ivailo Monev
59678ead04 use qint16 in QLocale where applicable
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-06 13:07:25 +00:00
Ivailo Monev
671d53e6cd avoid temporaries in QLocalePrivate::codeToLanguage() and QLocalePrivate::codeToScript()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-06 11:26:32 +00:00
Ivailo Monev
f35b5a057b do not exclude world from country table
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-06 11:26:00 +00:00
Ivailo Monev
beea0327a2 do not overwrite parent locale values with defaults
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-05 22:24:47 +00:00
Ivailo Monev
f20326843e parse parent locales from genlocale script
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-05 22:00:18 +00:00
Ivailo Monev
adf25f3026 variant locales are not supported, yet
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-05 20:24:01 +00:00
Ivailo Monev
4239c1b042 set defaults from main locale if territory is specified
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-05 19:47:38 +00:00
Ivailo Monev
1b3bf9543a do not discard locale tables entries
it is required by QLocale::countriesForLanguage() for an example

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-05 18:28:49 +00:00
Ivailo Monev
aeffc14296 correct weekend end parsing
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-05 16:33:01 +00:00
Ivailo Monev
d9d106ff91 update note about CLDR version in QLocale documentation [ci skip]
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-05 14:12:40 +00:00
Ivailo Monev
4ae511cc32 update QLocale language, country and script enums docs [ci skip]
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-05 14:03:08 +00:00
Ivailo Monev
055098ac9c shrink locales table
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-05 12:49:26 +00:00
Ivailo Monev
8e8c5658d5 compare language, country and script instead of address in localePrivateIndex() function
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-05 12:28:31 +00:00
Ivailo Monev
c6b24cc01e fix QLocalePrivate::bcp47Name()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-05 11:48:01 +00:00
Ivailo Monev
dd5888ac78 fix long day names mapping
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-05 11:26:06 +00:00
Ivailo Monev
5e8dbfa58a remove assumptions about language/country code length in QLocale::name()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-05 10:58:40 +00:00