Merge "RCFilters: Add range group filters - limit, days and hours"

diff --cc languages/i18n/en.json
index 263a1c1,fdfe75a..e0ac829
--- 1/languages/i18n/en.json
--- 2/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@@ -1349,9 -1349,14 +1349,15 @@@
        "recentchanges-legend-unpatrolled": "{{int:recentchanges-label-unpatrolled}}",
        "recentchanges-legend-plusminus": "(<em>±123</em>)",
        "recentchanges-submit": "Show",
 +      "rcfilters-legend-heading": "<strong>List of abbreviations:</strong>",
        "rcfilters-activefilters": "Active filters",
        "rcfilters-advancedfilters": "Advanced filters",
+       "rcfilters-limit-title": "Changes to show",
+       "rcfilters-limit-shownum": "Show last $1 changes",
+       "rcfilters-days-title": "Recent days",
+       "rcfilters-hours-title": "Recent hours",
+       "rcfilters-days-show-days": "$1 {{PLURAL:$1|day|days}}",
+       "rcfilters-days-show-hours": "$1 {{PLURAL:$1|hour|hours}}",
        "rcfilters-quickfilters": "Saved filters",
        "rcfilters-quickfilters-placeholder-title": "No links saved yet",
        "rcfilters-quickfilters-placeholder-description": "To save your filter settings and reuse them later, click the bookmark icon in the Active Filter area, below.",

diff --cc languages/i18n/qqq.json
index 182b910,a5d6d54..33b2f8f
--- 1/languages/i18n/qqq.json
--- 2/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@@ -1539,8 -1539,13 +1539,14 @@@
        "recentchanges-legend-unpatrolled": "Used as legend on [[Special:RecentChanges]] and [[Special:Watchlist]].\n\nRefers to {{msg-mw|Recentchanges-label-unpatrolled}}.",
        "recentchanges-legend-plusminus": "{{optional}}\nA plus/minus sign with a number for the legend.",
        "recentchanges-submit": "Label for submit button in [[Special:RecentChanges]]\n{{Identical|Show}}",
 +      "rcfilters-legend-heading": "Used as a heading for legend box on [[Special:RecentChanges]] and [[Special:Watchlist]] when RCFilters are enabled.",
        "rcfilters-activefilters": "Title for the filters selection showing the active filters.",
+       "rcfilters-limit-title": "Title for the options to change the number of results shown.",
+       "rcfilters-days-title": "Title for the options to change the number of days for the results shown.",
+       "rcfilters-hours-title": "Title for the options to change the number of hours for the results shown.",
+       "rcfilters-limit-shownum": "Title for the button that opens the operation to control how many results are shown. \n\nParameters: $1 - Number of results shown",
+       "rcfilters-days-show-days": "Title for the button that opens the operation to control the day range for the results. \n\nParameters: $1 - Number of days shown",
+       "rcfilters-days-show-hours": "Title for the button that opens the operation to control the hour range for the results. \n\nParameters: $1 - Number of hours shown",
        "rcfilters-advancedfilters": "Title for the buttons allowing the user to switch to the various advanced filters views.",
        "rcfilters-quickfilters": "Label for the button that opens the saved filter settings menu in [[Special:RecentChanges]]",
        "rcfilters-quickfilters-placeholder-title": "Title for the text shown in the quick filters menu on [[Special:RecentChanges]] if the user has not saved any quick filters.",

diff --cc resources/Resources.php
Simple merge

diff --cc resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
Simple merge

diff --cc resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
Simple merge

diff --cc resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
Simple merge

diff --cc resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
index 3e7a3e1,883527f..1e2ec81
--- 1/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
--- 2/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
@@@ -56,13 -72,13 +72,17 @@@
                }
  
                $bottom = $( '<div>' )
-                       .addClass( 'mw-rcfilters-ui-filterWrapperWidget-bottom' );
+                       .addClass( 'mw-rcfilters-ui-filterWrapperWidget-bottom' )
+                       .append(
+                               this.numChangesWidget.$element,
+                               this.dateWidget.$element
+                       );
  
 -              if ( mw.config.get( 'wgStructuredChangeFiltersEnableLiveUpdate' ) ) {
 +              if (
 +                      mw.config.get( 'wgStructuredChangeFiltersEnableLiveUpdate' ) ||
 +                      // Allow users to enable live update with ?liveupdate=1
 +                      new mw.Uri().query.liveupdate
 +              ) {
                        $bottom.append( this.liveUpdateButton.$element );
                }
  

diff --cc resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
Simple merge