aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not translate formulas, but localize decimal character.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2024-01-06 15:47:59 +02:00
parent cb5b85435f
commit 3f5371321b
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/libs/vpatterndb/vtranslatevars.cpp
View File

@ -704,12 +704,6 @@ auto VTranslateVars::FormulaFromUser(const QString &formula, bool osSeparator) c
return formula; return formula;
} }
VCommonSettings *settings = VAbstractApplication::VApp()->Settings();
if (!settings->IsTranslateFormula())
{
return formula;
}
// Eval formula // Eval formula
QScopedPointer<qmu::QmuTokenParser> cal( QScopedPointer<qmu::QmuTokenParser> cal(
new qmu::QmuTokenParser(formula, osSeparator, true, GetTranslatedFunctions())); new qmu::QmuTokenParser(formula, osSeparator, true, GetTranslatedFunctions()));
@ -719,7 +713,12 @@ auto VTranslateVars::FormulaFromUser(const QString &formula, bool osSeparator) c
QString newFormula = formula; // Local copy for making changes QString newFormula = formula; // Local copy for making changes
TranslateVarsFromUser(newFormula, tokens, numbers); VCommonSettings *settings = VAbstractApplication::VApp()->Settings();
if (settings->IsTranslateFormula())
{
TranslateVarsFromUser(newFormula, tokens, numbers);
}
TranslateNumbersFromUser(newFormula, tokens, numbers, osSeparator); TranslateNumbersFromUser(newFormula, tokens, numbers, osSeparator);
return newFormula; return newFormula;
@ -754,12 +753,6 @@ auto VTranslateVars::FormulaToUser(const QString &formula, bool osSeparator) con
return formula; return formula;
} }
VCommonSettings *settings = VAbstractApplication::VApp()->Settings();
if (!settings->IsTranslateFormula())
{
return formula;
}
QString newFormula = formula; // Local copy for making changes QString newFormula = formula; // Local copy for making changes
QMap<vsizetype, QString> tokens; QMap<vsizetype, QString> tokens;
@ -780,7 +773,12 @@ auto VTranslateVars::FormulaToUser(const QString &formula, bool osSeparator) con
return newFormula; return newFormula;
} }
TranslateVarsToUser(newFormula, tokens, numbers); VCommonSettings *settings = VAbstractApplication::VApp()->Settings();
if (settings->IsTranslateFormula())
{
TranslateVarsToUser(newFormula, tokens, numbers);
}
TranslateNumbersToUser(newFormula, tokens, numbers, osSeparator); TranslateNumbersToUser(newFormula, tokens, numbers, osSeparator);
return newFormula; return newFormula;