applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-29 02:15:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[libcalamares] Rename files Label -> Translation

Browse source
This commit is contained in:
Adriaan de Groot 2021-07-26 11:38:15 +02:00
parent bf9f1c95bc
commit bc9d8fb13a
12 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libcalamares/CMakeLists.txt
View file

@ -40,12 +40,12 @@ set( libSources
# Locale-data service # Locale-data service
locale/Global.cpp locale/Global.cpp
locale/Label.cpp
locale/LabelModel.cpp
locale/Lookup.cpp locale/Lookup.cpp
locale/TimeZone.cpp locale/TimeZone.cpp
locale/TranslatableConfiguration.cpp locale/TranslatableConfiguration.cpp
locale/TranslatableString.cpp locale/TranslatableString.cpp
locale/Translation.cpp
locale/TranslationsModel.cpp
# Modules # Modules
modulesystem/Config.cpp modulesystem/Config.cpp

2
src/libcalamares/locale/Tests.cpp
View file

@ -9,9 +9,9 @@
*/ */
#include "locale/Global.h" #include "locale/Global.h"
#include "locale/LabelModel.h"
#include "locale/TimeZone.h" #include "locale/TimeZone.h"
#include "locale/TranslatableConfiguration.h" #include "locale/TranslatableConfiguration.h"
#include "locale/TranslationsModel.h"
#include "CalamaresVersion.h" #include "CalamaresVersion.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"

3
src/libcalamares/locale/TranslatableConfiguration.cpp
View file

@ -10,7 +10,7 @@
#include "TranslatableConfiguration.h" #include "TranslatableConfiguration.h"
#include "LabelModel.h" #include "TranslationsModel.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Variant.h" #include "utils/Variant.h"
@ -69,6 +69,7 @@ TranslatedString::get() const
QString QString
TranslatedString::get( const QLocale& locale ) const TranslatedString::get( const QLocale& locale ) const
{ {
// TODO: keep track of special cases like sr@latin and ca@valencia
QString localeName = locale.name(); QString localeName = locale.name();
// Special case, sr@latin doesn't have the @latin reflected in the name // Special case, sr@latin doesn't have the @latin reflected in the name
if ( locale.language() == QLocale::Language::Serbian && locale.script() == QLocale::Script::LatinScript ) if ( locale.language() == QLocale::Language::Serbian && locale.script() == QLocale::Script::LatinScript )

2
src/libcalamares/locale/Label.cpp → src/libcalamares/locale/Translation.cpp
View file

@ -9,7 +9,7 @@
* *
*/ */
#include "Label.h" #include "Translation.h"
#include <memory> #include <memory>

4
src/libcalamares/locale/Label.h → src/libcalamares/locale/Translation.h
View file

@ -9,8 +9,8 @@
* *
*/ */
#ifndef LOCALE_LABEL_H #ifndef LOCALE_TRANSLATION_H
#define LOCALE_LABEL_H #define LOCALE_TRANSLATION_H
#include <QLocale> #include <QLocale>
#include <QObject> #include <QObject>

8
src/libcalamares/locale/LabelModel.cpp → src/libcalamares/locale/TranslationsModel.cpp
View file

@ -9,7 +9,7 @@
* *
*/ */
#include "LabelModel.h" #include "TranslationsModel.h"
#include "Lookup.h" #include "Lookup.h"
@ -121,7 +121,8 @@ TranslationsModel::find( const QString& countryCode ) const
} }
auto c_l = countryData( countryCode ); auto c_l = countryData( countryCode );
int r = find( [&]( const Translation& l ) { return ( l.language() == c_l.second ) && ( l.country() == c_l.first ); } ); int r = find(
[&]( const Translation& l ) { return ( l.language() == c_l.second ) && ( l.country() == c_l.first ); } );
if ( r >= 0 ) if ( r >= 0 )
{ {
return r; return r;
@ -132,7 +133,8 @@ TranslationsModel::find( const QString& countryCode ) const
TranslationsModel* TranslationsModel*
availableTranslations() availableTranslations()
{ {
static TranslationsModel* model = new TranslationsModel( QStringLiteral( CALAMARES_TRANSLATION_LANGUAGES ).split( ';' ) ); static TranslationsModel* model
= new TranslationsModel( QStringLiteral( CALAMARES_TRANSLATION_LANGUAGES ).split( ';' ) );
return model; return model;
} }

6
src/libcalamares/locale/LabelModel.h → src/libcalamares/locale/TranslationsModel.h
View file

@ -9,11 +9,11 @@
* *
*/ */
#ifndef LOCALE_LABELMODEL_H #ifndef LOCALE_TRANSLATIONSMODEL_H
#define LOCALE_LABELMODEL_H #define LOCALE_TRANSLATIONSMODEL_H
#include "DllMacro.h" #include "DllMacro.h"
#include "Label.h" #include "Translation.h"
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QVector> #include <QVector>

2
src/modules/locale/Config.cpp
View file

@ -15,7 +15,7 @@
#include "JobQueue.h" #include "JobQueue.h"
#include "Settings.h" #include "Settings.h"
#include "locale/Global.h" #include "locale/Global.h"
#include "locale/Label.h" #include "locale/Translation.h"
#include "modulesystem/ModuleManager.h" #include "modulesystem/ModuleManager.h"
#include "network/Manager.h" #include "network/Manager.h"
#include "utils/Logger.h" #include "utils/Logger.h"

2
src/modules/welcome/Config.h
View file

@ -10,7 +10,7 @@
#ifndef WELCOME_CONFIG_H #ifndef WELCOME_CONFIG_H
#define WELCOME_CONFIG_H #define WELCOME_CONFIG_H
#include "locale/LabelModel.h" #include "locale/TranslationsModel.h"
#include "modulesystem/RequirementsModel.h" #include "modulesystem/RequirementsModel.h"
#include <QObject> #include <QObject>

1
src/modules/welcome/WelcomePage.cpp
View file

@ -20,7 +20,6 @@
#include "Settings.h" #include "Settings.h"
#include "ViewManager.h" #include "ViewManager.h"
#include "locale/LabelModel.h"
#include "modulesystem/ModuleManager.h" #include "modulesystem/ModuleManager.h"
#include "modulesystem/RequirementsModel.h" #include "modulesystem/RequirementsModel.h"
#include "utils/CalamaresUtilsGui.h" #include "utils/CalamaresUtilsGui.h"

2
src/modules/welcome/WelcomePage.h
View file

@ -11,7 +11,7 @@
#ifndef WELCOMEPAGE_H #ifndef WELCOMEPAGE_H
#define WELCOMEPAGE_H #define WELCOMEPAGE_H
#include "locale/LabelModel.h" #include "locale/TranslationsModel.h"
#include <QStyledItemDelegate> #include <QStyledItemDelegate>
#include <QWidget> #include <QWidget>

2
src/modules/welcomeq/WelcomeQmlViewStep.cpp
View file

@ -12,7 +12,7 @@
#include "checker/GeneralRequirements.h" #include "checker/GeneralRequirements.h"
#include "locale/LabelModel.h" #include "locale/TranslationsModel.h"
#include "utils/Dirs.h" #include "utils/Dirs.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Variant.h" #include "utils/Variant.h"