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

[welcome] Use generated about string

Browse Source
This commit is contained in:
Adriaan de Groot 2022-05-23 16:57:51 +02:00
parent 09255a1d9c
commit 4a852facb3
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libcalamares/CalamaresAbout.cpp
View File

@ -9,6 +9,8 @@
#include "CalamaresAbout.h"
#include "CalamaresVersion.h"
#include <QCoreApplication>
static const char s_header[]
@ -59,15 +61,21 @@ aboutMaintainers()
} );
}
static QString
substituteVersions( const QString& s )
{
return s.arg( CALAMARES_APPLICATION_NAME ).arg( CALAMARES_VERSION );
}
const QString
Calamares::aboutString()
{
return QCoreApplication::translate( "AboutData", s_header ) + aboutMaintainers()
return substituteVersions( QCoreApplication::translate( "AboutData", s_header ) ) + aboutMaintainers()
+ QCoreApplication::translate( "AboutData", s_footer );
}
const QString
Calamares::aboutStringUntranslated()
{
return QString( s_header ) + aboutMaintainers() + QString( s_footer );
return substituteVersions( QString( s_header ) ) + aboutMaintainers() + QString( s_footer );
}

8
src/libcalamares/CalamaresAbout.h
View File

@ -16,7 +16,15 @@
namespace Calamares
{
/** @brief Returns an about string for the application
*
* The about string includes a header-statement, a list of maintainer
* addresses, and a thank-you to Blue Systems. There is on %-substitution
* left, where you can fill in the name of the product (e.g. to say
* "Calamares for Netrunner" or ".. for Manjaro").
*/
DLLEXPORT const QString aboutStringUntranslated();
/// @brief As above, but translated in the current Calamares language
DLLEXPORT const QString aboutString();
} // namespace Calamares

17
src/modules/welcome/WelcomePage.cpp
View File

@ -15,6 +15,7 @@
#include "ui_WelcomePage.h"
#include "Branding.h"
#include "CalamaresAbout.h"
#include "CalamaresVersion.h"
#include "Config.h"
#include "Settings.h"
@ -235,21 +236,7 @@ WelcomePage::showAboutBox()
= Calamares::Settings::instance()->isSetupMode() ? tr( "About %1 setup" ) : tr( "About %1 installer" );
QMessageBox mb( QMessageBox::Information,
title.arg( CALAMARES_APPLICATION_NAME ),
tr( "<h1>%1</h1><br/>"
"<strong>%2<br/>"
"for %3</strong><br/><br/>"
"Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>"
"Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>"
"Thanks to <a href=\"https://calamares.io/team/\">the Calamares team</a> "
"and the <a href=\"https://www.transifex.com/calamares/calamares/\">Calamares "
"translators team</a>.<br/><br/>"
"<a href=\"https://calamares.io/\">Calamares</a> "
"development is sponsored by <br/>"
"<a href=\"http://www.blue-systems.com/\">Blue Systems</a> - "
"Liberating Software." )
.arg( CALAMARES_APPLICATION_NAME )
.arg( CALAMARES_VERSION )
.arg( Calamares::Branding::instance()->versionedName() ),
Calamares::aboutString().arg( Calamares::Branding::instance()->versionedName() ),
QMessageBox::Ok,
this );
Calamares::fixButtonLabels( &mb );