[svn-commits] qwell: branch 1.6.0 r204476 - in /branches/1.6.0: ./ main/say.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Tue Jun 30 13:50:50 2009
New Revision: 204476

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=204476
Log:
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.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/say.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/say.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/main/say.c?view=diff&rev=204476&r1=204475&r2=204476
==============================================================================
--- branches/1.6.0/main/say.c (original)
+++ branches/1.6.0/main/say.c Tue Jun 30 13:50:50 2009
@@ -7786,7 +7786,7 @@
 	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 @@
 		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);