[asterisk-commits] tzafrir: trunk r335718 - /trunk/main/asterisk.c

[SVN commits to the Asterisk project]

Author: tzafrir
Date: Tue Sep 13 16:40:56 2011
New Revision: 335718

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=335718
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>
Original-Commit: http://svn.digium.com/svn/asterisk/branches/1.8@335716
Original-Commit: http://svn.digium.com/svn/asterisk/branches/10@335717

Modified:
    trunk/main/asterisk.c

Modified: trunk/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/asterisk.c?view=diff&rev=335718&r1=335717&r2=335718
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Tue Sep 13 16:40:56 2011
@@ -3055,6 +3055,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);