From 3f5371321bb2afa029e07855c40c92882e8ddde1 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Sat, 6 Jan 2024 15:47:59 +0200
Subject: [PATCH] Do not translate formulas, but localize decimal character.

---
 src/libs/vpatterndb/vtranslatevars.cpp | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/libs/vpatterndb/vtranslatevars.cpp b/src/libs/vpatterndb/vtranslatevars.cpp
index 279507598..1154be62f 100644
--- a/src/libs/vpatterndb/vtranslatevars.cpp
+++ b/src/libs/vpatterndb/vtranslatevars.cpp
@@ -704,12 +704,6 @@ auto VTranslateVars::FormulaFromUser(const QString &formula, bool osSeparator) c
         return formula;
     }
 
-    VCommonSettings *settings = VAbstractApplication::VApp()->Settings();
-    if (!settings->IsTranslateFormula())
-    {
-        return formula;
-    }
-
     // Eval formula
     QScopedPointer<qmu::QmuTokenParser> cal(
         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
 
-    TranslateVarsFromUser(newFormula, tokens, numbers);
+    VCommonSettings *settings = VAbstractApplication::VApp()->Settings();
+    if (settings->IsTranslateFormula())
+    {
+        TranslateVarsFromUser(newFormula, tokens, numbers);
+    }
+
     TranslateNumbersFromUser(newFormula, tokens, numbers, osSeparator);
 
     return newFormula;
@@ -754,12 +753,6 @@ auto VTranslateVars::FormulaToUser(const QString &formula, bool osSeparator) con
         return formula;
     }
 
-    VCommonSettings *settings = VAbstractApplication::VApp()->Settings();
-    if (!settings->IsTranslateFormula())
-    {
-        return formula;
-    }
-
     QString newFormula = formula; // Local copy for making changes
 
     QMap<vsizetype, QString> tokens;
@@ -780,7 +773,12 @@ auto VTranslateVars::FormulaToUser(const QString &formula, bool osSeparator) con
         return newFormula;
     }
 
-    TranslateVarsToUser(newFormula, tokens, numbers);
+    VCommonSettings *settings = VAbstractApplication::VApp()->Settings();
+    if (settings->IsTranslateFormula())
+    {
+        TranslateVarsToUser(newFormula, tokens, numbers);
+    }
+
     TranslateNumbersToUser(newFormula, tokens, numbers, osSeparator);
 
     return newFormula;