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

Tr/LanguageClient: Add some comments, parametrize error message

Browse Source 
Change-Id: Ifd7354c10d18c0df093908c1a240f254c679893a
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Eike Ziller
2023-05-31 10:04:05 +02:00
parent f8a28abd78
commit deb974de05
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/languageclient/client.cpp
View File

@@ -356,6 +356,7 @@ void Client::setName(const QString &name)
QString Client::name() const QString Client::name() const
{ {
if (d->m_project && !d->m_project->displayName().isEmpty()) if (d->m_project && !d->m_project->displayName().isEmpty())
//: <language client> for <project>
return Tr::tr("%1 for %2").arg(d->m_displayName, d->m_project->displayName()); return Tr::tr("%1 for %2").arg(d->m_displayName, d->m_project->displayName());
return d->m_displayName; return d->m_displayName;
} }
@@ -555,11 +556,17 @@ Client::State Client::state() const
QString Client::stateString() const QString Client::stateString() const
{ {
switch (d->m_state){ switch (d->m_state){
//: language client state
case Uninitialized: return Tr::tr("uninitialized"); case Uninitialized: return Tr::tr("uninitialized");
//: language client state
case InitializeRequested: return Tr::tr("initialize requested"); case InitializeRequested: return Tr::tr("initialize requested");
//: language client state
case Initialized: return Tr::tr("initialized"); case Initialized: return Tr::tr("initialized");
//: language client state
case ShutdownRequested: return Tr::tr("shutdown requested"); case ShutdownRequested: return Tr::tr("shutdown requested");
//: language client state
case Shutdown: return Tr::tr("shut down"); case Shutdown: return Tr::tr("shut down");
//: language client state
case Error: return Tr::tr("error"); case Error: return Tr::tr("error");
} }
return {}; return {};
@@ -1970,7 +1977,7 @@ void ClientPrivate::initializeCallback(const InitializeRequest::Response &initRe
if (std::optional<ResponseError<InitializeError>> error = initResponse.error()) { if (std::optional<ResponseError<InitializeError>> error = initResponse.error()) {
if (std::optional<InitializeError> data = error->data()) { if (std::optional<InitializeError> data = error->data()) {
if (data->retry()) { if (data->retry()) {
const QString title(Tr::tr("Language Server \"%1\" Initialize Error").arg(m_displayName)); const QString title(Tr::tr("Language Server \"%1\" Initialization Error").arg(m_displayName));
auto result = QMessageBox::warning(Core::ICore::dialogParent(), auto result = QMessageBox::warning(Core::ICore::dialogParent(),
title, title,
error->message(), error->message(),
@@ -1983,7 +1990,7 @@ void ClientPrivate::initializeCallback(const InitializeRequest::Response &initRe
} }
} }
} }
q->setError(Tr::tr("Initialize error: ") + error->message()); q->setError(Tr::tr("Initialization error: %1.").arg(error->message()));
emit q->finished(); emit q->finished();
return; return;
} }