From 36d72a57567c26aa1bfd6fdb0014cb664bc1f284 Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Thu, 29 Jun 2017 03:16:30 +0300
Subject: [PATCH] Script function names have been translated

---
 limereport/lrscriptenginemanager.cpp | 26 +++++++++++++-------------
 translations/limereport_ru.ts        | 20 ++++++++++++++++++++
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/limereport/lrscriptenginemanager.cpp b/limereport/lrscriptenginemanager.cpp
index 983637f..866c4c5 100644
--- a/limereport/lrscriptenginemanager.cpp
+++ b/limereport/lrscriptenginemanager.cpp
@@ -427,7 +427,7 @@ void ScriptEngineManager::setDataManager(DataSourceManager *dataManager){
         if (m_dataManager){
             foreach(QString func, m_dataManager->groupFunctionNames()){
                 if (isFunctionExists(func)) deleteFunction(func);
-                addFunction(func, groupFunction,"GROUP FUNCTIONS", func+"(\""+tr("Value")+"\",\""+tr("BandName")+"\")");
+                addFunction(func, groupFunction,tr("GROUP FUNCTIONS"), func+"(\""+tr("Value")+"\",\""+tr("BandName")+"\")");
             }
             foreach(ScriptFunctionDesc func, m_functions){
                 if (func.type==ScriptFunctionDesc::Native)
@@ -612,22 +612,22 @@ ScriptEngineManager::ScriptEngineManager()
     m_scriptEngine = new QScriptEngine;
 
     //addFunction("dateToStr",dateToStr,"DATE", "dateToStr(\"value\",\"format\")");
-    addFunction("line",line,"SYSTEM", "line(\""+tr("BandName")+"\")");
-    addFunction("numberFormat",numberFormat,"NUMBER", "numberFormat(\""+tr("Value")+"\",\""+tr("Format")+"\",\""+
+    addFunction("line",line,tr("SYSTEM"), "line(\""+tr("BandName")+"\")");
+    addFunction("numberFormat",numberFormat,tr("NUMBER"), "numberFormat(\""+tr("Value")+"\",\""+tr("Format")+"\",\""+
                 tr("Precision")+"\",\""+
                 tr("Locale")+"\")");
-    addFunction("dateFormat",dateFormat,"DATE&TIME", "dateFormat(\""+tr("Value")+"\",\""+tr("Format")+"\")");
-    addFunction("timeFormat",timeFormat,"DATE&TIME", "dateFormat(\""+tr("Value")+"\",\""+tr("Format")+"\")");
-    addFunction("dateTimeFormat", dateTimeFormat, "DATE&TIME", "dateTimeFormat(\""+tr("Value")+"\",\""+tr("Format")+"\")");
-    addFunction("date",date,"DATE&TIME","date()");
-    addFunction("now",now,"DATE&TIME","now()");
+    addFunction("dateFormat",dateFormat,tr("DATE&TIME"), "dateFormat(\""+tr("Value")+"\",\""+tr("Format")+"\")");
+    addFunction("timeFormat",timeFormat,tr("DATE&TIME"), "dateFormat(\""+tr("Value")+"\",\""+tr("Format")+"\")");
+    addFunction("dateTimeFormat", dateTimeFormat, tr("DATE&TIME"), "dateTimeFormat(\""+tr("Value")+"\",\""+tr("Format")+"\")");
+    addFunction("date",date,tr("DATE&TIME"),"date()");
+    addFunction("now",now,tr("DATE&TIME"),"now()");
 #if QT_VERSION>0x040800
-    addFunction("currencyFormat",currencyFormat,"NUMBER","currencyFormat(\""+tr("Value")+"\",\""+tr("Locale")+"\")");
-    addFunction("currencyUSBasedFormat",currencyUSBasedFormat,"NUMBER","currencyUSBasedFormat(\""+tr("Value")+",\""+tr("CurrencySymbol")+"\")");
+    addFunction("currencyFormat",currencyFormat,tr("NUMBER"),"currencyFormat(\""+tr("Value")+"\",\""+tr("Locale")+"\")");
+    addFunction("currencyUSBasedFormat",currencyUSBasedFormat,tr("NUMBER"),"currencyUSBasedFormat(\""+tr("Value")+",\""+tr("CurrencySymbol")+"\")");
 #endif
-    addFunction("setVariable", setVariable, "GENERAL", "setVariable(\""+tr("Name")+"\",\""+tr("Value")+"\")");
-    addFunction("getVariable", getVariable, "GENERAL", "getVariable(\""+tr("Name")+"\")");
-    addFunction("getField", getField, "GENERAL", "getField(\""+tr("Name")+"\")");
+    addFunction("setVariable", setVariable, tr("GENERAL"), "setVariable(\""+tr("Name")+"\",\""+tr("Value")+"\")");
+    addFunction("getVariable", getVariable, tr("GENERAL"), "getVariable(\""+tr("Name")+"\")");
+    addFunction("getField", getField, tr("GENERAL"), "getField(\""+tr("Name")+"\")");
 
     QScriptValue colorCtor = m_scriptEngine->newFunction(constructColor);
     m_scriptEngine->globalObject().setProperty("QColor", colorCtor);
diff --git a/translations/limereport_ru.ts b/translations/limereport_ru.ts
index d2bd7e0..8b9caa0 100644
--- a/translations/limereport_ru.ts
+++ b/translations/limereport_ru.ts
@@ -1968,6 +1968,26 @@ This preview is no longer valid.</source>
         <source>Name</source>
         <translation>Имя переменной</translation>
     </message>
+    <message>
+        <source>GROUP FUNCTIONS</source>
+        <translation>АГРЕГАТНЫЕ ФУНКЦИИ</translation>
+    </message>
+    <message>
+        <source>SYSTEM</source>
+        <translation>СИСТЕМНЫЕ</translation>
+    </message>
+    <message>
+        <source>NUMBER</source>
+        <translation>ЧИСЛОВЫЕ</translation>
+    </message>
+    <message>
+        <source>DATE&amp;TIME</source>
+        <translation>ДАТА И ВРЕМЯ</translation>
+    </message>
+    <message>
+        <source>GENERAL</source>
+        <translation>ОБЩИЕ</translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::SettingDialog</name>