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

tr()-fixes in git.

Browse Source 
- 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>
This commit is contained in:
Friedemann Kleint
2013-07-15 16:16:15 +02:00
parent 42b4e57f55
commit aec9124723
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/git/branchdialog.cpp
View File

@@ -240,12 +240,13 @@ void BranchDialog::remove()
const bool isTag = m_model->isTag(selected); const bool isTag = m_model->isTag(selected);
const bool wasMerged = isTag ? true : m_model->branchIsMerged(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) 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 else
message = message.arg(wasMerged ? tr("branch") : tr("<b>unmerged</b> branch")); message = tr("Would you like to delete the <b>unmerged</b> branch '%1'?").arg(branchName);
message = message.arg(branchName);
if (QMessageBox::question(this, isTag ? tr("Delete Tag") : tr("Delete Branch"), if (QMessageBox::question(this, isTag ? tr("Delete Tag") : tr("Delete Branch"),
message, QMessageBox::Yes | QMessageBox::No, message, QMessageBox::Yes | QMessageBox::No,

18
src/plugins/git/gitclient.cpp
View File

@@ -780,6 +780,11 @@ static inline QString msgParseFilesFailed()
return GitClient::tr("Cannot parse the file output."); 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() static inline QString currentDocumentPath()
{ {
if (Core::IDocument *document= Core::EditorManager::currentDocument()) if (Core::IDocument *document= Core::EditorManager::currentDocument())
@@ -2619,11 +2624,10 @@ bool GitClient::tryLauchingGitK(const QProcessEnvironment &env,
success = QProcess::startDetached(binary, arguments, workingDirectory); success = QProcess::startDetached(binary, arguments, workingDirectory);
} }
if (!success) { if (!success) {
const QString error = tr("Cannot launch \"%1\".").arg(binary);
if (silent) if (silent)
outwin->appendSilently(error); outwin->appendSilently(msgCannotLaunch(binary));
else else
outwin->appendError(error); outwin->appendError(msgCannotLaunch(binary));
} }
return success; return success;
} }
@@ -2636,7 +2640,7 @@ bool GitClient::launchGitGui(const QString &workingDirectory) {
workingDirectory); workingDirectory);
if (!success) if (!success)
outputWindow()->appendError(tr("Cannot launch git gui")); outputWindow()->appendError(msgCannotLaunch(QLatin1String("git gui")));
return success; return success;
} }
@@ -3100,11 +3104,11 @@ void GitClient::handleMergeConflicts(const QString &workingDir, const QString &c
{ {
QString message; QString message;
if (!commit.isEmpty()) 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()) 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 else
message = tr("Conflicts detected"); message = tr("Conflicts detected.");
QMessageBox mergeOrAbort(QMessageBox::Question, tr("Conflicts Detected"), message, QMessageBox mergeOrAbort(QMessageBox::Question, tr("Conflicts Detected"), message,
QMessageBox::NoButton, Core::ICore::mainWindow()); QMessageBox::NoButton, Core::ICore::mainWindow());
QPushButton *mergeToolButton = mergeOrAbort.addButton(tr("Run &Merge Tool"), QPushButton *mergeToolButton = mergeOrAbort.addButton(tr("Run &Merge Tool"),