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

Add translationsPathPrefix to Branding.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-05-07 16:10:04 +02:00
parent d1047ab76e
commit 09d7cd9de6
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libcalamaresui/Branding.cpp
View File

@ -1,6 +1,6 @@
/* === This file is part of Calamares - <http://github.com/calamares> === /* === This file is part of Calamares - <http://github.com/calamares> ===
* *
* Copyright 2014, Teo Mrnjavac <teo@kde.org> * Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -172,6 +172,14 @@ Branding::Branding( const QString& brandingFilePath,
{ {
cDebug() << "WARNING: YAML parser error " << e.what(); cDebug() << "WARNING: YAML parser error " << e.what();
} }
QDir translationsDir( componentDir.filePath( "lang" ) );
if ( !translationsDir.exists() )
cDebug() << "WARNING: the selected branding component does not ship translations.";
m_translationsPathPrefix = translationsDir.absolutePath();
m_translationsPathPrefix.append( QString( "%1calamares-%2" )
.arg( QDir::separator() )
.arg( m_componentName ) );
} }
else else
{ {
@ -205,6 +213,13 @@ Branding::componentDirectory() const
} }
QString
Branding::translationsPathPrefix() const
{
return m_translationsPathPrefix;
}
QString QString
Branding::string( Branding::StringEntry stringEntry ) const Branding::string( Branding::StringEntry stringEntry ) const
{ {

4
src/libcalamaresui/Branding.h
View File

@ -1,6 +1,6 @@
/* === This file is part of Calamares - <http://github.com/calamares> === /* === This file is part of Calamares - <http://github.com/calamares> ===
* *
* Copyright 2014, Teo Mrnjavac <teo@kde.org> * Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -72,6 +72,7 @@ public:
QString descriptorPath() const; QString descriptorPath() const;
QString componentName() const; QString componentName() const;
QString componentDirectory() const; QString componentDirectory() const;
QString translationsPathPrefix() const;
QString string( Branding::StringEntry stringEntry ) const; QString string( Branding::StringEntry stringEntry ) const;
QString styleString( Branding::StyleEntry styleEntry ) const; QString styleString( Branding::StyleEntry styleEntry ) const;
@ -101,6 +102,7 @@ private:
QMap< QString, QString > m_images; QMap< QString, QString > m_images;
QMap< QString, QString > m_style; QMap< QString, QString > m_style;
QString m_slideshowPath; QString m_slideshowPath;
QString m_translationsPathPrefix;
}; };
} }