[Freeciv-Dev] patch: Internationalization (PR#69)

[dwp@xxxxxxxxxxxxxx]

This is a multi-part message in MIME format.

--_----------=_93287598192840
Content-Disposition: inline
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

=?ISO-8859-1?Q?David_P=E9rez_Serrada?= <david@xxxxxxx> wrote:
> On Sun, 18 Jul 1999, David Pfitzner wrote:
> 
> > David =3D?iso-8859-1?Q?P=3DE9rez?=3D Serrada wrote:

> > What I would like to see now is a patch which changes=20
> > configure etc, and civserver.c and civclient.c, to provide
> > basic working support. =20
> Ok... here it is=20

Ok, but I think your "diff -Xno.freeciv" excluded too much;
eg, configure.in and POTFILES.in.  And can exclude aclocal.m4,
since it is created by 'aclocal', and may depend on local
automake version etc.

Ah, I notice the example no.freeciv file in
   http://www.freeciv.org/contribute.html
has these problems; that should be fixed :-/

Also, I don't think your patch does enough to ensure that
the right libs all and includes all happen if the user specifies
--with-included_gettext, to use the internal version.

Attached is a modified patch, doing the following:

Makefile.am
  Added 'intl' and 'po' to SUBDIRS; added intl early in list, so included 
libintl.a is built before executables if using included gettext.

other Makefile.am:
  Added -I../intl to INCLUDES (or -I../../intl in gui dirs).  
This is necessary to be able to use included gettext, which then 
provides a libintl.h simlink in intl.  Note this deliberately
uses relative paths, and not, eg, -I$(top_srcdir)/intl, because
if compiling in a dir other than the source dir, gettext puts
the symlink in the build area, pointing to the source area.

server/Makefile.am:
  Added @INTLDEPS@ to civserver_DEPENDENCIES
  Added @INTLLIBS@ to civserver_LDADD;
Following gettext manual, I put freeciv common and ai libraries 
in LDADD twice, once before @INTLLIBS@ and once after... but I'm
not sure about this.

client/Makefile.am: similarly to server/Makefile.am above.

civclient.c, civserver.c:
Added:
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
(The internal libintl.h includes this by my system one doesn't.)
(Or this could instead go in fcintl.h ?)

To enable/disable i18n code, use '#ifdef ENABLE_NLS' instead of
'#ifdef HAVE_GETTEXT'.  The latter is whether the system C library
has a gettext function, but we can do without it (and even if it does
we might turn off NLS in configure).

fcintl.h: similarly use '#ifdef ENABLE_NLS' instead of 
'#ifdef HAVE_GETTEXT'.

configure.in: (compared to earlier patch)
Moved AM_GNU_GETTEXT lower, because my autoconf complained about
order of AC_PROG_CC and AC_PROG_CPP.  Deleted
- AC_CHECK_FUNC(gettext,
-        AC_CHECK_LIB(intl,gettext)
- )
because it don't think its necessary and it may hurt? 
(eg, it doesn't define HAVE_GETTEXT on succes of first check.)

Added to AC_OUTPUT:
+         intl/Makefile
+         po/Makefile.in

Want POTFILES.in, not just POTFILES.

Added po/ChangeLog to satisfy 'make dist'.

With this patch I can now get a server starting up with a Spanish 
or French intro message, depending on env var LANG, using either 
system or included gettext.  :-)

(After applying the patch, need to run eg 
'aclocal; automake; autoconf; autoheader'; then configure)

The next question is which autogen files we should keep in 
CVS or not...

Regards,
-- David

--_----------=_93287598192840
Content-Disposition: inline; filename="i18n2_d3.diff.gz"
Content-Type: application/x-gzip; name="i18n2_d3.diff.gz"
Content-Transfer-Encoding: base64

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
ic39DyawAu5ZNwAA

--_----------=_93287598192840--