sysmocom/asterisk
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "say.c: Fix file locations for second, seconds, minute, minutes files"

Browse source
This commit is contained in:
George Joseph 2017-07-25 07:45:00 -05:00 committed by Gerrit Code Review
commit 63bcbb2a56
1 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
main/say.c
View file

@ -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 (!res && next_item(&format[offset + 1]) == 'S') { /* minutes only if seconds follow */
if (tm.tm_min == 1) { if (tm.tm_min == 1) {
res = wait_file(chan, ints, "digits/minute", lang); res = wait_file(chan, ints, "minute", lang);
} else { } else {
res = wait_file(chan, ints, "digits/minutes", lang); res = wait_file(chan, ints, "minutes", lang);
} }
} }
break; break;
@ -4517,7 +4517,7 @@ int ast_say_date_with_format_da(struct ast_channel *chan, time_t t, const char *
if (!res) { if (!res) {
res = ast_say_number(chan, tm.tm_sec, ints, lang, "f"); res = ast_say_number(chan, tm.tm_sec, ints, lang, "f");
if (!res) { if (!res) {
res = wait_file(chan, ints, "digits/seconds", lang); res = wait_file(chan, ints, "seconds", lang);
} }
} }
break; break;
@ -4637,16 +4637,16 @@ int ast_say_date_with_format_de(struct ast_channel *chan, time_t t, const char *
case 'M': case 'M':
/* Minute */ /* Minute */
if (next_item(&format[offset + 1]) == 'S') { /* zero 'digits/0' only if seconds follow */ 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) { } else if (tm.tm_min > 0) {
res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL); 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 (!res && next_item(&format[offset + 1]) == 'S') { /* minutes only if seconds follow */
if (tm.tm_min == 1) { if (tm.tm_min == 1) {
res = wait_file(chan, ints, "digits/minute", lang); res = wait_file(chan, ints, "minute", lang);
} else { } else {
res = wait_file(chan, ints, "digits/minutes", lang); res = wait_file(chan, ints, "minutes", lang);
} }
} }
break; break;
@ -4720,7 +4720,7 @@ int ast_say_date_with_format_de(struct ast_channel *chan, time_t t, const char *
if (!res) { if (!res) {
res = ast_say_number(chan, tm.tm_sec, ints, lang, "f"); res = ast_say_number(chan, tm.tm_sec, ints, lang, "f");
if (!res) { 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; 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 */ if (!res && next_item(&format[offset + 1]) == 'S') { /* minutes only if seconds follow */
/* Say minute/minutes depending on whether minutes end in 1 */ /* Say minute/minutes depending on whether minutes end in 1 */
if ((tm.tm_min % 10 == 1) && (tm.tm_min != 11)) { 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 { } else {
res = wait_file(chan, ints, "digits/minutes", lang); res = wait_file(chan, ints, "minutes", lang);
} }
} }
break; 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"); res = ast_say_number(chan, tm.tm_sec, ints, lang, "f");
/* Say minute/minutes depending on whether seconds end in 1 */ /* Say minute/minutes depending on whether seconds end in 1 */
if (!res && (tm.tm_sec % 10 == 1) && (tm.tm_sec != 11)) { 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 { } else {
res = wait_file(chan, ints, "digits/seconds", lang); res = wait_file(chan, ints, "seconds", lang);
} }
} }
break; break;
@ -5652,7 +5652,7 @@ int ast_say_date_with_format_fr(struct ast_channel *chan, time_t t, const char *
/* Seconds */ /* Seconds */
res = ast_say_number(chan, tm.tm_sec, ints, lang, (char * ) NULL); res = ast_say_number(chan, tm.tm_sec, ints, lang, (char * ) NULL);
if (!res) { if (!res) {
res = wait_file(chan, ints, "digits/second", lang); res = wait_file(chan, ints, "second", lang);
} }
break; break;
case 'T': 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; one = tm.tm_sec % 10;
if (one > 1 && one < 5 && ten != 1) if (one > 1 && one < 5 && ten != 1)
res = wait_file(chan, ints, "digits/seconds", lang); res = wait_file(chan, ints, "seconds", lang);
else 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); res = ast_say_number(chan, tm.tm_min, ints, lang, NULL);
if (!res) { if (!res) {
if (tm.tm_min > 1) { if (tm.tm_min > 1) {
res = wait_file(chan, ints, "digits/minutes", lang); res = wait_file(chan, ints, "minutes", lang);
} else { } else {
res = wait_file(chan, ints, "digits/minute", lang); res = wait_file(chan, ints, "minute", lang);
} }
} }
} else { } 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); res = ast_say_number(chan, tm.tm_sec, ints, lang, NULL);
if (!res) { if (!res) {
if (tm.tm_sec > 1) { if (tm.tm_sec > 1) {
res = wait_file(chan, ints, "digits/seconds", lang); res = wait_file(chan, ints, "seconds", lang);
} else { } else {
res = wait_file(chan, ints, "digits/second", lang); res = wait_file(chan, ints, "second", lang);
} }
} }
} else { } else {
@ -6783,7 +6783,7 @@ int ast_say_date_with_format_zh(struct ast_channel *chan, time_t t, const char *
} }
} }
if (!res) { if (!res) {
res = wait_file(chan, ints, "digits/minute", lang); res = wait_file(chan, ints, "minute", lang);
} }
break; break;
case 'P': case 'P':
@ -6867,7 +6867,7 @@ int ast_say_date_with_format_zh(struct ast_channel *chan, time_t t, const char *
} }
} }
if (!res) { if (!res) {
res = wait_file(chan, ints, "digits/second", lang); res = wait_file(chan, ints, "second", lang);
} }
break; break;
case 'T': 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) { if (tm.tm_min > 0) {
res = ast_say_number(chan, tm.tm_min, ints, lang, "f"); res = ast_say_number(chan, tm.tm_min, ints, lang, "f");
if (!res) if (!res)
res = ast_streamfile(chan, "digits/minute", lang); res = ast_streamfile(chan, "minute", lang);
} }
return res; 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); res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
if (!res) { if (!res) {
if (tm.tm_min > 1) if (tm.tm_min > 1)
res = wait_file(chan, ints, "digits/minutes", lang); res = wait_file(chan, ints, "minutes", lang);
else else
res = wait_file(chan, ints, "digits/minute", lang); res = wait_file(chan, ints, "minute", lang);
} }
} }
return res; return res;
@ -7179,7 +7179,7 @@ int ast_say_time_zh(struct ast_channel *chan, time_t t, const char *ints, const
if (!res) if (!res)
res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL); res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
if (!res) if (!res)
res = ast_streamfile(chan, "digits/minute", lang); res = ast_streamfile(chan, "minute", lang);
if (!res) if (!res)
res = ast_waitstream(chan, ints); res = ast_waitstream(chan, ints);
return res; return res;
@ -7602,7 +7602,7 @@ int ast_say_datetime_zh(struct ast_channel *chan, time_t t, const char *ints, co
if (!res) if (!res)
res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL); res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
if (!res) if (!res)
res = ast_streamfile(chan, "digits/minute", lang); res = ast_streamfile(chan, "minute", lang);
if (!res) if (!res)
res = ast_waitstream(chan, ints); res = ast_waitstream(chan, ints);
return res; return res;
@ -8480,7 +8480,7 @@ static int ast_say_date_with_format_gr(struct ast_channel *chan, time_t t, const
if (!res) if (!res)
res = ast_say_number_full_gr(chan, tm.tm_sec, ints, lang, -1, -1); res = ast_say_number_full_gr(chan, tm.tm_sec, ints, lang, -1, -1);
if (!res) if (!res)
ast_copy_string(nextmsg, "digits/seconds", sizeof(nextmsg)); ast_copy_string(nextmsg, "seconds", sizeof(nextmsg));
res = wait_file(chan, ints, nextmsg, lang); res = wait_file(chan, ints, nextmsg, lang);
break; break;
case 'T': case 'T':