mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-25 15:08:53 +00:00
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: https://origsvn.digium.com/svn/asterisk/branches/1.4@68326 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -4903,7 +4903,7 @@ static int vm_play_folder_name(struct ast_channel *chan, char *mbox)
|
|||||||
{
|
{
|
||||||
int cmd;
|
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 */
|
cmd = ast_play_and_wait(chan, "vm-messages"); /* "messages */
|
||||||
return cmd ? cmd : ast_play_and_wait(chan, mbox);
|
return cmd ? cmd : ast_play_and_wait(chan, mbox);
|
||||||
} else if (!strcasecmp(chan->language, "gr")){
|
} else if (!strcasecmp(chan->language, "gr")){
|
||||||
@@ -5376,14 +5376,14 @@ static int vm_intro_fr(struct ast_channel *chan,struct vm_state *vms)
|
|||||||
}
|
}
|
||||||
if (!res && vms->oldmessages) {
|
if (!res && vms->oldmessages) {
|
||||||
res = say_and_wait(chan, vms->oldmessages, chan->language);
|
res = say_and_wait(chan, vms->oldmessages, chan->language);
|
||||||
|
if (!res)
|
||||||
|
res = ast_play_and_wait(chan, "vm-Old");
|
||||||
if (!res) {
|
if (!res) {
|
||||||
if (vms->oldmessages == 1)
|
if (vms->oldmessages == 1)
|
||||||
res = ast_play_and_wait(chan, "vm-message");
|
res = ast_play_and_wait(chan, "vm-message");
|
||||||
else
|
else
|
||||||
res = ast_play_and_wait(chan, "vm-messages");
|
res = ast_play_and_wait(chan, "vm-messages");
|
||||||
}
|
}
|
||||||
if (!res)
|
|
||||||
res = ast_play_and_wait(chan, "vm-Old");
|
|
||||||
}
|
}
|
||||||
if (!res) {
|
if (!res) {
|
||||||
if (!vms->oldmessages && !vms->newmessages) {
|
if (!vms->oldmessages && !vms->newmessages) {
|
||||||
|
Reference in New Issue
Block a user