issue #5576

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

diff --git a/ChangeLog b/ChangeLog
index 30cc205..39f4f53 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-11-07  Kevin P. Fleming  <kpfleming@digium.com>
 
+       * say.c (ast_say_date_with_format_da): say hours properly (issue #5576)
+
        * manager.c (astman_get_variables): restore old multiple-variable behavior for "Variable" header (issue #5585)
 
        * many files: don't check for NULL before calling ast_strlen_zero, it can do it itself (issue #5648)

diff --git a/say.c b/say.c
index 2a6c63d..720d086 100755 (executable)
--- a/say.c
+++ b/say.c
@@ -3286,12 +3286,14 @@ int ast_say_date_with_format_da(struct ast_channel *chan, time_t time, const cha
                                }
                                break;
                        case 'H':
+                               /* 24-Hour, single digit hours preceeded by "oh" (0) */
+                               if (tm.tm_hour < 10 && tm.tm_hour > 0) {
+                                       res = wait_file(chan,ints, "digits/0",lang);
+                               }
+                               /* FALLTRHU */
                        case 'k':
                                /* 24-Hour */
-                               res = wait_file(chan,ints,"digits/oclock",lang);
-                               if (!res) {
-                                       res = ast_say_number(chan, tm.tm_hour, ints, lang, (char *) NULL);      
-                               }
+                               res = ast_say_number(chan, tm.tm_hour, ints, lang, (char *) NULL);      
                                break;
                        case 'M':
                                /* Minute */