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

VcsBase: Convert to Tr::tr

Browse Source 
To reduce the amount of duplicated strings for translators to handle.
The problem is not very prominent in vcsbase, but that's where we
are moving everywhere else.

Change-Id: Icb11fad3bccfea8a1408420e729566a75adccb66
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2023-01-18 09:38:35 +01:00
parent 7e815270f1
commit fa7dd2fd3b
46 changed files with 293 additions and 1510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@
#include "submitfieldwidget.h"
#include "submitfilemodel.h"
#include "vcsbaseplugin.h"
#include "vcsbasetr.h"
#include "vcsoutputwindow.h"
#include "vcsplugin.h"
@@ -150,7 +151,7 @@ void VcsBaseSubmitEditor::setParameters(const VcsBaseSubmitEditorParameters &par
d->m_file.setMimeType(QLatin1String(parameters.mimeType));
setWidget(d->m_widget);
document()->setPreferredDisplayName(QCoreApplication::translate("VCS", d->m_parameters.displayName));
document()->setPreferredDisplayName(QCoreApplication::translate("::VcsBase", d->m_parameters.displayName));
// Message font according to settings
CompletingTextEdit *descriptionEdit = d->m_widget->descriptionEdit();
@@ -184,14 +185,14 @@ void VcsBaseSubmitEditor::setParameters(const VcsBaseSubmitEditorParameters &par
d->m_widget->addDescriptionEditContextMenuAction(sep);
// Run check action
if (!settings.submitMessageCheckScript.value().isEmpty()) {
auto checkAction = new QAction(tr("Check Message"), this);
auto checkAction = new QAction(Tr::tr("Check Message"), this);
connect(checkAction, &QAction::triggered,
this, &VcsBaseSubmitEditor::slotCheckSubmitMessage);
d->m_widget->addDescriptionEditContextMenuAction(checkAction);
}
// Insert nick
if (!settings.nickNameMailMap.value().isEmpty()) {
auto insertAction = new QAction(tr("Insert Name..."), this);
auto insertAction = new QAction(Tr::tr("Insert Name..."), this);
connect(insertAction, &QAction::triggered, this, &VcsBaseSubmitEditor::slotInsertNickName);
d->m_widget->addDescriptionEditContextMenuAction(insertAction);
}
@@ -453,7 +454,7 @@ void VcsBaseSubmitEditor::accept(VcsBasePluginPrivate *plugin)
const bool canCommit = checkSubmitMessage(&errorMessage) && submitWidget->canSubmit(&errorMessage);
if (!canCommit) {
VcsOutputWindow::appendError(
tr("Cannot %1%2.",
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));
@@ -481,8 +482,8 @@ bool VcsBaseSubmitEditor::promptSubmit(VcsBasePluginPrivate *plugin)
const QString commitName = plugin->commitDisplayName();
return QMessageBox::question(Core::ICore::dialogParent(),
tr("Close %1 %2 Editor").arg(plugin->displayName(), commitName),
tr("Closing this editor will abort the %1. Are you sure?")
Tr::tr("Close %1 %2 Editor").arg(plugin->displayName(), commitName),
Tr::tr("Closing this editor will abort the %1. Are you sure?")
.arg(commitName.toLower())) == QMessageBox::Yes;
}
@@ -515,7 +516,7 @@ void VcsBaseSubmitEditor::slotCheckSubmitMessage()
{
QString errorMessage;
if (!checkSubmitMessage(&errorMessage)) {
QMessageBox msgBox(QMessageBox::Warning, tr("Submit Message Check Failed"),
QMessageBox msgBox(QMessageBox::Warning, Tr::tr("Submit Message Check Failed"),
errorMessage, QMessageBox::Ok, d->m_widget);
msgBox.setMinimumWidth(checkDialogMinimumWidth);
msgBox.exec();
@@ -537,8 +538,8 @@ static QString msgCheckScript(const FilePath &workingDir, const QString &cmd)
{
const QString nativeCmd = QDir::toNativeSeparators(cmd);
return workingDir.isEmpty() ?
VcsBaseSubmitEditor::tr("Executing %1").arg(nativeCmd) :
VcsBaseSubmitEditor::tr("Executing [%1] %2").
Tr::tr("Executing %1").arg(nativeCmd) :
Tr::tr("Executing [%1] %2").
arg(workingDir.toUserOutput(), nativeCmd);
}