FT: different stuff

tischsoic · tischsoic · commit b43d595874fd · 2023-08-30T09:46:56.000+02:00
diff --git a/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig b/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig
@@ -56,7 +56,7 @@
                     {% if bookmark.userCanEdit %}
                         <button
                             class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text ibexa-btn--content-edit"
-                            title="{{ 'bookmark.list.content.edit'|trans|desc('Edit content') }}"
+                            title="{{ 'bookmark.list.content.edit'|trans|desc('Edit') }}"
                             data-content-id="{{ bookmark.contentInfo.id }}"
                             data-language-code="{{ bookmark.contentInfo.mainLanguageCode }}"
                         >
diff --git a/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig b/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig
@@ -67,7 +67,7 @@
                     {% set col_raw %}
                         <button
                             class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text mx-2 ibexa-btn--content-draft-edit"
-                            title="{{ 'drafts.list.action.edit'|trans|desc('Edit draft') }}"
+                            title="{{ 'drafts.list.action.edit'|trans|desc('Edit') }}"
                             data-content-id="{{ row.versionInfo.contentInfo.id }}"
                             data-language-code="{{ row.versionInfo.initialLanguageCode }}"
                             data-content-draft-edit-url="{{ path(content_draft_edit_url, {
diff --git a/src/bundle/Resources/views/themes/admin/content/tab/versions/table.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/versions/table.html.twig
@@ -104,7 +104,7 @@
                                         <a
                                             href="{{ edit_url }}"
                                             class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text {% if edit_draft_disabled %}ibexa-btn--prevented{% endif %}"
-                                            title="{{ 'tab.versions.table.action.draft.edit'|trans|desc('Edit draft') }}"
+                                            title="{{ 'tab.versions.table.action.draft.edit'|trans|desc('Edit') }}"
                                             {% if edit_draft_disabled %}disabled{% endif %}
                                         >
                                             <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
@@ -123,7 +123,7 @@
                                             data-content-id="{{ version.contentInfo.id }}"
                                             data-language-code="{{ version.initialLanguageCode }}"
                                             class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text mx-2 ibexa-btn--content-draft-edit {% if edit_draft_disabled %}ibexa-btn--prevented{% endif %}"
-                                            title="{{ 'tab.versions.table.action.draft.edit'|trans|desc('Edit draft') }}"
+                                            title="{{ 'tab.versions.table.action.draft.edit'|trans|desc('Edit') }}"
                                             {% if edit_draft_disabled %}disabled{% endif %}
                                         >
                                             <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
diff --git a/src/bundle/Resources/views/themes/admin/content_type/macros.html.twig b/src/bundle/Resources/views/themes/admin/content_type/macros.html.twig
@@ -17,7 +17,7 @@
 
 {% macro content_type_copy(content_type, content_type_group, class_name) %}
     <button
-        title="{{ 'content_type.action.copy'|trans|desc('Copy') }}"
+        title="{{ 'content_type.action.copy'|trans|desc('Duplicate') }}"
         type="button"
         data-content-type-id="{{ content_type.id }}"
         data-content-type-identifier="{{ content_type.identifier }}"
diff --git a/src/bundle/Resources/views/themes/admin/link_manager/list.html.twig b/src/bundle/Resources/views/themes/admin/link_manager/list.html.twig
@@ -49,7 +49,7 @@
                     <a
                         href="{{ edit_url }}"
                         class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text"
-                        title="{{ 'url.action.edit'|trans|desc('Edit URL') }}"
+                        title="{{ 'url.action.edit'|trans|desc('Edit') }}"
                     >
                         <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
                             <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
diff --git a/src/bundle/Resources/views/themes/admin/link_manager/view.html.twig b/src/bundle/Resources/views/themes/admin/link_manager/view.html.twig
@@ -39,7 +39,7 @@
                         <a href="{{ url.url }}" target="_blank">{{ url.url }}</a>
                         <a href="{{ path('ibexa.link_manager.edit', { urlId: url.id }) }}"
                            class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text mx-2 float-right"
-                           title="{{ 'url.action.edit'|trans|desc('Edit URL') }}">
+                           title="{{ 'url.action.edit'|trans|desc('Edit') }}">
                             <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
                                 <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
                             </svg>
@@ -98,7 +98,7 @@
                 {% if can_edit %}
                     <button
                         class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text ibexa-btn--content-edit"
-                        title="{{ 'url.action.item.edit'|trans|desc('Edit content') }}"
+                        title="{{ 'url.action.item.edit'|trans|desc('Edit') }}"
                         data-content-id="{{ content.id }}"
                         data-language-code="{{ content.mainLanguageCode }}"
                     >
diff --git a/src/bundle/Resources/views/themes/admin/section/list.html.twig b/src/bundle/Resources/views/themes/admin/section/list.html.twig
@@ -136,7 +136,6 @@
                 { },
             ],
             body_rows,
-            empty_table_info_text: 'dashboard.tab.my_drafts.empty'|trans|desc('No content. Drafts you create will show up here'),
             show_notice: show_table_notice,
             notice_message: 'section.list.cannot_delete_notice'|trans|desc('You cannot delete the disabled sections, because they have assigned content.'),
         } %}
diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/all_media.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/all_media.html.twig
@@ -31,7 +31,7 @@
         { content: row.type },
         { content: row.contributor is not null ? row.contributor.name : 'dashboard.table.contributor.not_found'|trans|desc('Can\'t fetch contributor') },
         { content: row.modified|ibexa_full_datetime },
-        { has_action_btns: true, content: macros.edit_content_button(row, 'dashboard.table.all.media.edit'|trans|desc('Edit Media')), raw: true },
+        { has_action_btns: true, content: macros.edit_content_button(row, 'dashboard.table.all.media.edit'|trans|desc('Edit')), raw: true },
     ]) %}
 
     {% set body_rows = body_rows|merge([{ cols: body_row_cols }]) %}
diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_draft_list.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_draft_list.html.twig
@@ -28,7 +28,7 @@
         {% set col_raw %}
             <button
                 class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text mx-2 ibexa-btn--content-draft-edit"
-                title="{{ 'dashboard.table.draft.edit'|trans|desc('Edit Draft') }}"
+                title="{{ 'dashboard.table.draft.edit'|trans|desc('Edit') }}"
                 data-content-draft-edit-url="{{ path(content_draft_edit_url, {
                     'contentId': row.versionInfo.contentInfo.id,
                     'versionNo': row.versionInfo.versionNo,
@@ -77,7 +77,7 @@
         { },
     ],
     body_rows,
-    empty_table_info_text: 'dashboard.tab.my_drafts.empty'|trans|desc('No content. Drafts you create will show up here'),
+    empty_table_info_text: 'dashboard.tab.my_drafts.empty'|trans|desc('You have no drafts yet. Your drafts will show up here.'),
 } %}
 
 {% if pager.haveToPaginate %}
diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_media.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_media.html.twig
@@ -30,7 +30,7 @@
     {% set body_row_cols = body_row_cols|merge([
         { content: row.type },
         { content: row.modified|ibexa_full_datetime },
-        { has_action_btns: true, content: macros.edit_content_button(row, 'dashboard.table.media.edit'|trans|desc('Edit Media')), raw: true },
+        { has_action_btns: true, content: macros.edit_content_button(row, 'dashboard.table.media.edit'|trans|desc('Edit')), raw: true },
     ]) %}
 
     {% set body_rows = body_rows|merge([{ cols: body_row_cols }]) %}
diff --git a/src/bundle/Resources/views/themes/admin/url_wildcard/list.html.twig b/src/bundle/Resources/views/themes/admin/url_wildcard/list.html.twig
@@ -66,7 +66,7 @@
                 <a
                     href="{{ edit_url }}"
                     class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text"
-                    title="{{ 'url_wildcard.action.edit'|trans|desc('Edit URL wildcard') }}"
+                    title="{{ 'url_wildcard.action.edit'|trans|desc('Edit') }}"
                 >
                     <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
                         <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
diff --git a/src/bundle/Resources/views/themes/admin/user/policy/edit.html.twig b/src/bundle/Resources/views/themes/admin/user/policy/edit.html.twig
@@ -24,7 +24,7 @@
             {% do form.policy.setRendered %}
         </section>
         <section class="ibexa-fieldgroup">
-            <h2 class="ibexa-fieldgroup__name"><b>{{ 'policy.view.limitations.title'|trans|desc('Edit Limitations') }}</b></h2>
+            <h2 class="ibexa-fieldgroup__name"><b>{{ 'policy.view.limitations.title'|trans|desc('Edit') }}</b></h2>
             <div class="ibexa-fieldgroup__content">
                 {% for limitation_form in form.limitations %}
                     {{ include(limitation_form.vars.template, {form: limitation_form}, with_context = false) }}
diff --git a/src/lib/Behat/Page/UserSettingsPage.php b/src/lib/Behat/Page/UserSettingsPage.php
@@ -65,7 +65,7 @@ public function openAutosaveDraftEditionPage(): void
     {
         $this->getHTMLPage()
             ->findAll(new VisibleCSSLocator('settingsSection', '#ibexa-tab-my-preferences .ibexa-details'))
-            ->getByCriterion(new ChildElementTextCriterion(new VisibleCSSLocator('settingHeader', '.ibexa-table-header'), 'Edit content'))
+            ->getByCriterion(new ChildElementTextCriterion(new VisibleCSSLocator('settingHeader', '.ibexa-table-header'), 'Edit'))
             ->find(new VisibleCSSLocator('editButton', '[data-original-title="Edit"]'))
             ->click();
     }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@`
`56`	`56`	`{% if bookmark.userCanEdit %}`
`57`	`57`	`<button`
`58`	`58`	`class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text ibexa-btn--content-edit"`
`59`		`- title="{{ 'bookmark.list.content.edit'\|trans\|desc('Edit content') }}"`
	`59`	`+ title="{{ 'bookmark.list.content.edit'\|trans\|desc('Edit') }}"`
`60`	`60`	`data-content-id="{{ bookmark.contentInfo.id }}"`
`61`	`61`	`data-language-code="{{ bookmark.contentInfo.mainLanguageCode }}"`
`62`	`62`	`>`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`<a`
`50`	`50`	`href="{{ edit_url }}"`
`51`	`51`	`class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text"`
`52`		`- title="{{ 'url.action.edit'\|trans\|desc('Edit URL') }}"`
	`52`	`+ title="{{ 'url.action.edit'\|trans\|desc('Edit') }}"`
`53`	`53`	`>`
`54`	`54`	`<svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">`
`55`	`55`	`<use xlink:href="{{ ibexa_icon_path('edit') }}"></use>`