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

[libcalamaresui] Branding uses $-substitution

Browse Source 
Replace @{name} with ${name} to be consistent with the rest
of the replacement-code in Calamares.
This commit is contained in:
Adriaan de Groot 2022-08-07 15:14:13 +02:00
parent d1664f3502
commit 1821eb1b39
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/branding/default/branding.desc
View File

@ -109,7 +109,7 @@ navigation: widget
# #
# These strings support substitution from /etc/os-release # These strings support substitution from /etc/os-release
# if KDE Frameworks 5.58 are available at build-time. When # if KDE Frameworks 5.58 are available at build-time. When
# enabled, @{var-name} is replaced by the equivalent value # enabled, ${varname} is replaced by the equivalent value
# from os-release. All the supported var-names are in all-caps, # from os-release. All the supported var-names are in all-caps,
# and are listed on the FreeDesktop.org site, # and are listed on the FreeDesktop.org site,
# https://www.freedesktop.org/software/systemd/man/os-release.html # https://www.freedesktop.org/software/systemd/man/os-release.html
@ -121,7 +121,7 @@ navigation: widget
# are visible as buttons there if the corresponding *show* keys # are visible as buttons there if the corresponding *show* keys
# are set to "true" (they can also be overridden). # are set to "true" (they can also be overridden).
strings: strings:
productName: "@{NAME}" productName: "${NAME}"
shortProductName: Generic shortProductName: Generic
version: 2020.2 LTS version: 2020.2 LTS
shortVersion: 2020.2 shortVersion: 2020.2

2
src/libcalamaresui/Branding.cpp
View File

@ -259,7 +259,7 @@ Branding::Branding( const QString& brandingFilePath, QObject* parent )
{ QStringLiteral( "VARIANT_ID" ), relInfo.variantId() }, { QStringLiteral( "VARIANT_ID" ), relInfo.variantId() },
{ QStringLiteral( "LOGO" ), relInfo.logo() } } }; { QStringLiteral( "LOGO" ), relInfo.logo() } } };
auto expand = [ & ]( const QString& s ) -> QString auto expand = [ & ]( const QString& s ) -> QString
{ return KMacroExpander::expandMacros( s, relMap, QLatin1Char( '@' ) ); }; { return KMacroExpander::expandMacros( s, relMap, QLatin1Char( '$' ) ); };
#else #else
auto expand = []( const QString& s ) -> QString { return s; }; auto expand = []( const QString& s ) -> QString { return s; };
#endif #endif