Adjust ngettext default.

diff --git a/ChangeLog b/ChangeLog
index 4128b0476511bba35ef2110708a0d260c2a6ce6c..28b834123c2aaad872874a39682a11a976cf0547 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,8 @@
 
        * config/config.guess, config/config.sub, po/*.po: Update.
        * src/system.h (ngettext): Now that we use ngettext, be sure to
 
        * config/config.guess, config/config.sub, po/*.po: Update.
        * src/system.h (ngettext): Now that we use ngettext, be sure to

-       provide a default definition when NLS are not used.
+       provide a default definition when NLS are not used that takes care
+       of the cardinality.

 
 2001-11-12  Akim Demaille  <akim@epita.fr>
 
 
 2001-11-12  Akim Demaille  <akim@epita.fr>
 

diff --git a/src/system.h b/src/system.h
index bad5b7704bf1b37c5cdac2e19ca015b716c654d4..a0b46eee3460882003d18a77b13c5c8f23b6d46d 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -131,7 +131,8 @@ size_t strnlen PARAMS ((const char *s, size_t maxlen));
 # undef  textdomain
 # define textdomain(Domain)
 # undef  ngettext
 # undef  textdomain
 # define textdomain(Domain)
 # undef  ngettext

-# define ngettext(Singular, Plural, Num)   Plural
+# define ngettext(Singular, Plural, Number)   \
+         ((Number == 1) ? Singular : Plural)

 # define _(Text) Text
 #endif
 #define N_(Text) Text
 # define _(Text) Text
 #endif
 #define N_(Text) Text