From 4c51d320f6ae3b22449df0e4cf6e642b259aea3f Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Thu, 16 Oct 2014 16:59:29 +0200 Subject: [PATCH] Use branding in Prepare viewmodule. --- src/modules/prepare/PreparePage.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/modules/prepare/PreparePage.cpp b/src/modules/prepare/PreparePage.cpp index 7d76b849a..b69dd584e 100644 --- a/src/modules/prepare/PreparePage.cpp +++ b/src/modules/prepare/PreparePage.cpp @@ -21,6 +21,7 @@ #include "PrepareCheckWidget.h" #include "utils/CalamaresUtilsGui.h" +#include "Branding.h" #include #include @@ -89,7 +90,9 @@ PreparePage::init( const QList< PrepareEntry >& checkEntries ) iconLabel->size() ) ); textLabel->setText( tr( "This computer does not satisfy the minimum " "requirements for installing %1.\n" - "Installation cannot continue." ).arg( "$RELEASE_NAME" ) ); //TODO: fill this with text from branding system + "Installation cannot continue." ) + .arg( Calamares::Branding::instance()-> + string( Calamares::Branding::ShortVersionedName ) ) ); } else { @@ -99,7 +102,9 @@ PreparePage::init( const QList< PrepareEntry >& checkEntries ) textLabel->setText( tr( "This computer does not satisfy some of the " "recommended requirements for installing %1.\n" "Installation can continue, but some features " - "might be disabled." ).arg( "$RELEASE_NAME" ) ); //TODO: fill this with text from branding system + "might be disabled." ) + .arg( Calamares::Branding::instance()-> + string( Calamares::Branding::ShortVersionedName ) ) ); }