Skip to content

Commit 311564e

Browse files
authored
Merge pull request doxygen#12157 from StackAndPointer/improve-language-switch
2 parents 744dfae + f492ee5 commit 311564e

10 files changed

Lines changed: 21 additions & 19 deletions

addon/doxywizard/doxywizard.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,9 @@ void MainWindow::switchLanguage()
464464
if (langCode!=DoxygenWizard::langCode)
465465
{
466466
setLanguage(langCode);
467-
quit();
467+
// Restart the application
468+
qApp->quit();
469+
QProcess::startDetached(qApp->arguments()[0], qApp->arguments().mid(1));
468470
}
469471
}
470472
}

addon/doxywizard/i18n/doxywizard_de.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -695,8 +695,8 @@ Angegebener Grund: %2</translation>
695695
<translation>Verfügbare Sprachen</translation>
696696
</message>
697697
<message>
698-
<source>Select and Quit</source>
699-
<translation>Auswählen und Beenden</translation>
698+
<source>Select and Restart</source>
699+
<translation>Auswählen und Neustart</translation>
700700
</message>
701701
</context>
702702

addon/doxywizard/i18n/doxywizard_es.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -695,8 +695,8 @@ Razón dada: %2</translation>
695695
<translation>Idiomas disponibles</translation>
696696
</message>
697697
<message>
698-
<source>Select and Quit</source>
699-
<translation>Seleccionar y salir</translation>
698+
<source>Select and Restart</source>
699+
<translation>Seleccionar y reiniciar</translation>
700700
</message>
701701
</context>
702702

addon/doxywizard/i18n/doxywizard_fr.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -695,8 +695,8 @@ Raison donnée : %2</translation>
695695
<translation>Langues disponibles</translation>
696696
</message>
697697
<message>
698-
<source>Select and Quit</source>
699-
<translation>Sélectionner et quitter</translation>
698+
<source>Select and Restart</source>
699+
<translation>Sélectionner et redémarrer</translation>
700700
</message>
701701
</context>
702702

addon/doxywizard/i18n/doxywizard_ja.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -695,8 +695,8 @@ Reason given: %2</source>
695695
<translation>利用可能な言語</translation>
696696
</message>
697697
<message>
698-
<source>Select and Quit</source>
699-
<translation>選択して終了</translation>
698+
<source>Select and Restart</source>
699+
<translation>選択して再起動</translation>
700700
</message>
701701
</context>
702702

addon/doxywizard/i18n/doxywizard_ko.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -695,8 +695,8 @@ Reason given: %2</source>
695695
<translation>사용 가능한 언어</translation>
696696
</message>
697697
<message>
698-
<source>Select and Quit</source>
699-
<translation>선택 후 종료</translation>
698+
<source>Select and Restart</source>
699+
<translation>선택 후 재시작</translation>
700700
</message>
701701
</context>
702702

addon/doxywizard/i18n/doxywizard_ru.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -695,8 +695,8 @@ Reason given: %2</source>
695695
<translation>Доступные языки</translation>
696696
</message>
697697
<message>
698-
<source>Select and Quit</source>
699-
<translation>Выбрать и выйти</translation>
698+
<source>Select and Restart</source>
699+
<translation>Выбрать и перезапустить</translation>
700700
</message>
701701
</context>
702702

addon/doxywizard/i18n/doxywizard_zh_CN.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -695,8 +695,8 @@ Reason given: %2</source>
695695
<translation>可用语言</translation>
696696
</message>
697697
<message>
698-
<source>Select and Quit</source>
699-
<translation>选择并退出</translation>
698+
<source>Select and Restart</source>
699+
<translation>选择并重启</translation>
700700
</message>
701701
</context>
702702

addon/doxywizard/i18n/doxywizard_zh_TW.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -695,8 +695,8 @@ Reason given: %2</source>
695695
<translation>可用語言</translation>
696696
</message>
697697
<message>
698-
<source>Select and Quit</source>
699-
<translation>選擇並退出</translation>
698+
<source>Select and Restart</source>
699+
<translation>選擇並重啟</translation>
700700
</message>
701701
</context>
702702

addon/doxywizard/languagedialog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ LanguageDialog::LanguageDialog(const QString &currentLocale,
9393

9494
mainLayout->addWidget(groupBox);
9595

96-
// Buttons: Cancel | Select & Quit
96+
// Buttons: Cancel | Select & Restart
9797
auto *buttonBox = new QDialogButtonBox(this);
9898
auto *cancelBtn = buttonBox->addButton(QDialogButtonBox::Cancel);
99-
auto *selectBtn = buttonBox->addButton(tr("Select and Quit"),
99+
auto *selectBtn = buttonBox->addButton(tr("Select and Restart"),
100100
QDialogButtonBox::AcceptRole);
101101
selectBtn->setDefault(true);
102102

0 commit comments

Comments
 (0)