diff --git a/src/Admin/ActionListener/ContentVersion/TranslationsListener.php b/src/Admin/ActionListener/ContentVersion/TranslationsListener.php index db4bead..af5fdcd 100644 --- a/src/Admin/ActionListener/ContentVersion/TranslationsListener.php +++ b/src/Admin/ActionListener/ContentVersion/TranslationsListener.php @@ -10,7 +10,7 @@ use Softspring\CmsBundle\Manager\RouteManagerInterface; use Softspring\CmsBundle\Model\ContentInterface; use Softspring\CmsBundle\Model\ContentVersionInterface; -use Softspring\CmsBundle\Render\RenderErrorException; +use Softspring\CmsBundle\Render\Error\RenderErrorException; use Softspring\CmsBundle\Request\FlashNotifier; use Softspring\CmsBundle\Translator\TranslatableContext; use Softspring\CmsTranslationPlugin\SfsCmsTranslationPlugin; diff --git a/src/Translator/TranslatorExtractor.php b/src/Translator/TranslatorExtractor.php index 4e74421..b5406b7 100644 --- a/src/Translator/TranslatorExtractor.php +++ b/src/Translator/TranslatorExtractor.php @@ -89,7 +89,7 @@ public function extract(VersionInterface $version): array $seo = $version->getSeo(); foreach ($contentConfig as $field => $fieldConfig) { $extractedTranslations = $this->extractFieldTranslations($fieldConfig, $seo[$field] ?? null); - if (null !== $extractedTranslations) { + if ($extractedTranslations instanceof Translation) { $translations['_seo'][$field] = $extractedTranslations; } } @@ -151,7 +151,7 @@ protected function extractModule(array $moduleData): array continue; } $extractedTranslations = $this->extractFieldTranslations($fieldConfig, $moduleData[$field] ?? null); - if (null !== $extractedTranslations) { + if ($extractedTranslations instanceof Translation) { $translations[$field] = $extractedTranslations; } } diff --git a/templates/admin/content/version_translations.bootstrap5.html.twig b/templates/admin/content/version_translations.bootstrap5.html.twig index 7243392..434b641 100644 --- a/templates/admin/content/version_translations.bootstrap5.html.twig +++ b/templates/admin/content/version_translations.bootstrap5.html.twig @@ -16,23 +16,23 @@ href="{{ url('sfs_cms_admin_content_'~content_type~'_list') }}">{{ ('admin_'~content_type~'.list.breadcrumb')|trans }}
  • {{ ('admin_'~content_type~'.read.breadcrumb')|trans({'%name%': entity.name}) }} + href="{{ url('sfs_cms_admin_content_'~content_type~'_details', {'content':content_entity}) }}">{{ ('admin_'~content_type~'.read.breadcrumb')|trans({'%name%': content_entity.name}) }}
  • {{ ('admin_'~content_type~'.translations.breadcrumb')|trans({'%name%':content_entity.name}) }}
    • {% endblock breadcrums_content %} {% block content %} - {% include ['@content/'~content_type~'/admin/_content_title.html.twig', '@SfsCms/admin/content/_content_title.html.twig'] with {'current':'translations', 'content_type':content_type, 'content_entity':entity, 'version_entity': prev_version|default(false)} %} - {% include ['@content/'~content_type~'/admin/_content_tabs.html.twig', '@SfsCms/admin/content/_content_tabs.html.twig'] with {'current':'translations', 'content':content_entity, 'entity':version_entity} %} + {% include ['@content/'~content_type~'/admin/_content_title.html.twig', '@SfsCms/admin/content/_content_title.html.twig'] with {'current':'translations', 'content_type':content_type, 'content_entity':content_entity, 'version_entity': prev_version|default(false)} %} + {% include ['@content/'~content_type~'/admin/_content_tabs.html.twig', '@SfsCms/admin/content/_content_tabs.html.twig'] with {'current':'translations', 'content':content_entity, 'version_entity': version_entity} %}
    - {% if not content_config.admin.version_translations_import.is_granted or is_granted(content_config.admin.version_translations_import.is_granted, entity) %} + {% if not content_config.admin.version_translations_import.is_granted or is_granted(content_config.admin.version_translations_import.is_granted, content_entity) %} + href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_import', {'content':content_entity.id, 'back':'translations', 'version':prev_version.id}) }}"> {{ ('admin_'~content_type~'.translations.actions.import_translations.link')|trans }} @@ -43,7 +43,7 @@ {% endif %} - {% if not content_config.admin.version_translations_export.is_granted or is_granted(content_config.admin.version_translations_export.is_granted, entity) %} + {% if not content_config.admin.version_translations_export.is_granted or is_granted(content_config.admin.version_translations_export.is_granted, content_entity) %} {% if content_config.admin.version_translations_export.formats|length > 1 %}
    - {{ ('admin_'~content_type~'.translations.actions.cancel.button')|trans }} + {{ ('admin_'~content_type~'.translations.actions.cancel.button')|trans }}
    {{ form_end(form) }}
    diff --git a/templates/admin/content/version_translations_import.bootstrap5.html.twig b/templates/admin/content/version_translations_import.bootstrap5.html.twig index 856a66b..bd91873 100644 --- a/templates/admin/content/version_translations_import.bootstrap5.html.twig +++ b/templates/admin/content/version_translations_import.bootstrap5.html.twig @@ -15,15 +15,15 @@ href="{{ url('sfs_cms_admin_content_'~content_type~'_list') }}">{{ ('admin_'~content_type~'.list.breadcrumb')|trans }}
  • {{ ('admin_'~content_type~'.read.breadcrumb')|trans({'%name%': entity.name}) }} + href="{{ url('sfs_cms_admin_content_'~content_type~'_details', {'content':content_entity.id}) }}">{{ ('admin_'~content_type~'.read.breadcrumb')|trans({'%name%': content_entity.name}) }}
  • {{ ('admin_'~content_type~'.translations_import.breadcrumb')|trans({'%name%':content_entity.name}) }}
    • {% endblock breadcrums_content %} {% block content %} - {% include ['@content/'~content_type~'/admin/_content_title.html.twig', '@SfsCms/admin/content/_content_title.html.twig'] with {'current':'translations', 'content_type':content_type, 'content_entity':entity, 'version_entity': prev_version|default(false)} %} - {% include ['@content/'~content_type~'/admin/_content_tabs.html.twig', '@SfsCms/admin/content/_content_tabs.html.twig'] with {'current':'translations', 'content':content_entity, 'entity':version_entity} %} + {% include ['@content/'~content_type~'/admin/_content_title.html.twig', '@SfsCms/admin/content/_content_title.html.twig'] with {'current':'translations', 'content_type':content_type, 'content_entity':content_entity, 'version_entity': prev_version|default(false)} %} + {% include ['@content/'~content_type~'/admin/_content_tabs.html.twig', '@SfsCms/admin/content/_content_tabs.html.twig'] with {'current':'translations', 'content':content_entity, 'version_entity': version_entity} %}
    @@ -34,7 +34,7 @@ {{ form_rest(form) }}
    - {{ ('admin_'~content_type~'.translations_import.actions.cancel.button')|trans }} diff --git a/templates/admin/content/version_translations_import.semantic-ui.html.twig b/templates/admin/content/version_translations_import.semantic-ui.html.twig index 79a135f..80bbaba 100644 --- a/templates/admin/content/version_translations_import.semantic-ui.html.twig +++ b/templates/admin/content/version_translations_import.semantic-ui.html.twig @@ -19,13 +19,13 @@ href="{{ url('sfs_cms_admin_content_'~content_type~'_list') }}">{{ ('admin_'~content_type~'.list.breadcrumb')|trans }} {{ ('admin_'~content_type~'.read.breadcrumb')|trans({'%name%': entity.name}) }} + href="{{ url('sfs_cms_admin_content_'~content_type~'_details', {'content':content_entity.id}) }}">{{ ('admin_'~content_type~'.read.breadcrumb')|trans({'%name%': content_entity.name}) }} {{ ('admin_'~content_type~'.translations_import.breadcrumb')|trans({'%name%':content_entity.name}) }} {% endblock breadcrums_content %} {% block content %} - {% include ['@content/'~content_type~'/admin/_content_tabs.html.twig', '@SfsCms/admin/content/_content_tabs.html.twig'] with {'current':'translations', 'content':content_entity, 'entity':version_entity} %} + {% include ['@content/'~content_type~'/admin/_content_tabs.html.twig', '@SfsCms/admin/content/_content_tabs.html.twig'] with {'current':'translations', 'content':content_entity, 'version_entity': version_entity} %}
    {{ form_start(form,{'attr':{'class':'ui form clearing'}}) }} @@ -36,7 +36,7 @@ - {{ ('admin_'~content_type~'.translations_import.actions.cancel.button')|trans }}
    diff --git a/templates/bundles/SfsCmsBundle/admin/content/_read_translations.bootstrap5.html.twig b/templates/bundles/SfsCmsBundle/admin/content/_read_translations.bootstrap5.html.twig index 6352f49..8abc240 100644 --- a/templates/bundles/SfsCmsBundle/admin/content/_read_translations.bootstrap5.html.twig +++ b/templates/bundles/SfsCmsBundle/admin/content/_read_translations.bootstrap5.html.twig @@ -6,8 +6,8 @@ {% block title %}
    {{ title }} - {% if not content_config.admin.version_translations.is_granted or is_granted(content_config.admin.version_translations.is_granted, entity) %} - {{ ('admin_'~content_type~'.read.translations.edit.link')|trans }} + {% if not content_config.admin.version_translations.is_granted or is_granted(content_config.admin.version_translations.is_granted, content_entity) %} + {{ ('admin_'~content_type~'.read.translations.edit.link')|trans }} {% else %} {{ ('admin_'~content_type~'.read.translations.edit.link')|trans }} {% endif %} @@ -15,12 +15,12 @@ {% endblock %} {% block content %} - {% set stats = entity.lastVersion.getMetaField('translations_statistics')|default([]) %} + {% set stats = content_entity.lastVersion.getMetaField('translations_statistics')|default([]) %}

    {#Default language#} - {#{{ entity.defaultLocale }}#} - {{ ('locale.'~entity.defaultLocale)|trans({}, 'sfs_cms_admin') }} + {#{{ content_entity.defaultLocale }}#} + {{ ('locale.'~content_entity.defaultLocale)|trans({}, 'sfs_cms_admin') }}

    diff --git a/templates/bundles/SfsCmsBundle/admin/content/_read_translations.semantic-ui.html.twig b/templates/bundles/SfsCmsBundle/admin/content/_read_translations.semantic-ui.html.twig index 386a9a3..6730f36 100644 --- a/templates/bundles/SfsCmsBundle/admin/content/_read_translations.semantic-ui.html.twig +++ b/templates/bundles/SfsCmsBundle/admin/content/_read_translations.semantic-ui.html.twig @@ -4,8 +4,8 @@ {% trans_default_domain 'sfs_cms_contents' %} {% block title %} - {% if not content_config.admin.version_translations.is_granted or is_granted(content_config.admin.version_translations.is_granted, entity) %} - + {% if not content_config.admin.version_translations.is_granted or is_granted(content_config.admin.version_translations.is_granted, content_entity) %} + {{ ('admin_'~content_type~'.read.translations.edit.link')|trans }} {% else %} @@ -17,12 +17,12 @@ {% endblock %} {% block content %} - {% set stats = entity.lastVersion.getMetaField('translations_statistics')|default([]) %} + {% set stats = content_entity.lastVersion.getMetaField('translations_statistics')|default([]) %}
    -
    {{ ('locale.'~entity.defaultLocale)|trans({}, 'sfs_cms_admin') }}
    +
    {{ ('locale.'~content_entity.defaultLocale)|trans({}, 'sfs_cms_admin') }}