Merge branch '4.0-dev' into 4.0_menu_accessibility

joomla · Nov 20, 2019 · 349746f · 349746f
2 parents daccdf6 + 6120b49
commit 349746f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/administrator/components/com_banners/forms/filter_banners.xml b/administrator/components/com_banners/forms/filter_banners.xml
@@ -77,7 +77,7 @@
 			<option value="a.state ASC">JSTATUS_ASC</option>
 			<option value="a.state DESC">JSTATUS_DESC</option>
 			<option value="a.name ASC">JGLOBAL_NAME_ASC</option>
-			<option value="a.name DESC">JGLOBAL_NAME_DEC</option>
+			<option value="a.name DESC">JGLOBAL_NAME_DESC</option>
 			<option value="category_title ASC">JCATEGORY_ASC</option>
 			<option value="category_title DESC">JCATEGORY_DESC</option>
 			<option value="a.sticky ASC">COM_BANNERS_HEADING_STICKY_ASC</option>

diff --git a/administrator/components/com_contact/forms/filter_contacts.xml b/administrator/components/com_contact/forms/filter_contacts.xml
@@ -14,6 +14,7 @@
 		<field
 			name="featured"
 			type="list"
+			label="JOPTION_SELECT_FEATURED"
 			onchange="this.form.submit();"
 			default=""
 			>

diff --git a/administrator/components/com_content/forms/filter_articles.xml b/administrator/components/com_content/forms/filter_articles.xml
@@ -12,6 +12,7 @@
 		<field
 			name="featured"
 			type="list"
+			label="JOPTION_SELECT_FEATURED"
 			onchange="this.form.submit();"
 			default=""
 			>
@@ -23,6 +24,7 @@
 		<field
 			name="stage"
 			type="workflowstage"
+			label="JOPTION_SELECT_STAGE"
 			onchange="this.form.submit();"
 			activeonly="true"
 			extension="com_content"
@@ -33,6 +35,7 @@
 		<field
 			name="condition"
 			type="workflowcondition"
+			label="JOPTION_SELECT_CONDITION"
 			onchange="this.form.submit();"
 			extension="com_content"
 			>
@@ -64,6 +67,7 @@
 		<field
 			name="author_id"
 			type="author"
+			label="JOPTION_SELECT_AUTHOR"
 			multiple="true"
 			layout="joomla.form.field.list-fancy-select"
 			hint="JOPTION_SELECT_AUTHOR"
@@ -96,6 +100,7 @@
 		<field
 			name="level"
 			type="integer"
+			label="JOPTION_SELECT_MAX_LEVELS"
 			first="1"
 			last="10"
 			step="1"

diff --git a/layouts/joomla/button/transition-button.php b/layouts/joomla/button/transition-button.php
@@ -44,7 +44,7 @@
 		<?php endif; ?>
 
 		title="<?php echo HTMLHelper::_('tooltipText', Text::_($tipTitle ? : $title), '', 0); ?>"
-		data-content="<?php echo HTMLHelper::_('tooltipText', Text::_($title), '', 0); ?>"
+		data-content="<?php echo HTMLHelper::_('tooltipText', $title, '', 0); ?>"
 		data-placement="top"
 		onclick="Joomla.toggleAllNextElements(this, 'd-none')"
 	>