Fix the Slovak plural formula.

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index d38b7a133d82057e086ed6f041a94550b2fc6c46..2dd0d56108ddc6fafb07456dfe803a96479b6527 100644 (file)
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-27  Bruno Haible  <bruno@clisp.org>
+
+       * gettext.texi (Plural forms): Correct formula for Slovak.
+       Reported by Marcel Telka <marcel@telka.sk>.
+
 2003-05-24  Bruno Haible  <bruno@clisp.org>
 
        * gettext.texi (Glade): Mention support og Glade 2.

diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index 68ca8888c43612143b2357c8deb942b963fb5d4b..fc6b4554fef91ace7b4465216ed107806c979c2b 100644 (file)
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -4924,7 +4924,23 @@ Languages with this property include:
 
 @table @asis
 @item Slavic family
-Croatian, Czech, Russian, Slovak, Ukrainian
+Croatian, Czech, Russian, Ukrainian
+@end table
+
+@item Three forms, special cases for 1 and 2, 3, 4
+The header entry would look like this:
+
+@smallexample
+Plural-Forms: nplurals=3; \
+    plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;
+@end smallexample
+
+@noindent
+Languages with this property include:
+
+@table @asis
+@item Slavic family
+Slovak
 @end table
 
 @item Three forms, special case for one and some numbers ending in 2, 3, or 4

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index e4e9ec64ff7befd065f25eb70531efcccc056565..05353b161113705427acf624d1a34948ff4fd39d 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-27  Bruno Haible  <bruno@clisp.org>
+
+       * plural-table.c (plural_table): Correct entry for Slovak.
+       Reported by Marcel Telka <marcel@telka.sk>.
+
 2003-05-24  Bruno Haible  <bruno@clisp.org>
 
        * x-glade.h (EXTENSIONS_GLADE): Also recognize the .glade2 extension.

diff --git a/gettext-tools/src/plural-table.c b/gettext-tools/src/plural-table.c
index 0bf3b101683dd2a7026aa69569dbc26359ad0b8d..ea0137715d3e45b5292e5dded9b7577cb1f3f651 100644 (file)
--- a/gettext-tools/src/plural-table.c
+++ b/gettext-tools/src/plural-table.c
@@ -55,8 +55,8 @@ struct plural_table_entry plural_table[] =
     { "hr", "Croatian",          "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" },
     { "cs", "Czech",             "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" },
     { "ru", "Russian",           "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" },
-    { "sk", "Slovak",            "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" },
     { "uk", "Ukrainian",         "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" },
+    { "sk", "Slovak",            "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" },
     { "pl", "Polish",            "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" },
     { "sl", "Slovenian",         "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);" }
   };

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 77aaed607d06798b0240fb9da128bb40d0f8fd50..f44adac1d658beeb0734aff68100dd7430965ec0 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-27  Bruno Haible  <bruno@clisp.org>
+
+       * plural-2: Add test for Slovak plural formula.
+
 2003-05-24  Bruno Haible  <bruno@clisp.org>
 
        * xgettext-25: New file.

diff --git a/gettext-tools/tests/plural-2 b/gettext-tools/tests/plural-2
index 7f8f4fdf1cfc53214cc7c5ad6ba72dc694a8a99c..c36265be438c18b1d0bcef06462bf01f1bfdba4d 100755 (executable)
--- a/gettext-tools/tests/plural-2
+++ b/gettext-tools/tests/plural-2
@@ -31,6 +31,9 @@ n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2
 ru-glibc
 n%100/10==1 ? 2 : n%10==1 ? 0 : (n+9)%10>3 ? 2 : 1
 20111222222222222222201112222220111222222011122222201112222220111222222011122222201112222220111222222011122222222222222220111222222011122222201112222220111222222011122222201112222220111222222011122222
+sk
+(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2
+20111222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222
 pl
 n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2
 20111222222222222222221112222222111222222211122222221112222222111222222211122222221112222222111222222211122222222222222222111222222211122222221112222222111222222211122222221112222222111222222211122222