summaryrefslogtreecommitdiffstats
path: root/template/en/default/global
diff options
context:
space:
mode:
Diffstat (limited to 'template/en/default/global')
-rw-r--r--template/en/default/global/field-descs.none.tmpl2
-rw-r--r--template/en/default/global/user-error.html.tmpl10
2 files changed, 12 insertions, 0 deletions
diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl
index 8014fe255..7a2725121 100644
--- a/template/en/default/global/field-descs.none.tmpl
+++ b/template/en/default/global/field-descs.none.tmpl
@@ -88,4 +88,6 @@
"---" => "---",
" " => " " } %]
+[% MACRO get_resolution(res) GET resolution_descs.$res || res %]
+
[% Hook.process("end") %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 3b901929f..c615598b9 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -396,6 +396,16 @@
The value of a field is limited to 60 characters.
'[% value FILTER html %]' is too long ([% value.length %] characters).
+ [% ELSIF error == "fieldvalue_not_editable" %]
+ [% title = "Field Value Not Editable" %]
+ The value '[% old_value FILTER html %]' cannot be renamed because
+ it plays some special role for the '[% field FILTER html %]' field.
+
+ [% ELSIF error == "fieldvalue_not_deletable" %]
+ [% title = "Field Value Not Deletable" %]
+ The value '[% value FILTER html %]' cannot be removed because
+ it plays some special role for the '[% field FILTER html %]' field.
+
[% ELSIF error == "fieldvalue_not_specified" %]
[% title = "Field Value Not Specified" %]
No field value specified when trying to edit a field value.