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

Merge pull request #2208 from bitigchi/strings

Browse Source 
Improve string formatting and context
This commit is contained in:
Adriaan de Groot 2023-10-09 22:30:19 +02:00 committed by GitHub
commit 367c5097e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/calamares/CalamaresWindow.cpp
View File

@ -154,9 +154,9 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug,
aboutDialog->setIcon( Calamares::defaultPixmap( aboutDialog->setIcon( Calamares::defaultPixmap(
Calamares::Information, Calamares::Original, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) ); Calamares::Information, Calamares::Original, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) );
CALAMARES_RETRANSLATE_FOR( CALAMARES_RETRANSLATE_FOR(
aboutDialog, aboutDialog->setText( QCoreApplication::translate( "calamares-sidebar", "About" ) ); aboutDialog, aboutDialog->setText( QCoreApplication::translate( "calamares-sidebar", "About", "@button" ) );
aboutDialog->setToolTip( aboutDialog->setToolTip(
QCoreApplication::translate( "calamares-sidebar", "Show information about Calamares" ) ); ); QCoreApplication::translate( "calamares-sidebar", "Show information about Calamares", "@tooltip" ) ); );
extraButtons->addWidget( aboutDialog ); extraButtons->addWidget( aboutDialog );
aboutDialog->setFlat( true ); aboutDialog->setFlat( true );
aboutDialog->setCheckable( true ); aboutDialog->setCheckable( true );
@ -169,9 +169,9 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug,
debugWindowBtn->setIcon( Calamares::defaultPixmap( debugWindowBtn->setIcon( Calamares::defaultPixmap(
Calamares::Bugs, Calamares::Original, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) ); Calamares::Bugs, Calamares::Original, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) );
CALAMARES_RETRANSLATE_FOR( CALAMARES_RETRANSLATE_FOR(
debugWindowBtn, debugWindowBtn->setText( QCoreApplication::translate( "calamares-sidebar", "Debug" ) ); debugWindowBtn, debugWindowBtn->setText( QCoreApplication::translate( "calamares-sidebar", "Debug", "@button" ) );
debugWindowBtn->setToolTip( debugWindowBtn->setToolTip(
QCoreApplication::translate( "calamares-sidebar", "Show debug information" ) ); ); QCoreApplication::translate( "calamares-sidebar", "Show debug information", "@tooltip" ) ); );
extraButtons->addWidget( debugWindowBtn ); extraButtons->addWidget( debugWindowBtn );
debugWindowBtn->setFlat( true ); debugWindowBtn->setFlat( true );
debugWindowBtn->setCheckable( true ); debugWindowBtn->setCheckable( true );
@ -199,7 +199,7 @@ getWidgetNavigation( Calamares::DebugWindowManager*,
{ {
auto* back auto* back
= new QPushButton( getButtonIcon( QStringLiteral( "go-previous" ) ), = new QPushButton( getButtonIcon( QStringLiteral( "go-previous" ) ),
QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Back" ), QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Back", "@button" ),
navigation ); navigation );
back->setObjectName( "view-button-back" ); back->setObjectName( "view-button-back" );
back->setEnabled( viewManager->backEnabled() ); back->setEnabled( viewManager->backEnabled() );
@ -215,7 +215,7 @@ getWidgetNavigation( Calamares::DebugWindowManager*,
{ {
auto* next auto* next
= new QPushButton( getButtonIcon( QStringLiteral( "go-next" ) ), = new QPushButton( getButtonIcon( QStringLiteral( "go-next" ) ),
QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Next" ), QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Next", "@button" ),
navigation ); navigation );
next->setObjectName( "view-button-next" ); next->setObjectName( "view-button-next" );
next->setEnabled( viewManager->nextEnabled() ); next->setEnabled( viewManager->nextEnabled() );
@ -232,7 +232,7 @@ getWidgetNavigation( Calamares::DebugWindowManager*,
{ {
auto* quit auto* quit
= new QPushButton( getButtonIcon( QStringLiteral( "dialog-cancel" ) ), = new QPushButton( getButtonIcon( QStringLiteral( "dialog-cancel" ) ),
QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Cancel" ), QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Cancel", "@button" ),
navigation ); navigation );
quit->setObjectName( "view-button-cancel" ); quit->setObjectName( "view-button-cancel" );
QObject::connect( quit, &QPushButton::clicked, viewManager, &Calamares::ViewManager::quit ); QObject::connect( quit, &QPushButton::clicked, viewManager, &Calamares::ViewManager::quit );
@ -398,6 +398,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
setWindowFlag( Qt::WindowCloseButtonHint, false ); setWindowFlag( Qt::WindowCloseButtonHint, false );
} }
// %1 is the distribution name
CALAMARES_RETRANSLATE( const auto* branding = Calamares::Branding::instance(); CALAMARES_RETRANSLATE( const auto* branding = Calamares::Branding::instance();
setWindowTitle( Calamares::Settings::instance()->isSetupMode() setWindowTitle( Calamares::Settings::instance()->isSetupMode()
? tr( "%1 Setup Program" ).arg( branding->productName() ) ? tr( "%1 Setup Program" ).arg( branding->productName() )

6
src/calamares/DebugWindow.cpp
View File

@ -161,7 +161,7 @@ DebugWindow::DebugWindow()
m_ui->sendLogButton->setVisible( Calamares::Paste::isEnabled() ); m_ui->sendLogButton->setVisible( Calamares::Paste::isEnabled() );
connect( m_ui->sendLogButton, &QPushButton::clicked, [ this ]() { Calamares::Paste::doLogUploadUI( this ); } ); connect( m_ui->sendLogButton, &QPushButton::clicked, [ this ]() { Calamares::Paste::doLogUploadUI( this ); } );
CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); setWindowTitle( tr( "Debug information" ) ); ); CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); setWindowTitle( tr( "Debug Information", "@title" ) ); );
} }
void void
@ -232,8 +232,8 @@ void
DebugWindowManager::about() DebugWindowManager::about()
{ {
QString title = Calamares::Settings::instance()->isSetupMode() QString title = Calamares::Settings::instance()->isSetupMode()
? QCoreApplication::translate( "WelcomePage", "About %1 setup" ) ? QCoreApplication::translate( "WelcomePage", "About %1 Setup", "@title" )
: QCoreApplication::translate( "WelcomePage", "About %1 installer" ); : QCoreApplication::translate( "WelcomePage", "About %1 Installer", "@title" );
QMessageBox mb( QMessageBox::Information, QMessageBox mb( QMessageBox::Information,
title.arg( CALAMARES_APPLICATION_NAME ), title.arg( CALAMARES_APPLICATION_NAME ),
Calamares::aboutString().arg( Calamares::Branding::instance()->versionedName() ), Calamares::aboutString().arg( Calamares::Branding::instance()->versionedName() ),

2
src/calamares/DebugWindow.ui
View File

@ -99,7 +99,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
<item> <item>
<widget class="QPushButton" name="crashButton"> <widget class="QPushButton" name="crashButton">
<property name="toolTip"> <property name="toolTip">
<string>Crashes Calamares, so that Dr. Konqui can look at it.</string> <string>Crashes Calamares, so that Dr. Konqi can look at it.</string>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">Crash now</string> <string notr="true">Crash now</string>