From 88819d0490c93ddc4628878a1d66cd3f6a6ed26c Mon Sep 17 00:00:00 2001 From: Takumi ASAKI Date: Wed, 1 Jun 2016 16:42:05 +0900 Subject: [PATCH] Beautifier: Fix untranslated DISPLAY_NAME Change-Id: Ifad91eaada5f7614767b6332a643723de79fc6b2 Reviewed-by: Lorenz Haas Reviewed-by: David Schulz --- src/plugins/beautifier/artisticstyle/artisticstyle.cpp | 4 ++-- .../beautifier/artisticstyle/artisticstyleconstants.h | 4 +++- .../beautifier/artisticstyle/artisticstyleoptionspage.cpp | 3 ++- src/plugins/beautifier/beautifierplugin.cpp | 2 +- src/plugins/beautifier/clangformat/clangformat.cpp | 2 +- src/plugins/beautifier/clangformat/clangformatconstants.h | 4 +++- src/plugins/beautifier/uncrustify/uncrustify.cpp | 6 +++--- src/plugins/beautifier/uncrustify/uncrustifyconstants.h | 4 +++- src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp | 3 ++- 9 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp index 90d22d33b3b..7cac510c11e 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp @@ -69,7 +69,7 @@ ArtisticStyle::~ArtisticStyle() bool ArtisticStyle::initialize() { Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::ArtisticStyle::MENU_ID); - menu->menu()->setTitle(Constants::ArtisticStyle::DISPLAY_NAME); + menu->menu()->setTitle(tr(Constants::ArtisticStyle::DISPLAY_NAME)); m_formatFile = new QAction(BeautifierPlugin::msgFormatCurrentFile(), this); menu->addAction(Core::ActionManager::registerAction(m_formatFile, @@ -104,7 +104,7 @@ void ArtisticStyle::formatFile() const QString cfgFileName = configurationFile(); if (cfgFileName.isEmpty()) { BeautifierPlugin::showError(BeautifierPlugin::msgCannotGetConfigurationFile( - Constants::ArtisticStyle::DISPLAY_NAME)); + tr(Constants::ArtisticStyle::DISPLAY_NAME))); } else { m_beautifierPlugin->formatCurrentFile(command(cfgFileName)); } diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleconstants.h b/src/plugins/beautifier/artisticstyle/artisticstyleconstants.h index fc2948c8ae4..3916cfa4366 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleconstants.h +++ b/src/plugins/beautifier/artisticstyle/artisticstyleconstants.h @@ -25,11 +25,13 @@ #pragma once +#include + namespace Beautifier { namespace Constants { namespace ArtisticStyle { -const char DISPLAY_NAME[] = "Artistic Style"; +const char DISPLAY_NAME[] = QT_TRANSLATE_NOOP("Beautifier::Internal::ArtisticStyle::ArtisticStyle", "Artistic Style"); const char ACTION_FORMATFILE[] = "ArtisticStyle.FormatFile"; const char MENU_ID[] = "ArtisticStyle.Menu"; const char OPTION_ID[] = "ArtisticStyle"; diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp index c578c62db2e..dffc7cc5e36 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp @@ -28,6 +28,7 @@ #include "artisticstyleconstants.h" #include "artisticstylesettings.h" +#include "artisticstyle.h" #include "../beautifierconstants.h" #include "../beautifierplugin.h" @@ -49,7 +50,7 @@ ArtisticStyleOptionsPageWidget::ArtisticStyleOptionsPageWidget(ArtisticStyleSett "HOME", QDir::toNativeSeparators(QDir::home().absolutePath()))); ui->command->setExpectedKind(Utils::PathChooser::ExistingCommand); ui->command->setPromptDialogTitle(BeautifierPlugin::msgCommandPromptDialogTitle( - Constants::ArtisticStyle::DISPLAY_NAME)); + ArtisticStyle::tr(Constants::ArtisticStyle::DISPLAY_NAME))); connect(ui->command, &Utils::PathChooser::validChanged, ui->options, &QWidget::setEnabled); ui->configurations->setSettings(m_settings); } diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp index d16af095d02..ee9bbf650f3 100644 --- a/src/plugins/beautifier/beautifierplugin.cpp +++ b/src/plugins/beautifier/beautifierplugin.cpp @@ -101,7 +101,7 @@ FormatTask format(FormatTask task) process.setTimeoutS(5); Utils::SynchronousProcessResponse response = process.runBlocking(executable, options); if (response.result != Utils::SynchronousProcessResponse::Finished) { - task.error = QObject::tr("Failed to format: %1.").arg(response.exitMessage(executable, 5)); + task.error = BeautifierPlugin::tr("Failed to format: %1.").arg(response.exitMessage(executable, 5)); return task; } const QString output = response.stdErr; diff --git a/src/plugins/beautifier/clangformat/clangformat.cpp b/src/plugins/beautifier/clangformat/clangformat.cpp index dd01cbadff6..efc7c73399d 100644 --- a/src/plugins/beautifier/clangformat/clangformat.cpp +++ b/src/plugins/beautifier/clangformat/clangformat.cpp @@ -73,7 +73,7 @@ QString ClangFormat::id() const bool ClangFormat::initialize() { Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::ClangFormat::MENU_ID); - menu->menu()->setTitle(Constants::ClangFormat::DISPLAY_NAME); + menu->menu()->setTitle(tr(Constants::ClangFormat::DISPLAY_NAME)); m_formatFile = new QAction(BeautifierPlugin::msgFormatCurrentFile(), this); Core::Command *cmd diff --git a/src/plugins/beautifier/clangformat/clangformatconstants.h b/src/plugins/beautifier/clangformat/clangformatconstants.h index 51f6fa1bf86..837d3323069 100644 --- a/src/plugins/beautifier/clangformat/clangformatconstants.h +++ b/src/plugins/beautifier/clangformat/clangformatconstants.h @@ -25,11 +25,13 @@ #pragma once +#include + namespace Beautifier { namespace Constants { namespace ClangFormat { -const char DISPLAY_NAME[] = "ClangFormat"; +const char DISPLAY_NAME[] = QT_TRANSLATE_NOOP("Beautifier::Internal::ClangFormat::ClangFormat", "ClangFormat"); const char ACTION_FORMATFILE[] = "ClangFormat.FormatFile"; const char ACTION_FORMATSELECTED[] = "ClangFormat.FormatSelectedText"; const char MENU_ID[] = "ClangFormat.Menu"; diff --git a/src/plugins/beautifier/uncrustify/uncrustify.cpp b/src/plugins/beautifier/uncrustify/uncrustify.cpp index 32b13a99a3e..3b61d3a9dc5 100644 --- a/src/plugins/beautifier/uncrustify/uncrustify.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustify.cpp @@ -69,7 +69,7 @@ Uncrustify::~Uncrustify() bool Uncrustify::initialize() { Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::Uncrustify::MENU_ID); - menu->menu()->setTitle(Constants::Uncrustify::DISPLAY_NAME); + menu->menu()->setTitle(tr(Constants::Uncrustify::DISPLAY_NAME)); m_formatFile = new QAction(BeautifierPlugin::msgFormatCurrentFile(), this); Core::Command *cmd @@ -114,7 +114,7 @@ void Uncrustify::formatFile() const QString cfgFileName = configurationFile(); if (cfgFileName.isEmpty()) { BeautifierPlugin::showError(BeautifierPlugin::msgCannotGetConfigurationFile( - Constants::Uncrustify::DISPLAY_NAME)); + tr(Constants::Uncrustify::DISPLAY_NAME))); } else { m_beautifierPlugin->formatCurrentFile(command(cfgFileName)); } @@ -125,7 +125,7 @@ void Uncrustify::formatSelectedText() const QString cfgFileName = configurationFile(); if (cfgFileName.isEmpty()) { BeautifierPlugin::showError(BeautifierPlugin::msgCannotGetConfigurationFile( - Constants::Uncrustify::DISPLAY_NAME)); + tr(Constants::Uncrustify::DISPLAY_NAME))); return; } diff --git a/src/plugins/beautifier/uncrustify/uncrustifyconstants.h b/src/plugins/beautifier/uncrustify/uncrustifyconstants.h index 9936689c3f1..7fa9537c578 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifyconstants.h +++ b/src/plugins/beautifier/uncrustify/uncrustifyconstants.h @@ -25,11 +25,13 @@ #pragma once +#include + namespace Beautifier { namespace Constants { namespace Uncrustify { -const char DISPLAY_NAME[] = "Uncrustify"; +const char DISPLAY_NAME[] = QT_TRANSLATE_NOOP("Beautifier::Internal::Uncrustify::Uncrustify", "Uncrustify"); const char ACTION_FORMATFILE[] = "Uncrustify.FormatFile"; const char ACTION_FORMATSELECTED[] = "Uncrustify.FormatSelectedText"; const char MENU_ID[] = "Uncrustify.Menu"; diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp index 959022c0170..ab2e79162b8 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp @@ -28,6 +28,7 @@ #include "uncrustifyconstants.h" #include "uncrustifysettings.h" +#include "uncrustify.h" #include "../beautifierconstants.h" #include "../beautifierplugin.h" @@ -51,7 +52,7 @@ UncrustifyOptionsPageWidget::UncrustifyOptionsPageWidget(UncrustifySettings *set "HOME", QDir::toNativeSeparators(QDir::home().absolutePath()))); ui->command->setExpectedKind(Utils::PathChooser::ExistingCommand); ui->command->setPromptDialogTitle(BeautifierPlugin::msgCommandPromptDialogTitle( - Constants::Uncrustify::DISPLAY_NAME)); + Uncrustify::tr(Constants::Uncrustify::DISPLAY_NAME))); connect(ui->command, &Utils::PathChooser::validChanged, ui->options, &QWidget::setEnabled); ui->configurations->setSettings(m_settings); }