Minor bugfixes

app/system/language_amiga.cpp

@@ -44,25 +44,22 @@ AmigaLanguage::AmigaLanguage()
 
     base = (struct LocaleBase*)OpenLibrary("locale.library", 38L);
     locale = OpenLocale(NULL);
-    help =   OpenCatalog(NULL, "amath-help.catalog",
-                         OC_BuiltInLanguage,"english",
-                         OC_Language,"dansk",
-                         TAG_DONE);
-    ident =  OpenCatalog(NULL, "amath-ident.catalog",
-                         OC_BuiltInLanguage,"english",
-                         OC_Language,"dansk",
-                         TAG_DONE);
-    text =   OpenCatalog(NULL, "amath-text.catalog",
-                         OC_BuiltInLanguage,"english",
-                         OC_Language,"dansk",
-                         TAG_DONE);
+    helpcatalog  = OpenCatalog(locale, "amath-help.catalog",
+                               OC_BuiltInLanguage,"english",
+                               TAG_DONE);
+    identcatalog = OpenCatalog(locale, "amath-ident.catalog",
+                               OC_BuiltInLanguage,"english",
+                               TAG_DONE);
+    textcatalog  = OpenCatalog(locale, "amath-text.catalog",
+                               OC_BuiltInLanguage,"english",
+                               TAG_DONE);
 }
 
 AmigaLanguage::~AmigaLanguage()
 {
-    CloseCatalog(help);
-    CloseCatalog(ident);
-    CloseCatalog(text);
+    CloseCatalog(helpcatalog);
+    CloseCatalog(identcatalog);
+    CloseCatalog(textcatalog);
     CloseLocale(locale);
     CloseLibrary((struct Library*)base);
 }
@@ -82,7 +79,7 @@ char* AmigaLanguage::GetText(int id)
         return (char*)(HELPNOHELP);
     }
 
-    const char *text = GetCatalogStr(help, def->id, (char*)def->text);
+    const char *text = GetCatalogStr(helpcatalog, def->id, (char*)def->text);
     char *untagged = UntagText(text);
     return untagged;
 }
@@ -102,7 +99,7 @@ char* AmigaLanguage::GetHelpText(char* ident)
         return (char*)(HELPNOHELP);
     }
 
-    const char *text = GetCatalogStr(help, def->id, (char*)def->text);
+    const char *text = GetCatalogStr(identcatalog, def->id, (char*)def->text);
     char *untagged = UntagText(text);
     return untagged;
 }
@@ -122,7 +119,7 @@ char* AmigaLanguage::GetHelpText(Symbol symbol)
         return (char*)(HELPNOHELP);
     }
 
-    const char *text = GetCatalogStr(help, def->id, (char*)def->text);
+    const char *text = GetCatalogStr(textcatalog, def->id, (char*)def->text);
     char *untagged = UntagText(text);
     return untagged;
 }

app/system/language_amiga.h

@@ -51,9 +51,9 @@ public:
 private:
     struct LocaleBase* base;
     struct Locale* locale;
-    struct Catalog *help;
-    struct Catalog *ident;
-    struct Catalog *text;
+    struct Catalog *helpcatalog;
+    struct Catalog *identcatalog;
+    struct Catalog *textcatalog;
 };
 
 #endif

catalog/danish/amath-ident.ct

@@ -1,4 +1,4 @@
-## version $VER: amath-help.catalog 1.60 (08.04.2015)
+## version $VER: amath-ident.catalog 1.60 (08.04.2015)
 ## language dansk
 ## codeset 0
 ; #############################################################################

catalog/danish/amath-text.ct

@@ -1,4 +1,4 @@
-## version $VER: amath-help.catalog 1.60 (08.04.2015)
+## version $VER: amath-text.catalog 1.60 (08.04.2015)
 ## language dansk
 ## codeset 0
 ; #############################################################################

catalog/ident.cd

@@ -9,6 +9,8 @@
 ; Build with:
 ; flexcat ident.cd ../app/localize/ident.h=ident.sd
 ; #############################################################################
+#language english
+#version 0
 abs (/40/)
 The absolute value (or modulus) |x| of a real number x is the#NEWLINE#non-negative value of x without regard to its sign.#NEWLINE##SYNTAXHIGHLIGHT#Example: abs(-237.25)#NORMALTEXT##NEWLINE#
 sgn (/40/)

catalog/text.cd

@@ -27,6 +27,8 @@
 ; Build with:
 ; flexcat text.cd ../app/localize/text.h=text.sd
 ; #############################################################################
+#language english
+#version 0
 INTROMSG (/4/)
 #NORMALTEXT##BOLD##STARTMSG##NEWLINE##NORMALTEXT##COLOR02##ITALICS#Type help to show info.#NEWLINE#
 TXTLISTDIRHEADER (/4/)