From: Bruno Haible <bruno@clisp.org>
Date: Thu, 17 Aug 2006 11:52:36 +0000 (+0000)
Subject: Hungarian has two plural forms.
X-Git-Tag: 0.16.x-branchpoint~199
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a4c8fe0bc1c516a8369e1d354b0b17e10e78e15;p=thirdparty%2Fgettext.git

Hungarian has two plural forms.
---

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index 17aa8dce5..e40624c33 100644
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-16  Bruno Haible  <bruno@clisp.org>
+
+	* gettext.texi (Plural Forms): Put Hungarian under nplurals=2, and
+	explain why.
+	Reported by Arpad Biro <biro_arpad@yahoo.com> and
+	Gabor Kelemen <kelemeng@gnome.hu>.
+
 2006-08-16  Bruno Haible  <bruno@clisp.org>
 
 	* gettext.texi (Plural Forms): Mention the use of ngettext without
diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index cf7bec1a1..f95e10be1 100644
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -5284,8 +5284,6 @@ Plural-Forms: nplurals=1; plural=0;
 Languages with this property include:
 
 @table @asis
-@item Finno-Ugric family
-Hungarian
 @item Asian family
 Japanese, Korean, Vietnamese
 @item Turkic/Altaic family
@@ -5321,6 +5319,21 @@ Italian, Portuguese, Spanish
 Esperanto
 @end table
 
+@noindent
+Another language using the same header entry is:
+
+@table @asis
+@item Finno-Ugric family
+Hungarian
+@end table
+
+Hungarian does not appear to have a plural if you look at sentences involving
+ordinal numbers.  For example, ``1 apple'' is ``1 alma'', and ``123 apples'' is
+``123 apples''.  But when the number is not explicit, the distinction between
+singular and plural exists: ``the apple'' is ``az alma'', and ``the apples'' is
+``az alm@'{a}k''.  Since @code{ngettext} has to support both types of sentences,
+it is classified here, under ``two forms''.
+
 @item Two forms, singular used for zero and one
 Exceptional case in the language family.  The header entry would be:
 
diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 410e97062..195b130a9 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-16  Bruno Haible  <bruno@clisp.org>
+
+	* plural-table.c (plural_table): Put Hungarian under nplurals=2.
+	Reported by Arpad Biro <biro_arpad@yahoo.com> and
+	Gabor Kelemen <kelemeng@gnome.hu>.
+
 2006-08-16  Bruno Haible  <bruno@clisp.org>
 
 	* read-mo.c: Include stdbool.h, stdlib.h, format.h.
diff --git a/gettext-tools/src/plural-table.c b/gettext-tools/src/plural-table.c
index 3724f37ea..c7839e05c 100644
--- a/gettext-tools/src/plural-table.c
+++ b/gettext-tools/src/plural-table.c
@@ -1,5 +1,5 @@
 /* Table of known plural form expressions.
-   Copyright (C) 2001-2005 Free Software Foundation, Inc.
+   Copyright (C) 2001-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
    This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,6 @@
 /* Formulas taken from the documentation, node "Plural forms".  */
 struct plural_table_entry plural_table[] =
   {
-    { "hu", "Hungarian",         "nplurals=1; plural=0;" },
     { "ja", "Japanese",          "nplurals=1; plural=0;" },
     { "ko", "Korean",            "nplurals=1; plural=0;" },
     { "vi", "Vietnamese",        "nplurals=1; plural=0;" },
@@ -48,6 +47,7 @@ struct plural_table_entry plural_table[] =
     { "pt", "Portuguese",        "nplurals=2; plural=(n != 1);" },
     { "es", "Spanish",           "nplurals=2; plural=(n != 1);" },
     { "eo", "Esperanto",         "nplurals=2; plural=(n != 1);" },
+    { "hu", "Hungarian",         "nplurals=2; plural=(n != 1);" },
     { "fr", "French",            "nplurals=2; plural=(n > 1);" },
     { "pt_BR", "Brazilian",      "nplurals=2; plural=(n > 1);" },
     { "lv", "Latvian",           "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);" },
diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 69e4e468a..fc9719289 100644
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-16  Bruno Haible  <bruno@clisp.org>
+
+	* plural-2: Use Japanese, not Hungarian, as a test case for nplurals=1.
+
 2006-08-16  Bruno Haible  <bruno@clisp.org>
 
 	* msgunfmt-2: New file.
diff --git a/gettext-tools/tests/plural-2 b/gettext-tools/tests/plural-2
index e3c624fe7..dff148b59 100755
--- a/gettext-tools/tests/plural-2
+++ b/gettext-tools/tests/plural-2
@@ -10,7 +10,7 @@ test -d ll/LC_MESSAGES || mkdir ll/LC_MESSAGES
 
 tmpfiles="$tmpfiles plural-2.data"
 cat <<EOF > plural-2.data
-hu
+ja
 0
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 de