EZP-28181: Inconsistence with labels in content type specific view

mikadamczyk · Mar 26, 2018 · e8aa3f2 · e8aa3f2
1 parent 021458f
commit e8aa3f2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/features/ContentType.feature b/features/ContentType.feature
@@ -35,7 +35,7 @@ Feature: Content types management
       | label                | value    |
       | Name                 | Test CT  |
       | Identifier           | iTestCT  |
-      | Content name schema  | <name>   |
+      | Content name pattern | <name>   |
       And Content Type "Test CT" has field "CountryField" of type "ezcountry"
       And notification that "Content type" "Test CT" is updated appears
 
@@ -68,7 +68,7 @@ Feature: Content types management
       | label                | value           |
       | Name                 | Test CT edited  |
       | Identifier           | iTestCT         |
-      | Content name schema  | <name>          |
+      | Content name pattern | <name>          |
       And Content Type "Test CT" has proper fields
       | fieldName      | fieldType |
       | CountryField   | ezcountry |

diff --git a/src/bundle/Resources/translations/content_type.en.xliff b/src/bundle/Resources/translations/content_type.en.xliff
@@ -27,8 +27,8 @@
         <note>key: content_type.container</note>
       </trans-unit>
       <trans-unit id="693f9ade0c2bb6a7c19b6f9b818d96aa23f1e013" resname="content_type.default_availability">
-        <source>Default availability</source>
-        <target state="new">Default availability</target>
+        <source>Default content availability</source>
+        <target state="new">Default content availability</target>
         <note>key: content_type.default_availability</note>
       </trans-unit>
       <trans-unit id="3b3fc626a669a5462ec9fa7c94280a3573d8b106" resname="content_type.default_availability.help">
@@ -87,8 +87,8 @@
         <note>key: content_type.name</note>
       </trans-unit>
       <trans-unit id="9e9628fc59643f3167ebe81dfed3e40eecd281c9" resname="content_type.name_schema">
-        <source>Content name schema</source>
-        <target state="new">Content name schema</target>
+        <source>Content name pattern</source>
+        <target state="new">Content name pattern</target>
         <note>key: content_type.name_schema</note>
       </trans-unit>
       <trans-unit id="da59e6ae77cae375a30d7285970b1b2d9690049e" resname="content_type.sort_field.ascending">

diff --git a/src/bundle/Resources/views/admin/content_type/view.html.twig b/src/bundle/Resources/views/admin/content_type/view.html.twig
@@ -48,7 +48,7 @@
                 <td>{{ content_type.descriptions[language_code]|default('') }}</td>
             </tr>
             <tr>
-                <th>{{ "content_type.name_schema"|trans|desc("Content name schema") }}</th>
+                <th>{{ "content_type.name_schema"|trans|desc("Content name pattern") }}</th>
                 <td>{{ content_type.nameSchema }}</td>
             </tr>
             <tr>
@@ -71,7 +71,7 @@
             </tr>
             <tr>
                 <th>
-                    {{ "content_type.default_availability"|trans|desc('Default availability') }}
+                    {{ "content_type.default_availability"|trans|desc('Default content availability') }}
                     <p class="text-secondary small">
                         {{ "content_type.default_availability.help"|trans|desc("Default availability in primary language, if translation is absent") }}
                     </p>