From 7a53ed169169d606204850a9ad56bd87c5895a49 Mon Sep 17 00:00:00 2001 From: llsth Date: Wed, 8 Apr 2015 23:01:23 +0200 Subject: [PATCH] Minor bugfixes --- app/system/language_amiga.cpp | 33 +++++++++++++---------------- app/system/language_amiga.h | 6 +++--- catalog/danish/amath-ident.catalog | Bin 4734 -> 4734 bytes catalog/danish/amath-ident.ct | 2 +- catalog/danish/amath-text.catalog | Bin 1790 -> 1790 bytes catalog/danish/amath-text.ct | 2 +- catalog/ident.cd | 2 ++ catalog/text.cd | 2 ++ 8 files changed, 24 insertions(+), 23 deletions(-) diff --git a/app/system/language_amiga.cpp b/app/system/language_amiga.cpp index fcea8238..5306783e 100644 --- a/app/system/language_amiga.cpp +++ b/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; } diff --git a/app/system/language_amiga.h b/app/system/language_amiga.h index 2734f0c0..62eac1b8 100644 --- a/app/system/language_amiga.h +++ b/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 diff --git a/catalog/danish/amath-ident.catalog b/catalog/danish/amath-ident.catalog index 79270b3d0cf7d15b1ca075cc7c12653c7272246d..0827e01ac415023b428d59cc9f0a2aa0e4000dc0 100644 GIT binary patch delta 72 zcmeyT@=wLy%|FPOfkCLuImE}^EzC8Dfq_9s1xQ;dB<3cTWawt5q~?|AB`207=H#a< a80wiBC}X{iRXc$=N8JOr985o*sGHkTB7XkqNsuQFD diff --git a/catalog/danish/amath-ident.ct b/catalog/danish/amath-ident.ct index dee8846e..11414aa8 100644 --- a/catalog/danish/amath-ident.ct +++ b/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 ; ############################################################################# diff --git a/catalog/danish/amath-text.catalog b/catalog/danish/amath-text.catalog index e1a615f649e1c3cb5cc854e5febb2a24e0a9480c..0d6cca790ec6801869d0fea027dec24b98165a31 100644 GIT binary patch delta 15 Wcmeyz`;T{m0!vA1Maf2$TWkO|9tK4K delta 15 Wcmeyz`;T{m0!v0}PQgZ%TWkO{Vg@My diff --git a/catalog/danish/amath-text.ct b/catalog/danish/amath-text.ct index 4516a72f..e79209ce 100644 --- a/catalog/danish/amath-text.ct +++ b/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 ; ############################################################################# diff --git a/catalog/ident.cd b/catalog/ident.cd index 2f69a14a..e9ba7367 100644 --- a/catalog/ident.cd +++ b/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/) diff --git a/catalog/text.cd b/catalog/text.cd index 338f0ad2..fa09be12 100644 --- a/catalog/text.cd +++ b/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/)