forked from qt-creator/qt-creator
Prefix Tr::tr contexts with ::
To make outliers better visible in Linguist Change-Id: Ic35ea2a858b7e3576d9a416fb494fddb616eaaa1 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -19,15 +19,15 @@ namespace Constants {
|
||||
const char LANGUAGECLIENT_SETTINGS_CATEGORY[] = "ZY.LanguageClient";
|
||||
const char LANGUAGECLIENT_SETTINGS_PAGE[] = "LanguageClient.General";
|
||||
const char LANGUAGECLIENT_STDIO_SETTINGS_ID[] = "LanguageClient::StdIOSettingsID";
|
||||
const char LANGUAGECLIENT_SETTINGS_TR[] = QT_TRANSLATE_NOOP("LanguageClient", "Language Client");
|
||||
const char LANGUAGECLIENT_SETTINGS_TR[] = QT_TRANSLATE_NOOP("::LanguageClient", "Language Client");
|
||||
const char LANGUAGECLIENT_DOCUMENT_FILTER_ID[] = "Current Document Symbols";
|
||||
const char LANGUAGECLIENT_DOCUMENT_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("LanguageClient", "Symbols in Current Document");
|
||||
const char LANGUAGECLIENT_DOCUMENT_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::LanguageClient", "Symbols in Current Document");
|
||||
const char LANGUAGECLIENT_WORKSPACE_FILTER_ID[] = "Workspace Symbols";
|
||||
const char LANGUAGECLIENT_WORKSPACE_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("LanguageClient", "Symbols in Workspace");
|
||||
const char LANGUAGECLIENT_WORKSPACE_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::LanguageClient", "Symbols in Workspace");
|
||||
const char LANGUAGECLIENT_WORKSPACE_CLASS_FILTER_ID[] = "Workspace Classes and Structs";
|
||||
const char LANGUAGECLIENT_WORKSPACE_CLASS_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("LanguageClient", "Classes and Structs in Workspace");
|
||||
const char LANGUAGECLIENT_WORKSPACE_CLASS_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::LanguageClient", "Classes and Structs in Workspace");
|
||||
const char LANGUAGECLIENT_WORKSPACE_METHOD_FILTER_ID[] = "Workspace Functions and Methods";
|
||||
const char LANGUAGECLIENT_WORKSPACE_METHOD_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("LanguageClient", "Functions and Methods in Workspace");
|
||||
const char LANGUAGECLIENT_WORKSPACE_METHOD_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::LanguageClient", "Functions and Methods in Workspace");
|
||||
|
||||
} // namespace Constants
|
||||
} // namespace LanguageClient
|
||||
|
||||
@@ -270,8 +270,7 @@ LanguageClientSettingsPage::LanguageClientSettingsPage()
|
||||
setId(Constants::LANGUAGECLIENT_SETTINGS_PAGE);
|
||||
setDisplayName(tr("General"));
|
||||
setCategory(Constants::LANGUAGECLIENT_SETTINGS_CATEGORY);
|
||||
setDisplayCategory(QCoreApplication::translate("LanguageClient",
|
||||
Constants::LANGUAGECLIENT_SETTINGS_TR));
|
||||
setDisplayCategory(Tr::tr(Constants::LANGUAGECLIENT_SETTINGS_TR));
|
||||
setCategoryIconPath(":/languageclient/images/settingscategory_languageclient.png");
|
||||
connect(&m_model, &LanguageClientSettingsModel::dataChanged, [this](const QModelIndex &index) {
|
||||
if (BaseSettings *setting = m_model.settingForIndex(index))
|
||||
|
||||
@@ -9,7 +9,7 @@ namespace LanguageClient {
|
||||
|
||||
struct Tr
|
||||
{
|
||||
Q_DECLARE_TR_FUNCTIONS(LanguageClient)
|
||||
Q_DECLARE_TR_FUNCTIONS(::LanguageClient)
|
||||
};
|
||||
|
||||
} // namespace LanguageClient
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
#include "documentsymbolcache.h"
|
||||
#include "languageclient_global.h"
|
||||
#include "languageclientmanager.h"
|
||||
#include "languageclienttr.h"
|
||||
#include "languageclientutils.h"
|
||||
|
||||
#include <coreplugin/editormanager/editormanager.h>
|
||||
@@ -29,7 +30,7 @@ namespace LanguageClient {
|
||||
DocumentLocatorFilter::DocumentLocatorFilter()
|
||||
{
|
||||
setId(Constants::LANGUAGECLIENT_DOCUMENT_FILTER_ID);
|
||||
setDisplayName(Constants::LANGUAGECLIENT_DOCUMENT_FILTER_DISPLAY_NAME);
|
||||
setDisplayName(Tr::tr(Constants::LANGUAGECLIENT_DOCUMENT_FILTER_DISPLAY_NAME));
|
||||
setDescription(
|
||||
tr("Matches all symbols from the current document, based on a language server."));
|
||||
setDefaultShortcutString(".");
|
||||
@@ -232,7 +233,7 @@ WorkspaceLocatorFilter::WorkspaceLocatorFilter(const QVector<SymbolKind> &filter
|
||||
: m_filterKinds(filter)
|
||||
{
|
||||
setId(Constants::LANGUAGECLIENT_WORKSPACE_FILTER_ID);
|
||||
setDisplayName(Constants::LANGUAGECLIENT_WORKSPACE_FILTER_DISPLAY_NAME);
|
||||
setDisplayName(Tr::tr(Constants::LANGUAGECLIENT_WORKSPACE_FILTER_DISPLAY_NAME));
|
||||
setDefaultShortcutString(":");
|
||||
setDefaultIncludedByDefault(false);
|
||||
setPriority(ILocatorFilter::Low);
|
||||
@@ -344,7 +345,7 @@ WorkspaceClassLocatorFilter::WorkspaceClassLocatorFilter()
|
||||
: WorkspaceLocatorFilter({SymbolKind::Class, SymbolKind::Struct})
|
||||
{
|
||||
setId(Constants::LANGUAGECLIENT_WORKSPACE_CLASS_FILTER_ID);
|
||||
setDisplayName(Constants::LANGUAGECLIENT_WORKSPACE_CLASS_FILTER_DISPLAY_NAME);
|
||||
setDisplayName(Tr::tr(Constants::LANGUAGECLIENT_WORKSPACE_CLASS_FILTER_DISPLAY_NAME));
|
||||
setDefaultShortcutString("c");
|
||||
}
|
||||
|
||||
@@ -352,7 +353,7 @@ WorkspaceMethodLocatorFilter::WorkspaceMethodLocatorFilter()
|
||||
: WorkspaceLocatorFilter({SymbolKind::Method, SymbolKind::Function, SymbolKind::Constructor})
|
||||
{
|
||||
setId(Constants::LANGUAGECLIENT_WORKSPACE_METHOD_FILTER_ID);
|
||||
setDisplayName(Constants::LANGUAGECLIENT_WORKSPACE_METHOD_FILTER_DISPLAY_NAME);
|
||||
setDisplayName(Tr::tr(Constants::LANGUAGECLIENT_WORKSPACE_METHOD_FILTER_DISPLAY_NAME));
|
||||
setDefaultShortcutString("m");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user