Merge branch 'hotfix/fix_indexing_texts' into 'release/2.3.0'

Fix indexing texts See merge request metamodels/core!354
MetaModels · Nov 5, 2024 · 2267dbb · 2267dbb
2 parents fd92a52 + e958a7a
commit 2267dbb
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 36 deletions.
diff --git a/src/CoreBundle/Resources/contao/dca/tl_metamodel_searchable_pages.php b/src/CoreBundle/Resources/contao/dca/tl_metamodel_searchable_pages.php
@@ -166,6 +166,19 @@
             ],
             'sql'         => "varchar(255) NOT NULL default ''"
         ],
+        'rendersetting' => [
+            'label'       => 'rendersetting.label',
+            'description' => 'rendersetting.description',
+            'exclude'     => true,
+            'inputType'   => 'select',
+            'eval'        => [
+                'includeBlankOption' => true,
+                'mandatory'          => true,
+                'chosen'             => true,
+                'tl_class'           => 'w50',
+            ],
+            'sql'         => "int(10) unsigned NOT NULL default '0'"
+        ],
         'filter'        => [
             'label'       => 'filter.label',
             'description' => 'filter.description',
@@ -175,7 +188,7 @@
                 'includeBlankOption' => true,
                 'chosen'             => true,
                 'submitOnChange'     => true,
-                'tl_class'           => 'clr w50',
+                'tl_class'           => 'w50',
             ],
             'sql'         => "int(10) unsigned NOT NULL default '0'"
         ],
@@ -196,19 +209,6 @@
             ],
             'sql'         => 'longblob NULL'
         ],
-        'rendersetting' => [
-            'label'       => 'rendersetting.label',
-            'description' => 'rendersetting.description',
-            'exclude'     => true,
-            'inputType'   => 'select',
-            'eval'        => [
-                'includeBlankOption' => true,
-                'mandatory'          => true,
-                'chosen'             => true,
-                'tl_class'           => 'w50',
-            ],
-            'sql'         => "int(10) unsigned NOT NULL default '0'"
-        ],
         'published'     => [
             'label'       => 'published.label',
             'description' => 'published.description',

diff --git a/src/CoreBundle/Resources/translations/tl_metamodel_searchable_pages.en.xlf b/src/CoreBundle/Resources/translations/tl_metamodel_searchable_pages.en.xlf
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-  <file source-language="en" datatype="plaintext"
-        original="src/CoreBundle/Resources/translations/tl_metamodel_searchable_pages.en.xlf">
+  <file source-language="en" datatype="plaintext" original="src/CoreBundle/Resources/translations/tl_metamodel_searchable_pages.en.xlf">
     <body>
       <trans-unit id="backend-module.headline" resname="backend-module.headline">
-        <source>All search settings</source>
+        <source>All indexing settings</source>
       </trans-unit>
       <trans-unit id="id.label" resname="id.label">
         <source>Id</source>
@@ -16,7 +15,7 @@
         <source>New index</source>
       </trans-unit>
       <trans-unit id="new.description" resname="new.description">
-        <source>Create a new searchable page setting</source>
+        <source>Create a new indexing setting</source>
       </trans-unit>
       <trans-unit id="all.label" resname="all.label">
         <source>Edit multiple</source>
@@ -49,7 +48,7 @@
         <source>Name</source>
       </trans-unit>
       <trans-unit id="name.description" resname="name.description">
-        <source>Name of the searchable page setting</source>
+        <source>Name of the indexing setting</source>
       </trans-unit>
       <trans-unit id="tstamp.label" resname="tstamp.label">
         <source>Revision date</source>
@@ -58,16 +57,16 @@
         <source>Date and time of the latest revision.</source>
       </trans-unit>
       <trans-unit id="rendersetting.label" resname="rendersetting.label">
-        <source>Rendersetting</source>
+        <source>Render setting</source>
       </trans-unit>
       <trans-unit id="rendersetting.description" resname="rendersetting.description">
-        <source>Choose the rendersetting which will be used for the search rendering.</source>
+        <source>Select the render setting to be used for indexing. It usually makes sense to use the render setting for the list view.</source>
       </trans-unit>
       <trans-unit id="filter.label" resname="filter.label">
-        <source>Filtersetting</source>
+        <source>Filter setting</source>
       </trans-unit>
       <trans-unit id="filter.description" resname="filter.description">
-        <source>Choose the filtersetting which will be used for the search rendering.</source>
+        <source>Select the filter setting to be used for indexing. The filter can be used to exclude unpublished items, for example.</source>
       </trans-unit>
       <trans-unit id="filterparams.label" resname="filterparams.label">
         <source>Filter parameter override</source>
@@ -82,52 +81,52 @@
         <source>General settings</source>
       </trans-unit>
       <trans-unit id="edit.label" resname="edit.label">
-        <source>Edit searchable page</source>
+        <source>Edit indexing</source>
       </trans-unit>
       <trans-unit id="edit.description" resname="edit.description">
-        <source>Edit the searchable page setting ID %id%</source>
+        <source>Edit the indexing setting ID %id%</source>
       </trans-unit>
       <trans-unit id="copy.label" resname="copy.label">
-        <source>Copy searchable page</source>
+        <source>Copy indexing</source>
       </trans-unit>
       <trans-unit id="copy.description" resname="copy.description">
-        <source>Copy definition of searchable page setting ID %id%</source>
+        <source>Copy definition of indexing setting ID %id%</source>
       </trans-unit>
       <trans-unit id="delete.label" resname="delete.label">
-        <source>Delete searchable page</source>
+        <source>Delete indexing</source>
       </trans-unit>
       <trans-unit id="delete.description" resname="delete.description">
-        <source>Delete searchable page setting ID %id%</source>
+        <source>Delete indexing setting ID %id%</source>
       </trans-unit>
       <trans-unit id="delete.confirm" resname="delete.confirm">
         <source>Do you really want to delete element ID %id%?</source>
       </trans-unit>
       <trans-unit id="show.label" resname="show.label">
-        <source>Searchable page setting details</source>
+        <source>Indexing setting details</source>
       </trans-unit>
       <trans-unit id="show.description" resname="show.description">
-        <source>Show details of searchable page setting ID %id%</source>
+        <source>Show details of indexing setting ID %id%</source>
       </trans-unit>
       <trans-unit id="toggle.label" resname="toggle.label">
         <source>Toggle</source>
       </trans-unit>
       <trans-unit id="toggle.description" resname="toggle.description">
-        <source>Toggle the state of searchable page setting ID %id%</source>
+        <source>Toggle the state of indexing setting ID %id%</source>
       </trans-unit>
       <trans-unit id="settings.label" resname="settings.label">
-        <source>Searchable page settings</source>
+        <source>Indexing settings</source>
       </trans-unit>
       <trans-unit id="settings.description" resname="settings.description">
-        <source>Edit the settings of searchable page setting ID %id%</source>
+        <source>Edit the settings of indexing setting ID %id%</source>
       </trans-unit>
       <trans-unit id="published.label" resname="published.label">
-        <source>Searchable page settings</source>
+        <source>Indexing page settings</source>
       </trans-unit>
       <trans-unit id="published.description" resname="published.description">
         <source>Published</source>
       </trans-unit>
       <trans-unit id="deleteConfirm" resname="deleteConfirm">
-        <source>Do you really want to render setting ID %id%?</source>
+        <source>Do you really want indexing setting ID %id%?</source>
       </trans-unit>
       <trans-unit id="closeAll.label" resname="closeAll.label">
         <source>Cancel</source>