From 34d014395579bfd6ede5a1e27fed11171734bf84 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Tue, 30 Jun 2009 18:36:24 +0000 Subject: Recorded merge of revisions 204469 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r204469 | tilghman | 2009-06-30 13:23:35 -0500 (Tue, 30 Jun 2009) | 11 lines "tw" is the language specification for Twi (from Ghana) not Taiwanese. (closes issue #15346) Reported by: volivier Patches: 20090617__issue15346__1.4.diff.txt uploaded by tilghman (license 14) 20090617__issue15346__trunk.diff.txt uploaded by tilghman (license 14) 20090617__issue15346__1.6.0.diff.txt uploaded by tilghman (license 14) 20090617__issue15346__1.6.1.diff.txt uploaded by tilghman (license 14) 20090617__issue15346__1.6.2.diff.txt uploaded by tilghman (license 14) Tested by: volivier ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204470 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_voicemail.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'apps/app_voicemail.c') diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 2b20c7320..40eff961f 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -6806,7 +6806,7 @@ static int play_message_datetime(struct ast_channel *chan, struct ast_vm_user *v res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' q H 'digits/kai' M ", NULL); else if (!strcasecmp(chan->language,"pt_BR")) res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' Ad 'digits/pt-de' B 'digits/pt-de' Y 'digits/pt-as' HM ", NULL); - else if (!strcasecmp(chan->language,"tw")) /* CHINESE (Taiwan) syntax */ + else if (!strncasecmp(chan->language, "zh", 2)) /* CHINESE (Taiwan) syntax */ res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "qR 'vm-received'", NULL); else { res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' q 'digits/at' IMp", NULL); @@ -8163,7 +8163,7 @@ static int vm_intro_cz(struct ast_channel *chan,struct vm_state *vms) } /* CHINESE (Taiwan) syntax */ -static int vm_intro_tw(struct ast_channel *chan, struct vm_state *vms) +static int vm_intro_zh(struct ast_channel *chan, struct vm_state *vms) { int res; /* Introduce messages they have */ @@ -8242,8 +8242,8 @@ static int vm_intro(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm return vm_intro_no(chan, vms); } else if (!strcasecmp(chan->language, "ru")) { /* RUSSIAN syntax */ return vm_intro_multilang(chan, vms, "n"); - } else if (!strcasecmp(chan->language, "tw")) { /* CHINESE (Taiwan) syntax */ - return vm_intro_tw(chan, vms); + } else if (!strncasecmp(chan->language, "zh", 2)) { /* CHINESE (Taiwan) syntax */ + return vm_intro_zh(chan, vms); } else if (!strcasecmp(chan->language, "ua")) { /* UKRAINIAN syntax */ return vm_intro_multilang(chan, vms, "n"); } else if (!strcasecmp(chan->language, "he")) { /* HEBREW syntax */ @@ -8333,7 +8333,7 @@ static int vm_instructions_en(struct ast_channel *chan, struct ast_vm_user *vmu, return res; } -static int vm_instructions_tw(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, int skipadvanced, int in_urgent) +static int vm_instructions_zh(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, int skipadvanced, int in_urgent) { int res = 0; /* Play instructions and wait for new command */ @@ -8359,8 +8359,8 @@ static int vm_instructions_tw(struct ast_channel *chan, struct ast_vm_user *vmu, static int vm_instructions(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, int skipadvanced, int in_urgent) { - if (vms->starting && !strcasecmp(chan->language, "tw")) { /* CHINESE (Taiwan) syntax */ - return vm_instructions_tw(chan, vmu, vms, skipadvanced, in_urgent); + if (vms->starting && !strncasecmp(chan->language, "zh", 2)) { /* CHINESE (Taiwan) syntax */ + return vm_instructions_zh(chan, vmu, vms, skipadvanced, in_urgent); } else { /* Default to ENGLISH */ return vm_instructions_en(chan, vmu, vms, skipadvanced, in_urgent); } @@ -8814,7 +8814,7 @@ static int vm_browse_messages_pt(struct ast_channel *chan, struct vm_state *vms, * * \return zero on success, -1 on error. */ -static int vm_browse_messages_tw(struct ast_channel *chan, struct vm_state *vms, struct ast_vm_user *vmu) +static int vm_browse_messages_zh(struct ast_channel *chan, struct vm_state *vms, struct ast_vm_user *vmu) { int cmd=0; @@ -8855,8 +8855,8 @@ static int vm_browse_messages(struct ast_channel *chan, struct vm_state *vms, st return vm_browse_messages_pt(chan, vms, vmu); } else if (!strcasecmp(chan->language, "gr")){ return vm_browse_messages_gr(chan, vms, vmu); /* GREEK */ - } else if (!strcasecmp(chan->language, "tw")){ - return vm_browse_messages_tw(chan, vms, vmu); /* CHINESE (Taiwan) */ + } else if (!strncasecmp(chan->language, "zh", 2)){ + return vm_browse_messages_zh(chan, vms, vmu); /* CHINESE (Taiwan) */ } else if (!strcasecmp(chan->language, "he")) { return vm_browse_messages_he(chan, vms, vmu); /* HEBREW */ } else { /* Default to English syntax */ -- cgit v1.2.3