kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-27 09:10:51 +00:00
Code Issues Projects Releases Wiki Activity

FS-10058: [mod_voicemail] voicemail timestamp plays in military time

Browse Source
This commit is contained in:
Mike Jerris 2017-02-21 11:22:38 -06:00
parent 96e823b1e0
commit c03842754e
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/mod/say/mod_say_en/mod_say_en.c
View File

@ -381,7 +381,7 @@ static switch_status_t en_say_time(switch_say_file_handle_t *sh, char *tosay, sw
}
if (say_time) {
int32_t hour = tm.tm_hour, pm = 0, mil = 0;
int32_t hour = tm.tm_hour, mil = 0;
if (say_args->method == SSM_ITERATED) {
mil = 1;
@ -391,28 +391,12 @@ static switch_status_t en_say_time(switch_say_file_handle_t *sh, char *tosay, sw
switch_say_file(sh, "time/at");
}
if (hour > 12) {
if ( mil ) {
mil++;
} else {
hour -= 12;
pm = 1;
}
} else if (hour == 12) {
pm = 1;
} else if (hour == 0) {
if (mil) {
if (tm.tm_min == 0) {
hour = 24;
}
} else {
hour = 12;
pm = 0;
}
}
if (mil) {
if (hour == 0 && tm.tm_min == 0) {
hour = 24;
}
if (hour < 10) {
say_num(sh, 0, SSM_PRONOUNCED);
}
@ -431,6 +415,18 @@ static switch_status_t en_say_time(switch_say_file_handle_t *sh, char *tosay, sw
switch_say_file(sh, "time/hours");
} else {
switch_bool_t pm = 0;
if (hour >= 12) {
pm = 1;
}
if (hour > 12) {
hour -= 12;
} else if (hour == 0) {
hour = 12;
}
say_num(sh, hour, SSM_PRONOUNCED);
if (tm.tm_min > 9) {