From 7e64bb3eb41c5301b29413139953f90097d32e41 Mon Sep 17 00:00:00 2001 From: Till Brehm Date: Wed, 22 Feb 2017 17:49:47 +0100 Subject: [PATCH] Fixed last commit. --- install/lib/installer_base.lib.php | 2 +- install/tpl/mm_cfg.py.master | 2 +- server/conf/mm_cfg.py.master | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 088a98813c..d5f200661f 100644 --- a/install/lib/installer_base.lib.php +++ b/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); diff --git a/install/tpl/mm_cfg.py.master b/install/tpl/mm_cfg.py.master index 2e9a2227ae..c0de780e0d 100644 --- a/install/tpl/mm_cfg.py.master +++ b/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 diff --git a/server/conf/mm_cfg.py.master b/server/conf/mm_cfg.py.master index 04ec0d5fdf..3dcf5a6a61 100644 --- a/server/conf/mm_cfg.py.master +++ b/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 -- GitLab