[asterisk-commits] oej: branch oej/minivoicemail r58476 - in /team/oej/minivoicemail: apps/ conf...

[asterisk-commits at lists.digium.com]

Author: oej
Date: Thu Mar  8 15:02:40 2007
New Revision: 58476

URL: http://svn.digium.com/view/asterisk?view=rev&rev=58476
Log:
Documentation changes, final locale fixes

Modified:
    team/oej/minivoicemail/apps/app_minivm.c
    team/oej/minivoicemail/configs/minivm.conf.sample

Modified: team/oej/minivoicemail/apps/app_minivm.c
URL: http://svn.digium.com/view/asterisk/team/oej/minivoicemail/apps/app_minivm.c?view=diff&rev=58476&r1=58475&r2=58476
==============================================================================
--- team/oej/minivoicemail/apps/app_minivm.c (original)
+++ team/oej/minivoicemail/apps/app_minivm.c Thu Mar  8 15:02:40 2007
@@ -1456,7 +1456,7 @@
 	stringp = messageformat = ast_strdupa(format);
 	strsep(&stringp, "|");
 
-	if (etemplate->locale) {
+	if (!ast_strlen_zero(etemplate->locale)) {
 		char *newlocale;
 		ast_copy_string(oldlocale, setlocale(LC_TIME, NULL), sizeof(oldlocale));
 		if (option_debug > 1)
@@ -2607,7 +2607,7 @@
 static int handle_minivm_list_templates(int fd, int argc, char *argv[])
 {
 	struct minivm_template *this;
-	char *output_format = "%-15s %-8s %8s %-15.15s %-50s\n";
+	char *output_format = "%-15s %-10s %-10s %-15.15s %-50s\n";
 	int count = 0;
 
 	if (argc > 3)

Modified: team/oej/minivoicemail/configs/minivm.conf.sample
URL: http://svn.digium.com/view/asterisk/team/oej/minivoicemail/configs/minivm.conf.sample?view=diff&rev=58476&r1=58475&r2=58476
==============================================================================
--- team/oej/minivoicemail/configs/minivm.conf.sample (original)
+++ team/oej/minivoicemail/configs/minivm.conf.sample Thu Mar  8 15:02:40 2007
@@ -123,7 +123,7 @@
 ;----------------------- Message body templates---------------------
 ; [template-name]	; "template-" is a verbatim marker
 ; fromaddress = Your Friendly Asterisk Server
-; serveremail = asteriskvm at digium.com
+; fromemail = asteriskvm at digium.com
 ; subject = <string>
 ; attachmedia = yes | no	; Add media file as attachment?
 ; dateformat = <formatstring>   ; See above
@@ -137,9 +137,12 @@
 [template-sv_SE_email] 
 messagebody=Hej ${VM_NAME}:\n\n\tDu har fått ett röstbrevlåde-meddelande från ${VM_CALLERID}.\nLängd: ${VM_DUR}\nMailbox ${VM_MAILBOX}\nDatum:  ${VM_DATE}. \nMeddelandet bifogas det här brevet. Om du inte kan läsa det, kontakta intern support. \nHälsningar\n\n\t\t\t\t--Asterisk\n
 subject = Du har fått röstmeddelande (se bilaga)
+fromemail = swedish-voicemail-service at digium.com
+fromaddress = Asterisk Röstbrevlåda
 charset=iso-8859-1
 attachmedia=yes 
 dateformat=%A, %d %B %Y at %H:%M:%S
+locale=sv_SE
 
 [template-en_US_email] 
 messagebody=Dear ${VM_NAME}:\n\n\tjust wanted to let you know you were just left a ${VM_DUR} long message (number ${VM_MSGNUM})\nin mailbox ${VM_MAILBOX} from ${VM_CALLERID}, on ${VM_DATE}, so you might\nwant to check it when you get a chance.  Thanks!\n\n\t\t\t\t--Asterisk\n
@@ -153,11 +156,13 @@
 ;subject = Du har fått voicemail
 ;charset=iso-8859-1
 ;attachmedia=no
+;locale=sv_SE
 
 ;[template-nb_NO_email]
 ;templatefile = templates/email_nb_NO.txt
 ;subject = Du har fått voicemail
 ;charset=iso-8859-1
+;locale=nb_NO
 
 ;[template-en_US_email_southern]
 ;templatefile = templates/email_en_US.txt