[asterisk-commits] kpfleming: trunk r49000 - in /trunk: ./ doc/ main/

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Wed Dec 27 15:18:27 2006
New Revision: 49000

URL: http://svn.digium.com/view/asterisk?view=rev&rev=49000
Log:
make the 'languageprefix' option default to on, and deprecate turning it off

Modified:
    trunk/UPGRADE.txt
    trunk/doc/asterisk-conf.txt
    trunk/main/asterisk.c
    trunk/main/file.c

Modified: trunk/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/trunk/UPGRADE.txt?view=diff&rev=49000&r1=48999&r2=49000
==============================================================================
--- trunk/UPGRADE.txt (original)
+++ trunk/UPGRADE.txt Wed Dec 27 15:18:27 2006
@@ -17,3 +17,9 @@
   not include it, but really, you should make sure that all execution
   paths within your macros end in "return;".
 
+Core:
+
+* The 'languageprefix' option in asterisk.conf is now deprecated, and
+  the default sound file layout for non-English sounds is the 'new
+  style' layout introduced in Asterisk 1.4 (and used by the automatic
+  sound file installer in the Makefile).

Modified: trunk/doc/asterisk-conf.txt
URL: http://svn.digium.com/view/asterisk/trunk/doc/asterisk-conf.txt?view=diff&rev=49000&r1=48999&r2=49000
==============================================================================
--- trunk/doc/asterisk-conf.txt (original)
+++ trunk/doc/asterisk-conf.txt Wed Dec 27 15:18:27 2006
@@ -65,10 +65,11 @@
 execincludes = yes | no 			; Allow #exec entries in configuration files
 dontwarn = yes | no				; Don't over-inform the Asterisk sysadm, he's a guru
 systemname = <a_string>				; System name. Used to prefix CDR uniqueid and to fill ${SYSTEMNAME}
-languageprefix = yes | no			; Should language code be last component of sound file name or first?
+languageprefix = no | yes			; Should language code be last component of sound file name or first?
 	       	       				; when off, sound files are searched as <path>/<lang>/<file>
 						; when on, sound files are search as <lang>/<path>/<file>
 						; (only affects relative paths for sound files)
+						; NOTE: this option is deprecated, as the default value is now 'yes'
 maxlimit = <value>				; Maximum number open files for the Asterisk process
 
 [files]

Modified: trunk/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/main/asterisk.c?view=diff&rev=49000&r1=48999&r2=49000
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Wed Dec 27 15:18:27 2006
@@ -2491,6 +2491,9 @@
 		ast_verbose("[ Reading Master Configuration ]\n");
 	ast_readconfig();
 
+	if (!ast_language_is_prefix && !ast_opt_remote)
+		ast_log(LOG_WARNING, "The 'languageprefix' option in asterisk.conf is deprecated; in a future release it will be removed, and your sound files will need to be organized in the 'new style' language layout.\n");
+
 	if (ast_opt_dump_core) {
 		struct rlimit l;
 		memset(&l, 0, sizeof(l));

Modified: trunk/main/file.c
URL: http://svn.digium.com/view/asterisk/trunk/main/file.c?view=diff&rev=49000&r1=48999&r2=49000
==============================================================================
--- trunk/main/file.c (original)
+++ trunk/main/file.c Wed Dec 27 15:18:27 2006
@@ -61,7 +61,7 @@
  * (i.e. en/digits/1.gsm, it/digits/1.gsm or default to digits/1.gsm).
  * The latter permits a language to be entirely in one directory.
  */
-int ast_language_is_prefix = 0;
+int ast_language_is_prefix = 1;
 
 static AST_LIST_HEAD_STATIC(formats, ast_format);