say minutes/seconds using existing 'say number' code for Danish (issue #5277)
authorKevin P. Fleming <kpfleming@digium.com>
Tue, 27 Sep 2005 02:25:12 +0000 (02:25 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Tue, 27 Sep 2005 02:25:12 +0000 (02:25 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6673 65c4cc65-6c06-0410-ace0-fbb531ad65f3

say.c

diff --git a/say.c b/say.c
index 445fcd1..87ea86a 100755 (executable)
--- a/say.c
+++ b/say.c
@@ -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':