mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 20:20:07 +00:00
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 ........ 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
This commit is contained in:
10
main/say.c
10
main/say.c
@@ -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];
|
char sndfile[256], nextmsg[256];
|
||||||
|
|
||||||
if (format == NULL)
|
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);
|
res = wait_file(chan, ints, nextmsg, lang);
|
||||||
break;
|
break;
|
||||||
case 'Q':
|
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
|
/* XXX As emphasized elsewhere, this should the native way in your
|
||||||
* language to say the date, with changes in what you say, depending
|
* language to say the date, with changes in what you say, depending
|
||||||
* upon how recent the date is. XXX */
|
* 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 */
|
/* Yesterday */
|
||||||
res = wait_file(chan, ints, "digits/yesterday", lang);
|
res = wait_file(chan, ints, "digits/yesterday", lang);
|
||||||
} else {
|
} 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;
|
||||||
case 'q':
|
case 'q':
|
||||||
/* Shorthand for "" (today), "Yesterday", A (weekday), or ABdY */
|
/* Shorthand for "" (today), "Yesterday", A (weekday), or AdBY */
|
||||||
{
|
{
|
||||||
struct timeval now = ast_tvnow();
|
struct timeval now = ast_tvnow();
|
||||||
struct ast_tm tmnow;
|
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 */
|
/* Within the last week */
|
||||||
res = ast_say_date_with_format_nl(chan, t, ints, lang, "A", tzone);
|
res = ast_say_date_with_format_nl(chan, t, ints, lang, "A", tzone);
|
||||||
} else {
|
} 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;
|
||||||
|
Reference in New Issue
Block a user