39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
|
--- calamares-1.0.1/src/modules/locale/LocalePage.cpp.orig 2015-02-20 15:17:31.878095644 +0100
|
||
|
|
+++ calamares-1.0.1/src/modules/locale/LocalePage.cpp 2015-02-20 15:51:22.166759362 +0100
|
||
|
|
@@ -303,7 +303,7 @@
|
||
|
|
QLocale myLocale = QLocale();
|
||
|
|
|
||
|
|
if ( m_localeGenLines.isEmpty() )
|
||
|
|
- return "en_US.UTF-8 UTF-8";
|
||
|
|
+ return QString::fromUtf8(getenv("LANG")) + " UTF-8";
|
||
|
|
|
||
|
|
QString myLanguage = myLocale.name().split( '_' ).first();
|
||
|
|
QStringList linesForLanguage;
|
||
|
|
@@ -314,7 +314,7 @@
|
||
|
|
}
|
||
|
|
|
||
|
|
if ( linesForLanguage.length() == 0 )
|
||
|
|
- return "en_US.UTF-8 UTF-8";
|
||
|
|
+ return QString::fromUtf8(getenv("LANG")) + " UTF-8";
|
||
|
|
else if ( linesForLanguage.length() == 1 )
|
||
|
|
return linesForLanguage.first();
|
||
|
|
else
|
||
|
|
@@ -340,7 +340,7 @@
|
||
|
|
}
|
||
|
|
|
||
|
|
if ( linesForLanguageAndCountry.length() == 0 )
|
||
|
|
- return "en_US.UTF-8 UTF-8";
|
||
|
|
+ return QString::fromUtf8(getenv("LANG")) + " UTF-8";
|
||
|
|
else if ( linesForLanguageAndCountry.length() == 1 )
|
||
|
|
return linesForLanguageAndCountry.first();
|
||
|
|
else
|
||
|
|
@@ -356,7 +356,7 @@
|
||
|
|
return linesForLanguageAndCountryUtf.first();
|
||
|
|
}
|
||
|
|
|
||
|
|
- return "en_US.UTF-8 UTF-8";
|
||
|
|
+ return QString::fromUtf8(getenv("LANG")) + " UTF-8";
|
||
|
|
}
|
||
|
|
|
||
|
|
|