From 5fa03241854cfc02292b0f7e60e1faa483e071a8 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 8 Aug 2017 18:27:36 +0300 Subject: [PATCH] Fix translation elarc variables. --HG-- branch : develop --- share/translations/valentina.ts | 25 +++++++++++++++++++ share/translations/valentina_cs_CZ.ts | 25 +++++++++++++++++++ share/translations/valentina_de_DE.ts | 25 +++++++++++++++++++ share/translations/valentina_el_GR.ts | 25 +++++++++++++++++++ share/translations/valentina_en_CA.ts | 25 +++++++++++++++++++ share/translations/valentina_en_IN.ts | 25 +++++++++++++++++++ share/translations/valentina_en_US.ts | 25 +++++++++++++++++++ share/translations/valentina_es_ES.ts | 25 +++++++++++++++++++ share/translations/valentina_fi_FI.ts | 25 +++++++++++++++++++ share/translations/valentina_fr_FR.ts | 25 +++++++++++++++++++ share/translations/valentina_he_IL.ts | 25 +++++++++++++++++++ share/translations/valentina_id_ID.ts | 25 +++++++++++++++++++ share/translations/valentina_it_IT.ts | 25 +++++++++++++++++++ share/translations/valentina_nl_NL.ts | 25 +++++++++++++++++++ share/translations/valentina_pt_BR.ts | 25 +++++++++++++++++++ share/translations/valentina_ro_RO.ts | 25 +++++++++++++++++++ share/translations/valentina_ru_RU.ts | 25 +++++++++++++++++++ share/translations/valentina_uk_UA.ts | 25 +++++++++++++++++++ share/translations/valentina_zh_CN.ts | 25 +++++++++++++++++++ src/libs/ifc/ifcdef.cpp | 10 ++++++++ src/libs/ifc/ifcdef.h | 7 +++++- src/libs/vgeometry/vellipticalarc.cpp | 2 +- src/libs/vpatterndb/vtranslatevars.cpp | 5 ++++ .../TranslationsTest/tst_buitinregexp.cpp | 5 ++++ 24 files changed, 502 insertions(+), 2 deletions(-) diff --git a/share/translations/valentina.ts b/share/translations/valentina.ts index 7a34ae941..62b435746 100644 --- a/share/translations/valentina.ts +++ b/share/translations/valentina.ts @@ -12215,6 +12215,31 @@ Do you want to save your changes? Left symbol _ in the name + + ElArc_ + Left symbol _ in the name + + + + Radius1ElArc_ + Left symbol _ in the name + + + + Radius2ElArc_ + Left symbol _ in the name + + + + Angle1ElArc_ + Left symbol _ in the name + + + + Angle2ElArc_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_cs_CZ.ts b/share/translations/valentina_cs_CZ.ts index 8ad04f9ab..366a917e2 100644 --- a/share/translations/valentina_cs_CZ.ts +++ b/share/translations/valentina_cs_CZ.ts @@ -10790,6 +10790,31 @@ Do you want to save your changes? Left symbol _ in the name + + ElArc_ + Left symbol _ in the name + + + + Radius1ElArc_ + Left symbol _ in the name + + + + Radius2ElArc_ + Left symbol _ in the name + + + + Angle1ElArc_ + Left symbol _ in the name + + + + Angle2ElArc_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_de_DE.ts b/share/translations/valentina_de_DE.ts index fa5c4f1a4..93265a2f1 100644 --- a/share/translations/valentina_de_DE.ts +++ b/share/translations/valentina_de_DE.ts @@ -11801,6 +11801,31 @@ Do you want to save your changes? Left symbol _ in the name + + ElArc_ + Left symbol _ in the name + + + + Radius1ElArc_ + Left symbol _ in the name + + + + Radius2ElArc_ + Left symbol _ in the name + + + + Angle1ElArc_ + Left symbol _ in the name + + + + Angle2ElArc_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_el_GR.ts b/share/translations/valentina_el_GR.ts index 6e10b89a8..40cfd8bf1 100644 --- a/share/translations/valentina_el_GR.ts +++ b/share/translations/valentina_el_GR.ts @@ -11587,6 +11587,31 @@ Do you want to save your changes? Left symbol _ in the name + + ElArc_ + Left symbol _ in the name + + + + Radius1ElArc_ + Left symbol _ in the name + + + + Radius2ElArc_ + Left symbol _ in the name + + + + Angle1ElArc_ + Left symbol _ in the name + + + + Angle2ElArc_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_en_CA.ts b/share/translations/valentina_en_CA.ts index 7142e20f6..5680ebe62 100644 --- a/share/translations/valentina_en_CA.ts +++ b/share/translations/valentina_en_CA.ts @@ -12022,6 +12022,31 @@ Do you want to save your changes? Left symbol _ in the name Increment_ + + ElArc_ + Left symbol _ in the name + + + + Radius1ElArc_ + Left symbol _ in the name + + + + Radius2ElArc_ + Left symbol _ in the name + + + + Angle1ElArc_ + Left symbol _ in the name + + + + Angle2ElArc_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_en_IN.ts b/share/translations/valentina_en_IN.ts index b0b1c279f..eab0b3f73 100644 --- a/share/translations/valentina_en_IN.ts +++ b/share/translations/valentina_en_IN.ts @@ -12022,6 +12022,31 @@ Do you want to save your changes? Left symbol _ in the name Increment_ + + ElArc_ + Left symbol _ in the name + + + + Radius1ElArc_ + Left symbol _ in the name + + + + Radius2ElArc_ + Left symbol _ in the name + + + + Angle1ElArc_ + Left symbol _ in the name + + + + Angle2ElArc_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_en_US.ts b/share/translations/valentina_en_US.ts index e672aa80b..e705273da 100644 --- a/share/translations/valentina_en_US.ts +++ b/share/translations/valentina_en_US.ts @@ -12022,6 +12022,31 @@ Do you want to save your changes? Left symbol _ in the name Increment_ + + ElArc_ + Left symbol _ in the name + + + + Radius1ElArc_ + Left symbol _ in the name + + + + Radius2ElArc_ + Left symbol _ in the name + + + + Angle1ElArc_ + Left symbol _ in the name + + + + Angle2ElArc_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_es_ES.ts b/share/translations/valentina_es_ES.ts index f2e88a123..c567edda3 100644 --- a/share/translations/valentina_es_ES.ts +++ b/share/translations/valentina_es_ES.ts @@ -12022,6 +12022,31 @@ Do you want to save your changes? Left symbol _ in the name + + ElArc_ + Left symbol _ in the name + + + + Radius1ElArc_ + Left symbol _ in the name + + + + Radius2ElArc_ + Left symbol _ in the name + + + + Angle1ElArc_ + Left symbol _ in the name + + + + Angle2ElArc_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_fi_FI.ts b/share/translations/valentina_fi_FI.ts index 08db6a923..afeae7db5 100644 --- a/share/translations/valentina_fi_FI.ts +++ b/share/translations/valentina_fi_FI.ts @@ -10730,6 +10730,31 @@ Do you want to save your changes? Left symbol _ in the name + + ElArc_ + Left symbol _ in the name + + + + Radius1ElArc_ + Left symbol _ in the name + + + + Radius2ElArc_ + Left symbol _ in the name + + + + Angle1ElArc_ + Left symbol _ in the name + + + + Angle2ElArc_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_fr_FR.ts b/share/translations/valentina_fr_FR.ts index 6d13d2aff..7ca33d0c3 100644 --- a/share/translations/valentina_fr_FR.ts +++ b/share/translations/valentina_fr_FR.ts @@ -11978,6 +11978,31 @@ Voulez-vous enregistrer les changements? Left symbol _ in the name + + ElArc_ + Left symbol _ in the name + + + + Radius1ElArc_ + Left symbol _ in the name + + + + Radius2ElArc_ + Left symbol _ in the name + + + + Angle1ElArc_ + Left symbol _ in the name + + + + Angle2ElArc_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_he_IL.ts b/share/translations/valentina_he_IL.ts index 5e0f1493d..21c5a4a98 100644 --- a/share/translations/valentina_he_IL.ts +++ b/share/translations/valentina_he_IL.ts @@ -9531,6 +9531,31 @@ Do you want to save your changes? Left symbol _ in the name + + ElArc_ + Left symbol _ in the name + + + + Radius1ElArc_ + Left symbol _ in the name + + + + Radius2ElArc_ + Left symbol _ in the name + + + + Angle1ElArc_ + Left symbol _ in the name + + + + Angle2ElArc_ + Left symbol _ in the name + + VWidgetDetails diff --git a/share/translations/valentina_id_ID.ts b/share/translations/valentina_id_ID.ts index 5ab6de2e5..75ad277c3 100644 --- a/share/translations/valentina_id_ID.ts +++ b/share/translations/valentina_id_ID.ts @@ -9921,6 +9921,31 @@ Do you want to save your changes? Left symbol _ in the name + + ElArc_ + Left symbol _ in the name + + + + Radius1ElArc_ + Left symbol _ in the name + + + + Radius2ElArc_ + Left symbol _ in the name + + + + Angle1ElArc_ + Left symbol _ in the name + + + + Angle2ElArc_ + Left symbol _ in the name + + VWidgetDetails diff --git a/share/translations/valentina_it_IT.ts b/share/translations/valentina_it_IT.ts index 790c3374a..06a33f434 100644 --- a/share/translations/valentina_it_IT.ts +++ b/share/translations/valentina_it_IT.ts @@ -11719,6 +11719,31 @@ Vuoi salvare le tue modifiche? Left symbol _ in the name + + ElArc_ + Left symbol _ in the name + + + + Radius1ElArc_ + Left symbol _ in the name + + + + Radius2ElArc_ + Left symbol _ in the name + + + + Angle1ElArc_ + Left symbol _ in the name + + + + Angle2ElArc_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_nl_NL.ts b/share/translations/valentina_nl_NL.ts index d8ad2c9b2..e1d9ecaf8 100644 --- a/share/translations/valentina_nl_NL.ts +++ b/share/translations/valentina_nl_NL.ts @@ -12021,6 +12021,31 @@ Wil je deze veranderingen opslaan? Left symbol _ in the name Toenemen_ + + ElArc_ + Left symbol _ in the name + + + + Radius1ElArc_ + Left symbol _ in the name + + + + Radius2ElArc_ + Left symbol _ in the name + + + + Angle1ElArc_ + Left symbol _ in the name + + + + Angle2ElArc_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_pt_BR.ts b/share/translations/valentina_pt_BR.ts index a6bc1e7d7..8b7626457 100644 --- a/share/translations/valentina_pt_BR.ts +++ b/share/translations/valentina_pt_BR.ts @@ -10917,6 +10917,31 @@ Do you want to save your changes? Left symbol _ in the name + + ElArc_ + Left symbol _ in the name + + + + Radius1ElArc_ + Left symbol _ in the name + + + + Radius2ElArc_ + Left symbol _ in the name + + + + Angle1ElArc_ + Left symbol _ in the name + + + + Angle2ElArc_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_ro_RO.ts b/share/translations/valentina_ro_RO.ts index 0a26dfc42..3026e1f8e 100644 --- a/share/translations/valentina_ro_RO.ts +++ b/share/translations/valentina_ro_RO.ts @@ -10597,6 +10597,31 @@ Do you want to save your changes? Left symbol _ in the name + + ElArc_ + Left symbol _ in the name + + + + Radius1ElArc_ + Left symbol _ in the name + + + + Radius2ElArc_ + Left symbol _ in the name + + + + Angle1ElArc_ + Left symbol _ in the name + + + + Angle2ElArc_ + Left symbol _ in the name + + VWidgetDetails diff --git a/share/translations/valentina_ru_RU.ts b/share/translations/valentina_ru_RU.ts index 4c576f739..c45376257 100644 --- a/share/translations/valentina_ru_RU.ts +++ b/share/translations/valentina_ru_RU.ts @@ -12027,6 +12027,31 @@ Do you want to save your changes? Left symbol _ in the name Прибавка_ + + ElArc_ + Left symbol _ in the name + + + + Radius1ElArc_ + Left symbol _ in the name + + + + Radius2ElArc_ + Left symbol _ in the name + + + + Angle1ElArc_ + Left symbol _ in the name + + + + Angle2ElArc_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_uk_UA.ts b/share/translations/valentina_uk_UA.ts index f5e4b88aa..85e96aec4 100644 --- a/share/translations/valentina_uk_UA.ts +++ b/share/translations/valentina_uk_UA.ts @@ -12020,6 +12020,31 @@ Do you want to save your changes? Left symbol _ in the name Прибавка_ + + ElArc_ + Left symbol _ in the name + + + + Radius1ElArc_ + Left symbol _ in the name + + + + Radius2ElArc_ + Left symbol _ in the name + + + + Angle1ElArc_ + Left symbol _ in the name + + + + Angle2ElArc_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_zh_CN.ts b/share/translations/valentina_zh_CN.ts index 3f5043366..1b259b7d9 100644 --- a/share/translations/valentina_zh_CN.ts +++ b/share/translations/valentina_zh_CN.ts @@ -9564,6 +9564,31 @@ Do you want to save your changes? Left symbol _ in the name + + ElArc_ + Left symbol _ in the name + + + + Radius1ElArc_ + Left symbol _ in the name + + + + Radius2ElArc_ + Left symbol _ in the name + + + + Angle1ElArc_ + Left symbol _ in the name + + + + Angle2ElArc_ + Left symbol _ in the name + + VWidgetDetails diff --git a/src/libs/ifc/ifcdef.cpp b/src/libs/ifc/ifcdef.cpp index 0a4376cf9..1a88d5c34 100644 --- a/src/libs/ifc/ifcdef.cpp +++ b/src/libs/ifc/ifcdef.cpp @@ -252,9 +252,12 @@ const QString line_ = QStringLiteral("Line_"); const QString angleLine_ = QStringLiteral("AngleLine_"); const QString spl_ = QStringLiteral(SPL_); const QString arc_ = QStringLiteral(ARC_); +const QString elarc_ = QStringLiteral(ELARC_); const QString splPath = QStringLiteral("SplPath"); const QString radius_V = QStringLiteral("Radius"); const QString radiusArc_ = radius_V + arc_; +const QString radius1ElArc_ = radius_V + QLatin1Char('1') + elarc_; +const QString radius2ElArc_ = radius_V + QLatin1Char('2') + elarc_; const QString angle1_V = QStringLiteral("Angle1"); const QString angle2_V = QStringLiteral("Angle2"); const QString c1Length_V = QStringLiteral("C1Length"); @@ -265,6 +268,8 @@ const QString c1LengthSplPath = c1Length_V + splPath; const QString c2LengthSplPath = c2Length_V + splPath; const QString angle1Arc_ = angle1_V + arc_; const QString angle2Arc_ = angle2_V + arc_; +const QString angle1ElArc_ = angle1_V + elarc_; +const QString angle2ElArc_ = angle2_V + elarc_; const QString angle1Spl_ = angle1_V + spl_; const QString angle2Spl_ = angle2_V + spl_; const QString angle1SplPath = angle1_V + splPath; @@ -278,11 +283,16 @@ const QStringList builInVariables = QStringList() << measurement_ << line_ << angleLine_ << arc_ + << elarc_ << spl_ << splPath << radiusArc_ + << radius1ElArc_ + << radius2ElArc_ << angle1Arc_ << angle2Arc_ + << angle1ElArc_ + << angle2ElArc_ << angle1Spl_ << angle2Spl_ << angle1SplPath diff --git a/src/libs/ifc/ifcdef.h b/src/libs/ifc/ifcdef.h index c077fc8c6..9b0b8e565 100644 --- a/src/libs/ifc/ifcdef.h +++ b/src/libs/ifc/ifcdef.h @@ -177,17 +177,20 @@ extern const QString ColorCornFlowerBlue; // Hacks for avoiding the linker error "undefined reference to" #define SPL_ "Spl_" #define ARC_ "Arc_" -#define EARC_ "ElArc_" +#define ELARC_ "ElArc_" extern const QString measurement_; extern const QString increment_; extern const QString line_; extern const QString angleLine_; extern const QString arc_; +extern const QString elarc_; extern const QString spl_; extern const QString splPath; extern const QString radius_V; extern const QString radiusArc_; +extern const QString radius1ElArc_; +extern const QString radius2ElArc_; extern const QString angle1_V; extern const QString angle2_V; extern const QString c1Length_V; @@ -198,6 +201,8 @@ extern const QString c1LengthSplPath; extern const QString c2LengthSplPath; extern const QString angle1Arc_; extern const QString angle2Arc_; +extern const QString angle1ElArc_; +extern const QString angle2ElArc_; extern const QString angle1Spl_; extern const QString angle2Spl_; extern const QString angle1SplPath; diff --git a/src/libs/vgeometry/vellipticalarc.cpp b/src/libs/vgeometry/vellipticalarc.cpp index fad7f1e5c..d89c42f7a 100644 --- a/src/libs/vgeometry/vellipticalarc.cpp +++ b/src/libs/vgeometry/vellipticalarc.cpp @@ -481,7 +481,7 @@ QPointF VEllipticalArc::CutArc(const qreal &length) const //--------------------------------------------------------------------------------------------------------------------- void VEllipticalArc::CreateName() { - QString name = EARC_ + QString("%1").arg(this->GetCenter().name()); + QString name = ELARC_ + QString("%1").arg(this->GetCenter().name()); if (VAbstractCurve::id() != NULL_ID) { diff --git a/src/libs/vpatterndb/vtranslatevars.cpp b/src/libs/vpatterndb/vtranslatevars.cpp index e0ca6c460..22810a645 100644 --- a/src/libs/vpatterndb/vtranslatevars.cpp +++ b/src/libs/vpatterndb/vtranslatevars.cpp @@ -378,11 +378,16 @@ void VTranslateVars::InitVariables() 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")); + variables.insert(elarc_, translate("VTranslateVars", "ElArc_", "Left symbol _ in the name")); variables.insert(spl_, translate("VTranslateVars", "Spl_", "Left symbol _ in the name")); variables.insert(splPath, translate("VTranslateVars", "SplPath", "Do not add symbol _ to the end of the name")); variables.insert(radiusArc_, translate("VTranslateVars", "RadiusArc_", "Left symbol _ in the name")); + variables.insert(radius1ElArc_, translate("VTranslateVars", "Radius1ElArc_", "Left symbol _ in the name")); + variables.insert(radius2ElArc_, translate("VTranslateVars", "Radius2ElArc_", "Left symbol _ in the name")); variables.insert(angle1Arc_, translate("VTranslateVars", "Angle1Arc_", "Left symbol _ in the name")); variables.insert(angle2Arc_, translate("VTranslateVars", "Angle2Arc_", "Left symbol _ in the name")); + variables.insert(angle1ElArc_, translate("VTranslateVars", "Angle1ElArc_", "Left symbol _ in the name")); + variables.insert(angle2ElArc_, translate("VTranslateVars", "Angle2ElArc_", "Left symbol _ in the name")); variables.insert(angle1Spl_, translate("VTranslateVars", "Angle1Spl_", "Left symbol _ in the name")); variables.insert(angle2Spl_, translate("VTranslateVars", "Angle2Spl_", "Left symbol _ in the name")); variables.insert(angle1SplPath, translate("VTranslateVars", "Angle1SplPath", diff --git a/src/test/TranslationsTest/tst_buitinregexp.cpp b/src/test/TranslationsTest/tst_buitinregexp.cpp index 31ef8998d..5411f6f46 100644 --- a/src/test/TranslationsTest/tst_buitinregexp.cpp +++ b/src/test/TranslationsTest/tst_buitinregexp.cpp @@ -124,11 +124,16 @@ void TST_BuitInRegExp::TestCheckUnderlineExists_data() data.insert(line_, true); data.insert(angleLine_, true); data.insert(arc_, true); + data.insert(elarc_, true); data.insert(spl_, true); data.insert(splPath, false); data.insert(radiusArc_, true); + data.insert(radius1ElArc_, true); + data.insert(radius2ElArc_, true); data.insert(angle1Arc_, true); data.insert(angle2Arc_, true); + data.insert(angle1ElArc_, true); + data.insert(angle2ElArc_, true); data.insert(angle1Spl_, true); data.insert(angle2Spl_, true); data.insert(angle1SplPath, false);