Commit graph

2909 commits

Author SHA1 Message Date
Ivailo Monev
59ab7fd45f fix negative and zero-padded year formatting
cherry pick from upstream commits:
811bf4da67
dd488bb7a4

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-10 12:17:58 +00:00
Ivailo Monev
a68e67e8ad make enums first member of tables structs
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-10 11:37:38 +00:00
Ivailo Monev
75a045748e Merge branch 'master' of https://github.com/fluxer/katie into locale 2019-08-09 19:42:23 +00:00
Ivailo Monev
f8a4b7f02d add QDate, QTime and QDateTime tests
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-09 19:41:55 +00:00
Ivailo Monev
1e2cf7b659 correct expected test data in tst_QLocale::formatDateTime_data()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-09 17:54:41 +00:00
Ivailo Monev
a4a3cc91d9 implement language alias substitution
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-09 17:39:01 +00:00
Ivailo Monev
ce5faab20c remove unused locale table data
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-09 15:29:13 +00:00
Ivailo Monev
92b514fc06 quotation data contains only chars so it can be uint in the locale table
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-09 14:52:38 +00:00
Ivailo Monev
6f38ded051 adjust expected tests data of tst_QLocale::ctor() and tst_QLocale::uiLanguages()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-09 14:40:56 +00:00
Ivailo Monev
99f03a49ae fix lookup of different languages with identical script and country
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-09 14:39:23 +00:00
Ivailo Monev
836cdb8346 remove redundant and unused QLocalePrivate methods
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-09 13:58:01 +00:00
Ivailo Monev
3dca62b0c3 avoid shadowing outer-scope variable in qt_splitLocaleName() function
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-09 13:24:47 +00:00
Ivailo Monev
394ef1d06b deal with TODO in genlocale script
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-09 12:46:07 +00:00
Ivailo Monev
2dc598de8c adjust expected tests data in tst_QLocale::ctor()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 21:43:08 +00:00
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
3a2cbce13e adjust expected data of tst_QLocale::defaultNumeringSystem()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 18:05:26 +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
47878ce3b9 adjust expected data of some locale tests
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 14:46:48 +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
5220cb6172 use correct path to syslocaleapp in tst_QLocale::emptyCtor()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 13:20:24 +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
41bb2b7c0c remove duplicate "g" tag from unsupported in genlocale script
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-08 12:12:09 +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
5ee6f367bc move locale headers inclusions to the top of tst_qlocale source
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-07 21:01:30 +00:00
Ivailo Monev
222b0d3f30 "a" is valid date/time format tag
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-07 20:32:13 +00:00
Ivailo Monev
77114fe982 adjust some locale tests expected data
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-07 20:31:18 +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
9ce34c18eb add --printenums option to genlocale script
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-07 13:53:57 +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
37153ab0c2 check exit status instead of output to verify syslocaleapp exited normally
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2019-08-06 19:54:58 +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