[Asterisk-cvs] asterisk ChangeLog,1.58,1.59 say.c,1.73,1.74

[kpfleming]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv14890

Modified Files:
	ChangeLog say.c 
Log Message:
issue #5576


Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- ChangeLog	8 Nov 2005 02:11:42 -0000	1.58
+++ ChangeLog	8 Nov 2005 02:14:42 -0000	1.59
@@ -1,5 +1,7 @@
 2005-11-07  Kevin P. Fleming  <kpfleming at 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)

Index: say.c
===================================================================
RCS file: /usr/cvsroot/asterisk/say.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- say.c	26 Oct 2005 23:11:36 -0000	1.73
+++ say.c	8 Nov 2005 02:14:42 -0000	1.74
@@ -3286,12 +3286,14 @@
 				}
 				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 */