summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorTzafrir Cohen <tzafrir.cohen@xorcom.com>2011-09-13 21:40:56 +0000
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>2011-09-13 21:40:56 +0000
commit57a8b5a781bb3b68f7e538e062ba10ab9c51421a (patch)
tree2203f44c1ad04e441e931c55b947794e6b5b284a /main
parent1bf2d9e9c615686421bd12a556b51f7884705d03 (diff)
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> Original-Commit: http://svn.digium.com/svn/asterisk/branches/1.8@335716 Original-Commit: http://svn.digium.com/svn/asterisk/branches/10@335717 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@335718 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/asterisk.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/main/asterisk.c b/main/asterisk.c
index 748379a2a..16f3efa0e 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -3055,6 +3055,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);