fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-02 16:52:16 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1722 incorrect language selection when domain setting conflicts with system setting

Browse source
This commit is contained in:
Kijin Sung 2021-06-19 21:55:14 +09:00
parent 1ab02086bd
commit 865e83a46a
7 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/admin/tpl/config_advanced.html
View file

@ -64,7 +64,7 @@
<label class="x_control-label">{$lang->lang_select}</label>
<div class="x_controls">
<label for="lang_{$key}" class="x_inline" loop="$supported_lang=>$key,$val">
<input type="checkbox" name="enabled_lang[]" id="lang_{$key}" value="{$key}" disabled="disabled"|cond="$key==$default_lang" checked="checked"|cond="in_array($key, $enabled_lang)" />
<input type="checkbox" name="enabled_lang[]" id="lang_{$key}" value="{$key}" checked="checked"|cond="in_array($key, $enabled_lang)" />
{$val['name']}
</label>
</div>

1
modules/admin/tpl/config_domains_edit.html
View file

@ -79,6 +79,7 @@
<label class="x_control-label" for="default_lang">{$lang->default_lang}</label>
<div class="x_controls">
<select name="default_lang" id="default_lang">
<option value="default" selected="selected"|cond="$domain_lang === 'default'">{$lang->follow_default_lang}</option>
<option value="{$key}" loop="$enabled_lang => $key" selected="selected"|cond="$key == $domain_lang">{$supported_lang[$key]['name']}</option>
</select>
</div>