From: Jason Parker <jparker@digium.com>
Date: Tue, 30 Jun 2009 18:52:44 +0000 (+0000)
Subject: Merged revisions 204475 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8c7e688ffa2c68afd19e924da270bd1b9bb7bfb;p=thirdparty%2Fasterisk.git

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 ecde090c54..a9aee66521 100644
--- 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);