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

Merge remote-tracking branch 'upstream/master' into development

Browse Source
This commit is contained in:
Philip 2018-04-29 09:03:41 +02:00
commit 13bf2ba42f
8 changed files with 181 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -52,6 +52,8 @@ if(NOT CMAKE_VERSION VERSION_LESS "3.10.0")
)
endif()
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall" )
if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
message( STATUS "Found Clang ${CMAKE_CXX_COMPILER_VERSION}, setting up Clang-specific compiler flags." )
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall" )
@ -195,6 +197,12 @@ endif()
# Language en (source language) is added later. It isn't listed in
# Transifex either. Get the list of languages and their status
# from https://transifex.com/calamares/calamares/ .
#
# When adding a new language, take care that it is properly loaded
# by the translation framework. Languages with alternate scripts
# (sr@latin in particular) may need special handling in CalamaresUtils.cpp.
#
# TODO: pl and pl_PL overlap
set( _tx_complete ca zh_CN zh_TW hr cs_CZ da fr lt pt_BR pt_PT es tr_TR)
set( _tx_good sq ja pl sk ro it_IT hu he ru id de nl )
set( _tx_ok bg uk ast is ar sv el es_MX gl en_GB es_ES th fi_FI hi pl_PL

2
Dockerfile
View File

@ -1,2 +1,2 @@
FROM kdeneon/all
FROM kdeneon/all:dev-stable
RUN sudo apt-get update && sudo apt-get -y install build-essential cmake extra-cmake-modules gettext libatasmart-dev libboost-python-dev libkf5config-dev libkf5coreaddons-dev libkf5i18n-dev libkf5parts-dev libkf5service-dev libkf5widgetsaddons-dev libkpmcore-dev libparted-dev libpolkit-qt5-1-dev libqt5svg5-dev libqt5webkit5-dev libyaml-cpp-dev os-prober pkg-config python3-dev qtbase5-dev qtdeclarative5-dev qttools5-dev qttools5-dev-tools

4
calamares.desktop
View File

@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Version=1.0
Name=Calamares
Name=Install System
GenericName=System Installer
Keywords=calamares;system;installer
TryExec=calamares
@ -11,7 +11,7 @@ Icon=calamares
Terminal=false
StartupNotify=true
Categories=Qt;System;
X-AppStream-Ignore=true

16
src/libcalamares/utils/CalamaresUtils.cpp
View File

@ -147,6 +147,14 @@ installTranslator( const QLocale& locale,
if ( localeName == "C" )
localeName = "en";
// Special case of sr@latin
//
// See top-level CMakeLists.txt about special cases for translation loading.
if ( locale.language() == QLocale::Language::Serbian && locale.script() == QLocale::Script::LatinScript )
localeName = QStringLiteral( "sr@latin" );
cDebug() << "Looking for translations for" << localeName;
QTranslator* translator = nullptr;
// Branding translations
@ -167,11 +175,11 @@ installTranslator( const QLocale& locale,
"_",
brandingTranslationsDir.absolutePath() ) )
{
cDebug() << "Translation: Branding using locale:" << localeName;
cDebug() << " .. Branding using locale:" << localeName;
}
else
{
cDebug() << "Translation: Branding using default, system locale not found:" << localeName;
cDebug() << " .. Branding using default, system locale not found:" << localeName;
translator->load( brandingTranslationsPrefix + "en" );
}
@ -190,11 +198,11 @@ installTranslator( const QLocale& locale,
translator = new QTranslator( parent );
if ( translator->load( QString( ":/lang/calamares_" ) + localeName ) )
{
cDebug() << "Translation: Calamares using locale:" << localeName;
cDebug() << " .. Calamares using locale:" << localeName;
}
else
{
cDebug() << "Translation: Calamares using default, system locale not found:" << localeName;
cDebug() << " .. Calamares using default, system locale not found:" << localeName;
translator->load( QString( ":/lang/calamares_en" ) );
}

2
src/modules/locale/GeoIPTests.cpp
View File

@ -57,7 +57,7 @@ GeoIPTests::testJSON()
QCOMPARE( tz.second, QLatin1String( "Brussels" ) );
tz = handler.processReply( "time_zone: America/New_York\n" );
QCOMPARE( tz.first, "America" );
QCOMPARE( tz.first, QLatin1String( "America" ) );
}
void GeoIPTests::testJSONalt()

6
src/modules/partition/gui/CreatePartitionDialog.cpp
View File

@ -68,11 +68,11 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, PartitionNode* par
m_ui->encryptWidget->setText( tr( "En&crypt" ) );
m_ui->encryptWidget->hide();
if (m_device->type() == Device::Disk_Device) {
if (m_device->type() == Device::Type::Disk_Device) {
m_ui->lvNameLabel->hide();
m_ui->lvNameLineEdit->hide();
}
if (m_device->type() == Device::LVM_Device) {
if (m_device->type() == Device::Type::LVM_Device) {
/* LVM logical volume name can consist of: letters numbers _ . - +
* It cannot start with underscore _ and must not be equal to . or .. or any entry in /dev/
* QLineEdit accepts QValidator::Intermediate, so we just disable . at the beginning */
@ -242,7 +242,7 @@ CreatePartitionDialog::createPartition()
);
}
if (m_device->type() == Device::LVM_Device) {
if (m_device->type() == Device::Type::LVM_Device) {
partition->setPartitionPath(m_device->deviceNode() + QStringLiteral("/") + m_ui->lvNameLineEdit->text().trimmed());
}

2
src/modules/partition/gui/PartitionPage.cpp
View File

@ -145,7 +145,7 @@ PartitionPage::updateButtons()
if ( m_ui->deviceComboBox->currentIndex() >= 0 )
{
QModelIndex deviceIndex = m_core->deviceModel()->index( m_ui->deviceComboBox->currentIndex(), 0 );
if ( m_core->deviceModel()->deviceForIndex( deviceIndex )->type() != Device::LVM_Device )
if ( m_core->deviceModel()->deviceForIndex( deviceIndex )->type() != Device::Type::LVM_Device )
createTable = true;
}

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

@ -106,90 +106,172 @@ WelcomePage::WelcomePage( RequirementsChecker* requirementsChecker, QWidget* par
}
/** @brief Match the combobox of languages with a predicate
*
* Scans the entries in the @p list (actually a ComboBox) and if one
* matches the given @p predicate, returns true and sets @p matchFound
* to the locale that matched.
*
* If none match, returns false and leaves @p matchFound unchanged.
*/
static
bool matchLocale( QComboBox& list, QLocale& matchFound, std::function<bool(const QLocale&)> predicate)
{
for (int i = 0; i < list.count(); i++)
{
QLocale thisLocale = list.itemData( i, Qt::UserRole ).toLocale();
if ( predicate(thisLocale) )
{
list.setCurrentIndex( i );
cDebug() << " .. Matched locale " << thisLocale.name();
matchFound = thisLocale;
return true;
}
}
return false;
}
struct LocaleLabel
{
LocaleLabel( const QString& locale )
: m_locale( LocaleLabel::getLocale( locale ) )
, m_localeId( locale )
{
QString sortKey = QLocale::languageToString( m_locale.language() );
QString label = m_locale.nativeLanguageName();
if ( locale.contains( '_' ) && QLocale::countriesForLanguage( m_locale.language() ).count() > 2 )
{
QLatin1Literal countrySuffix( " (%1)" );
sortKey.append( QString( countrySuffix ).arg( QLocale::countryToString( m_locale.country() ) ) );
// If the language name is RTL, make this parenthetical addition RTL as well.
QString countryFormat = label.isRightToLeft() ? QString( QChar( 0x202B ) ) : QString();
countryFormat.append( countrySuffix );
label.append( countryFormat.arg( m_locale.nativeCountryName() ) );
}
m_sortKey = sortKey;
m_label = label;
}
QLocale m_locale;
QString m_localeId; // the locale identifier, e.g. "en_GB"
QString m_sortKey; // the English name of the locale
QString m_label; // the native name of the locale
/** @brief Define a sorting order.
*
* English (@see isEnglish() -- it means en_US) is sorted at the top.
*/
bool operator <(const LocaleLabel& other) const
{
if ( isEnglish() )
return !other.isEnglish();
if ( other.isEnglish() )
return false;
return m_sortKey < other.m_sortKey;
}
/** @brief Is this locale English?
*
* en_US and en (American English) is defined as English. The Queen's
* English -- proper English -- is relegated to non-English status.
*/
bool isEnglish() const
{
return m_localeId == QLatin1Literal( "en_US" ) || m_localeId == QLatin1Literal( "en" );
}
static QLocale getLocale( const QString& localeName )
{
if ( localeName.contains( "@latin" ) )
{
QLocale loc( localeName );
return QLocale( loc.language(), QLocale::Script::LatinScript, loc.country() );
}
else
return QLocale( localeName );
}
} ;
void
WelcomePage::initLanguages()
{
ui->languageWidget->setInsertPolicy( QComboBox::InsertAlphabetically );
// Fill the list of translations
ui->languageWidget->clear();
ui->languageWidget->setInsertPolicy( QComboBox::InsertAtBottom );
QLocale defaultLocale = QLocale( QLocale::system().name() );
{
bool isTranslationAvailable = false;
std::list< LocaleLabel > localeList;
const auto locales = QString( CALAMARES_TRANSLATION_LANGUAGES ).split( ';');
for ( const QString& locale : locales )
{
QLocale thisLocale = QLocale( locale );
QString lang = QLocale::languageToString( thisLocale.language() );
if ( QLocale::countriesForLanguage( thisLocale.language() ).count() > 2 )
lang.append( QString( " (%1)" )
.arg( QLocale::countryToString( thisLocale.country() ) ) );
ui->languageWidget->addItem( lang, thisLocale );
if ( thisLocale.language() == defaultLocale.language() &&
thisLocale.country() == defaultLocale.country() )
{
isTranslationAvailable = true;
ui->languageWidget->setCurrentIndex( ui->languageWidget->count() - 1 );
cDebug() << "Initial locale " << thisLocale.name();
CalamaresUtils::installTranslator( thisLocale.name(),
Calamares::Branding::instance()->translationsPathPrefix(),
qApp );
}
localeList.emplace_back( locale );
}
if ( !isTranslationAvailable )
localeList.sort(); // According to the sortkey, which is english
for ( const auto& locale : localeList )
{
for (int i = 0; i < ui->languageWidget->count(); i++)
{
QLocale thisLocale = ui->languageWidget->itemData( i, Qt::UserRole ).toLocale();
if ( thisLocale.language() == defaultLocale.language() )
{
isTranslationAvailable = true;
ui->languageWidget->setCurrentIndex( i );
cDebug() << "Initial locale " << thisLocale.name();
CalamaresUtils::installTranslator( thisLocale.name(),
Calamares::Branding::instance()->translationsPathPrefix(),
qApp );
break;
}
}
ui->languageWidget->addItem( locale.m_label, locale.m_locale );
}
if ( !isTranslationAvailable )
{
for (int i = 0; i < ui->languageWidget->count(); i++)
{
QLocale thisLocale = ui->languageWidget->itemData( i, Qt::UserRole ).toLocale();
if ( thisLocale == QLocale( QLocale::English, QLocale::UnitedStates ) )
{
isTranslationAvailable = true;
ui->languageWidget->setCurrentIndex( i );
cDebug() << "Translation unavailable, so initial locale set to " << thisLocale.name();
QLocale::setDefault( thisLocale );
CalamaresUtils::installTranslator( thisLocale.name(),
Calamares::Branding::instance()->translationsPathPrefix(),
qApp );
break;
}
}
}
if ( !isTranslationAvailable )
cWarning() << "No available translation matched" << defaultLocale;
connect( ui->languageWidget,
static_cast< void ( QComboBox::* )( int ) >( &QComboBox::currentIndexChanged ),
this, [ & ]( int newIndex )
{
QLocale selectedLocale = ui->languageWidget->itemData( newIndex, Qt::UserRole ).toLocale();
cDebug() << "Selected locale" << selectedLocale.name();
QLocale::setDefault( selectedLocale );
CalamaresUtils::installTranslator( selectedLocale,
Calamares::Branding::instance()->translationsPathPrefix(),
qApp );
} );
}
// Find the best initial translation
QLocale defaultLocale = QLocale( QLocale::system().name() );
QLocale matchedLocale;
cDebug() << "Matching exact locale" << defaultLocale;
bool isTranslationAvailable =
matchLocale( *(ui->languageWidget), matchedLocale,
[&](const QLocale& x){ return x.language() == defaultLocale.language() && x.country() == defaultLocale.country(); } );
if ( !isTranslationAvailable )
{
cDebug() << "Matching approximate locale" << defaultLocale.language();
isTranslationAvailable =
matchLocale( *(ui->languageWidget), matchedLocale,
[&](const QLocale& x){ return x.language() == defaultLocale.language(); } ) ;
}
if ( !isTranslationAvailable )
{
QLocale en_us( QLocale::English, QLocale::UnitedStates );
cDebug() << "Matching English (US)";
isTranslationAvailable =
matchLocale( *(ui->languageWidget), matchedLocale,
[&](const QLocale& x){ return x == en_us; } );
// Now, if it matched, because we didn't match the system locale, switch to the one found
if ( isTranslationAvailable )
QLocale::setDefault( matchedLocale );
}
if ( isTranslationAvailable )
CalamaresUtils::installTranslator( matchedLocale.name(),
Calamares::Branding::instance()->translationsPathPrefix(),
qApp );
else
cWarning() << "No available translation matched" << defaultLocale;
connect( ui->languageWidget,
static_cast< void ( QComboBox::* )( int ) >( &QComboBox::currentIndexChanged ),
this,
[&]( int newIndex )
{
QLocale selectedLocale = ui->languageWidget->itemData( newIndex, Qt::UserRole ).toLocale();
cDebug() << "Selected locale" << selectedLocale;
QLocale::setDefault( selectedLocale );
CalamaresUtils::installTranslator( selectedLocale,
Calamares::Branding::instance()->translationsPathPrefix(),
qApp );
} );
}