diff options
| -rwxr-xr-x | say.c | 32 |
1 files changed, 2 insertions, 30 deletions
@@ -3105,22 +3105,8 @@ int ast_say_date_with_format_en(struct ast_channel *chan, time_t time, const cha snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_min); res = wait_file(chan,ints,nextmsg,lang); } - } else if ((tm.tm_min < 21) || (tm.tm_min % 10 == 0)) { - snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_min); - res = wait_file(chan,ints,nextmsg,lang); } else { - int ten, one; - ten = (tm.tm_min / 10) * 10; - one = (tm.tm_min % 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_min, ints, lang, (char *) NULL); } break; case 'P': @@ -3194,22 +3180,8 @@ int ast_say_date_with_format_en(struct ast_channel *chan, time_t time, const cha 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': |