diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-25 14:49:20 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-25 14:49:20 +0000 |
| commit | f9a1ce20ef76fc5e7c8f015b0d7cf04551ef191e (patch) | |
| tree | acb72f38ee36e873e8b88ffac4d2f0414524e851 /main/say.c | |
| parent | f554d266c751f70183d42f1cee5e28608fa3a436 (diff) | |
Merged revisions 66159 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r66159 | tilghman | 2007-05-25 09:41:27 -0500 (Fri, 25 May 2007) | 10 lines
Merged revisions 66127 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r66127 | tilghman | 2007-05-25 08:46:35 -0500 (Fri, 25 May 2007) | 2 lines
Issue 9791 - Fix pronunciation of seconds in Dutch
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@66161 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/say.c')
| -rw-r--r-- | main/say.c | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/main/say.c b/main/say.c index c15f8f198..582ffb2ec 100644 --- a/main/say.c +++ b/main/say.c @@ -4779,32 +4779,7 @@ int ast_say_date_with_format_nl(struct ast_channel *chan, time_t time, const cha break; case 'S': /* Seconds */ - if (tm.tm_sec == 0) { - snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_sec); - res = wait_file(chan,ints,nextmsg,lang); - } else if (tm.tm_sec < 10) { - res = wait_file(chan,ints, "digits/oh",lang); - if (!res) { - snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_sec); - res = wait_file(chan,ints,nextmsg,lang); - } - } else if ((tm.tm_sec < 21) || (tm.tm_sec % 10 == 0)) { - snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_sec); - res = wait_file(chan,ints,nextmsg,lang); - } else { - int ten, one; - ten = (tm.tm_sec / 10) * 10; - one = (tm.tm_sec % 10); - snprintf(nextmsg,sizeof(nextmsg), "digits/%d", ten); - res = wait_file(chan,ints,nextmsg,lang); - if (!res) { - /* Fifty, not fifty-zero */ - if (one != 0) { - snprintf(nextmsg,sizeof(nextmsg), "digits/%d", one); - res = wait_file(chan,ints,nextmsg,lang); - } - } - } + res = ast_say_number(chan, tm.tm_sec, ints, lang, (char *) NULL); break; case 'T': res = ast_say_date_with_format_nl(chan, time, ints, lang, "HMS", timezone); |