From e8aa3f2d95ec07344c19ec25ef78640dca13e0da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Adamczyk?= Date: Fri, 23 Mar 2018 11:42:41 +0100 Subject: [PATCH] EZP-28181: Inconsistence with labels in content type specific view --- features/ContentType.feature | 4 ++-- src/bundle/Resources/translations/content_type.en.xliff | 8 ++++---- .../Resources/views/admin/content_type/view.html.twig | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/features/ContentType.feature b/features/ContentType.feature index 829c4e1a8a..5e9a8111d5 100644 --- 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 | | + | Content name pattern | | 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 | | + | Content name pattern | | 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 index 49551cbe65..ee05d9a19c 100644 --- a/src/bundle/Resources/translations/content_type.en.xliff +++ b/src/bundle/Resources/translations/content_type.en.xliff @@ -27,8 +27,8 @@ key: content_type.container - Default availability - Default availability + Default content availability + Default content availability key: content_type.default_availability @@ -87,8 +87,8 @@ key: content_type.name - Content name schema - Content name schema + Content name pattern + Content name pattern key: content_type.name_schema diff --git a/src/bundle/Resources/views/admin/content_type/view.html.twig b/src/bundle/Resources/views/admin/content_type/view.html.twig index 20f4059c1c..d55c5be2ff 100644 --- 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 @@ {{ content_type.descriptions[language_code]|default('') }} - {{ "content_type.name_schema"|trans|desc("Content name schema") }} + {{ "content_type.name_schema"|trans|desc("Content name pattern") }} {{ content_type.nameSchema }} @@ -71,7 +71,7 @@ - {{ "content_type.default_availability"|trans|desc('Default availability') }} + {{ "content_type.default_availability"|trans|desc('Default content availability') }}

{{ "content_type.default_availability.help"|trans|desc("Default availability in primary language, if translation is absent") }}