[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Rename language codes sr-ec and sr-el to sr-cyrl and sr-latn
Fomafix has uploaded a new change for review. https://gerrit.wikimedia.org/r/323677 Change subject: Rename language codes sr-ec and sr-el to sr-cyrl and sr-latn .. Rename language codes sr-ec and sr-el to sr-cyrl and sr-latn sr-ec and sr-el are not conform to BCP 47. https://tools.ietf.org/html/bcp47 BCP 47 explicit mentions sr-Latn and sr-Cyrl as examples. Bug: T117845 Change-Id: I6f03e3d0f7d745bd9189340fd149f21b7eaddcf0 Depends-On: I75da0af35a2066e7963e50c56c99daf1e07c55e6 --- M Echo.alias.php R i18n/sr-cyrl.json R i18n/sr-latn.json 3 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo refs/changes/77/323677/1 diff --git a/Echo.alias.php b/Echo.alias.php index 22ae8d0..0d29d24 100644 --- a/Echo.alias.php +++ b/Echo.alias.php @@ -217,7 +217,7 @@ ); /** Serbian (Cyrillic script) (српски (ћирилица)) */ -$specialPageAliases['sr-ec'] = array( +$specialPageAliases['sr-cyrl'] = array( 'Notifications' => array( 'Обавештења' ), ); diff --git a/i18n/sr-ec.json b/i18n/sr-cyrl.json similarity index 100% rename from i18n/sr-ec.json rename to i18n/sr-cyrl.json diff --git a/i18n/sr-el.json b/i18n/sr-latn.json similarity index 100% rename from i18n/sr-el.json rename to i18n/sr-latn.json -- To view, visit https://gerrit.wikimedia.org/r/323677 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6f03e3d0f7d745bd9189340fd149f21b7eaddcf0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: master Gerrit-Owner: Fomafix ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Rename language codes sr-ec and sr-el to sr-cyrl and sr-latn
Fomafix has uploaded a new change for review. https://gerrit.wikimedia.org/r/323678 Change subject: Rename language codes sr-ec and sr-el to sr-cyrl and sr-latn .. Rename language codes sr-ec and sr-el to sr-cyrl and sr-latn sr-ec and sr-el are not conform to BCP 47. https://tools.ietf.org/html/bcp47 BCP 47 explicit mentions sr-Latn and sr-Cyrl as examples. Bug: T117845 Change-Id: Idbccb1c369fdb5672756acd48b9749d593441ce9 Depends-On: I75da0af35a2066e7963e50c56c99daf1e07c55e6 --- M frontend/language/FlaggedRevs.alias.php R i18n/api/sr-cyrl.json R i18n/configuredpages/sr-cyrl.json R i18n/configuredpages/sr-latn.json R i18n/flaggedrevs/sr-cyrl.json R i18n/flaggedrevs/sr-latn.json R i18n/pendingchanges/sr-cyrl.json R i18n/pendingchanges/sr-latn.json R i18n/problemchanges/sr-cyrl.json R i18n/problemchanges/sr-latn.json R i18n/qualityoversight/sr-cyrl.json R i18n/qualityoversight/sr-latn.json R i18n/reviewedpages/sr-cyrl.json R i18n/reviewedpages/sr-latn.json R i18n/reviewedversions/sr-cyrl.json R i18n/reviewedversions/sr-latn.json R i18n/revisionreview/sr-cyrl.json R i18n/revisionreview/sr-latn.json R i18n/stabilization/sr-cyrl.json R i18n/stabilization/sr-latn.json R i18n/stablepages/sr-cyrl.json R i18n/stablepages/sr-latn.json R i18n/unreviewedpages/sr-cyrl.json R i18n/unreviewedpages/sr-latn.json R i18n/validationstatistics/sr-cyrl.json R i18n/validationstatistics/sr-latn.json 26 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs refs/changes/78/323678/1 diff --git a/frontend/language/FlaggedRevs.alias.php b/frontend/language/FlaggedRevs.alias.php index 0cef7e7..e751920 100644 --- a/frontend/language/FlaggedRevs.alias.php +++ b/frontend/language/FlaggedRevs.alias.php @@ -733,7 +733,7 @@ ); /** Serbian (Cyrillic script) (српски (ћирилица)) */ -$specialPageAliases['sr-ec'] = array( +$specialPageAliases['sr-cyrl'] = array( 'PendingChanges' => array( 'СтареПрегледанеСтране' ), 'ProblemChanges' => array( 'ПроблематичнеИзмене', 'Проблематичне_измене' ), 'QualityOversight' => array( 'НадгледањеКвалитета' ), @@ -876,4 +876,4 @@ 'ReviewedVersions' => array( '穩定版本' ), 'UnreviewedPages' => array( '未審閱頁面' ), 'ValidationStatistics' => array( '驗證數據' ), -); \ No newline at end of file +); diff --git a/i18n/api/sr-ec.json b/i18n/api/sr-cyrl.json similarity index 100% rename from i18n/api/sr-ec.json rename to i18n/api/sr-cyrl.json diff --git a/i18n/configuredpages/sr-ec.json b/i18n/configuredpages/sr-cyrl.json similarity index 100% rename from i18n/configuredpages/sr-ec.json rename to i18n/configuredpages/sr-cyrl.json diff --git a/i18n/configuredpages/sr-el.json b/i18n/configuredpages/sr-latn.json similarity index 100% rename from i18n/configuredpages/sr-el.json rename to i18n/configuredpages/sr-latn.json diff --git a/i18n/flaggedrevs/sr-ec.json b/i18n/flaggedrevs/sr-cyrl.json similarity index 100% rename from i18n/flaggedrevs/sr-ec.json rename to i18n/flaggedrevs/sr-cyrl.json diff --git a/i18n/flaggedrevs/sr-el.json b/i18n/flaggedrevs/sr-latn.json similarity index 100% rename from i18n/flaggedrevs/sr-el.json rename to i18n/flaggedrevs/sr-latn.json diff --git a/i18n/pendingchanges/sr-ec.json b/i18n/pendingchanges/sr-cyrl.json similarity index 100% rename from i18n/pendingchanges/sr-ec.json rename to i18n/pendingchanges/sr-cyrl.json diff --git a/i18n/pendingchanges/sr-el.json b/i18n/pendingchanges/sr-latn.json similarity index 100% rename from i18n/pendingchanges/sr-el.json rename to i18n/pendingchanges/sr-latn.json diff --git a/i18n/problemchanges/sr-ec.json b/i18n/problemchanges/sr-cyrl.json similarity index 100% rename from i18n/problemchanges/sr-ec.json rename to i18n/problemchanges/sr-cyrl.json diff --git a/i18n/problemchanges/sr-el.json b/i18n/problemchanges/sr-latn.json similarity index 100% rename from i18n/problemchanges/sr-el.json rename to i18n/problemchanges/sr-latn.json diff --git a/i18n/qualityoversight/sr-ec.json b/i18n/qualityoversight/sr-cyrl.json similarity index 100% rename from i18n/qualityoversight/sr-ec.json rename to i18n/qualityoversight/sr-cyrl.json diff --git a/i18n/qualityoversight/sr-el.json b/i18n/qualityoversight/sr-latn.json similarity index 100% rename from i18n/qualityoversight/sr-el.json rename to i18n/qualityoversight/sr-latn.json diff --git a/i18n/reviewedpages/sr-ec.json b/i18n/reviewedpages/sr-cyrl.json similarity index 100% rename from i18n/reviewedpages/sr-ec.json rename to i18n/reviewedpages/sr-cyrl.json diff --git a/i18n/reviewedpages/sr-el.json b/i18n/reviewedpages/sr-latn.json similarity index 100% rename from i18n/reviewedpages/sr-el.json rename to i18n/reviewedpages/sr-latn.json diff --git a/i18n/reviewedversions/sr-ec.json b/i18n/reviewedversions/sr-cyrl.json similarity index 100% rename from i18n/reviewedversions/sr-ec.json rename to i18n/reviewedversions/sr-cyrl.json diff
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Use P31 instead of P2 in one of docs
Ladsgroup has uploaded a new change for review. https://gerrit.wikimedia.org/r/323679 Change subject: Use P31 instead of P2 in one of docs .. Use P31 instead of P2 in one of docs Per user request in: https://www.wikidata.org/wiki/Topic:Tfe99wqxdpjbp0x4 Change-Id: Ie2e5e818c5e2f50a9fb76e93961517fc5ebbeee7 --- M repo/i18n/en.json M repo/includes/Api/GetClaims.php 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/79/323679/1 diff --git a/repo/i18n/en.json b/repo/i18n/en.json index 892919d..eac67a6 100644 --- a/repo/i18n/en.json +++ b/repo/i18n/en.json @@ -448,7 +448,7 @@ "apihelp-wbgetclaims-param-rank": "Optional filter to return only the claims that have the specified rank", "apihelp-wbgetclaims-param-props": "Some parts of the claim are returned optionally. This parameter controls which ones are returned.", "apihelp-wbgetclaims-example-1": "Get claims for item with ID Q42", - "apihelp-wbgetclaims-example-2": "Get claims for item with ID Q42 and property with ID P2", + "apihelp-wbgetclaims-example-2": "Get claims for item with ID Q42 and property with ID P31", "apihelp-wbgetclaims-example-3": "Get claims for item with ID Q42 that are ranked as normal", "apihelp-wbgetclaims-example-4": "Get claim with GUID of Q42$D8404CDA-25E4-4334-AF13-A3290BCD9C0F", "apihelp-wbgetentities-description": "Gets the data for multiple Wikibase entities.", diff --git a/repo/includes/Api/GetClaims.php b/repo/includes/Api/GetClaims.php index dfe42de..85ff89b 100644 --- a/repo/includes/Api/GetClaims.php +++ b/repo/includes/Api/GetClaims.php @@ -213,7 +213,7 @@ return array( "action=wbgetclaims&entity=Q42" => "apihelp-wbgetclaims-example-1", - "action=wbgetclaims&entity=Q42&property=P2" => + "action=wbgetclaims&entity=Q42&property=P31" => "apihelp-wbgetclaims-example-2", "action=wbgetclaims&entity=Q42&rank=normal" => "apihelp-wbgetclaims-example-3", -- To view, visit https://gerrit.wikimedia.org/r/323679 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie2e5e818c5e2f50a9fb76e93961517fc5ebbeee7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Ladsgroup ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Gadgets[master]: Rename language codes sr-ec and sr-el to sr-cyrl and sr-latn
Fomafix has uploaded a new change for review. https://gerrit.wikimedia.org/r/323680 Change subject: Rename language codes sr-ec and sr-el to sr-cyrl and sr-latn .. Rename language codes sr-ec and sr-el to sr-cyrl and sr-latn sr-ec and sr-el are not conform to BCP 47. https://tools.ietf.org/html/bcp47 BCP 47 explicit mentions sr-Latn and sr-Cyrl as examples. Bug: T117845 Change-Id: Ieb4f33ee971b854ade5f38a2539b18373e686385 Depends-On: I75da0af35a2066e7963e50c56c99daf1e07c55e6 --- M Gadgets.alias.php R i18n/sr-cyrl.json R i18n/sr-latn.json 3 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gadgets refs/changes/80/323680/1 diff --git a/Gadgets.alias.php b/Gadgets.alias.php index d6b8d2d..3759276 100644 --- a/Gadgets.alias.php +++ b/Gadgets.alias.php @@ -322,7 +322,7 @@ ); /** Serbian (Cyrillic script) (српски (ћирилица)) */ -$specialPageAliases['sr-ec'] = array( +$specialPageAliases['sr-cyrl'] = array( 'Gadgets' => array( 'Гаџети', 'Геџети' ), ); diff --git a/i18n/sr-ec.json b/i18n/sr-cyrl.json similarity index 100% rename from i18n/sr-ec.json rename to i18n/sr-cyrl.json diff --git a/i18n/sr-el.json b/i18n/sr-latn.json similarity index 100% rename from i18n/sr-el.json rename to i18n/sr-latn.json -- To view, visit https://gerrit.wikimedia.org/r/323680 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb4f33ee971b854ade5f38a2539b18373e686385 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gadgets Gerrit-Branch: master Gerrit-Owner: Fomafix ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LiquidThreads[master]: Rename language codes sr-ec and sr-el to sr-cyrl and sr-latn
Fomafix has uploaded a new change for review. https://gerrit.wikimedia.org/r/323681 Change subject: Rename language codes sr-ec and sr-el to sr-cyrl and sr-latn .. Rename language codes sr-ec and sr-el to sr-cyrl and sr-latn sr-ec and sr-el are not conform to BCP 47. https://tools.ietf.org/html/bcp47 BCP 47 explicit mentions sr-Latn and sr-Cyrl as examples. Bug: T117845 Change-Id: Id9c00b705685983ec4519795870acab29cca5cbd Depends-On: I75da0af35a2066e7963e50c56c99daf1e07c55e6 --- M i18n/LiquidThreads.magic.php M i18n/Lqt.alias.php R i18n/sr-cyrl.json R i18n/sr-latn.json 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LiquidThreads refs/changes/81/323681/1 diff --git a/i18n/LiquidThreads.magic.php b/i18n/LiquidThreads.magic.php index 908c680..d4d75fd 100644 --- a/i18n/LiquidThreads.magic.php +++ b/i18n/LiquidThreads.magic.php @@ -99,7 +99,7 @@ ); /** Serbian (Latin script) (srpski (latinica)) */ -$magicWords['sr-el'] = array( +$magicWords['sr-latn'] = array( 'useliquidthreads' => array( 0, 'UseLiquidThreads' ), 'lqtpagelimit' => array( 0, 'lqtpagelimit' ), ); @@ -120,4 +120,4 @@ $magicWords['zh-hans'] = array( 'useliquidthreads' => array( 0, '使用LiquidThreads' ), 'lqtpagelimit' => array( 0, 'lqt页面限制' ), -); \ No newline at end of file +); diff --git a/i18n/Lqt.alias.php b/i18n/Lqt.alias.php index eaf905c..28eeea7 100644 --- a/i18n/Lqt.alias.php +++ b/i18n/Lqt.alias.php @@ -469,7 +469,7 @@ ); /** Serbian (Cyrillic script) (српски (ћирилица)) */ -$specialPageAliases['sr-ec'] = array( +$specialPageAliases['sr-cyrl'] = array( 'DeleteThread' => array( 'ОбришиТему', 'Обриши_тему' ), 'MoveThread' => array( 'ПреместиТему', 'Премести_тему' ), 'NewMessages' => array( 'НовеПоруке', 'Нове_поруке' ), @@ -574,4 +574,4 @@ 'NewMessages' => array( '新訊息' ), 'SplitThread' => array( '分割討論串' ), 'MergeThread' => array( '合併討論串' ), -); \ No newline at end of file +); diff --git a/i18n/sr-ec.json b/i18n/sr-cyrl.json similarity index 100% rename from i18n/sr-ec.json rename to i18n/sr-cyrl.json diff --git a/i18n/sr-el.json b/i18n/sr-latn.json similarity index 100% rename from i18n/sr-el.json rename to i18n/sr-latn.json -- To view, visit https://gerrit.wikimedia.org/r/323681 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id9c00b705685983ec4519795870acab29cca5cbd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LiquidThreads Gerrit-Branch: master Gerrit-Owner: Fomafix ___ 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 - 2016-11-27T10:00:01+0000
WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323682
Change subject: New Wikidata Build - 2016-11-27T10:00:01+
..
New Wikidata Build - 2016-11-27T10:00:01+
Change-Id: I25eb68b0f222c9f0b02b7579362c8153345d202c
---
M composer.lock
M extensions/ExternalValidation/i18n/pt.json
M extensions/MediaInfo/i18n/pt.json
M extensions/Wikibase/client/includes/Store/Sql/DirectSqlStore.php
M extensions/Wikibase/client/includes/WikibaseClient.php
M extensions/Wikibase/client/tests/phpunit/includes/Api/PageTermsTest.php
M
extensions/Wikibase/client/tests/phpunit/includes/Store/Sql/DirectSqlStoreTest.php
M extensions/Wikibase/lib/i18n/nb.json
M extensions/Wikibase/lib/i18n/sv.json
M extensions/Wikibase/lib/includes/Store/Sql/TermSqlIndex.php
M extensions/Wikibase/lib/includes/TermIndexEntry.php
M
extensions/Wikibase/lib/tests/phpunit/Interactors/TermIndexSearchInteractorTest.php
M extensions/Wikibase/lib/tests/phpunit/NoBadDependencyUsageTest.php
M extensions/Wikibase/lib/tests/phpunit/Store/BufferingTermLookupTest.php
M extensions/Wikibase/lib/tests/phpunit/Store/EntityTermLookupTest.php
M
extensions/Wikibase/lib/tests/phpunit/Store/LanguageFallbackLabelDescriptionLookupTest.php
M extensions/Wikibase/lib/tests/phpunit/Store/Sql/TermSqlIndexTest.php
M extensions/Wikibase/lib/tests/phpunit/Store/TermPropertyLabelResolverTest.php
M extensions/Wikibase/lib/tests/phpunit/TermIndexEntryTest.php
M extensions/Wikibase/repo/i18n/be-tarask.json
M extensions/Wikibase/repo/i18n/eu.json
M extensions/Wikibase/repo/i18n/fr.json
M extensions/Wikibase/repo/i18n/gl.json
M extensions/Wikibase/repo/i18n/he.json
M extensions/Wikibase/repo/i18n/it.json
M extensions/Wikibase/repo/i18n/pt.json
M extensions/Wikibase/repo/i18n/uk.json
M extensions/Wikibase/repo/i18n/zh-hans.json
M extensions/Wikibase/repo/includes/Store/Sql/SqlStore.php
M
extensions/Wikibase/repo/tests/phpunit/includes/LabelDescriptionDuplicateDetectorTest.php
M vendor/composer/installed.json
31 files changed, 337 insertions(+), 244 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/82/323682/1
diff --git a/composer.lock b/composer.lock
index b0772a6..95699ad 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1267,7 +1267,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityExternalValidation";,
-"reference": "10ce1f4549dc3bcaae7ec8cb1af6fc22f535514f"
+"reference": "76a3c709d986ceebda6391dc1be38cf915d5e8a9"
},
"require": {
"data-values/common": ">=0.1 <0.4",
@@ -1319,7 +1319,7 @@
"support": {
"issues":
"https://phabricator.wikimedia.org/project/profile/1203/";
},
-"time": "2016-11-21 15:55:42"
+"time": "2016-11-25 21:56:38"
},
{
"name": "wikibase/internal-serialization",
@@ -1436,7 +1436,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseMediaInfo";,
-"reference": "90b82546ca3971d79fa24b21a641747cb82ec469"
+"reference": "467cbdc87e6e25db5a7cee8a43e8a53ef6bb36db"
},
"require": {
"php": ">=5.5.0",
@@ -1482,7 +1482,7 @@
"issues": "https://phabricator.wikimedia.org/";,
"irc": "irc://irc.freenode.net/wikidata"
},
-"time": "2016-10-25 12:33:42"
+"time": "2016-11-25 21:56:28"
},
{
"name": "wikibase/quality",
@@ -1585,12 +1585,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "bec3312b78e3fac35c01486875ae3c78c468d1d5"
+"reference": "3469b1112cbb0a2fcc8f64a79b035b7394a77aec"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/bec3312b78e3fac35c01486875ae3c78c468d1d5";,
-"reference": "bec3312b78e3fac35c01486875ae3c78c468d1d5",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/3469b1112cbb0a2fcc8f64a79b035b7394a77aec";,
+"reference": "3469b1112cbb0a2fcc8f64a79b035b7394a77aec",
"shasum": ""
},
"require": {
@@ -1664,7 +1664,7 @@
"wikibaserepo",
"wikidata"
],
-"time": "2016-11-25 08:08:36"
+"time": "2016-11-25 21:56:03"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Exte
[MediaWiki-commits] [Gerrit] mediawiki...ParserFunctions[master]: Rename language codes sr-ec and sr-el to sr-cyrl and sr-latn
Fomafix has uploaded a new change for review. https://gerrit.wikimedia.org/r/323683 Change subject: Rename language codes sr-ec and sr-el to sr-cyrl and sr-latn .. Rename language codes sr-ec and sr-el to sr-cyrl and sr-latn sr-ec and sr-el are not conform to BCP 47. https://tools.ietf.org/html/bcp47 BCP 47 explicit mentions sr-Latn and sr-Cyrl as examples. Bug: T117845 Change-Id: I2746b7986cda454affbc17f467fef233ecd4bf51 Depends-On: I75da0af35a2066e7963e50c56c99daf1e07c55e6 --- M ParserFunctions.i18n.magic.php R i18n/sr-cyrl.json R i18n/sr-latn.json 3 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ParserFunctions refs/changes/83/323683/1 diff --git a/ParserFunctions.i18n.magic.php b/ParserFunctions.i18n.magic.php index 96ccca4..13965cf 100644 --- a/ParserFunctions.i18n.magic.php +++ b/ParserFunctions.i18n.magic.php @@ -595,7 +595,7 @@ ); /** Serbian (Cyrillic script) (српски (ћирилица)) */ -$magicWords['sr-ec'] = array( +$magicWords['sr-cyrl'] = array( 'default' => array( 0, '#подразумевано' ), 'time' => array( 0, 'време' ), 'pos' => array( 0, 'поз' ), @@ -755,4 +755,4 @@ 'len' => array( 0, '長度' ), 'count' => array( 0, '計算' ), 'urldecode' => array( 0, 'URI解碼' ), -); \ No newline at end of file +); diff --git a/i18n/sr-ec.json b/i18n/sr-cyrl.json similarity index 100% rename from i18n/sr-ec.json rename to i18n/sr-cyrl.json diff --git a/i18n/sr-el.json b/i18n/sr-latn.json similarity index 100% rename from i18n/sr-el.json rename to i18n/sr-latn.json -- To view, visit https://gerrit.wikimedia.org/r/323683 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2746b7986cda454affbc17f467fef233ecd4bf51 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ParserFunctions Gerrit-Branch: master Gerrit-Owner: Fomafix ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Thanks[master]: Rename language codes sr-ec and sr-el to sr-cyrl and sr-latn
Fomafix has uploaded a new change for review. https://gerrit.wikimedia.org/r/323684 Change subject: Rename language codes sr-ec and sr-el to sr-cyrl and sr-latn .. Rename language codes sr-ec and sr-el to sr-cyrl and sr-latn sr-ec and sr-el are not conform to BCP 47. https://tools.ietf.org/html/bcp47 BCP 47 explicit mentions sr-Latn and sr-Cyrl as examples. Bug: T117845 Change-Id: I4e7ad4807f1dce266be59e330be912228c791b41 Depends-On: I75da0af35a2066e7963e50c56c99daf1e07c55e6 --- M Thanks.alias.php R i18n/sr-cyrl.json R i18n/sr-latn.json 3 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Thanks refs/changes/84/323684/1 diff --git a/Thanks.alias.php b/Thanks.alias.php index aadca2e..e1d2f63 100644 --- a/Thanks.alias.php +++ b/Thanks.alias.php @@ -145,7 +145,7 @@ ); /** Serbian (Cyrillic script) (српски (ћирилица)) */ -$specialPageAliases['sr-ec'] = array( +$specialPageAliases['sr-cyrl'] = array( 'Thanks' => array( 'Хвала' ), ); @@ -172,4 +172,4 @@ /** Traditional Chinese (中文（繁體）) */ $specialPageAliases['zh-hant'] = array( 'Thanks' => array( '感謝' ), -); \ No newline at end of file +); diff --git a/i18n/sr-ec.json b/i18n/sr-cyrl.json similarity index 100% rename from i18n/sr-ec.json rename to i18n/sr-cyrl.json diff --git a/i18n/sr-el.json b/i18n/sr-latn.json similarity index 100% rename from i18n/sr-el.json rename to i18n/sr-latn.json -- To view, visit https://gerrit.wikimedia.org/r/323684 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e7ad4807f1dce266be59e330be912228c791b41 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Thanks Gerrit-Branch: master Gerrit-Owner: Fomafix ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/compat[refs/meta/config]: Edit Project Config
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/323685 Change subject: Edit Project Config .. Edit Project Config Change-Id: Ic58750c15acee950ec390739844a037acbdb76f2 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat refs/changes/85/323685/1 -- To view, visit https://gerrit.wikimedia.org/r/323685 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic58750c15acee950ec390739844a037acbdb76f2 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: refs/meta/config Gerrit-Owner: Xqt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [bugfix] Fix purgepages() result
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/323686 Change subject: [bugfix] Fix purgepages() result .. [bugfix] Fix purgepages() result linkupdates are only done if the value of the key argument is True or None. Check for the value first. Test added. Bug: T151712 Change-Id: I9367ddf02c782694947c1f452a515cea8971819f --- M pywikibot/site.py M tests/page_tests.py 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/86/323686/1 diff --git a/pywikibot/site.py b/pywikibot/site.py index 4e8b6e1..413ac87 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -5759,7 +5759,7 @@ for arg in kwargs: if arg in linkupdate_args + ['redirects', 'converttitles']: req[arg] = kwargs[arg] -if arg in linkupdate_args: +if arg in linkupdate_args and kwargs[arg]: linkupdate = True result = req.submit() if 'purge' not in result: diff --git a/tests/page_tests.py b/tests/page_tests.py index ea2d7da..ebb9a38 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -844,6 +844,7 @@ """Test purging the mainpage.""" mainpage = self.get_mainpage() self.assertIsInstance(mainpage.purge(), bool) +self.assertEqual(mainpage.purge(), mainpage.purge(forcelinkupdate=None)) def test_watch(self): """Test Page.watch, with and without unwatch enabled.""" -- To view, visit https://gerrit.wikimedia.org/r/323686 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9367ddf02c782694947c1f452a515cea8971819f Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: $linktrail for Bengali (bn)
MarcoAurelio has uploaded a new change for review. https://gerrit.wikimedia.org/r/323687 Change subject: $linktrail for Bengali (bn) .. $linktrail for Bengali (bn) Bug: T15 Change-Id: I3723a10022de0c53a99d7275390e86a2c66c862c --- M languages/messages/MessagesBn.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/87/323687/1 diff --git a/languages/messages/MessagesBn.php b/languages/messages/MessagesBn.php index 59b4f65..3840b92 100644 --- a/languages/messages/MessagesBn.php +++ b/languages/messages/MessagesBn.php @@ -171,3 +171,5 @@ 'Whatlinkshere' => [ 'সংযোগকারী_পৃষ্ঠাসমূহ' ], 'Withoutinterwiki' => [ 'আন্তঃউইকিহীন' ], ]; + +$linkTrail = '/^([অআইঈউঊঋএঐওঔকখগঘঙচছজঝঞটঠডঢণতথদধনপফবভমযরলশষসহড়ঢ়য়ৎংঃঁািীুূৃেৈোৌৰৱ]+)(.*)$/sD'; -- To view, visit https://gerrit.wikimedia.org/r/323687 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3723a10022de0c53a99d7275390e86a2c66c862c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: MarcoAurelio ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ConfirmAccount[REL1_26]: Fix permission denied
Seb35 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323688
Change subject: Fix permission denied
..
Fix permission denied
Related to talk page https://www.mediawiki.org/wiki/Topic:Sf6zgc7plebtit4v
Bug: T121119
Change-Id: Ib5964951982474779077909b3c1305422b4b1d73
(cherry picked from commit 213beeec5241a93f859022e2aa4f7788583cc347)
---
M ConfirmAccount.config.php
M ConfirmAccount.php
2 files changed, 16 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmAccount
refs/changes/88/323688/1
diff --git a/ConfirmAccount.config.php b/ConfirmAccount.config.php
index 350b766..86b51e2 100644
--- a/ConfirmAccount.config.php
+++ b/ConfirmAccount.config.php
@@ -81,8 +81,9 @@
$wgConfirmAccountFSRepos = array(
'accountreqs' => array( # Location of attached files for pending
requests
'name' => 'accountreqs',
- 'directory' => isset( $wgFileStore['accountreqs'] ) ?
- $wgFileStore['accountreqs']['directory'] :
$wgUploadDirectory . "/accountreqs",
+ 'directory' => isset( $wgFileStore['accountreqs'] )
+ ? $wgFileStore['accountreqs']['directory']
+ : false,
'url'=> isset( $wgFileStore['accountreqs'] ) ?
$wgFileStore['accountreqs']['url'] : null,
'hashLevels' => isset( $wgFileStore['accountreqs'] ) ?
@@ -90,8 +91,9 @@
),
'accountcreds' => array( # Location of credential files
'name' => 'accountcreds',
- 'directory' => isset( $wgFileStore['accountcreds'] ) ?
- $wgFileStore['accountcreds']['directory'] :
$wgUploadDirectory . "/accountcreds",
+ 'directory' => isset( $wgFileStore['accountcreds'] )
+ ? $wgFileStore['accountcreds']['directory']
+ : false,
'url'=> isset( $wgFileStore['accountcreds'] ) ?
$wgFileStore['accountcreds']['url'] : null,
'hashLevels' => isset( $wgFileStore['accountcreds'] ) ?
diff --git a/ConfirmAccount.php b/ConfirmAccount.php
index 803570b..5687e57 100644
--- a/ConfirmAccount.php
+++ b/ConfirmAccount.php
@@ -71,11 +71,20 @@
* @return void
*/
function efLoadConfirmAccount() {
- global $wgEnableEmail;
+ global $wgEnableEmail, $wgConfirmAccountFSRepos, $wgUploadDirectory;
# This extension needs email enabled!
# Otherwise users can't get their passwords...
if ( !$wgEnableEmail ) {
echo "ConfirmAccount extension requires \$wgEnableEmail set to
true.\n";
exit( 1 ) ;
}
+
+ if ( $wgConfirmAccountFSRepos['accountreqs']['directory'] === false ) {
+ $wgConfirmAccountFSRepos['accountreqs']['directory'] =
+ $wgUploadDirectory . "/accountreqs";
+ }
+ if ( $wgConfirmAccountFSRepos['accountcreds']['directory'] === false ) {
+ $wgConfirmAccountFSRepos['accountcreds']['directory'] =
+ $wgUploadDirectory . "/accountcreds";
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/323688
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5964951982474779077909b3c1305422b4b1d73
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmAccount
Gerrit-Branch: REL1_26
Gerrit-Owner: Seb35
Gerrit-Reviewer: Paladox
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [bugfix] Fix purgepages() result
jenkins-bot has submitted this change and it was merged. Change subject: [bugfix] Fix purgepages() result .. [bugfix] Fix purgepages() result linkupdates are only done if the value of the key argument is True or None. Check for the value first. Test added. Bug: T151712 Change-Id: I9367ddf02c782694947c1f452a515cea8971819f --- M pywikibot/site.py M tests/page_tests.py 2 files changed, 2 insertions(+), 4 deletions(-) Approvals: Magul: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 4e8b6e1..cd6b1d4 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -5754,20 +5754,17 @@ """ req = self._simple_request(action='purge', titles=[page for page in set(pages)]) -linkupdate = False linkupdate_args = ['forcelinkupdate', 'forcerecursivelinkupdate'] for arg in kwargs: if arg in linkupdate_args + ['redirects', 'converttitles']: req[arg] = kwargs[arg] -if arg in linkupdate_args: -linkupdate = True result = req.submit() if 'purge' not in result: pywikibot.error(u'purgepages: Unexpected API response:\n%s' % result) return False result = result['purge'] purged = ['purged' in page for page in result] -if linkupdate: +if any(kwargs.get(arg) for arg in linkupdate_args): purged += ['linkupdate' in page for page in result] return all(purged) diff --git a/tests/page_tests.py b/tests/page_tests.py index ea2d7da..ebb9a38 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -844,6 +844,7 @@ """Test purging the mainpage.""" mainpage = self.get_mainpage() self.assertIsInstance(mainpage.purge(), bool) +self.assertEqual(mainpage.purge(), mainpage.purge(forcelinkupdate=None)) def test_watch(self): """Test Page.watch, with and without unwatch enabled.""" -- To view, visit https://gerrit.wikimedia.org/r/323686 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9367ddf02c782694947c1f452a515cea8971819f Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt Gerrit-Reviewer: Dalba Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Magul Gerrit-Reviewer: Ricordisamoa Gerrit-Reviewer: Xqt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...heritage[master]: Add script to print a ready-made deploy message for SAL
Jean-Frédéric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323689
Change subject: Add script to print a ready-made deploy message for SAL
..
Add script to print a ready-made deploy message for SAL
Every deploy should update the Server Admin Log.
This automates the generation of the log message.
Change-Id: I30d8f0e18be549c10937b7f5bf78fa1a93e5f369
---
M bin/deploy-to-toollabs.sh
A bin/deploy_message_from_git_log.py
2 files changed, 65 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/heritage
refs/changes/89/323689/1
diff --git a/bin/deploy-to-toollabs.sh b/bin/deploy-to-toollabs.sh
index 8d7dcb3..1448304 100755
--- a/bin/deploy-to-toollabs.sh
+++ b/bin/deploy-to-toollabs.sh
@@ -7,6 +7,9 @@
become heritage
cd heritage
git pull
-git log @{1}.. --oneline --reverse -C --no-merges
+git log @{1}.. --oneline --reverse -C --no-merges
echo "Deploy done."
+echo "Please update the Server Admin Log via IRC:"
+echo "https://webchat.freenode.net/?channels=#wikimedia-labs";
+python bin/deploy_message_from_git_log.py `whoami`
ENDSSH
diff --git a/bin/deploy_message_from_git_log.py
b/bin/deploy_message_from_git_log.py
new file mode 100644
index 000..76b4e67
--- /dev/null
+++ b/bin/deploy_message_from_git_log.py
@@ -0,0 +1,61 @@
+"""Parse Git logs of the latest deploy and prepare a SAL message for IRC."""
+
+import argparse
+import re
+import subprocess
+
+
+GIT_COMMIT_FIELDS = ['id', 'message']
+GIT_LOG_FORMAT_FIELDS = ['%h', '%b']
+GIT_LOG_FORMAT = '%x1f'.join(GIT_LOG_FORMAT_FIELDS) + '%x1e'
+GIT_LOG_OPTIONS = '@{1}.. --reverse -C --no-merges'
+
+
+def get_git_log():
+"""Run git log on the Shell and parse the output."""
+command = 'git log %s --format="%s"' % (GIT_LOG_OPTIONS, GIT_LOG_FORMAT)
+process = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE)
+(log, _) = process.communicate()
+log = log.strip('\n\x1e').split("\x1e")
+log = [row.strip().split("\x1f") for row in log]
+log = [dict(zip(GIT_COMMIT_FIELDS, row)) for row in log]
+return log
+
+
+def update_with_task_name(log_entry):
+"""Update the current log-entry with the mentionned task names (if
exists)."""
+tasks = search_for_tasks(log_entry['message'])
+log_entry['tasks'] = tasks
+return log_entry
+
+
+def search_for_tasks(message):
+"""Return all task IDs mentionned in the message."""
+return re.findall(r'(T\d+)', message)
+
+
+def format_entry(log_entry):
+"""Format a git log entry to our deploy message format."""
+if log_entry['tasks']:
+return '%s (%s)' % (log_entry['id'], ', '.join(log_entry['tasks']))
+else:
+return log_entry['id']
+
+
+def format_update_for_irc(project, structured_log):
+"""Return a post-deploy message for IRC from the structured log."""
+commits = ', '.join([format_entry(x) for x in structured_log])
+return '!log %s Deploy latest from Git master: %s' % (project, commits)
+
+
+def main():
+parser = argparse.ArgumentParser()
+parser.add_argument("project")
+args = parser.parse_args()
+log = get_git_log()
+augmented_log = [update_with_task_name(x) for x in log]
+print format_update_for_irc(args.project, augmented_log)
+
+
+if __name__ == '__main__':
+main()
--
To view, visit https://gerrit.wikimedia.org/r/323689
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30d8f0e18be549c10937b7f5bf78fa1a93e5f369
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Jean-Frédéric
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [bugfix] Show deprecated options warning
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323691
Change subject: [bugfix] Show deprecated options warning
..
[bugfix] Show deprecated options warning
- issue_deprecation_warning doesn't show the deprecated warning by default
when DeprecationWarning class is used. We have to use
ArgumentDeprecationWarning class instead.
- import issue_deprecation_warning to reuse it.
- When an option is deprecated or renamed the new one should be shown but
deprecated or renamed options should be omitted in the help doc. Whe have
issue_deprecation_warning to show the warning if necessary.
Change-Id: I68fcb0d671d1a6ae2f5969b38aeaec3c91fdc605
---
M scripts/checkimages.py
1 file changed, 6 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/91/323691/1
diff --git a/scripts/checkimages.py b/scripts/checkimages.py
index 8fc472b..9f98c85 100755
--- a/scripts/checkimages.py
+++ b/scripts/checkimages.py
@@ -25,9 +25,6 @@
-duplicatesreport Report the duplicates in a log *AND* put the template in
the images.
--duplicatereportThe -duplicatereport option is deprecated. Use
--duplicatesreport instead.
-
-sendemail Send an email after tagging.
-break To break the bot after the first check (default: recursive)
@@ -104,7 +101,7 @@
from pywikibot.exceptions import NotEmailableError
from pywikibot.family import Family
-from pywikibot.tools import deprecated, StringTypes
+from pywikibot.tools import deprecated, issue_deprecation_warning, StringTypes
###
# <--- Change only below! --->#
@@ -1614,7 +1611,8 @@
if arg.startswith('-sleep'):
length = len('-sleep')
else:
-pywikibot.tools.issue_deprecation_warning('-time', '-sleep', 2)
+issue_deprecation_warning('-time', '-sleep', 2,
+ ArgumentDeprecationWarning)
length = len('-time')
if len(arg) == length:
time_sleep = int(pywikibot.input(
@@ -1629,9 +1627,9 @@
commonsActive = True
elif arg == '-duplicatesreport' or arg == '-duplicatereport':
if arg == '-duplicatereport':
-pywikibot.tools.issue_deprecation_warning('-duplicatereport',
- '-duplicatesreport',
- 2)
+issue_deprecation_warning('-duplicatereport',
+ '-duplicatesreport',
+ 2, ArgumentDeprecationWarning)
duplicatesReport = True
elif arg.startswith('-duplicates'):
duplicatesActive = True
--
To view, visit https://gerrit.wikimedia.org/r/323691
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I68fcb0d671d1a6ae2f5969b38aeaec3c91fdc605
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...heritage[master]: Fix Flake8 violation E305 and pin flake8 dependency
Jean-Frédéric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323692
Change subject: Fix Flake8 violation E305 and pin flake8 dependency
..
Fix Flake8 violation E305 and pin flake8 dependency
Latest flake8 upgrade (3.2.1) included a pydocstyle upgrade
which modified the behaviour of violation E305,
'expected 2 blank lines after class or function definition, found 1'
This fixes the violations and pins flake8 to the current version.
Change-Id: Icd96413e4c1fe6efc6c78936b5a9908dcf2cbddf
---
M erfgoedbot/add_object_location_monuments.py
M erfgoedbot/categorize_images.py
M erfgoedbot/database_statistics.py
M erfgoedbot/monument_tables.py
M erfgoedbot/top_streets.py
M erfgoedbot/update_id_dump.py
M tox.ini
7 files changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/heritage
refs/changes/92/323692/1
diff --git a/erfgoedbot/add_object_location_monuments.py
b/erfgoedbot/add_object_location_monuments.py
index 99c790b..b61d421 100644
--- a/erfgoedbot/add_object_location_monuments.py
+++ b/erfgoedbot/add_object_location_monuments.py
@@ -234,6 +234,7 @@
locateCountry(
countrycode, lang, countryconfig, conn, cursor, conn2,
cursor2)
+
if __name__ == "__main__":
try:
main()
diff --git a/erfgoedbot/categorize_images.py b/erfgoedbot/categorize_images.py
index 8700c68..486ea17 100644
--- a/erfgoedbot/categorize_images.py
+++ b/erfgoedbot/categorize_images.py
@@ -533,5 +533,6 @@
outputStatistics(statistics)
+
if __name__ == "__main__":
main()
diff --git a/erfgoedbot/database_statistics.py
b/erfgoedbot/database_statistics.py
index 5b65931..323cf8e 100755
--- a/erfgoedbot/database_statistics.py
+++ b/erfgoedbot/database_statistics.py
@@ -344,5 +344,6 @@
outputStatistics(statistics)
+
if __name__ == "__main__":
main()
diff --git a/erfgoedbot/monument_tables.py b/erfgoedbot/monument_tables.py
index 693dd12..383064f 100755
--- a/erfgoedbot/monument_tables.py
+++ b/erfgoedbot/monument_tables.py
@@ -79,6 +79,7 @@
for (countrycode, lang), countryconfig in mconfig.countries.iteritems():
processCountry(countrycode, lang, countryconfig)
+
if __name__ == "__main__":
try:
main()
diff --git a/erfgoedbot/top_streets.py b/erfgoedbot/top_streets.py
index 815f454..c9d9452 100644
--- a/erfgoedbot/top_streets.py
+++ b/erfgoedbot/top_streets.py
@@ -105,6 +105,7 @@
else:
print u'Usage'
+
if __name__ == "__main__":
try:
main()
diff --git a/erfgoedbot/update_id_dump.py b/erfgoedbot/update_id_dump.py
index e77ba2b..f6f16f5 100755
--- a/erfgoedbot/update_id_dump.py
+++ b/erfgoedbot/update_id_dump.py
@@ -148,6 +148,7 @@
u'Working on countrycode "%s" in language "%s"' %
(countrycode, lang))
processCountry(countrycode, lang, countryconfig, conn, cursor)
+
if __name__ == "__main__":
try:
main()
diff --git a/tox.ini b/tox.ini
index 9a1e648..e682acd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@
commands = nosetests {posargs}
[testenv:flake8]
-deps = flake8
+deps = flake8==3.2.1
commands = flake8
[testenv:yaml]
--
To view, visit https://gerrit.wikimedia.org/r/323692
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd96413e4c1fe6efc6c78936b5a9908dcf2cbddf
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Jean-Frédéric
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: There is no need for opening or checking
Gauravbackback has uploaded a new change for review. https://gerrit.wikimedia.org/r/323693 Change subject: There is no need for opening or checking .. There is no need for opening or checking I have been having problem with git for a few days thats why I am checking it Change-Id: I87c6ddd0cee6015b5e1b211fb7f155041854708a --- A testing 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/93/323693/1 diff --git a/testing b/testing new file mode 100644 index 000..62ebb3e --- /dev/null +++ b/testing @@ -0,0 +1 @@ +No need for opening its just for testin as i have been having problem with git for a few days -- To view, visit https://gerrit.wikimedia.org/r/323693 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I87c6ddd0cee6015b5e1b211fb7f155041854708a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Gauravbackback ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Add Siberian Tatar language, sty
jenkins-bot has submitted this change and it was merged. Change subject: Add Siberian Tatar language, sty .. Add Siberian Tatar language, sty There is an incubator in this language at https://incubator.wikimedia.org/wiki/Wp/sty And they asked to translate. Change-Id: I732d1fad8220325b4f752602e327e04abaa0e338 --- M LanguageSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/LanguageSettings.php b/LanguageSettings.php index ba6f4ea..ebdf897 100644 --- a/LanguageSettings.php +++ b/LanguageSettings.php @@ -80,6 +80,7 @@ $wgExtraLanguageNames['sly'] = 'Bahasa Selayar'; # A Selayar / Siebrand 2012-01-09 $wgExtraLanguageNames['smj'] = 'julevsámegiella'; # Lule Saami / Nikerabbit 2016-06-22 $wgExtraLanguageNames['smn'] = 'anarâškielâ'; # Inari Saami / Siebrand 2014-10-06 +$wgExtraLanguageNames['sty'] = 'Себертатар'; # Siberian Tatar / Amir 2016-11-26 $wgExtraLanguageNames['swb'] = 'Shikomoro'; # Comorian $wgExtraLanguageNames['sxu'] = 'Säggssch'; # Upper Saxon $wgExtraLanguageNames['test'] = 'Test (site admin only)'; # Test -- To view, visit https://gerrit.wikimedia.org/r/323665 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I732d1fad8220325b4f752602e327e04abaa0e338 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Amire80 Gerrit-Reviewer: Raimond Spekking 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]: Initial configuration for fi.wikivoyage.org
MarcoAurelio has uploaded a new change for review. https://gerrit.wikimedia.org/r/323695 Change subject: Initial configuration for fi.wikivoyage.org .. Initial configuration for fi.wikivoyage.org Lang code... fi Shard... s3 Site name... Wikimatkat Meta namespace...Wikimatkat Talk namespace.. Keskustelu Wikimatkoista Logo https://commons.wikimedia.org/wiki/File:Wikivoyage-Logo-fi.svg Timezone Europe/Helsinki Uploads. Through Wikimedia Commons Features Flow, Visual Editor and Wikidata support Logo is being defined in different patch set as per T151571 Bug: T151570 Change-Id: I68a354b43b92f3eea1c8419ddbdd49f6128c0892 --- M dblists/all.dblist M dblists/commonsuploads.dblist M dblists/flow.dblist M dblists/s3.dblist M dblists/securepollglobal.dblist M dblists/small.dblist M dblists/wikidataclient.dblist M dblists/wikivoyage.dblist M wikiversions.json M wmf-config/InitialiseSettings.php 10 files changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/95/323695/1 diff --git a/dblists/all.dblist b/dblists/all.dblist index 4d930fa..a28ed98 100644 --- a/dblists/all.dblist +++ b/dblists/all.dblist @@ -248,6 +248,7 @@ fiwikiquote fiwikisource fiwikiversity +fiwikivoyage fiwiktionary fjwiki fjwiktionary diff --git a/dblists/commonsuploads.dblist b/dblists/commonsuploads.dblist index a5afef0..ada0b3d 100644 --- a/dblists/commonsuploads.dblist +++ b/dblists/commonsuploads.dblist @@ -136,6 +136,7 @@ fiwikibooks fiwikiquote fiwikiversity +fiwikivoyage fiwiktionary fjwiki fjwiktionary diff --git a/dblists/flow.dblist b/dblists/flow.dblist index 64dbb4f..884dbbe 100644 --- a/dblists/flow.dblist +++ b/dblists/flow.dblist @@ -228,6 +228,7 @@ fiwikiquote fiwikisource fiwikiversity +fiwikivoyage fiwiktionary fjwiki fjwiktionary diff --git a/dblists/s3.dblist b/dblists/s3.dblist index 4dd258d..15edf52 100644 --- a/dblists/s3.dblist +++ b/dblists/s3.dblist @@ -234,6 +234,7 @@ fiwikiquote fiwikisource fiwikiversity +fiwikivoyage fiwiktionary fjwiki fjwiktionary diff --git a/dblists/securepollglobal.dblist b/dblists/securepollglobal.dblist index 9058b0f..d05c543 100644 --- a/dblists/securepollglobal.dblist +++ b/dblists/securepollglobal.dblist @@ -247,6 +247,7 @@ fiwikiquote fiwikisource fiwikiversity +fiwikivoyage fiwiktionary fjwiki fjwiktionary diff --git a/dblists/small.dblist b/dblists/small.dblist index 9833cd9..3ab715a 100644 --- a/dblists/small.dblist +++ b/dblists/small.dblist @@ -140,6 +140,7 @@ fiwikinews fiwikiquote fiwikiversity +fiwikivoyage fjwiki fowikisource fowiktionary diff --git a/dblists/wikidataclient.dblist b/dblists/wikidataclient.dblist index 4c09ba4..0910257 100644 --- a/dblists/wikidataclient.dblist +++ b/dblists/wikidataclient.dblist @@ -179,6 +179,7 @@ fiwikiquote fiwikisource fiwikiversity +fiwikivoyage fjwiki fowiki fowikisource diff --git a/dblists/wikivoyage.dblist b/dblists/wikivoyage.dblist index b7942e2..53efbaa 100644 --- a/dblists/wikivoyage.dblist +++ b/dblists/wikivoyage.dblist @@ -3,6 +3,7 @@ enwikivoyage eswikivoyage fawikivoyage +fiwikivoyage frwikivoyage hewikivoyage itwikivoyage diff --git a/wikiversions.json b/wikiversions.json index 5abc2fc..f4b48c7 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -249,6 +249,7 @@ "fiwikiquote": "php-1.29.0-wmf.3", "fiwikisource": "php-1.29.0-wmf.3", "fiwikiversity": "php-1.29.0-wmf.3", +"fiwikivoyage": "php-1.29.0-wmf.3", "fiwiktionary": "php-1.29.0-wmf.3", "fjwiki": "php-1.29.0-wmf.3", "fjwiktionary": "php-1.29.0-wmf.3", diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 523dde3..fce7747 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -296,6 +296,7 @@ 'fawikinews' => 'Asia/Tehran', 'fiwiki' => 'Europe/Helsinki', 'fiwikimedia' => 'Europe/Helsinki', + 'fiwikivoyage' => 'Europe/Helsinki', // T151570 'frrwiki' => 'Europe/Berlin', 'frwiki' => 'Europe/Paris', 'frwikibooks' => 'Europe/Paris', @@ -1047,6 +1048,7 @@ // Wikivoyage 'elwikivoyage' => '/static/images/project-logos/elwikivoyage.png', 'fawikivoyage' => '/static/images/project-logos/fawikivoyage.png', // T73382 + 'fiwikivoyage' => '/static/images/project-logos/fiwikivoyage.png', // T151570 'hewikivoyage' => '/static/images/project-logos/hewikivoyage.png', 'plwikivoyage' => '/static/images/project-logos/plwikivoyage.png', 'ukwikivoyage' => '/static/images/project-logos/ukwikivoyage.png', // T110370 @@ -1192,12 +1194,14 @@ 'viwikisource' => [ '1.5x' => '/static/images/project-logos/viwikisource-1.5x.png', '2x' => '/static/images/project-logos/viwikisource-2x.png' ], # Wikivoyage - 'viwikivoyage' => [
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fallback Livvi-Karelian (olo) to Finnish (fi)
jenkins-bot has submitted this change and it was merged. Change subject: Fallback Livvi-Karelian (olo) to Finnish (fi) .. Fallback Livvi-Karelian (olo) to Finnish (fi) Bug: T146744 Change-Id: I413425b9389307e3ec4e9a45cc8946d82ed9bdbd --- M languages/messages/MessagesOlo.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified Nemo bis: Looks good to me, but someone else must approve diff --git a/languages/messages/MessagesOlo.php b/languages/messages/MessagesOlo.php index 14f5b6f..63c1e80 100644 --- a/languages/messages/MessagesOlo.php +++ b/languages/messages/MessagesOlo.php @@ -8,7 +8,7 @@ * */ -$fallback = 'ru'; +$fallback = 'fi'; // T146744#2678472 $namespaceNames = [ NS_MEDIA=> 'Medii', -- To view, visit https://gerrit.wikimedia.org/r/313576 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I413425b9389307e3ec4e9a45cc8946d82ed9bdbd Gerrit-PatchSet: 8 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: MarcoAurelio Gerrit-Reviewer: MarcoAurelio Gerrit-Reviewer: Nemo bis Gerrit-Reviewer: Paladox Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: Reedy 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]: [logo] Add logo to Wikivoyage Finnish
Urbanecm has uploaded a new change for review. https://gerrit.wikimedia.org/r/323697 Change subject: [logo] Add logo to Wikivoyage Finnish .. [logo] Add logo to Wikivoyage Finnish Bug: T151571 Change-Id: I23e7435de220845faf55833e4d400bb443f88b9f --- A static/images/project-logos/fiwikivoyage-1.5x.png A static/images/project-logos/fiwikivoyage-2x.png A static/images/project-logos/fiwikivoyage.png M wmf-config/InitialiseSettings.php 4 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/97/323697/1 diff --git a/static/images/project-logos/fiwikivoyage-1.5x.png b/static/images/project-logos/fiwikivoyage-1.5x.png new file mode 100644 index 000..f9f53a2 --- /dev/null +++ b/static/images/project-logos/fiwikivoyage-1.5x.png Binary files differ diff --git a/static/images/project-logos/fiwikivoyage-2x.png b/static/images/project-logos/fiwikivoyage-2x.png new file mode 100644 index 000..fb74daa --- /dev/null +++ b/static/images/project-logos/fiwikivoyage-2x.png Binary files differ diff --git a/static/images/project-logos/fiwikivoyage.png b/static/images/project-logos/fiwikivoyage.png new file mode 100644 index 000..ce44f26 --- /dev/null +++ b/static/images/project-logos/fiwikivoyage.png Binary files differ diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 523dde3..eaf35ec 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -1047,6 +1047,7 @@ // Wikivoyage 'elwikivoyage' => '/static/images/project-logos/elwikivoyage.png', 'fawikivoyage' => '/static/images/project-logos/fawikivoyage.png', // T73382 + 'fiwikivoyage' => '/static/images/project-logos/fiwikivoyage.png', // T151571 'hewikivoyage' => '/static/images/project-logos/hewikivoyage.png', 'plwikivoyage' => '/static/images/project-logos/plwikivoyage.png', 'ukwikivoyage' => '/static/images/project-logos/ukwikivoyage.png', // T110370 @@ -1192,6 +1193,7 @@ 'viwikisource' => [ '1.5x' => '/static/images/project-logos/viwikisource-1.5x.png', '2x' => '/static/images/project-logos/viwikisource-2x.png' ], # Wikivoyage + 'fiwikivoyage' => [ '1.5x' => '/static/images/project-logos/fiwikivoyage-1.5x.png', '2x' => '/static/images/project-logos/fiwikivoyage-2x.png' ], // T151571 'viwikivoyage' => [ '1.5x' => '/static/images/project-logos/viwikivoyage-1.5x.png', '2x' => '/static/images/project-logos/viwikivoyage-2x.png' ], # Chapter wikis -- To view, visit https://gerrit.wikimedia.org/r/323697 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I23e7435de220845faf55833e4d400bb443f88b9f 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] operations/puppet[production]: RESTBase configuration for fi.wikivoyage.org
MarcoAurelio has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323696
Change subject: RESTBase configuration for fi.wikivoyage.org
..
RESTBase configuration for fi.wikivoyage.org
Bug: T151570
Change-Id: Ic960389da38a2fdd1753ab2eb42426f15fa12720
---
M modules/restbase/templates/config.yaml.erb
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/323696/2
diff --git a/modules/restbase/templates/config.yaml.erb
b/modules/restbase/templates/config.yaml.erb
index d84e663..78a008b 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -819,6 +819,7 @@
/{domain:es.wikivoyage.org}: *default_project
/{domain:fa.wikivoyage.org}: *default_project
/{domain:fr.wikivoyage.org}: *default_project
+/{domain:fi.wikivoyage.org}: *default_project
/{domain:he.wikivoyage.org}: *default_project
/{domain:it.wikivoyage.org}: *default_project
/{domain:nl.wikivoyage.org}: *default_project
--
To view, visit https://gerrit.wikimedia.org/r/323696
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic960389da38a2fdd1753ab2eb42426f15fa12720
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: MarcoAurelio
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/puppet[production]: Labs configuration for fi.wikivoyage.org
MarcoAurelio has uploaded a new change for review. https://gerrit.wikimedia.org/r/323698 Change subject: Labs configuration for fi.wikivoyage.org .. Labs configuration for fi.wikivoyage.org Bug: T151570 Change-Id: Id5ab24afd97cb2f615fc47e1306a67f52a47a80d --- M modules/role/manifests/labs/dnsrecursor.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/98/323698/2 diff --git a/modules/role/manifests/labs/dnsrecursor.pp b/modules/role/manifests/labs/dnsrecursor.pp index ebbba85..791da38 100644 --- a/modules/role/manifests/labs/dnsrecursor.pp +++ b/modules/role/manifests/labs/dnsrecursor.pp @@ -147,7 +147,7 @@ 'fawikiquote', 'fawikisource', 'fawikivoyage', 'fawiktionary', 'ffwiki', 'fiu_vrowiki', 'fiwikibooks', 'fiwikimedia', 'fiwikinews', 'fiwikiquote', 'fiwikisource', 'fiwikiversity', -'fiwiktionary', 'fjwiki', 'fjwiktionary', 'foundationwiki', +'fiwikivoyage', 'fiwiktionary', 'fjwiki', 'fjwiktionary', 'foundationwiki', 'fowiki', 'fowikisource', 'fowiktionary', 'frpwiki', 'frrwiki', 'frwiki', 'frwikibooks', 'frwikinews', 'frwikiquote', 'frwikisource', 'frwikiversity', -- To view, visit https://gerrit.wikimedia.org/r/323698 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id5ab24afd97cb2f615fc47e1306a67f52a47a80d Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: MarcoAurelio Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics/refinery[master]: Configuration for fi.wikivoyage.org
MarcoAurelio has uploaded a new change for review. https://gerrit.wikimedia.org/r/323699 Change subject: Configuration for fi.wikivoyage.org .. Configuration for fi.wikivoyage.org Bug: T151570 Change-Id: Ic7d67f1a5d5c15ac917b95f5825bc95b42855ec6 --- M static_data/pageview/whitelist/whitelist.tsv 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery refs/changes/99/323699/2 diff --git a/static_data/pageview/whitelist/whitelist.tsv b/static_data/pageview/whitelist/whitelist.tsv index 9d59f51..dbeb39c 100644 --- a/static_data/pageview/whitelist/whitelist.tsv +++ b/static_data/pageview/whitelist/whitelist.tsv @@ -234,6 +234,7 @@ projectfi.wikiquote2015-10-12 00:00:00 projectfi.wikisource 2015-10-12 00:00:00 projectfi.wikiversity 2015-10-12 00:00:00 +projectfi.wikivoyage 2015-10-12 00:00:00 projectfi.wiktionary 2015-10-12 00:00:00 projectfj.wikipedia2015-10-12 00:00:00 projectfj.wiktionary 2015-10-12 00:00:00 -- To view, visit https://gerrit.wikimedia.org/r/323699 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7d67f1a5d5c15ac917b95f5825bc95b42855ec6 Gerrit-PatchSet: 2 Gerrit-Project: analytics/refinery Gerrit-Branch: master Gerrit-Owner: MarcoAurelio ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add Ukrainian and Belarusian as fallback languages for Russian
DixonD has uploaded a new change for review. https://gerrit.wikimedia.org/r/323700 Change subject: Add Ukrainian and Belarusian as fallback languages for Russian .. Add Ukrainian and Belarusian as fallback languages for Russian Bug: T109033 Change-Id: I24aebbde8c6546b72ec2a0f045ecf1ab84a15b4b --- M languages/messages/MessagesRu.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/00/323700/1 diff --git a/languages/messages/MessagesRu.php b/languages/messages/MessagesRu.php index e1af8f3..1c81326 100644 --- a/languages/messages/MessagesRu.php +++ b/languages/messages/MessagesRu.php @@ -102,6 +102,8 @@ * @author გიორგიმელა */ +$fallback = 'be, uk'; + $namespaceNames = [ NS_MEDIA=> 'Медиа', NS_SPECIAL => 'Служебная', -- To view, visit https://gerrit.wikimedia.org/r/323700 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24aebbde8c6546b72ec2a0f045ecf1ab84a15b4b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: DixonD ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: WikimediaMessages configuration for the new fi.wikivoyage.org
MarcoAurelio has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323701
Change subject: WikimediaMessages configuration for the new fi.wikivoyage.org
..
WikimediaMessages configuration for the new fi.wikivoyage.org
Bug: T151570
Change-Id: I247b09d924133fdb992b8796de2e13827f63f213
---
M i18n/wikimediaprojectnames/en.json
M i18n/wikimediaprojectnames/qqq.json
2 files changed, 2 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMessages
refs/changes/01/323701/2
diff --git a/i18n/wikimediaprojectnames/en.json
b/i18n/wikimediaprojectnames/en.json
index 20d267e..be9a80e 100644
--- a/i18n/wikimediaprojectnames/en.json
+++ b/i18n/wikimediaprojectnames/en.json
@@ -222,6 +222,7 @@
"project-localized-name-fiwikiquote": "Finnish Wikiquote",
"project-localized-name-fiwikisource": "Finnish Wikisource",
"project-localized-name-fiwikiversity": "Finnish Wikiversity",
+ "project-localized-name-fiwikivoyage": "Finnish Wikivoyage",
"project-localized-name-fiu_vrowiki": "Võro Wikipedia",
"project-localized-name-fjwiki": "Fijian Wikipedia",
"project-localized-name-fjwiktionary": "Fijian Wiktionary",
diff --git a/i18n/wikimediaprojectnames/qqq.json
b/i18n/wikimediaprojectnames/qqq.json
index 57e957a..da6755a 100644
--- a/i18n/wikimediaprojectnames/qqq.json
+++ b/i18n/wikimediaprojectnames/qqq.json
@@ -231,6 +231,7 @@
"project-localized-name-fiwikiquote":
"{{ProjectNameDocumentation|url=https://fi.wikiquote.org|name=Finnish
Wikiquote|language=fi}}",
"project-localized-name-fiwikisource":
"{{ProjectNameDocumentation|url=https://fi.wikisource.org|name=Finnish
Wikisource|language=fi}}",
"project-localized-name-fiwikiversity":
"{{ProjectNameDocumentation|url=https://fi.wikiversity.org|name=Finnish
Wikiversity|language=fi}}",
+ "project-localized-name-fiwikivoyage":
"{{ProjectNameDocumentation|url=https://fi.wikivoyage.org|name=Finnish
Wikivoyage|language=fi}}",
"project-localized-name-fiu_vrowiki":
"{{ProjectNameDocumentation|url=https://fiu-vro.wikipedia.org|name=Võro
Wikipedia|language=vro}}",
"project-localized-name-fjwiki":
"{{ProjectNameDocumentation|url=https://fj.wikipedia.org|name=Fijian
Wikipedia|language=fj}}",
"project-localized-name-fjwiktionary":
"{{ProjectNameDocumentation|url=https://fj.wiktionary.org|name=Fijian
Wiktionary|language=fj}}",
--
To view, visit https://gerrit.wikimedia.org/r/323701
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I247b09d924133fdb992b8796de2e13827f63f213
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...examples[master]: Modification example php pouet pouet
P.doreau has uploaded a new change for review. https://gerrit.wikimedia.org/r/323702 Change subject: Modification example php pouet pouet .. Modification example php pouet pouet Change-Id: I281f863a95fed0cce87e57d08f568fcfdcd45e43 --- M examples.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/examples refs/changes/02/323702/1 diff --git a/examples.php b/examples.php index 0de55d3..39dd248 100644 --- a/examples.php +++ b/examples.php @@ -5,3 +5,5 @@ require_once __DIR__ . "/DataPages/DataPages.php"; require_once __DIR__ . "/Example/Example.php"; + +Pouet pouet \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/323702 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I281f863a95fed0cce87e57d08f568fcfdcd45e43 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/examples Gerrit-Branch: master Gerrit-Owner: P.doreau ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...examples[master]: Short subject line
P.doreau has uploaded a new change for review. https://gerrit.wikimedia.org/r/323703 Change subject: Short subject line .. Short subject line gdgdflkgjfdk lgjkdjfdklgjkfdjgfkdgjdfjg dsfdsfjdsflkdsjfsdkjfdsklfjlks sdfdsf Bug:CSS1206 Change-Id: Ifbea9243b0176ff45ed125b6ebb411319ab45e45 --- M examples.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/examples refs/changes/03/323703/1 diff --git a/examples.php b/examples.php index 0de55d3..6bc658a 100644 --- a/examples.php +++ b/examples.php @@ -5,3 +5,5 @@ require_once __DIR__ . "/DataPages/DataPages.php"; require_once __DIR__ . "/Example/Example.php"; + +Pouet pouet fdsjkfsjkfhjkdshjkfdshjdf dslkf dklsfjslk \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/323703 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifbea9243b0176ff45ed125b6ebb411319ab45e45 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/examples Gerrit-Branch: master Gerrit-Owner: P.doreau ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [DOC] Keep -help doc beneath 79 chars
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/323704 Change subject: [DOC] Keep -help doc beneath 79 chars .. [DOC] Keep -help doc beneath 79 chars - Help doc must not exceed 80 chars. Otherwise there is an additional line feed printed. Change-Id: Ic8255b49ec52cbb6b271b2669fd030ee44cfdfe3 --- M scripts/archivebot.py M scripts/blockpageschecker.py M scripts/checkimages.py M scripts/coordinate_import.py M scripts/illustrate_wikidata.py M scripts/image.py M scripts/imagecopy_self.py M scripts/imagerecat.py M scripts/imageuncat.py M scripts/interwiki.py M scripts/patrol.py M scripts/redirect.py M scripts/reflinks.py M scripts/template.py M scripts/transferbot.py M scripts/upload.py 16 files changed, 47 insertions(+), 46 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/04/323704/1 diff --git a/scripts/archivebot.py b/scripts/archivebot.py index ea20c78..4e28140 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -34,9 +34,9 @@ Must be a subpage of the current page. Variables are supported. algo specifies the maximum age of a thread. Must be in the form - old() where specifies the age in minutes(m), - hours (h), days (d), weeks(w), months (M) or years (y) - like 24h or 5d. Default is old(24h) + old() where specifies the age in + minutes (m), hours (h), days (d), weeks(w), months (M) or + years (y) like 24h or 5d. Default is old(24h) counter The current value of a counter which could be assigned as variable. Will be actualized by bot. Initial value is 1. maxarchivesize The maximum archive size before incrementing the counter. diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py index e90b0c5..0e9bd35 100755 --- a/scripts/blockpageschecker.py +++ b/scripts/blockpageschecker.py @@ -26,8 +26,8 @@ Furthermore, the following command line parameters are supported: --always Doesn't ask every time if the bot should make the change or not, -do it always. +-always Doesn't ask every time whether the bot should make the change. +Do it always. -show When the bot can't delete the template from the page (wrong regex or something like that) it will ask you if it should show diff --git a/scripts/checkimages.py b/scripts/checkimages.py index 8fc472b..028b7ca 100755 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -63,10 +63,8 @@ right parameter. * Name= Set the name of the block -* Find= Use it to define what search in the text of the image's description, -while - Findonly= search only if the exactly text that you give is in the image's -description. +* Find= search this text in the image's description +* Findonly= search for exactly this text in the image's description * Summary= That's the summary that the bot will use when it will notify the problem. * Head= That's the incipit that the bot will use for the message. diff --git a/scripts/coordinate_import.py b/scripts/coordinate_import.py index ec7a891..aeb9a4a 100755 --- a/scripts/coordinate_import.py +++ b/scripts/coordinate_import.py @@ -11,7 +11,8 @@ This will work on all pages in the category "coordinates not on Wikidata" and will import the coordinates on these pages to Wikidata. -The data from the "GeoData" extension (https://www.mediawiki.org/wiki/Extension:GeoData) +The data from the "GeoData" extension +(https://www.mediawiki.org/wiki/Extension:GeoData) is used so that extension has to be setup properly. You can look at the [[Special:Nearby]] page on your local Wiki to see if it's populated. diff --git a/scripts/illustrate_wikidata.py b/scripts/illustrate_wikidata.py index 7fa88bd..bd257cd 100755 --- a/scripts/illustrate_wikidata.py +++ b/scripts/illustrate_wikidata.py @@ -1,10 +1,11 @@ #!/usr/bin/python # -*- coding: utf-8 -*- """ -Bot to add images to Wikidata items. The image is extracted from the page_props. +Bot to add images to Wikidata items. -For this to be available the PageImages extension -(https://www.mediawiki.org/wiki/Extension:PageImages) needs to be installed +The image is extracted from the page_props. For this to be available the +PageImages extension (https://www.mediawiki.org/wiki/Extension:PageImages) +needs to be installed Usage: diff --git a/scripts/image.py b/scripts/image.py index 9138549..c4f652d 100755 --- a/scripts/image.py +++ b/scripts/image.py @@ -26,8 +26,8 @@ Examples: -The image "FlagrantCopyvio.jpg" is about to be deleted, so let's first remove it -from everything that displays it: +The image "FlagrantCopyvio.jpg" is about to be deleted, so let's first remo
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [DOC] remove deprecated options from -help string
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323705
Change subject: [DOC] remove deprecated options from -help string
..
[DOC] remove deprecated options from -help string
- The local usage of -yesterday and -recentchanges are deprecated.
They should be removed from -help string. Pagegenerators options
are displayed and used instead.
- Remove "to do" remarks from generators which are obsolete.
Keep doc string beneath 80 chars there.
Change-Id: I1bad42fe172bc1e0d7e4bcd850ec6d497df2c896
---
M scripts/imageuncat.py
1 file changed, 3 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/05/323705/1
diff --git a/scripts/imageuncat.py b/scripts/imageuncat.py
index 38cdaf8..97df977 100755
--- a/scripts/imageuncat.py
+++ b/scripts/imageuncat.py
@@ -8,15 +8,6 @@
This script is working on the given site, so if the commons should be handled,
the site commons should be given and not a Wikipedia or similar.
--yesterdayGo through all uploads from yesterday. (Deprecated here,
moved
- to pagegenerators)
-
--recentchangesGo through the changes made from 'offset' minutes with
'duration'
- minutes of timespan. It must be given two arguments as
- '-recentchanges:offset,duration'
-
- Default value of offset is 120, and that of duration is 70
-
¶ms;
"""
#
@@ -1262,8 +1253,6 @@
def uploadedYesterday(site):
"""
Return a pagegenerator containing all the pictures uploaded yesterday.
-
-Should probably copied to somewhere else
"""
today = pywikibot.Timestamp.utcnow()
yesterday = today + timedelta(days=-1)
@@ -1275,10 +1264,10 @@
@deprecated('RecentChangesPageGenerator')
def recentChanges(site=None, delay=0, block=70):
"""
-Return a pagegenerator containing all the images edited in a certain
timespan.
+Return a generator containing all the images edited in a certain timespan.
-The delay is the amount of minutes to wait and the block is the timespan
to return images in.
-Should probably be copied to somewhere else
+The delay is the amount of minutes to wait and the block is the timespan to
+return images in.
"""
rcstart = site.getcurrenttime() + timedelta(minutes=-(delay + block))
rcend = site.getcurrenttime() + timedelta(minutes=-delay)
--
To view, visit https://gerrit.wikimedia.org/r/323705
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bad42fe172bc1e0d7e4bcd850ec6d497df2c896
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: wikitech cloudadmin: remove right that no longer exists
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/323708 Change subject: wikitech cloudadmin: remove right that no longer exists .. wikitech cloudadmin: remove right that no longer exists Change-Id: I2ba14c913f9958e0468edc4b0eff7ecde6bbf844 --- M wmf-config/InitialiseSettings.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/08/323708/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 523dde3..68b84cd 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -8348,7 +8348,6 @@ 'manageproject' => true, 'userrights' => true, 'managednsdomain' => true, - 'manageglobalpuppet' => true, 'accessrestrictedregions' => true, 'editallhiera' => true, ], -- To view, visit https://gerrit.wikimedia.org/r/323708 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ba14c913f9958e0468edc4b0eff7ecde6bbf844 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alex Monk ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...grrrit[master]: Test: Do not merge
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/323709 Change subject: Test: Do not merge .. Test: Do not merge Change-Id: I751d3101357b9f80d2edc799e19bc237d0661235 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit refs/changes/09/323709/1 -- To view, visit https://gerrit.wikimedia.org/r/323709 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I751d3101357b9f80d2edc799e19bc237d0661235 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/grrrit Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Follow-up to e62eca0e9ee1 - fix for other "deferred" query p...
Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323710
Change subject: Follow-up to e62eca0e9ee1 - fix for other "deferred" query
params
..
Follow-up to e62eca0e9ee1 - fix for other "deferred" query params
Change-Id: Iab809d7cd362cb4d75031176fb41890d430c2d8c
---
M CargoSQLQuery.php
M formats/CargoDeferredFormat.php
2 files changed, 8 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo
refs/changes/10/323710/2
diff --git a/CargoSQLQuery.php b/CargoSQLQuery.php
index 0f2e0dc..cf9c45e 100644
--- a/CargoSQLQuery.php
+++ b/CargoSQLQuery.php
@@ -23,6 +23,7 @@
public $mTableSchemas;
public $mFieldDescriptions;
public $mFieldTables;
+ public $mOrigGroupByStr;
public $mGroupByStr;
public $mHavingStr;
public $mOrderByStr;
@@ -53,13 +54,14 @@
// clause can (and often does) include a call to {{PAGENAME}},
// which HTML-encodes certain characters, notably single quotes.
$sqlQuery->mOrigWhereStr = htmlspecialchars_decode( $whereStr,
ENT_QUOTES );
- $sqlQuery->mWhereStr = htmlspecialchars_decode( $whereStr,
ENT_QUOTES );
+ $sqlQuery->mWhereStr = $sqlQuery->mOrigWhereStr;
$sqlQuery->mJoinOnStr = $joinOnStr;
$sqlQuery->setCargoJoinConds( $joinOnStr );
$sqlQuery->setAliasedFieldNames();
$sqlQuery->mTableSchemas = CargoUtils::getTableSchemas(
$sqlQuery->mTableNames );
$sqlQuery->setOrderBy( $orderByStr );
- $sqlQuery->mGroupByStr = $groupByStr;
+ $sqlQuery->mOrigGroupByStr = $groupByStr;
+ $sqlQuery->mGroupByStr = $sqlQuery->mOrigGroupByStr;
$sqlQuery->mHavingStr = $havingStr;
$sqlQuery->setDescriptionsForFields();
$sqlQuery->handleVirtualFields();
diff --git a/formats/CargoDeferredFormat.php b/formats/CargoDeferredFormat.php
index a21c4bf..0208f8c 100644
--- a/formats/CargoDeferredFormat.php
+++ b/formats/CargoDeferredFormat.php
@@ -38,10 +38,10 @@
$queryParams['fields'] = $sqlQuery->mFieldsStr;
}
if ( $sqlQuery->mWhereStr != '' ) {
- $queryParams['where'] = $sqlQuery->mWhereStr;
+ $queryParams['where'] =
$sqlQuery->mOrigWhereStr;
}
if ( $sqlQuery->mGroupByStr != '' ) {
- $queryParams['group by'] =
$sqlQuery->mGroupByStr;
+ $queryParams['group by'] =
$sqlQuery->mOrigGroupByStr;
}
if ( $sqlQuery->mHavingStr != '' ) {
$queryParams['having'] = $sqlQuery->mHavingStr;
@@ -57,8 +57,8 @@
$queryParams['tables'][] =
$sqlQuery->mTablesStr;
$queryParams['join on'][] =
$sqlQuery->mJoinOnStr;
$queryParams['fields'][] =
$sqlQuery->mFieldsStr;
- $queryParams['where'][] = $sqlQuery->mWhereStr;
- $queryParams['group by'][] =
$sqlQuery->mGroupByStr;
+ $queryParams['where'][] =
$sqlQuery->mOrigWhereStr;
+ $queryParams['group by'][] =
$sqlQuery->mOrigGroupByStr;
$queryParams['order by'][] =
$sqlQuery->mOrderByStr;
$queryParams['limit'][] =
$sqlQuery->mQueryLimit;
}
--
To view, visit https://gerrit.wikimedia.org/r/323710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab809d7cd362cb4d75031176fb41890d430c2d8c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren
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...Cargo[master]: Follow-up to e62eca0e9ee1 - fix for other "deferred" query p...
Yaron Koren has submitted this change and it was merged.
Change subject: Follow-up to e62eca0e9ee1 - fix for other "deferred" query
params
..
Follow-up to e62eca0e9ee1 - fix for other "deferred" query params
Change-Id: Iab809d7cd362cb4d75031176fb41890d430c2d8c
---
M CargoSQLQuery.php
M formats/CargoDeferredFormat.php
2 files changed, 8 insertions(+), 6 deletions(-)
Approvals:
Yaron Koren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CargoSQLQuery.php b/CargoSQLQuery.php
index 0f2e0dc..cf9c45e 100644
--- a/CargoSQLQuery.php
+++ b/CargoSQLQuery.php
@@ -23,6 +23,7 @@
public $mTableSchemas;
public $mFieldDescriptions;
public $mFieldTables;
+ public $mOrigGroupByStr;
public $mGroupByStr;
public $mHavingStr;
public $mOrderByStr;
@@ -53,13 +54,14 @@
// clause can (and often does) include a call to {{PAGENAME}},
// which HTML-encodes certain characters, notably single quotes.
$sqlQuery->mOrigWhereStr = htmlspecialchars_decode( $whereStr,
ENT_QUOTES );
- $sqlQuery->mWhereStr = htmlspecialchars_decode( $whereStr,
ENT_QUOTES );
+ $sqlQuery->mWhereStr = $sqlQuery->mOrigWhereStr;
$sqlQuery->mJoinOnStr = $joinOnStr;
$sqlQuery->setCargoJoinConds( $joinOnStr );
$sqlQuery->setAliasedFieldNames();
$sqlQuery->mTableSchemas = CargoUtils::getTableSchemas(
$sqlQuery->mTableNames );
$sqlQuery->setOrderBy( $orderByStr );
- $sqlQuery->mGroupByStr = $groupByStr;
+ $sqlQuery->mOrigGroupByStr = $groupByStr;
+ $sqlQuery->mGroupByStr = $sqlQuery->mOrigGroupByStr;
$sqlQuery->mHavingStr = $havingStr;
$sqlQuery->setDescriptionsForFields();
$sqlQuery->handleVirtualFields();
diff --git a/formats/CargoDeferredFormat.php b/formats/CargoDeferredFormat.php
index a21c4bf..0208f8c 100644
--- a/formats/CargoDeferredFormat.php
+++ b/formats/CargoDeferredFormat.php
@@ -38,10 +38,10 @@
$queryParams['fields'] = $sqlQuery->mFieldsStr;
}
if ( $sqlQuery->mWhereStr != '' ) {
- $queryParams['where'] = $sqlQuery->mWhereStr;
+ $queryParams['where'] =
$sqlQuery->mOrigWhereStr;
}
if ( $sqlQuery->mGroupByStr != '' ) {
- $queryParams['group by'] =
$sqlQuery->mGroupByStr;
+ $queryParams['group by'] =
$sqlQuery->mOrigGroupByStr;
}
if ( $sqlQuery->mHavingStr != '' ) {
$queryParams['having'] = $sqlQuery->mHavingStr;
@@ -57,8 +57,8 @@
$queryParams['tables'][] =
$sqlQuery->mTablesStr;
$queryParams['join on'][] =
$sqlQuery->mJoinOnStr;
$queryParams['fields'][] =
$sqlQuery->mFieldsStr;
- $queryParams['where'][] = $sqlQuery->mWhereStr;
- $queryParams['group by'][] =
$sqlQuery->mGroupByStr;
+ $queryParams['where'][] =
$sqlQuery->mOrigWhereStr;
+ $queryParams['group by'][] =
$sqlQuery->mOrigGroupByStr;
$queryParams['order by'][] =
$sqlQuery->mOrderByStr;
$queryParams['limit'][] =
$sqlQuery->mQueryLimit;
}
--
To view, visit https://gerrit.wikimedia.org/r/323710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab809d7cd362cb4d75031176fb41890d430c2d8c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren
Gerrit-Reviewer: Yaron Koren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...grrrit[master]: Remove hacks, fix logging
MarkTraceur has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323712
Change subject: Remove hacks, fix logging
..
Remove hacks, fix logging
Seriously tired of these hacky things getting in the way.
Change-Id: Ia35ad4e2325dafd8bdffc570abb29d63aafbd2d5
---
M src/relay.js
1 file changed, 66 insertions(+), 53 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit
refs/changes/12/323712/1
diff --git a/src/relay.js b/src/relay.js
index 38997d8..be77a5d 100644
--- a/src/relay.js
+++ b/src/relay.js
@@ -10,8 +10,10 @@
yaml = require('js-yaml'),
logging = require('winston'),
ssh2 = require('ssh2'),
-handle,
+ircUp = false,
+sshUp = false,
sshConn = null,
+savedTo,
// Sane? defaults
config_defaults = {
nick: 'grrrit',
@@ -27,41 +29,60 @@
logging.error(message);
}
+function bothConnected() {
+if ( sshUp && ircUp && savedTo !== undefined ) {
+ircClient.say( savedTo, "Successfully connected to IRC and SSH." );
+savedTo = undefined;
+}
+}
+
+function sshConnected( listener ) {
+sshUp = true;
+
+logging.info('Connected to Gerrit via SSH; requesting stream-events');
+sshConn.exec('gerrit stream-events', function(err, stream) {
+if (err) {
+logging.error(err);
+// TODO won't this log it twice?
+throw err;
+}
+logging.info('Connected to event stream!');
+stream.on('data', function(data) {
+listener(err, JSON.parse(data));
+});
+});
+
+bothConnected();
+}
+
+function ircConnected( to ) {
+ircUp = true;
+savedTo = to;
+
+logging.info( 'Connected to IRC.' );
+
+bothConnected();
+}
+
function subscribeToGerritStream(host, port, username, keypath, listener) {
logging.info('Connecting to gerrit..');
sshConn = ssh2.Client();
sshConn.on('ready', function() {
-logging.info('Connected; requesting stream-events');
-sshConn.exec('gerrit stream-events', function(err, stream) {
-if (err) {
-logging.error(err);
-throw err;
-}
-logging.info('Connected to event stream!');
-stream.on('data', function(data) {
-listener(err, JSON.parse(data));
-});
-});
+sshConnected( listener );
}).on('error', function(err) {
-console.log('Client error: ' + err);
+sshUp = false;
+logging.error('Client error: ' + err);
}).on('close', function() {
-console.log('Client disconnected');
-
-logging.info('re-connecting to irc.');
-
-handle = setInterval(startRelay, 1);
-
-logging.info('re-connected to irc.');
-
-console.log('Client re-connected');
+sshUp = false;
+logging.info('SSH connection to Gerrit closed, reconnecting');
+startRelay();
}).connect({
host: host,
port: port,
username: username,
privateKey: require('fs').readFileSync(keypath),
});
-clearInterval(handle);
}
var allChannels = _.keys(config.channels);
@@ -156,8 +177,9 @@
logging.info("Joined channel " + channel);
}
if(joinedChannels.length === allChannels.length) {
+ircConnected();
ircClient.removeListener('join', waitForChannelJoins);
-logging.info("Joined " + joinedChannels.length + " channels. Starting
relay");
+logging.info("Joined " + joinedChannels.length + " channels.
Connecting to Gerrit via SSH.");
startRelay();
}
}
@@ -171,15 +193,14 @@
if (text.indexOf(ircClient.nick + ': ' + 'restart') === 0) {
if (from_trusted) {
-console.log(from + ' => ' + to + ' ' + text);
+logging.debug(from + ' => ' + to + ' ' + text);
if (sshConn) {
sshConn.end();
-logging.info('re-connecting to gerrit..');
-ircClient.say(to, "Ended SSH connection to Gerrit.");
-} else {
-ircClient.say(to, "No SSH connection to Gerrit.");
+logging.info('Disconnected SSH connection to Gerrit.');
}
+
+ircClient.say(to, "Ended SSH connection to Gerrit.");
} else {
ircClient.say(to, "Permission is denied.");
}
@@ -187,24 +208,19 @@
if (text.indexOf(ircClient.nick + ': ' + 'force-restart') === 0) {
if (from_trusted) {
-console.log(from + ' => ' + to + ' ' + text);
-
-ircClient.say(to, "Re-connecting to Gerrit and IRC.");
-
-logging.info('Disconnecting from IRC.');
-
-ircClient.send('QUIT', "quit");
+
[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Fix for selecting strings literals as fields
Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323711
Change subject: Fix for selecting strings literals as fields
..
Fix for selecting strings literals as fields
Change-Id: Ifcff132d93c40aa1d768eab9daa379603165e007
---
M CargoSQLQuery.php
M CargoUtils.php
2 files changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo
refs/changes/11/323711/2
diff --git a/CargoSQLQuery.php b/CargoSQLQuery.php
index cf9c45e..db64e4a 100644
--- a/CargoSQLQuery.php
+++ b/CargoSQLQuery.php
@@ -1139,7 +1139,8 @@
// If it's really a field name, add quotes around it.
// (The quotes are mostly needed for Postgres, which
// lowercases all unquoted fields.)
- if ( strpos( $fieldName, '(' ) === false && strpos(
$fieldName, '.' ) === false && !$this->mCargoDB->isQuotedIdentifier( $fieldName
) ) {
+ if ( strpos( $fieldName, '(' ) === false && strpos(
$fieldName, '.' ) === false &&
+ !$this->mCargoDB->isQuotedIdentifier(
$fieldName ) && !CargoUtils::isSQLStringLiteral( $fieldName ) ) {
$fieldName =
$this->mCargoDB->addIdentifierQuotes( $fieldName );
}
$realAliasedFieldNames[$alias] = $fieldName;
diff --git a/CargoUtils.php b/CargoUtils.php
index d744aac..5b761e6 100644
--- a/CargoUtils.php
+++ b/CargoUtils.php
@@ -326,6 +326,14 @@
}
/**
+* Determines whether a string is a literal.
+* This may need different handling for different (non-MySQL) DB types.
+*/
+ public static function isSQLStringLiteral( $string ) {
+ return $string[0] == "'" && substr( $string, -1, 1 ) == "'";
+ }
+
+ /**
* Parses a piece of wikitext differently depending on whether
* we're in a special or regular page.
*
--
To view, visit https://gerrit.wikimedia.org/r/323711
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifcff132d93c40aa1d768eab9daa379603165e007
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren
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...Cargo[master]: Fix for selecting strings literals as fields
Yaron Koren has submitted this change and it was merged.
Change subject: Fix for selecting strings literals as fields
..
Fix for selecting strings literals as fields
Change-Id: Ifcff132d93c40aa1d768eab9daa379603165e007
---
M CargoSQLQuery.php
M CargoUtils.php
2 files changed, 10 insertions(+), 1 deletion(-)
Approvals:
Yaron Koren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CargoSQLQuery.php b/CargoSQLQuery.php
index cf9c45e..db64e4a 100644
--- a/CargoSQLQuery.php
+++ b/CargoSQLQuery.php
@@ -1139,7 +1139,8 @@
// If it's really a field name, add quotes around it.
// (The quotes are mostly needed for Postgres, which
// lowercases all unquoted fields.)
- if ( strpos( $fieldName, '(' ) === false && strpos(
$fieldName, '.' ) === false && !$this->mCargoDB->isQuotedIdentifier( $fieldName
) ) {
+ if ( strpos( $fieldName, '(' ) === false && strpos(
$fieldName, '.' ) === false &&
+ !$this->mCargoDB->isQuotedIdentifier(
$fieldName ) && !CargoUtils::isSQLStringLiteral( $fieldName ) ) {
$fieldName =
$this->mCargoDB->addIdentifierQuotes( $fieldName );
}
$realAliasedFieldNames[$alias] = $fieldName;
diff --git a/CargoUtils.php b/CargoUtils.php
index d744aac..5b761e6 100644
--- a/CargoUtils.php
+++ b/CargoUtils.php
@@ -326,6 +326,14 @@
}
/**
+* Determines whether a string is a literal.
+* This may need different handling for different (non-MySQL) DB types.
+*/
+ public static function isSQLStringLiteral( $string ) {
+ return $string[0] == "'" && substr( $string, -1, 1 ) == "'";
+ }
+
+ /**
* Parses a piece of wikitext differently depending on whether
* we're in a special or regular page.
*
--
To view, visit https://gerrit.wikimedia.org/r/323711
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcff132d93c40aa1d768eab9daa379603165e007
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren
Gerrit-Reviewer: Yaron Koren
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/puppet[production]: Bump parser cache purging batch wait time
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/323764 Change subject: Bump parser cache purging batch wait time .. Bump parser cache purging batch wait time Bug: T150124 Change-Id: I4be1d1620bf2a6a9afa011159c6975991569399b --- M modules/mediawiki/manifests/maintenance/parsercachepurging.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/64/323764/1 diff --git a/modules/mediawiki/manifests/maintenance/parsercachepurging.pp b/modules/mediawiki/manifests/maintenance/parsercachepurging.pp index a7669e6..47d44ea 100644 --- a/modules/mediawiki/manifests/maintenance/parsercachepurging.pp +++ b/modules/mediawiki/manifests/maintenance/parsercachepurging.pp @@ -9,7 +9,7 @@ hour=> 1, weekday => 0, # Purge entries older than 30d * 86400s/d = 2592000s -command => '/usr/local/bin/mwscript purgeParserCache.php --wiki=aawiki --age=2592000 --msleep 100 >/dev/null 2>&1', +command => '/usr/local/bin/mwscript purgeParserCache.php --wiki=aawiki --age=2592000 --msleep 500 >/dev/null 2>&1', } } -- To view, visit https://gerrit.wikimedia.org/r/323764 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4be1d1620bf2a6a9afa011159c6975991569399b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Aaron Schulz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/debian[master]: Use bundled jquery
Legoktm has submitted this change and it was merged.
Change subject: Use bundled jquery
..
Use bundled jquery
Debian unstable now has jquery 3, which is incompatible with
what MediaWiki expects, so use the bundled version that MediaWiki
provides.
Change-Id: I5d8a65f6db43f538e8725946783abdd2b9d2de8a
---
M debian/changelog
M debian/control
M debian/mediawiki.lintian-overrides
M debian/rules
4 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Legoktm: Verified; Looks good to me, approved
Muehlenhoff: Looks good to me, but someone else must approve
diff --git a/debian/changelog b/debian/changelog
index 738f84b..7572f1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@
* Add RELEASE-NOTES-* as documentation for mediawiki
* Recommend default-mysql-server | virtual-mysql-server instead of
just mysql-server (Closes: #843994)
+ * Use bundled jQuery (version 1) instead of Debian's jQuery, which is
+now the incompatible version 3
-- Kunal Mehta Tue, 13 Sep 2016 04:17:42 -0700
diff --git a/debian/control b/debian/control
index 5daadde..3b31567 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@
Package: mediawiki
Architecture: all
-Depends: apache2 | httpd, php, php-mysql | php-pgsql | php-sqlite3 |
php-mysqlnd, php-common (>= 5.5.0+dfsg-10~), php-mbstring, php-xml,
mime-support, libjs-jquery, mediawiki-classes (= ${binary:Version}),
${misc:Depends}
+Depends: apache2 | httpd, php, php-mysql | php-pgsql | php-sqlite3 |
php-mysqlnd, php-common (>= 5.5.0+dfsg-10~), php-mbstring, php-xml,
mime-support, mediawiki-classes (= ${binary:Version}), ${misc:Depends}
Recommends: default-mysql-server | virtual-mysql-server | postgresql-contrib,
php-cli, php-intl, php-curl, php-wikidiff2, python
Suggests: imagemagick | php-gd, memcached, clamav, php-apcu, hhvm
Breaks: fusionforge-plugin-mediawiki (<< 5.2~rc1+1~),
diff --git a/debian/mediawiki.lintian-overrides
b/debian/mediawiki.lintian-overrides
index 8682ccc..68b407e 100644
--- a/debian/mediawiki.lintian-overrides
+++ b/debian/mediawiki.lintian-overrides
@@ -16,6 +16,9 @@
# MediaWiki uses a newer version
mediawiki: embedded-javascript-library
usr/share/mediawiki/resources/lib/jquery/jquery.form.js please use
libjs-jquery-form
+# MediaWiki requires an older version
+mediawiki: embedded-javascript-library
usr/share/mediawiki/resources/lib/jquery/jquery.js please use libjs-jquery
+
# the files in question are not suitable for doc-base registration
mediawiki: possible-documentation-but-no-doc-base-registration
diff --git a/debian/rules b/debian/rules
index 169d529..5f43c70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,9 +26,6 @@
dh_link "`echo "$$i" | sed -e s#debian/mediawiki/##`" \
"`echo "$$i" | sed -e
s#debian/mediawiki/usr/share/mediawiki/#var/lib/mediawiki/#`"; \
done
- # Use system javascript libraries
- rm debian/mediawiki/usr/share/mediawiki/resources/lib/jquery/jquery.js
- dh_link usr/share/javascript/jquery/jquery.min.js
usr/share/mediawiki/resources/lib/jquery/jquery.js
# Remove Makefiles
find debian/mediawiki/ -iname makefile -exec rm {} \;
# Put debian version for mediawiki version..
--
To view, visit https://gerrit.wikimedia.org/r/322819
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5d8a65f6db43f538e8725946783abdd2b9d2de8a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Muehlenhoff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Adding $specialPageAliases translations for bengali (bn)
Aftab has uploaded a new change for review. https://gerrit.wikimedia.org/r/323783 Change subject: Adding $specialPageAliases translations for bengali (bn) .. Adding $specialPageAliases translations for bengali (bn) Change-Id: Ic709ebd5c0815b65b1f1a4ada8fe7e80fecf7033 --- M AbuseFilter.alias.php 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter refs/changes/83/323783/2 diff --git a/AbuseFilter.alias.php b/AbuseFilter.alias.php index 807832d..b742d6d 100644 --- a/AbuseFilter.alias.php +++ b/AbuseFilter.alias.php @@ -75,6 +75,12 @@ 'AbuseFilter' => array( 'Filter_panyalahgunaan' ), ); +/** Bengali (বাংলা) */ +$specialPageAliases['bn'] = array( + 'AbuseLog' => array( 'অপব্যবহার_লগ' ), + 'AbuseFilter' => array( 'অপব্যবহার_ছাঁকনি' ), +); + /** Bosnian (bosanski) */ $specialPageAliases['bs'] = array( 'AbuseLog' => array( 'ZapisZloupotrebe' ), -- To view, visit https://gerrit.wikimedia.org/r/323783 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic709ebd5c0815b65b1f1a4ada8fe7e80fecf7033 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/AbuseFilter Gerrit-Branch: master Gerrit-Owner: Aftab 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...WikimediaMessages[master]: WikimediaMessages configuration for the new fi.wikivoyage.org
jenkins-bot has submitted this change and it was merged.
Change subject: WikimediaMessages configuration for the new fi.wikivoyage.org
..
WikimediaMessages configuration for the new fi.wikivoyage.org
Bug: T151570
Change-Id: I247b09d924133fdb992b8796de2e13827f63f213
---
M i18n/wikimediaprojectnames/en.json
M i18n/wikimediaprojectnames/qqq.json
2 files changed, 2 insertions(+), 0 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/wikimediaprojectnames/en.json
b/i18n/wikimediaprojectnames/en.json
index 20d267e..be9a80e 100644
--- a/i18n/wikimediaprojectnames/en.json
+++ b/i18n/wikimediaprojectnames/en.json
@@ -222,6 +222,7 @@
"project-localized-name-fiwikiquote": "Finnish Wikiquote",
"project-localized-name-fiwikisource": "Finnish Wikisource",
"project-localized-name-fiwikiversity": "Finnish Wikiversity",
+ "project-localized-name-fiwikivoyage": "Finnish Wikivoyage",
"project-localized-name-fiu_vrowiki": "Võro Wikipedia",
"project-localized-name-fjwiki": "Fijian Wikipedia",
"project-localized-name-fjwiktionary": "Fijian Wiktionary",
diff --git a/i18n/wikimediaprojectnames/qqq.json
b/i18n/wikimediaprojectnames/qqq.json
index 57e957a..da6755a 100644
--- a/i18n/wikimediaprojectnames/qqq.json
+++ b/i18n/wikimediaprojectnames/qqq.json
@@ -231,6 +231,7 @@
"project-localized-name-fiwikiquote":
"{{ProjectNameDocumentation|url=https://fi.wikiquote.org|name=Finnish
Wikiquote|language=fi}}",
"project-localized-name-fiwikisource":
"{{ProjectNameDocumentation|url=https://fi.wikisource.org|name=Finnish
Wikisource|language=fi}}",
"project-localized-name-fiwikiversity":
"{{ProjectNameDocumentation|url=https://fi.wikiversity.org|name=Finnish
Wikiversity|language=fi}}",
+ "project-localized-name-fiwikivoyage":
"{{ProjectNameDocumentation|url=https://fi.wikivoyage.org|name=Finnish
Wikivoyage|language=fi}}",
"project-localized-name-fiu_vrowiki":
"{{ProjectNameDocumentation|url=https://fiu-vro.wikipedia.org|name=Võro
Wikipedia|language=vro}}",
"project-localized-name-fjwiki":
"{{ProjectNameDocumentation|url=https://fj.wikipedia.org|name=Fijian
Wikipedia|language=fj}}",
"project-localized-name-fjwiktionary":
"{{ProjectNameDocumentation|url=https://fj.wiktionary.org|name=Fijian
Wiktionary|language=fj}}",
--
To view, visit https://gerrit.wikimedia.org/r/323701
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I247b09d924133fdb992b8796de2e13827f63f213
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio
Gerrit-Reviewer: Alex Monk
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...ArticlePlaceholder[master]: Don't use numeric id for TermIndexEntry in test
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/323784 Change subject: Don't use numeric id for TermIndexEntry in test .. Don't use numeric id for TermIndexEntry in test compatibility with I2819090b in Wikibase Change-Id: I28c25553ee5681fbe42df495eb163e8d10c7f58e --- M tests/phpunit/includes/SearchHookHandlerTest.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticlePlaceholder refs/changes/84/323784/1 diff --git a/tests/phpunit/includes/SearchHookHandlerTest.php b/tests/phpunit/includes/SearchHookHandlerTest.php index 52f7c1c..fe4ac50 100644 --- a/tests/phpunit/includes/SearchHookHandlerTest.php +++ b/tests/phpunit/includes/SearchHookHandlerTest.php @@ -78,7 +78,7 @@ 'termText' => $text, 'termLanguage' => $languageCode, 'termType' => $termType, - 'entityId' => $entityId->getNumericId(), + 'entityId' => $entityId, 'entityType' => $entityId->getEntityType(), ] ); } -- To view, visit https://gerrit.wikimedia.org/r/323784 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I28c25553ee5681fbe42df495eb163e8d10c7f58e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ArticlePlaceholder Gerrit-Branch: master Gerrit-Owner: Aude ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Ported tag_nowcommons.py from compat to core
XXN has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323785
Change subject: Ported tag_nowcommons.py from compat to core
..
Ported tag_nowcommons.py from compat to core
Change-Id: I069c1fef10662395f51ea8da68c983fcc75b10af
---
A scripts/tag_nowcommons.py
1 file changed, 148 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/85/323785/2
diff --git a/scripts/tag_nowcommons.py b/scripts/tag_nowcommons.py
new file mode 100644
index 000..05fabff
--- /dev/null
+++ b/scripts/tag_nowcommons.py
@@ -0,0 +1,148 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+"""
+Bot tag local files available at Commons with the NowCommons template.
+
+"""
+#
+# (C) Multichill, 2011
+# (C) xqt, 2013
+# Ported from compat to core by XXN, 2016.
+#
+# Distributed under the terms of the MIT license.
+#
+
+#from __future__ import absolute_import, unicode_literals
+
+__version__ = '$Id: e9ddae2c4412b27b6e3b6c95a71afb4a833431b7 $'
+
+import sys
+import pywikibot
+from pywikibot import i18n, pagegenerators
+import image
+from scripts.imagecopy import nowCommonsTemplate
+
+
+skips = {
+'_default': [u'NowCommons'],
+'wikipedia': {
+'en': [u'NowCommons',
+ u'CommonsNow',
+ u'Nowcommons',
+ u'NowCommonsThis',
+ u'Nowcommons2',
+ u'NCT',
+ u'Nowcommonsthis',
+ u'Moved to commons',
+ u'Now Commons',
+ u'Now at commons',
+ u'Db-nowcommons',
+ u'WikimediaCommons',
+ u'Now commons',
+ u'Do not move to Commons',
+ u'KeepLocal',
+ u'Keeplocal',
+ u'NoCommons',
+ u'Nocommons',
+ u'NotMovedToCommons',
+ u'Nmtc',
+ u'Not moved to Commons',
+ u'Notmovedtocommons',
+ ],
+'fy': [u'NowCommons',
+ u'Nowcommons',
+ ],
+'ro': [u'NowCommons',
+ u'Now Commons',
+ u'AcumCommons',
+ u'FOP Romania',
+ ],
+'ru': [u'NowCommons',
+ u'Now Commons',
+ u'NoCommons',
+ u'FoP-Russia',
+ u'FoP-Ukraine',
+ ],
+'uk': [u'NowCommons',
+ u'Now Commons',
+ u'NoCommons',
+ u'NoFoP',
+ ],
+},
+}
+
+
+class NoEnoughData(pywikibot.Error):
+""" Error class for when the user doesn't specified all the data needed """
+
+
+def tagNowCommons(page):
+
+imagepage = pywikibot.FilePage(page.site, page.title())
+site = page.site
+language = site.code#site.language()
+family = site.family.name
+
+if not imagepage.fileIsOnCommons():
+
+if family in skips and language in skips[family]:
+localskips = skips[family][language]
+else:
+localskips = skips['_default']
+
+for template in imagepage.templates():
+if template in localskips:
+pywikibot.output(
+u'The file %s is already tagged with NowCommons'
+% imagepage.title())
+return
+
+imagehash = imagepage.latest_file_info.sha1
+commons = pywikibot.Site(u'commons', u'commons')#getSite
+duplicates = commons.getFilesFromAnHash(imagehash)
+if duplicates:
+duplicate = duplicates.pop()
+pywikibot.output(u'Found duplicate image at %s' % duplicate)
+comment = i18n.twtranslate(imagepage.site,
+ 'commons-file-now-available',
+ {'localfile': imagepage.title(
+ withNamespace=False),
+'commonsfile': duplicate})
+if site.lang in nowCommonsTemplate:
+template = nowCommonsTemplate[site.lang]
+else:
+template = nowCommonsTemplate['_default']
+
+newtext = template % (duplicate,) + '\n' + imagepage.get()
+pywikibot.showDiff(imagepage.get(), newtext)
+try:
+imagepage.put(newtext, comment)
+except pywikibot.LockedPage:
+return
+
+
+def main(args):
+generator = None
+# Load a lot of default generators
+genFactory = pagegenerators.GeneratorFactory()
+
+for arg in pywikibot.handleArgs():
+genFactory.handleArg(arg)
+
+generator = genFactory.getCombinedGenerator()
+if not generator:
+raise NoEnoughData(
+'You have to specify the generator you want to use for the
script!')
+
+pregenerator = pagegenerators.PreloadingGenerator(generator)
+for page in pregenerator:
+if page.exists() and page.names
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Show already logged in / security reauth message at the righ...
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323786
Change subject: Show already logged in / security reauth message at the right
time
..
Show already logged in / security reauth message at the right time
After I9588a2, the initial display of the login form might be skipped
under certain conditions. Make sure that the warnings normally shown
there are still shown if there is a login step that requires user
input.
(Using a similar system for the error/warning URL parameters is left
for a future patch.)
Bug: T141474
Change-Id: I59ebe79994debfb7bb17f0f748a5dcfe165333b6
---
M includes/specialpage/LoginSignupSpecialPage.php
1 file changed, 13 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/86/323786/1
diff --git a/includes/specialpage/LoginSignupSpecialPage.php
b/includes/specialpage/LoginSignupSpecialPage.php
index 5f57519..198fa01 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -308,6 +308,11 @@
return;
}
+ // make sure warnings will be shown exactly once, even if they
cannot be shown immediately
+ if ( !$this->isContinued() && !$this->getRequest()->wasPosted()
) {
+ $session->set( 'login-warnings-not-shown-yet', true );
+ }
+
if ( $this->canBypassForm( $button_name ) ) {
// bypassing means an attacker can send the user to
this page and it will be
// autosubmitted; we don't want the attacker to be able
to set the values of form
@@ -523,6 +528,7 @@
protected function mainLoginForm( array $requests, $msg = '', $msgtype
= 'error' ) {
$user = $this->getUser();
$out = $this->getOutput();
+ $session = SessionManager::getGlobalSession();
// FIXME how to handle empty $requests - restart, or no form,
just an error message?
// no form would be better for no session type errors, restart
is better when can* fails.
@@ -570,14 +576,13 @@
$submitStatus->fatal( $msg );
}
- // warning header for non-standard workflows (e.g. security
reauthentication)
- if (
- !$this->isSignup() &&
- $this->getUser()->isLoggedIn() &&
- !$this->isContinued()
- ) {
- $reauthMessage = $this->securityLevel ?
'userlogin-reauth' : 'userlogin-loggedin';
- $submitStatus->warning( $reauthMessage,
$this->getUser()->getName() );
+ if ( $session->get( 'login-warnings-not-shown-yet' ) ) {
+ if ( !$this->isSignup() &&
$this->getUser()->isLoggedIn() ) {
+ // warning header for non-standard workflows
(e.g. security reauthentication)
+ $reauthMessage = $this->securityLevel ?
'userlogin-reauth' : 'userlogin-loggedin';
+ $submitStatus->warning( $reauthMessage,
$this->getUser()->getName() );
+ }
+ $session->remove( 'login-warnings-not-shown-yet' );
}
$formHtml = $form->getHTML( $submitStatus );
--
To view, visit https://gerrit.wikimedia.org/r/323786
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I59ebe79994debfb7bb17f0f748a5dcfe165333b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/debian[master]: Add Provides for extension packages now included in tarball
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/323787 Change subject: Add Provides for extension packages now included in tarball .. Add Provides for extension packages now included in tarball Change-Id: I14b9f39bb4b54be16d8518e0226b692d0ae96c9a Closes: #845281 --- M debian/changelog M debian/control 2 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian refs/changes/87/323787/1 diff --git a/debian/changelog b/debian/changelog index 7572f1d..768004e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ just mysql-server (Closes: #843994) * Use bundled jQuery (version 1) instead of Debian's jQuery, which is now the incompatible version 3 + * Add Provides for extensions now included in this one (Closes: #845281) -- Kunal Mehta Tue, 13 Sep 2016 04:17:42 -0700 diff --git a/debian/control b/debian/control index 3b31567..63a74d7 100644 --- a/debian/control +++ b/debian/control @@ -28,6 +28,8 @@ Replaces: mediawiki-extensions-base, mediawiki-extensions-confirmedit, mediawiki-extensions-geshi +Provides: mediawiki-extensions-confirmedit, + mediawiki-extensions-geshi Description: website engine for collaborative work MediaWiki is a wiki engine (a program for creating a collaboratively edited website). It is designed to handle heavy websites containing -- To view, visit https://gerrit.wikimedia.org/r/323787 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14b9f39bb4b54be16d8518e0226b692d0ae96c9a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/debian Gerrit-Branch: master Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...JsonConfig[master]: Added "sources" field to tabular & map data
Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323788
Change subject: Added "sources" field to tabular & map data
..
Added "sources" field to tabular & map data
* Now both tabular and map data supports an optional
unlimited "sources" string field treated as a wiki markup.
* Cleaned up the pre-populated "new page" content.
Change-Id: Ic2cdb4fc77a80363180942c763f034c06d091a0c
---
M includes/JCDataContent.php
M includes/JCMapDataContentView.php
M includes/JCTabularContentView.php
3 files changed, 48 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/JsonConfig
refs/changes/88/323788/1
diff --git a/includes/JCDataContent.php b/includes/JCDataContent.php
index 8850277..fe99fcd 100644
--- a/includes/JCDataContent.php
+++ b/includes/JCDataContent.php
@@ -4,7 +4,10 @@
use Html;
use Language;
+use Parser;
+use ParserOptions;
use stdClass;
+use Title;
/**
* @package JsonConfig
@@ -24,6 +27,7 @@
$this->test( 'license', JCValidators::isStringLine(),
self::isValidLicense() );
$this->testOptional( 'info', [ 'en' => '' ],
JCValidators::isLocalizedString() );
+ $this->testOptional( 'sources', '', JCValidators::isString() );
}
/** Returns a validator function to check if the value is a valid string
@@ -72,6 +76,9 @@
'url' => wfMessage( 'jsonconfig-license-url-' .
$data->license )->plain(),
];
}
+ if ( property_exists( $data, 'sources' ) ) {
+ $result->sources = $data->sources;
+ }
}
public function renderInfo( $lang ) {
@@ -103,4 +110,17 @@
return $html;
}
+
+ public function renderSources( Parser $parser, Title $title, $revId,
ParserOptions $options ) {
+ $sources = $this->getField( 'sources' );
+
+ if ( $sources && !$sources->error() ) {
+ $text = $parser->parse( $sources->getValue(), $title,
$options, true, true, $revId );
+ $html = Html::rawElement( 'p', [ 'class' =>
'mw-jsonconfig-sources' ], $text );
+ } else {
+ $html = '';
+ }
+
+ return $html;
+ }
}
diff --git a/includes/JCMapDataContentView.php
b/includes/JCMapDataContentView.php
index 3ed21f0..8ec1c55 100644
--- a/includes/JCMapDataContentView.php
+++ b/includes/JCMapDataContentView.php
@@ -29,6 +29,8 @@
$generateHtml,
ParserOutput &$output ) {
global $wgParser;
+ $parser = $wgParser->getFreshParser();
+
$localizedData = $content->getLocalizedData(
$options->getUserLangObj() );
if ( $localizedData ) {
@@ -67,12 +69,13 @@
}
}
$output =
- $wgParser->getFreshParser()->parse( $text,
$title, $options, true, true, $revId );
+ $parser->parse( $text, $title, $options, true,
true, $revId );
}
return
$content->renderInfo( $options->getUserLangObj() ) .
'' .
$output->getRawText() . '' .
+ $content->renderSources( $parser, $title, $revId,
$options ) .
$content->renderLicense();
}
@@ -85,13 +88,24 @@
public function getDefault( $modelId ) {
return <renderInfo( $lang ) .
Html::rawElement( 'table', $dataAttrs,
Html::rawElement( 'tbody', null, implode( "\n",
$result ) ) ) .
+ $content->renderSources( $wgParser->getFreshParser(),
$title, $revId, $options ) .
$content->renderLicense();
return $html;
@@ -154,8 +157,14 @@
public function getDefault( $modelId ) {
return <
[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Add i18n translation descriptions and clean up date display
jenkins-bot has submitted this change and it was merged.
Change subject: Add i18n translation descriptions and clean up date display
..
Add i18n translation descriptions and clean up date display
The date display wasn't taking into account i18n, so now the years
have been moved in to become parameters for the i18n messages.
No bug in Phabricator.
Change-Id: I81545688cac514ca7f72e767fe4212de4f828cc6
---
D Genealogy.i18n.php
M i18n/en.json
A i18n/qqq.json
M src/Hooks.php
M src/Person.php
5 files changed, 37 insertions(+), 43 deletions(-)
Approvals:
Samwilson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Genealogy.i18n.php b/Genealogy.i18n.php
deleted file mode 100644
index 9d63d97..000
--- a/Genealogy.i18n.php
+++ /dev/null
@@ -1,29 +0,0 @@
-
- */
-$messages['en'] = [
- 'genealogy' => 'Genealogy',
- 'genealogy-desc' => 'Adds a parser function for easier linking between
genealogical records',
- 'genealogy-born' => 'b.',
- 'genealogy-died' => 'd.',
- 'genealogy-ancestor' => 'Ancestor',
- 'genealogy-ancestors' => 'Ancestors',
- 'genealogy-descendant' => 'Descendant',
- 'genealogy-descendants' => 'Descendants',
- 'genealogy-person-preload' => 'Template:Person/preload',
- 'genealogy-parser-function-not-found' => 'Genealogy parser function
type not recognised: $1',
- 'genealogy-existing-partners' => 'This person already has the following
'
- .'{{PLURAL:$1|partner|partners}}: ',
- 'genealogy-person-list-item' => 'Person/list-item'
-];
diff --git a/i18n/en.json b/i18n/en.json
index 4db81df..246130e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -6,14 +6,15 @@
},
"genealogy": "Genealogy",
"genealogy-desc": "Adds a parser function for easier linking between
genealogical records",
- "genealogy-born": "b.",
- "genealogy-died": "d.",
+ "genealogy-born": "(b. $1)",
+ "genealogy-died": "(d. $1)",
+ "genealogy-born-and-died": "($1–$2)",
"genealogy-ancestor": "Ancestor",
"genealogy-ancestors": "Ancestors",
"genealogy-descendant": "Descendant",
"genealogy-descendants": "Descendants",
"genealogy-person-preload": "Template:Person/preload",
+ "genealogy-person-list-item": "Template:Person/list-item",
"genealogy-parser-function-not-found": "Genealogy parser function type
not recognised: $1",
- "genealogy-existing-partners": "This person already has the following
{{PLURAL:$1|partner|partners}}: ",
- "genealogy-person-list-item": "Person/list-item"
+ "genealogy-existing-partners": "This person already has the following
{{PLURAL:$1|partner|partners}}: "
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..3206ebe
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,20 @@
+{
+ "@metadata": {
+ "authors": [
+ "Sam Wilson "
+ ]
+ },
+ "genealogy": "The extension title",
+ "genealogy-desc":
"{{desc|name=Genealogy|url=https://www.mediawiki.org/wiki/Extension:Genealogy}}";,
+ "genealogy-born": "The parenthetic abbreviation showing the year of
birth.",
+ "genealogy-died": "The parenthetic abbreviation showing the year of
death.",
+ "genealogy-born-and-died": "The parenthetic abbreviation showing both
the year of birth and year of death.",
+ "genealogy-ancestor": "A singular noun referring to any parent,
grandparent, etc. of a given person.",
+ "genealogy-ancestors": "A plural noun referring to all parents,
grandparents, etc. of a given person.",
+ "genealogy-descendant": "A singular noun referring to any child,
grandchild, etc. of a given person.",
+ "genealogy-descendants": "A plural noun referring to all children,
grandchildren, etc. of a given person.",
+ "genealogy-person-preload": "A name of the MediaWiki page that contains
the text that is preloaded when a new Person page is created.",
+ "genealogy-person-list-item": "The template that will be used (if it
exists) to format each item in any list of people.",
+ "genealogy-parser-function-not-found": "The error message shown when
the parser function is passed something it doesn't recognise.",
+ "genealogy-existing-partners": "The message that is shown above the
page-editing form, alerting the user to the fact that the person they're
editing has already got a defined partner from another page."
+}
diff --git a/src/Hooks.php b/src/Hooks.php
index b322f89..211cd72 100644
--- a/src/Hooks.php
+++ b/src/Hooks.php
@@ -166,9 +166,9 @@
$out = '';
$index = 1;
$peopleCount = count( $people );
+ $templateExists = Title::newFromText( $templateName->toString()
)->exists();
foreach ( $people as $person ) {
- $exist
[MediaWiki-commits] [Gerrit] mediawiki/debian[master]: Add Provides for extension packages now included in tarball
Legoktm has submitted this change and it was merged. Change subject: Add Provides for extension packages now included in tarball .. Add Provides for extension packages now included in tarball Change-Id: I14b9f39bb4b54be16d8518e0226b692d0ae96c9a Closes: #845281 --- M debian/changelog M debian/control 2 files changed, 3 insertions(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index 7572f1d..768004e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ just mysql-server (Closes: #843994) * Use bundled jQuery (version 1) instead of Debian's jQuery, which is now the incompatible version 3 + * Add Provides for extensions now included in this one (Closes: #845281) -- Kunal Mehta Tue, 13 Sep 2016 04:17:42 -0700 diff --git a/debian/control b/debian/control index 3b31567..63a74d7 100644 --- a/debian/control +++ b/debian/control @@ -28,6 +28,8 @@ Replaces: mediawiki-extensions-base, mediawiki-extensions-confirmedit, mediawiki-extensions-geshi +Provides: mediawiki-extensions-confirmedit, + mediawiki-extensions-geshi Description: website engine for collaborative work MediaWiki is a wiki engine (a program for creating a collaboratively edited website). It is designed to handle heavy websites containing -- To view, visit https://gerrit.wikimedia.org/r/323787 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I14b9f39bb4b54be16d8518e0226b692d0ae96c9a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/debian Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Hashar 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/vagrant[master]: contenttranslation: Add module and script names explicitly
jenkins-bot has submitted this change and it was merged.
Change subject: contenttranslation: Add module and script names explicitly
..
contenttranslation: Add module and script names explicitly
Bug: T151435
Change-Id: Ifd0a219346e72a1bc65be97d216ec3bf7b53ad67
---
M puppet/modules/contenttranslation/manifests/cxserver.pp
M puppet/modules/contenttranslation/templates/cxserver.config.yaml.erb
2 files changed, 4 insertions(+), 5 deletions(-)
Approvals:
KartikMistry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/contenttranslation/manifests/cxserver.pp
b/puppet/modules/contenttranslation/manifests/cxserver.pp
index e3f09a7..6222943 100644
--- a/puppet/modules/contenttranslation/manifests/cxserver.pp
+++ b/puppet/modules/contenttranslation/manifests/cxserver.pp
@@ -60,7 +60,9 @@
require ::service
service::node { 'cxserver':
-port => $port,
-config=> template('contenttranslation/cxserver.config.yaml.erb'),
+port => $port,
+script => 'src/server.js',
+module => 'src/app.js',
+config => template('contenttranslation/cxserver.config.yaml.erb'),
}
}
diff --git
a/puppet/modules/contenttranslation/templates/cxserver.config.yaml.erb
b/puppet/modules/contenttranslation/templates/cxserver.config.yaml.erb
index 08cc978..485b1f8 100644
--- a/puppet/modules/contenttranslation/templates/cxserver.config.yaml.erb
+++ b/puppet/modules/contenttranslation/templates/cxserver.config.yaml.erb
@@ -30,6 +30,3 @@
# registry to use
registry: registry.yaml
-
-# base path
-app_base_path: /vagrant/srv/cxserver/src
--
To view, visit https://gerrit.wikimedia.org/r/323506
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd0a219346e72a1bc65be97d216ec3bf7b53ad67
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: KartikMistry
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: Dduvall
Gerrit-Reviewer: KartikMistry
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...ContentTranslation[master]: Check for null value of template params to avoid js error
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323789
Change subject: Check for null value of template params to avoid js error
..
Check for null value of template params to avoid js error
Bug: T151621
Change-Id: Ibe9c6c499a2a0848f31ce66f16c734a6bd35be5a
---
M modules/tools/ext.cx.tools.template.editor.js
1 file changed, 3 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/89/323789/1
diff --git a/modules/tools/ext.cx.tools.template.editor.js
b/modules/tools/ext.cx.tools.template.editor.js
index 01bcb98..c7a0b3e 100644
--- a/modules/tools/ext.cx.tools.template.editor.js
+++ b/modules/tools/ext.cx.tools.template.editor.js
@@ -352,8 +352,8 @@
option = new mw.cx.widgets.TemplateParamOptionWidget( {
data: key,
classes: [
'cx-template-editor-param-selector-item' ],
- label: value.label && value.label[ language ]
|| key,
- description: value.description &&
value.description[ language ]
+ label: value && value.label && value.label[
language ] || key,
+ description: value && value.description &&
value.description[ language ] || ''
} );
option.$element.append( $desc );
items.push( option );
@@ -449,7 +449,7 @@
} );
$.each( this.targetTemplate.params, function ( key, value ) {
- if ( value.changed ) {
+ if ( value && value.changed ) {
if ( !value.html || !isNaN( value.html ) ) {
// Value cleared/deleted/a number. Save
an API call.
value.wt = value.html;
--
To view, visit https://gerrit.wikimedia.org/r/323789
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe9c6c499a2a0848f31ce66f16c734a6bd35be5a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Replace jshint, jscs, jsbeautifyrc by eslint
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323790
Change subject: Replace jshint, jscs, jsbeautifyrc by eslint
..
Replace jshint, jscs, jsbeautifyrc by eslint
Change-Id: Id821b8cebc4d0b43d50aaa0ec46bab9f9538b0d4
---
A .eslintrc.json
D .jsbeautifyrc
D .jscs.json
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
M modules/dashboard/ext.cx.recommendtool.client.js
M modules/dashboard/ext.cx.suggestionlist.js
M modules/dashboard/ext.cx.translationlist.js
M modules/editor/ext.cx.editor.js
M modules/entrypoint/ext.cx.contributions.js
M modules/entrypoint/ext.cx.entrypoint.js
M modules/eventlogging/ext.cx.eventlogging.js
M modules/publish/ext.cx.publish.dialog.js
M modules/publish/ext.cx.publish.js
M modules/publish/ext.cx.wikibase.link.js
M modules/source/ext.cx.source.js
M modules/source/ext.cx.source.selector.js
M modules/widgets/overlay/ext.cx.overlay.js
M package.json
21 files changed, 138 insertions(+), 117 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/90/323790/1
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000..ecc2e04
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+ "extends": "wikimedia",
+ "env": {
+ "browser": true,
+ "jquery": true,
+ "qunit": true
+ },
+ "globals": {
+ "mediaWiki": false,
+ "moment": false,
+ "EasyDeflate": false,
+ "OO": false
+ },
+ "rules": {
+ "dot-notation": 0,
+ "wrap-iife": 0
+ }
+}
diff --git a/.jsbeautifyrc b/.jsbeautifyrc
deleted file mode 100644
index cfa5b27..000
--- a/.jsbeautifyrc
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-"preserve_newlines": true,
-"jslint_happy": true,
-"keep_array_indentation": true,
-"space_before_conditional": true,
-"max_preserve_newlines": 10,
-"brace_style": "collapse",
-"keep_function_indentation": false,
-"break_chained_methods": false,
-"eval_code": false,
-"unescape_strings": false,
-"wrap_line_length": 0,
-"space_in_paren": true,
-"git_happy": true,
-"indent_with_tabs": true,
-"end_with_newline": true
-}
diff --git a/.jscs.json b/.jscs.json
deleted file mode 100644
index 9d22e3f..000
--- a/.jscs.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "preset": "wikimedia"
-}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index 9d22e3f..000
--- a/.jscsrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "preset": "wikimedia"
-}
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 18be9f9..000
--- a/.jshintignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# upstream libs
-lib/*
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index dc06253..000
--- a/.jshintrc
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "bitwise": true,
- "curly": true,
- "eqeqeq": true,
- "forin": false,
- "freeze": true,
- "latedef": true,
- "noarg": true,
- "nonew": true,
- "strict": true,
- "undef": true,
- "unused": true,
- "browser": true,
- "predef": [
- "EasyDeflate",
- "mediaWiki",
- "jQuery",
- "QUnit",
- "moment",
- "OO"
- ]
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index e46e25b..cec6620 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,25 +1,38 @@
-/*jshint node:true */
+/* eslint-env node */
module.exports = function ( grunt ) {
'use strict';
+
var conf = grunt.file.readJSON( 'extension.json' );
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+ grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
- grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.initConfig( {
- jshint: {
- options: {
- jshintrc: true
+ eslint: {
+ fix: {
+ options: {
+ fix: true
+ },
+ src: '<%= eslint.main %>'
},
- all: [
+ main: [
'**/*.js',
'!lib/**',
'!node_modules/**'
]
},
- jscs: {
- src: '<%= jshint.all %>'
+ stylelint: {
+ options: {
+ syntax: 'less'
+ },
+ src: [
+ '**/*.css',
+
[MediaWiki-commits] [Gerrit] operations/puppet[production]: site.pp: Change db1044 binlog to ROW
Marostegui has submitted this change and it was merged.
Change subject: site.pp: Change db1044 binlog to ROW
..
site.pp: Change db1044 binlog to ROW
In order to set up the new sanitarium, db1044 will need
to get its binary logs changed to ROW based replication
Bug: T150802
Change-Id: I0d93592efebe3adb884e99b857cad849dc68c595
---
M manifests/site.pp
1 file changed, 9 insertions(+), 1 deletion(-)
Approvals:
Jcrespo: Looks good to me, but someone else must approve
Marostegui: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 435cd10..ac01922 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -504,12 +504,20 @@
}
}
-node /^db10(15|35|38|44|77|78)\.eqiad\.wmnet/ {
+node /^db10(15|35|38|77|78)\.eqiad\.wmnet/ {
class { 'role::mariadb::core':
shard => 's3',
}
}
+# Testing row-based replication to sanitarium2 (T150802)
+node 'db1044.eqiad.wmnet' {
+class { 'role::mariadb::core':
+shard => 's3',
+binlog_format => 'ROW',
+}
+}
+
# s3 (default) core production dbs on codfw
# codfw master
node 'db2018.codfw.wmnet' {
--
To view, visit https://gerrit.wikimedia.org/r/323504
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0d93592efebe3adb884e99b857cad849dc68c595
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui
Gerrit-Reviewer: Jcrespo
Gerrit-Reviewer: Marostegui
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/puppet[production]: sanitarium2.my.cnf: Disable parallel replication
Marostegui has submitted this change and it was merged. Change subject: sanitarium2.my.cnf: Disable parallel replication .. sanitarium2.my.cnf: Disable parallel replication By default do not use parallel replication on the new sanitarium host. Change-Id: I93898b9afda86a3e942c03712e0f682dfe367798 --- M templates/mariadb/sanitarium2.my.cnf.erb 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jcrespo: Looks good to me, but someone else must approve Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/mariadb/sanitarium2.my.cnf.erb b/templates/mariadb/sanitarium2.my.cnf.erb index fafceeb..b2d56eb 100644 --- a/templates/mariadb/sanitarium2.my.cnf.erb +++ b/templates/mariadb/sanitarium2.my.cnf.erb @@ -42,7 +42,8 @@ transaction-isolation = REPEATABLE-READ log-bin slave_transaction_retries = 4294967295 -slave_parallel_threads = 2 +slave_parallel_mode= none +slave_parallel_threads = 0 slave_parallel_max_queued = 16M binlog-format = ROW expire_logs_days = 7 -- To view, visit https://gerrit.wikimedia.org/r/323145 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I93898b9afda86a3e942c03712e0f682dfe367798 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui 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]: db-eqiad.php: Added comment for db1044
jenkins-bot has submitted this change and it was merged. Change subject: db-eqiad.php: Added comment for db1044 .. db-eqiad.php: Added comment for db1044 We are planning to use db1044 as a temporary master for the new sanitarium host. Bug: T150802 Change-Id: Iefefd8e55b606504070d735cb09f3c7f7bed0174 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jcrespo: Looks good to me, but someone else must approve Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 0fdbe12..7098ac7 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -123,7 +123,7 @@ 'db1038' => 0, # 1.4TB 64GB, vslow, dump, old master 'db1015' => 1 , # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager # 'db1035' => 0, # 1.4TB 64GB -# 'db1044' => 0, # 1.4TB 64GB +# 'db1044' => 0, # 1.4TB 64GB, #Temporary master for db1095 - new sanitarium #T150802 'db1077' => 500, # 3.6TB 512GB 'db1078' => 500, # 3.6TB 512GB ], -- To view, visit https://gerrit.wikimedia.org/r/323505 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iefefd8e55b606504070d735cb09f3c7f7bed0174 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui 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]: db-eqiad.php: Repool db1092
Marostegui has uploaded a new change for review. https://gerrit.wikimedia.org/r/323791 Change subject: db-eqiad.php: Repool db1092 .. db-eqiad.php: Repool db1092 db1092 crashed a week ago and it has been working fine for the last week, so it is time to pool it again Bug: T151272 Change-Id: Ic1f4bad59ded076274df1f135eecee18e28fd6f7 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/91/323791/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 7098ac7..35c6566 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -146,7 +146,7 @@ 'db1071' => 50, # 2.8TB 160GB, api 'db1082' => 500, # 3.6TB 512GB 'db1087' => 500, # 3.6TB 512GB -# 'db1092' => 500, # 3.6TB 512GB T151272 + 'db1092' => 500, # 3.6TB 512GB ], 's6' => [ 'db1050' => 0, # 2.8TB 64GB, master -- To view, visit https://gerrit.wikimedia.org/r/323791 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic1f4bad59ded076274df1f135eecee18e28fd6f7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1092
jenkins-bot has submitted this change and it was merged. Change subject: db-eqiad.php: Repool db1092 .. db-eqiad.php: Repool db1092 db1092 crashed a week ago and it has been working fine for the last week, so it is time to pool it again Bug: T151272 Change-Id: Ic1f4bad59ded076274df1f135eecee18e28fd6f7 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 7098ac7..35c6566 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -146,7 +146,7 @@ 'db1071' => 50, # 2.8TB 160GB, api 'db1082' => 500, # 3.6TB 512GB 'db1087' => 500, # 3.6TB 512GB -# 'db1092' => 500, # 3.6TB 512GB T151272 + 'db1092' => 500, # 3.6TB 512GB ], 's6' => [ 'db1050' => 0, # 2.8TB 64GB, master -- To view, visit https://gerrit.wikimedia.org/r/323791 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic1f4bad59ded076274df1f135eecee18e28fd6f7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
