Merge "Revert "RCFilters: Change reset button title when it changes state""

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index f512000..eb43cdb 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1366,7 +1366,6 @@
        "rcfilters-activefilters": "Active filters",
        "rcfilters-restore-default-filters": "Restore default filters",
        "rcfilters-clear-all-filters": "Clear all filters",
-       "rcfilters-clear-filters-to-defaults": "Set filters to defaults",
        "rcfilters-search-placeholder": "Filter recent changes (browse or start typing)",
        "rcfilters-invalid-filter": "Invalid filter",
        "rcfilters-empty-filter": "No active filters. All contributions are shown.",

diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 3116163..f123189 100644 (file)
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1553,7 +1553,6 @@
        "rcfilters-activefilters": "Title for the filters selection showing the active filters.",
        "rcfilters-restore-default-filters": "Label for the button that resets filters to defaults",
        "rcfilters-clear-all-filters": "Title for the button that clears all filters",
-       "rcfilters-clear-filters-to-defaults": "Title for the button that sets filters to default",
        "rcfilters-search-placeholder": "Placeholder for the filter search input.",
        "rcfilters-invalid-filter": "A label for an invalid filter.",
        "rcfilters-empty-filter": "Placeholder for the filter list when no filters were chosen.",

diff --git a/resources/Resources.php b/resources/Resources.php
index 50aabb0..4ce326d 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1795,7 +1795,6 @@ return [
                        'rcfilters-activefilters',
                        'rcfilters-restore-default-filters',
                        'rcfilters-clear-all-filters',
-                       'rcfilters-clear-filters-to-defaults',
                        'rcfilters-search-placeholder',
                        'rcfilters-invalid-filter',
                        'rcfilters-empty-filter',

diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
index 3f461c7..944ebaa 100644 (file)
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
@@ -183,11 +183,6 @@
                this.resetButton.setLabel(
                        currFiltersAreEmpty ? mw.msg( 'rcfilters-restore-default-filters' ) : ''
                );
-               this.resetButton.setTitle(
-                       currFiltersAreEmpty ?
-                               mw.msg( 'rcfilters-clear-filters-to-defaults' ) :
-                               mw.msg( 'rcfilters-clear-all-filters' )
-               );
 
                this.resetButton.toggle( !hideResetButton );
                this.emptyFilterMessage.toggle( currFiltersAreEmpty );