From aec9124723a80b9f78e39c505d02dbab49f8120b Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Mon, 15 Jul 2013 16:16:15 +0200
Subject: [PATCH] tr()-fixes in git.
- Do concatenate message pieces that may not fit grammatically.
- Common message for "Cannot launch".
- Add period marker.
Change-Id: Ic67b27e30143febebc9153a3cefe523ebfd4bc49
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
src/plugins/git/branchdialog.cpp | 9 +++++----
src/plugins/git/gitclient.cpp | 18 +++++++++++-------
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp
index c4252761023..979a3b9004a 100644
--- a/src/plugins/git/branchdialog.cpp
+++ b/src/plugins/git/branchdialog.cpp
@@ -240,12 +240,13 @@ void BranchDialog::remove()
const bool isTag = m_model->isTag(selected);
const bool wasMerged = isTag ? true : m_model->branchIsMerged(selected);
- QString message = tr("Would you like to delete the %1 '%2'?");
+ QString message;
if (isTag)
- message = message.arg(tr("tag"));
+ message = tr("Would you like to delete the tag '%1'?").arg(branchName);
+ else if (wasMerged)
+ message = tr("Would you like to delete the branch '%1'?").arg(branchName);
else
- message = message.arg(wasMerged ? tr("branch") : tr("<b>unmerged</b> branch"));
- message = message.arg(branchName);
+ message = tr("Would you like to delete the <b>unmerged</b> branch '%1'?").arg(branchName);
if (QMessageBox::question(this, isTag ? tr("Delete Tag") : tr("Delete Branch"),
message, QMessageBox::Yes | QMessageBox::No,
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 2744c9be8fe..84598486073 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -780,6 +780,11 @@ static inline QString msgParseFilesFailed()
return GitClient::tr("Cannot parse the file output.");
}
+static inline QString msgCannotLaunch(const QString &binary)
+{
+ return GitClient::tr("Cannot launch \"%1\".").arg(QDir::toNativeSeparators(binary));
+}
+
static inline QString currentDocumentPath()
{
if (Core::IDocument *document= Core::EditorManager::currentDocument())
@@ -2619,11 +2624,10 @@ bool GitClient::tryLauchingGitK(const QProcessEnvironment &env,
success = QProcess::startDetached(binary, arguments, workingDirectory);
}
if (!success) {
- const QString error = tr("Cannot launch \"%1\".").arg(binary);
if (silent)
- outwin->appendSilently(error);
+ outwin->appendSilently(msgCannotLaunch(binary));
else
- outwin->appendError(error);
+ outwin->appendError(msgCannotLaunch(binary));
}
return success;
}
@@ -2636,7 +2640,7 @@ bool GitClient::launchGitGui(const QString &workingDirectory) {
workingDirectory);
if (!success)
- outputWindow()->appendError(tr("Cannot launch git gui"));
+ outputWindow()->appendError(msgCannotLaunch(QLatin1String("git gui")));
return success;
}
@@ -3100,11 +3104,11 @@ void GitClient::handleMergeConflicts(const QString &workingDir, const QString &c
{
QString message;
if (!commit.isEmpty())
- message = tr("Conflicts detected with commit %1").arg(commit);
+ message = tr("Conflicts detected with commit %1.").arg(commit);
else if (!files.isEmpty())
- message = tr("Conflicts detected with files:\n") + files.join(QLatin1String("\n"));
+ message = tr("Conflicts detected with files:\n%1").arg(files.join(QLatin1String("\n")));
else
- message = tr("Conflicts detected");
+ message = tr("Conflicts detected.");
QMessageBox mergeOrAbort(QMessageBox::Question, tr("Conflicts Detected"), message,
QMessageBox::NoButton, Core::ICore::mainWindow());
QPushButton *mergeToolButton = mergeOrAbort.addButton(tr("Run &Merge Tool"),
--
GitLab