fix saying the date in spanish (bug #3642)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@5285 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/CHANGES b/CHANGES
index 8ec3e0e012cb445bd9a81406a551c2ec99ca6f5e..d6579502c6e2bfd5bc880a7c19ee78a079e6d29f 100755 (executable)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,13 @@
        is available through the Asterisk-CVS mailing list hosted
        at http://lists.digium.com.
 
+ -- chan_zap
+    -- Asterisk will now also look in the regular context for the fax extension while
+       executing a macro.  Previously, for this to work, the fax extension would have
+       to be included in the macro definition.
+ -- general
+    -- A problem has been fixed with saying the date in Spanish.
+
 Asterisk 1.0.7
 
  -- chan_sip

diff --git a/say.c b/say.c
index 480b08e8ed59920c4b5660eb616184ae8a9a515a..ba3dd52cf81c66f938b803a6757f6d4808bcae53 100755 (executable)
--- a/say.c
+++ b/say.c
@@ -2976,20 +2976,7 @@ int ast_say_date_with_format_pt(struct ast_channel *chan, time_t time, char *int
                        case 'H':
                        case 'k':
                                /* 24-Hour */
-                               res = ast_say_number(chan, -tm.tm_hour, ints, lang, NULL);
-                               if (!res) {
-                                       if (tm.tm_hour != 0) {
-                                               int remainder = tm.tm_hour;
-                                               if (tm.tm_hour > 20) {
-                                                       res = wait_file(chan,ints, "digits/20",lang);
-                                                       remainder -= 20;
-                                               }
-                                               if (!res) {
-                                                       snprintf(nextmsg,sizeof(nextmsg), "digits/%d", remainder);
-                                                       res = wait_file(chan,ints,nextmsg,lang);
-                                               }
-                                       }
-                               }
+                               res = ast_say_number(chan, tm.tm_hour, ints, lang, NULL);
                                break;
                        case 'M':
                                /* Minute */