Fixed last commit.

install/lib/installer_base.lib.php

@@ -777,7 +777,7 @@ class installer_base {
 			$virtual_domains = "' '";
 
 		$content = str_replace('{hostname}', $conf['hostname'], $content);
-		if(!isset($old_options['DEFAULT_SERVER_LANGUAGE'])) $old_options['DEFAULT_SERVER_LANGUAGE'] = 'en';
+		if(!isset($old_options['DEFAULT_SERVER_LANGUAGE']) || $old_options['DEFAULT_SERVER_LANGUAGE'] == '') $old_options['DEFAULT_SERVER_LANGUAGE'] = 'en';
 		$content = str_replace('{default_language}', $old_options['DEFAULT_SERVER_LANGUAGE'], $content);
 		$content = str_replace('{virtual_domains}', $virtual_domains, $content);
 

install/tpl/mm_cfg.py.master

@@ -73,7 +73,7 @@ add_virtualhost(DEFAULT_URL_HOST, DEFAULT_EMAIL_HOST)
 
 #-------------------------------------------------------------
 # The default language for this server.
-DEFAULT_SERVER_LANGUAGE = '{default_language}'
+DEFAULT_SERVER_LANGUAGE = {default_language}
 
 #-------------------------------------------------------------
 # Iirc this was used in pre 2.1, leave it for now

server/conf/mm_cfg.py.master

@@ -73,7 +73,7 @@ add_virtualhost(DEFAULT_URL_HOST, DEFAULT_EMAIL_HOST)
 
 #-------------------------------------------------------------
 # The default language for this server.
-DEFAULT_SERVER_LANGUAGE = '{default_language}'
+DEFAULT_SERVER_LANGUAGE = {default_language}
 
 #-------------------------------------------------------------
 # Iirc this was used in pre 2.1, leave it for now