Skip to content

Commit 230b918

Browse files
authored
Merge branch '4.6' into IBX-10302
2 parents 07f6484 + 9de9a7a commit 230b918

File tree

6 files changed

+22
-3
lines changed

6 files changed

+22
-3
lines changed

src/bundle/Resources/translations/ibexa_content_edit.en.xliff

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
<target state="new">Content published.</target>
2727
<note>key: content.published.success</note>
2828
</trans-unit>
29+
<trans-unit id="3f953d15b951d613c3b973522fbbf48ddd314489" resname="content.title.empty_title_placeholder">
30+
<source>[Untitled]</source>
31+
<target state="new">[Untitled]</target>
32+
<note>key: content.title.empty_title_placeholder</note>
33+
</trans-unit>
2934
<trans-unit id="f34946beab1da2af6535a8e4a88145e9557de0aa" resname="editing">
3035
<source>Editing</source>
3136
<target state="new">Editing</target>

src/bundle/Resources/translations/ibexa_dashboard.en.xliff

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@
5656
<target state="new">Edit</target>
5757
<note>key: dashboard.table.content.edit</note>
5858
</trans-unit>
59+
<trans-unit id="e84a6508aff9e0a1f694695d466a7dca38f42dfb" resname="dashboard.table.content.empty_name_placeholder">
60+
<source>[Untitled]</source>
61+
<target state="new">[Untitled]</target>
62+
<note>key: dashboard.table.content.empty_name_placeholder</note>
63+
</trans-unit>
5964
<trans-unit id="e17a8999c9e44b7e8ea1ba0f5cff596ece264da5" resname="dashboard.table.content_type">
6065
<source>Content type</source>
6166
<target state="new">Content type</target>

src/bundle/Resources/translations/ibexa_drafts.en.xliff

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
<target state="new">Delete</target>
3232
<note>key: drafts.list.action.remove.confirmation.title</note>
3333
</trans-unit>
34+
<trans-unit id="a467c57cd3c072a6e0d2152a45ee3784c9f42b9d" resname="drafts.list.content.empty_name_placeholder">
35+
<source>[Untitled]</source>
36+
<target state="new">[Untitled]</target>
37+
<note>key: drafts.list.content.empty_name_placeholder</note>
38+
</trans-unit>
3439
<trans-unit id="b62c11ec52c71a7923851340a98932ed8ac8704b" resname="drafts.list.content_type">
3540
<source>Content type</source>
3641
<target state="new">Content type</target>

src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
{% import _self as macros %}
1010

11+
{% set empty_content_name_placeholder = 'drafts.list.content.empty_name_placeholder'|trans|desc('[Untitled]') %}
12+
1113
{% block title %}{{ 'drafts.list'|trans|desc('Drafts') }} - {{ parent() }}{% endblock %}
1214

1315
{% block body_class %}ibexa-drafts-list-view{% endblock %}
@@ -49,7 +51,7 @@
4951

5052
{% set col_raw %}
5153
<span title="{{ row.versionInfo.name }}">
52-
{{ row.versionInfo.name }}
54+
{{ row.versionInfo.name|default(empty_content_name_placeholder) }}
5355
</span>
5456
{% endset %}
5557
{% set body_row_cols = body_row_cols|merge([{

src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_draft_list.html.twig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{% trans_default_domain 'ibexa_dashboard' %}
22
{% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %}
33

4+
{% set empty_content_name_placeholder = 'dashboard.table.content.empty_name_placeholder'|trans|desc('[Untitled]') %}
45
{% set body_rows = [] %}
56
{% for row in data %}
67
{% set body_row_cols = [] %}
@@ -19,7 +20,7 @@
1920
}]) %}
2021

2122
{% set body_row_cols = body_row_cols|merge([
22-
{ content: row.versionInfo.name },
23+
{ content: row.versionInfo.name|default(empty_content_name_placeholder)},
2324
{ content: row.contentType.name },
2425
{ content: ibexa_admin_ui_config.languages.mappings[row.versionInfo.initialLanguageCode].name },
2526
{ content: row.versionInfo.versionNo },

src/bundle/Resources/views/themes/admin/ui/edit_header.html.twig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
{% set content = content|default(null) %}
44
{% set show_extra_bottom_content = show_extra_bottom_content|default(false) %}
55
{% set is_user_content_type = content_type is defined and content_type.identifier in ibexa_admin_ui_config.userContentTypes %}
6+
{% set empty_title_placeholder = 'content.title.empty_title_placeholder'|trans|desc('[Untitled]') %}
67

78
<div class="ibexa-edit-header {{ show_extra_bottom_content ? 'ibexa-edit-header--has-extra-content' }}">
89
<div class="ibexa-edit-header__containers">
@@ -38,7 +39,7 @@
3839
</div>
3940
<div class="ibexa-edit-header__container ibexa-edit-header__container--details">
4041
<div class="ibexa-edit-header__title-section">
41-
<h1 class="ibexa-edit-header__title">{{ title }}</h1>
42+
<h1 class="ibexa-edit-header__title">{{ title|default(empty_title_placeholder) }}</h1>
4243
<div class="ibexa-edit-header__after-title">
4344
{% block after_title %}{% endblock %}
4445
</div>

0 commit comments

Comments
 (0)