Fix translation elarc variables.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-08-08 18:27:36 +03:00
parent 16ec3a3ea8
commit 5fa0324185
24 changed files with 502 additions and 2 deletions

View File

@ -12215,6 +12215,31 @@ Do you want to save your changes?</translation>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VVITConverter</name>

View File

@ -10790,6 +10790,31 @@ Do you want to save your changes?</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VVITConverter</name>

View File

@ -11801,6 +11801,31 @@ Do you want to save your changes?</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VVITConverter</name>

View File

@ -11587,6 +11587,31 @@ Do you want to save your changes?</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VVITConverter</name>

View File

@ -12022,6 +12022,31 @@ Do you want to save your changes?</translation>
<comment>Left symbol _ in the name</comment>
<translation>Increment_</translation>
</message>
<message>
<source>ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VVITConverter</name>

View File

@ -12022,6 +12022,31 @@ Do you want to save your changes?</translation>
<comment>Left symbol _ in the name</comment>
<translation>Increment_</translation>
</message>
<message>
<source>ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VVITConverter</name>

View File

@ -12022,6 +12022,31 @@ Do you want to save your changes?</translation>
<comment>Left symbol _ in the name</comment>
<translation>Increment_</translation>
</message>
<message>
<source>ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VVITConverter</name>

View File

@ -12022,6 +12022,31 @@ Do you want to save your changes?</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VVITConverter</name>

View File

@ -10730,6 +10730,31 @@ Do you want to save your changes?</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VVITConverter</name>

View File

@ -11978,6 +11978,31 @@ Voulez-vous enregistrer les changements?</translation>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VVITConverter</name>

View File

@ -9531,6 +9531,31 @@ Do you want to save your changes?</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VWidgetDetails</name>

View File

@ -9921,6 +9921,31 @@ Do you want to save your changes?</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VWidgetDetails</name>

View File

@ -11719,6 +11719,31 @@ Vuoi salvare le tue modifiche?</translation>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VVITConverter</name>

View File

@ -12021,6 +12021,31 @@ Wil je deze veranderingen opslaan?</translation>
<comment>Left symbol _ in the name</comment>
<translation>Toenemen_</translation>
</message>
<message>
<source>ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VVITConverter</name>

View File

@ -10917,6 +10917,31 @@ Do you want to save your changes?</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VVITConverter</name>

View File

@ -10597,6 +10597,31 @@ Do you want to save your changes?</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VWidgetDetails</name>

View File

@ -12027,6 +12027,31 @@ Do you want to save your changes?</source>
<comment>Left symbol _ in the name</comment>
<translation>Прибавка_</translation>
</message>
<message>
<source>ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VVITConverter</name>

View File

@ -12020,6 +12020,31 @@ Do you want to save your changes?</source>
<comment>Left symbol _ in the name</comment>
<translation>Прибавка_</translation>
</message>
<message>
<source>ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VVITConverter</name>

View File

@ -9564,6 +9564,31 @@ Do you want to save your changes?</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Radius2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle1ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Angle2ElArc_</source>
<comment>Left symbol _ in the name</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VWidgetDetails</name>

View File

@ -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

View File

@ -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;

View File

@ -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)
{

View File

@ -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",

View File

@ -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);