From: Kevin P. Fleming <kpfleming@digium.com>
Date: Wed, 27 Dec 2006 21:18:27 +0000 (+0000)
Subject: make the 'languageprefix' option default to on, and deprecate turning it off
X-Git-Tag: 1.6.0-beta1~3^2~3622
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afbfafa400a39b2613a37367e9060cff55d0e731;p=thirdparty%2Fasterisk.git

make the 'languageprefix' option default to on, and deprecate turning it off


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49000 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/UPGRADE.txt b/UPGRADE.txt
index b0f5e2e7b4..0068b69692 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -17,3 +17,9 @@ AEL:
   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).
diff --git a/doc/asterisk-conf.txt b/doc/asterisk-conf.txt
index e8b03b6a0f..9e915c16c9 100644
--- a/doc/asterisk-conf.txt
+++ b/doc/asterisk-conf.txt
@@ -65,10 +65,11 @@ maxcalls = 255					; The maximum number of concurrent calls you want to allow
 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]
diff --git a/main/asterisk.c b/main/asterisk.c
index 86da7b17e6..5a393397b0 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -2491,6 +2491,9 @@ int main(int argc, char *argv[])
 		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));
diff --git a/main/file.c b/main/file.c
index 5311b3a43d..7488141949 100644
--- a/main/file.c
+++ b/main/file.c
@@ -61,7 +61,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
  * (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);