From: InterLinked1 <24227567+InterLinked1@users.noreply.github.com>
Date: Tue, 2 May 2023 14:09:42 +0000 (-0500)
Subject: say.c: Fix French time playback. (#42)
X-Git-Tag: 21.0.0-pre1~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffb90c454929fe6a4939a623506a120181af9d29;p=thirdparty%2Fasterisk.git

say.c: Fix French time playback. (#42)

ast_waitstream was not called after ast_streamfile,
resulting in "o'clock" being skipped in French.

Additionally, the minute announcements should be
feminine.

Reported-by: Danny Lloyd

Resolves: #41
ASTERISK-30488
---

diff --git a/main/say.c b/main/say.c
index 14e43dfff5..300581afb7 100644
--- a/main/say.c
+++ b/main/say.c
@@ -7339,11 +7339,16 @@ int ast_say_time_fr(struct ast_channel *chan, time_t t, const char *ints, const
 	ast_localtime(&when, &tm, NULL);
 
 	res = ast_say_number(chan, tm.tm_hour, ints, lang, "f");
-	if (!res)
+	if (!res) {
 		res = ast_streamfile(chan, "digits/oclock", lang);
+	}
+	if (!res) {
+		res = ast_waitstream(chan, ints);
+	}
 	if (tm.tm_min) {
-		if (!res)
-		res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
+		if (!res) {
+			res = ast_say_number(chan, tm.tm_min, ints, lang, "f");
+		}
 	}
 	return res;
 }