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

Use Retranslator in Prepare module (partial).

Browse Source
This commit is contained in:
Teo Mrnjavac 2014-11-13 15:03:11 +01:00
parent e5ac1a5c4f
commit 9b2dfdf1ec
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/modules/prepare/PreparePage.cpp
View File

@ -21,6 +21,7 @@
#include "PrepareCheckWidget.h" #include "PrepareCheckWidget.h"
#include "utils/CalamaresUtilsGui.h" #include "utils/CalamaresUtilsGui.h"
#include "utils/Retranslator.h"
#include "Branding.h" #include "Branding.h"
#include <QBoxLayout> #include <QBoxLayout>
@ -33,8 +34,10 @@ PreparePage::PreparePage( QWidget* parent )
QBoxLayout *mainLayout = new QVBoxLayout; QBoxLayout *mainLayout = new QVBoxLayout;
setLayout( mainLayout ); setLayout( mainLayout );
QLabel* text = new QLabel( tr( "For best results, please ensure that this " QLabel* text = new QLabel( this );
"computer:" ), this ); CALAMARES_RETRANSLATE(
text->setText( tr( "For best results, please ensure that this computer:" ) );
)
mainLayout->addSpacing( CalamaresUtils::defaultFontHeight() ); mainLayout->addSpacing( CalamaresUtils::defaultFontHeight() );
mainLayout->addWidget( text ); mainLayout->addWidget( text );
@ -88,24 +91,27 @@ PreparePage::init( const QList< PrepareEntry >& checkEntries )
iconLabel->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::Fail, iconLabel->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::Fail,
CalamaresUtils::Original, CalamaresUtils::Original,
iconLabel->size() ) ); iconLabel->size() ) );
textLabel->setText( tr( "This computer does not satisfy the minimum " CALAMARES_RETRANSLATE(
"requirements for installing %1.\n" textLabel->setText( tr( "This computer does not satisfy the minimum "
"Installation cannot continue." ) "requirements for installing %1.\n"
"Installation cannot continue." )
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortVersionedName ) ) ); string( Calamares::Branding::ShortVersionedName ) ) );
)
} }
else else
{ {
iconLabel->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::Information, iconLabel->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::Information,
CalamaresUtils::Original, CalamaresUtils::Original,
iconLabel->size() ) ); iconLabel->size() ) );
textLabel->setText( tr( "This computer does not satisfy some of the " CALAMARES_RETRANSLATE(
"recommended requirements for installing %1.\n" textLabel->setText( tr( "This computer does not satisfy some of the "
"Installation can continue, but some features " "recommended requirements for installing %1.\n"
"might be disabled." ) "Installation can continue, but some features "
"might be disabled." )
.arg( Calamares::Branding::instance()-> .arg( Calamares::Branding::instance()->
string( Calamares::Branding::ShortVersionedName ) ) ); string( Calamares::Branding::ShortVersionedName ) ) );
)
} }
mainLayout->insertLayout( mainLayout->count(), infoLayout ); mainLayout->insertLayout( mainLayout->count(), infoLayout );

4
src/modules/prepare/PrepareViewStep.cpp
View File

@ -24,6 +24,7 @@
#include "widgets/WaitingWidget.h" #include "widgets/WaitingWidget.h"
#include "utils/CalamaresUtilsGui.h" #include "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Retranslator.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"
@ -47,8 +48,9 @@ PrepareViewStep::PrepareViewStep( QObject* parent )
m_widget->setLayout( mainLayout ); m_widget->setLayout( mainLayout );
CalamaresUtils::unmarginLayout( mainLayout ); CalamaresUtils::unmarginLayout( mainLayout );
QWidget* waitingWidget = new WaitingWidget( tr( "Gathering system information..." ) ); WaitingWidget* waitingWidget = new WaitingWidget( QString() );
mainLayout->addWidget( waitingWidget ); mainLayout->addWidget( waitingWidget );
CALAMARES_RETRANSLATE( waitingWidget->setText( tr( "Gathering system information..." ) ); )
QTimer* timer = new QTimer; QTimer* timer = new QTimer;
timer->setSingleShot( true ); timer->setSingleShot( true );