From 27e07d16f21cab6a3e20a2fdef59fd48ff682a39 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 18 Jan 2024 17:12:38 +0200 Subject: [PATCH] Fix translation variables in Formula Wizard. --- .../dialogs/support/dialogeditwrongformula.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp index 0ea2cec92..a138a1e81 100644 --- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp +++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp @@ -629,6 +629,8 @@ template void DialogEditWrongFormula::ShowVariable(const QList &var ui->tableWidget->setColumnHidden(ColumnFullName, true); ui->labelDescription->setText(QString()); + const VTranslateVars *trVars = VAbstractApplication::VApp()->TrVars(); + for (const auto &var : vars) { if (ui->checkBoxHideEmpty->isEnabled() && ui->checkBoxHideEmpty->isChecked() && var->IsNotUsed()) @@ -639,7 +641,7 @@ template void DialogEditWrongFormula::ShowVariable(const QList &var if (!var->Filter(m_toolId)) { // If we create this variable don't show ui->tableWidget->setRowCount(ui->tableWidget->rowCount() + 1); - auto *item = new QTableWidgetItem(var->GetName()); + auto *item = new QTableWidgetItem(trVars->VarToUser(var->GetName())); QFont font = item->font(); font.setBold(true); item->setFont(font); @@ -734,9 +736,9 @@ void DialogEditWrongFormula::ShowFunctions() { ui->tableWidget->setRowCount(ui->tableWidget->rowCount() + 1); - QString name = (!settings->IsTranslateFormula() - ? i.value().getMsourceText() - : i.value().translate(VAbstractApplication::VApp()->Settings()->GetLocale())); + QString const name = (!settings->IsTranslateFormula() + ? i.value().getMsourceText() + : i.value().translate(VAbstractApplication::VApp()->Settings()->GetLocale())); auto *item = new QTableWidgetItem(name); item->setData(Qt::UserRole, i.key()); @@ -747,7 +749,7 @@ void DialogEditWrongFormula::ShowFunctions() if (functionsDescriptions.contains(i.key())) { - QString description = + QString const description = (!settings->IsTranslateFormula() ? functionsDescriptions.value(i.key()).getMsourceText() : functionsDescriptions.value(i.key()).translate( VAbstractApplication::VApp()->Settings()->GetLocale()));