diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-27 21:18:27 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-27 21:18:27 +0000 |
| commit | ab7096022bf857c49d3c98a6275c19d6f750b869 (patch) | |
| tree | 0ee6a9b23db4f2dd5ba133a9f49a66824c66fca2 | |
| parent | f16e0a15b8d2b1fdea85fcc3b0528992baf545e7 (diff) | |
make the 'languageprefix' option default to on, and deprecate turning it off
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@49000 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | UPGRADE.txt | 6 | ||||
| -rw-r--r-- | doc/asterisk-conf.txt | 3 | ||||
| -rw-r--r-- | main/asterisk.c | 3 | ||||
| -rw-r--r-- | main/file.c | 2 |
4 files changed, 12 insertions, 2 deletions
diff --git a/UPGRADE.txt b/UPGRADE.txt index b0f5e2e7b..0068b6969 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 e8b03b6a0..9e915c16c 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 86da7b17e..5a393397b 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 5311b3a43..748814194 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); |