From 1fa77ee7a01bc97d858d1a5c4238729e29547f07 Mon Sep 17 00:00:00 2001 From: qwell Date: Thu, 7 Jun 2007 23:00:44 +0000 Subject: Merged revisions 68326 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r68326 | qwell | 2007-06-07 18:00:01 -0500 (Thu, 07 Jun 2007) | 5 lines Fix incorrect French syntax of "old messages". Request for feedback was sent to asterisk-dev mailing list, with little response. Issue 9118, patch by junky. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@68327 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_voicemail.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apps') diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 787fc7b73..14a99d8ba 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -5096,7 +5096,7 @@ static int vm_play_folder_name(struct ast_channel *chan, char *mbox) { int cmd; - if (!strcasecmp(chan->language, "it") || !strcasecmp(chan->language, "es") || !strcasecmp(chan->language, "fr") || !strcasecmp(chan->language, "pt") || !strcasecmp(chan->language, "pt_BR")) { /* Italian, Spanish, French or Portuguese syntax */ + if (!strcasecmp(chan->language, "it") || !strcasecmp(chan->language, "es") || !strcasecmp(chan->language, "pt") || !strcasecmp(chan->language, "pt_BR")) { /* Italian, Spanish, French or Portuguese syntax */ cmd = ast_play_and_wait(chan, "vm-messages"); /* "messages */ return cmd ? cmd : ast_play_and_wait(chan, mbox); } else if (!strcasecmp(chan->language, "gr")){ @@ -5569,14 +5569,14 @@ static int vm_intro_fr(struct ast_channel *chan,struct vm_state *vms) } if (!res && vms->oldmessages) { res = say_and_wait(chan, vms->oldmessages, chan->language); + if (!res) + res = ast_play_and_wait(chan, "vm-Old"); if (!res) { if (vms->oldmessages == 1) res = ast_play_and_wait(chan, "vm-message"); else res = ast_play_and_wait(chan, "vm-messages"); } - if (!res) - res = ast_play_and_wait(chan, "vm-Old"); } if (!res) { if (!vms->oldmessages && !vms->newmessages) { -- cgit v1.2.3