Skip to content

Commit 5898e68

Browse files
committed
Fixed a problem with the language setting on updates.
1 parent 6ba3dc4 commit 5898e68

File tree

4 files changed

+7
-0
lines changed

4 files changed

+7
-0
lines changed

install/dist/lib/fedora.lib.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,8 @@ public function install_ispconfig()
578578

579579
$content = str_replace('{server_id}', $conf['server_id'], $content);
580580
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
581+
$content = str_replace('{language}', $conf['language'], $content);
582+
581583
wf("$install_dir/server/lib/$configfile", $content);
582584

583585

install/dist/lib/opensuse.lib.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,8 @@ public function install_ispconfig()
599599

600600
$content = str_replace('{server_id}', $conf['server_id'], $content);
601601
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
602+
$content = str_replace('{language}', $conf['language'], $content);
603+
602604
wf("$install_dir/server/lib/$configfile", $content);
603605

604606

install/lib/installer_base.lib.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -879,6 +879,8 @@ public function install_ispconfig()
879879

880880
$content = str_replace('{server_id}', $conf['server_id'], $content);
881881
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
882+
$content = str_replace('{language}', $conf['language'], $content);
883+
882884
wf("$install_dir/server/lib/$configfile", $content);
883885

884886

install/update.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
$conf["mysql"]["ispconfig_user"] = $conf_old["db_user"];
9090
$conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];
9191
$conf['language'] = $conf_old['language'];
92+
if($conf['language'] == '{language}') $conf['language'] = 'en';
9293

9394
if(isset($conf_old["dbmaster_host"])) $conf["mysql"]["master_host"] = $conf_old["dbmaster_host"];
9495
if(isset($conf_old["dbmaster_database"])) $conf["mysql"]["master_database"] = $conf_old["dbmaster_database"];

0 commit comments

Comments
 (0)