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

[locale] Repair tests

Browse Source 
- prefers language default country (ca_ES over ca_AD)
- prefers non-empty country match

(cherry picked from commit fb3112b75d)
This commit is contained in:
Adriaan de Groot 2022-08-23 02:02:54 +02:00
parent d7254f6f82
commit 55bea24660
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/locale/Tests.cpp
View File

@ -310,10 +310,10 @@ LocaleTests::testLanguageDetection_data()
QTest::newRow( "english (US)" ) << QStringLiteral( "en" ) << QStringLiteral( "US" )
<< QStringLiteral( "en_US.UTF-8" );
QTest::newRow( "english (CA)" ) << QStringLiteral( "en" ) << QStringLiteral( "CA" )
<< QStringLiteral( "en" ); // because it's first in the list
<< QStringLiteral( "en_US.UTF-8" );
QTest::newRow( "english (GB)" ) << QStringLiteral( "en" ) << QStringLiteral( "GB" )
<< QStringLiteral( "en_GB.UTF-8" );
QTest::newRow( "english (NL)" ) << QStringLiteral( "en" ) << QStringLiteral( "NL" ) << QStringLiteral( "en" );
QTest::newRow( "english (NL)" ) << QStringLiteral( "en" ) << QStringLiteral( "NL" ) << QStringLiteral( "en_US.UTF-8" );
QTest::newRow( "portuguese (PT)" ) << QStringLiteral( "pt" ) << QStringLiteral( "PT" )
<< QStringLiteral( "pt_PT.UTF-8" );
@ -323,11 +323,11 @@ LocaleTests::testLanguageDetection_data()
<< QStringLiteral( "pt_BR.UTF-8" );
QTest::newRow( "catalan ()" ) << QStringLiteral( "ca" ) << QStringLiteral( "" )
<< QStringLiteral( "ca_AD.UTF-8" ); // no country given? Matches first
<< QStringLiteral( "ca_ES.UTF-8" ); // no country given? Matches QLocale-default
QTest::newRow( "catalan (ES)" ) << QStringLiteral( "ca" ) << QStringLiteral( "ES" )
<< QStringLiteral( "ca_ES.UTF-8" );
QTest::newRow( "catalan (NL)" ) << QStringLiteral( "ca" ) << QStringLiteral( "NL" )
<< QStringLiteral( "ca_AD.UTF-8" );
<< QStringLiteral( "ca_ES.UTF-8" );
QTest::newRow( "catalan (@valencia)" ) << QStringLiteral( "ca@valencia" ) << QStringLiteral( "ES" )
<< QStringLiteral( "ca_ES@valencia" ); // Prefers regional variant
QTest::newRow( "catalan (@valencia_NL)" )