Add support for ngettext, added in PHP 4.2.0.

diff --git a/NEWS b/NEWS
index ee984e3aeb025f2bd1be28f524854b76171d9d34..c365d815d24e6e4b0a8999ad69db58190bcc0be2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,30 @@
 Version 0.12.2 - XXX 2003
 
+* Programming languages support:
+
+  - Perl:
+    xgettext now also supports Perl.
+
+  - PHP:
+    "xgettext --language=PHP" now supports the plural handling functions
+    ngettext, dngettext, dcngettext (introduced in PHP 4.2.0).
+
 * Data formats support:
 
   - Glade:
     xgettext now also supports Glade version 2.
+
+* Portability:
+
+  - C format strings with positions, as they arise when a translator needs to
+    reorder a sentence, are now supported on all platforms. On those few
+    platforms (NetBSD and Woe32) for which the native printf()/fprintf()/...
+    functions don't support such format strings, replacements are provided
+    through <libintl.h>.
+
+  - A new configuration option --disable-libasprintf allows to build all of
+    gettext except libasprintf; this is necessary on platforms for which
+    libtool cannot create shared libraries with C++ code.
 \f
 Version 0.12.1 - May 2003
 
@@ -303,7 +324,7 @@ Version 0.10.35 - April 1998, by Ulrich Drepper
 
 * reasonable header entry format implemented
 
-* Norwegian translation by Karl Anders Øygard
+* Norwegian translation by Karl Anders �gard
 
 * Configure command line option `--with-gnu-gettext' is renamed to
   `--with-included-gettext'

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 8a4e029d3823dbd0fbcfdb044e2490138d7d8913..398506dd3e1df37256d42511ef40a7a5a2a9c558 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-03  Bruno Haible  <bruno@clisp.org>
+
+       Support for PHP >= 4.2.0.
+       * x-php.c (init_keywords): Add ngettext, dngettext, dcngettext to the
+       built-in keywords.
+       Reported by A. Sopicki <a.sopicki@gmx.de>.
+
 2003-06-27  Bruno Haible  <bruno@clisp.org>
 
        * xgettext.h (from_current_source_encoding): New declaraction.

diff --git a/gettext-tools/src/x-php.c b/gettext-tools/src/x-php.c
index 338ff6291c7c228c6f3c5b18d2db00d689b424dd..b589fcf9257ef7974de4fbb55906e3aff750249d 100644 (file)
--- a/gettext-tools/src/x-php.c
+++ b/gettext-tools/src/x-php.c
@@ -98,6 +98,10 @@ init_keywords ()
       x_php_keyword ("gettext");
       x_php_keyword ("dgettext:2");
       x_php_keyword ("dcgettext:2");
+      /* The following were added in PHP 4.2.0.  */
+      x_php_keyword ("ngettext:1,2");
+      x_php_keyword ("dngettext:2,3");
+      x_php_keyword ("dcngettext:2,3");
       default_keywords = false;
     }
 }