From: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Date: Tue, 13 Sep 2011 21:33:20 +0000 (+0000)
Subject: do parse defaultlanguage from asterisk.conf
X-Git-Tag: 1.8.8.0-rc1~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42840a2ef9c7fdec9c2256d7ce98b86d8f897913;p=thirdparty%2Fasterisk.git

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@xorcom.com>

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

diff --git a/main/asterisk.c b/main/asterisk.c
index 2fb4d021f5..b54ab03cad 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -3032,6 +3032,8 @@ static void ast_readconfig(void)
 			}
 		} 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);