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
This commit is contained in:
Jon Trulson
2012-07-13 17:42:12 -06:00
parent 75f2f96793
commit 860aa64942
10 changed files with 46 additions and 24 deletions

View File

@@ -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;
}

View File

@@ -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;

View File

@@ -30,3 +30,7 @@ LANG=fr
#ifdef UXPArchitecture
LANG=fr
#endif
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
LANG=fr_FR.ISO8859-1
#endif

View File

@@ -30,3 +30,7 @@ LANG=de
#ifdef UXPArchitecture
LANG=de
#endif
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
LANG=de_DE.ISO8859-1
#endif

View File

@@ -30,3 +30,7 @@ LANG=it
#ifdef UXPArchitecture
LANG=it
#endif
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
LANG=it_IT.ISO8859-1
#endif

View File

@@ -30,3 +30,7 @@ LANG=es
#ifdef UXPArchitecture
LANG=es
#endif
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
LANG=es_ES.ISO8859-1
#endif

View File

@@ -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)" @@\
( \ @@\

View File

@@ -9,9 +9,6 @@ SHELL=/bin/ksh
#endif
OBJS= \
Xm.cat \
Mrm.cat \
Uil.cat \
DtHelp.cat \
fmt_tbl.cat \
DtMail.cat \