Merged revisions 85686 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Mon, 15 Oct 2007 21:01:00 +0000 (21:01 +0000)
committerRussell Bryant <russell@russellbryant.com>
Mon, 15 Oct 2007 21:01:00 +0000 (21:01 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r85686 | russell | 2007-10-15 15:21:27 -0500 (Mon, 15 Oct 2007) | 7 lines

Add a small fix for the tw version of saying dates.

(closes issue #7827)
Reported by: sharkey
Patches:
      say.nits.patch uploaded by sharkey (license 172)

........

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

main/say.c

index da0adaf..f0e30cd 100644 (file)
@@ -5623,15 +5623,11 @@ int ast_say_date_with_format_tw(struct ast_channel *chan, time_t time, const cha
                        case 'B':
                        case 'b':
                        case 'h':
+                       case 'm':
                                /* January - December */
                                snprintf(nextmsg,sizeof(nextmsg), "digits/mon-%d", tm.tm_mon);
                                res = wait_file(chan,ints,nextmsg,lang);
                                break;
-                       case 'm':
-                               /* First - Twelfth */
-                               snprintf(nextmsg,sizeof(nextmsg), "digits/h-%d", tm.tm_mon +1);
-                               res = wait_file(chan,ints,nextmsg,lang);
-                               break;
                        case 'd':
                        case 'e':
                                /* First - Thirtyfirst */
@@ -5646,7 +5642,7 @@ int ast_say_date_with_format_tw(struct ast_channel *chan, time_t time, const cha
                                                res = wait_file(chan,ints,nextmsg,lang);
                                        }
                                }
-                if(!res) res = wait_file(chan,ints,"ri",lang);
+                               if(!res) res = wait_file(chan,ints,"digits/day",lang);
                                break;
                        case 'Y':
                                /* Year */