[svn-commits] tilghman: branch 1.6.2 r232866 - in /branches/1.6.2: ./ apps/app_voicemail.c
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Dec 3 15:03:52 CST 2009
Author: tilghman
Date: Thu Dec 3 15:03:48 2009
New Revision: 232866
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=232866
Log:
Merged revisions 232854 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r232854 | tilghman | 2009-12-03 14:47:07 -0600 (Thu, 03 Dec 2009) | 15 lines
Merged revisions 232820 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r232820 | tilghman | 2009-12-03 14:10:19 -0600 (Thu, 03 Dec 2009) | 8 lines
Deprecate "cz" in favor of "cs".
Also, change the use of language codes so that language registers as a prefix,
rather than an exact match.
(closes issue #16272)
Reported by: patrol-cz
Patches:
20091203__issue16272.diff.txt uploaded by tilghman (license 14)
........
................
Modified:
branches/1.6.2/ (props changed)
branches/1.6.2/apps/app_voicemail.c
Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.2/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_voicemail.c?view=diff&rev=232866&r1=232865&r2=232866
==============================================================================
--- branches/1.6.2/apps/app_voicemail.c (original)
+++ branches/1.6.2/apps/app_voicemail.c Thu Dec 3 15:03:48 2009
@@ -6787,26 +6787,25 @@
#endif
if (the_zone) {
res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, the_zone->msg_format, the_zone->timezone);
- }
- else if (!strcasecmp(chan->language,"pl")) /* POLISH syntax */
+ } else if (!strncasecmp(chan->language, "de", 2)) { /* GERMAN syntax */
+ res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' Q 'digits/at' HM", NULL);
+ } else if (!strncasecmp(chan->language, "gr", 2)) { /* GREEK syntax */
+ res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' q H 'digits/kai' M ", NULL);
+ } else if (!strncasecmp(chan->language, "it", 2)) { /* ITALIAN syntax */
+ res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' q 'digits/at' 'digits/hours' k 'digits/e' M 'digits/minutes'", NULL);
+ } else if (!strncasecmp(chan->language, "nl", 2)) { /* DUTCH syntax */
+ res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' q 'digits/nl-om' HM", NULL);
+ } else if (!strncasecmp(chan->language, "no", 2)) { /* NORWEGIAN syntax */
+ res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' Q 'digits/at' HM", NULL);
+ } else if (!strncasecmp(chan->language, "pl", 2)) { /* POLISH syntax */
res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' Q HM", NULL);
- else if (!strcasecmp(chan->language,"se")) /* SWEDISH syntax */
+ } else if (!strncasecmp(chan->language, "pt_BR", 5)) { /* Brazillian PORTUGUESE syntax */
+ 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 (!strncasecmp(chan->language, "se", 2)) { /* SWEDISH syntax */
res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' dB 'digits/at' k 'and' M", NULL);
- else if (!strcasecmp(chan->language,"no")) /* NORWEGIAN syntax */
- res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' Q 'digits/at' HM", NULL);
- else if (!strcasecmp(chan->language,"de")) /* GERMAN syntax */
- res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' Q 'digits/at' HM", NULL);
- else if (!strcasecmp(chan->language,"nl")) /* DUTCH syntax */
- res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' q 'digits/nl-om' HM", NULL);
- else if (!strcasecmp(chan->language,"it")) /* ITALIAN syntax */
- res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' q 'digits/at' 'digits/hours' k 'digits/e' M 'digits/minutes'", NULL);
- else if (!strcasecmp(chan->language,"gr"))
- 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 (!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 {
+ } 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);
}
#if 0
@@ -6900,7 +6899,7 @@
res = wait_file2(chan, vms, "vm-duration");
/* POLISH syntax */
- if (!strcasecmp(chan->language, "pl")) {
+ if (!strncasecmp(chan->language, "pl", 2)) {
div_t num = div(durationm, 10);
if (durationm == 1) {
@@ -6939,7 +6938,7 @@
struct ast_config *msg_cfg;
struct ast_flags config_flags = { CONFIG_FLAG_NOCACHE };
- vms->starting = 0;
+ vms->starting = 0;
make_file(vms->fn, sizeof(vms->fn), vms->curdir, vms->curmsg);
adsi_message(chan, vms);
if (!vms->curmsg)
@@ -6963,13 +6962,13 @@
if (!res) {
/* POLISH syntax */
- if (!strcasecmp(chan->language, "pl")) {
+ if (!strncasecmp(chan->language, "pl", 2)) {
if (vms->curmsg && (vms->curmsg != vms->lastmsg)) {
int ten, one;
char nextmsg[256];
ten = (vms->curmsg + 1) / 10;
one = (vms->curmsg + 1) % 10;
-
+
if (vms->curmsg < 20) {
snprintf(nextmsg, sizeof(nextmsg), "digits/n-%d", vms->curmsg + 1);
res = wait_file2(chan, vms, nextmsg);
@@ -6987,7 +6986,7 @@
if (!res)
res = wait_file2(chan, vms, "vm-message");
/* HEBREW syntax */
- } else if (!strcasecmp(chan->language, "he")) {
+ } else if (!strncasecmp(chan->language, "he", 2)) {
if (!vms->curmsg) {
res = wait_file2(chan, vms, "vm-message");
res = wait_file2(chan, vms, "vm-first");
@@ -7000,9 +6999,9 @@
res = ast_say_number(chan, vms->curmsg + 1, AST_DIGIT_ANY, chan->language, "f");
}
} else {
- if (!strcasecmp(chan->language, "se")) /* SWEDISH syntax */
+ if (!strncasecmp(chan->language, "se", 2)) { /* SWEDISH syntax */
res = wait_file2(chan, vms, "vm-meddelandet"); /* "message" */
- else /* DEFAULT syntax */ {
+ } else { /* DEFAULT syntax */
res = wait_file2(chan, vms, "vm-message");
}
if (vms->curmsg && (vms->curmsg != vms->lastmsg)) {
@@ -7317,14 +7316,18 @@
{
int cmd;
- if (!strcasecmp(chan->language, "it") || !strcasecmp(chan->language, "es") || !strcasecmp(chan->language, "pt") || !strcasecmp(chan->language, "pt_BR")) { /* Italian, Spanish, French or Portuguese syntax */
+ if ( !strncasecmp(chan->language, "it", 2) ||
+ !strncasecmp(chan->language, "es", 2) ||
+ !strncasecmp(chan->language, "pt", 2)) { /* Italian, Spanish, or Portuguese syntax */
cmd = ast_play_and_wait(chan, "vm-messages"); /* "messages */
return cmd ? cmd : ast_play_and_wait(chan, box);
- } else if (!strcasecmp(chan->language, "gr")){
+ } else if (!strncasecmp(chan->language, "gr", 2)) {
return vm_play_folder_name_gr(chan, box);
- } else if (!strcasecmp(chan->language, "pl")){
+ } else if (!strncasecmp(chan->language, "he", 2)) { /* Hebrew syntax */
+ return ast_play_and_wait(chan, box);
+ } else if (!strncasecmp(chan->language, "pl", 2)) {
return vm_play_folder_name_pl(chan, box);
- } else if (!strcasecmp(chan->language, "ua")){ /* Ukrainian syntax */
+ } else if (!strncasecmp(chan->language, "ua", 2)) { /* Ukrainian syntax */
return vm_play_folder_name_ua(chan, box);
} else { /* Default English */
cmd = ast_play_and_wait(chan, box);
@@ -7332,18 +7335,18 @@
}
}
-/* GREEK SYNTAX
+/* GREEK SYNTAX
In greek the plural for old/new is
different so we need the following files
- We also need vm-denExeteMynhmata because
+ We also need vm-denExeteMynhmata because
this syntax is different.
-
+
-> vm-Olds.wav : "Palia"
-> vm-INBOXs.wav : "Nea"
-> vm-denExeteMynhmata : "den exete mynhmata"
*/
-
-
+
+
static int vm_intro_gr(struct ast_channel *chan, struct vm_state *vms)
{
int res = 0;
@@ -8100,7 +8103,7 @@
* vm-no : no ( no messages )
*/
-static int vm_intro_cz(struct ast_channel *chan,struct vm_state *vms)
+static int vm_intro_cs(struct ast_channel *chan, struct vm_state *vms)
{
int res;
res = ast_play_and_wait(chan, "vm-youhave");
@@ -8214,39 +8217,46 @@
}
/* Play voicemail intro - syntax is different for different languages */
- if (!strcasecmp(chan->language, "de")) { /* GERMAN syntax */
+ if (0) {
+ } else if (!strncasecmp(chan->language, "cs", 2)) { /* CZECH syntax */
+ return vm_intro_cs(chan, vms);
+ } else if (!strncasecmp(chan->language, "cz", 2)) { /* deprecated CZECH syntax */
+ static int deprecation_warning = 0;
+ if (deprecation_warning++ % 10 == 0) {
+ ast_log(LOG_WARNING, "cz is not a standard language code. Please switch to using cs instead.\n");
+ }
+ return vm_intro_cs(chan, vms);
+ } else if (!strncasecmp(chan->language, "de", 2)) { /* GERMAN syntax */
return vm_intro_de(chan, vms);
- } else if (!strcasecmp(chan->language, "es")) { /* SPANISH syntax */
+ } else if (!strncasecmp(chan->language, "es", 2)) { /* SPANISH syntax */
return vm_intro_es(chan, vms);
- } else if (!strcasecmp(chan->language, "it")) { /* ITALIAN syntax */
+ } else if (!strncasecmp(chan->language, "fr", 2)) { /* FRENCH syntax */
+ return vm_intro_fr(chan, vms);
+ } else if (!strncasecmp(chan->language, "gr", 2)) { /* GREEK syntax */
+ return vm_intro_gr(chan, vms);
+ } else if (!strncasecmp(chan->language, "he", 2)) { /* HEBREW syntax */
+ return vm_intro_he(chan, vms);
+ } else if (!strncasecmp(chan->language, "it", 2)) { /* ITALIAN syntax */
return vm_intro_it(chan, vms);
- } else if (!strcasecmp(chan->language, "fr")) { /* FRENCH syntax */
- return vm_intro_fr(chan, vms);
- } else if (!strcasecmp(chan->language, "nl")) { /* DUTCH syntax */
+ } else if (!strncasecmp(chan->language, "nl", 2)) { /* DUTCH syntax */
return vm_intro_nl(chan, vms);
- } else if (!strcasecmp(chan->language, "pt")) { /* PORTUGUESE syntax */
+ } else if (!strncasecmp(chan->language, "no", 2)) { /* NORWEGIAN syntax */
+ return vm_intro_no(chan, vms);
+ } else if (!strncasecmp(chan->language, "pl", 2)) { /* POLISH syntax */
+ return vm_intro_pl(chan, vms);
+ } else if (!strncasecmp(chan->language, "pt_BR", 5)) { /* BRAZILIAN PORTUGUESE syntax */
+ return vm_intro_pt_BR(chan, vms);
+ } else if (!strncasecmp(chan->language, "pt", 2)) { /* PORTUGUESE syntax */
return vm_intro_pt(chan, vms);
- } else if (!strcasecmp(chan->language, "pt_BR")) { /* BRAZILIAN PORTUGUESE syntax */
- return vm_intro_pt_BR(chan, vms);
- } else if (!strcasecmp(chan->language, "cz")) { /* CZECH syntax */
- return vm_intro_cz(chan, vms);
- } else if (!strcasecmp(chan->language, "gr")) { /* GREEK syntax */
- return vm_intro_gr(chan, vms);
- } else if (!strcasecmp(chan->language, "pl")) { /* POLISH syntax */
- return vm_intro_pl(chan, vms);
- } else if (!strcasecmp(chan->language, "se")) { /* SWEDISH syntax */
+ } else if (!strncasecmp(chan->language, "ru", 2)) { /* RUSSIAN syntax */
+ return vm_intro_multilang(chan, vms, "n");
+ } else if (!strncasecmp(chan->language, "se", 2)) { /* SWEDISH syntax */
return vm_intro_se(chan, vms);
- } else if (!strcasecmp(chan->language, "no")) { /* NORWEGIAN syntax */
- return vm_intro_no(chan, vms);
- } else if (!strcasecmp(chan->language, "ru")) { /* RUSSIAN syntax */
+ } else if (!strncasecmp(chan->language, "ua", 2)) { /* UKRAINIAN syntax */
return vm_intro_multilang(chan, vms, "n");
} 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 */
- return vm_intro_he(chan, vms);
- } else { /* Default to ENGLISH */
+ } else { /* Default to ENGLISH */
return vm_intro_en(chan, vms);
}
}
@@ -8851,19 +8861,19 @@
*/
static int vm_browse_messages(struct ast_channel *chan, struct vm_state *vms, struct ast_vm_user *vmu)
{
- if (!strcasecmp(chan->language, "es")) { /* SPANISH */
+ if (!strncasecmp(chan->language, "es", 2)) { /* SPANISH */
return vm_browse_messages_es(chan, vms, vmu);
- } else if (!strcasecmp(chan->language, "it")) { /* ITALIAN */
+ } else if (!strncasecmp(chan->language, "gr", 2)) { /* GREEK */
+ return vm_browse_messages_gr(chan, vms, vmu);
+ } else if (!strncasecmp(chan->language, "he", 2)) { /* HEBREW */
+ return vm_browse_messages_he(chan, vms, vmu);
+ } else if (!strncasecmp(chan->language, "it", 2)) { /* ITALIAN */
return vm_browse_messages_it(chan, vms, vmu);
- } else if (!strcasecmp(chan->language, "pt") || !strcasecmp(chan->language, "pt_BR")) { /* PORTUGUESE */
+ } else if (!strncasecmp(chan->language, "pt", 2)) { /* PORTUGUESE */
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 (!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 */
+ } else { /* Default to English syntax */
return vm_browse_messages_en(chan, vms, vmu);
}
}
@@ -9591,6 +9601,9 @@
case '*': /* Help */
if (!vms.starting) {
cmd = ast_play_and_wait(chan, "vm-onefor");
+ if (!strncasecmp(chan->language, "he", 2)) {
+ cmd = ast_play_and_wait(chan, "vm-for");
+ }
if (!cmd)
cmd = vm_play_folder_name(chan, vms.vmbox);
if (!cmd)
More information about the svn-commits
mailing list