OSDN Git Service
Ivailo Monev [Mon, 12 Aug 2019 14:03:38 +0000 (14:03 +0000)]
avoid temporary in QDateTimeParser::sectionFormat()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 12 Aug 2019 12:11:23 +0000 (12:11 +0000)]
ensure genlocale date/time formatter does not produce incorrect results
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 12 Aug 2019 11:46:53 +0000 (11:46 +0000)]
make monday first day in the locale table
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 12 Aug 2019 00:50:49 +0000 (00:50 +0000)]
handle all invalid cases in genlocale date/time formatter
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 11 Aug 2019 22:21:08 +0000 (22:21 +0000)]
replace QLocalePrivate::Alternate with QLocalePrivate::ForcePoint
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 11 Aug 2019 22:08:29 +0000 (22:08 +0000)]
minor genlocale script review
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 11 Aug 2019 22:08:07 +0000 (22:08 +0000)]
use proper type for QLocale::NumberOptions
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 11 Aug 2019 19:01:05 +0000 (19:01 +0000)]
fix corner case locale lookup
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 11 Aug 2019 14:15:57 +0000 (14:15 +0000)]
remove redundant default cases from QLocale month/day name getters
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 11 Aug 2019 14:15:17 +0000 (14:15 +0000)]
remove note about windows and mac from QLocale::system()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 11 Aug 2019 14:14:42 +0000 (14:14 +0000)]
prefix use of QLocale enums
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 11 Aug 2019 13:43:32 +0000 (13:43 +0000)]
update README
QTBUG-25143 was fixed in
https://github.com/fluxer/katie/commit/
7cf27b27038305e95de86a729551ed07fa466697
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 11 Aug 2019 13:32:58 +0000 (13:32 +0000)]
minr genlocale script review
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 11 Aug 2019 12:03:33 +0000 (12:03 +0000)]
merge non-territory locales into territory ones in genlocale script
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 11 Aug 2019 10:03:56 +0000 (10:03 +0000)]
correct currency ISO code mapping
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 11 Aug 2019 09:48:04 +0000 (09:48 +0000)]
make QLocale::toCurrencyString() respect group separator option
upstream commits:
https://github.com/qt/qtbase/commit/
3c0ac5208111c85c405ba1ee6ce3189a6c4e1236
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 11 Aug 2019 09:27:53 +0000 (09:27 +0000)]
update README
QTBUG-27287 was fixed in
https://github.com/fluxer/katie/commit/
59ab7fd45fd8a2d0f40f53f1a8f21e1cc3602c05
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sun, 11 Aug 2019 09:24:19 +0000 (09:24 +0000)]
fix QLocale::matchingLocales() behavior if script is not AnyScript or country is not AnyCountry
upstream commits:
https://github.com/qt/qtbase/commit/
9b85b81bc82f4e615b5d165425dc9f84fd2ae482
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sat, 10 Aug 2019 20:33:42 +0000 (20:33 +0000)]
make use of tocountryenum() in genlocale script
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sat, 10 Aug 2019 20:33:14 +0000 (20:33 +0000)]
make it possible to run locale test from any directory
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sat, 10 Aug 2019 19:15:18 +0000 (19:15 +0000)]
implement subtag, script and country substitution
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sat, 10 Aug 2019 12:17:58 +0000 (12:17 +0000)]
fix negative and zero-padded year formatting
cherry pick from upstream commits:
https://github.com/qt/qtbase/commit/
811bf4da67cedea0daa40f2fff805003687e9d6e
https://github.com/qt/qtbase/commit/
dd488bb7a449822d535ade6c840265ea76535f47
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Sat, 10 Aug 2019 11:37:22 +0000 (11:37 +0000)]
make enums first member of tables structs
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Fri, 9 Aug 2019 19:42:23 +0000 (19:42 +0000)]
Merge branch 'master' of https://github.com/fluxer/katie into locale
Ivailo Monev [Fri, 9 Aug 2019 19:41:55 +0000 (19:41 +0000)]
add QDate, QTime and QDateTime tests
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Fri, 9 Aug 2019 17:54:41 +0000 (17:54 +0000)]
correct expected test data in tst_QLocale::formatDateTime_data()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Fri, 9 Aug 2019 17:39:01 +0000 (17:39 +0000)]
implement language alias substitution
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Fri, 9 Aug 2019 15:29:13 +0000 (15:29 +0000)]
remove unused locale table data
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Fri, 9 Aug 2019 14:52:38 +0000 (14:52 +0000)]
quotation data contains only chars so it can be uint in the locale table
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Fri, 9 Aug 2019 14:40:56 +0000 (14:40 +0000)]
adjust expected tests data of tst_QLocale::ctor() and tst_QLocale::uiLanguages()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Fri, 9 Aug 2019 14:39:23 +0000 (14:39 +0000)]
fix lookup of different languages with identical script and country
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Fri, 9 Aug 2019 13:58:01 +0000 (13:58 +0000)]
remove redundant and unused QLocalePrivate methods
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Fri, 9 Aug 2019 13:24:47 +0000 (13:24 +0000)]
avoid shadowing outer-scope variable in qt_splitLocaleName() function
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Fri, 9 Aug 2019 12:46:07 +0000 (12:46 +0000)]
deal with TODO in genlocale script
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 21:43:08 +0000 (21:43 +0000)]
adjust expected tests data in tst_QLocale::ctor()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 21:41:52 +0000 (21:41 +0000)]
slightly better locale to script mappings
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 19:53:30 +0000 (19:53 +0000)]
update CLDR to v35.1, generated data is the same
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 18:40:55 +0000 (18:40 +0000)]
Merge branch 'master' of https://github.com/fluxer/katie into locale
Ivailo Monev [Thu, 8 Aug 2019 18:39:29 +0000 (18:39 +0000)]
remove unused local variables in QDateTimeParser::parseSection()
upstream commit:
https://github.com/qt/qtbase/commit/
a3421d1ba670a25c502f5e57d16394eefaa433f3
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 18:36:06 +0000 (18:36 +0000)]
avoid temporary variable shadowing in QDateTimeParser::parseFormat()
upstream commits:
https://github.com/qt/qtbase/commit/
57e024cc81c55b8c442db9f719f19aebb321ef37
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 18:30:07 +0000 (18:30 +0000)]
properly construct QString in DateTimeParser::parseSection()
upstream commit:
https://github.com/qt/qtbase/commit/
7abb90a70aed97c665430eb1e9f174dce26addd4
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 18:26:48 +0000 (18:26 +0000)]
avoid shadowing in QDateTimeParser::findAmPm()
upstream commit:
https://github.com/qt/qtbase/commit/
54ece34283f0eea4181772d6ce5fcd16c96a8962
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 18:05:26 +0000 (18:05 +0000)]
adjust expected data of tst_QLocale::defaultNumeringSystem()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 16:41:19 +0000 (16:41 +0000)]
use QLocale::toString() for date/time formatting
upstream commit:
https://github.com/qt/qtbase/commit/
35af88b37ea7d0120c86ad721f695b4dcbd8ba3e
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 16:13:44 +0000 (16:13 +0000)]
use iconv codec as fallback, if possible
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 15:12:25 +0000 (15:12 +0000)]
Merge branch 'master' of https://github.com/fluxer/katie into locale
Ivailo Monev [Thu, 8 Aug 2019 15:11:56 +0000 (15:11 +0000)]
remove redundant default cases from QDate short/long month/day getters
upstream commits:
https://github.com/qt/qtbase/commit/
0b77e1b6112dfe8a159d6704fbdb940ba477b467
https://github.com/qt/qtbase/commit/
613449a58d3957267ed8abb0d629ebdac72ec6cb
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 14:49:07 +0000 (14:49 +0000)]
use consistent name for temporary QLocalePrivate pointer
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 14:46:48 +0000 (14:46 +0000)]
adjust expected data of some locale tests
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 14:24:47 +0000 (14:24 +0000)]
Merge branch 'master' of https://github.com/fluxer/katie into locale
Ivailo Monev [Thu, 8 Aug 2019 14:23:38 +0000 (14:23 +0000)]
remove redundant checks from QDate short/long month/day getters
upstream commit:
https://github.com/qt/qtbase/commit/
e7f962d2719fb5d44b24a58b9d493ade93538cf4
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 14:22:11 +0000 (14:22 +0000)]
mark QDate::getDate() const
upstream commit:
https://github.com/qt/qtbase/commit/
a44d7862c8e92ad2bc2d0d56e542066e688d5c82
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 13:20:24 +0000 (13:20 +0000)]
use correct path to syslocaleapp in tst_QLocale::emptyCtor()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 12:53:22 +0000 (12:53 +0000)]
fix system locale and defalt to C, not system locale
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 12:14:00 +0000 (12:14 +0000)]
compare language to enum instead of integer in systemPrivate() function
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 12:12:53 +0000 (12:12 +0000)]
move qlocale_data_p header inclusion to the top of qlocale source
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 12:12:09 +0000 (12:12 +0000)]
remove duplicate "g" tag from unsupported in genlocale script
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Thu, 8 Aug 2019 11:21:20 +0000 (11:21 +0000)]
correct date/time format parsing and adjust some test cases
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Wed, 7 Aug 2019 22:07:12 +0000 (22:07 +0000)]
use iconv codec as fallback, not default
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Wed, 7 Aug 2019 21:01:30 +0000 (21:01 +0000)]
move locale headers inclusions to the top of tst_qlocale source
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Wed, 7 Aug 2019 20:32:13 +0000 (20:32 +0000)]
"a" is valid date/time format tag
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Wed, 7 Aug 2019 20:01:38 +0000 (20:01 +0000)]
adjust some locale tests expected data
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Wed, 7 Aug 2019 19:26:34 +0000 (19:26 +0000)]
locale data table should not have Default entry
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Wed, 7 Aug 2019 19:25:26 +0000 (19:25 +0000)]
make QLocale::matchingLocales() behave as documented
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Wed, 7 Aug 2019 14:48:16 +0000 (14:48 +0000)]
map duplicate language, script and country codes as aliases
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Wed, 7 Aug 2019 13:53:57 +0000 (13:53 +0000)]
add --printenums option to genlocale script
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Wed, 7 Aug 2019 11:11:03 +0000 (11:11 +0000)]
replace QLocale::LastScript with scriptTblSize for consistency
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 6 Aug 2019 21:18:54 +0000 (21:18 +0000)]
fix language, script and country code detection from non-null termiated strings
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 6 Aug 2019 19:54:58 +0000 (19:54 +0000)]
check exit status instead of output to verify syslocaleapp exited normally
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 6 Aug 2019 19:47:06 +0000 (19:47 +0000)]
fix default locale fallback
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 6 Aug 2019 19:36:36 +0000 (19:36 +0000)]
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>
Ivailo Monev [Tue, 6 Aug 2019 19:09:41 +0000 (19:09 +0000)]
fix QLocale::standaloneDayName()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 6 Aug 2019 19:01:29 +0000 (19:01 +0000)]
no and no_NO are no longer valid locale codes
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 6 Aug 2019 18:56:47 +0000 (18:56 +0000)]
add more possible occurences if invalid date/time format tags
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 6 Aug 2019 18:22:12 +0000 (18:22 +0000)]
use somewhat correct defaults only for parent locales
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 6 Aug 2019 18:04:00 +0000 (18:04 +0000)]
correct default alternate quotations
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 6 Aug 2019 16:40:57 +0000 (16:40 +0000)]
QLocale::name() should separate language from country with underscore, not dash
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 6 Aug 2019 15:33:59 +0000 (15:33 +0000)]
use Q_NULLPTR for empty char array values in genlocale script
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 6 Aug 2019 15:17:10 +0000 (15:17 +0000)]
update README [ci skip]
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 6 Aug 2019 14:30:13 +0000 (14:30 +0000)]
update linguist numerus tables
upstream commits:
https://github.com/qt/qttools/commit/
5145bed0b51062fdab0e62eaecbb5a6cdbe7048b
https://github.com/qt/qttools/commit/
72c62e2df12fce866d7aca00227166d0ca1a40de
https://github.com/qt/qttools/commit/
28df30fccd3d5b1e1e0b58efb225246766d7fcd5
https://github.com/qt/qttools/commit/
c2937bd62ee559639ce9616fd58c7134f6f3a85c
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 6 Aug 2019 14:09:10 +0000 (14:09 +0000)]
discard non-territory locale entries
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 6 Aug 2019 13:07:25 +0000 (13:07 +0000)]
use qint16 in QLocale where applicable
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 6 Aug 2019 11:27:12 +0000 (11:27 +0000)]
minor genlocale script review
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 6 Aug 2019 11:26:32 +0000 (11:26 +0000)]
avoid temporaries in QLocalePrivate::codeToLanguage() and QLocalePrivate::codeToScript()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Tue, 6 Aug 2019 11:26:00 +0000 (11:26 +0000)]
do not exclude world from country table
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 5 Aug 2019 22:24:47 +0000 (22:24 +0000)]
do not overwrite parent locale values with defaults
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 5 Aug 2019 22:00:18 +0000 (22:00 +0000)]
parse parent locales from genlocale script
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 5 Aug 2019 20:27:33 +0000 (20:27 +0000)]
error out on unknown month/day from genlocale script [ci skip]
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 5 Aug 2019 20:24:01 +0000 (20:24 +0000)]
variant locales are not supported, yet
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 5 Aug 2019 19:47:38 +0000 (19:47 +0000)]
set defaults from main locale if territory is specified
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 5 Aug 2019 18:28:49 +0000 (18:28 +0000)]
do not discard locale tables entries
it is required by QLocale::countriesForLanguage() for an example
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 5 Aug 2019 16:33:01 +0000 (16:33 +0000)]
correct weekend end parsing
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 5 Aug 2019 14:12:40 +0000 (14:12 +0000)]
update note about CLDR version in QLocale documentation [ci skip]
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 5 Aug 2019 13:51:44 +0000 (13:51 +0000)]
update QLocale language, country and script enums docs [ci skip]
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 5 Aug 2019 12:49:26 +0000 (12:49 +0000)]
shrink locales table
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 5 Aug 2019 12:28:31 +0000 (12:28 +0000)]
compare language, country and script instead of address in localePrivateIndex() function
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 5 Aug 2019 11:48:01 +0000 (11:48 +0000)]
fix QLocalePrivate::bcp47Name()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 5 Aug 2019 11:26:06 +0000 (11:26 +0000)]
fix long day names mapping
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 5 Aug 2019 10:58:40 +0000 (10:58 +0000)]
remove assumptions about language/country code length in QLocale::name()
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
Ivailo Monev [Mon, 5 Aug 2019 10:57:58 +0000 (10:57 +0000)]
replace longest matches date/time tags first in genlocale script
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>