diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-10-22 19:11:38 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2020-11-04 20:20:40 +0000 |
| commit | ca9cef2f6a9282cdfbdb8d2c46c4508c6da936bd (patch) | |
| tree | cf501e43b16ad94ab908906e49560be4e3a8f1eb | |
| parent | c7d34b9090d5b08310e27be17f46b23a24d9d7cb (diff) | |
Clear out deprecated QLocale::Language values
CLDR provides no Bihari locale data, so we're retiring it.
Tagalog is now called Filipino.
Various aliases mentioned in comments are going away.
Task-number: QTBUG-88167
Change-Id: Ie31353911be2de908f53e9b84d6b819677ad946b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 7268647fd5f911303a507fd5cc7c3feb48bb253f)
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
| -rw-r--r-- | src/linguist/shared/numerus.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/linguist/shared/numerus.cpp b/src/linguist/shared/numerus.cpp index 6a1ca8130..5b4895233 100644 --- a/src/linguist/shared/numerus.cpp +++ b/src/linguist/shared/numerus.cpp @@ -162,7 +162,6 @@ static const QLocale::Language englishStyleLanguages[] = { QLocale::Bashkir, QLocale::Basque, QLocale::Bengali, - QLocale::Bihari, QLocale::Bulgarian, QLocale::Catalan, QLocale::Cornish, @@ -206,7 +205,7 @@ static const QLocale::Language englishStyleLanguages[] = { // Missing: Nahuatl, QLocale::Nepali, QLocale::NorthernSotho, - QLocale::NorwegianBokmal, // same as Norwegian + QLocale::NorwegianBokmal, QLocale::NorwegianNynorsk, QLocale::Occitan, QLocale::Oriya, @@ -232,7 +231,6 @@ static const QLocale::Language englishStyleLanguages[] = { QLocale::Tsonga, QLocale::Tswana, QLocale::Turkmen, - // QLocale::Twi, // mapped to Akan QLocale::Uigur, QLocale::Urdu, QLocale::Uzbek, @@ -278,13 +276,11 @@ static const QLocale::Language russianStyleLanguages[] = { QLocale::Croatian, QLocale::Russian, QLocale::Serbian, - // QLocale::SerboCroatian, // deprecated, mapped to Serbian QLocale::Ukrainian, EOL }; static const QLocale::Language polishLanguage[] = { QLocale::Polish, EOL }; static const QLocale::Language romanianLanguages[] = { - // QLocale::Moldavian, // deprecated, mapped to Romanian QLocale::Romanian, EOL }; @@ -292,7 +288,7 @@ static const QLocale::Language slovenianLanguage[] = { QLocale::Slovenian, EOL } static const QLocale::Language malteseLanguage[] = { QLocale::Maltese, EOL }; static const QLocale::Language welshLanguage[] = { QLocale::Welsh, EOL }; static const QLocale::Language arabicLanguage[] = { QLocale::Arabic, EOL }; -static const QLocale::Language tagalogLanguage[] = { QLocale::Tagalog, EOL }; +static const QLocale::Language tagalogLanguage[] = { QLocale::Filipino, EOL }; static const QLocale::Country frenchStyleCountries[] = { // keep synchronized with frenchStyleLanguages |