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

use ShortProductName as second argument

Browse Source 
choicepage.cpp has 2 instances where %2 is not defined
This commit is contained in:
demmm 2015-05-16 12:48:18 -04:00 committed by Teo Mrnjavac
parent 235d0058c9
commit 5a07c240a9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/partition/gui/ChoicePage.cpp
View File

@ -181,7 +181,9 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
"You can choose which operating system you want each time the " "You can choose which operating system you want each time the "
"computer starts up." ) "computer starts up." )
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortVersionedName ) ) ); string( Calamares::Branding::ShortVersionedName ) )
.arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortProductName ) ) );
if ( core->deviceModel()->rowCount() < 2 ) if ( core->deviceModel()->rowCount() < 2 )
eraseButton->setText( tr( "<strong>Erase disk and install %1</strong><br/>" eraseButton->setText( tr( "<strong>Erase disk and install %1</strong><br/>"
@ -228,7 +230,9 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
"You can choose which operating system you want each time the " "You can choose which operating system you want each time the "
"computer starts up." ) "computer starts up." )
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortVersionedName ) ) ); string( Calamares::Branding::ShortVersionedName ) )
.arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortProductName ) ) );
if ( core->deviceModel()->rowCount() < 2 ) if ( core->deviceModel()->rowCount() < 2 )
eraseButton->setText( tr( "<strong>Erase disk and install %1</strong><br/>" eraseButton->setText( tr( "<strong>Erase disk and install %1</strong><br/>"