[Pkg-voip-commits] r1769 - in asterisk/branches/sarge/debian: .
patches
Tzafrir Cohen
tzafrir-guest at costa.debian.org
Sat May 20 20:41:52 UTC 2006
Author: tzafrir-guest
Date: 2006-05-20 20:41:51 +0000 (Sat, 20 May 2006)
New Revision: 1769
Added:
asterisk/branches/sarge/debian/patches/vm_he.dpatch
Modified:
asterisk/branches/sarge/debian/changelog
asterisk/branches/sarge/debian/patches/00list
asterisk/branches/sarge/debian/patches/brazilian_syntax.dpatch
Log:
* brazilian_syntax.dpatch: uses "pt_BR"
* vm_he.dpatch: Hebrew in app_voicemail
* sys_readline disabled for now
Modified: asterisk/branches/sarge/debian/changelog
===================================================================
--- asterisk/branches/sarge/debian/changelog 2006-05-20 16:14:40 UTC (rev 1768)
+++ asterisk/branches/sarge/debian/changelog 2006-05-20 20:41:51 UTC (rev 1769)
@@ -19,9 +19,9 @@
* sys_readline.dpatch: Realine support in the CLI. TODO: tab completion
* sys_editline.dpatch: alternativly, simply use the system version of
editline (not used).
- * Copied configuration from rapid_config instead of ast_config
* func_odbc_12.dpatch: backport of func_odbc (Closes: #364633)
- * brazilian_syntax.dpatch
+ * brazilian_syntax.dpatch (using "pt_BR")
+ * vm_he.dpatch: Hebrew in app_voicemail
* The data_dir patch also moves agi-bin/ and firmware/
* option_detach: using -F instead of -D (the same as upstream)
Modified: asterisk/branches/sarge/debian/patches/00list
===================================================================
--- asterisk/branches/sarge/debian/patches/00list 2006-05-20 16:14:40 UTC (rev 1768)
+++ asterisk/branches/sarge/debian/patches/00list 2006-05-20 20:41:51 UTC (rev 1769)
@@ -6,9 +6,10 @@
50_debian-libgsm.dpatch
95_conf_sample.dpatch
98_fpm-sounds.dpatch
-sys_readline
+#sys_readline
func_odbc_12
brazilian_syntax
+vm_he
pubkey_jnctn
nomarch
nooptimize
Modified: asterisk/branches/sarge/debian/patches/brazilian_syntax.dpatch
===================================================================
--- asterisk/branches/sarge/debian/patches/brazilian_syntax.dpatch 2006-05-20 16:14:40 UTC (rev 1768)
+++ asterisk/branches/sarge/debian/patches/brazilian_syntax.dpatch 2006-05-20 20:41:51 UTC (rev 1769)
@@ -13,7 +13,7 @@
format = "A dBY HMS";
} else if ( !strcasecmp(chan->language, "de" ) ) {
format = "A dBY HMS";
-+ } else if ( !strcasecmp(chan->language, "br" ) ) {
++ } else if ( !strcasecmp(chan->language, "pt_BR" ) ) {
+ format = "Ad 'digits/pt-de' B 'digits/pt-de' Y 'digits/pt-as' HMS";
} else {
format = "ABdY 'digits/at' IMp";
@@ -24,7 +24,7 @@
/*! \page vmlang Voicemail Language Syntaxes Supported
\par Syntaxes supported, not really language codes.
-+ \arg \b br - Brazilian Portuguese
++ \arg \b pt_BR - Brazilian Portuguese
\arg \b en - English
\arg \b de - German
\arg \b es - Spanish
@@ -32,7 +32,7 @@
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,"br"))
++ 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
res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, chan->language, "'vm-received' q 'digits/at' IMp", NULL);
@@ -42,7 +42,7 @@
int cmd;
- if (!strcasecmp(chan->language, "it") || !strcasecmp(chan->language, "es") || !strcasecmp(chan->language, "fr") || !strcasecmp(chan->language, "pt")) { /* Italian, Spanish, French or Portuguese syntax */
-+ if (!strcasecmp(chan->language, "it") || !strcasecmp(chan->language, "es") || !strcasecmp(chan->language, "fr") || !strcasecmp(chan->language, "pt") || !strcasecmp(chan->language, "br")) { /* Italian, Spanish, French or Portuguese syntax */
++ 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 */
cmd = ast_play_and_wait(chan, "vm-messages"); /* "messages */
if (cmd)
return cmd;
@@ -51,7 +51,7 @@
}
+/* BRAZILIAN PORTUGUESE syntax */
-+static int vm_intro_br(struct ast_channel *chan,struct vm_state *vms) {
++static int vm_intro_pt_BR(struct ast_channel *chan,struct vm_state *vms) {
+ /* Introduce messages they have */
+ int res;
+ if (!vms->oldmessages && !vms->newmessages) {
@@ -105,8 +105,8 @@
return vm_intro_nl(chan, vms);
} else if (!strcasecmp(chan->language, "pt")) { /* PORTUGUESE syntax */
return vm_intro_pt(chan, vms);
-+ } else if (!strcasecmp(chan->language, "br")) { /* BRAZILIAN PORTUGUESE syntax */
-+ return vm_intro_br(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 */
@@ -115,7 +115,7 @@
} else if (!strcasecmp(chan->language, "it")) { /* ITALIAN */
return vm_browse_messages_it(chan, vms, vmu);
- } else if (!strcasecmp(chan->language, "pt")) { /* PORTUGUESE */
-+ } else if (!strcasecmp(chan->language, "pt") || !strcasecmp(chan->language, "br")) { /* PORTUGUESE */
++ } else if (!strcasecmp(chan->language, "pt") || !strcasecmp(chan->language, "pt_BR")) { /* PORTUGUESE */
return vm_browse_messages_pt(chan, vms, vmu);
} else if (!strcasecmp(chan->language, "gr")){
return vm_browse_messages_gr(chan, vms, vmu); /* GREEK */
@@ -125,7 +125,7 @@
static int ast_say_time_fr(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
static int ast_say_time_nl(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
static int ast_say_time_pt(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
-+static int ast_say_time_br(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
++static int ast_say_time_pt_BR(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
static int ast_say_time_tw(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
static int ast_say_time_gr(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
@@ -133,7 +133,7 @@
static int ast_say_datetime_fr(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
static int ast_say_datetime_nl(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
static int ast_say_datetime_pt(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
-+static int ast_say_datetime_br(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
++static int ast_say_datetime_pt_BR(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
static int ast_say_datetime_tw(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
static int ast_say_datetime_gr(struct ast_channel *chan, time_t t, const char *ints, const char *lang);
@@ -142,7 +142,7 @@
} else if (!strcasecmp(language, "pl") ) { /* Polish syntax */
return(ast_say_number_full_pl(chan, num, ints, language, options, audiofd, ctrlfd));
- } else if (!strcasecmp(language, "pt") ) { /* Portuguese syntax */
-+ } else if (!strcasecmp(language, "pt") || !strcasecmp(language, "br")) { /* Portuguese syntax */
++ } else if (!strcasecmp(language, "pt") || !strcasecmp(language, "pt_BR")) { /* Portuguese syntax */
return(ast_say_number_full_pt(chan, num, ints, language, options, audiofd, ctrlfd));
} else if (!strcasecmp(language, "se") ) { /* Swedish syntax */
return(ast_say_number_full_se(chan, num, ints, language, options, audiofd, ctrlfd));
@@ -162,7 +162,7 @@
} else if (!strcasecmp(lang, "nl") ) { /* Dutch syntax */
return(ast_say_date_nl(chan, t, ints, lang));
- } else if (!strcasecmp(lang, "pt") ) { /* Portuguese syntax */
-+ } else if (!strcasecmp(lang, "pt") || !strcasecmp(lang, "br")) { /* Portuguese syntax */
++ } else if (!strcasecmp(lang, "pt") || !strcasecmp(lang, "pt_BR")) { /* Portuguese syntax */
return(ast_say_date_pt(chan, t, ints, lang));
} else if (!strcasecmp(lang, "gr") ) { /* Greek syntax */
return(ast_say_date_gr(chan, t, ints, lang));
@@ -171,7 +171,7 @@
} else if (!strcasecmp(lang, "nl") ) { /* Dutch syntax */
return(ast_say_date_with_format_nl(chan, time, ints, lang, format, timezone));
- } else if (!strcasecmp(lang, "pt") ) { /* Portuguese syntax */
-+ } else if (!strcasecmp(lang, "pt") || !strcasecmp(lang, "br")) { /* Portuguese syntax */
++ } else if (!strcasecmp(lang, "pt") || !strcasecmp(lang, "pt_BR")) { /* Portuguese syntax */
return(ast_say_date_with_format_pt(chan, time, ints, lang, format, timezone));
} else if (!strcasecmp(lang, "tw") ) { /* Taiwanese syntax */
return(ast_say_date_with_format_tw(chan, time, ints, lang, format, timezone));
@@ -181,7 +181,7 @@
/* First - Twelfth */
- snprintf(nextmsg,sizeof(nextmsg), "digits/h-%d", tm.tm_mon +1);
- res = wait_file(chan,ints,nextmsg,lang);
-+ if (!strcasecmp(lang, "br")) {
++ if (!strcasecmp(lang, "pt_BR")) {
+ res = ast_say_number(chan, tm.tm_mon+1, ints, lang, (char *) NULL);
+ } else {
+ snprintf(nextmsg,sizeof(nextmsg), "digits/h-%d", tm.tm_mon +1);
@@ -215,7 +215,7 @@
- }
- if (!res)
- res = ast_say_number(chan, (tm.tm_hour % 12), ints, lang, "f");
-+ if (!strcasecmp(lang, "br")) {
++ if (!strcasecmp(lang, "pt_BR")) {
+ if (tm.tm_hour == 0) {
+ if (format[offset] == 'I')
+ res = wait_file(chan, ints, "digits/pt-a", lang);
@@ -273,7 +273,7 @@
- if (tm.tm_hour > 20) {
- res = wait_file(chan,ints, "digits/20",lang);
- remainder -= 20;
-+ if (!strcasecmp(lang, "br")) {
++ if (!strcasecmp(lang, "pt_BR")) {
+ res = ast_say_number(chan, tm.tm_hour, ints, lang, "f");
+ if ((!res) && (format[offset] == 'H')) {
+ if (tm.tm_hour > 1) {
@@ -307,7 +307,7 @@
- if (tm.tm_min == 0) {
- res = wait_file(chan, ints, "digits/pt-hora", lang);
- if (tm.tm_hour != 1)
-+ if (!strcasecmp(lang, "br")) {
++ if (!strcasecmp(lang, "pt_BR")) {
+ res = ast_say_number(chan, tm.tm_min, ints, lang, NULL);
+ if (!res) {
+ if (tm.tm_min > 1) {
@@ -339,7 +339,7 @@
- res = wait_file(chan, ints, "digits/p-m", lang);
- else if (tm.tm_hour && tm.tm_hour < 12)
- res = wait_file(chan, ints, "digits/a-m", lang);
-+ if (!strcasecmp(lang, "br")) {
++ if (!strcasecmp(lang, "pt_BR")) {
+ if ((tm.tm_hour != 0) && (tm.tm_hour != 12)) {
+ res = wait_file(chan, ints, "digits/pt-da", lang);
+ if (!res) {
@@ -368,7 +368,7 @@
- res = wait_file(chan,ints,nextmsg,lang);
- } else if (tm.tm_sec < 10) {
- res = wait_file(chan,ints, "digits/oh",lang);
-+ if (!strcasecmp(lang, "br")) {
++ if (!strcasecmp(lang, "pt_BR")) {
+ res = ast_say_number(chan, tm.tm_sec, ints, lang, NULL);
if (!res) {
- snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_sec);
@@ -424,8 +424,8 @@
return(ast_say_time_nl(chan, t, ints, lang));
} else if (!strcasecmp(lang, "pt") ) { /* Portuguese syntax */
return(ast_say_time_pt(chan, t, ints, lang));
-+ } else if (!strcasecmp(lang, "br") ) { /* Brazilian Portuguese syntax */
-+ return(ast_say_time_br(chan, t, ints, lang));
++ } else if (!strcasecmp(lang, "pt_BR") ) { /* Brazilian Portuguese syntax */
++ return(ast_say_time_pt_BR(chan, t, ints, lang));
} else if (!strcasecmp(lang, "tw") ) { /* Taiwanese syntax */
return(ast_say_time_tw(chan, t, ints, lang));
} else if (!strcasecmp(lang, "gr") ) { /* Greek syntax */
@@ -434,7 +434,7 @@
}
+/* Brazilian Portuguese syntax */
-+int ast_say_time_br(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
++int ast_say_time_pt_BR(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
+{
+ struct tm tm;
+ int res = 0;
@@ -468,8 +468,8 @@
return(ast_say_datetime_nl(chan, t, ints, lang));
} else if (!strcasecmp(lang, "pt") ) { /* Portuguese syntax */
return(ast_say_datetime_pt(chan, t, ints, lang));
-+ } else if (!strcasecmp(lang, "br") ) { /* Brazilian Portuguese syntax */
-+ return(ast_say_datetime_br(chan, t, ints, lang));
++ } else if (!strcasecmp(lang, "pt_BR") ) { /* Brazilian Portuguese syntax */
++ return(ast_say_datetime_pt_BR(chan, t, ints, lang));
} else if (!strcasecmp(lang, "tw") ) { /* Taiwanese syntax */
return(ast_say_datetime_tw(chan, t, ints, lang));
} else if (!strcasecmp(lang, "gr") ) { /* Greek syntax */
@@ -478,7 +478,7 @@
}
+/* Brazilian Portuguese syntax */
-+int ast_say_datetime_br(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
++int ast_say_datetime_pt_BR(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
+{
+ struct tm tm;
+ int res = 0;
@@ -497,7 +497,7 @@
} else if (!strcasecmp(lang, "fr") ) { /* French syntax */
return(ast_say_datetime_from_now_fr(chan, t, ints, lang));
- } else if (!strcasecmp(lang, "pt") ) { /* Portuguese syntax */
-+ } else if (!strcasecmp(lang, "pt") || !strcasecmp(lang, "br")) { /* Portuguese syntax */
++ } else if (!strcasecmp(lang, "pt") || !strcasecmp(lang, "pt_BR")) { /* Portuguese syntax */
return(ast_say_datetime_from_now_pt(chan, t, ints, lang));
}
@@ -513,7 +513,7 @@
- res = wait_file(chan, ints, "digits/pt-sss", lang);
- if (!res)
- res = ast_say_time(chan, t, ints, lang);
-+ if (!strcasecmp(lang, "br")) {
++ if (!strcasecmp(lang, "pt_BR")) {
+ if (tm.tm_hour > 1) {
+ snprintf(fn, sizeof(fn), "digits/pt-as");
+ } else {
Added: asterisk/branches/sarge/debian/patches/vm_he.dpatch
===================================================================
--- asterisk/branches/sarge/debian/patches/vm_he.dpatch 2006-05-20 16:14:40 UTC (rev 1768)
+++ asterisk/branches/sarge/debian/patches/vm_he.dpatch 2006-05-20 20:41:51 UTC (rev 1769)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## vm_he.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add Hebrew support to the voicemail app.
+
+ at DPATCH@
+diff -urNad asterisk-1.2.7.1.dfsg/apps/app_voicemail.c /tmp/dpep.9UOJxZ/asterisk-1.2.7.1.dfsg/apps/app_voicemail.c
+--- asterisk-1.2.7.1.dfsg/apps/app_voicemail.c 2006-04-12 01:24:46.000000000 +0300
++++ /tmp/dpep.9UOJxZ/asterisk-1.2.7.1.dfsg/apps/app_voicemail.c 2006-05-19 08:00:31.550220449 +0300
+@@ -154,6 +154,7 @@
+ \arg \b gr - Greek
+ \arg \b no - Norwegian
+ \arg \b se - Swedish
++ \arg \b he - Hebrew
+
+ German requires the following additional soundfile:
+ \arg \b 1F einE (feminine)
+@@ -3667,6 +3668,8 @@
+ 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,"he")) /* HEBREW 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,"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"))
Property changes on: asterisk/branches/sarge/debian/patches/vm_he.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-voip-commits
mailing list