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

[locale] Tighten up language-matching

Browse Source 
- Drop plain startsWith() matching, since we now have "as" and "ast"
   as supported languages, where one name is a prefix of the other.
This commit is contained in:
Adriaan de Groot 2020-01-28 17:35:54 +01:00
parent 49690fc681
commit a09593e4a2
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/locale/LocaleConfiguration.cpp
View File

@ -18,7 +18,11 @@
*/ */
#include "LocaleConfiguration.h" #include "LocaleConfiguration.h"
#include "utils/Logger.h"
#include <QLocale> #include <QLocale>
#include <QRegularExpression>
LocaleConfiguration::LocaleConfiguration() LocaleConfiguration::LocaleConfiguration()
: explicit_lang( false ) : explicit_lang( false )
@ -53,14 +57,9 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
{ {
QString language = languageLocale.split( '_' ).first(); QString language = languageLocale.split( '_' ).first();
QStringList linesForLanguage; // Either an exact match, or the whole language part matches
for ( const QString& line : availableLocales ) // (followed by .<encoding> or _<country>
{ QStringList linesForLanguage = availableLocales.filter( QRegularExpression( language + "[._]" ) );
if ( line.startsWith( language ) )
{
linesForLanguage.append( line );
}
}
QString lang; QString lang;
if ( linesForLanguage.length() == 0 || languageLocale.isEmpty() ) if ( linesForLanguage.length() == 0 || languageLocale.isEmpty() )