[4.0] Label missing from some select filters (#24813)

Adds a label to the client, language and item type selectors in com_associations, comm_menus and com_languages
joomla · Jul 23, 2019 · df3a965 · df3a965
1 parent 55fc78c
commit df3a965
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 7 deletions.
diff --git a/administrator/components/com_associations/forms/filter_associations.xml b/administrator/components/com_associations/forms/filter_associations.xml
@@ -3,7 +3,7 @@
 	<field
 		name="itemtype"
 		type="itemtype"
-		label="COM_ASSOCIATIONS_FILTER_SELECT_ITEM_TYPE"
+		label="COM_ASSOCIATIONS_FILTER_SELECT_ITEM"
 		filtermode="selector"
 		onchange="Joomla.resetFilters(this)"
 		>
@@ -13,7 +13,7 @@
 	<field
 		name="language"
 		type="contentlanguage"
-		label="JOPTION_SELECT_LANGUAGE"
+		label="COM_ASSOCIATIONS_FILTER_SELECT_LANGUAGE"
 		filtermode="selector"
 		onchange="this.form.submit();"
 		>

diff --git a/administrator/components/com_languages/forms/filter_installed.xml b/administrator/components/com_languages/forms/filter_installed.xml
@@ -3,7 +3,7 @@
 	<field
 		name="client_id"
 		type="list"
-		label="JSITEADMIN"
+		label="COM_LANGUAGES_INSTALLED_SELECT_CLIENT"
 		onchange="Joomla.resetFilters(this)"
 		filtermode="selector"
 		>

diff --git a/administrator/components/com_languages/forms/filter_overrides.xml b/administrator/components/com_languages/forms/filter_overrides.xml
@@ -3,7 +3,7 @@
 	<field
 		name="language_client"
 		type="languageclient"
-		label="COM_LANGUAGES_OVERRIDE_SELECT_LANGUAGE"
+		label="COM_LANGUAGES_OVERRIDE_SELECT_LANGUAGECLIENT"
 		onchange="this.form.submit();"
 		filtermode="selector"
 		addfieldprefix="Joomla\Component\Languages\Administrator\Field"

diff --git a/administrator/components/com_menus/forms/filter_items.xml b/administrator/components/com_menus/forms/filter_items.xml
@@ -3,7 +3,7 @@
 	<field
 		name="client_id"
 		type="list"
-		label="JSITEADMIN"
+		label="COM_MENUS_SELECT_CLIENT_FILTER"
 		filtermode="selector"
 		onchange="this.form.submit();"
 		>
@@ -13,7 +13,7 @@
 	<field
 		name="menutype"
 		type="menu"
-		label="COM_MENUS_SELECT_MENU"
+		label="COM_MENUS_SELECT_MENU_FILTER"
 		accesstype="manage"
 		clientid=""
 		showAll="false"

diff --git a/administrator/components/com_menus/forms/filter_menus.xml b/administrator/components/com_menus/forms/filter_menus.xml
@@ -3,7 +3,7 @@
 	<field
 		name="client_id"
 		type="list"
-		label="JSITEADMIN"
+		label="COM_MENUS_SELECT_CLIENT_FILTER"
 		filtermode="selector"
 		onchange="this.form.submit();"
 		>

diff --git a/administrator/language/en-GB/en-GB.com_associations.ini b/administrator/language/en-GB/en-GB.com_associations.ini
@@ -21,7 +21,9 @@ COM_ASSOCIATIONS_ERROR_NO_ASSOC="The Multilingual Associations component can't b
 COM_ASSOCIATIONS_ERROR_NO_TYPE="The item type selected does not exist for this component."
 COM_ASSOCIATIONS_FILTER_SEARCH_DESC="Search an item by its title"
 COM_ASSOCIATIONS_FILTER_SEARCH_LABEL="Search item"
+COM_ASSOCIATIONS_FILTER_SELECT_ITEM="Select Item Type"
 COM_ASSOCIATIONS_FILTER_SELECT_ITEM_TYPE="- Select Item Type -"
+COM_ASSOCIATIONS_FILTER_SELECT_LANGUAGE="Select Language"
 COM_ASSOCIATIONS_HEADING_ASSOCIATION="Associations"
 COM_ASSOCIATIONS_HEADING_MENUTYPE="Menu"
 COM_ASSOCIATIONS_HEADING_MENUTYPE_ASC="Menu ascending"

diff --git a/administrator/language/en-GB/en-GB.com_languages.ini b/administrator/language/en-GB/en-GB.com_languages.ini
@@ -55,6 +55,7 @@ COM_LANGUAGES_HOMEPAGE="Home"
 COM_LANGUAGES_INSTALL="Install Languages"
 COM_LANGUAGES_INSTALLED_FILTER_SEARCH_DESC="Search in title and language tag."
 COM_LANGUAGES_INSTALLED_FILTER_SEARCH_LABEL="Search Installed Languages"
+COM_LANGUAGES_INSTALLED_SELECT_CLIENT="Select Client"
 COM_LANGUAGES_INSTALLED_TABLE_CAPTION="Table of Installed Languages"
 COM_LANGUAGES_MSG_DEFAULT_LANGUAGE_SAVED="Default Language Saved. This does not affect users that have chosen a specific language on their profile or on the login page."
 COM_LANGUAGES_MSG_DEFAULT_MULTILANG_SAVED="Default Language Saved. This does not affect users that have chosen a specific language on their profile or on the login page.<br><strong>Warning!</strong> The Site Default Language also has to be a published Content language."
@@ -100,6 +101,7 @@ COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_LABEL="Search For"
 COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_TEXT="Value"
 COM_LANGUAGES_OVERRIDE_FIRST_SELECT_MESSAGE="To create a new override, please first select a language and client."
 COM_LANGUAGES_OVERRIDE_SELECT_LANGUAGE="- Select Language & Client -"
+COM_LANGUAGES_OVERRIDE_SELECT_LANGUAGECLIENT="Select Language & Client"
 COM_LANGUAGES_SAVE_SUCCESS="Content Language saved."
 COM_LANGUAGES_SEARCH_IN_TITLE="Search in title."
 COM_LANGUAGES_SWITCH_ADMIN="Switch Language"

diff --git a/administrator/language/en-GB/en-GB.com_menus.ini b/administrator/language/en-GB/en-GB.com_menus.ini
@@ -160,7 +160,9 @@ COM_MENUS_PRESET_LOAD_FAILED="Failed to load the specified preset."
 COM_MENUS_REQUEST_FIELDSET_LABEL="Required Settings"
 COM_MENUS_SAVE_SUCCESS="Menu item saved."
 COM_MENUS_SELECT_A_MENUITEM="Select a Menu Item"
+COM_MENUS_SELECT_CLIENT_FILTER="Select Client"
 COM_MENUS_SELECT_MENU="- Select Menu -"
+COM_MENUS_SELECT_MENU_FILTER="Select Menu"
 COM_MENUS_SELECT_MENU_FILTER_NOT_TRASHED="Filter the list by a state other than trashed or clear the filter."
 COM_MENUS_SELECT_MENU_FIRST="To use batch processing, please first select a Menu in the manager."
 COM_MENUS_SELECT_MENU_FIRST_EXPORT="To use export, please first select a valid Menu in the manager."