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 b0f5e2e7b4d4d844a0cd4da404685714b25e9d1a..0068b6969260d51dda035f7c8254cb27b6388795 100644 (file)
--- 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 e8b03b6a0f36a2397cd0caf9bd797c30054f85be..9e915c16c97a5a6f51531d26263e5bee0c56542b 100644 (file)
--- 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 86da7b17e6929aa2e7d991a9a7843e14dd4a3c01..5a393397b0450cc42fc93cb306901d36a618d160 100644 (file)
--- 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 5311b3a43dedea7eaf0d86e0dd9f771da02c15e8..7488141949cb057b6cb4df825ce32da508dc808b 100644 (file)
--- 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);