From f8836cf563f054d88d58c75739555fe3f9593adc Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 28 Mar 2017 10:18:19 +0300 Subject: [PATCH] Fix translation bug. Default names for increment and measurement should also be validated in unit tests. --HG-- branch : develop --- share/translations/valentina.ts | 14 ++++++++++-- share/translations/valentina_cs_CZ.ts | 18 ++++++++------- share/translations/valentina_de_DE.ts | 14 ++++++++++-- share/translations/valentina_el_GR.ts | 14 ++++++++++-- share/translations/valentina_en_CA.ts | 14 ++++++++++-- share/translations/valentina_en_IN.ts | 14 ++++++++++-- share/translations/valentina_en_US.ts | 14 ++++++++++-- share/translations/valentina_es_ES.ts | 22 ++++++++++--------- share/translations/valentina_fi_FI.ts | 18 ++++++++------- share/translations/valentina_fr_FR.ts | 22 ++++++++++--------- share/translations/valentina_he_IL.ts | 18 ++++++++------- share/translations/valentina_id_ID.ts | 18 ++++++++------- share/translations/valentina_it_IT.ts | 14 ++++++++++-- share/translations/valentina_nl_NL.ts | 22 ++++++++++--------- share/translations/valentina_pt_BR.ts | 18 ++++++++------- share/translations/valentina_ro_RO.ts | 18 ++++++++------- share/translations/valentina_ru_RU.ts | 18 ++++++++++----- share/translations/valentina_uk_UA.ts | 14 ++++++++++-- share/translations/valentina_zh_CN.ts | 18 ++++++++------- src/app/tape/tmainwindow.cpp | 2 +- .../valentina/dialogs/dialogincrements.cpp | 2 +- src/libs/ifc/ifcdef.cpp | 6 ++++- src/libs/ifc/ifcdef.h | 2 ++ src/libs/vpatterndb/vtranslatevars.cpp | 2 ++ .../TranslationsTest/tst_buitinregexp.cpp | 2 ++ 25 files changed, 227 insertions(+), 111 deletions(-) diff --git a/share/translations/valentina.ts b/share/translations/valentina.ts index 767453f68..03be7262f 100644 --- a/share/translations/valentina.ts +++ b/share/translations/valentina.ts @@ -2412,7 +2412,7 @@ Increment_%1 - Increment_%1 + Increment_%1 Edit increment @@ -7761,7 +7761,7 @@ Do you want to save your changes? M_%1 - M_%1 + M_%1 Error @@ -11496,6 +11496,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_cs_CZ.ts b/share/translations/valentina_cs_CZ.ts index dcb1e0031..4079f2548 100644 --- a/share/translations/valentina_cs_CZ.ts +++ b/share/translations/valentina_cs_CZ.ts @@ -2120,10 +2120,6 @@ Parser error: %1 Chyba zpracování: %1 - - Increment_%1 - - Edit increment @@ -6998,10 +6994,6 @@ Chcete uložit své změny? Edit measurement - - M_%1 - - Error Chyba @@ -10437,6 +10429,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_de_DE.ts b/share/translations/valentina_de_DE.ts index 09d19705c..a343a8a73 100644 --- a/share/translations/valentina_de_DE.ts +++ b/share/translations/valentina_de_DE.ts @@ -2280,7 +2280,7 @@ Increment_%1 - Zuwachs_%1 + Zuwachs_%1 Edit increment @@ -7473,7 +7473,7 @@ Sollen die Änderungen gespeichert werden? M_%1 - M_%1 + M_%1 Error @@ -11118,6 +11118,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_el_GR.ts b/share/translations/valentina_el_GR.ts index e8074b523..7ed2cdbee 100644 --- a/share/translations/valentina_el_GR.ts +++ b/share/translations/valentina_el_GR.ts @@ -2340,7 +2340,7 @@ Increment_%1 - Αύξηση_%1 + Αύξηση_%1 Edit increment @@ -7414,7 +7414,7 @@ Do you want to save your changes? M_%1 - M_%1 + M_%1 Error @@ -10875,6 +10875,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_en_CA.ts b/share/translations/valentina_en_CA.ts index 787236451..023b16654 100644 --- a/share/translations/valentina_en_CA.ts +++ b/share/translations/valentina_en_CA.ts @@ -2328,7 +2328,7 @@ Increment_%1 - Increment_%1 + Increment_%1 Edit increment @@ -7541,7 +7541,7 @@ Do you want to save your changes? M_%1 - M_%1 + M_%1 Error @@ -11252,6 +11252,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_en_IN.ts b/share/translations/valentina_en_IN.ts index 97d91eb42..d28513096 100644 --- a/share/translations/valentina_en_IN.ts +++ b/share/translations/valentina_en_IN.ts @@ -2328,7 +2328,7 @@ Increment_%1 - Increment_%1 + Increment_%1 Edit increment @@ -7541,7 +7541,7 @@ Do you want to save your changes? M_%1 - M_%1 + M_%1 Error @@ -11252,6 +11252,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_en_US.ts b/share/translations/valentina_en_US.ts index c4ddd905c..5d5eea7a0 100644 --- a/share/translations/valentina_en_US.ts +++ b/share/translations/valentina_en_US.ts @@ -2328,7 +2328,7 @@ Increment_%1 - Increment_%1 + Increment_%1 Edit increment @@ -7541,7 +7541,7 @@ Do you want to save your changes? M_%1 - M_%1 + M_%1 Error @@ -11252,6 +11252,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_es_ES.ts b/share/translations/valentina_es_ES.ts index 8f11545a3..51d4ea4a1 100644 --- a/share/translations/valentina_es_ES.ts +++ b/share/translations/valentina_es_ES.ts @@ -1707,10 +1707,6 @@ DialogEllipticalArc - - Dialog - Diálogo - Radius1: Alcance1: @@ -2413,7 +2409,7 @@ Increment_%1 - Incremento_%1 + Incremento_%1 Edit increment @@ -3771,10 +3767,6 @@ Apply settings anyway? DialogPin - - Dialog - Diálogo - Pin tool Imperdible @@ -7637,7 +7629,7 @@ Quiere guardar los cambios? M_%1 - M_%1 + M_%1 Error @@ -11372,6 +11364,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_fi_FI.ts b/share/translations/valentina_fi_FI.ts index 5d73438ff..fd9e4e905 100644 --- a/share/translations/valentina_fi_FI.ts +++ b/share/translations/valentina_fi_FI.ts @@ -2113,10 +2113,6 @@ Parser error: %1 Jäsentämis virhe: %1 - - Increment_%1 - - Edit increment @@ -6983,10 +6979,6 @@ Haluatko tallentaa muutokset? Edit measurement - - M_%1 - - Error Virhe @@ -10420,6 +10412,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_fr_FR.ts b/share/translations/valentina_fr_FR.ts index 9ae941b07..0eff9bc41 100644 --- a/share/translations/valentina_fr_FR.ts +++ b/share/translations/valentina_fr_FR.ts @@ -1706,10 +1706,6 @@ DialogEllipticalArc - - Dialog - Dialogue - Radius1: Rayon1 : @@ -2412,7 +2408,7 @@ Increment_%1 - Increment_%1 + Increment_%1 Edit increment @@ -3768,10 +3764,6 @@ Appliquer les réglages quand-même ? DialogPin - - Dialog - Dialogue - Pin tool @@ -7630,7 +7622,7 @@ Voulez-vous sauvegarder les changements? M_%1 - M_%1 + M_%1 Error @@ -11340,6 +11332,16 @@ Voulez-vous enregistrer les changements? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_he_IL.ts b/share/translations/valentina_he_IL.ts index 6da208347..8e81ae406 100644 --- a/share/translations/valentina_he_IL.ts +++ b/share/translations/valentina_he_IL.ts @@ -1793,10 +1793,6 @@ Parser error: %1 - - Increment_%1 - - Edit increment @@ -6215,10 +6211,6 @@ Do you want to save your changes? Edit measurement - - M_%1 - - Error @@ -9434,6 +9426,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VWidgetDetails diff --git a/share/translations/valentina_id_ID.ts b/share/translations/valentina_id_ID.ts index 37711a3c1..a5fe49923 100644 --- a/share/translations/valentina_id_ID.ts +++ b/share/translations/valentina_id_ID.ts @@ -1977,10 +1977,6 @@ Parser error: %1 - - Increment_%1 - - Edit increment @@ -6468,10 +6464,6 @@ Apakah anda ingin menyimpan perubahan anda? Edit measurement - - M_%1 - - Error @@ -9707,6 +9699,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VWidgetDetails diff --git a/share/translations/valentina_it_IT.ts b/share/translations/valentina_it_IT.ts index 0c9e13c02..7bdaf79c8 100644 --- a/share/translations/valentina_it_IT.ts +++ b/share/translations/valentina_it_IT.ts @@ -2324,7 +2324,7 @@ Increment_%1 - Incremento_%1 + Incremento_%1 Edit increment @@ -7533,7 +7533,7 @@ Vuoi salvare i cambiamenti? M_%1 - M_%1 + M_%1 Error @@ -11076,6 +11076,16 @@ Vuoi salvare le tue modifiche? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_nl_NL.ts b/share/translations/valentina_nl_NL.ts index 515bcf87f..9c4dd2d5f 100644 --- a/share/translations/valentina_nl_NL.ts +++ b/share/translations/valentina_nl_NL.ts @@ -1706,10 +1706,6 @@ DialogEllipticalArc - - Dialog - Dialoog - Radius1: Straal1: @@ -2412,7 +2408,7 @@ Increment_%1 - Verkleinen/vergroten_%1 + Verkleinen/vergroten_%1 Edit increment @@ -3771,10 +3767,6 @@ Toch de instellingen aanpassen? DialogPin - - Dialog - Dialoog - Pin tool Pin gereedschap @@ -7637,7 +7629,7 @@ Do you want to save your changes? M_%1 - M_%1 + M_%1 Error @@ -11368,6 +11360,16 @@ Wil je deze veranderingen opslaan? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_pt_BR.ts b/share/translations/valentina_pt_BR.ts index 688bdace2..9e1c30bfd 100644 --- a/share/translations/valentina_pt_BR.ts +++ b/share/translations/valentina_pt_BR.ts @@ -2158,10 +2158,6 @@ Parser error: %1 - - Increment_%1 - - Edit increment @@ -6699,10 +6695,6 @@ Do you want to save your changes? Edit measurement - - M_%1 - - Error Erro @@ -10048,6 +10040,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_ro_RO.ts b/share/translations/valentina_ro_RO.ts index 269617793..e52408321 100644 --- a/share/translations/valentina_ro_RO.ts +++ b/share/translations/valentina_ro_RO.ts @@ -2206,10 +2206,6 @@ Parser error: %1 Eroare Parser: %1 - - Increment_%1 - - Edit increment @@ -6955,10 +6951,6 @@ Do you want to save your changes? Edit measurement - - M_%1 - - Error Eroare @@ -10282,6 +10274,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VWidgetDetails diff --git a/share/translations/valentina_ru_RU.ts b/share/translations/valentina_ru_RU.ts index 6ab60a9e4..ef187cecb 100644 --- a/share/translations/valentina_ru_RU.ts +++ b/share/translations/valentina_ru_RU.ts @@ -1706,10 +1706,6 @@ DialogEllipticalArc - - Dialog - Диалог - Radius1: Радиус1: @@ -2412,7 +2408,7 @@ Increment_%1 - Прибавка_%1 + Прибавка_%1 Edit increment @@ -7633,7 +7629,7 @@ Do you want to save your changes? M_%1 - М_%1 + М_%1 Error @@ -11369,6 +11365,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_uk_UA.ts b/share/translations/valentina_uk_UA.ts index 9a687f27b..0fac98d1e 100644 --- a/share/translations/valentina_uk_UA.ts +++ b/share/translations/valentina_uk_UA.ts @@ -2312,7 +2312,7 @@ Increment_%1 - Прибавка_%1 + Прибавка_%1 Edit increment @@ -7504,7 +7504,7 @@ Do you want to save your changes? M_%1 - M_%1 + M_%1 Error @@ -11189,6 +11189,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_zh_CN.ts b/share/translations/valentina_zh_CN.ts index a6b51a162..b94b273ee 100644 --- a/share/translations/valentina_zh_CN.ts +++ b/share/translations/valentina_zh_CN.ts @@ -1760,10 +1760,6 @@ Parser error: %1 - - Increment_%1 - - Edit increment @@ -6142,10 +6138,6 @@ Do you want to save your changes? Edit measurement - - M_%1 - - Error 错误 @@ -9373,6 +9365,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VWidgetDetails diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index 0bc85e214..d5ab1be8d 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -1237,7 +1237,7 @@ void TMainWindow::AddCustom() QString name; do { - name = CustomMSign + tr("M_%1").arg(num); + name = CustomMSign + qApp->TrVars()->InternalVarToUser(measurement_) + QString().number(num); num++; } while (data->IsUnique(name) == false); diff --git a/src/app/valentina/dialogs/dialogincrements.cpp b/src/app/valentina/dialogs/dialogincrements.cpp index c6224086f..f174a7563 100644 --- a/src/app/valentina/dialogs/dialogincrements.cpp +++ b/src/app/valentina/dialogs/dialogincrements.cpp @@ -471,7 +471,7 @@ void DialogIncrements::AddIncrement() QString name; do { - name = CustomIncrSign + tr("Increment_%1").arg(num); + name = CustomIncrSign + qApp->TrVars()->InternalVarToUser(increment_) + QString().number(num); num++; } while (data->IsUnique(name)==false); diff --git a/src/libs/ifc/ifcdef.cpp b/src/libs/ifc/ifcdef.cpp index 2315b2364..1ad4f6e97 100644 --- a/src/libs/ifc/ifcdef.cpp +++ b/src/libs/ifc/ifcdef.cpp @@ -165,6 +165,8 @@ const QString ColorDeepSkyBlue = QStringLiteral("deepskyblue"); const QString ColorCornFlowerBlue = QStringLiteral("cornflowerblue"); //variables +const QString measurement_ = QStringLiteral("M_"); +const QString increment_ = QStringLiteral("Increment_"); const QString line_ = QStringLiteral("Line_"); const QString angleLine_ = QStringLiteral("AngleLine_"); const QString spl_ = QStringLiteral(SPL_); @@ -190,7 +192,9 @@ const QString seg_ = QStringLiteral("Seg_"); const QString currentLength = QStringLiteral("CurrentLength"); const QString currentSeamAllowance = QStringLiteral("CurrentSeamAllowance"); -const QStringList builInVariables = QStringList() << line_ +const QStringList builInVariables = QStringList() << measurement_ + << increment_ + << line_ << angleLine_ << arc_ << spl_ diff --git a/src/libs/ifc/ifcdef.h b/src/libs/ifc/ifcdef.h index 143fee251..0f8de9771 100644 --- a/src/libs/ifc/ifcdef.h +++ b/src/libs/ifc/ifcdef.h @@ -174,6 +174,8 @@ extern const QString ColorCornFlowerBlue; #define ARC_ "Arc_" #define EARC_ "ElArc_" +extern const QString measurement_; +extern const QString increment_; extern const QString line_; extern const QString angleLine_; extern const QString arc_; diff --git a/src/libs/vpatterndb/vtranslatevars.cpp b/src/libs/vpatterndb/vtranslatevars.cpp index 65552be53..e6823dc9f 100644 --- a/src/libs/vpatterndb/vtranslatevars.cpp +++ b/src/libs/vpatterndb/vtranslatevars.cpp @@ -372,6 +372,8 @@ void VTranslateVars::InitPatternMakingSystems() //--------------------------------------------------------------------------------------------------------------------- void VTranslateVars::InitVariables() { + variables.insert(measurement_, translate("VTranslateVars", "M_", "Left symbol _ in the name")); + variables.insert(increment_, translate("VTranslateVars", "Increment_", "Left symbol _ in the name")); variables.insert(line_, translate("VTranslateVars", "Line_", "Left symbol _ in the name")); variables.insert(angleLine_, translate("VTranslateVars", "AngleLine_", "Left symbol _ in the name")); variables.insert(arc_, translate("VTranslateVars", "Arc_", "Left symbol _ in the name")); diff --git a/src/test/TranslationsTest/tst_buitinregexp.cpp b/src/test/TranslationsTest/tst_buitinregexp.cpp index 1ae953068..79560e280 100644 --- a/src/test/TranslationsTest/tst_buitinregexp.cpp +++ b/src/test/TranslationsTest/tst_buitinregexp.cpp @@ -124,6 +124,8 @@ void TST_BuitInRegExp::TestCheckUnderlineExists_data() { QMap data; + data.insert(measurement_, true); + data.insert(increment_, true); data.insert(line_, true); data.insert(angleLine_, true); data.insert(arc_, true);