Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISPConfig
ISPConfig 3
Commits
a2fd8637
Commit
a2fd8637
authored
Feb 22, 2017
by
Till Brehm
Browse files
Set mailman default language to 'en' when no language is set and add '' arond the language string.
parent
c612b7f4
Changes
3
Hide whitespace changes
Inline
Side-by-side
install/lib/installer_base.lib.php
View file @
a2fd8637
...
@@ -777,7 +777,7 @@ class installer_base {
...
@@ -777,7 +777,7 @@ class installer_base {
$virtual_domains
=
"' '"
;
$virtual_domains
=
"' '"
;
$content
=
str_replace
(
'{hostname}'
,
$conf
[
'hostname'
],
$content
);
$content
=
str_replace
(
'{hostname}'
,
$conf
[
'hostname'
],
$content
);
if
(
!
isset
(
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
]))
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
]
=
''
;
if
(
!
isset
(
$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
(
'{default_language}'
,
$old_options
[
'DEFAULT_SERVER_LANGUAGE'
],
$content
);
$content
=
str_replace
(
'{virtual_domains}'
,
$virtual_domains
,
$content
);
$content
=
str_replace
(
'{virtual_domains}'
,
$virtual_domains
,
$content
);
...
...
install/tpl/mm_cfg.py.master
View file @
a2fd8637
...
@@ -73,7 +73,7 @@ add_virtualhost(DEFAULT_URL_HOST, DEFAULT_EMAIL_HOST)
...
@@ -73,7 +73,7 @@ add_virtualhost(DEFAULT_URL_HOST, DEFAULT_EMAIL_HOST)
#-------------------------------------------------------------
#-------------------------------------------------------------
# The default language for this server.
# 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
# Iirc this was used in pre 2.1, leave it for now
...
...
server/conf/mm_cfg.py.master
View file @
a2fd8637
...
@@ -73,7 +73,7 @@ add_virtualhost(DEFAULT_URL_HOST, DEFAULT_EMAIL_HOST)
...
@@ -73,7 +73,7 @@ add_virtualhost(DEFAULT_URL_HOST, DEFAULT_EMAIL_HOST)
#-------------------------------------------------------------
#-------------------------------------------------------------
# The default language for this server.
# 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
# Iirc this was used in pre 2.1, leave it for now
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment