[svn-commits] kmoore: trunk r330435 - in /trunk: ./ main/say.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Mon Aug  1 10:24:21 2011
New Revision: 330435

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=330435
Log:
Merged revisions 330434 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330434 | kmoore | 2011-08-01 10:23:29 -0500 (Mon, 01 Aug 2011) | 16 lines
  
  Merged revisions 330433 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330433 | kmoore | 2011-08-01 10:22:10 -0500 (Mon, 01 Aug 2011) | 9 lines
    
    Incorrect playback for Spanish in some circumstances
    
    When you say the time in spanish and it is 01:00 - 01:59 or 13:00 - 13:59 you
    must use female pronunciation "1F". The function "say_date_with_format_es" does
    not take this in account.
    
    (closes ASTERISK-15016)
    Patch-by: Luis Jimenez
  ........
................

Modified:
    trunk/   (props changed)
    trunk/main/say.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/main/say.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/say.c?view=diff&rev=330435&r1=330434&r2=330435
==============================================================================
--- trunk/main/say.c (original)
+++ trunk/main/say.c Mon Aug  1 10:24:21 2011
@@ -4725,6 +4725,8 @@
 				/* 12-Hour */
 				if (tm.tm_hour == 0)
 					ast_copy_string(nextmsg, "digits/12", sizeof(nextmsg));
+				else if (tm.tm_hour == 1 || tm.tm_hour == 13)
+					snprintf(nextmsg,sizeof(nextmsg), "digits/1F");
 				else if (tm.tm_hour > 12)
 					snprintf(nextmsg, sizeof(nextmsg), "digits/%d", tm.tm_hour - 12);
 				else