[asterisk-commits] tzafrir: branch 1.8 r335716 - /branches/1.8/main/asterisk.c

[SVN commits to the Asterisk project]

Author: tzafrir
Date: Tue Sep 13 16:33:20 2011
New Revision: 335716

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=335716
Log:
do parse defaultlanguage from asterisk.conf

Do parse the option "defaultlanguage" from the [options] section of
asterisk.conf, as in the sample config file. Otherwise the build-time
default language (normally "en") is always the default one.

Review: https://reviewboard.asterisk.org/r/1342/
Signed-off-by: Tzafrir Cohen (License #5035) <tzafrir.cohen at xorcom.com>

Modified:
    branches/1.8/main/asterisk.c

Modified: branches/1.8/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/asterisk.c?view=diff&rev=335716&r1=335715&r2=335716
==============================================================================
--- branches/1.8/main/asterisk.c (original)
+++ branches/1.8/main/asterisk.c Tue Sep 13 16:33:20 2011
@@ -3032,6 +3032,8 @@
 			}
 		} else if (!strcasecmp(v->name, "languageprefix")) {
 			ast_language_is_prefix = ast_true(v->value);
+		} else if (!strcasecmp(v->name, "defaultlanguage")) {
+			ast_copy_string(defaultlanguage, v->value, MAX_LANGUAGE);
  		} else if (!strcasecmp(v->name, "lockmode")) {
  			if (!strcasecmp(v->value, "lockfile")) {
  				ast_set_lock_type(AST_LOCK_TYPE_LOCKFILE);