From f9f18e5d3b93214af3b79ab57a9cce76f9b30bdc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 23 May 2022 17:00:56 +0200 Subject: [PATCH] [welcome] Use welcome message from Config object --- src/modules/welcome/WelcomePage.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp index 186e63653..d5bc286d1 100644 --- a/src/modules/welcome/WelcomePage.cpp +++ b/src/modules/welcome/WelcomePage.cpp @@ -209,20 +209,7 @@ WelcomePage::setLanguageIcon( QPixmap i ) void WelcomePage::retranslate() { - QString message; - - if ( Calamares::Settings::instance()->isSetupMode() ) - { - message = Calamares::Branding::instance()->welcomeStyleCalamares() - ? tr( "

Welcome to the Calamares setup program for %1.

" ) - : tr( "

Welcome to %1 setup.

" ); - } - else - { - message = Calamares::Branding::instance()->welcomeStyleCalamares() - ? tr( "

Welcome to the Calamares installer for %1.

" ) - : tr( "

Welcome to the %1 installer.

" ); - } + const QString message = m_conf->genericWelcomeMessage(); ui->mainText->setText( message.arg( Calamares::Branding::instance()->versionedName() ) ); ui->retranslateUi( this );