Merged revisions 204475 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r204475 | qwell | 2009-06-30 13:48:35 -0500 (Tue, 30 Jun 2009) | 9 lines

  Merged revisions 204474 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r204474 | qwell | 2009-06-30 13:47:06 -0500 (Tue, 30 Jun 2009) | 1 line

    Fix ast_say_counted_noun to correctly handle Polish.  Fix a comment typo in passing.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@204477 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/say.c b/main/say.c
index ecde090c548b79d8ac7e70ec5ae9446e28dccf58..a9aee665210925ec22bbb7909a3bb79cd8b28c74 100644 (file)
--- a/main/say.c
+++ b/main/say.c
@@ -7786,7 +7786,7 @@ static const char *counted_noun_ending_slavic(int num)
        if (num == 1) {                 /* singular */
            return "";
        }
-       if (num > 0 && num < 5) {       /* 2--5 get genative singular */
+       if (num > 0 && num < 5) {       /* 2--4 get genative singular */
            return "x1";
        } else {                        /* 5--19 get genative plural */
            return "x2";
@@ -7802,7 +7802,7 @@ int ast_say_counted_noun(struct ast_channel *chan, int num, const char noun[])
                ending = counted_noun_ending_slavic(num);
        } else if(!strcasecmp(chan->language, "ua")) {          /* Ukrainian */
                ending = counted_noun_ending_slavic(num);
-       } else if(!strcasecmp(chan->language, "ua")) {          /* Polish */
+       } else if(!strcasecmp(chan->language, "pl")) {          /* Polish */
                ending = counted_noun_ending_slavic(num);
        } else {                                                /* English and default */
                ending = counted_noun_ending_en(num);