fixed a bug in config panel. added nicer temporary error message for missing language fields
This commit is contained in:
parent
754d2899b3
commit
60e0c7ba42
@ -254,7 +254,7 @@
|
|||||||
$l = $lang['admin'][ADMIN_PANEL][ADMIN_PANEL_ACTION];
|
$l = $lang['admin'][ADMIN_PANEL][ADMIN_PANEL_ACTION];
|
||||||
}
|
}
|
||||||
|
|
||||||
$errors[$field] = $l['error'][$field];
|
$errors[$field] = isset($l['error'][$field])? $l['error'][$field] : htmlspecialchars($field);
|
||||||
if ($halt)
|
if ($halt)
|
||||||
break;
|
break;
|
||||||
} else {
|
} else {
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
{validate id="timeoffset" message=$panelstrings.error.maxentries append="error"}
|
{validate id="timeoffset" message=$panelstrings.error.maxentries append="error"}
|
||||||
{validate id="timeformat" message=$panelstrings.error.maxentries append="error"}
|
{validate id="timeformat" message=$panelstrings.error.maxentries append="error"}
|
||||||
{validate id="dateformat" message=$panelstrings.error.maxentries append="error"}
|
{validate id="dateformat" message=$panelstrings.error.maxentries append="error"}
|
||||||
|
{validate id="dateformatshort" message=$panelstrings.error.maxentries append="error"}
|
||||||
{validate id="lang" message=$panelstrings.error.maxentries append="error"}
|
{validate id="lang" message=$panelstrings.error.maxentries append="error"}
|
||||||
{validate id="charset" message=$panelstrings.error.maxentries append="error"}
|
{validate id="charset" message=$panelstrings.error.maxentries append="error"}
|
||||||
|
|
||||||
@ -132,7 +133,7 @@
|
|||||||
|
|
||||||
<dt> <label for="charset"> {$panelstrings.charset} </label></dt>
|
<dt> <label for="charset"> {$panelstrings.charset} </label></dt>
|
||||||
<dd> <p><input type="text" name="charset" id="charset"
|
<dd> <p><input type="text" name="charset" id="charset"
|
||||||
class="smalltextinput{$error.dateformat|notempty:" field-error"}"
|
class="smalltextinput{$error.charset|notempty:" field-error"}"
|
||||||
value="{$fp_config.locale.charset}" /></p>
|
value="{$fp_config.locale.charset}" /></p>
|
||||||
<p>{$panelstrings.charsettip}</p>
|
<p>{$panelstrings.charsettip}</p>
|
||||||
</dd>
|
</dd>
|
||||||
|
@ -63,6 +63,7 @@
|
|||||||
'You can use floating point (e.g. 2h30" => 2.5)',
|
'You can use floating point (e.g. 2h30" => 2.5)',
|
||||||
'timeformat'=> 'You must insert a format string for time',
|
'timeformat'=> 'You must insert a format string for time',
|
||||||
'dateformat'=> 'You must insert a format string for date',
|
'dateformat'=> 'You must insert a format string for date',
|
||||||
|
'dateformatshort'=> 'You must insert a format string for date (short)',
|
||||||
'charset' => 'You must insert a charset id',
|
'charset' => 'You must insert a charset id',
|
||||||
'lang' => 'The language you chose is not available'
|
'lang' => 'The language you chose is not available'
|
||||||
);
|
);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user