浏览代码

Allow the trans fields to use default catalog.

Romain Geissler 13 年之前
父节点
当前提交
15d35a2b8a
共有 2 个文件被更改,包括 10 次插入2 次删除
  1. 5 1
      Resources/views/CRUD/list_trans.html.twig
  2. 5 1
      Resources/views/CRUD/show_trans.html.twig

+ 5 - 1
Resources/views/CRUD/list_trans.html.twig

@@ -11,5 +11,9 @@ file that was distributed with this source code.
 {% extends 'SonataAdminBundle:CRUD:base_list_field.html.twig' %}
 
 {% block field%}
-    {{value|trans({}, field_description.options.catalogue)}}
+    {% if field_description.options.catalogue is not defined %}
+        {{value|trans}}
+    {% else %}
+        {{value|trans({}, field_description.options.catalogue)}}
+    {% endif %}
 {% endblock %}

+ 5 - 1
Resources/views/CRUD/show_trans.html.twig

@@ -11,5 +11,9 @@ file that was distributed with this source code.
 {% extends 'SonataAdminBundle:CRUD:base_show_field.html.twig' %}
 
 {% block field%}
-    {{value|trans({}, field_description.options.catalogue)}}
+    {% if field_description.options.catalogue is not defined %}
+        {{value|trans}}
+    {% else %}
+        {{value|trans({}, field_description.options.catalogue)}}
+    {% endif %}
 {% endblock %}