Merge "Combine changes limit and time period selectors"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 30 Nov 2017 19:11:03 +0000 (19:11 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 30 Nov 2017 19:11:03 +0000 (19:11 +0000)
1  2 
languages/i18n/en.json
languages/i18n/qqq.json
resources/Resources.php

diff --combined languages/i18n/en.json
        "rcfilters-legend-heading": "<strong>List of abbreviations:</strong>",
        "rcfilters-other-review-tools": "Other review tools",
        "rcfilters-group-results-by-page": "Group results by page",
-       "rcfilters-grouping-title": "Grouping",
        "rcfilters-activefilters": "Active filters",
        "rcfilters-advancedfilters": "Advanced filters",
-       "rcfilters-limit-title": "Changes to show",
-       "rcfilters-limit-shownum": "Show last {{PLURAL:$1|change|$1 changes}}",
+       "rcfilters-limit-title": "Results to show",
+       "rcfilters-limit-and-date-label": "{{PLURAL:$1|change|$1 changes}}, $2",
+       "rcfilters-date-popup-title": "Time period to search",
        "rcfilters-days-title": "Recent days",
        "rcfilters-hours-title": "Recent hours",
        "rcfilters-days-show-days": "$1 {{PLURAL:$1|day|days}}",
        "import-mapping-namespace": "Import to a namespace:",
        "import-mapping-subpage": "Import as subpages of the following page:",
        "import-upload-filename": "Filename:",
 +      "import-upload-username-prefix": "Interwiki prefix:",
 +      "import-assign-known-users": "Assign edits to local users where the named user exists locally",
        "import-comment": "Comment:",
        "importtext": "Please export the file from the source wiki using the [[Special:Export|export utility]].\nSave it to your computer and upload it here.",
        "importstart": "Importing pages...",
        "imported-log-entries": "Imported $1 {{PLURAL:$1|log entry|log entries}}.",
        "importfailed": "Import failed: <nowiki>$1</nowiki>",
        "importunknownsource": "Unknown import source type",
 +      "importnoprefix": "No interwiki prefix was supplied",
        "importcantopen": "Could not open import file",
        "importbadinterwiki": "Bad interwiki link",
        "importsuccess": "Import finished!",
        "autosumm-blank": "Blanked the page",
        "autosumm-replace": "Replaced content with \"$1\"",
        "autoredircomment": "Redirected page to [[$1]]",
 +      "autosumm-removed-redirect": "Removed redirect to [[$1]]",
 +      "autosumm-changed-redirect-target": "Changed redirect target from [[$1]] to [[$2]]",
        "autosumm-new": "Created page with \"$1\"",
        "autosumm-newblank": "Created blank page",
        "autoblock_whitelist": "",
        "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Tag|Tags}}]]: $2)",
        "tag-mw-contentmodelchange": "content model change",
        "tag-mw-contentmodelchange-description": "Edits that [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:ChangeContentModel change the content model] of a page",
 +      "tag-mw-new-redirect": "New redirect",
 +      "tag-mw-new-redirect-description": "Edits that create a new redirect or change a page to a redirect",
 +      "tag-mw-removed-redirect": "Removed redirect",
 +      "tag-mw-removed-redirect-description": "Edits that change an existing redirect to a non-redirect",
 +      "tag-mw-changed-redirect-target": "Redirect target changed",
 +      "tag-mw-changed-redirect-target-description": "Edits that change the target of a redirect",
 +      "tag-mw-blank": "Blanking",
 +      "tag-mw-blank-description": "Edits that blank a page",
 +      "tag-mw-replace": "Replaced",
 +      "tag-mw-replace-description": "Edits that remove more than 90% of the content of a page",
 +      "tag-mw-rollback": "Rollback",
 +      "tag-mw-rollback-description": "Edits that roll back previous edits using the rollback link",
        "tags-title": "Tags",
        "tags-intro": "This page lists the tags that the software may mark an edit with, and their meaning.",
        "tags-tag": "Tag name",
diff --combined languages/i18n/qqq.json
        "rcfilters-legend-heading": "Used as a heading for legend box on [[Special:RecentChanges]] and [[Special:Watchlist]] when RCFilters are enabled.",
        "rcfilters-other-review-tools": "Used as a heading for the community collection of other links on [[Special:RecentChanges]] when RCFilters are enabled.",
        "rcfilters-group-results-by-page": "A label for the checkbox describing whether the results in [[Special:RecentChanges]] are grouped by page when RCFilters are enabled.",
-       "rcfilters-grouping-title": "Title for the section showing display options for grouping results in [[Special:RecentChanges]] when RCFilters are enabled.",
        "rcfilters-activefilters": "Title for the filters selection showing the active filters.",
        "rcfilters-advancedfilters": "Title for the buttons allowing the user to switch to the various advanced filters views.",
        "rcfilters-limit-title": "Title for the options to change the number of 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-limit-and-date-label": "Title for the button that opens the operation to control how many results to show and in which time period to search. \n\nParameters: $1 - Number of results shown\n\n$2 - Time period to search. One of {{msg-mw|rcfilters-days-title}} or {{msg-mw|rcfilters-hours-title}} is used as $2",
+       "rcfilters-date-popup-title": "Section title of date options on recent changes results",
        "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-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\n{{Identical|Day}}",
        "import-mapping-namespace": "Used as label for the second of three radio buttons in Import form on [[Special:Import]]. The radio button is followed by a drop-down list from which the user can select a namespace.\n\nSee also:\n* {{msg-mw|Import-mapping-default}}\n* {{msg-mw|Import-mapping-subpage}}",
        "import-mapping-subpage": "Used as label for the third of three radio buttons in Import form on [[Special:Import]]. The radio button is followed by a text box in which the user can type a page name. The imported pages will be created as subpages of the entered page name.\n\nSee also:\n* {{msg-mw|Import-mapping-default}}\n* {{msg-mw|Import-mapping-namespace}}",
        "import-upload-filename": "Used on [[Special:Import]] as label for upload of an XML file containing the pages to import.\n{{Identical|Filename}}",
 +      "import-upload-username-prefix": "Used as label for input box in [[Special:Import]].",
 +      "import-assign-known-users": "Use as label for checkbox in [[Special:Import]].",
        "import-comment": "Used as label for input box in [[Special:Import]].\n\nSee also:\n* {{msg-mw|Import-interwiki-history}}\n* {{msg-mw|Import-interwiki-templates}}\n* {{msg-mw|Import-interwiki-namespace}}\n* {{msg-mw|Import-interwiki-rootpage}}\n* {{msg-mw|Import-interwiki-submit}}\n{{Identical|Comment}}",
        "importtext": "Used in the Import form on [[Special:Import]].",
        "importstart": "Used in [[Special:Import]].\n\nSee also:\n* {{msg-mw|Importsuccess}}\n* {{msg-mw|Importfailed}}",
        "imported-log-entries": "Used as success message. Parameters:\n* $1 - number of log items\nSee also:\n* {{msg-mw|Importnopages}} - fatal error message",
        "importfailed": "Used as error message in [[Special:Import]]. Parameters:\n* $1 - import source\nSee also:\n* {{msg-mw|Importstart}}\n* {{msg-mw|Importsuccess}}",
        "importunknownsource": "Used as error message in [[Special:Import]].\n\nSee also:\n* {{msg-mw|import-token-mismatch}}\n* {{msg-mw|import-invalid-interwiki}}\n* {{msg-mw|Importunknownsource}}",
 +      "importnoprefix": "Used as error message in [[Special:Import]]. Usually this error means that import via upload was attempted and the {{msg-mw|import-upload-username-prefix}} field was left empty.",
        "importcantopen": "Used as error message when importing from file or from URL.",
        "importbadinterwiki": "Used as error message when importing from interwiki.\n\nSee also:\n* {{msg-mw|Import-noarticle}}\n* {{msg-mw|Importbadinterwiki}}",
        "importsuccess": "Used in [[Special:Import]].\n\nSee also:\n* {{msg-mw|Importstart}}\n* {{msg-mw|Importfailed}}",
        "autosumm-blank": "The auto summary when blanking the whole page. This is not the same as deleting the page.",
        "autosumm-replace": "The auto summary when a user removes a lot of characters in the page.\n\nParameters:\n* $1 - truncated text",
        "autoredircomment": "The auto summary when making a redirect. Parameters:\n* $1 - the page where it redirects to\n* $2 - (Optional) the first X number of characters of the redirect ($2 is usually only used when end users customize the message)\n{{Identical|Redirect}}",
 +      "autosumm-removed-redirect": "The auto summary when making a redirect. Parameters:\n* $1 - the page where it redirects to\n* $2 - (Optional) the first X number of characters of the redirect ($2 is usually only used when end users customize the message)\n{{Identical|Redirect}}",
 +      "autosumm-changed-redirect-target": "The auto summary when making a redirect. Parameters:\n* $1 - the page where it redirects to\n* $2 - (Optional) the first X number of characters of the redirect ($2 is usually only used when end users customize the message)\n{{Identical|Redirect}}",
        "autosumm-new": "The auto summary when creating a new page. $1 are the first X number of characters of the new page.",
        "autosumm-newblank": "The automatic edit summary when creating a blank page. This is not the same as blanking a page.",
        "autoblock_whitelist": "{{notranslate}}",
        "tag-list-wrapper": "Wrapper for the list of tags shown on recent changes, watchlists, history pages and diffs.\n\nParameters:\n* $1 - number of distinct tags for given edit\n* $2 - comma-separated list of tags for given edit",
        "tag-mw-contentmodelchange": "Change tag for edits that change the content model of a page",
        "tag-mw-contentmodelchange-description": "Description for \"content model change\" change tag",
 +      "tag-mw-new-redirect": "Change tag for edits that make the page a redirect (either redirect creation or editing an existing page)",
 +      "tag-mw-new-redirect-description": "Description for \"New redirect\" change tag",
 +      "tag-mw-removed-redirect": "Change tag for edits that change an existing redirect into a non-redirect",
 +      "tag-mw-removed-redirect-description": "Description for \"Removed redirect\" change tag",
 +      "tag-mw-changed-redirect-target": "Change tag for edits that change the target of a redirect",
 +      "tag-mw-changed-redirect-target-description": "Description for \"Redirect target changed\" change tag",
 +      "tag-mw-blank": "Change tag for edits that blank a page with existing content",
 +      "tag-mw-blank-description": "Description for \"blank\" change tag",
 +      "tag-mw-replace": "Change tag for edits removing more than 90% of the content of a page",
 +      "tag-mw-replace-description": "Description for \"replace\" change tag",
 +      "tag-mw-rollback": "Change tag for rolling back an edit",
 +      "tag-mw-rollback-description": "Description for \"rollback\" change tag",
        "tags-title": "The title of [[Special:Tags]].\n{{Identical|Tag}}",
        "tags-intro": "Explanation on top of [[Special:Tags]]. For more information on tags see [[mw:Manual:Tags|MediaWiki]].",
        "tags-tag": "Caption of a column in [[Special:Tags]]. For more information on tags see [[mw:Manual:Tags|MediaWiki]].",
diff --combined resources/Resources.php
@@@ -717,7 -717,6 +717,7 @@@ return 
                        'az' => 'resources/lib/moment/locale/az.js',
                        'be' => 'resources/lib/moment/locale/be.js',
                        'bg' => 'resources/lib/moment/locale/bg.js',
 +                      'bm' => 'resources/lib/moment/locale/bm.js',
                        'bn' => 'resources/lib/moment/locale/bn.js',
                        'bo' => 'resources/lib/moment/locale/bo.js',
                        'br' => 'resources/lib/moment/locale/br.js',
                        'da' => 'resources/lib/moment/locale/da.js',
                        'de' => 'resources/lib/moment/locale/de.js',
                        'de-at' => 'resources/lib/moment/locale/de-at.js',
 +                      'de-ch' => 'resources/lib/moment/locale/de-ch.js',
                        'dv' => 'resources/lib/moment/locale/dv.js',
                        'el' => 'resources/lib/moment/locale/el.js',
                        'en' => 'resources/src/moment-dmy.js',
                        'fa' => 'resources/lib/moment/locale/fa.js',
                        'fi' => 'resources/lib/moment/locale/fi.js',
                        'fo' => 'resources/lib/moment/locale/fo.js',
 -                      'fr-ca' => 'resources/lib/moment/locale/fr-ca.js',
                        'fr' => 'resources/lib/moment/locale/fr.js',
 +                      'fr-ca' => 'resources/lib/moment/locale/fr-ca.js',
                        'fy' => 'resources/lib/moment/locale/fy.js',
                        'gd' => 'resources/lib/moment/locale/gd.js',
                        'gl' => 'resources/lib/moment/locale/gl.js',
 +                      'gom-latn' => 'resources/lib/moment/locale/gom-latn.js',
 +                      'gu' => 'resources/lib/moment/locale/gu.js',
                        'he' => 'resources/lib/moment/locale/he.js',
                        'hi' => 'resources/lib/moment/locale/hi.js',
                        'hr' => 'resources/lib/moment/locale/hr.js',
                        'jv' => 'resources/lib/moment/locale/jv.js',
                        'ka' => 'resources/lib/moment/locale/ka.js',
                        'kk-cyrl' => 'resources/lib/moment/locale/kk.js',
 +                      'kn' => 'resources/lib/moment/locale/kn.js',
                        'ko' => 'resources/lib/moment/locale/ko.js',
                        'ky' => 'resources/lib/moment/locale/ky.js',
                        'lo' => 'resources/lib/moment/locale/lo.js',
                        'nn' => 'resources/lib/moment/locale/nn.js',
                        'pa' => 'resources/lib/moment/locale/pa-in.js',
                        'pl' => 'resources/lib/moment/locale/pl.js',
 -                      'pt-br' => 'resources/lib/moment/locale/pt-br.js',
                        'pt' => 'resources/lib/moment/locale/pt.js',
 +                      'pt-br' => 'resources/lib/moment/locale/pt-br.js',
                        'ro' => 'resources/lib/moment/locale/ro.js',
                        'ru' => 'resources/lib/moment/locale/ru.js',
 +                      'sd' => 'resources/lib/moment/locale/sd.js',
                        'se' => 'resources/lib/moment/locale/se.js',
                        'si' => 'resources/lib/moment/locale/si.js',
                        'sk' => 'resources/lib/moment/locale/sk.js',
                        'sw' => 'resources/lib/moment/locale/sw.js',
                        'ta' => 'resources/lib/moment/locale/ta.js',
                        'te' => 'resources/lib/moment/locale/te.js',
 +                      'tet' => 'resources/lib/moment/locale/tet.js',
                        'th' => 'resources/lib/moment/locale/th.js',
                        'tl-ph' => 'resources/lib/moment/locale/tl-ph.js',
                        'tr' => 'resources/lib/moment/locale/tr.js',
                        'tzm' => 'resources/lib/moment/locale/tzm.js',
                        'tzm-latn' => 'resources/lib/moment/locale/tzm-latn.js',
                        'uk' => 'resources/lib/moment/locale/uk.js',
 +                      'ur' => 'resources/lib/moment/locale/ur.js',
                        'uz' => 'resources/lib/moment/locale/uz.js',
 +                      'uz-latn' => 'resources/lib/moment/locale/uz-latn.js',
                        'vi' => 'resources/lib/moment/locale/vi.js',
 +                      'yo' => 'resources/lib/moment/locale/yo.js',
 +                      'zh-hans' => 'resources/lib/moment/locale/zh-cn.js',
 +                      'zh-hant' => 'resources/lib/moment/locale/zh-tw.js',
                        'zh-cn' => 'resources/lib/moment/locale/zh-cn.js',
                        'zh-hk' => 'resources/lib/moment/locale/zh-hk.js',
                        'zh-tw' => 'resources/lib/moment/locale/zh-tw.js',
 -                      'zh-hans' => 'resources/lib/moment/locale/zh-cn.js',
 -                      'zh-hant' => 'resources/lib/moment/locale/zh-tw.js',
                ],
                // HACK: skinScripts come after languageScripts, and we need locale overrides to come
                // after locale definitions
                ],
                'dependencies' => [
                        'jquery.footHovzer',
 +                      'oojs-ui-core',
                ],
        ],
        'mediawiki.diff.styles' => [
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ViewSwitchWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ValuePickerWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitPopupWidget.js',
-                       'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitButtonWidget.js',
-                       'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DateButtonWidget.js',
+                       'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitAndDateButtonWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DatePopupWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js',
                        'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js',
                        'rcfilters-activefilters',
                        'rcfilters-advancedfilters',
                        'rcfilters-group-results-by-page',
-                       'rcfilters-grouping-title',
                        'rcfilters-limit-title',
-                       'rcfilters-limit-shownum',
+                       'rcfilters-limit-and-date-label',
+                       'rcfilters-date-popup-title',
                        'rcfilters-days-title',
                        'rcfilters-hours-title',
                        'rcfilters-days-show-days',