napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[welcome] Only show (country) in list if the locale suggests it

Browse Source 
- A locale suggests it is country-specific by having the form <lang>_<country>
 - This mostly fixes locale "ar" being presented as "Arabiy (Misr)" when
   there is no need to (and the RTL is messed up then, too).
This commit is contained in:
Adriaan de Groot 2018-04-19 07:19:10 -04:00
parent 59537d86d6
commit 7c944760fc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/welcome/WelcomePage.cpp
View File

@ -141,7 +141,7 @@ struct LocaleLabel
QString sortKey = QLocale::languageToString( thisLocale.language() ); QString sortKey = QLocale::languageToString( thisLocale.language() );
QString label = thisLocale.nativeLanguageName(); QString label = thisLocale.nativeLanguageName();
if ( QLocale::countriesForLanguage( thisLocale.language() ).count() > 2 ) if ( locale.contains( '_' ) && QLocale::countriesForLanguage( thisLocale.language() ).count() > 2 )
{ {
sortKey.append( QString( " (%1)" ) sortKey.append( QString( " (%1)" )
.arg( QLocale::countryToString( thisLocale.country() ) ) ); .arg( QLocale::countryToString( thisLocale.country() ) ) );