- Return the TranslatableContent record from runtime. So that getMess…

…agesStringInternal() can work fine.

- Moved the TranslatableContent from Util.mo to Error.mo
- Added a testcase for getMessagesStringInternal().
- Some minor fixes in FMI.
- The translation file msgid and msgstr should be same.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12778 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Compiler/OpenModelicaBootstrappingHeader.h

@@ -115,6 +115,36 @@ extern struct record_description Config_LanguageStandard_MODELICA__LATEST__desc;
 static const MMC_DEFSTRUCTLIT(Config__MODELICA_5fLATEST__struct,1,9) {&Config_LanguageStandard_MODELICA__LATEST__desc}};
 static void *Config__MODELICA_5fLATEST = MMC_REFSTRUCTLIT(Config__MODELICA_5fLATEST__struct);
 #ifdef ADD_METARECORD_DEFINTIONS
+#ifndef Error_TranslatableContent_gettext__desc_added
+#define Error_TranslatableContent_gettext__desc_added
+ADD_METARECORD_DEFINTIONS const char* Error_TranslatableContent_gettext__desc__fields[1] = {"msgid"};
+ADD_METARECORD_DEFINTIONS struct record_description Error_TranslatableContent_gettext__desc = {
+  "Error_TranslatableContent_gettext",
+  "Error.TranslatableContent.gettext",
+  Error_TranslatableContent_gettext__desc__fields
+};
+#endif
+#else /* Only use the file as a header */
+extern struct record_description Error_TranslatableContent_gettext__desc;
+#endif
+#define Error__gettext_3dBOX1 3
+#define Error__gettext(msgid) (mmc_mk_box2(3,&Error_TranslatableContent_gettext__desc,msgid))
+#ifdef ADD_METARECORD_DEFINTIONS
+#ifndef Error_TranslatableContent_notrans__desc_added
+#define Error_TranslatableContent_notrans__desc_added
+ADD_METARECORD_DEFINTIONS const char* Error_TranslatableContent_notrans__desc__fields[1] = {"str"};
+ADD_METARECORD_DEFINTIONS struct record_description Error_TranslatableContent_notrans__desc = {
+  "Error_TranslatableContent_notrans",
+  "Error.TranslatableContent.notrans",
+  Error_TranslatableContent_notrans__desc__fields
+};
+#endif
+#else /* Only use the file as a header */
+extern struct record_description Error_TranslatableContent_notrans__desc;
+#endif
+#define Error__notrans_3dBOX1 4
+#define Error__notrans(str) (mmc_mk_box2(4,&Error_TranslatableContent_notrans__desc,str))
+#ifdef ADD_METARECORD_DEFINTIONS
 #ifndef Error_Severity_ERROR__desc_added
 #define Error_Severity_ERROR__desc_added
 ADD_METARECORD_DEFINTIONS const char* Error_Severity_ERROR__desc__fields[1] = {"no fileds"};

Compiler/Script/CevalScript.mo

@@ -4781,15 +4781,15 @@ algorithm
       Absyn.Path msgpath;
       Values.Value tyVal,severityVal,infoVal;
       list<Values.Value> values;
-      Util.TranslatableContent message;
+      Error.TranslatableContent message;
       String msg_str;
       Integer id;
       Error.Severity severity;
       Error.MessageType ty;
       Absyn.Info info;
     case Error.TOTALMESSAGE(Error.MESSAGE(id,ty,severity,message),info)
       equation
-        msg_str = Util.translateContent(message);
+        msg_str = Error.translateContent(message);
         msgpath = Absyn.FULLYQUALIFIED(Absyn.QUALIFIED("OpenModelica",Absyn.QUALIFIED("Scripting",Absyn.IDENT("ErrorMessage"))));
         tyVal = errorTypeToValue(ty);
         severityVal = errorLevelToValue(severity);

Compiler/Template/CodegenFMU.tpl

@@ -1191,9 +1191,9 @@ template dumpFMIModelVariableBasetypeAndName(Integer fmiModelVariable)
   let basetype = getFMIModelVariableBaseType(fmiModelVariable)
   let name = getFMIModelVariableName(fmiModelVariable)
   let hasStart = getFMIModelVariableHasStart(fmiModelVariable)
-  let hasFixed = getFMIModelVariableHasFixed(fmiModelVariable)
+  let isFixed = getFMIModelVariableIsFixed(fmiModelVariable)
   <<
-  <%basetype%> <%name%><%if stringEq(hasStart,"true") then "(start="+dumpFMIModelVariableStartValue(fmiModelVariable,basetype)%><%if boolAnd(stringEq(hasStart,"true"),stringEq(hasFixed,"true")) then ",fixed=true"%><%if boolAnd(stringEq(hasStart,"false"),stringEq(hasFixed,"true")) then "(fixed=true"%><%if boolOr(stringEq(hasStart,"true"),stringEq(hasFixed,"true")) then ")"%>
+  <%basetype%> <%name%><%if stringEq(hasStart,"true") then "(start="+dumpFMIModelVariableStartValue(fmiModelVariable,basetype)%><%if boolAnd(stringEq(hasStart,"true"),stringEq(isFixed,"true")) then ",fixed=true"%><%if boolAnd(stringEq(hasStart,"false"),stringEq(isFixed,"true")) then "(fixed=true"%><%if boolOr(stringEq(hasStart,"true"),stringEq(isFixed,"true")) then ")"%>
   >>
 end dumpFMIModelVariableBasetypeAndName;
 

Compiler/Template/SimCodeTV.mo

@@ -2598,10 +2598,10 @@ package FMI
     output Boolean outFMIModelVariableHasStart;
   end getFMIModelVariableHasStart;
 
-  function getFMIModelVariableHasFixed
+  function getFMIModelVariableIsFixed
     input Integer inFMIModelVariable;
     output Boolean outFMIModelVariableHasFixed;
-  end getFMIModelVariableHasFixed;
+  end getFMIModelVariableIsFixed;
 
   function getFMIRealVariableStartValue
     input Integer inFMIModelVariable;

Compiler/Template/Unparsing.mo

@@ -9,9 +9,32 @@ encapsulated package Unparsing
 
 public import Tpl;
 
+public import SimCode;
+public import BackendDAE;
 public import System;
 public import Absyn;
+public import DAE;
+public import ClassInf;
 public import SCode;
+public import Util;
+public import List;
+public import ComponentReference;
+public import Expression;
+public import ExpressionDump;
+public import Config;
+public import Flags;
+public import Settings;
+public import Patternm;
+public import Error;
+public import Values;
+public import ValuesUtil;
+public import BackendQSS;
+public import BackendVariable;
+public import DAEDump;
+public import Algorithm;
+public import DAEUtil;
+public import Types;
+public import FMI;
 
 protected function lm_28
   input Tpl.Text in_txt;
@@ -579,4 +602,4 @@ algorithm
   end matchcontinue;
 end elementExternalHeader;
 
-end Unparsing;
+end Unparsing;

Compiler/Translation/de.po

@@ -2328,7 +2328,7 @@ msgstr ""
 #: ../runtime/SimulationResults.c:108 ../runtime/SimulationResults.c:138
 #, c-format
 msgid "%s not found in %s\n"
-msgstr "%s nicht in %s gefunden"
+msgstr "%s nicht in %s gefunden\n"
 
 #: ../runtime/SimulationResults.c:121
 #, c-format
@@ -2338,7 +2338,7 @@ msgstr ""
 #: ../runtime/SimulationResults.c:154
 #, c-format
 msgid "%s not defined at time %s\n"
-msgstr "%s zur Zeit %s nicht definiert"
+msgstr "%s zur Zeit %s nicht definiert\n"
 
 #: ../runtime/SimulationResults.c:168
 #, c-format
@@ -2380,11 +2380,11 @@ msgstr ""
 
 #: ../runtime/SimulationResultsCmp.c:701
 msgid "Cannot write result file!\n"
-msgstr "Kann Ergebnisdatei nicht schreiben!"
+msgstr "Kann Ergebnisdatei nicht schreiben!\n"
 
 #: ../runtime/SimulationResultsCmp.c:712
 msgid "Files not Equal\n"
-msgstr "Dateien sind nicht gleich"
+msgstr "Dateien sind nicht gleich\n"
 
 #: ../runtime/systemimpl.c:313
 #, c-format