kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1684 in FS/freeswitch from ~DRAGOS_OANCEA/freeswitch-dragos:FS-11636-fix-say-date to master 

* commit '6b2ad1d48d2c6b3e3477db7289be19fcb1c2aa84':
  FS-11636: [mod_say_de] fix SST_CURRENT_DATE_TIME FS-11636: [mod_say_en] fix SST_CURRENT_DATE_TIME
This commit is contained in:
Mike Jerris 2019-02-28 19:06:13 -06:00
parent 9635c7d09c 6b2ad1d48d
commit d4fd8acced
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mod/say/mod_say_de/mod_say_de.c
View File

@ -384,6 +384,11 @@ static switch_status_t de_say_time(switch_core_session_t *session, char *tosay,
break;
}
if (say_date) {
say_dow = say_day = say_month = say_year = 1;
say_today = say_yesterday = 0;
}
if (say_today) {
say_file("time/today.wav");
}
@ -408,11 +413,6 @@ static switch_status_t de_say_time(switch_core_session_t *session, char *tosay,
say_num(tm.tm_year + 1900, SSM_PRONOUNCED_YEAR);
}
if (say_date) {
say_dow = say_day = say_month = say_year = 1;
say_today = say_yesterday = 0;
}
if (say_time) {
if (say_date || say_today || say_yesterday || say_dow) {
say_file("time/at.wav");

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

@ -355,6 +355,11 @@ static switch_status_t en_say_time(switch_say_file_handle_t *sh, char *tosay, sw
break;
}
if (say_date) {
say_year = say_month = say_day = say_dow = 1;
say_today = say_yesterday = 0;
}
if (say_today) {
switch_say_file(sh, "time/today");
}
@ -364,12 +369,6 @@ static switch_status_t en_say_time(switch_say_file_handle_t *sh, char *tosay, sw
if (say_dow) {
switch_say_file(sh, "time/day-%d", tm.tm_wday);
}
if (say_date) {
say_year = say_month = say_day = say_dow = 1;
say_today = say_yesterday = 0;
}
if (say_month) {
switch_say_file(sh, "time/mon-%d", tm.tm_mon);
}