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

[merge] fix conflictÂ

Browse Source
This commit is contained in:
Philip Müller 2019-01-09 19:09:13 +01:00
parent fc76d1560f
commit e7989dff81
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/locale/LocalePage.cpp
View File

@ -387,12 +387,7 @@ std::pair< QString, QString > LocalePage::prettyLocaleStatus( const LocaleConfig
{ {
using CalamaresUtils::LocaleLabel; using CalamaresUtils::LocaleLabel;
<<<<<<< HEAD
LocaleLabel lang( lc.lang, LocaleLabel::LabelFormat::AlwaysWithCountry );
=======
LocaleLabel lang( lc.language(), LocaleLabel::LabelFormat::AlwaysWithCountry ); LocaleLabel lang( lc.language(), LocaleLabel::LabelFormat::AlwaysWithCountry );
>>>>>>> 44211ee19a30eb062508bba565da274c53b16a71
LocaleLabel num( lc.lc_numeric, LocaleLabel::LabelFormat::AlwaysWithCountry );
return std::make_pair< QString, QString >( return std::make_pair< QString, QString >(
tr( "The system language will be set to %1." ).arg( lang.label() ), tr( "The system language will be set to %1." ).arg( lang.label() ),