[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Don't execute upload.loadConfig when it may not exist
Matthias Mullie has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331231 ) Change subject: Don't execute upload.loadConfig when it may not exist .. Don't execute upload.loadConfig when it may not exist Upload.BookletLayout creates a mw.Upload object, which has no loadConfig method. ForeignStructuredUpload.BookletLayout, which is a child of Upload.BookletLayout, creates a mw.ForeignStructuredUpload object, which does have this method. Thus, that method should be moved to where we know the object will have it. Change-Id: Ibb1c0f2b8260a8b0a7cc9f02e3434aed7d163637 --- M resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js M resources/src/mediawiki/mediawiki.Upload.BookletLayout.js 2 files changed, 7 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/31/331231/1 diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js index a5cf1d8..543ece8 100644 --- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js +++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js @@ -107,6 +107,9 @@ e.stopPropagation(); } ); } ); + }, function ( errorMsg ) { + booklet.getPage( 'upload' ).$element.msg( errorMsg ); + return $.Deferred().resolve(); } ) ); } diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js index c7ebfd8..f736036 100644 --- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js +++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js @@ -176,16 +176,9 @@ return this.upload.getApi().then( function ( api ) { - return $.when( - booklet.upload.loadConfig().then( - null, - function ( errorMsg ) { - booklet.getPage( 'upload' ).$element.msg( errorMsg ); - return $.Deferred().resolve(); - } - ), - // If the user can't upload anything, don't give them the option to. - api.getUserInfo().then( function ( userInfo ) { + // If the user can't upload anything, don't give them the option to. + return api.getUserInfo().then( + function ( userInfo ) { if ( userInfo.rights.indexOf( 'upload' ) === -1 ) { if ( mw.user.isAnon() ) { booklet.getPage( 'upload' ).$element.msg( 'api-error-mustbeloggedin' ); @@ -194,9 +187,7 @@ } } return $.Deferred().resolve(); - } ) - ).then( - null, + }, // Always resolve, never reject function () { return $.Deferred().resolve(); } ); -- To view, visit https://gerrit.wikimedia.org/r/331231 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb1c0f2b8260a8b0a7cc9f02e3434aed7d163637 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Matthias Mullie___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use parsed HTML error responses instead of api-error-*
Matthias Mullie has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331232 ) Change subject: Use parsed HTML error responses instead of api-error-* .. Use parsed HTML error responses instead of api-error-* There is no point in keeping these api-error- messages. They were originally introduced in UploadWizard, then moved to core, where nothing else (apart from some in BookletLayout) uses them. They are mostly duplicates of other messages in core, and these are very easy to miss when updating a message in core. Instead of building the messages on the frontend, we're much better off requesting a parsed error response from the API right away. This also lets us get rid of sime hacks (e.g. for AbuseFilter) And then a few other api-error-* messages have been removed in favor of their alternatives (which are also used elsewhere) And stashfailed is not a warning. Maybe it was at some point, but stashfailed now dies with an error. Change-Id: I41d88e2aad308a1fecd10d97085345a17d0c3603 --- M languages/i18n/en.json M languages/i18n/qqq.json M resources/Resources.php M resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js M resources/src/mediawiki/mediawiki.Upload.BookletLayout.js 5 files changed, 45 insertions(+), 198 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/32/331232/1 diff --git a/languages/i18n/en.json b/languages/i18n/en.json index a621f1c..174e135 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -3966,56 +3966,9 @@ "feedback-useragent": "User agent:", "searchsuggest-search": "Search {{SITENAME}}", "searchsuggest-containing": "containing...", - "api-error-autoblocked": "Your IP address has been blocked automatically, because it was used by a blocked user.", - "api-error-badaccess-groups": "You are not permitted to upload files to this wiki.", - "api-error-badtoken": "Internal error: Bad token.", - "api-error-blocked": "You have been blocked from editing.", - "api-error-copyuploaddisabled": "Uploading by URL is disabled on this server.", - "api-error-duplicate": "There {{PLURAL:$1|is another file|are some other files}} already on the site with the same content.", - "api-error-duplicate-archive": "There {{PLURAL:$1|was another file|were some other files}} already on the site with the same content, but {{PLURAL:$1|it was|they were}} deleted.", - "api-error-empty-file": "The file you submitted was empty.", - "api-error-emptypage": "Creating new, empty pages is not allowed.", - "api-error-fetchfileerror": "Internal error: Something went wrong while fetching the file.", - "api-error-fileexists-forbidden": "A file with name \"$1\" already exists, and cannot be overwritten.", - "api-error-fileexists-shared-forbidden": "A file with name \"$1\" already exists in the shared file repository, and cannot be overwritten.", - "api-error-file-too-large": "The file you submitted was too large.", - "api-error-filename-tooshort": "The filename is too short.", - "api-error-filetype-banned": "This type of file is banned.", - "api-error-filetype-banned-type": "$1 {{PLURAL:$4|is not a permitted file type|are not permitted file types}}. Permitted {{PLURAL:$3|file type is|file types are}} $2.", - "api-error-filetype-missing": "The filename is missing an extension.", - "api-error-hookaborted": "The modification you tried to make was aborted by an extension.", - "api-error-http": "Internal error: Unable to connect to server.", - "api-error-illegal-filename": "The filename is not allowed.", - "api-error-internal-error": "Internal error: Something went wrong with processing your upload on the wiki.", - "api-error-invalid-file-key": "Internal error: File was not found in temporary storage.", - "api-error-missingparam": "Internal error: Missing parameters on request.", - "api-error-missingresult": "Internal error: Could not determine if the copy succeeded.", - "api-error-mustbeloggedin": "You must be logged in to upload files.", - "api-error-mustbeposted": "Internal error: Request requires HTTP POST.", - "api-error-noimageinfo": "The upload succeeded, but the server did not give us any information about the file.", - "api-error-nomodule": "Internal error: No upload module set.", - "api-error-ok-but-empty": "Internal error: No response from server.", - "api-error-overwrite": "Overwriting an existing file is not allowed.", - "api-error-ratelimited": "You're trying to upload more files in a short space of time than this wiki allows.\nPlease try again in a few minutes.", - "api-error-stashfailed": "Internal error: Server failed to store temporary file.", - "api-error-publishfailed": "Internal error: Server failed to publish temporary
[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: Treat duplicate & duplicate-archive warnings differently
Matthias Mullie has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331230 ) Change subject: Treat duplicate & duplicate-archive warnings differently .. Treat duplicate & duplicate-archive warnings differently 1: Get rid of 2 more api-error- messages when there is a perfect substiture. 2: The duplicate-archive substiture already references the archived file, so we no longer need to list in in a (which didn't make too much sense anyway, there was always only 1 being returned) 3: It no longer makes sense to force both down the same method - if the is no longer needed, they're very different now. Change-Id: I9324e24853a9be86e24a2f09d1d6c467f8af5275 --- M extension.json M resources/mw.UploadWizardUpload.js 2 files changed, 23 insertions(+), 24 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard refs/changes/30/331230/1 diff --git a/extension.json b/extension.json index e59c411..5a15da5 100644 --- a/extension.json +++ b/extension.json @@ -267,6 +267,8 @@ "unknown-error", "apierror-unknownerror", "apierror-stashfailed-complete", + "file-exists-duplicate", + "file-deleted-duplicate", "mwe-upwiz-api-warning-was-deleted", "mwe-upwiz-api-warning-exists", "mwe-upwiz-tutorial-error-localized-file-missing", diff --git a/resources/mw.UploadWizardUpload.js b/resources/mw.UploadWizardUpload.js index 3faf57b..f55039d 100644 --- a/resources/mw.UploadWizardUpload.js +++ b/resources/mw.UploadWizardUpload.js @@ -168,7 +168,6 @@ // we ignore these warnings, because the title is not our final title. break; case 'duplicate': - case 'duplicate-archive': this.setDuplicateError( warnCode, result.upload.warnings[ warnCode ] ); return; case 'nochange': @@ -176,6 +175,9 @@ if ( result.upload.warnings.exists ) { this.setDuplicateError( 'duplicate', result.upload.warnings.exists ); } + return; + case 'duplicate-archive': + this.setDuplicateArchiveError( warnCode, result.upload.warnings[ warnCode ] ); return; default: param = warnCode; @@ -249,25 +251,13 @@ * @param {Object} resultDuplicate Portion of the API error result listing duplicates */ mw.UploadWizardUpload.prototype.setDuplicateError = function ( code, resultDuplicate ) { - var duplicates, $ul, $extra, uploadDuplicate; - - if ( typeof resultDuplicate === 'object' ) { - duplicates = resultDuplicate; - } else if ( typeof resultDuplicate === 'string' ) { - duplicates = [ resultDuplicate ]; - } - - $ul = $( '' ); - $.each( duplicates, function ( i, filename ) { - var href, $a, params = {}; + var $ul = $( '' ); + $.each( resultDuplicate, function ( i, filename ) { + var href, $a; try { $a = $( '' ).text( filename ); - if ( code === 'duplicate-archive' ) { - $a.addClass( 'new' ); - params = { action: 'edit', redlink: '1' }; - } - href = mw.Title.makeTitle( NS_FILE, filename ).getUrl( params ); + href = mw.Title.makeTitle( NS_FILE, filename ).getUrl( {} ); $a.attr( { href: href, target: '_blank' } ); } catch ( e ) { // For example, if the file was revdeleted @@ -277,12 +267,22 @@ $ul.append( $( '' ).append( $a ) ); } ); - if ( duplicates.length > 1 ) { + if ( resultDuplicate.length > 1 ) { $ul.makeCollapsible( { collapsed: true } ); } - $extra = $ul; - if ( code ===
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Added log extract to Special:ChangeContentModel
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331216 ) Change subject: Added log extract to Special:ChangeContentModel .. Added log extract to Special:ChangeContentModel Bug: T154874 Change-Id: I571ea324f31935c2394dce77e31c74c3afb76358 --- M includes/specials/SpecialChangeContentModel.php 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: TTO: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/SpecialChangeContentModel.php b/includes/specials/SpecialChangeContentModel.php index 87276a1..a36b414 100644 --- a/includes/specials/SpecialChangeContentModel.php +++ b/includes/specials/SpecialChangeContentModel.php @@ -33,6 +33,18 @@ } } + protected function postText() { + $text = ''; + if ( $this->title ) { + $contentModelLogPage = new LogPage( 'contentmodel' ); + $text = Xml::element( 'h2', null, $contentModelLogPage->getName()->text() ); + $out = ''; + LogEventsList::showLogExtract( $out, 'contentmodel', $this->title ); + $text .= $out; + } + return $text; + } + protected function getDisplayFormat() { return 'ooui'; } -- To view, visit https://gerrit.wikimedia.org/r/331216 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I571ea324f31935c2394dce77e31c74c3afb76358 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: FilipGerrit-Reviewer: TTO Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add en.wikinews and es.wikinews as import source in testwiki
Urbanecm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331229 ) Change subject: Add en.wikinews and es.wikinews as import source in testwiki .. Add en.wikinews and es.wikinews as import source in testwiki Bug: T154879 Change-Id: I4605c6dedf85be5664180b2b1f877aa4ce61589e --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/29/331229/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index b31c679..9d6949e 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10945,7 +10945,7 @@ 'tewiki' => [ 'en', 'commons' ], // T43880 'tewikisource' => [ 'w', 'b', 'en' ], // T94531 'tewikiquote' => [ 'w', 'en' ], // T91635 - 'testwiki' => [ 'de', 'en', 'es', 'fr', 'ja', 'commons', 'meta', 'incubator', 'strategy' ], + 'testwiki' => [ 'de', 'en', 'es', 'fr', 'ja', 'commons', 'meta', 'incubator', 'strategy', 'wikinews:en', 'wikinews:es' ], // T154879 'test2wiki' => [ 'en', 'cs' ], 'tetwiki' => [ 'en', 'de', 'pt' ], 'tnwiki' => [ 'en' ], // T53327 -- To view, visit https://gerrit.wikimedia.org/r/331229 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4605c6dedf85be5664180b2b1f877aa4ce61589e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Urbanecm___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Avoid IDEA warning about $keys being both a parameter and lo...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331200 ) Change subject: Avoid IDEA warning about $keys being both a parameter and loop variable .. Avoid IDEA warning about $keys being both a parameter and loop variable Change-Id: Id562053a71f135fa863cb88b5f081982c01575cf --- M includes/libs/objectcache/WANObjectCache.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified Jeroen De Dauw: Looks good to me, but someone else must approve diff --git a/includes/libs/objectcache/WANObjectCache.php b/includes/libs/objectcache/WANObjectCache.php index 8d3c6d9..01a9149 100644 --- a/includes/libs/objectcache/WANObjectCache.php +++ b/includes/libs/objectcache/WANObjectCache.php @@ -275,8 +275,8 @@ $checkKeysForAll = []; $checkKeysByKey = []; $checkKeysFlat = []; - foreach ( $checkKeys as $i => $keys ) { - $prefixed = self::prefixCacheKeys( (array)$keys, self::TIME_KEY_PREFIX ); + foreach ( $checkKeys as $i => $checkKeyGroup ) { + $prefixed = self::prefixCacheKeys( (array)$checkKeyGroup, self::TIME_KEY_PREFIX ); $checkKeysFlat = array_merge( $checkKeysFlat, $prefixed ); // Is this check keys for a specific cache key, or for all keys being fetched? if ( is_int( $i ) ) { -- To view, visit https://gerrit.wikimedia.org/r/331200 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id562053a71f135fa863cb88b5f081982c01575cf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron SchulzGerrit-Reviewer: Jeroen De Dauw Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: More error handling fixes
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330419 ) Change subject: More error handling fixes .. More error handling fixes See T154565 Change-Id: I073aae149497342157503ad3f465b7d57aaad4fa --- M ApiVisualEditor.php M modules/ve-mw/i18n/en.json 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php index 48d650c..8924d48 100644 --- a/ApiVisualEditor.php +++ b/ApiVisualEditor.php @@ -113,12 +113,12 @@ } elseif ( $response['error'] !== '' ) { $this->dieWithError( [ 'apierror-visualeditor-docserver-http-error', wfEscapeWikiText( $response['error'] ) ], - $response['error'] + 'apierror-visualeditor-docserver-http-error' ); } else { // error null, code not 200 $this->dieWithError( [ 'apierror-visualeditor-docserver-http', $response['code'] ], - (string) $response['code'] + 'apierror-visualeditor-docserver-http' ); } return $response['body']; diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json index bc04df4..9aa6c6b 100644 --- a/modules/ve-mw/i18n/en.json +++ b/modules/ve-mw/i18n/en.json @@ -54,8 +54,8 @@ "apierror-visualeditor-badcachekey": "No cached serialization found with that key", "apierror-visualeditor-difffailed": "Diff failed", "apierror-visualeditor-docserver": "Error contacting the Parsoid/RESTbase server", - "apierror-visualeditor-docserver-http": "docserver-http: HTTP $1", - "apierror-visualeditor-docserver-http-error": "docserver-http-error: $1", + "apierror-visualeditor-docserver-http": "HTTP $1", + "apierror-visualeditor-docserver-http-error": "$1", "apierror-visualeditor-invaliddeflate": "Content provided is not properly deflated", "apierror-visualeditor-latestnotfound": "Could not find latest revision for title", "tooltip-ca-createsource": "Create the source code of this page", -- To view, visit https://gerrit.wikimedia.org/r/330419 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I073aae149497342157503ad3f465b7d57aaad4fa Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Alex MonkGerrit-Reviewer: Alex Monk Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Annotator[master]: Fix failing tests due to some apihelp messages missing
Phantom42 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331228 ) Change subject: Fix failing tests due to some apihelp messages missing .. Fix failing tests due to some apihelp messages missing Added 10 messages related to apihelp Bug: T154836 Change-Id: I41c9db2759bb57c65f25bd9a3ad23bd55ccab7cf --- M i18n/en.json M i18n/qqq.json 2 files changed, 23 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Annotator refs/changes/28/331228/1 diff --git a/i18n/en.json b/i18n/en.json index bc5299b..b189245 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -5,5 +5,15 @@ ] }, "annotator-desc": "Allows inline comments on pages", - "annotator-view-annotations": "View annotations" -} \ No newline at end of file + "annotator-view-annotations": "View annotations", + "apihelp-annotator-create-description": "Create new annotation", + "apihelp-annotator-create-param-revid": "Revision ID related to this annotation", + "apihelp-annotator-read-description": "Find annotation by ID and return its data", + "apihelp-annotator-read-param-id": "Annotation ID", + "apihelp-annotator-search-description": "Find all annotations by revision ID they are related to", + "apihelp-annotator-search-param-revid": "Revision ID", + "apihelp-annotator-update-description": "Update existing annotation with new data", + "apihelp-annotator-update-param-id": "Annotation ID", + "apihelp-annotator-destroy-description": "Delete annotation", + "apihelp-annotator-destroy-param-id": "Annotation ID" +} diff --git a/i18n/qqq.json b/i18n/qqq.json index 2919ce1..d62527d 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -7,5 +7,15 @@ ] }, "annotator-desc": "{{desc|name=Annotator|url=https://www.mediawiki.org/wiki/Extension:Annotator}};, - "annotator-view-annotations": "The message shown in the tab which allows the user to load annotations on a page" + "annotator-view-annotations": "The message shown in the tab which allows the user to load annotations on a page", + "apihelp-annotator-create-description": "{{doc-apihelp-description|annotator-create}}", + "apihelp-annotator-create-param-revid": "{{doc-apihelp-param|annotator-create|revid}}", + "apihelp-annotator-read-description": "{{doc-apihelp-description|annotator-read}}", + "apihelp-annotator-read-param-id": "{{doc-apihelp-param|annotator-read|id}}", + "apihelp-annotator-search-description": "{{doc-apihelp-description|annotator-search}}", + "apihelp-annotator-search-param-revid": "{{doc-apihelp-param|annotator-search|revid}}", + "apihelp-annotator-update-description": "{{doc-apihelp-description|annotator-update}}", + "apihelp-annotator-update-param-id": "{{doc-apihelp-param|annotator-update|id}}", + "apihelp-annotator-destroy-description": "{{doc-apihelp-description|annotator-destroy}}", + "apihelp-annotator-destroy-param-id": "{{doc-apihelp-param|annotator-destroy|id}}" } -- To view, visit https://gerrit.wikimedia.org/r/331228 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I41c9db2759bb57c65f25bd9a3ad23bd55ccab7cf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Annotator Gerrit-Branch: master Gerrit-Owner: Phantom42___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Inlined return var
Aleksey Bekh-Ivanov (WMDE) has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331103 ) Change subject: Inlined return var .. Inlined return var Change-Id: I6d9d79fd2d8592acf7f8f65457f0fad5585ce912 --- M repo/includes/Hooks/InfoActionHookHandler.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, approved diff --git a/repo/includes/Hooks/InfoActionHookHandler.php b/repo/includes/Hooks/InfoActionHookHandler.php index f3e5cae..5788642 100644 --- a/repo/includes/Hooks/InfoActionHookHandler.php +++ b/repo/includes/Hooks/InfoActionHookHandler.php @@ -133,11 +133,11 @@ if ( !$url ) { return $subscription; } - $element = Html::element( 'a', + + return Html::element( 'a', [ 'href' => $url ], $subscription ); - return $element; } } -- To view, visit https://gerrit.wikimedia.org/r/331103 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6d9d79fd2d8592acf7f8f65457f0fad5585ce912 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Jeroen De DauwGerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) Gerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Remove rare @group tags from tests
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330883 ) Change subject: Remove rare @group tags from tests .. Remove rare @group tags from tests Most of these are only used a single time. This does not add any value, when you can as well select the file by it's name. Some have actual typos. "Claim" is a word we are not using any more, because most of this code is not dealing with claims but with statements. Some are obscure and inconsistently set anyway. Change-Id: I43bbc64206606c9ac1e65815b3e252bd5d101fdd --- M client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php M client/tests/phpunit/includes/Hooks/ChangesListSpecialPageHookHandlersTest.php M client/tests/phpunit/includes/Hooks/EditActionHookHandlerTest.php M client/tests/phpunit/includes/Hooks/InfoActionHookHandlerTest.php M client/tests/phpunit/includes/Hooks/NoLangLinkHandlerTest.php M client/tests/phpunit/includes/Notifications/PageConnectionPresentationModelTest.php M client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php M client/tests/phpunit/includes/Specials/SpecialUnconnectedPagesTest.php M client/tests/phpunit/includes/Store/Sql/DirectSqlStoreTest.php M client/tests/phpunit/includes/Store/TitleFactoryTest.php M lib/tests/phpunit/Formatters/VocabularyUriFormatterTest.php M lib/tests/phpunit/Interactors/TermIndexSearchInteractorTest.php M lib/tests/phpunit/Store/Sql/SiteLinkTableTest.php M lib/tests/phpunit/Store/TermIndexSearchCriteriaTest.php M lib/tests/phpunit/SummaryTest.php M lib/tests/phpunit/TermIndexEntryTest.php M repo/tests/phpunit/includes/Api/FormatSnakValueTest.php M repo/tests/phpunit/includes/BabelUserLanguageLookupTest.php M repo/tests/phpunit/includes/ChangeDispatcherTest.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementTest.php M repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php M repo/tests/phpunit/includes/Content/ItemContentTest.php M repo/tests/phpunit/includes/Diff/ClaimDifferTest.php M repo/tests/phpunit/includes/Diff/ClaimDifferenceTest.php M repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php M repo/tests/phpunit/includes/Diff/DiffOpValueFormatterTest.php M repo/tests/phpunit/includes/Diff/DifferencesSnakVisualizerTest.php M repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php M repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php M repo/tests/phpunit/includes/EditEntityTest.php M repo/tests/phpunit/includes/Hooks/InfoActionHookHandlerTest.php M repo/tests/phpunit/includes/IO/EntityIdReaderTest.php M repo/tests/phpunit/includes/IO/LineReaderTest.php M repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php M repo/tests/phpunit/includes/Interactors/RedirectCreationInteractorTest.php M repo/tests/phpunit/includes/Interactors/TokenCheckInteractorTest.php M repo/tests/phpunit/includes/SnakFactoryTest.php M repo/tests/phpunit/includes/Store/Sql/EntityPerPageBuilderTest.php M repo/tests/phpunit/includes/Store/Sql/EntityPerPageTableTest.php M repo/tests/phpunit/includes/Store/Sql/SqlSiteLinkConflictLookupTest.php M repo/tests/phpunit/includes/Store/Sql/TermSearchKeyBuilderTest.php M repo/tests/phpunit/includes/SummaryFormatterTest.php 43 files changed, 0 insertions(+), 43 deletions(-) Approvals: Aleksey Bekh-Ivanov (WMDE): Looks good to me, approved jenkins-bot: Verified diff --git a/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php b/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php index 2f29022..131f0f5 100644 --- a/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php +++ b/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php @@ -28,7 +28,6 @@ * @group Database * @group WikibaseClient * @group Wikibase - * @group AffectedPagesFinder * * @license GPL-2.0+ * @author Katie Filbert < aude.w...@gmail.com > diff --git a/client/tests/phpunit/includes/Hooks/ChangesListSpecialPageHookHandlersTest.php b/client/tests/phpunit/includes/Hooks/ChangesListSpecialPageHookHandlersTest.php index 73c33de..ce7cb3f 100644 --- a/client/tests/phpunit/includes/Hooks/ChangesListSpecialPageHookHandlersTest.php +++ b/client/tests/phpunit/includes/Hooks/ChangesListSpecialPageHookHandlersTest.php @@ -13,7 +13,6 @@ /** * @covers Wikibase\Client\Hooks\ChangesListSpecialPageHookHandlers * - * @group WikibaseClientHooks * @group WikibaseClient * @group Wikibase * diff --git a/client/tests/phpunit/includes/Hooks/EditActionHookHandlerTest.php b/client/tests/phpunit/includes/Hooks/EditActionHookHandlerTest.php index 57c206d..af41020 100644 --- a/client/tests/phpunit/includes/Hooks/EditActionHookHandlerTest.php +++ b/client/tests/phpunit/includes/Hooks/EditActionHookHandlerTest.php @@ -23,7 +23,6 @@ * @covers Wikibase\Client\Hooks\EditActionHookHandler * * @group WikibaseClient - * @group
[MediaWiki-commits] [Gerrit] labs/toollabs[master]: WIP: Don't ignore fchdir()'s errors
Tim Landscheidt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331227 ) Change subject: WIP: Don't ignore fchdir()'s errors .. WIP: Don't ignore fchdir()'s errors Change-Id: Ibe4b9f7a890a2a9f34c5e0baa7d9db10591c077b --- M src/take.cc 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/27/331227/1 diff --git a/src/take.cc b/src/take.cc index 45ba55e..380fd38 100755 --- a/src/take.cc +++ b/src/take.cc @@ -152,7 +152,8 @@ if(d->d_name[1]=='.' && d->d_name[2]==0) continue; } -fchdir(file); +if (fchdir(file)) +return error(path, d->d_name); cwdchanged = true; ok &= takeover(d->d_name, true); } @@ -221,7 +222,8 @@ bool ok = true; for(int arg=optind; arg___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Replace assertRaises with assertRaisesRegex in i18n_tests.py
Preus has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331226 ) Change subject: Replace assertRaises with assertRaisesRegex in i18n_tests.py .. Replace assertRaises with assertRaisesRegex in i18n_tests.py assertRaises is not as good of a test as assertRaisesRegex. The latter has an extra parameter to match the exception message, allowing more more precision when checking an error. Bug: T154281 Change-Id: I52f0bb10c9a46abce0e783ab4b4420e17823a4b7 --- M tests/i18n_tests.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/26/331226/1 diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index 897e2e2..0b1c640 100644 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -171,7 +171,7 @@ u'test-non-localized EN') def testNoEnglish(self): -self.assertRaises(i18n.TranslationError, i18n.twtranslate, +self.assertRaisesRegex(i18n.TranslationError, 'No English translation has been defined for TranslateWiki key u\'test-no-english', i18n.twtranslate, 'en', 'test-no-english') @@ -346,7 +346,7 @@ def test_missing(self): """Test a missing message from a real message bundle.""" -self.assertRaises(i18n.TranslationError, +self.assertRaisesRegex(i18n.TranslationError, 'No English translation has been defined for TranslateWiki key u\'pywikibot-missing-key', i18n.twntranslate, 'en', 'pywikibot-missing-key') -- To view, visit https://gerrit.wikimedia.org/r/331226 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52f0bb10c9a46abce0e783ab4b4420e17823a4b7 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Preus___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MultiUpload[master]: Add missing apihelp messages to the MultiUpload Extension
MtDu has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331225 ) Change subject: Add missing apihelp messages to the MultiUpload Extension .. Add missing apihelp messages to the MultiUpload Extension Tests are failing because of missing apihelp-messages. This patch adds apihelp description as well as parameter messages. In addition, a qqq.json file has been added, albeit with some empty values. Bug: T154606 Change-Id: Ibc27274f129df8cb9737a9d0379c273474637ac5 --- M i18n/en.json A i18n/qqq.json 2 files changed, 29 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiUpload refs/changes/25/331225/1 diff --git a/i18n/en.json b/i18n/en.json index 7a8147c..268ae50 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -18,5 +18,8 @@ "multiupload-unpack-error": "Error unpacking package file", "multiupload-unreadable-package": "Can't read file $1", "multiupload-http-error": "Couldn't connect to server.", - "multiupload-file-unpacked-from": "File $1 from package $2" + "multiupload-file-unpacked-from": "File $1 from package $2", + "apihelp-multiupload-unpack-description": "Unpack a zip or tar file before importing its contents.", + "apihelp-multiupload-unpack-param-key": "\"filekey\" obtained when uploading the package file to stash", + "apihelp-multiupload-unpack-param-filename": "filename of the package" } diff --git a/i18n/qqq.json b/i18n/qqq.json new file mode 100644 index 000..7502ed6 --- /dev/null +++ b/i18n/qqq.json @@ -0,0 +1,25 @@ +{ + "@metadata": { + "authors": [ + "Justin Du" + ] + }, + "multiupload": "Message displayed on the legend in Special:MultiUpload", + "multiupload-desc": "Description of the MultiUpload extension", + "multiupload-text": "Pretext shown in an UploadForm instance of MultiUpload.", + "multipleupload": "Alias for multiupload", + "multipleupload-toolbox": "", + "multiupload-submit": "Message shown on the submit button of the MultiUpload form.", + "multiupload-uploadedto": "Success message shown when a file has been successfully uploaded using Special:MultiUpload.", + "multiupload-row": "", + "multiupload-unpack-button": "Label message for the unpack button.", + "multiupload-notify-ok": "Message shown in a dialog displayed to the user.", + "multiupload-upload-package-error": "Error message shown when a package has failed to upload.", + "multiupload-unpack-error": "Error message shown when a package has failed to be unpacked on the server.", + "multiupload-unreadable-package": "", + "multiupload-http-error": "HTTP Connection error message.", + "multiupload-file-unpacked-from": "Message shown when filed have successfully been unpacked.", + "apihelp-multiupload-unpack-description": "{{doc-apihelp-description|multiupload-unpack}}", + "apihelp-multiupload-unpack-param-key": "{{doc-apihelp-param|multiupload-unpack|key}}", + "apihelp-multiupload-unpack-param-filename": "{{doc-apihelp-param|multiupload-unpack|filename}}" +} -- To view, visit https://gerrit.wikimedia.org/r/331225 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc27274f129df8cb9737a9d0379c273474637ac5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultiUpload Gerrit-Branch: master Gerrit-Owner: MtDu___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: tests.page_tests: assertRaises => assertRaisesRegex
Sn1per has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331224 ) Change subject: tests.page_tests: assertRaises => assertRaisesRegex .. tests.page_tests: assertRaises => assertRaisesRegex Adds more detail and preciseness to page unit tests. Bug: T154281 Change-Id: I4971a775c9955cb7262582af0da2df2bc2465867 --- M tests/page_tests.py 1 file changed, 28 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/24/331224/1 diff --git a/tests/page_tests.py b/tests/page_tests.py index ebb9a38..0c65130 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -29,6 +29,10 @@ DefaultDrySiteTestCase, DeprecationTestCase, ) +EMPTY_TITLE_RE = 'Title must be specified and not empty if source is a Site\.' +INVALID_TITLE_RE = 'The link does not contain a page title' +NO_PAGE_RE = 'doesn\'t exist\.' + class TestLinkObject(SiteAttributeTestCase): @@ -156,7 +160,11 @@ # Translation namespace does not exist on wikisource:it l3 = pywikibot.page.Link('Translation:Albert Einstein', source=self.enws) self.assertEqual(l3.ns_title(), 'Translation:Albert Einstein') -self.assertRaises(pywikibot.Error, l3.ns_title, onsite=self.itws) +self.assertRaisesRegex(pywikibot.Error, + 'No corresponding namespace found for ' + 'namespace Translation: on wikisource:it.', + l3.ns_title, + onsite=self.itws) class TestPageObjectEnglish(TestCase): @@ -292,10 +300,11 @@ # the site parameter. # Empty string or None as title raises error. page = pywikibot.page.BasePage(site) -self.assertRaises(InvalidTitle, page.title) +self.assertRaisesRegex(InvalidTitle, INVALID_TITLE_RE, page.title) page = pywikibot.page.BasePage(site, title=u'') -self.assertRaises(InvalidTitle, page.title) -self.assertRaises(ValueError, pywikibot.page.BasePage, site, title=None) +self.assertRaisesRegex(InvalidTitle, INVALID_TITLE_RE, page.title) +self.assertRaisesRegex(ValueError, 'Title cannot be None.', + pywikibot.page.BasePage, site, title=None) def testPageConstructor(self): """Test Page constructor.""" @@ -303,15 +312,18 @@ mainpage = self.get_mainpage() # Test that Page() needs a title when Site is used as source. -self.assertRaises(ValueError, pywikibot.Page, site) -self.assertRaises(ValueError, pywikibot.Page, site, '') +self.assertRaisesRegex(ValueError, EMPTY_TITLE_RE, pywikibot.Page, site) +self.assertRaisesRegex(ValueError, EMPTY_TITLE_RE, pywikibot.Page, site, '') # Test Page as source. p1 = pywikibot.Page(mainpage) self.assertEqual(p1, mainpage) # Test not valid source. -self.assertRaises(pywikibot.Error, pywikibot.Page, 'dummy') +self.assertRaisesRegex(pywikibot.Error, + 'Invalid argument type \'\' in ' + 'Page constructor: dummy', + pywikibot.Page, 'dummy') def testTitle(self): """Test title() method options in article namespace.""" @@ -427,7 +439,7 @@ def test_bad_page(self): """Test various methods that rely on API: bad page.""" badpage = self.get_missing_article() -self.assertRaises(pywikibot.NoPage, badpage.get) +self.assertRaisesRegex(pywikibot.NoPage, NO_PAGE_RE, badpage.get) def testIsDisambig(self): """Test the integration with Extension:Disambiguator.""" @@ -814,8 +826,8 @@ text = u'This page is used in the [[mw:Manual:Pywikipediabot]] testing suite.' self.assertEqual(p1.get(), text) -self.assertRaises(pywikibot.exceptions.IsRedirectPage, p2.get) -self.assertRaises(pywikibot.exceptions.NoPage, p3.get) +self.assertRaisesRegex(pywikibot.exceptions.IsRedirectPage, 'is a redirect page\.', p2.get) +self.assertRaisesRegex(pywikibot.exceptions.NoPage, NO_PAGE_RE, p3.get) def test_set_redirect_target(self): """Test set_redirect_target method.""" @@ -826,10 +838,10 @@ p3 = pywikibot.Page(site, u'User:Legoktm/R3') text = p2.get(get_redirect=True) -self.assertRaises(pywikibot.exceptions.IsNotRedirectPage, - p1.set_redirect_target, p2) -self.assertRaises(pywikibot.exceptions.NoPage, p3.set_redirect_target, - p2) +self.assertRaisesRegex(pywikibot.exceptions.IsNotRedirectPage, 'is not a redirect page\.', + p1.set_redirect_target, p2) +self.assertRaisesRegex(pywikibot.exceptions.NoPage, NO_PAGE_RE, + p3.set_redirect_target,
[MediaWiki-commits] [Gerrit] mediawiki...AjaxLogin[master]: Fix AjaxLogin failing tests due to some messages missing
Phantom42 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331223 ) Change subject: Fix AjaxLogin failing tests due to some messages missing .. Fix AjaxLogin failing tests due to some messages missing Added 7 messages related to apihelp Bug: T126415 Change-Id: I612fcf1c7efd974a0255574a36521e9612450cac --- M i18n/en.json M i18n/qqq.json 2 files changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AjaxLogin refs/changes/23/331223/1 diff --git a/i18n/en.json b/i18n/en.json index 64e6657..cc4a06e 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -10,5 +10,12 @@ "ajaxlogin-create": "Create an account", "al-nosuchuser": "There is no user by the name \"$1\".\nUser names are case sensitive.\nCheck your spelling.", "al-createblocked": "Your IP address is blocked from account creation.", - "al-throttled": "You have had too many recent password attempts. Please wait $1 {{PLURAL:$1|second|seconds}} before trying again." + "al-throttled": "You have had too many recent password attempts. Please wait $1 {{PLURAL:$1|second|seconds}} before trying again.", + "apihelp-ajaxlogin-description": "Authenticate user or mail password", + "apihelp-ajaxlogin-param-Name": "User name", + "apihelp-ajaxlogin-param-Password": "User password", + "apihelp-ajaxlogin-param-Remember": "Whether to save user token to a cookie", + "apihelp-ajaxlogin-param-Loginattempt": "If set, then authenticate user with provided credentials", + "apihelp-ajaxlogin-param-Mailmypassword": "If set, then send password reset email to user with provided name", + "apihelp-ajaxlogin-param-Token": "Login token to use while authenticating user" } diff --git a/i18n/qqq.json b/i18n/qqq.json index 3c3c0d3..165c8b0 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -12,5 +12,12 @@ "ajaxlogin-create": "{{Identical|Create account}}", "al-nosuchuser": "This message refers to you have no user by that name and user names are case sensative.", "al-createblocked": "This message refers to your ip address is blocked from creating an account.", - "al-throttled": "This message refers to you have had too many recent password attempts." + "al-throttled": "This message refers to you have had too many recent password attempts.", + "apihelp-ajaxlogin-description": "{{doc-apihelp-description|ajaxlogin}}", + "apihelp-ajaxlogin-param-Name": "{{doc-apihelp-param|ajaxlogin|Name}}", + "apihelp-ajaxlogin-param-Password": "{{doc-apihelp-param|ajaxlogin|Password}}", + "apihelp-ajaxlogin-param-Remember": "{{doc-apihelp-param|ajaxlogin|Remember}}", + "apihelp-ajaxlogin-param-Loginattempt": "{{doc-apihelp-param|ajaxlogin|Loginattempt}}", + "apihelp-ajaxlogin-param-Mailmypassword": "{{doc-apihelp-param|ajaxlogin|Mailmypassword}}", + "apihelp-ajaxlogin-param-Token": "{{doc-apihelp-param|ajaxlogin|Token}}" } -- To view, visit https://gerrit.wikimedia.org/r/331223 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I612fcf1c7efd974a0255574a36521e9612450cac Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AjaxLogin Gerrit-Branch: master Gerrit-Owner: Phantom42___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Petition[master]: Cosmetic changes to fit coding conventions, organize
SamanthaNguyen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331221 ) Change subject: Cosmetic changes to fit coding conventions, organize .. Cosmetic changes to fit coding conventions, organize - Moved JS and CSS files into resources folder - Spacing per coding conventions - Switch to jQuery() instead of $(document).ready() since .ready() is being deprecated in jQuery 3.0 https://jquery.com/upgrade-guide/3.0/#deprecated-document-ready-handlers-other-than-jquery-function - Tabbing in package.json Change-Id: Idfcdd1a8e3dcae181fd48a72f6cf32de9203c86d --- M SpecialPetition.php M SpecialPetitionData.php M package.json D petition.js R resources/petition.css A resources/petition.js 6 files changed, 27 insertions(+), 28 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Petition refs/changes/21/331221/1 diff --git a/SpecialPetition.php b/SpecialPetition.php index 9b3e81e..8a9ddc6 100755 --- a/SpecialPetition.php +++ b/SpecialPetition.php @@ -9,15 +9,14 @@ return true; } - function execute($par) { + function execute( $par ) { $out = $this->getOutput(); // Can have multiple named petitions using {{Special:Petition/foo}} // Can also specify am optional tracking parameter e.g. {{Special:Petition/foo/email}} - $arr = explode('/', $par); - $petitionName = isset($arr[0]) ? $arr[0] : 'default'; - $source = isset($arr[1]) ? $arr[1] : ''; - + $arr = explode( '/', $par ); + $petitionName = isset( $arr[0] ) ? $arr[0] : 'default'; + $source = isset( $arr[1] ) ? $arr[1] : ''; $this->setHeaders(); $this->outputHeader(); @@ -87,7 +86,7 @@ // Update the cached number of signatures $cache = ObjectCache::getMainWANInstance(); - $key = wfMemcKey( 'petition', md5($formData['petitionname']), 'numsignatures' ); + $key = wfMemcKey( 'petition', md5( $formData['petitionname'] ), 'numsignatures' ); $cache->touchCheckKey( $key ); // Log signature @@ -145,7 +144,7 @@ if ( is_callable( array( 'CountryNames', 'getNames' ) ) ) { // Need to flip as HTMLForm requires display name as the key $countries = array_flip( CountryNames::getNames( $language ) ); - ksort($countries); + ksort( $countries ); return $countries; } diff --git a/SpecialPetitionData.php b/SpecialPetitionData.php index 5ff32fe..62be195 100644 --- a/SpecialPetitionData.php +++ b/SpecialPetitionData.php @@ -45,8 +45,8 @@ $response->header( "Content-type: text/csv; charset=utf-8" ); $fh = fopen( 'php://output', 'w' ); - fputcsv( $fh, array('id', 'petitionname', 'source', 'name', - 'email', 'country', 'message', 'share', 'timestamp')); + fputcsv( $fh, array( 'id', 'petitionname', 'source', 'name', + 'email', 'country', 'message', 'share', 'timestamp' ) ); foreach( $res as $row ) { diff --git a/package.json b/package.json index 7643164..1fb7b69 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { - "private": true, - "scripts": { -"test": "grunt test" - }, - "devDependencies": { -"grunt": "0.4.5", -"grunt-cli": "0.1.13", -"grunt-banana-checker": "0.4.0", -"grunt-jsonlint": "1.0.7", -"grunt-contrib-jshint": "0.11.3" - } + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "0.4.5", + "grunt-cli": "0.1.13", + "grunt-banana-checker": "0.4.0", + "grunt-jsonlint": "1.0.7", + "grunt-contrib-jshint": "0.11.3" + } } diff --git a/petition.js b/petition.js deleted file mode 100644 index f413982..000 --- a/petition.js +++ /dev/null @@ -1,6 +0,0 @@ -$(document).ready(function() { - // If site has geolocation, automatically select country - if( typeof(window.Geo) !== 'undefined' ) { - $('.petition-form #mw-input-wpcountry').val(Geo.country); - } -}); \ No newline at end of file diff --git a/petition.css b/resources/petition.css similarity index 88% rename from petition.css rename to resources/petition.css index d344a23..2e59dc2 100644 --- a/petition.css +++ b/resources/petition.css @@ -1,7 +1,7 @@ /* Match rest of mw-ui-vform style */ .petition-form #mw-input-wpcountry, .petition-form #mw-input-wppersonalmessage { - padding: 0.35em 0.5em 0.35em 0.5em; + padding: 0.35em 0.5em; border: 1px solid #ccc; color: #252525; margin: 0; @@
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Added diffrent log-in tooltip to private wiki
Filip has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331220 ) Change subject: Added diffrent log-in tooltip to private wiki .. Added diffrent log-in tooltip to private wiki Bug: T148006 Change-Id: I14e9a554c7e6f67bc120941199b999740886 --- M includes/skins/SkinTemplate.php M languages/i18n/en.json M languages/i18n/qqq.json 3 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/20/331220/1 diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php index 575a9ac..a8bcb07 100644 --- a/includes/skins/SkinTemplate.php +++ b/includes/skins/SkinTemplate.php @@ -720,7 +720,10 @@ } if ( $authManager->canAuthenticateNow() ) { - $personal_urls['login'] = $login_url; + $key = User::groupHasPermission( '*', 'read' ) + ? 'login' + : 'login-private'; + $personal_urls[$key] = $login_url; } } diff --git a/languages/i18n/en.json b/languages/i18n/en.json index a621f1c..4f26f34 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -2676,6 +2676,7 @@ "accesskey-pt-mycontris": "y", "accesskey-pt-anoncontribs": "y", "accesskey-pt-login": "o", + "accesskey-pt-login-private": "o", "accesskey-pt-logout": "", "accesskey-pt-createaccount": "", "accesskey-ca-talk": "t", @@ -2747,6 +2748,7 @@ "tooltip-pt-mycontris": "A list of {{GENDER:|your}} contributions", "tooltip-pt-anoncontribs": "A list of edits made from this IP address", "tooltip-pt-login": "You are encouraged to log in; however, it is not mandatory", + "tooltip-pt-login-private": "You need to log in to use this wiki", "tooltip-pt-logout": "Log out", "tooltip-pt-createaccount": "You are encouraged to create an account and log in; however, it is not mandatory", "tooltip-ca-talk": "Discussion about the content page", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index 372a127..d480f3a 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -2861,6 +2861,7 @@ "accesskey-pt-mycontris": "{{doc-accesskey}}\nSee also:\n* {{msg-mw|Mycontris}}\n* {{msg-mw|Accesskey-pt-mycontris}}\n* {{msg-mw|Tooltip-pt-mycontris}}", "accesskey-pt-anoncontribs": "{{doc-accesskey}}\nSee also:\n* {{msg-mw|Anoncontribs}}\n* {{msg-mw|Tooltip-pt-anoncontribs}}", "accesskey-pt-login": "{{doc-accesskey}}", + "accesskey-pt-login-private": "{{doc-accesskey}}", "accesskey-pt-logout": "{{doc-accesskey}}\nSee also:\n* {{msg-mw|Logout}}\n* {{msg-mw|Accesskey-pt-logout}}\n* {{msg-mw|Tooltip-pt-logout}}", "accesskey-pt-createaccount": "{{doc-accesskey}}", "accesskey-ca-talk": "{{doc-accesskey}}\nSee also:\n* {{msg-mw|Talk}}\n* {{msg-mw|Accesskey-ca-talk}}\n* {{msg-mw|Tooltip-ca-talk}}", @@ -2932,6 +2933,7 @@ "tooltip-pt-mycontris": "Tooltip shown when hovering over the {{msg-mw|Mycontris}} link in your personal toolbox (upper right side).\n\nSee also:\n* {{msg-mw|Mycontris}}\n* {{msg-mw|Accesskey-pt-mycontris}}\n* {{msg-mw|Tooltip-pt-mycontris}}", "tooltip-pt-anoncontribs": "Tooltip shown when hovering over the {{msg-mw|Anoncontribs}} link in your personal toolbox (upper right side).\n\nSee also:\n* {{msg-mw|Anoncontribs}}\n* {{msg-mw|Accesskey-pt-anoncontribs}}", "tooltip-pt-login": "Tooltip shown when hovering over the link 'Log in' in the upper right corner show on all pages while not logged in.", + "tooltip-pt-login-private": "Tooltip shown when hovering over the link 'Log in' in the upper right corner show on all pages while not logged in, and wiki is private.", "tooltip-pt-logout": "Tooltip shown when hovering over the {{msg-mw|Logout}} link in your personal toolbox (upper right side).\n\nSee also:\n* {{msg-mw|Logout}}\n* {{msg-mw|Accesskey-pt-logout}}\n* {{msg-mw|Tooltip-pt-logout}}\n{{Identical|Log out}}", "tooltip-pt-createaccount": "Tooltip shown when hovering over the link 'Create account' in the upper right corner show on all pages while not logged in.", "tooltip-ca-talk": "Tooltip shown when hovering over the {{msg-mw|Talk}} tab.\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 a technical definition of 'content namespaces' see
[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Move ScoreException class to standalone file
Dereckson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331219 ) Change subject: Move ScoreException class to standalone file .. Move ScoreException class to standalone file Change-Id: I76c2436cfb2aa1e1b8fac6ee52ef357224ede5c3 --- M Score.body.php A ScoreException.php 2 files changed, 56 insertions(+), 30 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Score refs/changes/19/331219/1 diff --git a/Score.body.php b/Score.body.php index fd1e27c..bcb3813 100644 --- a/Score.body.php +++ b/Score.body.php @@ -28,36 +28,6 @@ } /** - * Score exception - */ -class ScoreException extends Exception { - /** -* Constructor. -* -* @param $message Message to create error message from. Should have one $1 parameter. -* @param $code int optionally, an error code. -* @param $previous Exception that caused this exception. -*/ - public function __construct( $message, $code = 0, Exception $previous = null ) { - parent::__construct( $message->inContentLanguage()->parse(), $code, $previous ); - } - - /** -* Auto-renders exception as HTML error message in the wiki's content -* language. -* -* @return string Error message HTML. -*/ - public function __toString() { - return Html::rawElement( - 'div', - array( 'class' => 'errorbox' ), - $this->getMessage() - ); - } -} - -/** * Score class. */ class Score { diff --git a/ScoreException.php b/ScoreException.php new file mode 100644 index 000..edf06f4 --- /dev/null +++ b/ScoreException.php @@ -0,0 +1,56 @@ +http://www.gnu.org/licenses/>. + + To contact the author: ++ http://en.wikisource.org/wiki/User_talk:GrafZahl + https://github.com/TheCount/score + + */ + +/** + * Score exception + */ +class ScoreException extends Exception { + + /** +* Constructor. +* +* @param $message Message to create error message from. Should have one $1 parameter. +* @param $code int optionally, an error code. +* @param $previous Exception that caused this exception. +*/ + public function __construct( $message, $code = 0, Exception $previous = null ) { + parent::__construct( $message->inContentLanguage()->parse(), $code, $previous ); + } + + /** +* Auto-renders exception as HTML error message in the wiki's content +* language. +* +* @return string Error message HTML. +*/ + public function __toString() { + return Html::rawElement( + 'div', + array( 'class' => 'errorbox' ), + $this->getMessage() + ); + } + +} -- To view, visit https://gerrit.wikimedia.org/r/331219 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I76c2436cfb2aa1e1b8fac6ee52ef357224ede5c3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Score Gerrit-Branch: master Gerrit-Owner: Dereckson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Improve style
Dereckson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331218 ) Change subject: Improve style .. Improve style Change-Id: Ib2da89d38ac02ca4f34642d8db27bbdd56ff0b59 --- M Score.body.php 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Score refs/changes/18/331218/1 diff --git a/Score.body.php b/Score.body.php index fd1e27c..1cb109b 100644 --- a/Score.body.php +++ b/Score.body.php @@ -384,7 +384,7 @@ $midiFileName = "{$options['file_name_prefix']}.midi"; $metaDataFileName = "{$options['file_name_prefix']}.json"; - if( isset( $existingFiles[$metaDataFileName] ) ) { + if ( isset( $existingFiles[$metaDataFileName] ) ) { $metaDataFile = $backend->getFileContents( array( 'src' => "{$options['dest_storage_path']}/$metaDataFileName" ) ); if ( $metaDataFile === false ) { @@ -480,8 +480,8 @@ $link = Html::rawElement( 'a', array( 'href' => $url ), $link ); } if ( $options['generate_ogg'] ) { - $length = $metaData[basename($oggPath)]['length']; - if ( class_exists( 'TimedMediaTransformOutput' ) ){ + $length = $metaData[basename( $oggPath )]['length']; + if ( class_exists( 'TimedMediaTransformOutput' ) ) { $player = new TimedMediaTransformOutput( array( 'length' => $length, 'sources' => array( @@ -799,7 +799,7 @@ 'dst' => $remoteDest ); // Create metadata json - $metaData[basename($remoteDest)]['length'] = self::getLength( $factoryOgg ); + $metaData[basename( $remoteDest )]['length'] = self::getLength( $factoryOgg ); $dstFileName = "{$options['file_name_prefix']}.json"; $dest = "{$options['dest_storage_path']}/$dstFileName"; $ops[] = array( @@ -905,7 +905,7 @@ * @return float duration in seconds */ private static function getLength( $path ) { - //File_Ogg is packaged in TimedMediaHandler and OggHandler + // File_Ogg is packaged in TimedMediaHandler and OggHandler if ( !class_exists( 'File_Ogg' ) ) { require( 'File/Ogg.php' ); } @@ -943,7 +943,7 @@ * @return Bool true on success, false on error */ private static function eraseFactory( $dir ) { - if( file_exists( $dir ) ) { + if ( file_exists( $dir ) ) { array_map( 'unlink', glob( "$dir/*", GLOB_NOSORT ) ); $rc = rmdir( $dir ); if ( !$rc ) { -- To view, visit https://gerrit.wikimedia.org/r/331218 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib2da89d38ac02ca4f34642d8db27bbdd56ff0b59 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Score Gerrit-Branch: master Gerrit-Owner: Dereckson___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Display Lilypond version on Special:Version
Dereckson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331217 ) Change subject: Display Lilypond version on Special:Version .. Display Lilypond version on Special:Version Users wants to know which Lilypond version is active on a wiki. Bug: T133014 Change-Id: I35702ff61a5399664fc3439192edc6152d2c7d70 --- M Score.body.php M Score.hooks.php M extension.json 3 files changed, 21 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Score refs/changes/17/331217/1 diff --git a/Score.body.php b/Score.body.php index fd1e27c..89ef172 100644 --- a/Score.body.php +++ b/Score.body.php @@ -107,13 +107,21 @@ ); } + public static function getLilypondVersion() { + if ( self::$lilypondVersion === null ) { + self::fetchLilypondVersion(); + } + + return self::$lilypondVersion; + } + /** * Determines the version of LilyPond in use and writes the version * string to self::$lilypondVersion. * * @throws ScoreException if LilyPond could not be executed properly. */ - private static function getLilypondVersion() { + private static function fetchLilypondVersion() { global $wgScoreLilyPond; if ( !is_executable( $wgScoreLilyPond ) ) { @@ -725,11 +733,7 @@ * @throws ScoreException if determining the LilyPond version fails. */ private static function embedLilypondCode( $lilypondCode ) { - /* Get LilyPond version if we don't know it yet */ - if ( self::$lilypondVersion === null ) { - self::getLilypondVersion(); - } - $version = self::$lilypondVersion; + $version = self::getLilypondVersion(); /* Raw code. In Scheme, ##f is false and ##t is true. */ /* Set the default MIDI tempo to 100, 60 is a bit too slow */ diff --git a/Score.hooks.php b/Score.hooks.php index 934878d..855a7b4 100644 --- a/Score.hooks.php +++ b/Score.hooks.php @@ -14,4 +14,12 @@ $parser->setHook( 'score', 'Score::render' ); return true; } + + public static function onSoftwareInfo( array &$software ) { + try { + $software[ '[http://lilypond.org/ LilyPond]' ] = Score::getLilypondVersion(); + } catch ( ScoreException $ex ) { + // LilyPond executable can't found + } + } } diff --git a/extension.json b/extension.json index 9cb53b4..5540b83 100644 --- a/extension.json +++ b/extension.json @@ -61,6 +61,9 @@ "Hooks": { "ParserFirstCallInit": [ "ScoreHooks::onParserFirstCallInit" + ], + "SoftwareInfo": [ + "ScoreHooks::onSoftwareInfo" ] }, "config": { -- To view, visit https://gerrit.wikimedia.org/r/331217 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I35702ff61a5399664fc3439192edc6152d2c7d70 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Score Gerrit-Branch: master Gerrit-Owner: Dereckson___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Added LogExtract to Special:ContentModel
Filip has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331216 ) Change subject: Added LogExtract to Special:ContentModel .. Added LogExtract to Special:ContentModel Bug: T154874 Change-Id: I571ea324f31935c2394dce77e31c74c3afb76358 --- M includes/specials/SpecialChangeContentModel.php 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/16/331216/1 diff --git a/includes/specials/SpecialChangeContentModel.php b/includes/specials/SpecialChangeContentModel.php index 87276a1..fe9ef43 100644 --- a/includes/specials/SpecialChangeContentModel.php +++ b/includes/specials/SpecialChangeContentModel.php @@ -33,6 +33,15 @@ } } + protected function postText() { + $contentModelLogPage = new LogPage( 'contentmodel' ); + $text = Xml::element( 'h2', null, $contentModelLogPage->getName()->text() ); + $out = ''; + LogEventsList::showLogExtract( $out, 'contentmodel', $this->title ); + $text .= $out; + return $text; + } + protected function getDisplayFormat() { return 'ooui'; } -- To view, visit https://gerrit.wikimedia.org/r/331216 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I571ea324f31935c2394dce77e31c74c3afb76358 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Filip___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...lists[master]: Query fix in order to exclude redirects that link to other n...
Incola has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331215 ) Change subject: Query fix in order to exclude redirects that link to other namespaces (not NS0) from valid links when generating orphaned articles lists .. Query fix in order to exclude redirects that link to other namespaces (not NS0) from valid links when generating orphaned articles lists Change-Id: Id96872c05fea3c33906966d180e7aaf793400779 --- M query/itwiki/Voci/Voci_orfane_con_interlink.sql M query/itwiki/Voci/Voci_orfane_in_ordine_alfabetico.sql M query/itwiki/Voci/Voci_orfane_per_creatore.sql M query/itwiki/Voci/Voci_orfane_per_data_di_creazione.sql M query/itwiki/Voci/Voci_orfane_per_dimensione.sql M query/itwiki/Voci/Voci_orfane_senza_interlink.sql 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/query/itwiki/Voci/Voci_orfane_con_interlink.sql b/query/itwiki/Voci/Voci_orfane_con_interlink.sql index fc3df99..107f5df 100644 --- a/query/itwiki/Voci/Voci_orfane_con_interlink.sql +++ b/query/itwiki/Voci/Voci_orfane_con_interlink.sql @@ -17,7 +17,7 @@ WHERE page_namespace=0 AND rd_namespace = 0 AND NOT EXISTS ( SELECT * FROM page AS p JOIN pagelinks ON p.page_id = pl_from -WHERE p.page_namespace IN (0, 4, 10, 12, 100, 102) AND pl_namespace = 0 AND pl_title = page.page_title)) +WHERE p.page_namespace = 0 AND pl_namespace = 0 AND pl_title = page.page_title)) AND pl_from NOT IN (SELECT cl_from FROM categorylinks, pagelinks diff --git a/query/itwiki/Voci/Voci_orfane_in_ordine_alfabetico.sql b/query/itwiki/Voci/Voci_orfane_in_ordine_alfabetico.sql index 32253f1..f4ecc6d 100644 --- a/query/itwiki/Voci/Voci_orfane_in_ordine_alfabetico.sql +++ b/query/itwiki/Voci/Voci_orfane_in_ordine_alfabetico.sql @@ -17,7 +17,7 @@ WHERE page_namespace=0 AND rd_namespace = 0 AND NOT EXISTS ( SELECT * FROM page AS p JOIN pagelinks ON p.page_id = pl_from -WHERE p.page_namespace IN (0, 4, 10, 12, 100, 102) AND pl_namespace = 0 AND pl_title = page.page_title)) +WHERE p.page_namespace = 0 AND pl_namespace = 0 AND pl_title = page.page_title)) AND pl_from NOT IN (SELECT cl_from FROM categorylinks, pagelinks diff --git a/query/itwiki/Voci/Voci_orfane_per_creatore.sql b/query/itwiki/Voci/Voci_orfane_per_creatore.sql index 47797e8..ff1cae2 100644 --- a/query/itwiki/Voci/Voci_orfane_per_creatore.sql +++ b/query/itwiki/Voci/Voci_orfane_per_creatore.sql @@ -19,7 +19,7 @@ WHERE page_namespace=0 AND rd_namespace = 0 AND NOT EXISTS ( SELECT * FROM page AS p JOIN pagelinks ON p.page_id = pl_from -WHERE p.page_namespace IN (0, 4, 10, 12, 100, 102) AND pl_namespace = 0 AND pl_title = page.page_title)) +WHERE p.page_namespace = 0 AND pl_namespace = 0 AND pl_title = page.page_title)) AND pl_from NOT IN (SELECT cl_from FROM categorylinks, pagelinks diff --git a/query/itwiki/Voci/Voci_orfane_per_data_di_creazione.sql b/query/itwiki/Voci/Voci_orfane_per_data_di_creazione.sql index bd1e8c8..d59099f 100644 --- a/query/itwiki/Voci/Voci_orfane_per_data_di_creazione.sql +++ b/query/itwiki/Voci/Voci_orfane_per_data_di_creazione.sql @@ -19,7 +19,7 @@ WHERE page_namespace=0 AND rd_namespace = 0 AND NOT EXISTS ( SELECT * FROM page AS p JOIN pagelinks ON p.page_id = pl_from -WHERE p.page_namespace IN (0, 4, 10, 12, 100, 102) AND pl_namespace = 0 AND pl_title = page.page_title)) +WHERE p.page_namespace = 0 AND pl_namespace = 0 AND pl_title = page.page_title)) AND pl_from NOT IN (SELECT cl_from FROM categorylinks, pagelinks diff --git a/query/itwiki/Voci/Voci_orfane_per_dimensione.sql b/query/itwiki/Voci/Voci_orfane_per_dimensione.sql index cf70b75..e3c69aa 100644 --- a/query/itwiki/Voci/Voci_orfane_per_dimensione.sql +++ b/query/itwiki/Voci/Voci_orfane_per_dimensione.sql @@ -17,7 +17,7 @@ WHERE page_namespace=0 AND rd_namespace = 0 AND NOT EXISTS ( SELECT * FROM page AS p JOIN pagelinks ON p.page_id = pl_from -WHERE p.page_namespace IN (0, 4, 10, 12, 100, 102) AND pl_namespace = 0 AND pl_title = page.page_title)) +WHERE p.page_namespace = 0 AND pl_namespace = 0 AND pl_title = page.page_title)) AND pl_from NOT IN (SELECT cl_from FROM categorylinks, pagelinks diff --git a/query/itwiki/Voci/Voci_orfane_senza_interlink.sql b/query/itwiki/Voci/Voci_orfane_senza_interlink.sql index 400b729..234fc35 100644 --- a/query/itwiki/Voci/Voci_orfane_senza_interlink.sql +++ b/query/itwiki/Voci/Voci_orfane_senza_interlink.sql @@ -17,7 +17,7 @@ WHERE page_namespace=0 AND rd_namespace = 0 AND NOT EXISTS ( SELECT * FROM page AS p JOIN pagelinks ON p.page_id = pl_from -WHERE p.page_namespace IN (0, 4, 10, 12, 100, 102) AND pl_namespace = 0 AND pl_title = page.page_title)) +WHERE p.page_namespace = 0 AND pl_namespace = 0 AND pl_title = page.page_title)) AND pl_from NOT
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2017-01-08T10:00:01+0000
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331211 ) Change subject: New Wikidata Build - 2017-01-08T10:00:01+ .. New Wikidata Build - 2017-01-08T10:00:01+ Change-Id: I2abd2655ba09eafe16db1052048ce393ec2e1056 --- M composer.lock M extensions/Wikibase/repo/i18n/bn.json M extensions/Wikibase/repo/i18n/es.json M extensions/Wikibase/repo/i18n/lv.json M vendor/composer/installed.json 5 files changed, 14 insertions(+), 9 deletions(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.lock b/composer.lock index 9f72563..9c67fb4 100644 --- a/composer.lock +++ b/composer.lock @@ -1606,12 +1606,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;, -"reference": "52caf646b94f27b82794026d36b800b263fd29eb" +"reference": "25c8d2f7a299078d7cb2cd82700fe3dcb4a85c24" }, "dist": { "type": "zip", -"url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/52caf646b94f27b82794026d36b800b263fd29eb;, -"reference": "52caf646b94f27b82794026d36b800b263fd29eb", +"url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/25c8d2f7a299078d7cb2cd82700fe3dcb4a85c24;, +"reference": "25c8d2f7a299078d7cb2cd82700fe3dcb4a85c24", "shasum": "" }, "require": { @@ -1686,7 +1686,7 @@ "wikibaserepo", "wikidata" ], -"time": "2017-01-07 01:53:11" +"time": "2017-01-07 21:14:26" }, { "name": "wikibase/wikimedia-badges", diff --git a/extensions/Wikibase/repo/i18n/bn.json b/extensions/Wikibase/repo/i18n/bn.json index 5bbe580..4b2f148 100644 --- a/extensions/Wikibase/repo/i18n/bn.json +++ b/extensions/Wikibase/repo/i18n/bn.json @@ -109,6 +109,7 @@ "wikibase-validator-illegal-file-chars": "ফাইলের নামে কোলন বা স্ল্যাশের মত অক্ষর ধারণ করার অনুমতি নেই। \"File:\" লেখার পাশে শুধুমাত্র ফাইলের নাম প্রতিলেপন করুন, ধন্যবাদ।", "wikibase-validator-no-such-media": "[https://commons.wikimedia.org/ উইকিমিডিয়া কমন্সে] \"$1\" ফাইলটির অস্তিত্ব নেই।", "wikibase-validator-not-a-language": "\"$1\" জানা ভাষার কোড নয়।", + "wikibase-item-reference-edit-placeholder": "আইটেমের আইডি লিখুন উদা. Q10", "wikibase-wikibaserepopage-not-itemid": "\"$1\" কোন বৈধ আইটেম আইডি নয়।", "wikibase-wikibaserepopage-invalid-langcode": "ভাষা কোড \"$1\" অজানা। সিস্টেমের জন্য পরিচিত এমন একটি ভাষা কোড ব্যবহার করুন, যেমন \"bn\"।", "wikibase-wikibaserepopage-invalid-id": "সিস্টেমের কাছে আইডি \"$1\" অজানা। দয়া করে একটি বৈধ সত্তার আইডি ব্যবহার করুন।", diff --git a/extensions/Wikibase/repo/i18n/es.json b/extensions/Wikibase/repo/i18n/es.json index 22d3f78..29b961a 100644 --- a/extensions/Wikibase/repo/i18n/es.json +++ b/extensions/Wikibase/repo/i18n/es.json @@ -146,6 +146,8 @@ "wikibase-validator-label-no-entityid": "La etiqueta no debe ser un identificador de entidad válido.", "wikibase-validator-no-such-media": "El archivo \"$1\" no existe en [https://commons.wikimedia.org/ Wikimedia Commons].", "wikibase-validator-not-a-language": "«$1» no es un código de idioma conocido.", + "wikibase-item-reference-edit-invalid-format": "El identificador de elemento introducido tiene un formato no válido", + "wikibase-item-reference-edit-nonexistent-item": "El elemento con este identificador no existe", "wikibase-wikibaserepopage-not-itemid": "\"$1\" no es un identificador de elemento válido.", "wikibase-wikibaserepopage-invalid-langcode": "El código de idioma «$1» es desconocido. Utiliza un código de idioma que el sistema reconozca, como «es».", "wikibase-wikibaserepopage-invalid-id": "El identificador \"$1\" es desconocido para el sistema. Utiliza un identificador de entidad que sea válido.", diff --git a/extensions/Wikibase/repo/i18n/lv.json b/extensions/Wikibase/repo/i18n/lv.json index 935c325..7c67785 100644 --- a/extensions/Wikibase/repo/i18n/lv.json +++ b/extensions/Wikibase/repo/i18n/lv.json @@ -5,7 +5,8 @@ "Papuass", "Edgars2007", "Macofe", - "Nitalynx" + "Nitalynx", + "Silraks" ] }, "wikibase-entity-item": "vienums", @@ -33,6 +34,7 @@ "wikibase-label-edit-placeholder": "ievadiet nosaukumu", "wikibase-description-empty": "Nav apraksta", "wikibase-description-edit-placeholder": "ievadiet aprakstu", + "wikibase-content-language-edit-label": "Valoda:",
[MediaWiki-commits] [Gerrit] labs...lists[master]: Query fix in order to exclude redirects that link to other n...
Mess has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331215 ) Change subject: Query fix in order to exclude redirects that link to other namespaces (not NS0) from valid links when generating orphaned articles lists .. Query fix in order to exclude redirects that link to other namespaces (not NS0) from valid links when generating orphaned articles lists Change-Id: Id96872c05fea3c33906966d180e7aaf793400779 --- M query/itwiki/Voci/Voci_orfane_con_interlink.sql M query/itwiki/Voci/Voci_orfane_in_ordine_alfabetico.sql M query/itwiki/Voci/Voci_orfane_per_creatore.sql M query/itwiki/Voci/Voci_orfane_per_data_di_creazione.sql M query/itwiki/Voci/Voci_orfane_per_dimensione.sql M query/itwiki/Voci/Voci_orfane_senza_interlink.sql 6 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/lists refs/changes/15/331215/2 diff --git a/query/itwiki/Voci/Voci_orfane_con_interlink.sql b/query/itwiki/Voci/Voci_orfane_con_interlink.sql index fc3df99..107f5df 100644 --- a/query/itwiki/Voci/Voci_orfane_con_interlink.sql +++ b/query/itwiki/Voci/Voci_orfane_con_interlink.sql @@ -17,7 +17,7 @@ WHERE page_namespace=0 AND rd_namespace = 0 AND NOT EXISTS ( SELECT * FROM page AS p JOIN pagelinks ON p.page_id = pl_from -WHERE p.page_namespace IN (0, 4, 10, 12, 100, 102) AND pl_namespace = 0 AND pl_title = page.page_title)) +WHERE p.page_namespace = 0 AND pl_namespace = 0 AND pl_title = page.page_title)) AND pl_from NOT IN (SELECT cl_from FROM categorylinks, pagelinks diff --git a/query/itwiki/Voci/Voci_orfane_in_ordine_alfabetico.sql b/query/itwiki/Voci/Voci_orfane_in_ordine_alfabetico.sql index 32253f1..f4ecc6d 100644 --- a/query/itwiki/Voci/Voci_orfane_in_ordine_alfabetico.sql +++ b/query/itwiki/Voci/Voci_orfane_in_ordine_alfabetico.sql @@ -17,7 +17,7 @@ WHERE page_namespace=0 AND rd_namespace = 0 AND NOT EXISTS ( SELECT * FROM page AS p JOIN pagelinks ON p.page_id = pl_from -WHERE p.page_namespace IN (0, 4, 10, 12, 100, 102) AND pl_namespace = 0 AND pl_title = page.page_title)) +WHERE p.page_namespace = 0 AND pl_namespace = 0 AND pl_title = page.page_title)) AND pl_from NOT IN (SELECT cl_from FROM categorylinks, pagelinks diff --git a/query/itwiki/Voci/Voci_orfane_per_creatore.sql b/query/itwiki/Voci/Voci_orfane_per_creatore.sql index 47797e8..ff1cae2 100644 --- a/query/itwiki/Voci/Voci_orfane_per_creatore.sql +++ b/query/itwiki/Voci/Voci_orfane_per_creatore.sql @@ -19,7 +19,7 @@ WHERE page_namespace=0 AND rd_namespace = 0 AND NOT EXISTS ( SELECT * FROM page AS p JOIN pagelinks ON p.page_id = pl_from -WHERE p.page_namespace IN (0, 4, 10, 12, 100, 102) AND pl_namespace = 0 AND pl_title = page.page_title)) +WHERE p.page_namespace = 0 AND pl_namespace = 0 AND pl_title = page.page_title)) AND pl_from NOT IN (SELECT cl_from FROM categorylinks, pagelinks diff --git a/query/itwiki/Voci/Voci_orfane_per_data_di_creazione.sql b/query/itwiki/Voci/Voci_orfane_per_data_di_creazione.sql index bd1e8c8..d59099f 100644 --- a/query/itwiki/Voci/Voci_orfane_per_data_di_creazione.sql +++ b/query/itwiki/Voci/Voci_orfane_per_data_di_creazione.sql @@ -19,7 +19,7 @@ WHERE page_namespace=0 AND rd_namespace = 0 AND NOT EXISTS ( SELECT * FROM page AS p JOIN pagelinks ON p.page_id = pl_from -WHERE p.page_namespace IN (0, 4, 10, 12, 100, 102) AND pl_namespace = 0 AND pl_title = page.page_title)) +WHERE p.page_namespace = 0 AND pl_namespace = 0 AND pl_title = page.page_title)) AND pl_from NOT IN (SELECT cl_from FROM categorylinks, pagelinks diff --git a/query/itwiki/Voci/Voci_orfane_per_dimensione.sql b/query/itwiki/Voci/Voci_orfane_per_dimensione.sql index cf70b75..e3c69aa 100644 --- a/query/itwiki/Voci/Voci_orfane_per_dimensione.sql +++ b/query/itwiki/Voci/Voci_orfane_per_dimensione.sql @@ -17,7 +17,7 @@ WHERE page_namespace=0 AND rd_namespace = 0 AND NOT EXISTS ( SELECT * FROM page AS p JOIN pagelinks ON p.page_id = pl_from -WHERE p.page_namespace IN (0, 4, 10, 12, 100, 102) AND pl_namespace = 0 AND pl_title = page.page_title)) +WHERE p.page_namespace = 0 AND pl_namespace = 0 AND pl_title = page.page_title)) AND pl_from NOT IN (SELECT cl_from FROM categorylinks, pagelinks diff --git a/query/itwiki/Voci/Voci_orfane_senza_interlink.sql b/query/itwiki/Voci/Voci_orfane_senza_interlink.sql index 400b729..234fc35 100644 --- a/query/itwiki/Voci/Voci_orfane_senza_interlink.sql +++ b/query/itwiki/Voci/Voci_orfane_senza_interlink.sql @@ -17,7 +17,7 @@ WHERE page_namespace=0 AND rd_namespace = 0 AND NOT EXISTS ( SELECT * FROM page AS p JOIN pagelinks ON p.page_id = pl_from -WHERE p.page_namespace IN (0, 4, 10, 12, 100, 102) AND pl_namespace = 0 AND pl_title = page.page_title)) +WHERE p.page_namespace
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Use UsersMultiselectWidget to manage publishers list
Phantom42 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331214 ) Change subject: Use UsersMultiselectWidget to manage publishers list .. Use UsersMultiselectWidget to manage publishers list Bug: T131492 Change-Id: I002bd1534ad7c58f627c03711cfb189889b03cdf --- M i18n/en.json M i18n/qqq.json M includes/NewsletterEditPage.php 3 files changed, 6 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter refs/changes/14/331214/1 diff --git a/i18n/en.json b/i18n/en.json index d738e4b..d10927b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -57,14 +57,13 @@ "newsletter-announce-nonexistent-page": "The provided issue page does not exist. Please enter an existing page.", "newsletter-announce-failure": "A new issue could not be announced. Please try again.", "newsletter-manage": "Manage \"$1\" newsletter", - "newsletter-manage-publishers": "Publishers (separated by newline):", + "newsletter-manage-publishers": "Publishers:", "newsletter-manage-name": "Newsletter name:", "newsletter-manage-title": "Title of Main Page", "newsletter-manage-description": "Description:", "newsletter-manage-text": "You can add or remove publishers for \"$1\" by modifying the list below.", "newsletter-managenewsletter-button": "Submit", "newsletter-manage-no-publishers": "Are you sure that you want to remove all the publishers from this newsletter?", - "newsletter-manage-invalid-publisher": "\"$1\" is not a valid user. Please make sure that you entered valid input and try again.", "newsletter-manage-remove-self-publisher": "Are you sure that you want to remove yourself from the publishers?", "newsletter-manage-newsletter-success": "The newsletter have been modified.", "newsletter-manage-newsletter-nochanges": "No changes were made to the existing newsletter.", diff --git a/i18n/qqq.json b/i18n/qqq.json index 5923a9c..0df2d1b 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -71,7 +71,6 @@ "newsletter-manage-text": "Introductory message shown on Special:Newsletter's manage form. $1 - Name of the newsletter", "newsletter-managenewsletter-button": "Label of submit button on Special:Newsletter's manage form\n{{Identical|Submit}}", "newsletter-manage-no-publishers": "Confirmation message shown on Special:Newsletter's manage form if the user attempted to remove all the publishers.", - "newsletter-manage-invalid-publisher": "Error message shown on Special:Newsletter's manage form if an invalid user was entered in the input. $1 - Name of invalid user", "newsletter-manage-remove-self-publisher": "Confirmation message shown on Special:Newsletter's manage form if the user removes themselves from the publishers' list.", "newsletter-manage-newsletter-success": "Success message shown on Special:Newsletter's manage form when the publishers have been modfied.", "newsletter-manage-newsletter-nochanges": "Message shown on Special:Newsletter if no changes were made to the existing publishers' list.", diff --git a/includes/NewsletterEditPage.php b/includes/NewsletterEditPage.php index 569bb07..7a0ad72 100644 --- a/includes/NewsletterEditPage.php +++ b/includes/NewsletterEditPage.php @@ -100,10 +100,10 @@ 'required' => true, ); $fields['Publishers'] = array( - 'type' => 'textarea', + 'type' => 'usersmultiselect', 'label-message' => 'newsletter-manage-publishers', - 'rows' => 10, - 'default' => implode( "\n", $publishersNames ), + 'users' => $publishersNames, + 'exists' => true, ); $fields['Summary'] = array( 'type' => 'text', @@ -326,25 +326,14 @@ $modified = true; } - $publisherNames = explode( "\n", $data['Publishers'] ); - // Strip whitespace, then remove blank lines and duplicates - $publisherNames = array_unique( array_filter( array_map( 'trim', $publisherNames ) ) ); - + $publisherNames = $data['Publishers']; // Ask for confirmation before removing all the publishers if ( !$confirmed && count( $publisherNames ) === 0 ) { return Status::newFatal( 'newsletter-manage-no-publishers' ); } /** @var User[] $newPublishers */ - $newPublishers = array(); - foreach ( $publisherNames as $publisherName ) { - $user = User::newFromName( $publisherName ); - if ( !$user || !$user->getId() ) { -
[MediaWiki-commits] [Gerrit] integration/config[master]: Do not mail build log in operations-puppet-doc
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331213 ) Change subject: Do not mail build log in operations-puppet-doc .. Do not mail build log in operations-puppet-doc The build log is typically rather large and the qa-alerts list hold the mail in moderation. Change-Id: I5c436e20d25224b5127358ec44d8723685f36228 --- M jjb/operations-puppet.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/operations-puppet.yaml b/jjb/operations-puppet.yaml index 041b1ca..d8ad2b2 100644 --- a/jjb/operations-puppet.yaml +++ b/jjb/operations-puppet.yaml @@ -32,7 +32,7 @@ publishers: - email-ext: recipients: qa-ale...@lists.wikimedia.org - attach-build-log: true + attach-build-log: false first-failure: true aborted: true failure: false -- To view, visit https://gerrit.wikimedia.org/r/331213 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5c436e20d25224b5127358ec44d8723685f36228 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: HasharGerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Do not mail build log in operations-puppet-doc
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331213 ) Change subject: Do not mail build log in operations-puppet-doc .. Do not mail build log in operations-puppet-doc The build log is typically rather large and the qa-alerts list hold the mail in moderation. Change-Id: I5c436e20d25224b5127358ec44d8723685f36228 --- M jjb/operations-puppet.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/13/331213/1 diff --git a/jjb/operations-puppet.yaml b/jjb/operations-puppet.yaml index 041b1ca..d8ad2b2 100644 --- a/jjb/operations-puppet.yaml +++ b/jjb/operations-puppet.yaml @@ -32,7 +32,7 @@ publishers: - email-ext: recipients: qa-ale...@lists.wikimedia.org - attach-build-log: true + attach-build-log: false first-failure: true aborted: true failure: false -- To view, visit https://gerrit.wikimedia.org/r/331213 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5c436e20d25224b5127358ec44d8723685f36228 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: ApiReview: Make generic error conditionals actually reachable
TTO has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331212 ) Change subject: ApiReview: Make generic error conditionals actually reachable .. ApiReview: Make generic error conditionals actually reachable These errors can be generated when approving and when unapproving, so it didn't make sense to have them in an else block at the bottom where they couldn't be reached. Bug: T56817 Change-Id: I889011deef5686be1fd8bc132a49b75162ed1400 --- M api/actions/ApiReview.php 1 file changed, 13 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs refs/changes/12/331212/1 diff --git a/api/actions/ApiReview.php b/api/actions/ApiReview.php index 6f3aa71..ad3b35c 100644 --- a/api/actions/ApiReview.php +++ b/api/actions/ApiReview.php @@ -113,6 +113,19 @@ if ( $status === true ) { $this->getResult()->addValue( null, $this->getModuleName(), array( 'result' => 'Success' ) ); + # Generic failures + } elseif ( $status === 'review_page_notexists' ) { + if ( is_callable( array( $this, 'dieWithError' ) ) ) { + $this->dieWithError( 'apierror-flaggedrevs-pagedoesnotexist', 'notarget' ); + } else { + $this->dieUsage( "Provided page does not exist.", 'notarget' ); + } + } elseif ( $status === 'review_page_unreviewable' ) { + if ( is_callable( array( $this, 'dieWithError' ) ) ) { + $this->dieWithError( 'apierror-flaggedrevs-notreviewable', 'notreviewable' ); + } else { + $this->dieUsage( "Provided page is not reviewable.", 'notreviewable' ); + } # Approve-specific failures } elseif ( $form->getAction() === 'approve' ) { if ( $status === 'review_denied' ) { @@ -177,21 +190,6 @@ $this->dieWithError( array( 'apierror-unknownerror-nocode' ), 'unknownerror' ); } else { $this->dieUsageMsg( array( 'unknownerror', '' ) ); - } - } - # Generic failures - } else { - if ( $status === 'review_page_unreviewable' ) { - if ( is_callable( array( $this, 'dieWithError' ) ) ) { - $this->dieWithError( 'apierror-flaggedrevs-notreviewable', 'notreviewable' ); - } else { - $this->dieUsage( "Provided page is not reviewable.", 'notreviewable' ); - } - } elseif ( $status === 'review_page_notexists' ) { - if ( is_callable( array( $this, 'dieWithError' ) ) ) { - $this->dieWithError( 'apierror-flaggedrevs-pagedoesnotexist', 'notarget' ); - } else { - $this->dieUsage( "Provided page does not exist.", 'notarget' ); } } } -- To view, visit https://gerrit.wikimedia.org/r/331212 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I889011deef5686be1fd8bc132a49b75162ed1400 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/FlaggedRevs Gerrit-Branch: master Gerrit-Owner: TTO___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2017-01-08T10:00:01+0000
WikidataBuilder has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331211 ) Change subject: New Wikidata Build - 2017-01-08T10:00:01+ .. New Wikidata Build - 2017-01-08T10:00:01+ Change-Id: I2abd2655ba09eafe16db1052048ce393ec2e1056 --- M composer.lock M extensions/Wikibase/repo/i18n/bn.json M extensions/Wikibase/repo/i18n/es.json M extensions/Wikibase/repo/i18n/lv.json M vendor/composer/installed.json 5 files changed, 14 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/11/331211/1 diff --git a/composer.lock b/composer.lock index 9f72563..9c67fb4 100644 --- a/composer.lock +++ b/composer.lock @@ -1606,12 +1606,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;, -"reference": "52caf646b94f27b82794026d36b800b263fd29eb" +"reference": "25c8d2f7a299078d7cb2cd82700fe3dcb4a85c24" }, "dist": { "type": "zip", -"url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/52caf646b94f27b82794026d36b800b263fd29eb;, -"reference": "52caf646b94f27b82794026d36b800b263fd29eb", +"url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/25c8d2f7a299078d7cb2cd82700fe3dcb4a85c24;, +"reference": "25c8d2f7a299078d7cb2cd82700fe3dcb4a85c24", "shasum": "" }, "require": { @@ -1686,7 +1686,7 @@ "wikibaserepo", "wikidata" ], -"time": "2017-01-07 01:53:11" +"time": "2017-01-07 21:14:26" }, { "name": "wikibase/wikimedia-badges", diff --git a/extensions/Wikibase/repo/i18n/bn.json b/extensions/Wikibase/repo/i18n/bn.json index 5bbe580..4b2f148 100644 --- a/extensions/Wikibase/repo/i18n/bn.json +++ b/extensions/Wikibase/repo/i18n/bn.json @@ -109,6 +109,7 @@ "wikibase-validator-illegal-file-chars": "ফাইলের নামে কোলন বা স্ল্যাশের মত অক্ষর ধারণ করার অনুমতি নেই। \"File:\" লেখার পাশে শুধুমাত্র ফাইলের নাম প্রতিলেপন করুন, ধন্যবাদ।", "wikibase-validator-no-such-media": "[https://commons.wikimedia.org/ উইকিমিডিয়া কমন্সে] \"$1\" ফাইলটির অস্তিত্ব নেই।", "wikibase-validator-not-a-language": "\"$1\" জানা ভাষার কোড নয়।", + "wikibase-item-reference-edit-placeholder": "আইটেমের আইডি লিখুন উদা. Q10", "wikibase-wikibaserepopage-not-itemid": "\"$1\" কোন বৈধ আইটেম আইডি নয়।", "wikibase-wikibaserepopage-invalid-langcode": "ভাষা কোড \"$1\" অজানা। সিস্টেমের জন্য পরিচিত এমন একটি ভাষা কোড ব্যবহার করুন, যেমন \"bn\"।", "wikibase-wikibaserepopage-invalid-id": "সিস্টেমের কাছে আইডি \"$1\" অজানা। দয়া করে একটি বৈধ সত্তার আইডি ব্যবহার করুন।", diff --git a/extensions/Wikibase/repo/i18n/es.json b/extensions/Wikibase/repo/i18n/es.json index 22d3f78..29b961a 100644 --- a/extensions/Wikibase/repo/i18n/es.json +++ b/extensions/Wikibase/repo/i18n/es.json @@ -146,6 +146,8 @@ "wikibase-validator-label-no-entityid": "La etiqueta no debe ser un identificador de entidad válido.", "wikibase-validator-no-such-media": "El archivo \"$1\" no existe en [https://commons.wikimedia.org/ Wikimedia Commons].", "wikibase-validator-not-a-language": "«$1» no es un código de idioma conocido.", + "wikibase-item-reference-edit-invalid-format": "El identificador de elemento introducido tiene un formato no válido", + "wikibase-item-reference-edit-nonexistent-item": "El elemento con este identificador no existe", "wikibase-wikibaserepopage-not-itemid": "\"$1\" no es un identificador de elemento válido.", "wikibase-wikibaserepopage-invalid-langcode": "El código de idioma «$1» es desconocido. Utiliza un código de idioma que el sistema reconozca, como «es».", "wikibase-wikibaserepopage-invalid-id": "El identificador \"$1\" es desconocido para el sistema. Utiliza un identificador de entidad que sea válido.", diff --git a/extensions/Wikibase/repo/i18n/lv.json b/extensions/Wikibase/repo/i18n/lv.json index 935c325..7c67785 100644 --- a/extensions/Wikibase/repo/i18n/lv.json +++ b/extensions/Wikibase/repo/i18n/lv.json @@ -5,7 +5,8 @@ "Papuass", "Edgars2007", "Macofe", - "Nitalynx" + "Nitalynx", + "Silraks" ] }, "wikibase-entity-item": "vienums", @@ -33,6 +34,7 @@ "wikibase-label-edit-placeholder": "ievadiet nosaukumu", "wikibase-description-empty": "Nav apraksta", "wikibase-description-edit-placeholder": "ievadiet aprakstu", + "wikibase-content-language-edit-label": "Valoda:",