[MediaWiki-commits] [Gerrit] Add GENDER support to searchmenu-new - change (mediawiki/core)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/266708 Change subject: Add GENDER support to searchmenu-new .. Add GENDER support to searchmenu-new Bug: T72706 Change-Id: I4ed463782ed750ce1a4d6cec0bf900c7f1a94bef --- M includes/specials/SpecialSearch.php M languages/i18n/en.json M languages/i18n/qqq.json 3 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/08/266708/1 diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index 8809900..5f7692a 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -568,6 +568,9 @@ wfEscapeWikiText( $title->getPrefixedText() ), Message::numParam( $num ) ); + if ( $messageName === 'searchmenu-new' ) { + $params[] = $this->getUser(); + } Hooks::run( 'SpecialSearchCreateLink', array( $title, &$params ) ); // Extensions using the hook might still return an empty $messageName diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 54c6cbd..1009e7e 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -907,7 +907,7 @@ "shown-title": "Show $1 {{PLURAL:$1|result|results}} per page", "viewprevnext": "View ($1 {{int:pipe-separator}} $2) ($3)", "searchmenu-exists": "There is a page named \"[[:$1]]\" on this wiki. {{PLURAL:$2|0=|See also the other search results found.}}", - "searchmenu-new": "Create the page \"[[:$1]]\" on this wiki! {{PLURAL:$2|0=|See also the page found with your search.|See also the search results found.}}", + "searchmenu-new": "{{GENDER:$3|Create}} the page \"[[:$1]]\" on this wiki! {{PLURAL:$2|0=|See also the page found with your search.|See also the search results found.}}", "searchmenu-new-nocreate": "", "searchprofile-articles": "Content pages", "searchprofile-images": "Multimedia", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index 2ec7a84..cdf1f82 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -1082,7 +1082,7 @@ "shown-title": "Parameters:\n* $1 - number of search results", "viewprevnext": "This is part of the navigation message on the top and bottom of Special pages which are lists of things, e.g. the User's contributions page (in date order) or the list of all categories (in alphabetical order). ($1) and ($2) are either {{msg-mw|Pager-older-n}} and {{msg-mw|Pager-newer-n}} (for date order) or {{msg-mw|Prevn}} and {{msg-mw|Nextn}} (for alphabetical order).\n\nIt is also used by [[Special:WhatLinksHere|Whatlinkshere]] pages, where ($1) and ($2) are {{msg-mw|Whatlinkshere-prev}} and {{msg-mw|Whatlinkshere-next}}.\n($3) is made up in all cases of the various proposed numbers of results per page, e.g. \"(20 | 50 | 100 | 250 | 500)\".\nFor Special pages, the navigation bar is prefixed by \"({{msg-mw|Page first}} | {{msg-mw|Page last}})\" (alphabetical order) or \"({{msg-mw|Histfirst}} | {{msg-mw|Histlast}})\" (date order).\n\nViewprevnext is sometimes preceded by the {{msg-mw|Showingresults}} or {{msg-mw|Showingresultsnum}} message (for Special pages) or by the {{msg-mw|Linkshere}} message (for Whatlinkshere pages).\n\nRefers to {{msg-mw|Pipe-separator}}.", "searchmenu-exists": "An option shown in a menu beside search form offering a link to the existing page having the specified title (when using the default MediaWiki search engine).\n\nParameters:\n* $1 - page title\n* $2 - the number of search results found", - "searchmenu-new": "An option shown in a menu beside search form offering a red link to the not yet existing page having the specified title (when using the default MediaWiki search engine).\n\nParameters:\n* $1 - page title\n* $2 - the number of search results found", + "searchmenu-new": "An option shown in a menu beside search form offering a red link to the not yet existing page having the specified title (when using the default MediaWiki search engine).\n\nParameters:\n* $1 - page title\n* $2 - the number of search results found\n* $3 - The username, used foe GENDER support", "searchmenu-new-nocreate": "{{notranslate}}", "searchprofile-articles": "A quick link in the advanced search box on [[Special:Search]]. Clicking on this link starts a search in the content pages of the wiki.\n\nA 'content page' is a page that forms part of the purpose of the wiki. It includes the main page and pages in the main namespace and any other namespaces that are included when the wiki is customised. For example on Wikimedia Commons 'content pages' include pages in the file and category namespaces. On Wikinews 'content pages' include pages in the Portal namespace. For
[MediaWiki-commits] [Gerrit] Clarify and add GENDER support to a few messages - change (mediawiki...OpenBadges)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/266496 Change subject: Clarify and add GENDER support to a few messages .. Clarify and add GENDER support to a few messages Changed "e-mail" to "email address" Added GENDER support to ob-db-user-no-email-confirmation Bug: T124744 Change-Id: Ic70d8cecd7be3fb8440ca2079bef2fa03efde43e --- M SpecialBadgeIssue.php M i18n/en.json M i18n/qqq.json 3 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenBadges refs/changes/96/266496/1 diff --git a/SpecialBadgeIssue.php b/SpecialBadgeIssue.php index 29ad480..283d0b5 100644 --- a/SpecialBadgeIssue.php +++ b/SpecialBadgeIssue.php @@ -132,7 +132,7 @@ return wfMessage( 'ob-db-user-no-email' ); } if ( $wgOpenBadgesRequireEmailConfirmation && !$recipient->isEmailConfirmed() ) { - return wfMessage( 'ob-db-user-no-email-confirmation' ); + return wfMessage( 'ob-db-user-no-email-confirmation' )->params( $recipient )->parse(); } return true; diff --git a/i18n/en.json b/i18n/en.json index b8e0730..4d6424d 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -33,8 +33,8 @@ "ob-issue-type": "Badge", "ob-issue-evidence": "Evidence URL", "ob-db-user-not-found": "User doesn't exist.", - "ob-db-user-no-email": "User hasn't entered an e-mail.", - "ob-db-user-no-email-confirmation": "User hasn't confirmed their e-mail.", + "ob-db-user-no-email": "User hasn't entered an email address.", + "ob-db-user-no-email-confirmation": "User hasn't confirmed their email address.", "ob-db-evidence-not-url": "The evidence must be a URL.", "ob-db-badge-not-found": "Badge doesn't exist.", "ob-db-unknown-error": "Unknown database error.", diff --git a/i18n/qqq.json b/i18n/qqq.json index a648e08..eb597c0 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -40,7 +40,7 @@ "ob-issue-evidence": "Evidence URL, form field to input the url of the evidence supporting the badge being awarded", "ob-db-user-not-found": "Error message if user does not exist", "ob-db-user-no-email": "Error message if user hasn't entered an e-mail", - "ob-db-user-no-email-confirmation": "Error message if user hasn't confirmed their e-mail", + "ob-db-user-no-email-confirmation": "Error message if user hasn't confirmed their e-mail. Parameters:\n* $1 - username, used for GENDER support", "ob-db-evidence-not-url": "Error message if the evidence is not a URL", "ob-db-badge-not-found": "Error message if badge does not exist", "ob-db-unknown-error": "Error message for unknown database error", -- To view, visit https://gerrit.wikimedia.org/r/266496 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic70d8cecd7be3fb8440ca2079bef2fa03efde43e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OpenBadges Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add GENDER support to $3 in logentry-rights-rights - change (mediawiki/core)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/266473 Change subject: Add GENDER support to $3 in logentry-rights-rights .. Add GENDER support to $3 in logentry-rights-rights Bug: T52583 Change-Id: I23756db584cd15652caf42ed0c5e7a0aaea13836 --- M languages/i18n/en.json M languages/i18n/qqq.json 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/73/266473/1 diff --git a/languages/i18n/en.json b/languages/i18n/en.json index f50dcca..54c6cbd 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -3653,7 +3653,7 @@ "logentry-protect-protect-cascade": "$1 {{GENDER:$2|protected}} $3 $4 [cascading]", "logentry-protect-modify": "$1 {{GENDER:$2|changed}} protection level for $3 $4", "logentry-protect-modify-cascade": "$1 {{GENDER:$2|changed}} protection level for $3 $4 [cascading]", - "logentry-rights-rights": "$1 {{GENDER:$2|changed}} group membership for $3 from $4 to $5", + "logentry-rights-rights": "$1 {{GENDER:$2|changed}} group membership for {{GENDER:$3|$3}} from $4 to $5", "logentry-rights-rights-legacy": "$1 {{GENDER:$2|changed}} group membership for $3", "logentry-rights-autopromote": "$1 was automatically {{GENDER:$2|promoted}} from $4 to $5", "logentry-upload-upload": "$1 {{GENDER:$2|uploaded}} $3", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index e0ea568..2ec7a84 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -3828,7 +3828,7 @@ "logentry-protect-protect-cascade": "{{Logentry|[[Special:Log/protect]]}}\n\n* $4 - protect expiry (formatted with {{msg-mw|protect-summary-desc}}, multiple possible)\nFor word \"cascading\" see {{msg-mw|protect-summary-cascade}}", "logentry-protect-modify": "{{Logentry|[[Special:Log/protect]]}}\n\n* $4 - protect expiry (formatted with {{msg-mw|protect-summary-desc}}, multiple possible)", "logentry-protect-modify-cascade": "{{Logentry|[[Special:Log/protect]]}}\n\n* $4 - protect expiry (formatted with {{msg-mw|protect-summary-desc}}, multiple possible)\nFor word \"cascading\" see {{msg-mw|protect-summary-cascade}}", - "logentry-rights-rights": "* $1 - username\n* $2 - (see below)\n* $3 - username\n* $4 - list of user groups or {{msg-mw|Rightsnone}}\n* $5 - list of user groups or {{msg-mw|Rightsnone}}\n\n{{Logentry|[[Special:Log/rights]]}}", + "logentry-rights-rights": "* $1 - username\n* $2 - (see below)\n* $3 - username, also used for GENDER support\n* $4 - list of user groups or {{msg-mw|Rightsnone}}\n* $5 - list of user groups or {{msg-mw|Rightsnone}}\n\n{{Logentry|[[Special:Log/rights]]}}", "logentry-rights-rights-legacy": "* $1 - username\n* $2 - (see below)\n* $3 - username\n\n{{Logentry|[[Special:Log/rights]]}}", "logentry-rights-autopromote": "* $1 - username\n* $2 - (see below)\n* $3 - (see below)\n* $4 - comma separated list of old user groups or {{msg-mw|Rightsnone}}\n* $5 - comma separated list of new user groups\n\n{{Logentry|[[Special:Log/rights]]}}", "logentry-upload-upload": "{{Logentry|[[Special:Log/upload]]}}", -- To view, visit https://gerrit.wikimedia.org/r/266473 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I23756db584cd15652caf42ed0c5e7a0aaea13836 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix Undefined Index error - change (mediawiki...ErrorHandler)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/266070 Change subject: Fix Undefined Index error .. Fix Undefined Index error Bug: T70701 Change-Id: If92b9542e5fdca9033a77bf7d6ccf71a6f66b777 --- M ErrorHandler.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ErrorHandler refs/changes/70/266070/1 diff --git a/ErrorHandler.php b/ErrorHandler.php index 2bcb5cf..36b4c50 100644 --- a/ErrorHandler.php +++ b/ErrorHandler.php @@ -216,7 +216,7 @@ if( !is_array( $messages ) ) require_once( dirname( __FILE__ ) . '/ErrorHandler.i18n.php' ); $msg = array_shift( $args ); - $message = $messages['en'][$msg]; + $message = $msg; $replacementKeys = array(); foreach( $args as $n => $param ) { $replacementKeys['$' . ($n + 1)] = $param; -- To view, visit https://gerrit.wikimedia.org/r/266070 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If92b9542e5fdca9033a77bf7d6ccf71a6f66b777 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ErrorHandler Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add license name to extension.json - change (mediawiki...ImageMap)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/266044 Change subject: Add license name to extension.json .. Add license name to extension.json Bug: T123943 Change-Id: I52068aa130f5456d8a04200aa1363b76b36e1a3a --- M extension.json 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ImageMap refs/changes/44/266044/1 diff --git a/extension.json b/extension.json index c0adfb5..572c149 100644 --- a/extension.json +++ b/extension.json @@ -3,6 +3,7 @@ "author": "Tim Starling", "url": "https://www.mediawiki.org/wiki/Extension:ImageMap";, "descriptionmsg": "imagemap_desc", + "license-name": "GPL-2.0+", "type": "parserhook", "MessagesDirs": { "ImageMap": [ -- To view, visit https://gerrit.wikimedia.org/r/266044 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52068aa130f5456d8a04200aa1363b76b36e1a3a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ImageMap Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add license to $wgExtensionCredits - change (mediawiki...timeline)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/266042 Change subject: Add license to $wgExtensionCredits .. Add license to $wgExtensionCredits Bug: T123943 Change-Id: I404504ad16ee7b4c490bf86fe6a3d6291c5d1b3f --- M Timeline.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/timeline refs/changes/42/266042/1 diff --git a/Timeline.php b/Timeline.php index e164a2f..f0cce9d 100644 --- a/Timeline.php +++ b/Timeline.php @@ -17,6 +17,7 @@ 'author' => 'Erik Zachte', 'url' => 'https://www.mediawiki.org/wiki/Extension:EasyTimeline', 'descriptionmsg' => 'timeline-desc', + 'license-name' => 'GPL-2.0+', ); class TimelineSettings { -- To view, visit https://gerrit.wikimedia.org/r/266042 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I404504ad16ee7b4c490bf86fe6a3d6291c5d1b3f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/timeline Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add license name to extension.json - change (mediawiki...SiteMatrix)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/266040 Change subject: Add license name to extension.json .. Add license name to extension.json Bug: T123943 Change-Id: Ia176b6fc095fe4b95da50743b9a6cc56fc4f9412 --- M extension.json 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SiteMatrix refs/changes/40/266040/1 diff --git a/extension.json b/extension.json index 70918eb..293c74a 100644 --- a/extension.json +++ b/extension.json @@ -9,6 +9,7 @@ ], "url": "https://www.mediawiki.org/wiki/Extension:SiteMatrix";, "descriptionmsg": "sitematrix-desc", + "license-name": "GPL-2.0+", "type": "specialpage", "SpecialPages": { "SiteMatrix": "SpecialSiteMatrix" -- To view, visit https://gerrit.wikimedia.org/r/266040 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia176b6fc095fe4b95da50743b9a6cc56fc4f9412 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SiteMatrix Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add license name to extension.json - change (mediawiki...PoolCounter)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/266038 Change subject: Add license name to extension.json .. Add license name to extension.json Bug: T123943 Change-Id: I5ce4c76b57d0c64676f9c935cf964d2bd2ad0752 --- M extension.json 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PoolCounter refs/changes/38/266038/1 diff --git a/extension.json b/extension.json index 158df52..c1f325d 100644 --- a/extension.json +++ b/extension.json @@ -3,6 +3,7 @@ "author": "Tim Starling", "url": "https://www.mediawiki.org/wiki/Extension:PoolCounter";, "descriptionmsg": "poolcounter-desc", + "license-name": "GPL-2.0+", "type": "other", "MessagesDirs": { "PoolCounterClient": [ -- To view, visit https://gerrit.wikimedia.org/r/266038 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5ce4c76b57d0c64676f9c935cf964d2bd2ad0752 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PoolCounter Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add license to $wgExtensionCredits - change (mediawiki...SecurePoll)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/266036 Change subject: Add license to $wgExtensionCredits .. Add license to $wgExtensionCredits Bug: T123943 Change-Id: I3389ee995ca2f210ce6a171d6e263238ca596bbc --- M SecurePoll.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecurePoll refs/changes/36/266036/1 diff --git a/SecurePoll.php b/SecurePoll.php index b9975f2..df5d85a 100644 --- a/SecurePoll.php +++ b/SecurePoll.php @@ -18,6 +18,7 @@ 'author' => array( 'Tim Starling', '...' ), 'url' => 'https://www.mediawiki.org/wiki/Extension:SecurePoll', 'descriptionmsg' => 'securepoll-desc', + 'license-name' => 'GPL-2.0+', ); # Configuration -- To view, visit https://gerrit.wikimedia.org/r/266036 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3389ee995ca2f210ce6a171d6e263238ca596bbc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SecurePoll Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add license to $wgExtensionCredits - change (mediawiki...XAnalytics)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/266035 Change subject: Add license to $wgExtensionCredits .. Add license to $wgExtensionCredits Bug: T123943 Change-Id: Ib431227882b628046ed0ffdfbde91d421a19e16a --- M XAnalytics.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/XAnalytics refs/changes/35/266035/1 diff --git a/XAnalytics.php b/XAnalytics.php index 9389c63..1d355d5 100644 --- a/XAnalytics.php +++ b/XAnalytics.php @@ -15,6 +15,7 @@ 'url' => 'https://wikitech.wikimedia.org/wiki/X-Analytics', 'author' => 'Ori Livneh', 'descriptionmsg' => 'xanalytics-desc', + 'license-name' => 'GPL-2.0+', ); // Messages -- To view, visit https://gerrit.wikimedia.org/r/266035 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib431227882b628046ed0ffdfbde91d421a19e16a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/XAnalytics Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add license to $wgExtensionCredits - change (mediawiki...CategoryTree)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/266033 Change subject: Add license to $wgExtensionCredits .. Add license to $wgExtensionCredits Bug: T123943 Change-Id: I9ec064539b7ad84ce930a0626aa8a35738917338 --- M CategoryTree.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CategoryTree refs/changes/33/266033/1 diff --git a/CategoryTree.php b/CategoryTree.php index 0717285..3fd4cbe 100644 --- a/CategoryTree.php +++ b/CategoryTree.php @@ -109,6 +109,7 @@ 'author' => 'Daniel Kinzler', 'url' => 'https://www.mediawiki.org/wiki/Extension:CategoryTree', 'descriptionmsg' => 'categorytree-desc', + 'license-name' => 'GPL-2.0+', ); /** -- To view, visit https://gerrit.wikimedia.org/r/266033 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9ec064539b7ad84ce930a0626aa8a35738917338 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CategoryTree Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add license name to $wgExtensionCredits - change (mediawiki...Scribunto)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/266030 Change subject: Add license name to $wgExtensionCredits .. Add license name to $wgExtensionCredits Bug: T123943 Change-Id: I9c9c667ae20375abf852223df5ca1a33d58f992a --- M Scribunto.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto refs/changes/30/266030/1 diff --git a/Scribunto.php b/Scribunto.php index 49961cf..7834253 100644 --- a/Scribunto.php +++ b/Scribunto.php @@ -29,6 +29,7 @@ 'author' => array( 'Victor Vasiliev', 'Tim Starling', 'Brad Jorsch' ), 'descriptionmsg' => 'scribunto-desc', 'url'=> 'https://www.mediawiki.org/wiki/Extension:Scribunto', + 'license-name' => 'GPL-2.0+', ); define( 'CONTENT_MODEL_SCRIBUNTO', 'Scribunto' ); -- To view, visit https://gerrit.wikimedia.org/r/266030 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c9c667ae20375abf852223df5ca1a33d58f992a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Scribunto Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make Special:Redirect page ridirect to log events by ID - change (mediawiki/core)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/263850 Change subject: Make Special:Redirect page ridirect to log events by ID .. Make Special:Redirect page ridirect to log events by ID Bug: T71107 Change-Id: I48bc6ae31e9f841f1cfeed6167c0c13c58e53f4a --- M includes/specials/SpecialRedirect.php M languages/i18n/en.json M languages/i18n/qqq.json 3 files changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/50/263850/1 diff --git a/includes/specials/SpecialRedirect.php b/includes/specials/SpecialRedirect.php index 553e2b1..0037961 100644 --- a/includes/specials/SpecialRedirect.php +++ b/includes/specials/SpecialRedirect.php @@ -158,6 +158,37 @@ ) ); } + function dispatchLog() { + $logid = $this->mValue; + if ( !ctype_digit( $logid ) ) { + return null; + } + $logid = (int)$logid; + + $logparams = array( 'log_type', 'log_action', 'log_user', 'log_namespace', 'log_title' ); + + $dbr = wfGetDB( DB_SLAVE ); + $res = $dbr->select( + 'logging', + array( 'log_timestamp' ), + 'log_id = $logid' + ); + $i = 0; + while ( count( $res ) > 1 && $i < 5 ) { + $res = $dbr->select( + 'logging', + array( $logparams[$i] ), + 'log_id = $logid' + ); + $i = $i + 1; + } + + return wfAppendQuery( wfScript( 'index' ), array( + 'title' => 'Special:Log', + 'offset' => $res[0] + ) ); + } + /** * Use appropriate dispatch* method to obtain a redirection URL, * and either: redirect, set a 404 error code and error message, @@ -180,6 +211,9 @@ break; case 'page': $url = $this->dispatchPage(); + break; + case 'logid': + $url = $this->dispatchLog(); break; default: $this->getOutput()->setStatusCode( 404 ); @@ -212,6 +246,7 @@ 'page' => $mp . '-page', 'revision' => $mp . '-revision', 'file' => $mp . '-file', + 'logid' => $mp . '-logid', ); $a = array(); $a['type'] = array( @@ -273,6 +308,7 @@ 'page', 'revision', 'user', + 'logid' ); } diff --git a/languages/i18n/en.json b/languages/i18n/en.json index e8d4c01..2d5855c 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -3445,6 +3445,7 @@ "redirect-page": "Page ID", "redirect-revision": "Page revision", "redirect-file": "Filename", + "redirect-logid": "Log ID", "redirect-not-exists": "Value not found", "fileduplicatesearch": "Search for duplicate files", "fileduplicatesearch-summary": "Search for duplicate files based on hash values.", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index 99877e9..e0ea568 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -3620,6 +3620,7 @@ "redirect-page": "Description of lookup type for [[Special:Redirect]].\n{{Identical|Page ID}}", "redirect-revision": "Description of lookup type for [[Special:Redirect]].\n\nThis means \"Page revision '''ID'''\".", "redirect-file": "Description of lookup type for [[Special:Redirect]].\n{{Identical|Filename}}", + "redirect-logid": "Description of lookup type for [[Special:Redirect]].\n{{Identical|Log ID}}", "redirect-not-exists": "Used as error message in [[Special:Redirect]]", "fileduplicatesearch": "Name of special page [[Special:FileDuplicateSearch]].", "fileduplicatesearch-summary": "Summary of [[Special:FileDuplicateSearch]]", -- To view, visit https://gerrit.wikimedia.org/r/263850 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I48bc6ae31e9f841f1cfeed6167c0c13c58e53f4a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove items from Gather collections - change (mediawiki...Gather)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/263600 Change subject: Remove items from Gather collections .. Remove items from Gather collections Bug: T122543 Change-Id: I42b0b63c51bf960b317054c137a772ebf7499333 --- M resources/ext.gather.page.search/CollectionPageList.js 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather refs/changes/00/263600/1 diff --git a/resources/ext.gather.page.search/CollectionPageList.js b/resources/ext.gather.page.search/CollectionPageList.js index fd11838..be0ec4c 100644 --- a/resources/ext.gather.page.search/CollectionPageList.js +++ b/resources/ext.gather.page.search/CollectionPageList.js @@ -2,6 +2,7 @@ var PageList = M.require( 'mobile.pagelist/PageList' ), Page = M.require( 'mobile.startup/Page' ), + CollectionsGateway = M.require( 'ext.gather.api/CollectionsGateway' ), Icon = M.require( 'mobile.startup/Icon' ), CollectionPageList; @@ -46,6 +47,8 @@ this._additions = []; PageList.prototype.initialize.apply( this, arguments ); this.collectionsGateway = options.collectionsGateway; + this.api = options.api; + this.collectionGateway = new CollectionsGateway( this.api ); }, /** * Event handler for when a member changes status in the collection -- To view, visit https://gerrit.wikimedia.org/r/263600 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I42b0b63c51bf960b317054c137a772ebf7499333 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: dev Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix Parse error in APITest.php - change (mediawiki...Convert2Wiki)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/263335 Change subject: Fix Parse error in APITest.php .. Fix Parse error in APITest.php Bug: T70707 Change-Id: Ic99a9056b8f046e4108cb5a086e2ae3f30801dfa --- M src/test/api/APITest.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Convert2Wiki refs/changes/35/263335/1 diff --git a/src/test/api/APITest.php b/src/test/api/APITest.php index 0bfe14c..75fe945 100644 --- a/src/test/api/APITest.php +++ b/src/test/api/APITest.php @@ -20,7 +20,7 @@ public function testGetConversionList(){ $this->assertArrayEquals(array( 'Convert2Wiki\Formats\CSV' => (new CSV())->getFormatName(), - 'Convert2Wiki\Formats\WikiTable' => (new WikiTable())->getFormatName(), + 'Convert2Wiki\Formats\WikiTable' => (new WikiTable())->getFormatName() ),json_decode(API::getConversionList(),true)); } -- To view, visit https://gerrit.wikimedia.org/r/263335 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic99a9056b8f046e4108cb5a086e2ae3f30801dfa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Convert2Wiki Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add PLURAL support to some messages - change (mediawiki...CentralAuth)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/263166 Change subject: Add PLURAL support to some messages .. Add PLURAL support to some messages Bug: T111096 Change-Id: Ib5925bfab29e05f9235523270c4314259a52f75c --- M i18n/en.json M i18n/qqq.json M includes/CentralAuthHooks.php 3 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth refs/changes/66/263166/1 diff --git a/i18n/en.json b/i18n/en.json index ad9fc35..ddb375a 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -217,8 +217,8 @@ "centralauth-account-unattached-exists": "Cannot create account: The username is already in use. Please pick another name.", "centralauth-account-rename-exists": "Cannot create account: The username is already in use. Please pick another name.", "centralauth-account-exists-reset": "The username $1 is not registered on this wiki, but you can reset its password on [[Special:CentralAuth/$1|a wiki where it is]].", - "centralauth-login-progress": "Logging you in to wikis of {{int:Centralauth-groupname}}:", - "centralauth-logout-progress": "Logging you out from other wikis of {{int:Centralauth-groupname}}:", + "centralauth-login-progress": "Logging you in to {{PLURAL:$2|wikis}} of {{int:Centralauth-groupname}}:", + "centralauth-logout-progress": "Logging you out from other {{PLURAL:$2|wikis}} of {{int:Centralauth-groupname}}:", "centralauth-login-no-others": "You have been automatically logged into other projects of {{int:Centralauth-groupname}}.", "centralauth-logout-no-others": "You have been automatically logged out of other projects of {{int:Centralauth-groupname}}.", "centralauth-hidden-blockreason": "globally hidden by $1 at $2 with following reason: $3", @@ -244,7 +244,7 @@ "centralauth-rightslog-entry-groupperms3": "changed group restricted wikis set for $1 from $2 to $3", "centralauth-rightslog-entry-grouprename": "renamed group $2 to $1", "centralauth-rightslog-header": "This log contains operations on global groups: membership and permissions changes", - "centralauth-rightslog-entry-newset": "created $2 wiki set $1 with following wikis: $3", + "centralauth-rightslog-entry-newset": "created $2 wiki set $1 with following {{PLURAL:$3|wiki|wikis}}: $3", "centralauth-rightslog-entry-setrename": "renamed wiki set \"$2\" to \"$1\"", "centralauth-rightslog-entry-setnewtype": "changed type of \"$1\" from $2 to $3", "centralauth-rightslog-entry-setchange": "changed wikis in \"$1\": added: $2; removed: $3", diff --git a/i18n/qqq.json b/i18n/qqq.json index 1296405..8ea1b90 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -233,8 +233,8 @@ "centralauth-account-unattached-exists": "Used as error message.", "centralauth-account-rename-exists": "Used as error message.", "centralauth-account-exists-reset": "Used as error message.\n\nParameters:\n* $1 - global user's name", - "centralauth-login-progress": "{{gender}}\nRefers to {{msg-mw|Centralauth-groupname}}.\n\nParameters:\n* $1 - (Optional) the user name of the logged in user\nSee also:\n* {{msg-mw|Centralauth-logout-progress}}", - "centralauth-logout-progress": "{{gender}}\nRefers to {{msg-mw|Centralauth-groupname}}.\n\nParameters:\n* $1 - (Optional) the user name of the logged out user\nSee also:\n* {{msg-mw|Centralauth-login-progress}}", + "centralauth-login-progress": "{{gender}}\nRefers to {{msg-mw|Centralauth-groupname}}.\n\nParameters:\n* $1 - (Optional) the user name of the logged in user\n $2 the number of wikis, used for PLURAL support\nSee also:\n* {{msg-mw|Centralauth-logout-progress}}", + "centralauth-logout-progress": "{{gender}}\nRefers to {{msg-mw|Centralauth-groupname}}.\n\nParameters:\n* $1 - (Optional) the user name of the logged out user\n $2 the number of wikis, used for PLURAL support\nSee also:\n* {{msg-mw|Centralauth-login-progress}}", "centralauth-login-no-others": "Refers to {{msg-mw|Centralauth-groupname}}.\n\nSee also:\n* {{msg-mw|Centralauth-logout-no-others}}", "centralauth-logout-no-others": "Refers to {{msg-mw|Centralauth-groupname}}.\n\nSee also:\n* {{msg-mw|Centralauth-login-no-others}}", "centralauth-hidden-blockreason": "Unused at this time. Parameters:\n* $1 - username\n* $2 - ...\n* $3 - reason", @@ -260,7 +260,7 @@ "centralauth-rightslog-entry-groupperms3": "A log entry when a user changes the wiki set where the specified global group is applied.\n\nParameters:\n* $1 - the name of the group being changed\n* $2 - the name of the previous wiki set\n* $3 - the name of the new wiki set", "centralauth-rightslog-entry-grouprename": "A log entry when a user renames a global group. Parameters:\n* $1 - the title of the new
[MediaWiki-commits] [Gerrit] Add PLURAL support to exif-pdf-pagesize - change (mediawiki...PdfHandler)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/262459 Change subject: Add PLURAL support to exif-pdf-pagesize .. Add PLURAL support to exif-pdf-pagesize Change-Id: If63c5fd300a9a219e7dc334f51cc76d2c0b5b413 --- M PdfHandler.image.php M i18n/en.json M i18n/qqq.json 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PdfHandler refs/changes/59/262459/1 diff --git a/PdfHandler.image.php b/PdfHandler.image.php index ea016e3..8e27c78 100644 --- a/PdfHandler.image.php +++ b/PdfHandler.image.php @@ -284,7 +284,7 @@ $pageSizeArray = array_keys( $pageSizes ); if ( count( $pageSizeArray ) > 0 ) { - $items['pdf-PageSize'] = $pageSizeArray; + $items['pdf-PageSize', count( $pageSizeArray )] = $pageSizeArray; } break; } diff --git a/i18n/en.json b/i18n/en.json index 1e68720..fcb2f9b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -12,5 +12,5 @@ "exif-pdf-producer": "Conversion program", "exif-pdf-version": "Version of PDF format", "exif-pdf-encrypted": "Encrypted", - "exif-pdf-pagesize": "Page size" + "exif-pdf-pagesize": "Page {{PLURAL:$1|size|sizes}}" } diff --git a/i18n/qqq.json b/i18n/qqq.json index ca8bb39..893635e 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -17,5 +17,5 @@ "exif-pdf-producer": "The label used in the metadata table at the bottom of the file description page for the program used to convert this PDF file into a PDF.\n\nThis is separate from the program used to create the original file (Which is labeled by {{msg-mw|Exif-software}}).", "exif-pdf-version": "Label for the version of the pdf file format in the metadata table at the bottom of an image description page. Usually a number between 1.2 and 1.6", "exif-pdf-encrypted": "Label for field in metadata table at bottom of an image description page to denote if the PDF file is encrypted. The value of the field this references is either \"no\" (most common) or something like \"yes (print:yes copy:no change:no addNotes:no)\"", - "exif-pdf-pagesize": "Label for the field in the metadata table at the bottom of an image description page to denote the size of the pages in the pdf. If there is more than one size of page used in this document, each size is listed once.\n{{Identical|Page size}}" + "exif-pdf-pagesize": "Label for the field in the metadata table at the bottom of an image description page to denote the size of the pages in the pdf. If there is more than one size of page used in this document, each size is listed once.\n{{Identical|Page size}}\nParameter: $1 count of page sizes, used for PLURAL support." } -- To view, visit https://gerrit.wikimedia.org/r/262459 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If63c5fd300a9a219e7dc334f51cc76d2c0b5b413 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PdfHandler Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add GENDER support to some MediaWiki core messages - change (mediawiki/core)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/262250 Change subject: Add GENDER support to some MediaWiki core messages .. Add GENDER support to some MediaWiki core messages Change-Id: Ieec383e77aa245fd0db12ea714a27540853c5054 --- M includes/specials/SpecialUserrights.php M languages/i18n/en.json M languages/i18n/qqq.json 3 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/50/262250/1 diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php index 1327972..ee1518d 100644 --- a/includes/specials/SpecialUserrights.php +++ b/includes/specials/SpecialUserrights.php @@ -464,7 +464,7 @@ $this->mFetchedUser === null ? array( 'autofocus' => '' ) : array() ) ) . ' ' . - Xml::submitButton( $this->msg( 'editusergroup' )->text() ) . + Xml::submitButton( $this->msg( 'editusergroup', $user->getName() )->text() ) . Html::closeElement( 'fieldset' ) . Html::closeElement( 'form' ) . "\n" ); @@ -594,7 +594,7 @@ " . - Xml::submitButton( $this->msg( 'saveusergroups' )->text(), + Xml::submitButton( $this->msg( 'saveusergroups', $user->getName() )->text(), array( 'name' => 'saveusergroups' ) + Linker::tooltipAndAccesskeyAttribs( 'userrights-set' ) ) . diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 75d577d..e8d4c01 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -1068,10 +1068,10 @@ "userrights-summary": "", "userrights-lookup-user": "Manage user groups", "userrights-user-editname": "Enter a username:", - "editusergroup": "Edit user groups", + "editusergroup": "Edit {{GENDER:$1|user}} groups", "editinguser": "Changing user rights of {{GENDER:$1|user}} [[User:$1|$1]] $2", "userrights-editusergroup": "Edit user groups", - "saveusergroups": "Save user groups", + "saveusergroups": "Save {{GENDER:$1|user}} groups", "userrights-groupsmember": "Member of:", "userrights-groupsmember-auto": "Implicit member of:", "userrights-groupsmember-type": "$1", @@ -3215,8 +3215,8 @@ "scarytranscludefailed-httpstatus": "[Template fetch failed for $1: HTTP $2]", "scarytranscludetoolong": "[URL is too long]", "deletedwhileediting": "Warning: This page was deleted after you started editing!", - "confirmrecreate": "User [[User:$1|$1]] ([[User talk:$1|talk]]) deleted this page after you started editing with reason:\n: $2\nPlease confirm that you really want to recreate this page.", - "confirmrecreate-noreason": "User [[User:$1|$1]] ([[User talk:$1|talk]]) deleted this page after you started editing. Please confirm that you really want to recreate this page.", + "confirmrecreate": "User [[User:$1|$1]] ([[User talk:$1|talk]]) {{GENDER:$1|deleted}} this page after you started editing with reason:\n: $2\nPlease confirm that you really want to recreate this page.", + "confirmrecreate-noreason": "User [[User:$1|$1]] ([[User talk:$1|talk]]) {{GENDER:$1|deleted}} this page after you started editing. Please confirm that you really want to recreate this page.", "recreate": "Recreate", "unit-pixel": "px", "confirm_purge_button": "OK", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index 93b8cff..99877e9 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -1243,10 +1243,10 @@ "userrights-summary": "{{doc-specialpagesummary|userrights}}", "userrights-lookup-user": "Label text when managing user rights ([[Special:UserRights]])", "userrights-user-editname": "Displayed on [[Special:UserRights]].", - "editusergroup": "Button name, in page [[Special:Userrights]] (only available to administrators), in the section named {{MediaWiki:userrights-lookup-user}}.\n\n{{Identical|Edit user groups}}", + "editusergroup": "Button name, in page [[Special:Userrights]] (only available to administrators), in the section named {{MediaWiki:userrights-lookup-user}}.\n\n{{Identical|Edit user groups}}.\nParameters:\n* $1 - username, for GENDER support", "editinguser": "Appears on [[Special:UserRights]]. Parameters:\n* $1 - a plaintext username\n* $2 - user tool links. e.g. \"(Talk | contribs | block | send email)\""
[MediaWiki-commits] [Gerrit] Add GENDER support to two Newsletter messages - change (mediawiki...Newsletter)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/262088 Change subject: Add GENDER support to two Newsletter messages .. Add GENDER support to two Newsletter messages Change-Id: I920b0166abb5cbf164a2123f1a4ce3320063bcb0 --- M i18n/en.json M i18n/qqq.json 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter refs/changes/88/262088/1 diff --git a/i18n/en.json b/i18n/en.json index 007a6ad..1006a82 100755 --- a/i18n/en.json +++ b/i18n/en.json @@ -83,8 +83,8 @@ "newsletter-list-search-none-found": "No newsletters match your query.", "echo-category-title-newsletter": "Newsletters", "echo-pref-tooltip-newsletter": "Notify me when any of the newsletters to which I have subscribed to announces a new issue.", - "newsletter-notification-title": "[[User:$3|$3]] has announced a [[$2|new issue]] of \"$1\".", - "newsletter-notification-flyout": "$3 has announced a new issue of $1.", + "newsletter-notification-title": "[[User:$3|$3]] {{GENDER:$3|has announced}} a [[$2|new issue]] of \"$1\".", + "newsletter-notification-flyout": "$3 {{GENDER:$3|has announced}} a new issue of $1.", "newsletter-notification-link-text-new-issue": "View new issue", "newsletter-notification-link-text-view-newsletter": "View newsletter", "newsletter-email-subject": "A new issue of $1 has been announced.", diff --git a/i18n/qqq.json b/i18n/qqq.json index b228d86..1fda6ff 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -86,8 +86,8 @@ "newsletter-list-search-none-found": "Error message shown on [[Special:Newsletters]] if no newsletters found after user searches the table using filters", "echo-category-title-newsletter": "Title of the notification category used by Newsletter extension.\n{{Related|Echo-category-title}}\n{{Identical|Newsletter}}", "echo-pref-tooltip-newsletter": "Short description of the newsletter notification category.\n{{Related|Echo-pref-tooltip}}", - "newsletter-notification-title": "Header text for a notification when a new issue of a newsletter is announced. Parameters:\n* $1 is the name of the newsletter.\n* $2 is title of the issue page.\n* $3 is the username of the user who announced the new issue.", - "newsletter-notification-flyout": "Used as a Echo notification flyout message when a new issue of a newsletter is announced. \n* $1 is the name of the newsletter.\n* $2 is title of the issue page.\n* $3 is the username of the user who announced the new issue.", + "newsletter-notification-title": "Header text for a notification when a new issue of a newsletter is announced. Parameters:\n* $1 is the name of the newsletter.\n* $2 is title of the issue page.\n* $3 is the username of the user who announced the new issue, also used for GENDER in translations.", + "newsletter-notification-flyout": "Used as a Echo notification flyout message when a new issue of a newsletter is announced. \n* $1 is the name of the newsletter.\n* $2 is title of the issue page.\n* $3 is the username of the user who announced the new issue, also used for GENDER.", "newsletter-notification-link-text-new-issue": "Label of the primary link of the notification-newsletter-flyout, which on clicking navigates the user to the newly announced issue of a newsletter.", "newsletter-notification-link-text-view-newsletter": "Label for button that links to the newsletter page.", "newsletter-email-subject": "Text of the email subject when a new newsletter is announced Parameters:\n* $1 is the name of the newsletter.", -- To view, visit https://gerrit.wikimedia.org/r/262088 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I920b0166abb5cbf164a2123f1a4ce3320063bcb0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Convert SubpageSortkey to use extension registration - change (mediawiki...SubpageSortkey)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/261879 Change subject: Convert SubpageSortkey to use extension registration .. Convert SubpageSortkey to use extension registration Bug: T87975 Change-Id: I4762af9539ab5362ccf3037e4367df1fe1650f05 --- A README.txt M SubpageSortkey.i18n.php M SubpageSortkey.php A extension.json 4 files changed, 60 insertions(+), 88 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SubpageSortkey refs/changes/79/261879/1 diff --git a/README.txt b/README.txt new file mode 100644 index 000..f30 --- /dev/null +++ b/README.txt @@ -0,0 +1,16 @@ +Really simple extension to change the default sortkey to have something +to do with the subpages. See bug 22911. Requires at least MediaWiki 1.18 + +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2 of the License, or (at your option) +any later version. + +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +more details. +You should have received a copy of the GNU General Public License along with +this program; if not, write to the Free Software Foundation, Inc., 59 Temple +Place - Suite 330, Boston, MA 02111-1307, USA. +http://www.gnu.org/copyleft/gpl.html diff --git a/SubpageSortkey.i18n.php b/SubpageSortkey.i18n.php index dcd91ab..8b13789 100644 --- a/SubpageSortkey.i18n.php +++ b/SubpageSortkey.i18n.php @@ -1,35 +1 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShim533cf18466273801' ) ) { - function wfJsonI18nShim533cf18466273801( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim533cf18466273801'; -} diff --git a/SubpageSortkey.php b/SubpageSortkey.php index bf08458..bf68029 100644 --- a/SubpageSortkey.php +++ b/SubpageSortkey.php @@ -1,62 +1,22 @@ http://www.gnu.org/copyleft/gpl.html - * * @addtogroup Extensions * * @author Brian Wolff * @copyright Copyright © 2011 Brian Wolff * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later - */ -$wgExtensionCredits['other'][] = array( - 'path' => __FILE__, - 'name' => 'Subpage Sortkey', - 'author' => array( '[http://mediawiki.org/wiki/User:Bawolff Brian Wolff]' ), - 'descriptionmsg' => 'subpagesortkey-desc', - 'url' => 'https://www.mediawiki.org/wiki/Extension:SubpageSortkey', - 'version' => '0.2.0', - 'license-name' => 'GPL-2.0+', -); - -// Syntax is as follows: -// * A positive number n represents the nth subpage section -// * A negative number -i represents the ith subpage section counting backwards -// * A range a..b represents all sections a to b inclusive -// * Ranges can be open. -// Examples: -// "0" would be just the base page name (a/b/c/d -> a). -// "0..2" would be the first 3 sections (a/b/c/d -> a/b/c) -// "0,2" would be a/b/c/d -> a/c -// "1.." would be a/b/c/d -> b/c/d -// "0,-2" would be a/b/c/d -> a/c - -// The default sortkey subpage descriptor (aka "1,2,3..6" ) -$wgSubpageSortkeyDefault = false; -// Per namespace sortkeys (array, each key is a namespace number) -// For example $wgSubpageSortkeyByNamespace[NS_TALK] = '1..'; -$wgSubpageSortkeyByNamespa
[MediaWiki-commits] [Gerrit] Change validation message after uploading a cohort - change (analytics/wikimetrics)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/261793 Change subject: Change validation message after uploading a cohort .. Change validation message after uploading a cohort Bug: T76914 Change-Id: Ib0627cd39c19664b8b20dfb7279956bcff3bff5c --- M wikimetrics/templates/cohorts.html 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics refs/changes/93/261793/1 diff --git a/wikimetrics/templates/cohorts.html b/wikimetrics/templates/cohorts.html index 6fabafc..d4a5293 100644 --- a/wikimetrics/templates/cohorts.html +++ b/wikimetrics/templates/cohorts.html @@ -56,10 +56,9 @@ -Validated - of - cohort members. - are valid, are invalid. +Validation complete: +invalid and + valid users. -- To view, visit https://gerrit.wikimedia.org/r/261793 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0627cd39c19664b8b20dfb7279956bcff3bff5c Gerrit-PatchSet: 1 Gerrit-Project: analytics/wikimetrics Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Whitelist PranavK (for Verified +2 tests) - change (integration/config)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/261606 Change subject: Whitelist PranavK (for Verified +2 tests) .. Whitelist PranavK (for Verified +2 tests) Change-Id: Id6c276f394175c08ceacf21a064e8d0c3fbb4163 --- M zuul/layout.yaml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/06/261606/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 050b099..4dd13f8 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -148,6 +148,7 @@ | platonides@gmail\.com | pleasestand@live\.com | pragun06@gmail\.com +| pranavmk98@gmail\.com | pyfisch@gmail\.com | raimond\.spekking@gmail\.com | ricordisamoa@openmailbox\.org @@ -426,6 +427,7 @@ - ^juliusalphonso\.09@gmail\.com$ # JadeMaveric - ^justin\.d128@gmail\.com$ # MtDu - ^mhutti1@gmail\.com$ + - ^pranavmk98@gmail\.com # PranavK - ^victorbarbu08@gmail\.com$ # Victorbarbu # Let whitelisted users the ability to reenqueue a change in the test -- To view, visit https://gerrit.wikimedia.org/r/261606 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id6c276f394175c08ceacf21a064e8d0c3fbb4163 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Convert OAI Extension to use extension registration - change (mediawiki...OAI)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/261324 Change subject: Convert OAI Extension to use extension registration .. Convert OAI Extension to use extension registration Bug: T87948 Change-Id: If7989ce0c3a6632738efda9501ca225cc95437c4 --- M OAI.php A extension.json 2 files changed, 68 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAI refs/changes/24/261324/1 diff --git a/OAI.php b/OAI.php index 7cb12a3..6b2d924 100644 --- a/OAI.php +++ b/OAI.php @@ -1,3 +1,14 @@ https://www.mediawiki.org/wiki/Extension_registration for more details.' + ); + return; +} else { + die( 'This version of the OAI extension requires MediaWiki 1.25+' ); +} diff --git a/extension.json b/extension.json new file mode 100644 index 000..c775d9a --- /dev/null +++ b/extension.json @@ -0,0 +1,55 @@ +{ + "name": "OAIRepository", + "author": "Brion Vibber", + "url": "https://www.mediawiki.org/wiki/Extension:OAIRepository";, + "descriptionmsg": "oai-desc", + "license-name": "GPL-2.0+", + "type": "specialpage", + "SpecialPages": { + "OAIRepository": "SpecialOAIRepository" + }, + "MessagesDirs": { + "OAIRepository": [ + "i18n" + ] + }, + "ExtensionMessagesFiles": { + "OAIRepositoryAlias": "OAIRepo.alias.php" + }, + "AutoloadClasses": { + "SpecialOAIRepository": "OAIRepo_body.php", + "OAIRepo": "OAIRepo_body.php", + "OAIRecord": "OAIRepo_body.php", + "WikiOAIRecord": "OAIRepo_body.php", + "OAIDumpWriter": "OAIRepo_body.php", + "OAILSearchWriter": "OAIRepo_body.php", + "OAIHarvester": "OAIHarvest.php", + "OAIError": "OAIHarvest.php", + "OAIUpdateRecord": "OAIHarvest.php", + "OAIHook": "OAIHooks.php" + }, + "Hooks": { + "ArticleSaveComplete": [ + "OAIHook::updateSave" + ], + "ArticleDelete": [ + "OAIHook::updateDeleteSetup" + ], + "ArticleDeleteComplete": [ + "OAIHook::updateDelete" + ], + "TitleMoveComplete": [ + "OAIHook::updateMove" + ], + "ParserTestTables": [ + "OAIHook::testTables" + ], + "ArticleUndelete": [ + "OAIHook::updateUndelete" + ], + "LoadExtensionSchemaUpdates": [ + "OAIHook::updateSchemaHook" + ] + }, + "manifest_version": 1 +} -- To view, visit https://gerrit.wikimedia.org/r/261324 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If7989ce0c3a6632738efda9501ca225cc95437c4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OAI Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated wfMsg* functions - change (mediawiki...ConventionExtension)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/261307 Change subject: Replace deprecated wfMsg* functions .. Replace deprecated wfMsg* functions Bug: T70750 Change-Id: Ia41ddc95572ec6740e34f2a012f31e107d7ca25a --- M ConferenceHooks.php M ui/admin/SpecialDashboard.php M ui/user/SpecialAuthorRegister.php M utils/CommonUtils.php 4 files changed, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConventionExtension refs/changes/07/261307/1 diff --git a/ConferenceHooks.php b/ConferenceHooks.php index f1a2633..8687af3 100644 --- a/ConferenceHooks.php +++ b/ConferenceHooks.php @@ -39,7 +39,7 @@ # generate the link for the page if ( $arg1 == 'article' ) { - $pageLink = Title::newFromText( $conferenceTitle . '/' . wfMsgForContent('cvext-pages') . '/' . $pageType )->getPrefixedDBKey(); + $pageLink = Title::newFromText( $conferenceTitle . '/' . wfMessage('cvext-pages')->inContentLanguage()->text() . '/' . $pageType )->getPrefixedDBKey(); } elseif ( $arg1 == 'special' ) { $pageLink = SpecialPage::getTitleFor( 'AuthorRegister', $conferenceTitle )->getFullURL( 'action=createview' ); } @@ -141,7 +141,7 @@ $conferenceTitle = $confTitle->getDBkey(); } $conference = ConferenceUtils::loadFromConferenceTag( $conferenceId ); - $baseTitleText = $conferenceTitle . '/' . wfMsgForContent( 'cvext-pages' ) . '/'; + $baseTitleText = $conferenceTitle . '/' . wfMessage( 'cvext-pages' )->inContentLanguage()->text() . '/'; $venue = isset( $conference['venue'] ) ? $conference['venue'] : ''; if ( $venue ) { $venueArray = explode( ',', $venue ); @@ -171,7 +171,7 @@ $sidebar = array(); foreach ( $links as $link ) { /*$name = $link['name'];*/ - $name = $link['msg'] == 'aboutcity' ? wfMsgForContent( 'cvext-' . $link['msg'] . '-plain' ) : wfMsgForContent( 'cvext-' . $link['msg'] ); + $name = $link['msg'] == 'aboutcity' ? wfMessage( 'cvext-' . $link['msg'] . '-plain' )->inContentLanguage()->text() : wfMessage( 'cvext-' . $link['msg'] )->inContentLanguage()->text(); $title = Title::newFromText( $baseTitleText . $name ); $msg = $link['msg'] == 'aboutcity' ? wfMsg( 'cvext-' . $link['msg'], $city ) : wfMsg( 'cvext-' . $link['msg'] ); if ( $title->exists() ) { @@ -243,4 +243,4 @@ $customVariableIds[] = 'conf-description'; return true; } -} \ No newline at end of file +} diff --git a/ui/admin/SpecialDashboard.php b/ui/admin/SpecialDashboard.php index 64ae6dd..399d989 100644 --- a/ui/admin/SpecialDashboard.php +++ b/ui/admin/SpecialDashboard.php @@ -215,7 +215,7 @@ { $exists = true; } - $completePageTitle = $this->conference->getTitle() . '/' . wfMsgForContent( 'cvext-pages' ) . '/' . $page; + $completePageTitle = $this->conference->getTitle() . '/' . wfMessage( 'cvext-pages' )->inContentLanguage()->text() . '/' . $page; $links = $exists ? ('' . wfMsg( 'cvext-dash-create' ) . ' | ' . '' . wfMsg( 'cvext-dash-edit' ) . '' . ' | ' . '' . wfMsg( 'cvext-dash-delete' ) . '') : ('' . wfMsg( 'cvext-dash-create' ) . ' | '. @@ -319,11 +319,11 @@ $endTime = $event->getEndTime(); $day = $event->getDay(); $group = $event->getGroup(); - $completeEventTitle = $this->conference->getTitle() . '/' . wfMsgForContent( 'cvext-events' ) . '/' . $topic . '-' . $day . + $completeEventTitle = $this->conference->getTitle() . '/' . wfMessage( 'cvext-events' )->inContentLanguage()->text() . '/' . $topic . '-' . $day . '-' . $startTime . '-' . $endTime . '-' . $group; $eventUrl = Title::makeTitle( NS_MAIN, $completeEventTitle )->getFullURL(); $location = $event->getLocation(); - $completeLocationTitle = $this->conference->getTitle() . '/' .
[MediaWiki-commits] [Gerrit] UploadWizard's "ownwork" and "thirdparty" are case sensitive - change (mediawiki...UploadWizard)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/261170 Change subject: UploadWizard's "ownwork" and "thirdparty" are case sensitive .. UploadWizard's "ownwork" and "thirdparty" are case sensitive Bug: T65494 Change-Id: I96b041e3cf4ba2f1f5cfd3dc96fa677280c36d9b --- M UploadWizard.config.php 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard refs/changes/70/261170/1 diff --git a/UploadWizard.config.php b/UploadWizard.config.php index c86e3ef..346b70a 100644 --- a/UploadWizard.config.php +++ b/UploadWizard.config.php @@ -434,6 +434,13 @@ 'ownWork' => array( 'type' => 'or', 'template' => 'self', + 'defaults' => array( + 'cc-by-sa-4.0', + 'cc-by-sa-3.0', + 'cc-by-4.0', + 'cc-by-3.0', + 'cc-zero' + ), 'licenses' => array( 'cc-by-sa-4.0', 'cc-by-sa-3.0', @@ -446,6 +453,13 @@ // checkbox selection of all licenses 'thirdParty' => array( 'type' => 'or', + 'defaults' => array( + 'cc-by-sa-4.0', + 'cc-by-sa-3.0', + 'cc-by-4.0', + 'cc-by-3.0', + 'cc-zero' + ), 'licenseGroups' => array( array( // This should be a list of all CC licenses we can reasonably expect to find around the web -- To view, visit https://gerrit.wikimedia.org/r/261170 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I96b041e3cf4ba2f1f5cfd3dc96fa677280c36d9b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UploadWizard Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make "Upload anyway" link a OOjs UI button - change (mediawiki...UploadWizard)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/260900 Change subject: Make "Upload anyway" link a OOjs UI button .. Make "Upload anyway" link a OOjs UI button Bug: T114221 Change-Id: Iaee6b7c5abf5396d649bd87eb308dfd2e9b32fa5 --- M resources/mw.UploadWizardUpload.js 1 file changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard refs/changes/00/260900/1 diff --git a/resources/mw.UploadWizardUpload.js b/resources/mw.UploadWizardUpload.js index da20c4d..077eab2 100644 --- a/resources/mw.UploadWizardUpload.js +++ b/resources/mw.UploadWizardUpload.js @@ -305,13 +305,15 @@ $extra = $ul; if ( code === 'duplicate-archive' ) { - $override = $( '' ) - .attr( 'href', '#' ) - .text( mw.message( 'mwe-upwiz-override' ).text() ) - .click( function () { - this.removeErrors( 'duplicate-archive' ); - }.bind( this ) ); - $extra = $extra.add( $override ); + this.uploadDuplicate = new OO.ui.ButtonWidget( { + label: mw.message( 'mwe-upwiz-override' ).escaped(), + title: mw.message( 'mwe-upwiz-override' ).escaped(), + flags: 'progressive', + framed: false + } ).on( 'click', function () { + this.removeErrors( 'duplicate-archive' ); + } ); + $extra = $extra.append( this.uploadDuplicate.$element ); } this.setError( code, [ duplicates.length ], $extra ); -- To view, visit https://gerrit.wikimedia.org/r/260900 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaee6b7c5abf5396d649bd87eb308dfd2e9b32fa5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UploadWizard Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make Special:MediaStatistics show a total count of file sizes - change (mediawiki/core)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/260183 Change subject: Make Special:MediaStatistics show a total count of file sizes .. Make Special:MediaStatistics show a total count of file sizes Bug: T117606 Change-Id: I4216566df4dd2423d679f0f64fa694fa06e55c0e --- M includes/specials/SpecialMediaStatistics.php M languages/i18n/en.json M languages/i18n/qqq.json 3 files changed, 24 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/83/260183/1 diff --git a/includes/specials/SpecialMediaStatistics.php b/includes/specials/SpecialMediaStatistics.php index e5ba8c6..91655f1 100644 --- a/includes/specials/SpecialMediaStatistics.php +++ b/includes/specials/SpecialMediaStatistics.php @@ -26,7 +26,7 @@ * @ingroup SpecialPage */ class MediaStatisticsPage extends QueryPage { - protected $totalCount = 0, $totalBytes = 0; + protected $totalCount = 0, $totalBytes = 0, $totalPerType = 0, $totalSize = 0; function __construct( $name = 'MediaStatistics' ) { parent::__construct( $name ); @@ -123,6 +123,7 @@ $this->outputTableEnd(); } $this->outputMediaType( $mediaType ); + $this->totalPerType = 0; $this->outputTableStart( $mediaType ); $prevMediaType = $mediaType; } @@ -130,6 +131,7 @@ } if ( $prevMediaType !== null ) { $this->outputTableEnd(); + $this->getOutput()->addWikiText($this->msg( 'mediastatistics-allbytes' )->numParams( $this->totalSize ) ); } } @@ -138,6 +140,7 @@ */ protected function outputTableEnd() { $this->getOutput()->addHtml( Html::closeElement( 'table' ) ); + $this->getOutput()->addWikiText( $this->msg( 'mediastatistics-bytespertype' )->numParams( $this->totalPerType ) ); } /** @@ -180,7 +183,8 @@ ->numParams( $this->makePercentPretty( $bytes / $this->totalBytes ) ) ->parse() ); - + $this->totalPerType += $bytes; + $this->totalSize += $this->totalPerType; $this->getOutput()->addHTML( Html::rawElement( 'tr', array(), $row ) ); } diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 70a2b80..924dd0c 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -1250,6 +1250,7 @@ "recentchanges-legend-bot": "{{int:recentchanges-label-bot}}", "recentchanges-legend-unpatrolled": "{{int:recentchanges-label-unpatrolled}}", "recentchanges-legend-plusminus": "(±123)", + "recentchanges-submit": "Show", "rcnotefrom": "Below {{PLURAL:$5|is the change|are the changes}} since $3, $4 (up to $1 shown).", "rclistfrom": "Show new changes starting from $2, $3", "rcshowhideminor": "$1 minor edits", @@ -1721,6 +1722,7 @@ "prefixindex": "All pages with prefix", "prefixindex-namespace": "All pages with prefix ($1 namespace)", "prefixindex-summary": "", + "prefixindex-submit": "Show", "prefixindex-strip": "Strip prefix in list", "shortpages": "Short pages", "shortpages-summary": "", @@ -1741,12 +1743,14 @@ "protectedpages-performer": "Protecting user", "protectedpages-params": "Protection parameters", "protectedpages-reason": "Reason", + "protectedpages-submit": "Display pages", "protectedpages-unknown-timestamp": "Unknown", "protectedpages-unknown-performer": "Unknown user", "protectedpages-unknown-reason": "—", "protectedtitles": "Protected titles", "protectedtitles-summary": "This page lists titles that are currently protected from creation. For a list of existing pages that are protected, see [[{{#special:ProtectedPages}}|{{int:protectedpages}}]].", "protectedtitlesempty": "No titles are currently protected with these parameters.", + "protectedtitles-submit": "Display titles", "listusers": "User list", "listusers-summary": "", "listusers-editsonly": "Show only users with edits", @@ -1839,6 +1843,7 @@ "activeusers-hidebots": "Hide bots", "activeusers-hidesysops": "Hide administrators", "activeusers-noresult": "No users found.", + "activeusers-submit": "Display active users", "listgrouprights": "User group rights", "listgrouprights-summary": "The following is a list of user groups defined on this wiki, with their associated access rights.\nThere may be [[{{MediaWiki:Listgrouprights-helppage}}|additional information]] about in
[MediaWiki-commits] [Gerrit] Make Special:MediaStatistics show a total count of file sizes - change (mediawiki/core)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/260182 Change subject: Make Special:MediaStatistics show a total count of file sizes .. Make Special:MediaStatistics show a total count of file sizes Bug: T117606 Change-Id: I1c0ed8a27d487fa8d5c4d9641d430acfe007277c --- M includes/specials/SpecialMediaStatistics.php M languages/i18n/en.json M languages/i18n/qqq.json 3 files changed, 24 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/82/260182/1 diff --git a/includes/specials/SpecialMediaStatistics.php b/includes/specials/SpecialMediaStatistics.php index e5ba8c6..91655f1 100644 --- a/includes/specials/SpecialMediaStatistics.php +++ b/includes/specials/SpecialMediaStatistics.php @@ -26,7 +26,7 @@ * @ingroup SpecialPage */ class MediaStatisticsPage extends QueryPage { - protected $totalCount = 0, $totalBytes = 0; + protected $totalCount = 0, $totalBytes = 0, $totalPerType = 0, $totalSize = 0; function __construct( $name = 'MediaStatistics' ) { parent::__construct( $name ); @@ -123,6 +123,7 @@ $this->outputTableEnd(); } $this->outputMediaType( $mediaType ); + $this->totalPerType = 0; $this->outputTableStart( $mediaType ); $prevMediaType = $mediaType; } @@ -130,6 +131,7 @@ } if ( $prevMediaType !== null ) { $this->outputTableEnd(); + $this->getOutput()->addWikiText($this->msg( 'mediastatistics-allbytes' )->numParams( $this->totalSize ) ); } } @@ -138,6 +140,7 @@ */ protected function outputTableEnd() { $this->getOutput()->addHtml( Html::closeElement( 'table' ) ); + $this->getOutput()->addWikiText( $this->msg( 'mediastatistics-bytespertype' )->numParams( $this->totalPerType ) ); } /** @@ -180,7 +183,8 @@ ->numParams( $this->makePercentPretty( $bytes / $this->totalBytes ) ) ->parse() ); - + $this->totalPerType += $bytes; + $this->totalSize += $this->totalPerType; $this->getOutput()->addHTML( Html::rawElement( 'tr', array(), $row ) ); } diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 70a2b80..924dd0c 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -1250,6 +1250,7 @@ "recentchanges-legend-bot": "{{int:recentchanges-label-bot}}", "recentchanges-legend-unpatrolled": "{{int:recentchanges-label-unpatrolled}}", "recentchanges-legend-plusminus": "(±123)", + "recentchanges-submit": "Show", "rcnotefrom": "Below {{PLURAL:$5|is the change|are the changes}} since $3, $4 (up to $1 shown).", "rclistfrom": "Show new changes starting from $2, $3", "rcshowhideminor": "$1 minor edits", @@ -1721,6 +1722,7 @@ "prefixindex": "All pages with prefix", "prefixindex-namespace": "All pages with prefix ($1 namespace)", "prefixindex-summary": "", + "prefixindex-submit": "Show", "prefixindex-strip": "Strip prefix in list", "shortpages": "Short pages", "shortpages-summary": "", @@ -1741,12 +1743,14 @@ "protectedpages-performer": "Protecting user", "protectedpages-params": "Protection parameters", "protectedpages-reason": "Reason", + "protectedpages-submit": "Display pages", "protectedpages-unknown-timestamp": "Unknown", "protectedpages-unknown-performer": "Unknown user", "protectedpages-unknown-reason": "—", "protectedtitles": "Protected titles", "protectedtitles-summary": "This page lists titles that are currently protected from creation. For a list of existing pages that are protected, see [[{{#special:ProtectedPages}}|{{int:protectedpages}}]].", "protectedtitlesempty": "No titles are currently protected with these parameters.", + "protectedtitles-submit": "Display titles", "listusers": "User list", "listusers-summary": "", "listusers-editsonly": "Show only users with edits", @@ -1839,6 +1843,7 @@ "activeusers-hidebots": "Hide bots", "activeusers-hidesysops": "Hide administrators", "activeusers-noresult": "No users found.", + "activeusers-submit": "Display active users", "listgrouprights": "User group rights", "listgrouprights-summary": "The following is a list of user groups defined on this wiki, with their associated access rights.\nThere may be [[{{MediaWiki:Listgrouprights-helppage}}|additional information]] about in
[MediaWiki-commits] [Gerrit] Handle errors when attempting to unsubscribe on Special:News... - change (mediawiki...Newsletter)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/259655 Change subject: Handle errors when attempting to unsubscribe on Special:Newsletters .. Handle errors when attempting to unsubscribe on Special:Newsletters Bug:T115874 Change-Id: I4334567c81100286ba1063eee0d2e325081f119c --- M i18n/en.json M i18n/qqq.json M modules/ext.newsletter.js 3 files changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter refs/changes/55/259655/1 diff --git a/i18n/en.json b/i18n/en.json index 153afa8..f8a42d6 100755 --- a/i18n/en.json +++ b/i18n/en.json @@ -67,6 +67,7 @@ "newsletter-do-unsubscribe": "Unsubscribe from this newsletter", "newsletter-unsubscribe-success": "You are no longer a subscriber of \"$1\" newsletter and you will not receive notifications when new issues of this newsletter are announced.", "newsletter-unsubscribe-fail": "Could not unsubscribe from \"$1\" newsletter as you are not currently subscribed to this newsletter.", + "newsletter-unsubscribe-error": "Error in unsubscribing from newsletter.", "newsletter-subscribe-section": "Subscribe newsletters", "newsletter-unsubscribe-section": "Unsubscribe newsletters", "newsletter-subscribe-confirmation": "You are now subscribed to the newsletter.", diff --git a/i18n/qqq.json b/i18n/qqq.json index 86ce029..f0aea9a 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -70,6 +70,7 @@ "newsletter-do-unsubscribe": "Label for button shown on Special:Newsletter//unsubscribe. Unsubscribes the current user from the newsletter when clicked on.", "newsletter-unsubscribe-success": "Success message shown on Special:Newsletter//unsubscribe when the user gets unsubscribed from the newsletter.\n\nParameters:\n* $1 - Name of the newsletter for the specified id", "newsletter-unsubscribe-fail": "Error message shown when the user attempts to unsubscribe but fails to do so.\n\nParameters:\n* $1 - Name of the newsletter", + "newsletter-unsubscribe-error": "Error message shown to handle any exceptions arising during unsubscription.", "newsletter-subscribe-section": "Section header of HTML form in [[Special:Newsletters]] which allows users to subscribe.", "newsletter-unsubscribe-section": "Section header of HTML form in [[Special:Newsletters]] which allows users to un-subscribe.", "newsletter-subscribe-confirmation": "Confirmation message displayed after subscribing to a newsletter", diff --git a/modules/ext.newsletter.js b/modules/ext.newsletter.js index 52de8f0..bc8c1bb 100644 --- a/modules/ext.newsletter.js +++ b/modules/ext.newsletter.js @@ -45,6 +45,11 @@ $link.text( mw.msg( 'newsletter-unsubscribing' ) ); // @todo Handle failures as well promise = doAPIRequest( 'unsubscribe', newsletterId ) + + .fail( function ( promise ) { + mw.notify( mw.msg( 'newsletter-unsubscribe-error', data.newslettersubscribe.name ) ); + } ); + .done( function ( data ) { updateLinkAttribs( $link, 'subscribe' ); $subscriberCount.text( parseInt( $subscriberCount.text() ) - 1 ); -- To view, visit https://gerrit.wikimedia.org/r/259655 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4334567c81100286ba1063eee0d2e325081f119c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wbsearchentities: Make returning the entity URL optinal - change (mediawiki...Wikibase)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/258967 Change subject: wbsearchentities: Make returning the entity URL optinal .. wbsearchentities: Make returning the entity URL optinal Bug: T103875 Change-Id: I63a694141d9b5222cb672fba0c62ff54eef58993 --- M repo/i18n/en.json M repo/i18n/qqq.json M repo/includes/api/SearchEntities.php M repo/tests/phpunit/includes/api/SearchEntitiesTest.php 4 files changed, 49 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/67/258967/1 diff --git a/repo/i18n/en.json b/repo/i18n/en.json index 5fd946d..40aa965 100644 --- a/repo/i18n/en.json +++ b/repo/i18n/en.json @@ -495,11 +495,13 @@ "apihelp-wbsearchentities-param-language": "Search in this language.", "apihelp-wbsearchentities-param-strictlanguage": "Whether to disable language fallback", "apihelp-wbsearchentities-param-type": "Search for this type of entity.", + "apihelp-wbsearchentities-param-props": "Return these properties for each entity.", "apihelp-wbsearchentities-param-limit": "Maximal number of results", "apihelp-wbsearchentities-param-continue": "Offset where to continue a search", "apihelp-wbsearchentities-example-1": "Search for \"abc\" in English language, with defaults for type and limit", "apihelp-wbsearchentities-example-2": "Search for \"abc\" in English language with a limit of 50", "apihelp-wbsearchentities-example-3": "Search for \"alphabet\" in English language for type property", + "apihelp-wbsearchentities-example-4": "Search for \"alphabet\" in English language, and return URL", "apihelp-query+wbsearch-description": "Searches for entities using labels and aliases.\nThis can be used as a generator for other queries.\nReturns the matched term that should be displayed.", "apihelp-query+wbsearch-param-search": "Search for this text.", "apihelp-query+wbsearch-param-language": "Search in this language.", @@ -604,3 +606,5 @@ "apihelp-wbsetsitelink-example-7": "Change the link to the Polish page from the item with ID \"Q42\" without changing badges", "apihelp-wbsetsitelink-example-8": "Change the link to the Polish page from the item with ID \"Q42\" and remove all of its badges" } + + diff --git a/repo/i18n/qqq.json b/repo/i18n/qqq.json index bc1b925..dd347d7 100644 --- a/repo/i18n/qqq.json +++ b/repo/i18n/qqq.json @@ -526,9 +526,11 @@ "apihelp-wbsearchentities-param-type": "{{doc-apihelp-param|wbsearchentities|type}}", "apihelp-wbsearchentities-param-limit": "{{doc-apihelp-param|wbsearchentities|limit}}", "apihelp-wbsearchentities-param-continue": "{{doc-apihelp-param|wbsearchentities|continue}}", + "apihelp-wbsearchentities-param-props": "{{doc-apihelp-param|wbsearchentities|props}}", "apihelp-wbsearchentities-example-1": "{{doc-apihelp-example|wbsearchentities}}", "apihelp-wbsearchentities-example-2": "{{doc-apihelp-example|wbsearchentities}}", "apihelp-wbsearchentities-example-3": "{{doc-apihelp-example|wbsearchentities}}", + "apihelp-wbsearchentities-example-4": "{{doc-apihelp-example|wbsearchentities}}", "apihelp-query+wbsearch-description": "{{doc-apihelp-description|query+wbsearch}}", "apihelp-query+wbsearch-param-search": "{{doc-apihelp-param|query+wbsearch|search}}", "apihelp-query+wbsearch-param-language": "{{doc-apihelp-param|query+wbsearch|language}}", @@ -633,3 +635,5 @@ "apihelp-wbsetsitelink-example-7": "{{doc-apihelp-example|wbsetsitelink}}", "apihelp-wbsetsitelink-example-8": "{{doc-apihelp-example|wbsetsitelink}}" } + + diff --git a/repo/includes/api/SearchEntities.php b/repo/includes/api/SearchEntities.php index 3e6a4bf..2decbcb 100644 --- a/repo/includes/api/SearchEntities.php +++ b/repo/includes/api/SearchEntities.php @@ -143,10 +143,13 @@ $entry = array( 'id' => $match->getEntityId()->getSerialization(), 'concepturi' => $this->conceptBaseUri . $match->getEntityId()->getSerialization(), - 'url' => $title->getFullUrl(), 'title' => $title->getPrefixedText(), 'pageid' => $title->getArticleID() ); + + if ( $params['props'] === 'url' ) { + $entry['url'] = $title->getFullUrl(); + } $displayLabel = $match->getDisplayLabel(); @@ -275,6 +278,11 @@ self::PARAM_TYPE => 'integer', self::PARAM_REQUIRED => false, ), + 'props' => array( + self::PARAM_TYPE => array( 'url' ), + self::PARAM_REQUIRED => false
[MediaWiki-commits] [Gerrit] Wikidata: wbsearchentities: Make returning the entity URL op... - change (mediawiki...Wikidata)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/258679 Change subject: Wikidata: wbsearchentities: Make returning the entity URL optional .. Wikidata: wbsearchentities: Make returning the entity URL optional Bug: T103875 Change-Id: I846389d320de2804675a3397447ea70828221188 --- M extensions/Wikibase/repo/includes/api/SearchEntities.php 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/79/258679/1 diff --git a/extensions/Wikibase/repo/includes/api/SearchEntities.php b/extensions/Wikibase/repo/includes/api/SearchEntities.php index 3e6a4bf..8a271a8 100644 --- a/extensions/Wikibase/repo/includes/api/SearchEntities.php +++ b/extensions/Wikibase/repo/includes/api/SearchEntities.php @@ -143,10 +143,13 @@ $entry = array( 'id' => $match->getEntityId()->getSerialization(), 'concepturi' => $this->conceptBaseUri . $match->getEntityId()->getSerialization(), - 'url' => $title->getFullUrl(), 'title' => $title->getPrefixedText(), 'pageid' => $title->getArticleID() ); + + if ( $params['props'] == 'url' ) { + $entry['url'] = $title->getFullUrl(); + } $displayLabel = $match->getDisplayLabel(); @@ -275,6 +278,11 @@ self::PARAM_TYPE => 'integer', self::PARAM_REQUIRED => false, ), + 'props' => array( + self::PARAM_TYPE => 'string', + self::PARAM_REQUIRED => false, + ), + ); } -- To view, visit https://gerrit.wikimedia.org/r/258679 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I846389d320de2804675a3397447ea70828221188 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikidata Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation: Gave each special page its own message - change (mediawiki/core)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/258437 Change subject: Localisation: Gave each special page its own message .. Localisation: Gave each special page its own message Bug: T45502 Change-Id: I6d41c2174a67bc9b231b6fc6209677fb84692cc5 --- M includes/specials/SpecialActiveusers.php M includes/specials/SpecialListusers.php M includes/specials/SpecialPrefixindex.php M includes/specials/SpecialProtectedpages.php M includes/specials/SpecialProtectedtitles.php M includes/specials/SpecialWatchlist.php M includes/specials/SpecialWhatlinkshere.php M languages/i18n/en.json M languages/i18n/qqq.json 9 files changed, 27 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/37/258437/1 diff --git a/includes/specials/SpecialActiveusers.php b/includes/specials/SpecialActiveusers.php index e51b6c0..70c7a8b 100644 --- a/includes/specials/SpecialActiveusers.php +++ b/includes/specials/SpecialActiveusers.php @@ -240,7 +240,7 @@ # Submit button and form bottom $out .= Xml::submitButton( - $this->msg( 'allpagessubmit' )->text(), + $this->msg( 'activeusers-submit' )->text(), array( 'tabindex' => 4 ) ) . "\n"; $out .= Xml::closeElement( 'fieldset' ); @@ -318,3 +318,5 @@ return 'users'; } } + + diff --git a/includes/specials/SpecialListusers.php b/includes/specials/SpecialListusers.php index 274a95a..d43a263 100644 --- a/includes/specials/SpecialListusers.php +++ b/includes/specials/SpecialListusers.php @@ -322,7 +322,7 @@ # Submit button and form bottom $out .= Html::hidden( 'limit', $this->mLimit ); - $out .= Xml::submitButton( $this->msg( 'allpagessubmit' )->text() ); + $out .= Xml::submitButton( $this->msg( 'listusers-submit' )->text() ); Hooks::run( 'SpecialListusersHeader', array( $this, &$out ) ); $out .= Xml::closeElement( 'fieldset' ) . Xml::closeElement( 'form' ); diff --git a/includes/specials/SpecialPrefixindex.php b/includes/specials/SpecialPrefixindex.php index 2f65d69..6de394b 100644 --- a/includes/specials/SpecialPrefixindex.php +++ b/includes/specials/SpecialPrefixindex.php @@ -138,7 +138,7 @@ 'stripprefix', $this->stripPrefix ) . ' ' . - Xml::submitButton( $this->msg( 'allpagessubmit' )->text() ) . + Xml::submitButton( $this->msg( 'prefixindex-submit' )->text() ) . " "; $out .= Xml::closeElement( 'table' ); diff --git a/includes/specials/SpecialProtectedpages.php b/includes/specials/SpecialProtectedpages.php index 0119781..7a82cd8 100644 --- a/includes/specials/SpecialProtectedpages.php +++ b/includes/specials/SpecialProtectedpages.php @@ -109,7 +109,7 @@ $this->getRedirectCheck( $noRedirect ) . "\n" . "\n" . $this->getSizeLimit( $sizetype, $size ) . "\n" . - Xml::submitButton( $this->msg( 'allpagessubmit' )->text() ) . "\n" . + Xml::submitButton( $this->msg( 'protectedpages-submit' )->text() ) . "\n" . Xml::closeElement( 'fieldset' ) . Xml::closeElement( 'form' ); } diff --git a/includes/specials/SpecialProtectedtitles.php b/includes/specials/SpecialProtectedtitles.php index 85ce78f..2c79fec 100644 --- a/includes/specials/SpecialProtectedtitles.php +++ b/includes/specials/SpecialProtectedtitles.php @@ -126,7 +126,7 @@ Html::hidden( 'title', $special ) . " \n" . $this->getNamespaceMenu( $namespace ) . " \n" . $this->getLevelMenu( $level ) . " \n" . - " " . Xml::submitButton( $this->msg( 'allpagessubmit' )->text() ) . "\n" . + " " . Xml::submitButton( $this->msg( 'protectedtitles-submit' )->text() ) . "\n" . ""; } diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index b5e614d..e22a8e6 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -502,7 +502,7 @@ $opts['associated'], array( 'title' => $this->msg( 'tooltip-namespace_association' )->text() ) ) . "\n"; - $form .= Xml::submitButton( $this->msg( 'allpagessubmit' )->text() ) . "\n"; + $form .= Xml::submitButton( $this->msg( 'watchlist-submit' )->text() ) . "\n"; foreach ( $hiddenFields as $key => $value ) {
[MediaWiki-commits] [Gerrit] Bug:T103870 - change (mediawiki/core)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/257870 Change subject: Bug:T103870 .. Bug:T103870 Removed unnecessary blank line in Special:Export page Change-Id: I5b314ef9204ca33d851a9fe88477d0be427e5199 --- M includes/specials/SpecialExport.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/70/257870/1 diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php index 7392972..ce039fb 100644 --- a/includes/specials/SpecialExport.php +++ b/includes/specials/SpecialExport.php @@ -65,7 +65,7 @@ */ $catpages = $this->getPagesFromCategory( $t ); if ( $catpages ) { - $page .= implode( "\n", $catpages ); + $page .= implode( "\n", $catpages ) . "\n"; } } } -- To view, visit https://gerrit.wikimedia.org/r/257870 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b314ef9204ca33d851a9fe88477d0be427e5199 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed unnecessary blank line from Special:Export page - change (mediawiki/core)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/257865 Change subject: Removed unnecessary blank line from Special:Export page .. Removed unnecessary blank line from Special:Export page Change-Id: I9d143ee4b833e537ca27293d2aa63c93c50bb8d4 --- M includes/specials/SpecialExport.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/65/257865/1 diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php index 642ea69..7392972 100644 --- a/includes/specials/SpecialExport.php +++ b/includes/specials/SpecialExport.php @@ -65,7 +65,7 @@ */ $catpages = $this->getPagesFromCategory( $t ); if ( $catpages ) { - $page .= "\n" . implode( "\n", $catpages ); + $page .= implode( "\n", $catpages ); } } } -- To view, visit https://gerrit.wikimedia.org/r/257865 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d143ee4b833e537ca27293d2aa63c93c50bb8d4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Upgrade from deprecated wfMsg functions Bug: 68750 - change (mediawiki...SemanticPageMaker)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/183473 Change subject: Upgrade from deprecated wfMsg functions Bug: 68750 .. Upgrade from deprecated wfMsg functions Bug: 68750 Change-Id: Iadf11c537dc308d6046493b12274c1661703ac4e --- M specials/WidgetAssembler/SPM_UploadWindow.php 1 file changed, 33 insertions(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticPageMaker refs/changes/73/183473/1 diff --git a/specials/WidgetAssembler/SPM_UploadWindow.php b/specials/WidgetAssembler/SPM_UploadWindow.php index f8f1746..c5bcc23 100644 --- a/specials/WidgetAssembler/SPM_UploadWindow.php +++ b/specials/WidgetAssembler/SPM_UploadWindow.php @@ -218,7 +218,7 @@ unset( $this->mCurlDestHandle ); if ( $error ) { unlink( $dest ); - if ( wfEmptyMsg( "upload-curl-error$errornum", wfMsg( "upload-curl-error$errornum" ) ) ) + if ( wfMessage( "upload-curl-error$errornum" )->inContentLanguage->text() ) $wgOut->errorPage( 'upload-misc-error', 'upload-misc-error-text' ); else $wgOut->errorPage( "upload-curl-error$errornum", "upload-curl-error$errornum-text" ); @@ -310,7 +310,7 @@ /* Check for PHP error if any, requires php 4.2 or newer */ if ( $this->mCurlError == 1/*UPLOAD_ERR_INI_SIZE*/ ) { - $this->mainUploadWindowForm( wfMsgHtml( 'largefileserver' ) ); + $this->mainUploadWindowForm( wfMessage( 'largefileserver' )->rawParams()->escaped() ); return; } @@ -318,7 +318,7 @@ * If there was no filename or a zero size given, give up quick. */ if ( trim( $this->mSrcName ) == '' || empty( $this->mFileSize ) ) { - $this->mainUploadWindowForm( wfMsgHtml( 'emptyfile' ) ); + $this->mainUploadWindowForm( wfMessage( 'emptyfile' )->rawParams()->escaped() ); return; } @@ -350,7 +350,7 @@ } if ( strlen( $partname ) < 1 ) { - $this->mainUploadWindowForm( wfMsgHtml( 'minlength1' ) ); + $this->mainUploadWindowForm( wfMessage( 'minlength1' )->rawParams()->escaped() ); return; } @@ -431,7 +431,7 @@ $filtered = ucfirst( $filtered ); } if ( $basename != $filtered ) { - $warning .= '' . wfMsgHtml( 'badfilename', htmlspecialchars( $this->mDestName ) ) . ''; + $warning .= '' . wfMessage( 'badfilename' )->rawParams( htmlspecialchars($this->mDestName) )->escaped() ) . ''; } global $wgCheckFileExtensions; @@ -446,10 +446,10 @@ if ( $wgUploadSizeWarning && ( $this->mFileSize > $wgUploadSizeWarning ) ) { $wsize =Linker::formatSize( $wgUploadSizeWarning ); $asize = Linker::formatSize( $this->mFileSize ); - $warning .= '' . wfMsgHtml( 'large-file', $wsize, $asize ) . ''; + $warning .= '' . wfMessage( 'large-file' )->rawParams( $wsize, $asize )->escaped() . ''; } if ( $this->mFileSize == 0 ) { - $warning .= '' . wfMsgHtml( 'emptyfile' ) . ''; + $warning .= '' . wfMessage( 'emptyfile' )->rawParams()->escaped() . ''; } if ( !$this->mDestWarningAck ) { @@ -624,7 +624,7 @@ # If the file existed before and was deleted, warn the user of this # Don't bother doing so if the image exists now, however $ltitle = SpecialPage::getTitleFor( 'Log' ); - $llink = $sk->makeKnownLinkObj( $ltitle, wfMsgHtml( 'sf_deletionlog' ), + $llink = $sk->makeKnownLinkObj( $ltitle, wfMessage( 'sf_deletionlog' )->rawParams( 'sf_deletionlog' )->escaped(), 'type=delete&page=' . $file->getTitle()->getPrefixedUrl() ); $warning .= '' . wfMsgWikiHtml( 'filewasdeleted', $llink ) . ''; } @@ -744,7 +744,7 @@ */ function uploadError( $error ) { global $wgOut; - $wgOut->addHTML( "" . wfMsgHtml( 'uploadwarning' ) . "\n" ); + $wgOut->addHTML( "" . wfMessage( 'uploadwarning' )->rawParams()->escaped() . "\n" ); $wgOut->addHTML( "{$error
[MediaWiki-commits] [Gerrit] Upgrade from deprecated wfMsg functions Bug: 68750 - change (mediawiki...SemanticExpressiveness)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/183459 Change subject: Upgrade from deprecated wfMsg functions Bug: 68750 .. Upgrade from deprecated wfMsg functions Bug: 68750 Change-Id: Ibd0ddfb992c40d62ad7785e1ef9cbf3bdb452f99 --- M includes/ShortQueryAbstractResult.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticExpressiveness refs/changes/59/183459/1 diff --git a/includes/ShortQueryAbstractResult.php b/includes/ShortQueryAbstractResult.php index 1742390..ea5f90d 100644 --- a/includes/ShortQueryAbstractResult.php +++ b/includes/ShortQueryAbstractResult.php @@ -95,10 +95,10 @@ $ret = $property; } elseif( $fromRef ) { // query 'from ref' - $ret = wfMsgForContent( 'semex-shortquery-title-from-ref', $property, $source ); + $ret = wfMessage( 'semex-shortquery-title-from-ref', $property, $source )->inContentLanguage()->text(); } else { // query from any other known page or expressive string - $ret = wfMsgForContent( 'semex-shortquery-title', $property, $source ); + $ret = wfMessage( 'semex-shortquery-title', $property, $source )->inContentLanguage()->text(); } return $ret; } -- To view, visit https://gerrit.wikimedia.org/r/183459 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd0ddfb992c40d62ad7785e1ef9cbf3bdb452f99 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticExpressiveness Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add support for passing objects - change (mediawiki/core)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/182774 Change subject: Add support for passing objects .. Add support for passing objects Change-Id: Ic4651642563086248e337f706846d1c0f4bc6812 --- M includes/debug/MWDebug.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/74/182774/1 diff --git a/includes/debug/MWDebug.php b/includes/debug/MWDebug.php index 718e7d0..f260e99 100644 --- a/includes/debug/MWDebug.php +++ b/includes/debug/MWDebug.php @@ -91,10 +91,10 @@ /** * Adds a line to the log * -* @todo Add support for passing objects * * @since 1.19 * @param string $str + * @param MWDebug $obj */ public static function log( $str, MWDebug $obj ) { if ( !self::$enabled ) { -- To view, visit https://gerrit.wikimedia.org/r/182774 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4651642563086248e337f706846d1c0f4bc6812 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make $mNewpassword private - change (mediawiki/core)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/182772 Change subject: Make $mNewpassword private .. Make $mNewpassword private Change-Id: I9c8ee17323aff5e8f2c9374b67393f195ccdfd4c --- M includes/User.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/72/182772/1 diff --git a/includes/User.php b/includes/User.php index c18fa18..ec82b40 100644 --- a/includes/User.php +++ b/includes/User.php @@ -195,7 +195,6 @@ public $mPassword; /** -* @todo Make this actually private * @private */ private $mNewpassword; -- To view, visit https://gerrit.wikimedia.org/r/182772 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c8ee17323aff5e8f2c9374b67393f195ccdfd4c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make showDiffPage() protected - change (mediawiki/core)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/182771 Change subject: Make showDiffPage() protected .. Make showDiffPage() protected Change-Id: I4c6edc57e1f9b483db72a4adde749699ccb39e13 --- M includes/page/Article.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/71/182771/1 diff --git a/includes/page/Article.php b/includes/page/Article.php index 269b4ff..4d46450 100644 --- a/includes/page/Article.php +++ b/includes/page/Article.php @@ -774,7 +774,6 @@ * Show a diff page according to current request variables. For use within * Article::view() only, other callers should use the DifferenceEngine class. * -* @todo Make protected */ protected function showDiffPage() { $request = $this->getContext()->getRequest(); -- To view, visit https://gerrit.wikimedia.org/r/182771 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c6edc57e1f9b483db72a4adde749699ccb39e13 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add support for passing objects - change (mediawiki/core)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/182651 Change subject: Add support for passing objects .. Add support for passing objects Change-Id: I121acab012676e486e19b3f8b0fae50af3d3a567 --- M includes/debug/MWDebug.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/51/182651/1 diff --git a/includes/debug/MWDebug.php b/includes/debug/MWDebug.php index c4c6cf3..718e7d0 100644 --- a/includes/debug/MWDebug.php +++ b/includes/debug/MWDebug.php @@ -96,7 +96,7 @@ * @since 1.19 * @param string $str */ - public static function log( $str ) { + public static function log( $str, MWDebug $obj ) { if ( !self::$enabled ) { return; } -- To view, visit https://gerrit.wikimedia.org/r/182651 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I121acab012676e486e19b3f8b0fae50af3d3a567 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make $mNewpassword private - change (mediawiki/core)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/182650 Change subject: Make $mNewpassword private .. Make $mNewpassword private Change-Id: I6ea1f8fc485f1389c09130d9e9048e90b7e6319a --- M includes/User.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/50/182650/1 diff --git a/includes/User.php b/includes/User.php index 88004dc..c18fa18 100644 --- a/includes/User.php +++ b/includes/User.php @@ -198,7 +198,7 @@ * @todo Make this actually private * @private */ - public $mNewpassword; + private $mNewpassword; public $mNewpassTime; -- To view, visit https://gerrit.wikimedia.org/r/182650 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ea1f8fc485f1389c09130d9e9048e90b7e6319a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make showdiffPages() protected - change (mediawiki/core)
PranavK has uploaded a new change for review. https://gerrit.wikimedia.org/r/182649 Change subject: Make showdiffPages() protected .. Make showdiffPages() protected Change-Id: Ida696a96445aa6bc71d1ab6c9363289261e01bfa --- M includes/page/Article.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/49/182649/1 diff --git a/includes/page/Article.php b/includes/page/Article.php index be138f1..269b4ff 100644 --- a/includes/page/Article.php +++ b/includes/page/Article.php @@ -776,7 +776,7 @@ * * @todo Make protected */ - public function showDiffPage() { + protected function showDiffPage() { $request = $this->getContext()->getRequest(); $user = $this->getContext()->getUser(); $diff = $request->getVal( 'diff' ); -- To view, visit https://gerrit.wikimedia.org/r/182649 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida696a96445aa6bc71d1ab6c9363289261e01bfa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: PranavK ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits