From ad9081e3d8598c2013f7383766bc0ab12dc9ae75 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 15 Apr 2013 13:44:32 +0200 Subject: [PATCH] tr()-Fixes in git/gerrit. Introduce common message for "Cannot run", remove exclamation marks. Change-Id: Ib3f36e95c67136041cde56e697ec4ba0a3b9549e Reviewed-by: Tobias Hunger --- src/plugins/git/gerrit/gerritplugin.cpp | 2 +- src/plugins/git/gitclient.cpp | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index 556af275ec4..d05a22ca8eb 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -367,7 +367,7 @@ void GerritPlugin::push() if (!dialog->localChangesFound()) { QMessageBox::critical(Core::ICore::mainWindow(), tr("No Local Changes"), - tr("Change from HEAD appears to be in remote branch already! Aborting.")); + tr("Change from HEAD appears to be in remote branch already. Aborting.")); return; } diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index a6c211e48a3..85a2d557706 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1211,6 +1211,12 @@ static inline QString msgCannotDetermineBranch(const QString &workingDirectory, return GitClient::tr("Cannot retrieve branch of \"%1\": %2").arg(QDir::toNativeSeparators(workingDirectory), why); } +static inline QString msgCannotRun(const QString &command, const QString &workingDirectory, const QString &why) +{ + return GitClient::tr("Cannot run \"%1\" in \"%2\": %3") + .arg(command, QDir::toNativeSeparators(workingDirectory), why); +} + bool GitClient::synchronousHeadRefs(const QString &workingDirectory, QStringList *output, QString *errorMessage) { @@ -1221,8 +1227,7 @@ bool GitClient::synchronousHeadRefs(const QString &workingDirectory, QStringList QByteArray errorText; const bool rc = fullySynchronousGit(workingDirectory, args, &outputText, &errorText); if (!rc) { - QString message = tr("Cannot run \"git show-ref --head\" in \"%1\": %2"). - arg(QDir::toNativeSeparators(workingDirectory), commandOutputFromLocal8Bit(errorText)); + QString message = msgCannotRun(QLatin1String("git show-ref --head"), workingDirectory, commandOutputFromLocal8Bit(errorText)); if (errorMessage) *errorMessage = message; @@ -1500,7 +1505,7 @@ bool GitClient::synchronousBranchCmd(const QString &workingDirectory, QStringLis const bool rc = fullySynchronousGit(workingDirectory, branchArgs, &outputText, &errorText); *output = commandOutputFromLocal8Bit(outputText); if (!rc) { - *errorMessage = tr("Cannot run \"git branch\" in \"%1\": %2").arg(QDir::toNativeSeparators(workingDirectory), commandOutputFromLocal8Bit(errorText)); + *errorMessage = msgCannotRun(QLatin1String("git branch"), workingDirectory, commandOutputFromLocal8Bit(errorText)); return false; } return true; @@ -1515,8 +1520,7 @@ bool GitClient::synchronousShowRefCmd(const QString &workingDirectory, QStringLi const bool rc = fullySynchronousGit(workingDirectory, args, &outputText, &errorText); *output = commandOutputFromLocal8Bit(outputText); if (!rc) { - *errorMessage = tr("Cannot run \"git show-ref\" in \"%1\": %2") - .arg(QDir::toNativeSeparators(workingDirectory), commandOutputFromLocal8Bit(errorText)); + *errorMessage = msgCannotRun(QLatin1String("git show-ref"), workingDirectory, commandOutputFromLocal8Bit(errorText)); return false; } @@ -1531,7 +1535,7 @@ bool GitClient::synchronousRemoteCmd(const QString &workingDirectory, QStringLis QByteArray errorText; const bool rc = fullySynchronousGit(workingDirectory, remoteArgs, &outputText, &errorText); if (!rc) { - *errorMessage = tr("Cannot run \"git remote\" in \"%1\": %2").arg(QDir::toNativeSeparators(workingDirectory), commandOutputFromLocal8Bit(errorText)); + *errorMessage = msgCannotRun(QLatin1String("git remote"), workingDirectory, commandOutputFromLocal8Bit(errorText)); return false; } *output = commandOutputFromLocal8Bit(outputText); @@ -1578,8 +1582,7 @@ QMap GitClient::synchronousSubmoduleList(const QString &working QByteArray errorText; const bool rc = fullySynchronousGit(workingDirectory, args, &outputText, &errorText); if (!rc) { - QString message = tr("Cannot run \"git config -l\" in \"%1\": %2"). - arg(QDir::toNativeSeparators(workingDirectory), commandOutputFromLocal8Bit(errorText)); + QString message = msgCannotRun(QLatin1String("git config -l"), workingDirectory, commandOutputFromLocal8Bit(errorText)); if (errorMessage) *errorMessage = message; @@ -1612,7 +1615,7 @@ bool GitClient::synchronousShow(const QString &workingDirectory, const QString & QByteArray errorText; const bool rc = fullySynchronousGit(workingDirectory, args, &outputText, &errorText); if (!rc) { - *errorMessage = tr("Cannot run \"git show\" in \"%1\": %2").arg(QDir::toNativeSeparators(workingDirectory), commandOutputFromLocal8Bit(errorText)); + *errorMessage = msgCannotRun(QLatin1String("git show"), workingDirectory, commandOutputFromLocal8Bit(errorText)); return false; } *output = commandOutputFromLocal8Bit(outputText); @@ -1629,7 +1632,7 @@ bool GitClient::cleanList(const QString &workingDirectory, const QString &flag, QByteArray errorText; const bool rc = fullySynchronousGit(workingDirectory, args, &outputText, &errorText); if (!rc) { - *errorMessage = tr("Cannot run \"git clean\" in \"%1\": %2").arg(QDir::toNativeSeparators(workingDirectory), commandOutputFromLocal8Bit(errorText)); + *errorMessage = msgCannotRun(QLatin1String("git clean"), workingDirectory, commandOutputFromLocal8Bit(errorText)); return false; } // Filter files that git would remove