Fix saying of date in Dutch.
authorMark Michelson <mmichelson@digium.com>
Tue, 25 Sep 2012 23:10:22 +0000 (23:10 +0000)
committerMark Michelson <mmichelson@digium.com>
Tue, 25 Sep 2012 23:10:22 +0000 (23:10 +0000)
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
........

Merged revisions 373775 from http://svn.asterisk.org/svn/asterisk/branches/11

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

main/say.c

index d8122e3..295d411 100644 (file)
@@ -5300,7 +5300,7 @@ int ast_say_date_with_format_nl(struct ast_channel *chan, time_t t, const char *
        char sndfile[256], nextmsg[256];
 
        if (format == NULL)
        char sndfile[256], nextmsg[256];
 
        if (format == NULL)
-               format = "ABdY 'digits/at' IMp";
+               format = "AdBY 'digits/at' IMp";
 
        ast_localtime(&when, &tm, tzone);
 
 
        ast_localtime(&when, &tm, tzone);
 
@@ -5422,7 +5422,7 @@ int ast_say_date_with_format_nl(struct ast_channel *chan, time_t t, const char *
                                res = wait_file(chan, ints, nextmsg, lang);
                                break;
                        case 'Q':
                                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 */
                                /* 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 @@ int ast_say_date_with_format_nl(struct ast_channel *chan, time_t t, const char *
                                                /* Yesterday */
                                                res = wait_file(chan, ints, "digits/yesterday", lang);
                                        } else {
                                                /* 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':
                                        }
                                }
                                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;
                                {
                                        struct timeval now = ast_tvnow();
                                        struct ast_tm tmnow;
@@ -5466,7 +5466,7 @@ int ast_say_date_with_format_nl(struct ast_channel *chan, time_t t, const char *
                                                /* Within the last week */
                                                res = ast_say_date_with_format_nl(chan, t, ints, lang, "A", tzone);
                                        } else {
                                                /* 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;
                                        }
                                }
                                break;