[asterisk-commits] mmichelson: branch 11 r373775 - in /branches/11: ./ main/say.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Sep 25 18:09:40 2012
New Revision: 373775

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=373775
Log:
Fix saying of date in Dutch.

The Dutch say the date before the month.

(closes issue ASTERISK-20353)
Reported by: Teun Ouwehand
........

Merged revisions 373773 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 373774 from http://svn.asterisk.org/svn/asterisk/branches/10

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

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

Modified: branches/11/main/say.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/say.c?view=diff&rev=373775&r1=373774&r2=373775
==============================================================================
--- branches/11/main/say.c (original)
+++ branches/11/main/say.c Tue Sep 25 18:09:40 2012
@@ -5300,7 +5300,7 @@
 	char sndfile[256], nextmsg[256];
 
 	if (format == NULL)
-		format = "ABdY 'digits/at' IMp";
+		format = "AdBY 'digits/at' IMp";
 
 	ast_localtime(&when, &tm, tzone);
 
@@ -5422,7 +5422,7 @@
 				res = wait_file(chan, ints, nextmsg, lang);
 				break;
 			case 'Q':
-				/* Shorthand for "Today", "Yesterday", or ABdY */
+				/* Shorthand for "Today", "Yesterday", or AdBY */
 				/* XXX As emphasized elsewhere, this should the native way in your
 				 * language to say the date, with changes in what you say, depending
 				 * upon how recent the date is. XXX */
@@ -5442,12 +5442,12 @@
 						/* Yesterday */
 						res = wait_file(chan, ints, "digits/yesterday", lang);
 					} else {
-						res = ast_say_date_with_format_nl(chan, t, ints, lang, "ABdY", tzone);
+						res = ast_say_date_with_format_nl(chan, t, ints, lang, "AdBY", tzone);
 					}
 				}
 				break;
 			case 'q':
-				/* Shorthand for "" (today), "Yesterday", A (weekday), or ABdY */
+				/* Shorthand for "" (today), "Yesterday", A (weekday), or AdBY */
 				{
 					struct timeval now = ast_tvnow();
 					struct ast_tm tmnow;
@@ -5466,7 +5466,7 @@
 						/* Within the last week */
 						res = ast_say_date_with_format_nl(chan, t, ints, lang, "A", tzone);
 					} else {
-						res = ast_say_date_with_format_nl(chan, t, ints, lang, "ABdY", tzone);
+						res = ast_say_date_with_format_nl(chan, t, ints, lang, "AdBY", tzone);
 					}
 				}
 				break;