feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Tr/VCS: Fix various issues with translations

Browse Source 
Inserting the name for the "commit" operation into messages relies on a
certain sentence structure and doesn't work with translations. Same for
"optional" error messages. Use different complete messages for the
different cases instead.

Avoid explicit line endings, use automatic word wrap instead.

Add some quotes and full stops.

Fix message with plural.

Don't use %n for constant number (inline in message with assert).

Improve confusing tool tip for instant blame.

Change-Id: Ic8453763279753ebd5898858951acddcf311e6e4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Eike Ziller
2023-05-31 09:54:53 +02:00
parent ff2ed7d94b
commit 7bd06829c4
12 changed files with 84 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -453,11 +453,7 @@ void VcsBaseSubmitEditor::accept(VcsBasePluginPrivate *plugin)
QString errorMessage;
const bool canCommit = checkSubmitMessage(&errorMessage) && submitWidget->canSubmit(&errorMessage);
if (!canCommit) {
VcsOutputWindow::appendError(
Tr::tr("Cannot %1%2.",
"%2 is an optional error message with ': ' prefix. Don't add space in front.")
.arg(plugin->commitDisplayName().toLower(),
errorMessage.isEmpty() ? errorMessage : ": " + errorMessage));
VcsOutputWindow::appendError(plugin->commitErrorMessage(errorMessage));
} else if (plugin->activateCommit()) {
close();
}
@@ -480,12 +476,10 @@ bool VcsBaseSubmitEditor::promptSubmit(VcsBasePluginPrivate *plugin)
if (!submitWidget->isEnabled() || !submitWidget->isEdited())
return true;
const QString commitName = plugin->commitDisplayName();
QMessageBox mb(Core::ICore::dialogParent());
mb.setWindowTitle(Tr::tr("Close %1 %2 Editor").arg(plugin->displayName(), commitName));
mb.setWindowTitle(plugin->commitAbortTitle());
mb.setIcon(QMessageBox::Warning);
mb.setText(Tr::tr("Closing this editor will abort the %1.")
.arg(commitName.toLower()));
mb.setText(plugin->commitAbortMessage());
mb.setStandardButtons(QMessageBox::Close | QMessageBox::Cancel);
// On Windows there is no mnemonic for Close. Set it explicitly.
mb.button(QMessageBox::Close)->setText(Tr::tr("&Close"));