From 19b080b54749a9c89003bc749de36e77fdaa9cc1 Mon Sep 17 00:00:00 2001 From: Rusty Newton Date: Fri, 14 Jul 2017 13:47:50 -0500 Subject: [PATCH] say.c: Fix file locations for second, seconds, minute, minutes files The seconds and minutes files have always existed in the base language directory of the Core package. So say.c has always been calling the wrong location (under digits/) for those two files and in the case of second and minute they didn't exist in the Core packages at all. The 1.6 sounds release moves the second and minute files into Core from Extra for the languages that already had them. A future release will include the second and minute files for languages that didn't already have them. This patch just changes all the target locations for second, seconds, minute, and minutes that were under the digits subdir to be under the root of sounds instead. Which is where the sounds will be for some languages after 1.6 sounds and for all languages after a future release. ASTERISK-25810 #close Change-Id: I05d9d4bee6a7237030530a46e7eb3df15f13f702 Reported-by: Nicolas Riendeau --- main/say.c | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/main/say.c b/main/say.c index 44f55e25ae..c97dc9fd8a 100644 --- a/main/say.c +++ b/main/say.c @@ -4441,9 +4441,9 @@ int ast_say_date_with_format_da(struct ast_channel *chan, time_t t, const char * } if (!res && next_item(&format[offset + 1]) == 'S') { /* minutes only if seconds follow */ if (tm.tm_min == 1) { - res = wait_file(chan, ints, "digits/minute", lang); + res = wait_file(chan, ints, "minute", lang); } else { - res = wait_file(chan, ints, "digits/minutes", lang); + res = wait_file(chan, ints, "minutes", lang); } } break; @@ -4517,7 +4517,7 @@ int ast_say_date_with_format_da(struct ast_channel *chan, time_t t, const char * if (!res) { res = ast_say_number(chan, tm.tm_sec, ints, lang, "f"); if (!res) { - res = wait_file(chan, ints, "digits/seconds", lang); + res = wait_file(chan, ints, "seconds", lang); } } break; @@ -4637,16 +4637,16 @@ int ast_say_date_with_format_de(struct ast_channel *chan, time_t t, const char * case 'M': /* Minute */ if (next_item(&format[offset + 1]) == 'S') { /* zero 'digits/0' only if seconds follow */ - res = ast_say_number(chan, tm.tm_min, ints, lang, "f"); /* female only if we say digits/minutes */ + res = ast_say_number(chan, tm.tm_min, ints, lang, "f"); /* female only if we say minutes */ } else if (tm.tm_min > 0) { res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL); } if (!res && next_item(&format[offset + 1]) == 'S') { /* minutes only if seconds follow */ if (tm.tm_min == 1) { - res = wait_file(chan, ints, "digits/minute", lang); + res = wait_file(chan, ints, "minute", lang); } else { - res = wait_file(chan, ints, "digits/minutes", lang); + res = wait_file(chan, ints, "minutes", lang); } } break; @@ -4720,7 +4720,7 @@ int ast_say_date_with_format_de(struct ast_channel *chan, time_t t, const char * if (!res) { res = ast_say_number(chan, tm.tm_sec, ints, lang, "f"); if (!res) { - res = wait_file(chan, ints, tm.tm_sec == 1 ? "digits/second" : "digits/seconds", lang); + res = wait_file(chan, ints, tm.tm_sec == 1 ? "second" : "seconds", lang); } } break; @@ -4853,9 +4853,9 @@ int ast_say_date_with_format_is(struct ast_channel *chan, time_t t, const char * if (!res && next_item(&format[offset + 1]) == 'S') { /* minutes only if seconds follow */ /* Say minute/minutes depending on whether minutes end in 1 */ if ((tm.tm_min % 10 == 1) && (tm.tm_min != 11)) { - res = wait_file(chan, ints, "digits/minute", lang); + res = wait_file(chan, ints, "minute", lang); } else { - res = wait_file(chan, ints, "digits/minutes", lang); + res = wait_file(chan, ints, "minutes", lang); } } break; @@ -4930,9 +4930,9 @@ int ast_say_date_with_format_is(struct ast_channel *chan, time_t t, const char * res = ast_say_number(chan, tm.tm_sec, ints, lang, "f"); /* Say minute/minutes depending on whether seconds end in 1 */ if (!res && (tm.tm_sec % 10 == 1) && (tm.tm_sec != 11)) { - res = wait_file(chan, ints, "digits/second", lang); + res = wait_file(chan, ints, "second", lang); } else { - res = wait_file(chan, ints, "digits/seconds", lang); + res = wait_file(chan, ints, "seconds", lang); } } break; @@ -5652,7 +5652,7 @@ int ast_say_date_with_format_fr(struct ast_channel *chan, time_t t, const char * /* Seconds */ res = ast_say_number(chan, tm.tm_sec, ints, lang, (char * ) NULL); if (!res) { - res = wait_file(chan, ints, "digits/second", lang); + res = wait_file(chan, ints, "second", lang); } break; case 'T': @@ -6303,9 +6303,9 @@ int ast_say_date_with_format_pl(struct ast_channel *chan, time_t thetime, const one = tm.tm_sec % 10; if (one > 1 && one < 5 && ten != 1) - res = wait_file(chan, ints, "digits/seconds", lang); + res = wait_file(chan, ints, "seconds", lang); else - res = wait_file(chan, ints, "digits/second", lang); + res = wait_file(chan, ints, "second", lang); } } } @@ -6469,9 +6469,9 @@ int ast_say_date_with_format_pt(struct ast_channel *chan, time_t t, const char * res = ast_say_number(chan, tm.tm_min, ints, lang, NULL); if (!res) { if (tm.tm_min > 1) { - res = wait_file(chan, ints, "digits/minutes", lang); + res = wait_file(chan, ints, "minutes", lang); } else { - res = wait_file(chan, ints, "digits/minute", lang); + res = wait_file(chan, ints, "minute", lang); } } } else { @@ -6567,9 +6567,9 @@ int ast_say_date_with_format_pt(struct ast_channel *chan, time_t t, const char * res = ast_say_number(chan, tm.tm_sec, ints, lang, NULL); if (!res) { if (tm.tm_sec > 1) { - res = wait_file(chan, ints, "digits/seconds", lang); + res = wait_file(chan, ints, "seconds", lang); } else { - res = wait_file(chan, ints, "digits/second", lang); + res = wait_file(chan, ints, "second", lang); } } } else { @@ -6783,7 +6783,7 @@ int ast_say_date_with_format_zh(struct ast_channel *chan, time_t t, const char * } } if (!res) { - res = wait_file(chan, ints, "digits/minute", lang); + res = wait_file(chan, ints, "minute", lang); } break; case 'P': @@ -6867,7 +6867,7 @@ int ast_say_date_with_format_zh(struct ast_channel *chan, time_t t, const char * } } if (!res) { - res = wait_file(chan, ints, "digits/second", lang); + res = wait_file(chan, ints, "second", lang); } break; case 'T': @@ -7022,7 +7022,7 @@ int ast_say_time_hu(struct ast_channel *chan, time_t t, const char *ints, const if (tm.tm_min > 0) { res = ast_say_number(chan, tm.tm_min, ints, lang, "f"); if (!res) - res = ast_streamfile(chan, "digits/minute", lang); + res = ast_streamfile(chan, "minute", lang); } return res; } @@ -7117,9 +7117,9 @@ int ast_say_time_pt_BR(struct ast_channel *chan, time_t t, const char *ints, con res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL); if (!res) { if (tm.tm_min > 1) - res = wait_file(chan, ints, "digits/minutes", lang); + res = wait_file(chan, ints, "minutes", lang); else - res = wait_file(chan, ints, "digits/minute", lang); + res = wait_file(chan, ints, "minute", lang); } } return res; @@ -7179,7 +7179,7 @@ int ast_say_time_zh(struct ast_channel *chan, time_t t, const char *ints, const if (!res) res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL); if (!res) - res = ast_streamfile(chan, "digits/minute", lang); + res = ast_streamfile(chan, "minute", lang); if (!res) res = ast_waitstream(chan, ints); return res; @@ -7602,7 +7602,7 @@ int ast_say_datetime_zh(struct ast_channel *chan, time_t t, const char *ints, co if (!res) res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL); if (!res) - res = ast_streamfile(chan, "digits/minute", lang); + res = ast_streamfile(chan, "minute", lang); if (!res) res = ast_waitstream(chan, ints); return res; @@ -8480,7 +8480,7 @@ static int ast_say_date_with_format_gr(struct ast_channel *chan, time_t t, const if (!res) res = ast_say_number_full_gr(chan, tm.tm_sec, ints, lang, -1, -1); if (!res) - ast_copy_string(nextmsg, "digits/seconds", sizeof(nextmsg)); + ast_copy_string(nextmsg, "seconds", sizeof(nextmsg)); res = wait_file(chan, ints, nextmsg, lang); break; case 'T':