[Freeswitch-svn] [commit] r8678 - freeswitch/trunk/src/mod/say/mod_say_de

[Freeswitch SVN]

Author: mikej
Date: Mon May 26 20:36:09 2008
New Revision: 8678

Modified:
   freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.c

Log:
Corrected cardinal and ordinal number reading in German (MODAPP-97)

Modified: freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.c
==============================================================================
--- freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.c	(original)
+++ freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.c	Mon May 26 20:36:09 2008
@@ -39,6 +39,7 @@
  * 
  * Anthony Minessale II <anthmct at yahoo.com>
  * Michael B. Murdock <mike at mmurdock.org>
+ * Daniel Swarbrick <daniel.swarbrick at gmail.com>
  *
  * mod_say_de.c -- Say for German
  *
@@ -101,11 +102,21 @@
 
 	if (b) {
 		if (b > 1) {
-			say_file("digits/%d0.wav", b);
+			say_file("digits/%d.wav", c);
+			say_file("currency/and.wav");
+			if (method == SSM_COUNTED) {
+				say_file("digits/h-%d0.wav", b);
+			} else {
+				say_file("digits/%d0.wav", b);
+			}
 		} else {
-			say_file("digits/%d%d.wav", b, c);
-			c = 0;
+			if (method == SSM_COUNTED) {
+				say_file("digits/h-%d%d.wav", b, c);
+			} else {
+				say_file("digits/%d%d.wav", b, c);
+			}
 		}
+		c = 0;
 	}
 
 	if (c) {
@@ -395,14 +406,13 @@
 		}
 
 		say_num(hour, SSM_PRONOUNCED);
+		say_file("time/oclock.wav");
 
 		if (tm.tm_min > 9) {
 			say_num(tm.tm_min, SSM_PRONOUNCED);
 		} else if (tm.tm_min) {
 			say_file("time/oh.wav");
 			say_num(tm.tm_min, SSM_PRONOUNCED);
-		} else {
-			say_file("time/oclock.wav");
 		}
 
 		say_file("time/%s.wav", pm ? "p-m" : "a-m");