From: Jon Trulson <jon@radscan.com>
Date: Fri, 13 Jul 2012 23:42:12 +0000 (-0600)
Subject: Fix some minor issues and re-enable building of DE, ES, FR, and IT locale data (help... 
X-Git-Tag: 2.2.0a~17
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=860aa64942a0690b818df074b6a88c1c469bf427;p=oweals%2Fcde.git

Fix some minor issues and re-enable building of DE, ES, FR, and IT locale data (help and message cats)

Note, there are still some issues with certain programs appearing not
to use their localized message catalogs properly, while others work
fine.

Also, in order to build these now, you need to make sure you have
installed the DE, ES, FR, and IT locales before building or you will
get failures.  On [k]ubuntu, at least, you can install these with the
following commands:

sudo locale-gen de_DE
sudo locale-gen es_ES
sudo locale-gen fr_FR
sudo locale-gen it_IT
---

diff --git a/cde/admin/IntegTools/dbTools/installCDE.src b/cde/admin/IntegTools/dbTools/installCDE.src
index b4c5c91b..6e13dd0f 100755
--- a/cde/admin/IntegTools/dbTools/installCDE.src
+++ b/cde/admin/IntegTools/dbTools/installCDE.src
@@ -847,13 +847,27 @@ XCOMM
     fi
 
     HASH now load any localized filesets
-
     if [ "$DEVELOP_ENV" != "yes" ]
     then
       if [ "$theLang" != "" ]
       then
         DATABASE_FILES="$DATABASE_FILES CDE-$theLang CDE-MSG-$theLang \
 			CDE-HELP-$theLang"
+      else
+        HASH load all current (working) languages
+        DATABASE_FILES="$DATABASE_FILES \
+                                        CDE-DE \
+                                        CDE-MSG-DE \
+                                        CDE-HELP-DE \
+                                        CDE-ES \
+                                        CDE-MSG-ES \
+                                        CDE-HELP-ES \
+                                        CDE-FR \
+                                        CDE-MSG-FR \
+                                        CDE-HELP-FR \
+                                        CDE-IT \
+                                        CDE-MSG-IT \
+                                        CDE-HELP-IT "
       fi
     fi
   fi
diff --git a/cde/config/cf/site.def b/cde/config/cf/site.def
index 613a0abf..2cdc401c 100644
--- a/cde/config/cf/site.def
+++ b/cde/config/cf/site.def
@@ -82,9 +82,10 @@ XCOMM site:  $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
 # define DtLocalesToBuild ja_JP.dt-eucJP
 #endif
 
-XCOMM No locales other than C will build at this time.
-#ifdef LinuxArchitecture
-# define DtLocalesToBuild 
+XCOMM Make sure you have installed the de_DE, es_ES, fr_FR and it_IT locales.
+XCOMM  or building non-C locales will cause build failures.
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+# define DtLocalesToBuild de_DE.ISO8859-1 es_ES.ISO8859-1 fr_FR.ISO8859-1 it_IT.ISO8859-1
 #endif
 
 #ifdef SunArchitecture
diff --git a/cde/programs/dthelp/parser/canon1/helptag/help.c b/cde/programs/dthelp/parser/canon1/helptag/help.c
index 7ffe7ec1..830bf2ec 100644
--- a/cde/programs/dthelp/parser/canon1/helptag/help.c
+++ b/cde/programs/dthelp/parser/canon1/helptag/help.c
@@ -1768,7 +1768,7 @@ if (!charset)
 	charset = dotPtr + 1;
     }
 if (dotPtr)
-    *dotPtr = NULL;
+    *dotPtr = 0;
 
 strcpy(stdLang, locale);
 if (charset)
@@ -2250,7 +2250,7 @@ M_WCHAR wc;
 {
 if ((wc >= 0) && (wc <= 255))
     {
-    return _toupper(wc);
+    return toupper(wc);
     }
 return wc;
 }
diff --git a/cde/programs/dthelp/parser/pass2/htag2/sdl.c b/cde/programs/dthelp/parser/pass2/htag2/sdl.c
index f907fa1e..b75adf6e 100644
--- a/cde/programs/dthelp/parser/pass2/htag2/sdl.c
+++ b/cde/programs/dthelp/parser/pass2/htag2/sdl.c
@@ -1680,9 +1680,9 @@ while (pThis)
 	    pId = &pThis->u.u_switch.id;
 	    break;
 	default:
-	    fprintf(stderr, errMess);
+          fprintf(stderr, "%s\n", errMess);
 	    if (m_errfile && (m_errfile != stderr))
-		fprintf(m_errfile, errMess);
+		fprintf(m_errfile, "%s\n", errMess);
 	    exit(xxx);
 	}
     if (w_strcmp(rid, *pId) == 0) return pThis;
@@ -2342,9 +2342,9 @@ while (pThis)
 	    pThis = pThis->pNext;
 	    break;
 	default:
-	    fprintf(stderr, errMess);
+	    fprintf(stderr, "%s\n", errMess);
 	    if (m_errfile && (m_errfile != stderr))
-		fprintf(m_errfile, errMess);
+		fprintf(m_errfile, "%s\n", errMess);
 	    exit(xxx);
 	}
     }
@@ -3368,9 +3368,9 @@ while (pThis)
 	    pThis = pThis->pNext;
 	    break;
 	default:
-	    fprintf(stderr, errMess);
+	    fprintf(stderr, "%s\n", errMess);
 	    if (m_errfile && (m_errfile != stderr))
-		fprintf(m_errfile, errMess);
+		fprintf(m_errfile, "%s\n", errMess);
 	    exit(xxx);
 	}
     }
@@ -4915,9 +4915,9 @@ while (pThis)
 	    DeleteElement(pThat);
 	    break;
 	default:
-	    fprintf(stderr, errMess);
+	    fprintf(stderr, "%s\n", errMess);
 	    if (m_errfile && (m_errfile != stderr))
-		fprintf(m_errfile, errMess);
+		fprintf(m_errfile, "%s\n", errMess);
 	    exit(xxx);
 	}
     }
@@ -6409,7 +6409,7 @@ static char      padString[COMPRESS_PAD_LENGTH];
 pc = padString;
 length = COMPRESS_PAD_LENGTH;
 while (--length >= 0)
-    *pc++ = 0xff;
+  *pc++ = (char)0xff;
 
 FcloseFile(outFile, compFileName, xxx);
 newZsize = Compress(compFileName, compZFileName, TRUE) + 4;
diff --git a/cde/programs/localized/templates/French.tmpl b/cde/programs/localized/templates/French.tmpl
index 7a611383..7e029390 100644
--- a/cde/programs/localized/templates/French.tmpl
+++ b/cde/programs/localized/templates/French.tmpl
@@ -30,3 +30,7 @@ LANG=fr
 #ifdef UXPArchitecture
 LANG=fr
 #endif
+
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+LANG=fr_FR.ISO8859-1
+#endif
diff --git a/cde/programs/localized/templates/German.tmpl b/cde/programs/localized/templates/German.tmpl
index e0ea4ffe..890b333a 100644
--- a/cde/programs/localized/templates/German.tmpl
+++ b/cde/programs/localized/templates/German.tmpl
@@ -30,3 +30,7 @@ LANG=de
 #ifdef UXPArchitecture
 LANG=de
 #endif
+
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+LANG=de_DE.ISO8859-1
+#endif
diff --git a/cde/programs/localized/templates/Italian.tmpl b/cde/programs/localized/templates/Italian.tmpl
index 0dd50445..ccc368be 100644
--- a/cde/programs/localized/templates/Italian.tmpl
+++ b/cde/programs/localized/templates/Italian.tmpl
@@ -30,3 +30,7 @@ LANG=it
 #ifdef UXPArchitecture
 LANG=it
 #endif
+
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+LANG=it_IT.ISO8859-1
+#endif
diff --git a/cde/programs/localized/templates/Spanish.tmpl b/cde/programs/localized/templates/Spanish.tmpl
index e7d9de5a..532d01ea 100644
--- a/cde/programs/localized/templates/Spanish.tmpl
+++ b/cde/programs/localized/templates/Spanish.tmpl
@@ -30,3 +30,7 @@ LANG=es
 #ifdef UXPArchitecture
 LANG=es
 #endif
+
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+LANG=es_ES.ISO8859-1
+#endif
diff --git a/cde/programs/localized/templates/header2.tmpl b/cde/programs/localized/templates/header2.tmpl
index 621fd93b..bc7b2f35 100644
--- a/cde/programs/localized/templates/header2.tmpl
+++ b/cde/programs/localized/templates/header2.tmpl
@@ -39,12 +39,6 @@ AllTarget($(TMPLOCAL_TARGET))						@@\
 									@@\
 .SUFFIXES: .msg .cat							@@\
 									@@\
-RandomMotifMessageCatalogRule(Xm)					@@\
-									@@\
-RandomMotifMessageCatalogRule(Mrm)					@@\
-									@@\
-RandomMotifMessageCatalogRule(Uil)					@@\
-									@@\
 dtprintinfo.cat: dtprintinfo.msg					@@\
 	@echo "Running sym2num for $@ with LANG set to $(LANG)"		@@\
 	( \								@@\
diff --git a/cde/programs/localized/templates/msg.C.tmpl b/cde/programs/localized/templates/msg.C.tmpl
index b0ae5cb4..c307c89d 100644
--- a/cde/programs/localized/templates/msg.C.tmpl
+++ b/cde/programs/localized/templates/msg.C.tmpl
@@ -9,9 +9,6 @@ SHELL=/bin/ksh
 #endif
 
 OBJS= \
-      Xm.cat		\
-      Mrm.cat		\
-      Uil.cat		\
       DtHelp.cat	\
       fmt_tbl.cat	\
       DtMail.cat	\