From 24d5aa0f53cf55d0ac4a860a16d309ed11a53d30 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 21 Jan 2017 15:49:43 +0200 Subject: [PATCH] The error message should display the translated measurement name. --HG-- branch : feature --- src/app/valentina/mainwindow.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 412f16af2..8823c0370 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -401,14 +401,17 @@ QSharedPointer MainWindow::OpenMeasurementFile(const QString &pat throw e; } - const QStringList mList = m->ListAll(); - const QStringList pList = doc->ListMeasurements(); - - const QSet match = pList.toSet().subtract(mList.toSet()); + const QSet match = doc->ListMeasurements().toSet().subtract(m->ListAll().toSet()); if (not match.isEmpty()) { + QList list = match.toList(); + for (int i = 0; i < list.size(); ++i) + { + list[i] = qApp->TrVars()->MToUser(list.at(i)); + } + VException e(tr("Measurement file doesn't include all required measurements.")); - e.AddMoreInformation(tr("Please, additionaly provide: %1").arg(QStringList(match.toList()).join(", "))); + e.AddMoreInformation(tr("Please, additionaly provide: %1").arg(QStringList(list).join(", "))); throw e; }