[MediaWiki-commits] [Gerrit] DonationInterface has JSON support - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: DonationInterface has JSON support .. DonationInterface has JSON support Change-Id: I77b5f886990a44dfa34639c07a9b34746ae9a213 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 13 insertions(+), 7 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 06da90d..0efa7b3 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -439,18 +439,21 @@ Disqus Tag Donation Interface - Adyen Gateway +format = json id = ext-di-adyen -file = DonationInterface/adyen_gateway/adyen_gateway.i18n.php +file = DonationInterface/adyen_gateway/i18n/%CODE%.json descmsg = adyen_gateway-desc Donation Interface - Amazon Gateway -file = DonationInterface/amazon_gateway/amazon_gateway.i18n.php +format = json +file = DonationInterface/amazon_gateway/i18n/%CODE%.json id = ext-di-ag descmsg = amazon_gateway-desc Donation Interface - Gateway Common +format = json id = ext-di-gc -file = DonationInterface/gateway_common/interface.i18n.php +file = DonationInterface/gateway_common/i18n/interface/%CODE%.json descmsg = donate_interface-desc optional = donate_interface-currency-display, donate_interface-pm-alipay, donate_interface-pm-bpay optional = donate_interface-pm-boletus, donate_interface-pm-directebanking, donate_interface-pm-eps @@ -463,26 +466,29 @@ optional = donate_interface-donor-fname-alt, donate_interface-donor-lname-alt, donate_interface-donor-postcode Donation Interface - Global Collect Gateway +format = json +file = DonationInterface/globalcollect_gateway/i18n/%CODE%.json id = ext-di-gcg descmsg = globalcollect_gateway-desc -file = DonationInterface/globalcollect_gateway/globalcollect_gateway.i18n.php Donation Interface - Payflow Pro Gateway +format = json id = ext-di-pfpg -file = DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php descmsg = payflowpro_gateway-desc optional = payflow_gateway-card-name-amex, payflow_gateway-card-name-visa, payflow_gateway-card-name-mc, payflow_gateway-card-name-discover optional = payflowpro_gateway-month Donation Interface - Paypal Gateway +format = json id = ext-di-ppg +file = DonationInterface/paypal_gateway/i18n/%CODE%.json # aliasfile = DonationInterface/paypal_gateway/paypal_gateway.alias.php -file = DonationInterface/paypal_gateway/paypal_gateway.i18n.php descmsg = paypal_gateway-desc Donation Interface - WorldPay Gateway +format = json id = ext-di-wpg -file = DonationInterface/worldpay_gateway/worldpay_gateway.i18n.php +file = DonationInterface/worldpay_gateway/i18n/%CODE%.json Double Wiki format = json -- To view, visit https://gerrit.wikimedia.org/r/121085 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I77b5f886990a44dfa34639c07a9b34746ae9a213 Gerrit-PatchSet: 2 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@kitano.nl Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Get rid of term handle in the context of items in browsert... - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Get rid of term handle in the context of items in browsertest features .. Get rid of term handle in the context of items in browsertest features Change-Id: I3f5eeaf5252fa351c8927f705076ebbef0ce976b --- M tests/browser/features/statements_item.feature M tests/browser/features/step_definitions/entity_steps.rb M tests/browser/features/step_definitions/statement_steps.rb 3 files changed, 8 insertions(+), 8 deletions(-) Approvals: WikidataJenkins: Verified Thiemo Mättig (WMDE): Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/statements_item.feature b/tests/browser/features/statements_item.feature index ca8a23a..d250219 100644 --- a/tests/browser/features/statements_item.feature +++ b/tests/browser/features/statements_item.feature @@ -17,11 +17,11 @@ Scenario Outline: Adding a statement of type item Given There are properties with the following handles and datatypes: | itemprop | wikibase-item | -Given There are items with the following handles: +Given I have the following items: | item1 | When I click the statement add button And I select the property itemprop - And I enter the label of the item with handle itemhandle as statement value + And I enter the label of item item as statement value And I save Then Statement add button should be there And Statement cancel button should not be there @@ -30,8 +30,8 @@ And Statement value input element should not be there And Statement edit button for claim 1 in group 1 should be there And Statement name of group 1 should be the label of itemprop -And Statement value of claim 1 in group 1 should be the label of the item with handle itemhandle +And Statement value of claim 1 in group 1 should be the label of item item Examples: -| itemhandle | save| -| item1 | click the statement save button | +| item | save| +| item1 | click the statement save button | diff --git a/tests/browser/features/step_definitions/entity_steps.rb b/tests/browser/features/step_definitions/entity_steps.rb index 7377713..560114e 100644 --- a/tests/browser/features/step_definitions/entity_steps.rb +++ b/tests/browser/features/step_definitions/entity_steps.rb @@ -23,7 +23,7 @@ @properties = wb_api.wb_create_properties(props.raw) end -Given /^There are items with the following handles:$/ do |handles| +Given /^I have the following items:$/ do |handles| wb_api = WikibaseAPI::Gateway.new(URL.repo_api) @items = wb_api.wb_create_items(handles.raw) end diff --git a/tests/browser/features/step_definitions/statement_steps.rb b/tests/browser/features/step_definitions/statement_steps.rb index 1405d29..c20f13e 100644 --- a/tests/browser/features/step_definitions/statement_steps.rb +++ b/tests/browser/features/step_definitions/statement_steps.rb @@ -44,7 +44,7 @@ end end -When /^I enter the label of the item with handle (.+) as statement value$/ do |handle| +When /^I enter the label of item (.+) as statement value$/ do |handle| on(ItemPage) do |page| page.statement_value_input_field_element.clear page.statement_value_input_field = @items[handle][label] @@ -126,6 +126,6 @@ on(ItemPage).statement_string_value(group_index, claim_index).should == value end -Then /^Statement value of claim (.+) in group (.+) should be the label of the item with handle (.+)$/ do |claim_index, group_index, handle| +Then /^Statement value of claim (.+) in group (.+) should be the label of item (.+)$/ do |claim_index, group_index, handle| on(ItemPage).statement_value_element(group_index, claim_index).text.should == @items[handle][label] end -- To view, visit https://gerrit.wikimedia.org/r/121669 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3f5eeaf5252fa351c8927f705076ebbef0ce976b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Stop registering event handlers twice in referenceview - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121674
Change subject: Stop registering event handlers twice in referenceview
..
Stop registering event handlers twice in referenceview
Bug: 63225
Change-Id: Iea36de4d0ecb8f61e67580e7af3cd771f7dd5db4
---
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
1 file changed, 0 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/74/121674/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
index 716aee5..29b21c6 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
@@ -371,8 +371,6 @@
this.element.removeClass( 'wb-edit' );
this._isInEditMode = false;
- this._attachEditModeEventHandlers();
-
this._trigger( 'afterstopediting', null, [
dropValue ] );
} else {
--
To view, visit https://gerrit.wikimedia.org/r/121674
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea36de4d0ecb8f61e67580e7af3cd771f7dd5db4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove db62, decom - change (operations/dns)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/121672 Change subject: remove db62, decom .. remove db62, decom RT #7131 Change-Id: I7ce9cb51bfc93b8820995ad45a29c24f71b8e3b1 --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/72/121672/1 diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index 0403c2b..9081395 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -110,7 +110,6 @@ 58 1H IN PTR db48.pmtpa.wmnet. 70 1H IN PTR db60.pmtpa.wmnet. -72 1H IN PTR db62.pmtpa.wmnet. 73 1H IN PTR db63.pmtpa.wmnet. 74 1H IN PTR db64.pmtpa.wmnet. 75 1H IN PTR db65.pmtpa.wmnet. diff --git a/templates/wmnet b/templates/wmnet index ae6ddcd..a0fe725 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -59,7 +59,6 @@ db40 1H IN A10.0.6.50 db481H IN A10.0.6.58 db60 1H IN A10.0.6.70 -db62 1H IN A10.0.6.72 db63 1H IN A10.0.6.73 db64 1H IN A10.0.6.74 db65 1H IN A10.0.6.75 -- To view, visit https://gerrit.wikimedia.org/r/121672 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ce9cb51bfc93b8820995ad45a29c24f71b8e3b1 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Migrate amazon_gateway.i18n.php to JSON i18n - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged.
Change subject: Migrate amazon_gateway.i18n.php to JSON i18n
..
Migrate amazon_gateway.i18n.php to JSON i18n
This was missed in 0e1f29e675393e9dcf because it is not actually used
anywhere in the extension. I'd expected it to be used in
DonationInterface.php in a block of code similar to this at line 1038:
if ( $optionalParts['Adyen'] === true )
Procedure per https://www.mediawiki.org/wiki/Manual:GenerateJsonI18n.php
with shim.
Change-Id: I45ece1dbda5b4cdfcb4a833e13da983fd63473c3
---
M amazon_gateway/amazon_gateway.i18n.php
A amazon_gateway/i18n/ast.json
A amazon_gateway/i18n/be-tarask.json
A amazon_gateway/i18n/br.json
A amazon_gateway/i18n/ca.json
A amazon_gateway/i18n/ce.json
A amazon_gateway/i18n/cs.json
A amazon_gateway/i18n/cy.json
A amazon_gateway/i18n/da.json
A amazon_gateway/i18n/de-formal.json
A amazon_gateway/i18n/de.json
A amazon_gateway/i18n/dsb.json
A amazon_gateway/i18n/el.json
A amazon_gateway/i18n/en.json
A amazon_gateway/i18n/eo.json
A amazon_gateway/i18n/es.json
A amazon_gateway/i18n/eu.json
A amazon_gateway/i18n/fa.json
A amazon_gateway/i18n/fi.json
A amazon_gateway/i18n/fr.json
A amazon_gateway/i18n/gl.json
A amazon_gateway/i18n/he.json
A amazon_gateway/i18n/hsb.json
A amazon_gateway/i18n/hu.json
A amazon_gateway/i18n/ia.json
A amazon_gateway/i18n/id.json
A amazon_gateway/i18n/it.json
A amazon_gateway/i18n/ja.json
A amazon_gateway/i18n/ka.json
A amazon_gateway/i18n/ko.json
A amazon_gateway/i18n/ksh.json
A amazon_gateway/i18n/lb.json
A amazon_gateway/i18n/mk.json
A amazon_gateway/i18n/ms.json
A amazon_gateway/i18n/mt.json
A amazon_gateway/i18n/nb.json
A amazon_gateway/i18n/nl.json
A amazon_gateway/i18n/oc.json
A amazon_gateway/i18n/pl.json
A amazon_gateway/i18n/pms.json
A amazon_gateway/i18n/pt-br.json
A amazon_gateway/i18n/qqq.json
A amazon_gateway/i18n/ro.json
A amazon_gateway/i18n/roa-tara.json
A amazon_gateway/i18n/ru.json
A amazon_gateway/i18n/si.json
A amazon_gateway/i18n/sv.json
A amazon_gateway/i18n/te.json
A amazon_gateway/i18n/tl.json
A amazon_gateway/i18n/tr.json
A amazon_gateway/i18n/uk.json
A amazon_gateway/i18n/ur.json
A amazon_gateway/i18n/vi.json
A amazon_gateway/i18n/zh-hans.json
A amazon_gateway/i18n/zh-hant.json
55 files changed, 502 insertions(+), 427 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/amazon_gateway/amazon_gateway.i18n.php
b/amazon_gateway/amazon_gateway.i18n.php
index d71b78b..eeb2776 100644
--- a/amazon_gateway/amazon_gateway.i18n.php
+++ b/amazon_gateway/amazon_gateway.i18n.php
@@ -1,433 +1,31 @@
?php
/**
- * Internationalization file for the Donation Interface - Amazon - extension
+ * This is a backwards-compatibility shim, generated by:
+ *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
*
- * @file
- * @ingroup Extensions
+ * Beginning with MediaWiki 1.23, translation strings are stored in json files,
+ * and the EXTENSION.i18n.php file only exists to provide compatibility with
+ * older releases of MediaWiki. For more information about this migration, see:
+ * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
+ *
+ * This shim maintains compatibility back to MediaWiki 1.17.
*/
-
$messages = array();
+$GLOBALS['wgHooks']['LocalisationCacheRecache'][] = function ( $cache, $code,
$cachedData ) {
+ $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
+ foreach ( $codeSequence as $csCode ) {
+ $fileName = __DIR__ . /i18n/$csCode.json;
+ if ( is_readable( $fileName ) ) {
+ $data = FormatJson::decode( file_get_contents(
$fileName ), true );
+ foreach ( array_keys( $data ) as $key ) {
+ if ( $key === '' || $key[0] === '@' ) {
+ unset( $data[$key] );
+ }
+ }
+ $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
+ }
-/** English */
-$messages['en'] = array(
- 'amazongateway' = 'Make your donation now',
- 'amazon_gateway-desc' = 'Amazon payment processing',
-);
-
-/** Message documentation (Message documentation)
- * @author Shirayuki
- */
-$messages['qqq'] = array(
- 'amazongateway' = '{{Identical|Make your donation now}}',
- 'amazon_gateway-desc' = '{{desc}}',
-);
-
-/** Asturian (asturianu)
- * @author Xuacu
- */
-$messages['ast'] = array(
- 'amazongateway' = 'Fai la to donación agora',
- 'amazon_gateway-desc' = Procesamientu de pagos d'Amazon,
-);
-
-/** Belarusian (Taraškievica orthography) (беларуская (тарашкевіца))
- * @author Wizardist
- */
-$messages['be-tarask'] = array(
- 'amazongateway' = 'Зрабіце ахвяраваньне зараз',
- 'amazon_gateway-desc' =
[MediaWiki-commits] [Gerrit] decom db62, remove from dhcp - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: decom db62, remove from dhcp
..
decom db62, remove from dhcp
RT #7131
Change-Id: I7e44a59548df7f7f782bd5f858e0a5d4463b529c
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 0 insertions(+), 5 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index cfc52e3..6fb8d46 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -727,11 +727,6 @@
fixed-address db60.pmtpa.wmnet;
}
-host db62 {
- hardware ethernet D4:AE:52:7C:A6:FD;
- fixed-address db62.pmtpa.wmnet;
-}
-
host db63 {
hardware ethernet d4:ae:52:90:39:8c;
fixed-address db63.pmtpa.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/121656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7e44a59548df7f7f782bd5f858e0a5d4463b529c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add file for group ext-di-pfpg - change (translatewiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/121673 Change subject: Add file for group ext-di-pfpg .. Add file for group ext-di-pfpg Change-Id: I5bc67b9d29694c9b8c5319978a9168cbf73c06ad --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/73/121673/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 0efa7b3..fd2b3c7 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -473,6 +473,7 @@ Donation Interface - Payflow Pro Gateway format = json +file = DonationInterface/payflowpro_gateway/i18n/%CODE%.json id = ext-di-pfpg descmsg = payflowpro_gateway-desc optional = payflow_gateway-card-name-amex, payflow_gateway-card-name-visa, payflow_gateway-card-name-mc, payflow_gateway-card-name-discover -- To view, visit https://gerrit.wikimedia.org/r/121673 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5bc67b9d29694c9b8c5319978a9168cbf73c06ad Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@kitano.nl ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove trailing period - change (mediawiki...Elastica)
Chad has submitted this change and it was merged.
Change subject: Remove trailing period
..
Remove trailing period
Change-Id: I8a61b44ba2ab0220d2da2a43625d9b49c81dbb9a
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Manybubbles: Verified
Siebrand: Looks good to me, approved
diff --git a/i18n/en.json b/i18n/en.json
index 5867887..b04fd2c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2,5 +2,5 @@
@metadata: {
authors: []
},
-elastica-desc: Base [http://www.elasticsearch.org/ Elasticsearch]
functionality for other extensions by providing [http://elastica.io/ Elastica]
library.
+elastica-desc: Base [http://www.elasticsearch.org/ Elasticsearch]
functionality for other extensions by providing [http://elastica.io/ Elastica]
library
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/121440
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8a61b44ba2ab0220d2da2a43625d9b49c81dbb9a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Elastica
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add snak variation css class in non-JS claim html - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121668
Change subject: Add snak variation css class in non-JS claim html
..
Add snak variation css class in non-JS claim html
Change-Id: Ie90c65e39fe5b5f6c47bb84d6335ac3dac467312
---
M lib/resources/templates.php
M repo/includes/ClaimHtmlGenerator.php
2 files changed, 23 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/68/121668/2
diff --git a/lib/resources/templates.php b/lib/resources/templates.php
index 3292fdb..d8f49e4 100644
--- a/lib/resources/templates.php
+++ b/lib/resources/templates.php
@@ -114,7 +114,7 @@
/div
div class=wb-snak-value-container dir=auto
div class=wb-snak-typeselector/div
- div class=wb-snak-value$2/div
+ div class=wb-snak-value $2$3/div
/div
/div
HTML;
diff --git a/repo/includes/ClaimHtmlGenerator.php
b/repo/includes/ClaimHtmlGenerator.php
index d6936fa..52949ad 100644
--- a/repo/includes/ClaimHtmlGenerator.php
+++ b/repo/includes/ClaimHtmlGenerator.php
@@ -229,20 +229,41 @@
);
}
+ $snakViewVariation = $this-getSnakViewVariation( $snak );
+ $snakViewCssClass = 'wb-snakview-variation-' .
$snakViewVariation;
+
$formattedValue = $this-getFormattedSnakValue( $snak );
- if( $formattedValue === '' ) {
+ if ( $formattedValue === '' ) {
$formattedValue = 'nbsp;';
}
return wfTemplate( 'wb-snak',
// Display property link only once for snaks featuring
the same property:
$propertyLink,
+ $snakViewCssClass,
$formattedValue
);
}
/**
+* @param Snak $snak
+*
+* @return string
+*/
+ private function getSnakViewVariation( Snak $snak ) {
+ if ( $snak instanceof PropertyValueSnak ) {
+ $variation = 'valuesnak';
+ } elseif ( $snak instanceof PropertySomeValueSnak ) {
+ $variation = 'somevaluesnak';
+ } else {
+ $variation = 'novaluesnak';
+ }
+
+ return $variation;
+ }
+
+ /**
* @fixme handle errors more consistently as done in JS UI, and perhaps
add
* localised exception messages.
*
--
To view, visit https://gerrit.wikimedia.org/r/121668
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie90c65e39fe5b5f6c47bb84d6335ac3dac467312
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add file for group ext-di-pfpg - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Add file for group ext-di-pfpg .. Add file for group ext-di-pfpg Change-Id: I5bc67b9d29694c9b8c5319978a9168cbf73c06ad --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 0efa7b3..fd2b3c7 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -473,6 +473,7 @@ Donation Interface - Payflow Pro Gateway format = json +file = DonationInterface/payflowpro_gateway/i18n/%CODE%.json id = ext-di-pfpg descmsg = payflowpro_gateway-desc optional = payflow_gateway-card-name-amex, payflow_gateway-card-name-visa, payflow_gateway-card-name-mc, payflow_gateway-card-name-discover -- To view, visit https://gerrit.wikimedia.org/r/121673 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5bc67b9d29694c9b8c5319978a9168cbf73c06ad Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@kitano.nl Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow reports to be rerun - change (analytics/wikimetrics)
Nuria has submitted this change and it was merged.
Change subject: Allow reports to be rerun
..
Allow reports to be rerun
A few changes had to be made to make it possible to rerun reports. This
patch does not add the ability to schedule recurring reports, it just
makes it possible to create a RunReport object using only the data
stored by the PersistentReport instance created during the initial run.
The RunReport object can then be run on the Celery queue and it yields
results based on the latest data. The report results are automatically
available in the UI, but future commits that implement the recurring
logic may choose to change the display to call out that this is a
scheduled report result.
Change-Id: I163d73bc0bd54276a4d12d915a63382bc592f848
Card: analytics 1378
---
M wikimetrics/controllers/forms/secure_form.py
M wikimetrics/models/report_nodes/report.py
M wikimetrics/models/report_nodes/run_report.py
M wikimetrics/models/report_nodes/validate_report.py
M wikimetrics/static/js/reportCreate.js
5 files changed, 57 insertions(+), 16 deletions(-)
Approvals:
Nuria: Looks good to me, approved
diff --git a/wikimetrics/controllers/forms/secure_form.py
b/wikimetrics/controllers/forms/secure_form.py
index 7e06d19..b3aa219 100644
--- a/wikimetrics/controllers/forms/secure_form.py
+++ b/wikimetrics/controllers/forms/secure_form.py
@@ -19,6 +19,9 @@
This __init__ handles the problem with calling
SessionSecureForm.__init__()
outside of a flask request context.
+# do not validate csrf if we are running tests
+self.no_csrf = 'TESTING' in app.config and app.config['TESTING'] is
True
+
csrf_context = {}
# only access the session if we're in a request context
if current_app:
@@ -27,8 +30,11 @@
SessionSecureForm.__init__(self, csrf_context=csrf_context, *args,
**kwargs)
def validate_csrf_token(self, field):
-# only validate if we are in a real request context
-if app.config['TESTING']:
-return True
-
-return SessionSecureForm.validate_csrf_token(self, field)
+return self.no_csrf or SessionSecureForm.validate_csrf_token(self,
field)
+
+def disable_csrf(self):
+
+Makes calls to validate_csrf_token always return True. Useful for
scheduled
+report runs when the metric is not configured on a form.
+
+self.no_csrf = True
diff --git a/wikimetrics/models/report_nodes/report.py
b/wikimetrics/models/report_nodes/report.py
index eb55daa..c122ae8 100644
--- a/wikimetrics/models/report_nodes/report.py
+++ b/wikimetrics/models/report_nodes/report.py
@@ -61,7 +61,9 @@
queue_result_key=None,
children=None,
public=False,
- parameters='{}'):
+ parameters='{}',
+ recurrent=False,
+ recurrent_parent_id=None):
if children is None:
children = []
diff --git a/wikimetrics/models/report_nodes/run_report.py
b/wikimetrics/models/report_nodes/run_report.py
index f38759b..868ab25 100644
--- a/wikimetrics/models/report_nodes/run_report.py
+++ b/wikimetrics/models/report_nodes/run_report.py
@@ -6,7 +6,7 @@
from wikimetrics.models.user import User
from wikimetrics.models.cohort_user import CohortUser
from wikimetrics.metrics import metric_classes
-from wikimetrics.utils import deduplicate
+from wikimetrics.utils import deduplicate, stringify
from report import ReportNode
from aggregate_report import AggregateReport
from validate_report import ValidateReport
@@ -24,18 +24,44 @@
show_in_ui = False
-def __init__(self, desired_responses, user_id=0, *args, **kwargs):
+def __init__(self,
+ desired_responses,
+ user_id=0,
+ recurrent=False,
+ recurrent_parent_id=None):
+Parameters:
+desired_responses : list of dictionaries of the form:
+cohort: the cohort to run a metric on
+metric: the metric to run
+aggregation: the aggregation options to use
+user_id : the user wishing to run this report
+recurrent : whether this report should recur daily
+recurrent_parent_id : the parent PersistentReport.id for a
recurrent run
+
+super(RunReport, self).__init__(
+user_id=user_id,
+parameters=stringify({'responses': desired_responses}),
+recurrent=recurrent,
+recurrent_parent_id=recurrent_parent_id,
+)
+self.parse_request(desired_responses, recurrent_parent_id is None)
+
+def parse_request(self, desired_responses, validate_csrf):
+
+Takes an array of configured metric+cohort pairs from the user that
are to
[MediaWiki-commits] [Gerrit] Stop registering event handlers twice in referenceview - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Stop registering event handlers twice in referenceview
..
Stop registering event handlers twice in referenceview
Bug: 63225
Change-Id: Iea36de4d0ecb8f61e67580e7af3cd771f7dd5db4
---
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
1 file changed, 0 insertions(+), 2 deletions(-)
Approvals:
WikidataJenkins: Verified
Thiemo Mättig (WMDE): Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
index 716aee5..29b21c6 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
@@ -371,8 +371,6 @@
this.element.removeClass( 'wb-edit' );
this._isInEditMode = false;
- this._attachEditModeEventHandlers();
-
this._trigger( 'afterstopediting', null, [
dropValue ] );
} else {
--
To view, visit https://gerrit.wikimedia.org/r/121674
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iea36de4d0ecb8f61e67580e7af3cd771f7dd5db4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] package-builder.pp: --create must be 1st arg to pbuilder - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121671
Change subject: package-builder.pp: --create must be 1st arg to pbuilder
..
package-builder.pp: --create must be 1st arg to pbuilder
Change-Id: Ic3c98feb5879905c821e84be899d413715719312
---
M manifests/misc/package-builder.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/121671/1
diff --git a/manifests/misc/package-builder.pp
b/manifests/misc/package-builder.pp
index 549ab2a..c276de4 100644
--- a/manifests/misc/package-builder.pp
+++ b/manifests/misc/package-builder.pp
@@ -148,7 +148,7 @@
$image_file = ${pbuilder_root}/${file_prefix}${realdist}.${file_ext}
exec { imaging ${realdist} for ${realpbuilder}:
-command = /bin/mkdir -p ${apt_cache_dir}; ${realpbuilder}
${apt_cache} ${build_place} --create --distribution ${realdist} ${base_option}
${image_file} ${components} ${othermirror},
+command = /bin/mkdir -p ${apt_cache_dir}; ${realpbuilder}
--create ${apt_cache} ${build_place} --distribution ${realdist} ${base_option}
${image_file} ${components} ${othermirror},
creates = $image_file,
path = '/bin:/sbin:/usr/bin:/usr/sbin',
timeout = 600,
--
To view, visit https://gerrit.wikimedia.org/r/121671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic3c98feb5879905c821e84be899d413715719312
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sanitized directory structure - change (mediawiki...BetaFeatures)
jenkins-bot has submitted this change and it was merged.
Change subject: Sanitized directory structure
..
Sanitized directory structure
This has been really bugging me. :)
Renamed/merged directories:
* js/ → resources/
* css/ → resources/
* img/form-icon/ → resources/images/
Updated paths where applicable.
Change-Id: I4bc552252b1ac8966d6d96f84e868dd8bc4609f4
---
M BetaFeatures.php
R resources/betafeatures.css
R resources/betafeatures.js
R resources/ext.betaFeatures.popup.js
R resources/images/checked.png
R resources/images/checked.svg
R resources/images/feature-discussion.png
R resources/images/feature-discussion.svg
R resources/images/feature-information.png
R resources/images/feature-information.svg
R resources/mediawiki.ui.checkbox.js
11 files changed, 15 insertions(+), 15 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/BetaFeatures.php b/BetaFeatures.php
index 005f6e6..d98de93 100644
--- a/BetaFeatures.php
+++ b/BetaFeatures.php
@@ -47,17 +47,17 @@
$wgJobClasses['updateBetaFeaturesUserCounts'] =
'UpdateBetaFeatureUserCountsJob';
$moduleInfo = array(
- 'localBasePath' = __DIR__,
- 'remoteExtPath' = 'BetaFeatures',
+ 'localBasePath' = __DIR__ . '/resources',
+ 'remoteExtPath' = 'BetaFeatures/resources',
);
$wgResourceModules['ext.betaFeatures'] = array(
'scripts' = array(
- 'js/betafeatures.js',
- 'js/mediawiki.ui.checkbox.js',
+ 'betafeatures.js',
+ 'mediawiki.ui.checkbox.js',
),
'styles' = array(
- 'css/betafeatures.css',
+ 'betafeatures.css',
),
'dependencies' = array(
'jquery.client',
@@ -67,7 +67,7 @@
$wgResourceModules['ext.betaFeatures.popup'] = array(
'scripts' = array(
- 'js/ext.betaFeatures.popup.js',
+ 'ext.betaFeatures.popup.js',
),
'dependencies' = array(
diff --git a/css/betafeatures.css b/resources/betafeatures.css
similarity index 91%
rename from css/betafeatures.css
rename to resources/betafeatures.css
index 39e555d..3bc1910 100644
--- a/css/betafeatures.css
+++ b/resources/betafeatures.css
@@ -52,11 +52,11 @@
/* SVG support using a transparent gradient to guarantee cross-browser
* compatibility (browsers able to understand gradient syntax support
also SVG).
*
http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
- background-image: url(../img/form-icon/checked.png);
+ background-image: url(images/checked.png);
/* @embed */
- background-image: -webkit-linear-gradient(transparent, transparent),
url(../img/form-icon/checked.svg);
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(images/checked.svg);
/* @embed */
- background-image: linear-gradient(transparent, transparent),
url(../img/form-icon/checked.svg);
+ background-image: linear-gradient(transparent, transparent),
url(images/checked.svg);
background-repeat: no-repeat;
}
@@ -147,22 +147,22 @@
/* SVG support using a transparent gradient to guarantee cross-browser
* compatibility (browsers able to understand gradient syntax support
also SVG).
*
http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
- background-image: url(../img/form-icon/feature-discussion.png);
+ background-image: url(images/feature-discussion.png);
/* @embed */
- background-image: -webkit-linear-gradient(transparent, transparent),
url(../img/form-icon/feature-discussion.svg);
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(images/feature-discussion.svg);
/* @embed */
- background-image: linear-gradient(transparent, transparent),
url(../img/form-icon/feature-discussion.svg);
+ background-image: linear-gradient(transparent, transparent),
url(images/feature-discussion.svg);
}
.mw-ui-feature-info-link {
/* SVG support using a transparent gradient to guarantee cross-browser
* compatibility (browsers able to understand gradient syntax support
also SVG).
*
http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
- background-image: url(../img/form-icon/feature-information.png);
+ background-image: url(images/feature-information.png);
/* @embed */
- background-image: -webkit-linear-gradient(transparent, transparent),
url(../img/form-icon/feature-information.svg);
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(images/feature-information.svg);
/* @embed */
- background-image: linear-gradient(transparent, transparent),
url(../img/form-icon/feature-information.svg);
+ background-image: linear-gradient(transparent,
[MediaWiki-commits] [Gerrit] Counteract mw.ext.* files being removed in sub-components - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review. https://gerrit.wikimedia.org/r/118968 Change subject: Counteract mw.ext.* files being removed in sub-components .. Counteract mw.ext.* files being removed in sub-components Change-Id: Ifc781f83c5f57f1f206acb7a28962e7ba2210b62 --- M composer.json M lib/resources/Resources.php M lib/resources/experts/resources.php A lib/resources/experts/wikibase.experts.js D lib/resources/experts/wikibase.experts.register.js A lib/resources/formatters/resources.php A lib/resources/formatters/wikibase.formatters.js D lib/resources/formatters/wikibase.formatters.register.js M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Value.js A lib/resources/parsers/resources.php A lib/resources/parsers/wikibase.parsers.js D lib/resources/parsers/wikibase.parsers.register.js 12 files changed, 331 insertions(+), 234 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/68/118968/6 diff --git a/composer.json b/composer.json index 8d466ad..3701457 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ data-values/validators: ~0.1.0, data-values/data-types: ~0.2.0, data-values/serialization: ~1.0, - data-values/javascript: ~0.4.0, + data-values/javascript: ~0.5.0, data-values/value-view: ~0.5.0, wikibase/data-model: ~0.7.2, diff/diff: ~0.9.0, diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php index 4cb73f6..4503847 100644 --- a/lib/resources/Resources.php +++ b/lib/resources/Resources.php @@ -58,119 +58,6 @@ ) ), - 'wikibase.parsers.api' = $moduleTemplate + array( - 'scripts' = array( - 'parsers/wikibase.parsers.api.js', - ), - 'dependencies' = array( - 'wikibase', - ), - ), - - 'wikibase.ApiBasedValueParser' = $moduleTemplate + array( - 'scripts' = array( - 'parsers/ApiBasedValueParser.js', - ), - 'dependencies' = array( - 'util.inherit', - 'valueParsers.ValueParser', - 'wikibase.parsers.api', - ), - ), - - 'wikibase.EntityIdParser' = $moduleTemplate + array( - 'scripts' = array( - 'parsers/EntityIdParser.js', - ), - 'dependencies' = array( - 'util.inherit', - 'valueParsers.ValueParser', - 'wikibase', - 'wikibase.datamodel', - ), - ), - - 'wikibase.GlobeCoordinateParser' = $moduleTemplate + array( - 'scripts' = array( - 'parsers/GlobeCoordinateParser.js', - ), - 'dependencies' = array( - 'util.inherit', - 'wikibase.ApiBasedValueParser', - ), - ), - - 'wikibase.TimeParser' = $moduleTemplate + array( - 'scripts' = array( - 'parsers/TimeParser.js', - ), - 'dependencies' = array( - 'util.inherit', - 'wikibase.ApiBasedValueParser', - ), - ), - - 'wikibase.QuantityParser' = $moduleTemplate + array( - 'scripts' = array( - 'parsers/QuantityParser.js', - ), - 'dependencies' = array( - 'util.inherit', - 'wikibase.ApiBasedValueParser', - ), - ), - - 'wikibase.parsers' = $moduleTemplate + array( - 'scripts' = array( - 'parsers/wikibase.parsers.register.js', - ), - 'dependencies' = array( - 'dataValues.values', - 'mw.ext.valueParsers', - 'wikibase.datamodel', - 'wikibase.EntityIdParser', - 'wikibase.GlobeCoordinateParser', - 'wikibase.QuantityParser', -
[MediaWiki-commits] [Gerrit] Only use -parse on i18n messages if required - change (mediawiki...Thanks)
jenkins-bot has submitted this change and it was merged. Change subject: Only use -parse on i18n messages if required .. Only use -parse on i18n messages if required Change-Id: I89e9d9aa4becde968900f7f07a302de791519004 --- M Thanks.hooks.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/Thanks.hooks.php b/Thanks.hooks.php index 75a4db1..de7e4ca 100644 --- a/Thanks.hooks.php +++ b/Thanks.hooks.php @@ -55,7 +55,7 @@ return Html::element( 'span', array( 'class' = 'mw-thanks-thanked' ), - wfMessage( 'thanks-thanked', $wgUser )-parse() + wfMessage( 'thanks-thanked', $wgUser )-text() ); } @@ -329,7 +329,7 @@ return Html::rawElement( 'span', array( 'class' = $cssInactiveClass ), - wfMessage( 'thanks-button-thanked', $user )-parse() + wfMessage( 'thanks-button-thanked', $user )-escaped() ); } @@ -346,7 +346,7 @@ 'title' = $tooltip, 'data-post-id' = $post-getPostId() ), - wfMessage( 'thanks-button-thank', $user )-parse() + wfMessage( 'thanks-button-thank', $user )-escaped() ); } } -- To view, visit https://gerrit.wikimedia.org/r/121541 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I89e9d9aa4becde968900f7f07a302de791519004 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Thanks Gerrit-Branch: master Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Drop nexus.wmflabs.org from list of repositories - change (analytics/kraken)
Stefan.petrea has submitted this change and it was merged. Change subject: Drop nexus.wmflabs.org from list of repositories .. Drop nexus.wmflabs.org from list of repositories nexus.wmflabs.org got turned off when migrating labs instances to eqiad. Still having it around in the list of repositories, means maven tries to use it, but times out. This make building kraken tremendously slow. As building kraken currently does not rely on jars from nexus.wmflabs.org, we remove nexus.wmflabs.org from the list of repositories. Change-Id: I0d34e5f3ca61ae892153b3f3eaac9434feeaf367 --- M pom.xml 1 file changed, 0 insertions(+), 14 deletions(-) Approvals: Stefan.petrea: Looks good to me, approved jenkins-bot: Verified diff --git a/pom.xml b/pom.xml index 3cbf315..433f3de 100644 --- a/pom.xml +++ b/pom.xml @@ -56,20 +56,6 @@ repositories repository -idwmf-releases/id -nameWMF Releases/name - urlhttp://nexus.wmflabs.org/nexus/content/repositories/releases/url -releasesenabledtrue/enabled/releases -snapshotsenabledfalse/enabled/snapshots -/repository -repository -idwmf-snapshots/id -nameWMF Snapshots/name - urlhttp://nexus.wmflabs.org/nexus/content/repositories/snapshots/url -releasesenabledfalse/enabled/releases -snapshotsenabledtrue/enabled/snapshots -/repository -repository idcloudera/id nameCloudera/name urlhttps://repository.cloudera.com/artifactory/cloudera-repos/url -- To view, visit https://gerrit.wikimedia.org/r/121662 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0d34e5f3ca61ae892153b3f3eaac9434feeaf367 Gerrit-PatchSet: 1 Gerrit-Project: analytics/kraken Gerrit-Branch: master Gerrit-Owner: QChris christ...@quelltextlich.at Gerrit-Reviewer: Stefan.petrea ste...@garage-coding.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implemented changes for getting into translatewiki - change (mediawiki...BlueSpiceFoundation)
Smuggli has uploaded a new change for review. https://gerrit.wikimedia.org/r/121685 Change subject: Implemented changes for getting into translatewiki .. Implemented changes for getting into translatewiki Changed order of messages: FIRST en, SECOND qqq, AFTER THAT doesn't matter Change-Id: I44e6a10f9d55429963aa7c1c89723b2663876ab1 --- M languages/BlueSpice.ExtJS.Portal.i18n.php 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation refs/changes/85/121685/1 diff --git a/languages/BlueSpice.ExtJS.Portal.i18n.php b/languages/BlueSpice.ExtJS.Portal.i18n.php index 09739b0..3c8c844 100644 --- a/languages/BlueSpice.ExtJS.Portal.i18n.php +++ b/languages/BlueSpice.ExtJS.Portal.i18n.php @@ -14,18 +14,6 @@ 'bs-extjs-portal-timespan-alltime' = 'All time' ); -$messages['de'] = array( - 'bs-extjs-portal-config' = 'Portlet konfigurieren:', -//unused 'bs-extjs-portal-portlets' = 'Portlets', - 'bs-extjs-portal-title' = 'Portlettitel', - 'bs-extjs-portal-height' = 'Höhe', - 'bs-extjs-portal-count' = 'Anzahl', - 'bs-extjs-portal-timespan' = 'Zeitraum', - 'bs-extjs-portal-timespan-week' = 'Woche', - 'bs-extjs-portal-timespan-month' = 'Monat', - 'bs-extjs-portal-timespan-alltime' = 'Unbegrenzt' -); - $messages['qqq'] = array( 'bs-extjs-portal-config' = 'Title of configuration dialogues for dashboard portlets. Followed by the name of the portlet, hence the colon.', //unused 'bs-extjs-portal-portlets' = 'Portlets', @@ -36,4 +24,16 @@ 'bs-extjs-portal-timespan-week' = 'Label for timespan option week', 'bs-extjs-portal-timespan-month' = 'Label for timespan option month', 'bs-extjs-portal-timespan-alltime' = 'Label for timespan option unlimited' +); + +$messages['de'] = array( + 'bs-extjs-portal-config' = 'Portlet konfigurieren:', +//unused 'bs-extjs-portal-portlets' = 'Portlets', + 'bs-extjs-portal-title' = 'Portlettitel', + 'bs-extjs-portal-height' = 'Höhe', + 'bs-extjs-portal-count' = 'Anzahl', + 'bs-extjs-portal-timespan' = 'Zeitraum', + 'bs-extjs-portal-timespan-week' = 'Woche', + 'bs-extjs-portal-timespan-month' = 'Monat', + 'bs-extjs-portal-timespan-alltime' = 'Unbegrenzt' ); \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/121685 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I44e6a10f9d55429963aa7c1c89723b2663876ab1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: Smuggli mug...@hallowelt.biz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prepare GeoData config for Elasticsearch switchover - change (operations/mediawiki-config)
MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121691
Change subject: Prepare GeoData config for Elasticsearch switchover
..
Prepare GeoData config for Elasticsearch switchover
Make backend configurable per wiki and per realm.
Because neither of 2 variables have been changed, this commit is a no-op.
Change-Id: I7e9595ce0d2c05636eb654b3e1c91738fba6d669
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
3 files changed, 14 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/91/121691/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 4268384..0d4a6e4 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2241,13 +2241,14 @@
if ( $wmgEnableGeoData ) {
require_once( $IP/extensions/GeoData/GeoData.php );
- $wgGeoDataBackend = 'solr';
+ $wgGeoDataBackend = $wmgGeoDataBackend;
$wgGeoDataSolrMaster = 'solr1001.eqiad.wmnet';
$wgGeoDataSolrHosts = array(
'solr1001.eqiad.wmnet' = 75, // master, put less read load on
it
'solr1002.eqiad.wmnet' = 100,
'solr1003.eqiad.wmnet' = 100,
);
+ $wgGeoDataUseCirrusSearch = $wmgGeoDataUseCirrusSearch;
# Data collection mode
if ( !$wmgEnableGeoSearch ) {
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 8e3733b..a3a6190 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -223,6 +223,12 @@
'wmgEnableGeoData' = array(
'default' = true,
),
+ 'wmgGeoDataBackend' = array(
+ 'default' = 'solr',
+ ),
+ 'wmgGeoDataUseCirrusSearch' = array(
+ 'default' = false,
+ ),
'wmgULSPosition' = array(
# Beta-specific
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index d8dc33a..85a0d24 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12269,6 +12269,12 @@
'wiki' = true,
'wikivoyage' = true,
),
+'wmgGeoDataBackend' = array(
+ 'default' = 'solr',
+),
+'wmgGeoDataUseCirrusSearch' = array(
+ 'default' = false,
+),
'wmgEnableGeoSearch' = array(
'default' = true,
'loginwiki' = false,
--
To view, visit https://gerrit.wikimedia.org/r/121691
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e9595ce0d2c05636eb654b3e1c91738fba6d669
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem maxsem.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VE core submodule to master (5a86ff9) - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to master (5a86ff9) .. Update VE core submodule to master (5a86ff9) New changes: 6b1d082 Update OOjs UI to v0.1.0-pre (e9e435be5e) 24eec6f Fix ClickableNode documentation comment to add a missing period d2fb10f Localisation updates from https://translatewiki.net. 5a86ff9 Update OOjs UI to v0.1.0-pre (23fb1b6144) Change-Id: I167138e92ca502ca198692fcdd443b42d19ec1f0 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved Trevor Parscal: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ve b/lib/ve index 9c19df0..5a86ff9 16 --- a/lib/ve +++ b/lib/ve -Subproject commit 9c19df04295402abde23f09a9c3cb3a1c45fb492 +Subproject commit 5a86ff90535d148c82410cd565f2a1cbf0df6a81 -- To view, visit https://gerrit.wikimedia.org/r/121538 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I167138e92ca502ca198692fcdd443b42d19ec1f0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Trevor Parscal tpars...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: bd00517..6acac41 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: bd00517..6acac41 .. Syncronize VisualEditor: bd00517..6acac41 Change-Id: Id6cdeb858893f59e6d6ab23006d494427b8bc188 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index bd00517..6acac41 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit bd00517709aa8c5cee1e25a2d9f678bd5c9ad651 +Subproject commit 6acac41490d7d765fad54c708244ad92c9dbcb83 -- To view, visit https://gerrit.wikimedia.org/r/121692 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id6cdeb858893f59e6d6ab23006d494427b8bc188 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: bd00517..6acac41 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/121692 Change subject: Syncronize VisualEditor: bd00517..6acac41 .. Syncronize VisualEditor: bd00517..6acac41 Change-Id: Id6cdeb858893f59e6d6ab23006d494427b8bc188 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/92/121692/1 diff --git a/VisualEditor b/VisualEditor index bd00517..6acac41 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit bd00517709aa8c5cee1e25a2d9f678bd5c9ad651 +Subproject commit 6acac41490d7d765fad54c708244ad92c9dbcb83 -- To view, visit https://gerrit.wikimedia.org/r/121692 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id6cdeb858893f59e6d6ab23006d494427b8bc188 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove db62, decom - change (operations/dns)
Dzahn has submitted this change and it was merged. Change subject: remove db62, decom .. remove db62, decom RT #7131 Change-Id: I7ce9cb51bfc93b8820995ad45a29c24f71b8e3b1 --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index 0403c2b..9081395 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -110,7 +110,6 @@ 58 1H IN PTR db48.pmtpa.wmnet. 70 1H IN PTR db60.pmtpa.wmnet. -72 1H IN PTR db62.pmtpa.wmnet. 73 1H IN PTR db63.pmtpa.wmnet. 74 1H IN PTR db64.pmtpa.wmnet. 75 1H IN PTR db65.pmtpa.wmnet. diff --git a/templates/wmnet b/templates/wmnet index ae6ddcd..a0fe725 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -59,7 +59,6 @@ db40 1H IN A10.0.6.50 db481H IN A10.0.6.58 db60 1H IN A10.0.6.70 -db62 1H IN A10.0.6.72 db63 1H IN A10.0.6.73 db64 1H IN A10.0.6.74 db65 1H IN A10.0.6.75 -- To view, visit https://gerrit.wikimedia.org/r/121672 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7ce9cb51bfc93b8820995ad45a29c24f71b8e3b1 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Migrate to JSON i18n - change (mediawiki...OpenStackManager)
jenkins-bot has submitted this change and it was merged. Change subject: Migrate to JSON i18n .. Migrate to JSON i18n Procedure per https://www.mediawiki.org/wiki/Manual:GenerateJsonI18n.php with shim. Change-Id: Ia4953d743c5942a1c1d03d79b55fb779cf703a55 --- M OpenStackManager.i18n.php M OpenStackManager.php A i18n/af.json A i18n/arc.json A i18n/as.json A i18n/ast.json A i18n/az.json A i18n/ba.json A i18n/be-tarask.json A i18n/bg.json A i18n/bn.json A i18n/br.json A i18n/bs.json A i18n/ca.json A i18n/ce.json A i18n/cs.json A i18n/cu.json A i18n/da.json A i18n/de-formal.json A i18n/de.json A i18n/diq.json A i18n/el.json A i18n/en-gb.json A i18n/en.json A i18n/eo.json A i18n/es.json A i18n/et.json A i18n/eu.json A i18n/fa.json A i18n/fi.json A i18n/fr.json A i18n/frp.json A i18n/ga.json A i18n/gl.json A i18n/gsw.json A i18n/gu.json A i18n/he.json A i18n/hi.json A i18n/hsb.json A i18n/hu.json A i18n/ia.json A i18n/id.json A i18n/it.json A i18n/ja.json A i18n/jv.json A i18n/ka.json A i18n/ko.json A i18n/ksh.json A i18n/ku-latn.json A i18n/lb.json A i18n/lt.json A i18n/lv.json A i18n/mk.json A i18n/ml.json A i18n/mr.json A i18n/ms.json A i18n/mt.json A i18n/nap.json A i18n/nb.json A i18n/nds.json A i18n/ne.json A i18n/nl.json A i18n/or.json A i18n/pdc.json A i18n/pfl.json A i18n/pl.json A i18n/pms.json A i18n/ps.json A i18n/pt-br.json A i18n/pt.json A i18n/qqq.json A i18n/ro.json A i18n/roa-tara.json A i18n/ru.json A i18n/sa.json A i18n/sco.json A i18n/si.json A i18n/sl.json A i18n/sr-ec.json A i18n/sr-el.json A i18n/sv.json A i18n/ta.json A i18n/te.json A i18n/tet.json A i18n/tl.json A i18n/tly.json A i18n/tr.json A i18n/tzm.json A i18n/ug-arab.json A i18n/uk.json A i18n/ur.json A i18n/vi.json A i18n/yi.json A i18n/zh-hans.json A i18n/zh-hant.json 95 files changed, 14,065 insertions(+), 14,878 deletions(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/121648 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia4953d743c5942a1c1d03d79b55fb779cf703a55 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OpenStackManager Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@kitano.nl Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix sidebar away bug - change (mediawiki...MediaWikiChat)
UltrasonicNXT has submitted this change and it was merged.
Change subject: Fix sidebar away bug
..
Fix sidebar away bug
Change-Id: I7a23480fb5960870c29cafc6b420c5c71a156aa5
---
M MediaWikiChat.hooks.php
M MediaWikiChat.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
UltrasonicNXT: Verified; Looks good to me, approved
diff --git a/MediaWikiChat.hooks.php b/MediaWikiChat.hooks.php
index 2b69460..3c34c6f 100644
--- a/MediaWikiChat.hooks.php
+++ b/MediaWikiChat.hooks.php
@@ -89,7 +89,7 @@
background-position: right 1em
center;
background-repeat: no-repeat;
background-image:
url($avatar);;
- if ( $away MediaWikiChat::now() - 10
) {
+ if ( $away MediaWikiChat::now() -
12 ) {
$style .= -webkit-filter:
grayscale(1); /* old webkit */
-webkit-filter:
grayscale(100%); /* new webkit */
-moz-filter:
grayscale(100%); /* safari */
diff --git a/MediaWikiChat.php b/MediaWikiChat.php
index f9d1d0b..087afee 100644
--- a/MediaWikiChat.php
+++ b/MediaWikiChat.php
@@ -17,7 +17,7 @@
$wgExtensionCredits['specialpage'][] = array(
'path' = __FILE__,
'name' = 'MediaWikiChat',
- 'version' = '2.10.4',
+ 'version' = '2.10.5',
'author' = 'Adam Carter/UltrasonicNXT',
'url' = 'https://www.mediawiki.org/wiki/Extension:MediaWikiChat',
'descriptionmsg' = 'chat-desc',
--
To view, visit https://gerrit.wikimedia.org/r/121694
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a23480fb5960870c29cafc6b420c5c71a156aa5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT adamr_car...@btinternet.com
Gerrit-Reviewer: UltrasonicNXT adamr_car...@btinternet.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Migrate to JSON i18n - change (mediawiki...Parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Migrate to JSON i18n
..
Migrate to JSON i18n
Procedure per https://www.mediawiki.org/wiki/Manual:GenerateJsonI18n.php
with shim.
Change-Id: I08de52c2756b477a27e8ba18c79ee87df78a5d3b
---
M php/Parsoid.i18n.php
M php/Parsoid.php
A php/i18n/en.json
A php/i18n/qqq.json
4 files changed, 44 insertions(+), 15 deletions(-)
Approvals:
Raimond Spekking: Looks good to me, approved
jenkins-bot: Verified
diff --git a/php/Parsoid.i18n.php b/php/Parsoid.i18n.php
index f972ae3..eeb2776 100644
--- a/php/Parsoid.i18n.php
+++ b/php/Parsoid.i18n.php
@@ -1,15 +1,31 @@
?php
+/**
+ * This is a backwards-compatibility shim, generated by:
+ *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
+ *
+ * Beginning with MediaWiki 1.23, translation strings are stored in json files,
+ * and the EXTENSION.i18n.php file only exists to provide compatibility with
+ * older releases of MediaWiki. For more information about this migration, see:
+ * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
+ *
+ * This shim maintains compatibility back to MediaWiki 1.17.
+ */
$messages = array();
+$GLOBALS['wgHooks']['LocalisationCacheRecache'][] = function ( $cache, $code,
$cachedData ) {
+ $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
+ foreach ( $codeSequence as $csCode ) {
+ $fileName = __DIR__ . /i18n/$csCode.json;
+ if ( is_readable( $fileName ) ) {
+ $data = FormatJson::decode( file_get_contents(
$fileName ), true );
+ foreach ( array_keys( $data ) as $key ) {
+ if ( $key === '' || $key[0] === '@' ) {
+ unset( $data[$key] );
+ }
+ }
+ $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
+ }
-/** English
- * @author Gabriel Wicke
- */
-$messages['en'] = array(
- 'parsoid-desc' = 'Parsoid wiki runtime for MediaWiki'
-);
-
-/** Message documentation
- */
-$messages['qqq'] = array(
- 'parsoid-desc' =
'{{desc|name=Parsoid|url=http://www.mediawiki.org/wiki/Parsoid}}',
-);
+ $cachedData['deps'][] = new FileDependency( $fileName );
+ }
+ return true;
+};
diff --git a/php/Parsoid.php b/php/Parsoid.php
index 7609d26..f3e274c 100644
--- a/php/Parsoid.php
+++ b/php/Parsoid.php
@@ -12,7 +12,6 @@
* Class containing basic setup functions.
*/
class ParsoidSetup {
-
/**
* Set up Parsoid.
*
@@ -46,12 +45,13 @@
'Adam Wight',
'C. Scott Ananian'
),
- 'version' = '0.1.0',
+ 'version' = '0.2.0',
'url' = 'https://www.mediawiki.org/wiki/Parsoid',
'descriptionmsg' = 'parsoid-desc',
);
# Register localizations.
+ $wgMessagesDirs['Parsoid'] = __DIR__ . '/i18n';
$wgExtensionMessagesFiles['Parsoid'] = $dir .
'/Parsoid.i18n.php';
# Set up a default configuration
@@ -127,7 +127,6 @@
# File upload
$wgHooks['FileUpload'][] = 'ParsoidHooks::onFileUpload';
}
-
}
# Load hooks that are always set
diff --git a/php/i18n/en.json b/php/i18n/en.json
new file mode 100644
index 000..9391dd8
--- /dev/null
+++ b/php/i18n/en.json
@@ -0,0 +1,8 @@
+{
+@metadata: {
+authors: [
+Gabriel Wicke
+]
+},
+parsoid-desc: Parsoid wiki runtime for MediaWiki
+}
\ No newline at end of file
diff --git a/php/i18n/qqq.json b/php/i18n/qqq.json
new file mode 100644
index 000..bdf9e4a
--- /dev/null
+++ b/php/i18n/qqq.json
@@ -0,0 +1,6 @@
+{
+@metadata: {
+authors: []
+},
+parsoid-desc:
{{desc|name=Parsoid|url=http://www.mediawiki.org/wiki/Parsoid}};
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/121646
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I08de52c2756b477a27e8ba18c79ee87df78a5d3b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Migrate to JSON i18n - change (mediawiki...PageImages)
jenkins-bot has submitted this change and it was merged.
Change subject: Migrate to JSON i18n
..
Migrate to JSON i18n
Procedure per https://www.mediawiki.org/wiki/Manual:GenerateJsonI18n.php
with shim.
Change-Id: I5b344b529252da5c24e261d3cef3acafdbc14bf0
---
M PageImages.i18n.php
M PageImages.php
A i18n/ast.json
A i18n/be-tarask.json
A i18n/ce.json
A i18n/cs.json
A i18n/de.json
A i18n/dsb.json
A i18n/en.json
A i18n/es.json
A i18n/et.json
A i18n/fa.json
A i18n/fi.json
A i18n/fr.json
A i18n/gl.json
A i18n/he.json
A i18n/hsb.json
A i18n/ia.json
A i18n/ilo.json
A i18n/it.json
A i18n/ja.json
A i18n/ko.json
A i18n/ksh.json
A i18n/lb.json
A i18n/mk.json
A i18n/ml.json
A i18n/ms.json
A i18n/nb.json
A i18n/nl.json
A i18n/pl.json
A i18n/pms.json
A i18n/qqq.json
A i18n/roa-tara.json
A i18n/ru.json
A i18n/sco.json
A i18n/sv.json
A i18n/tl.json
A i18n/uk.json
A i18n/vi.json
A i18n/zh-hans.json
A i18n/zh-hant.json
41 files changed, 343 insertions(+), 276 deletions(-)
Approvals:
Raimond Spekking: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PageImages.i18n.php b/PageImages.i18n.php
index 053b49c..eeb2776 100644
--- a/PageImages.i18n.php
+++ b/PageImages.i18n.php
@@ -1,275 +1,31 @@
?php
-
+/**
+ * This is a backwards-compatibility shim, generated by:
+ *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
+ *
+ * Beginning with MediaWiki 1.23, translation strings are stored in json files,
+ * and the EXTENSION.i18n.php file only exists to provide compatibility with
+ * older releases of MediaWiki. For more information about this migration, see:
+ * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
+ *
+ * This shim maintains compatibility back to MediaWiki 1.17.
+ */
$messages = array();
+$GLOBALS['wgHooks']['LocalisationCacheRecache'][] = function ( $cache, $code,
$cachedData ) {
+ $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
+ foreach ( $codeSequence as $csCode ) {
+ $fileName = __DIR__ . /i18n/$csCode.json;
+ if ( is_readable( $fileName ) ) {
+ $data = FormatJson::decode( file_get_contents(
$fileName ), true );
+ foreach ( array_keys( $data ) as $key ) {
+ if ( $key === '' || $key[0] === '@' ) {
+ unset( $data[$key] );
+ }
+ }
+ $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
+ }
-$messages['en'] = array (
- 'pageimages-desc' = 'Collects information about images used on page',
- 'pageimages-blacklist' = '', # do not translate or duplicate this
message to other languages
-);
-
-/** Message documentation (Message documentation)
- * @author Shirayuki
- */
-$messages['qqq'] = array(
- 'pageimages-desc' = '{{desc|name=Page
Images|url=http://www.mediawiki.org/wiki/Extension:PageImages}}',
- 'pageimages-blacklist' = 'List of images. They will never be selected
as page images',
-);
-
-/** Asturian (asturianu)
- * @author Xuacu
- */
-$messages['ast'] = array(
- 'pageimages-desc' = Recueye información de les imaxes que s'usen nuna
páxina,
-);
-
-/** Belarusian (Taraškievica orthography) (беларуская (тарашкевіца))
- * @author Wizardist
- */
-$messages['be-tarask'] = array(
- 'pageimages-desc' = 'Зьбірае зьвесткі пра выявы, выкарыстаныя на
старонцы',
-);
-
-/** Chechen (нохчийн)
- * @author Умар
- */
-$messages['ce'] = array(
- 'pageimages-desc' = 'АгӀонашкахь лелина долу суьртийн хаам схьагулбо',
-);
-
-/** Czech (čeština)
- * @author Mormegil
- */
-$messages['cs'] = array(
- 'pageimages-desc' = 'Sbírá informace o obrázcích používaných na
stránce',
-);
-
-/** German (Deutsch)
- * @author Kghbln
- */
-$messages['de'] = array(
- 'pageimages-desc' = 'Ermöglicht das Sammeln von Informationen zu
Bildern, die sich auf einer Seite befinden',
-);
-
-/** Lower Sorbian (dolnoserbski)
- * @author Michawiki
- */
-$messages['dsb'] = array(
- 'pageimages-desc' = 'Zběra informacije wó wobrazach, kótarež su na
boku',
-);
-
-/** Spanish (español)
- * @author Armando-Martin
- */
-$messages['es'] = array(
- 'pageimages-desc' = 'Recopila información sobre las imágenes
utilizadas en la página',
-);
-
-/** Estonian (eesti)
- * @author Pikne
- */
-$messages['et'] = array(
- 'pageimages-desc' = 'Kogub teavet leheküljel kasutatud piltide kohta.',
-);
-
-/** Persian (فارسی)
- * @author Reza1615
- */
-$messages['fa'] = array(
- 'pageimages-desc' = 'جمعآوری اطلاعات درباره تصاویر مورد استفاده در
صفحه',
-);
-
-/** Finnish (suomi)
- * @author VezonThunder
- */
-$messages['fi'] = array(
- 'pageimages-desc' = 'Kerää tietoa sivulla käytetyistä kuvista',
-);
-
-/** French (français)
- * @author DavidL
- */
[MediaWiki-commits] [Gerrit] Make jshint voting for LiquidThreads - change (integration/zuul-config)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/121688 Change subject: Make jshint voting for LiquidThreads .. Make jshint voting for LiquidThreads Bug: 61610 Change-Id: Iee543b87144db2b039651539421900ceb6f8c4e6 --- M layout.yaml 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/88/121688/1 diff --git a/layout.yaml b/layout.yaml index 30ff47f..029f337 100644 --- a/layout.yaml +++ b/layout.yaml @@ -414,8 +414,6 @@ voting: false - name: mwext-Lingo-jslint # bug 61609 voting: false - - name: mwext-LiquidThreads-jslint # bug 61610 -voting: false - name: mwext-Maps-jslint # bug 61611 voting: false - name: mwext-MoodBar-jslint # bug 61612 -- To view, visit https://gerrit.wikimedia.org/r/121688 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iee543b87144db2b039651539421900ceb6f8c4e6 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] elasticsearch: prevent dupe packages - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: elasticsearch: prevent dupe packages
..
elasticsearch: prevent dupe packages
curl and openjdk-7 might be defined elsewhere, only define the packages
if they haven't been realized yet.
Dupe issue happens when using role::ci::slave::labs which use
contint::packages that ships the same packages.
Change-Id: Ifd0b9c6f4da82959700e8f48fc88d2a684d961f3
---
M modules/elasticsearch/manifests/packages.pp
1 file changed, 9 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/elasticsearch/manifests/packages.pp
b/modules/elasticsearch/manifests/packages.pp
index 7a1b694..5e0df45 100644
--- a/modules/elasticsearch/manifests/packages.pp
+++ b/modules/elasticsearch/manifests/packages.pp
@@ -3,5 +3,13 @@
# Provisions Elasticsearch package and dependencies.
#
class elasticsearch::packages {
-package { [ 'openjdk-7-jdk', 'elasticsearch', 'curl' ]: }
+package { 'elasticsearch': }
+
+ if ! defined ( Package['openjdk-7-jdk'] ) {
+ package { 'openjdk-7-jdk': ensure = present }
+}
+ if ! defined ( Package['curl'] ) {
+ package { 'curl': ensure = present }
+}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/121659
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd0b9c6f4da82959700e8f48fc88d2a684d961f3
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add temporary PTR record for mail.tools.wmflabs.org - change (operations/dns)
coren has submitted this change and it was merged. Change subject: Add temporary PTR record for mail.tools.wmflabs.org .. Add temporary PTR record for mail.tools.wmflabs.org PTR records for public IPs should be handled dynamically by labs-ns0. However, we need an interim solution for the Tools mail server as many other mail servers reject mail from a server with no PTR record. The old PTR record for the pmtpa Tools mail server (208.80.153.183) can be removed. Bug: 51359 Bug: 62887 Change-Id: I16b7673e907550f7d9777f536706878183df4b7c --- M templates/153.80.208.in-addr.arpa M templates/155.80.208.in-addr.arpa 2 files changed, 7 insertions(+), 5 deletions(-) Approvals: coren: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/153.80.208.in-addr.arpa b/templates/153.80.208.in-addr.arpa index e0b13ea..fb8c13b 100644 --- a/templates/153.80.208.in-addr.arpa +++ b/templates/153.80.208.in-addr.arpa @@ -16,8 +16,3 @@ ; Virtualization subnet #2 208.80.153.64/26 (208.80.153.64 - 208.80.153.127) ; Virtualization subnet 208.80.153.128/25 (208.80.153.128 - 208.80.153.255) - -; MXes need proper reverse - -1831D IN PTR tools-mail.wmflabs.org. - diff --git a/templates/155.80.208.in-addr.arpa b/templates/155.80.208.in-addr.arpa index d4cbefd..05078b8 100644 --- a/templates/155.80.208.in-addr.arpa +++ b/templates/155.80.208.in-addr.arpa @@ -68,3 +68,10 @@ ; 208.80.155.128/25 Eqiad Labs virtualization subnet + +; FIXME: These public IPs should be handled dynamically by labs-ns0 +; (cf. bug #62887). However, we need an interim solution for the +; Tools mail server as many other mail servers reject mail from a +; server with no PTR record (cf. bug #51359). + +162 1H IN PTR mail.tools.wmflabs.org. -- To view, visit https://gerrit.wikimedia.org/r/121416 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I16b7673e907550f7d9777f536706878183df4b7c Gerrit-PatchSet: 2 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Tim Landscheidt t...@tim-landscheidt.de Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org Gerrit-Reviewer: Petrb benap...@gmail.com Gerrit-Reviewer: Ryan Lane rl...@wikimedia.org Gerrit-Reviewer: coren mpellet...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add utility functions for scheduling - change (analytics/wikimetrics)
Nuria has submitted this change and it was merged.
Change subject: Add utility functions for scheduling
..
Add utility functions for scheduling
Adds two utility functions that are useful for scheduled task
implementation.
* diff_datewise finds differences between lists of dates,
and supports parsing those lists from lists of strings.
* timestamps_to_now gives you an efficient datastructure that enumerates
dates from some start to now, at some interval.
Change-Id: I1b9e2603938fcb18d9f396a8bb2fef0741d6ac9d
Card: analytics 1378
---
M tests/test_utils/test_one_off_functions.py
M wikimetrics/utils.py
2 files changed, 106 insertions(+), 4 deletions(-)
Approvals:
Nuria: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/test_utils/test_one_off_functions.py
b/tests/test_utils/test_one_off_functions.py
index 407d15c..e13dd78 100644
--- a/tests/test_utils/test_one_off_functions.py
+++ b/tests/test_utils/test_one_off_functions.py
@@ -1,5 +1,5 @@
# -*- coding:utf-8 -*-
-import datetime
+from datetime import datetime, timedelta, date
import decimal
from nose.tools import assert_true, assert_equal
from unittest import TestCase
@@ -11,6 +11,8 @@
link_to_user_page,
parse_pretty_date,
format_pretty_date,
+diff_datewise,
+timestamps_to_now,
)
from wikimetrics.metrics import NamespaceEdits
@@ -18,12 +20,12 @@
class UtilsTest(TestCase):
def test_better_encoder_date(self):
-result = stringify(date_not_date_time=datetime.date(2013, 06, 01))
+result = stringify(date_not_date_time=date(2013, 06, 01))
assert_true(result.find('date_not_date_time') = 0)
assert_true(result.find('2013-06-01') = 0)
def test_better_encoder_datetime(self):
-result = stringify(date_time=datetime.datetime(2013, 06, 01, 02, 03,
04))
+result = stringify(date_time=datetime(2013, 06, 01, 02, 03, 04))
assert_true(result.find('date_time') = 0)
assert_true(result.find('2013-06-01 02:03:04') = 0)
@@ -88,5 +90,54 @@
assert_true(True)
def test_parse_pretty_date(self):
-date = datetime.datetime(2012, 2, 3, 4, 5)
+date = datetime(2012, 2, 3, 4, 5)
assert_equal(date, parse_pretty_date(format_pretty_date(date)))
+
+
+class TestUtil(TestCase):
+def test_diff_datewise(self):
+l = []
+l_just_dates = []
+r = []
+r_just_dates = []
+lp = 'blah%Y...%m...%d...%Hblahblah'
+rp = 'neenee%Y%m%d%Hneenee'
+
+expect0 = set([datetime(2012, 6, 14, 13), datetime(2012, 11, 9, 3)])
+expect1 = set([datetime(2012, 6, 14, 14), datetime(2013, 11, 10, 22)])
+
+for y in range(2012, 2014):
+for m in range(1, 13):
+# we're just diffing so we don't care about getting all days
+for d in range(1, 28):
+for h in range(0, 24):
+x = datetime(y, m, d, h)
+if x not in expect1:
+l.append(datetime.strftime(x, lp))
+l_just_dates.append(x)
+if x not in expect0:
+r.append(datetime.strftime(x, rp))
+r_just_dates.append(x)
+
+result = diff_datewise(l, r, left_parse=lp, right_parse=rp)
+self.assertEqual(result[0], expect0)
+self.assertEqual(result[1], expect1)
+
+result = diff_datewise(l_just_dates, r, right_parse=rp)
+self.assertEqual(result[0], expect0)
+self.assertEqual(result[1], expect1)
+
+result = diff_datewise(l_just_dates, r_just_dates)
+self.assertEqual(result[0], expect0)
+self.assertEqual(result[1], expect1)
+
+def test_timestamps_to_now(self):
+now = datetime.now()
+start = now - timedelta(hours=2)
+expect = [
+start,
+start + timedelta(hours=1),
+start + timedelta(hours=2),
+]
+timestamps = timestamps_to_now(start, timedelta(hours=1))
+self.assertEqual(expect, list(timestamps))
diff --git a/wikimetrics/utils.py b/wikimetrics/utils.py
index 166d78b..5952da3 100644
--- a/wikimetrics/utils.py
+++ b/wikimetrics/utils.py
@@ -164,6 +164,57 @@
os.makedirs(full_path)
+def diff_datewise(left, right, left_parse=None, right_parse=None):
+
+Parameters
+left: a list of datetime strings or objects
+right : a list of datetime strings or objects
+left_parse : if left contains datetimes, None; else a strptime format
+right_parse : if right contains datetimes, None; else a strptime format
+
+Returns
+A tuple of two sets:
+[0] : the datetime objects in left but not right
+[1] : the datetime objects in right but not left
+
+
+
[MediaWiki-commits] [Gerrit] Change email address inputs in GC forms to use type=email - change (mediawiki...DonationInterface)
Pcoombe has uploaded a new change for review. https://gerrit.wikimedia.org/r/121690 Change subject: Change email address inputs in GC forms to use type=email .. Change email address inputs in GC forms to use type=email Use the HTML5 attribute type=email on email address input elements. Most browsers will recognise this, and mobile browsers will use a soft keyboard more suited to inputting an email address. Browsers which don't recognise it will seamlessly fall back to type=text See http://diveintohtml5.info/forms.html#type-email for more info Also change CSS so inputs with type=email are styled the same as type=text Change-Id: I2c6856bdfcc5fe0b0413b67fc05d262ed8200aba --- M globalcollect_gateway/forms/html/_personal-information/BR.html M globalcollect_gateway/forms/html/_personal-information/CA.html M globalcollect_gateway/forms/html/_personal-information/GB.html M globalcollect_gateway/forms/html/_personal-information/JP.html M globalcollect_gateway/forms/html/_personal-information/US.html M globalcollect_gateway/forms/html/_personal-information/default.html M modules/css/gateway.css 7 files changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/90/121690/1 diff --git a/globalcollect_gateway/forms/html/_personal-information/BR.html b/globalcollect_gateway/forms/html/_personal-information/BR.html index 10a3d11..7d90daa 100644 --- a/globalcollect_gateway/forms/html/_personal-information/BR.html +++ b/globalcollect_gateway/forms/html/_personal-information/BR.html @@ -65,7 +65,7 @@ /tr tr td colspan=2 -input class=fullwidth name=emailAdd value=@emailAdd type=text title=%donate_interface-donor-email% placeholder=%donate_interface-donor-email% id=emailAdd +input class=fullwidth name=emailAdd value=@emailAdd type=email title=%donate_interface-donor-email% placeholder=%donate_interface-donor-email% id=emailAdd /td /tr diff --git a/globalcollect_gateway/forms/html/_personal-information/CA.html b/globalcollect_gateway/forms/html/_personal-information/CA.html index 85ad76d..d088fee 100644 --- a/globalcollect_gateway/forms/html/_personal-information/CA.html +++ b/globalcollect_gateway/forms/html/_personal-information/CA.html @@ -50,6 +50,6 @@ /tr tr td colspan=2 - input class=fullwidth name=emailAdd value=@emailAdd type=text title=%donate_interface-donor-email% placeholder=%donate_interface-donor-email% id=emailAdd + input class=fullwidth name=emailAdd value=@emailAdd type=email title=%donate_interface-donor-email% placeholder=%donate_interface-donor-email% id=emailAdd /td /tr diff --git a/globalcollect_gateway/forms/html/_personal-information/GB.html b/globalcollect_gateway/forms/html/_personal-information/GB.html index fac7e7f..215ef2e 100644 --- a/globalcollect_gateway/forms/html/_personal-information/GB.html +++ b/globalcollect_gateway/forms/html/_personal-information/GB.html @@ -161,7 +161,7 @@ /tr tr td colspan=2 -input class=fullwidth name=emailAdd value=@emailAdd type=text title=%donate_interface-donor-email% placeholder=%donate_interface-donor-email% id=emailAdd +input class=fullwidth name=emailAdd value=@emailAdd type=email title=%donate_interface-donor-email% placeholder=%donate_interface-donor-email% id=emailAdd /td /tr \ No newline at end of file diff --git a/globalcollect_gateway/forms/html/_personal-information/JP.html b/globalcollect_gateway/forms/html/_personal-information/JP.html index 22188b4..5a4473b 100644 --- a/globalcollect_gateway/forms/html/_personal-information/JP.html +++ b/globalcollect_gateway/forms/html/_personal-information/JP.html @@ -10,7 +10,7 @@ /tr tr td colspan=2 -input class=fullwidth name=emailAdd value=@emailAdd type=text title=%donate_interface-donor-email% placeholder=%donate_interface-donor-email% id=emailAdd +input class=fullwidth name=emailAdd value=@emailAdd type=email title=%donate_interface-donor-email% placeholder=%donate_interface-donor-email% id=emailAdd /td /tr tr class=collapsingCity diff --git a/globalcollect_gateway/forms/html/_personal-information/US.html b/globalcollect_gateway/forms/html/_personal-information/US.html index 0ad2baa..1e9fafd 100644 --- a/globalcollect_gateway/forms/html/_personal-information/US.html +++ b/globalcollect_gateway/forms/html/_personal-information/US.html @@ -87,6 +87,6 @@ /tr tr td colspan=2 - input class=fullwidth name=emailAdd value=@emailAdd type=text title=%donate_interface-donor-email% placeholder=%donate_interface-donor-email% id=emailAdd + input class=fullwidth name=emailAdd value=@emailAdd type=email title=%donate_interface-donor-email% placeholder=%donate_interface-donor-email% id=emailAdd /td /tr diff --git
[MediaWiki-commits] [Gerrit] Implemented changes for getting into translatewiki - change (mediawiki...BlueSpiceFoundation)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121687
Change subject: Implemented changes for getting into translatewiki
..
Implemented changes for getting into translatewiki
Changed order of messages: FIRST en, SECOND qqq, AFTER THAT doesn't matter
Added GENDER support to personalized messages
Change-Id: I7d71828ba3d394674e55fb5bc809df27bf909eeb
---
M languages/BlueSpice.i18n.php
1 file changed, 179 insertions(+), 180 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/87/121687/1
diff --git a/languages/BlueSpice.i18n.php b/languages/BlueSpice.i18n.php
index 751187f..f6c696e 100644
--- a/languages/BlueSpice.i18n.php
+++ b/languages/BlueSpice.i18n.php
@@ -5,7 +5,6 @@
* Part of BlueSpice for MediaWiki
*
* @author Stephan Muggli mug...@hallowelt.biz
-
* @packageBlueSpice_Core
* @subpackage BlueSpice
* @copyright Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All
rights reserved.
@@ -15,136 +14,64 @@
$messages = array();
-$messages['de'] = array(
- 'bs-ns_main'= '(Seiten)',
- 'bs-ns_all' = '(alle)',
- 'bs-shortdatetime' = 'd.m.Y H:i',
- 'bs-tab_navigation' = 'Navigation',
- 'bs-tab_focus' = 'Fokus',
- 'bs-tab_admin' = 'Admin',
- 'bs-userbar_loginswitch_logout' = 'Abmelden',
- 'bs-userbar_loginswitch_login' = 'Anmelden',
- 'bs-extended-search-tooltip-title' = 'Titelsuche',
- 'bs-extended-search-tooltip-fulltext' = 'Volltextsuche',
- 'bs-extended-search-textfield-defaultvalue' = 'Suche...',
- 'bs-extended-search-textfield-tooltip' = 'Wiki durchsuchen
[alt-shift-f]',
- 'bs-no-information-available' = 'Keine Informationen
verfügbar',
- 'bs-years-duration' = '{{PLURAL:$1|einem
Jahr|$1 Jahren}}',
- 'bs-months-duration'= '{{PLURAL:$1|einem
Monat|$1 Monaten}}',
- 'bs-weeks-duration' = '{{PLURAL:$1|einer
Woche|$1 Wochen}}',
- 'bs-days-duration' = '{{PLURAL:$1|einem
Tag|$1 Tagen}}',
- 'bs-hours-duration' = '{{PLURAL:$1|einer
Stunde|$1 Stunden}}',
- 'bs-mins-duration' = '{{PLURAL:$1|einer
Minute|$1 Minuten}}',
- 'bs-secs-duration' = '{{PLURAL:$1|einer
Sekunde|$1 Sekunden}}',
- 'bs-two-units-ago' = 'vor $1 und $2',
- 'bs-one-unit-ago' = 'vor $1',
- 'bs-now'= 'jetzt',
- 'bs-mail-greeting-receiver' = Hallo $1,\n\n,
- 'bs-mail-greeting-no-receiver' = Hallo,\n\n,
- 'bs-mail-footer'=
\n\n-\n\nDies ist eine automatisch generierte Mail. Bitte
antworte nicht an den Absender dieser E-Mail!\n\n-,
- 'bs-mail-greeting-receiver-html'= Hallo $1,br /br
/,
- 'bs-mail-greeting-no-receiver-html' = Hallo,br /br /,
- 'bs-mail-footer-html' = br /br
/-br /br /Dies ist eine automatisch generierte Mail.
Bitte antworte nicht an den Absender dieser E-Mail!br /br
/-,
- 'bs-userpagesettings-legend'=
'Benutzereinstellungen',
- 'bs-userpreferences-link-text' = 'Weitere
Benutzereinstellungen',
- 'bs-userpreferences-link-title' = 'Klicke hier, um zur
persönlichen Einstellungsseite zu gelangen.',
- 'bs-exception-view-heading' = 'Es ist ein Fehler
aufgetreten',
- 'bs-exception-view-text'= 'Bei der
Verarbeitung Deiner Anfrage ist folgender Fehler aufgetreten:',
- 'bs-exception-view-admin-hint' = 'Bitte kontaktiere
Deinen Administrator.',
- 'bs-exception-view-stacktrace-toggle-show-text' = 'Fehlerdetails
anzeigen',
- 'bs-exception-view-stacktrace-toggle-hide-text' = 'Fehlerdetails
verbergen',
- 'bs-viewtagerrorlist-legend'= '$1 - Fehler',
- 'bs-readonly' = 'Die Datenbank ist
vorübergehend für Neueinträge und Änderungen gesperrt. Bitte versuche es später
noch einmal. Grund der Sperrung: $1. ',
- 'bs-imageofotheruser' = 'Du bist nicht
berechtigt ein Bild für einen anderen Benutzer hochzuladen.',
- 'bs-pref-sortalph'
[MediaWiki-commits] [Gerrit] Migrate to JSON i18n - change (mediawiki...PageTriage)
jenkins-bot has submitted this change and it was merged. Change subject: Migrate to JSON i18n .. Migrate to JSON i18n Procedure per https://www.mediawiki.org/wiki/Manual:GenerateJsonI18n.php with shim. Change-Id: I27a4e14ec7daaa6a1f25a324172444a3ee5d5737 --- M PageTriage.i18n.php M PageTriage.php A i18n/af.json A i18n/ar.json A i18n/arc.json A i18n/ba.json A i18n/be-tarask.json A i18n/bg.json A i18n/br.json A i18n/bxr.json A i18n/ce.json A i18n/co.json A i18n/cs.json A i18n/cu.json A i18n/de-formal.json A i18n/de.json A i18n/diq.json A i18n/el.json A i18n/en-gb.json A i18n/en.json A i18n/eo.json A i18n/es.json A i18n/et.json A i18n/eu.json A i18n/fa.json A i18n/fi.json A i18n/fr.json A i18n/frp.json A i18n/ga.json A i18n/gl.json A i18n/he.json A i18n/hi.json A i18n/hsb.json A i18n/hu.json A i18n/ia.json A i18n/id.json A i18n/is.json A i18n/it.json A i18n/ja.json A i18n/ka.json A i18n/ko.json A i18n/ksh.json A i18n/ku-latn.json A i18n/lb.json A i18n/mk.json A i18n/mr.json A i18n/mt.json A i18n/nds.json A i18n/nl.json A i18n/pam.json A i18n/pl.json A i18n/pms.json A i18n/ps.json A i18n/pt-br.json A i18n/pt.json A i18n/qqq.json A i18n/ro.json A i18n/roa-tara.json A i18n/ru.json A i18n/scn.json A i18n/si.json A i18n/sr-ec.json A i18n/sr-el.json A i18n/sv.json A i18n/ta.json A i18n/te.json A i18n/tl.json A i18n/tly.json A i18n/tr.json A i18n/uk.json A i18n/ur.json A i18n/vi.json A i18n/yi.json A i18n/zh-hans.json A i18n/zh-hant.json 75 files changed, 9,416 insertions(+), 9,541 deletions(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/121643 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I27a4e14ec7daaa6a1f25a324172444a3ee5d5737 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageTriage Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@kitano.nl Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use proper php.ini comment format - change (operations/puppet)
Chad has uploaded a new change for review. https://gerrit.wikimedia.org/r/121695 Change subject: Use proper php.ini comment format .. Use proper php.ini comment format Change-Id: Ic3cd824e3c41d04bf911a3c872c5e9fe43240e0f --- M files/php/fss.ini.snaps.hardy 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/95/121695/1 diff --git a/files/php/fss.ini.snaps.hardy b/files/php/fss.ini.snaps.hardy index 8d90ed0..8874191 100644 --- a/files/php/fss.ini.snaps.hardy +++ b/files/php/fss.ini.snaps.hardy @@ -1,4 +1,4 @@ ; This file is managed by Puppet! -# Enable FastStringSearch extension +; Enable FastStringSearch extension extension=fss.so -- To view, visit https://gerrit.wikimedia.org/r/121695 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic3cd824e3c41d04bf911a3c872c5e9fe43240e0f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Chad ch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (23fb1b6144) - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Update OOjs UI to v0.1.0-pre (23fb1b6144)
..
Update OOjs UI to v0.1.0-pre (23fb1b6144)
New changes:
41e01ca Add documentation explaining what's going on in GroupWidget
de8cd1d intro/outro: Keep local reference to OO inside closure
8bc207e Localisation updates from https://translatewiki.net.
5e1422e [BREAKING CHANGE] Use registry for tool group types
5d3ac51 Basic toolbar demo
ad53af5 Styling for disabled toolgroups
3529d6f Force visible label for MenuToolGroups
Change-Id: Ifdda408c17e257ffb3de2474bd64f5e2689e94d6
---
M resources/oojs-ui/i18n/es.json
M resources/oojs-ui/i18n/et.json
M resources/oojs-ui/i18n/kk-cyrl.json
M resources/oojs-ui/i18n/qu.json
M resources/oojs-ui/oojs-ui-apex.css
M resources/oojs-ui/oojs-ui.js
M resources/oojs-ui/oojs-ui.svg.css
7 files changed, 131 insertions(+), 33 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/oojs-ui/i18n/es.json b/resources/oojs-ui/i18n/es.json
index 0d822bc..eb53138 100644
--- a/resources/oojs-ui/i18n/es.json
+++ b/resources/oojs-ui/i18n/es.json
@@ -19,5 +19,6 @@
ooui-dialog-action-close: Cerrar,
ooui-outline-control-move-down: Mover abajo,
ooui-outline-control-move-up: Mover arriba,
+ooui-outline-control-remove: Eliminar elemento,
ooui-toolbar-more: Más
}
\ No newline at end of file
diff --git a/resources/oojs-ui/i18n/et.json b/resources/oojs-ui/i18n/et.json
index 4af8dbe..aa780e4 100644
--- a/resources/oojs-ui/i18n/et.json
+++ b/resources/oojs-ui/i18n/et.json
@@ -8,5 +8,6 @@
ooui-dialog-action-close: Sule,
ooui-outline-control-move-down: Liiguta üksust allapoole,
ooui-outline-control-move-up: Liiguta üksust ülespoole,
+ooui-outline-control-remove: Eemalda üksus,
ooui-toolbar-more: Veel
}
\ No newline at end of file
diff --git a/resources/oojs-ui/i18n/kk-cyrl.json
b/resources/oojs-ui/i18n/kk-cyrl.json
index 4c27b07..df37fe3 100644
--- a/resources/oojs-ui/i18n/kk-cyrl.json
+++ b/resources/oojs-ui/i18n/kk-cyrl.json
@@ -7,5 +7,6 @@
ooui-dialog-action-close: Жабу,
ooui-outline-control-move-down: Элементті төмен жылжыту,
ooui-outline-control-move-up: Элементті жоғары жылжыту,
+ooui-outline-control-remove: Элементті алып тастау,
ooui-toolbar-more: толығырақ
}
\ No newline at end of file
diff --git a/resources/oojs-ui/i18n/qu.json b/resources/oojs-ui/i18n/qu.json
index 9a412f5..d98b0e4 100644
--- a/resources/oojs-ui/i18n/qu.json
+++ b/resources/oojs-ui/i18n/qu.json
@@ -1,11 +1,13 @@
{
@metadata: {
authors: [
-AlimanRuna
+AlimanRuna,
+Jduranboger
]
},
ooui-dialog-action-close: Wichq'ay,
ooui-outline-control-move-down: Qallawata uraykuchiy,
ooui-outline-control-move-up: Qallawata huqariy,
+ooui-outline-control-remove: P'anqa sutikunata qichuy,
ooui-toolbar-more: Aswan
}
\ No newline at end of file
diff --git a/resources/oojs-ui/oojs-ui-apex.css
b/resources/oojs-ui/oojs-ui-apex.css
index 338edd3..091f4fc 100644
--- a/resources/oojs-ui/oojs-ui-apex.css
+++ b/resources/oojs-ui/oojs-ui-apex.css
@@ -86,11 +86,11 @@
transition: border-color 300ms ease-in-out;
}
-.oo-ui-toolGroup:hover {
+.oo-ui-toolGroup.oo-ui-widget-enabled:hover {
border-color: rgba(0, 0, 0, 0.1);
}
-.oo-ui-toolGroup .oo-ui-tool-link .oo-ui-tool-title {
+.oo-ui-toolGroup.oo-ui-widget-enabled .oo-ui-tool-link .oo-ui-tool-title {
color: #000;
}
@@ -318,11 +318,15 @@
border-bottom-right-radius: 0.25em;
}
-.oo-ui-barToolGroup .oo-ui-tool.oo-ui-widget-enabled:hover {
+.oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-iconedElement-icon {
+ opacity: 0.8;
+}
+
+.oo-ui-barToolGroup.oo-ui-widget-enabled
.oo-ui-tool.oo-ui-widget-enabled:hover {
border-color: rgba(0, 0, 0, 0.2);
}
-.oo-ui-barToolGroup .oo-ui-tool-active.oo-ui-widget-enabled {
+.oo-ui-barToolGroup.oo-ui-widget-enabled
.oo-ui-tool-active.oo-ui-widget-enabled {
background: #f8fbfd;
background-image: -webkit-gradient(linear, right top, right bottom,
color-stop(0%, #f1f7fb), color-stop(100%, #ff));
background-image: -webkit-linear-gradient(top, #f1f7fb 0%, #ff 100%);
@@ -335,24 +339,24 @@
box-shadow: inset 0 0.07em 0.07em 0 rgba(0, 0, 0, 0.07);
}
-.oo-ui-barToolGroup .oo-ui-tool-active.oo-ui-widget-enabled +
.oo-ui-tool-active.oo-ui-widget-enabled {
+.oo-ui-barToolGroup.oo-ui-widget-enabled
.oo-ui-tool-active.oo-ui-widget-enabled +
.oo-ui-tool-active.oo-ui-widget-enabled {
border-left-color: rgba(0, 0, 0, 0.1);
}
-.oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-iconedElement-icon {
- opacity: 0.8;
-}
-
-.oo-ui-barToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-iconedElement-icon {
+.oo-ui-barToolGroup.oo-ui-widget-enabled .oo-ui-tool.oo-ui-widget-disabled
.oo-ui-tool-link
[MediaWiki-commits] [Gerrit] remove db40, decom - change (operations/dns)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/121693 Change subject: remove db40, decom .. remove db40, decom RT #7130 Change-Id: I8d290dce1dea1343d7546c0d1061dd99c15fd33f --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/93/121693/1 diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index 9081395..b1b313a 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -106,7 +106,6 @@ 45 1H IN PTR db35.pmtpa.wmnet. 48 1H IN PTR db38.pmtpa.wmnet. -50 1H IN PTR db40.pmtpa.wmnet. 58 1H IN PTR db48.pmtpa.wmnet. 70 1H IN PTR db60.pmtpa.wmnet. diff --git a/templates/wmnet b/templates/wmnet index a0fe725..a48521b 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -56,7 +56,6 @@ db35 1H IN A10.0.6.45 db38 1H IN A10.0.6.48 -db40 1H IN A10.0.6.50 db481H IN A10.0.6.58 db60 1H IN A10.0.6.70 db63 1H IN A10.0.6.73 -- To view, visit https://gerrit.wikimedia.org/r/121693 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8d290dce1dea1343d7546c0d1061dd99c15fd33f Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implemented changes for getting into translatewiki - change (mediawiki...BlueSpiceFoundation)
Smuggli has uploaded a new change for review. https://gerrit.wikimedia.org/r/121686 Change subject: Implemented changes for getting into translatewiki .. Implemented changes for getting into translatewiki Changed order of messages: FIRST en, SECOND qqq, AFTER THAT doesn't matter Change-Id: I86c39ff6cb42f5a22e91e635eb66e4cd63b704a9 --- M languages/BlueSpice.ExtJS.i18n.php 1 file changed, 29 insertions(+), 29 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation refs/changes/86/121686/1 diff --git a/languages/BlueSpice.ExtJS.i18n.php b/languages/BlueSpice.ExtJS.i18n.php index ab17d8b..6c6e843 100644 --- a/languages/BlueSpice.ExtJS.i18n.php +++ b/languages/BlueSpice.ExtJS.i18n.php @@ -32,6 +32,35 @@ 'bs-extjs-allns' = '(all)' ); +$messages['qqq'] = array( + 'bs-extjs-ok' = 'Label for submit button used in dialogues, alerts and prompts', + 'bs-extjs-cancel' = 'Label for cancel button used in dialogues, alerts and prompts', + 'bs-extjs-yes' = 'Label for accept button used in dialogues, alerts and prompts', + 'bs-extjs-no' = 'Label for reject button used in dialogues, alerts and prompts', + 'bs-extjs-save' = 'Label for save button used in dialogues, alerts and prompts', + 'bs-extjs-delete' = 'Label for delete button used in dialogues, alerts and prompts', +//unused 'bs-extjs-add' = 'Label for add button used in dialogues, alerts and prompts', +//unused 'bs-extjs-remove' = 'Label for remove button used in dialogues, alerts and prompts', + 'bs-extjs-hint' = 'Title for hint prompts', + 'bs-extjs-error' = 'Title for error prompts', + 'bs-extjs-confirm' = 'Title for confirm prompts', + 'bs-extjs-loading' = 'Label for elements that are shown when waiting for ajax data', + 'bs-extjs-pageSize' = 'Label for the input box that changes the number of lines in a grid', + 'bs-extjs-actions-column-header' = 'Label for the grid cloumn that shows the action buttons', + 'bs-extjs-warning' = 'Title for warning prompts', + 'bs-extjs-saving' = 'Label for elements that are shown when saving data from a dialogue via ajax', + 'bs-extjs-reset' = 'Label for reset button used in dialogues, alerts and prompts', + 'bs-extjs-close' = 'Label for close button used in dialogues, alerts and prompts', + 'bs-extjs-label-user' = 'Label for combo boxes that select users', + 'bs-extjs-upload' = 'Label for upload button used in dialogues, alerts and prompts', + 'bs-extjs-browse' = 'Label for browse button used in dialogues, alerts and prompts', + 'bs-extjs-uploading' = 'Label for elements that are shown when uploading files from a dialogue', + + 'bs-extjs-confirmNavigationTitle'= 'Title for prompt that warns you if you want to follow a link but have unsaved changes', + 'bs-extjs-confirmNavigationText'= 'Text for prompt that warns you if you want to follow a link but have unsaved changes', + 'bs-extjs-allns' = 'Selector for all namespaces in namespace combo boxes' +); + $messages['de'] = array( 'bs-extjs-ok' = 'OK', 'bs-extjs-cancel' = 'Abbrechen', @@ -64,33 +93,4 @@ $messages['de-formal'] = array( 'bs-extjs-confirmNavigationText'= 'Möchten Sie wirklich diesem Link folgen? Alle dynamischen Einstellungen, wie Filter und Sortierung, auf dieser Seite gehen dabei verloren.', -); - -$messages['qqq'] = array( - 'bs-extjs-ok' = 'Label for submit button used in dialogues, alerts and prompts', - 'bs-extjs-cancel' = 'Label for cancel button used in dialogues, alerts and prompts', - 'bs-extjs-yes' = 'Label for accept button used in dialogues, alerts and prompts', - 'bs-extjs-no' = 'Label for reject button used in dialogues, alerts and prompts', - 'bs-extjs-save' = 'Label for save button used in dialogues, alerts and prompts', - 'bs-extjs-delete' = 'Label for delete button used in dialogues, alerts and prompts', -//unused 'bs-extjs-add' = 'Label for add button used in dialogues, alerts and prompts', -//unused 'bs-extjs-remove' = 'Label for remove button used in dialogues, alerts and prompts', - 'bs-extjs-hint' = 'Title for hint prompts', - 'bs-extjs-error' = 'Title for error prompts', - 'bs-extjs-confirm' = 'Title for confirm prompts', - 'bs-extjs-loading' = 'Label for elements that are shown when waiting for ajax data', - 'bs-extjs-pageSize' = 'Label for the input box that changes the number of lines in a grid', - 'bs-extjs-actions-column-header' = 'Label for the grid cloumn that shows the action buttons', - 'bs-extjs-warning' = 'Title for warning prompts', - 'bs-extjs-saving' = 'Label for elements that are shown when saving data from a dialogue via ajax', - 'bs-extjs-reset' = 'Label for reset button used in dialogues,
[MediaWiki-commits] [Gerrit] remove db40, decom - change (operations/dns)
Dzahn has submitted this change and it was merged. Change subject: remove db40, decom .. remove db40, decom RT #7130 Change-Id: I8d290dce1dea1343d7546c0d1061dd99c15fd33f --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index 9081395..b1b313a 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -106,7 +106,6 @@ 45 1H IN PTR db35.pmtpa.wmnet. 48 1H IN PTR db38.pmtpa.wmnet. -50 1H IN PTR db40.pmtpa.wmnet. 58 1H IN PTR db48.pmtpa.wmnet. 70 1H IN PTR db60.pmtpa.wmnet. diff --git a/templates/wmnet b/templates/wmnet index a0fe725..a48521b 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -56,7 +56,6 @@ db35 1H IN A10.0.6.45 db38 1H IN A10.0.6.48 -db40 1H IN A10.0.6.50 db481H IN A10.0.6.58 db60 1H IN A10.0.6.70 db63 1H IN A10.0.6.73 -- To view, visit https://gerrit.wikimedia.org/r/121693 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d290dce1dea1343d7546c0d1061dd99c15fd33f Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make jshint voting for LiquidThreads - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Make jshint voting for LiquidThreads .. Make jshint voting for LiquidThreads Bug: 61610 Change-Id: Iee543b87144db2b039651539421900ceb6f8c4e6 --- M layout.yaml 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 30ff47f..029f337 100644 --- a/layout.yaml +++ b/layout.yaml @@ -414,8 +414,6 @@ voting: false - name: mwext-Lingo-jslint # bug 61609 voting: false - - name: mwext-LiquidThreads-jslint # bug 61610 -voting: false - name: mwext-Maps-jslint # bug 61611 voting: false - name: mwext-MoodBar-jslint # bug 61612 -- To view, visit https://gerrit.wikimedia.org/r/121688 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iee543b87144db2b039651539421900ceb6f8c4e6 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a dummy .jshintrc - change (mediawiki...OAuth)
Raimond Spekking has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121696
Change subject: Add a dummy .jshintrc
..
Add a dummy .jshintrc
Per Hashar in https://gerrit.wikimedia.org/r/#/c/121636/
Change-Id: I6f550432f77d3bdf4ec580d5ac4427b332b2e7f9
---
A ..jshintrc
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth
refs/changes/96/121696/1
diff --git a/..jshintrc b/..jshintrc
new file mode 100644
index 000..0967ef4
--- /dev/null
+++ b/..jshintrc
@@ -0,0 +1 @@
+{}
--
To view, visit https://gerrit.wikimedia.org/r/121696
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f550432f77d3bdf4ec580d5ac4427b332b2e7f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] decom db40, remove from dsh, dhcp - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: decom db40, remove from dsh,dhcp
..
decom db40, remove from dsh,dhcp
RT #7130
Change-Id: I9c9d5b1eb9c679c8426a6d976739e92e46531cf0
---
M files/dsh/group/db
M modules/install-server/files/dhcpd/linux-host-entries.ttyS0-9600
2 files changed, 0 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/files/dsh/group/db b/files/dsh/group/db
index 929f684..8390e33 100644
--- a/files/dsh/group/db
+++ b/files/dsh/group/db
@@ -43,7 +43,6 @@
db38
-db40
db48
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-9600
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-9600
index 30911b9..9dfb7fd 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-9600
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-9600
@@ -74,11 +74,6 @@
fixed-address db38.pmtpa.wmnet;
}
-host db40 {
- hardware ethernet 00:21:28:6B:CD:C2;
- fixed-address db40.pmtpa.wmnet;
-}
-
host ms6 {
hardware ethernet 0:14:4f:f2:a3:10;
fixed-address ms6.esams.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/121655
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c9d5b1eb9c679c8426a6d976739e92e46531cf0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix sidebar away bug - change (mediawiki...MediaWikiChat)
UltrasonicNXT has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121694
Change subject: Fix sidebar away bug
..
Fix sidebar away bug
Change-Id: I7a23480fb5960870c29cafc6b420c5c71a156aa5
---
M MediaWikiChat.hooks.php
M MediaWikiChat.php
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat
refs/changes/94/121694/1
diff --git a/MediaWikiChat.hooks.php b/MediaWikiChat.hooks.php
index 2b69460..3c34c6f 100644
--- a/MediaWikiChat.hooks.php
+++ b/MediaWikiChat.hooks.php
@@ -89,7 +89,7 @@
background-position: right 1em
center;
background-repeat: no-repeat;
background-image:
url($avatar);;
- if ( $away MediaWikiChat::now() - 10
) {
+ if ( $away MediaWikiChat::now() -
12 ) {
$style .= -webkit-filter:
grayscale(1); /* old webkit */
-webkit-filter:
grayscale(100%); /* new webkit */
-moz-filter:
grayscale(100%); /* safari */
diff --git a/MediaWikiChat.php b/MediaWikiChat.php
index f9d1d0b..087afee 100644
--- a/MediaWikiChat.php
+++ b/MediaWikiChat.php
@@ -17,7 +17,7 @@
$wgExtensionCredits['specialpage'][] = array(
'path' = __FILE__,
'name' = 'MediaWikiChat',
- 'version' = '2.10.4',
+ 'version' = '2.10.5',
'author' = 'Adam Carter/UltrasonicNXT',
'url' = 'https://www.mediawiki.org/wiki/Extension:MediaWikiChat',
'descriptionmsg' = 'chat-desc',
--
To view, visit https://gerrit.wikimedia.org/r/121694
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a23480fb5960870c29cafc6b420c5c71a156aa5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT adamr_car...@btinternet.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implemented changes for getting into translatewiki - change (mediawiki...BlueSpiceFoundation)
Smuggli has uploaded a new change for review. https://gerrit.wikimedia.org/r/121680 Change subject: Implemented changes for getting into translatewiki .. Implemented changes for getting into translatewiki Change-Id: I3e308872ed170f9bd02fee484d2035a1925d39ce --- M languages/BlueSpice.Credits.i18n.php 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation refs/changes/80/121680/1 diff --git a/languages/BlueSpice.Credits.i18n.php b/languages/BlueSpice.Credits.i18n.php index b171133..b7c6772 100644 --- a/languages/BlueSpice.Credits.i18n.php +++ b/languages/BlueSpice.Credits.i18n.php @@ -14,13 +14,6 @@ $messages = array(); -$messages['de'] = array( - 'specialcredits' = 'BlueSpice Credits', - 'bs-credits-programmers' = 'Programmierer', - 'bs-credits-dnt' = 'Design und Testing', - 'bs-credits-contributors' = 'Contributors' -); - $messages['en'] = array( 'specialcredits' = 'BlueSpice credits', 'bs-credits-programmers' = 'Programmers', @@ -31,6 +24,13 @@ $messages['qqq'] = array( 'specialcredits' = 'Special page title', 'bs-credits-programmers' = 'Heading for column listing programmers', - 'bs-credits-dnt' = 'Heading for column with designers listing testers', + 'bs-credits-dnt' = 'Heading for column with listing designers and testers', 'bs-credits-contributors' = 'Headings for column listing contributors' +); + +$messages['de'] = array( + 'specialcredits' = 'BlueSpice Credits', + 'bs-credits-programmers' = 'Programmierer', + 'bs-credits-dnt' = 'Design und Testing', + 'bs-credits-contributors' = 'Contributors' ); \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/121680 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e308872ed170f9bd02fee484d2035a1925d39ce Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: Smuggli mug...@hallowelt.biz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge Remove space thats in the wrong place - change (mediawiki...Wikibase)
Christopher Johnson (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/121681 Change subject: Merge Remove space thats in the wrong place .. Merge Remove space thats in the wrong place Change-Id: I032c80e6e5646df595f0225906aa6065325c9090 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/81/121681/1 -- To view, visit https://gerrit.wikimedia.org/r/121681 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I032c80e6e5646df595f0225906aa6065325c9090 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Using more UI agnostic language in licensing notice - change (mediawiki...WikimediaMessages)
jenkins-bot has submitted this change and it was merged.
Change subject: Using more UI agnostic language in licensing notice
..
Using more UI agnostic language in licensing notice
Some skins (such as Minerva) may not have a Save page button, but
may use some other UI element. Changing By clicking the
'{{int:savearticle}}' button to By saving changes, so that it is
UI agnostic.
Change-Id: Ic5eae6ed86bac87716454644ea053bf8796b20c6
---
M i18n/wikimedia/en.json
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
JGonera: Looks good to me, approved
Jdlrobson: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/i18n/wikimedia/en.json b/i18n/wikimedia/en.json
index 601e237..cf269b7 100644
--- a/i18n/wikimedia/en.json
+++ b/i18n/wikimedia/en.json
@@ -158,8 +158,8 @@
shared-repo-name-shared: Wikimedia Commons,
wikimedia-copyright: Text is available under the a
href=\https://creativecommons.org/licenses/by-sa/3.0/\;Creative Commons
Attribution/Share-Alike License/a;\nadditional terms may apply.\nSee a
href=\https://wikimediafoundation.org/wiki/Terms_of_Use\;Terms of Use/a for
details.,
wikidata-copyright: All structured data from the main and property
namespace is available under the a
href=\https://creativecommons.org/publicdomain/zero/1.0/\; title=\Definition
of the Creative Commons CC0 License\Creative Commons CC0 License/a;\ntext
in the other namespaces is available under the a
href=\https://creativecommons.org/licenses/by-sa/3.0/\; title=\Definition of
the Creative Commons Attribution/Share-Alike License\Creative Commons
Attribution/Share-Alike License/a;\nadditional terms may apply.\nSee a
href=\https://wikimediafoundation.org/wiki/Terms_of_Use\; title=\Wikimedia
Foundation Terms of Use\Terms of Use/a for details.,
-wikimedia-copyrightwarning: By clicking the \{{int:savearticle}}\
button, you agree to the [https://wikimediafoundation.org/wiki/Terms_of_Use
Terms of Use], and you irrevocably agree to release your contribution under the
[https://en.wikipedia.org/wiki/Wikipedia:Text_of_Creative_Commons_Attribution-ShareAlike_3.0_Unported_License
CC BY-SA 3.0 License] and the
[https://en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License
GFDL].\nYou agree that a hyperlink or URL is sufficient attribution under the
Creative Commons license.,
-wikimedia-mobile-copyrightwarning: By clicking the
\{{int:savearticle}}\ button, you agree to the
[https://wikimediafoundation.org/wiki/Terms_of_Use Terms of Use], and you
irrevocably agree to release your contribution under the
[https://creativecommons.org/licenses/by-sa/3.0/ CC BY-SA 3.0 License] and the
[https://en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License
GFDL].,
+wikimedia-copyrightwarning: By saving changes, you agree to the
[https://wikimediafoundation.org/wiki/Terms_of_Use Terms of Use], and you
irrevocably agree to release your contribution under the
[https://en.wikipedia.org/wiki/Wikipedia:Text_of_Creative_Commons_Attribution-ShareAlike_3.0_Unported_License
CC BY-SA 3.0 License] and the
[https://en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License
GFDL].\nYou agree that a hyperlink or URL is sufficient attribution under the
Creative Commons license.,
+wikimedia-mobile-copyrightwarning: By saving changes, you agree to the
[https://wikimediafoundation.org/wiki/Terms_of_Use Terms of Use], and you
irrevocably agree to release your contribution under the
[https://creativecommons.org/licenses/by-sa/3.0/ CC BY-SA 3.0 License] and the
[https://en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License
GFDL].,
wikimedia-mobile-photo-copyrightwarning: By uploading this image, you
agree to our [https://wikimediafoundation.org/wiki/Terms_of_use Terms of Use]
and agree to release your image under the
[https://creativecommons.org/licenses/by-sa/3.0/ Creative Commons
Attribution-ShareAlike 3.0 License].,
wikibase-repo-name: Wikidata,
wikibase-sitelinks-wikiquote: Wikiquote pages linked to this item,
--
To view, visit https://gerrit.wikimedia.org/r/120728
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5eae6ed86bac87716454644ea053bf8796b20c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: Awjrichards aricha...@wikimedia.org
Gerrit-Reviewer: JGonera jgon...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable gc during tests - change (integration/jenkins)
CSteipp has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121697
Change subject: Disable gc during tests
..
Disable gc during tests
Bug: 62623
Change-Id: I0605c72d064612200e8756919e862144b37b79de
---
M bin/mw-run-phpunit-allexts.sh
M bin/mw-run-phpunit.sh
2 files changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/97/121697/1
diff --git a/bin/mw-run-phpunit-allexts.sh b/bin/mw-run-phpunit-allexts.sh
index 165ddfa..5fc2724 100755
--- a/bin/mw-run-phpunit-allexts.sh
+++ b/bin/mw-run-phpunit-allexts.sh
@@ -31,6 +31,7 @@
cd ${MW_INSTALL_PATH}/tests/phpunit
php phpunit.php \
+ -d zend.enable_gc=0 \
--with-phpunitdir $PHPUNIT_DIR \
--log-junit $JUNIT_DEST \
--testsuite extensions
diff --git a/bin/mw-run-phpunit.sh b/bin/mw-run-phpunit.sh
index 60b7d29..2c24f32 100755
--- a/bin/mw-run-phpunit.sh
+++ b/bin/mw-run-phpunit.sh
@@ -95,6 +95,7 @@
set -x
cd ${MW_INSTALL_PATH}/tests/phpunit
php phpunit.php \
+ -d zend.enable_gc=0 \
--with-phpunitdir $PHPUNIT_DIR \
$PHPUNIT_GROUP_OPT \
--exclude-group $PHPUNIT_EXCLUDE_GROUP \
--
To view, visit https://gerrit.wikimedia.org/r/121697
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0605c72d064612200e8756919e862144b37b79de
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: CSteipp cste...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Elasticsearch support - change (mediawiki...GeoData)
jenkins-bot has submitted this change and it was merged.
Change subject: Elasticsearch support
..
Elasticsearch support
Change-Id: Ie6eef11ebdbead62d60eef113879eccf45ec4aea
---
M Coord.php
M GeoData.body.php
M GeoData.php
M GeoDataHooks.php
M api/ApiQueryCoordinates.php
M api/ApiQueryGeoSearchDb.php
A api/ApiQueryGeoSearchElastic.php
M solrupdate.php
8 files changed, 357 insertions(+), 14 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Coord.php b/Coord.php
index 3c619e3..8d556bf 100644
--- a/Coord.php
+++ b/Coord.php
@@ -13,7 +13,10 @@
$type,
$name,
$country,
- $region;
+ $region,
+
+ $pageId,
+ $distance;
public function __construct( $lat, $lon, $globe = null ) {
global $wgDefaultGlobe;
@@ -85,7 +88,19 @@
return $row;
}
- public static $fieldMapping = array(
+ /**
+* Returns these coordinates as an associative array
+* @return array
+*/
+ public function getAsArray() {
+ $result = array();
+ foreach ( self::getFields() as $field ) {
+ $result[$field] = $this-$field;
+ }
+ return $result;
+ }
+
+ private static $fieldMapping = array(
'id' = 'gt_id',
'lat' = 'gt_lat',
'lon' = 'gt_lon',
@@ -97,4 +112,24 @@
'country' = 'gt_country',
'region' = 'gt_region',
);
+
+ public static function getFieldMapping() {
+ return self::$fieldMapping;
+ }
+
+ public static function getFields() {
+ static $fields = null;
+ if ( !$fields ) {
+ $fields = array_keys( self::$fieldMapping );
+ }
+ return $fields;
+ }
+
+ public static function getColumns() {
+ static $columns = null;
+ if ( !$columns ) {
+ $columns = array_values( self::$fieldMapping );
+ }
+ return $columns;
+ }
}
diff --git a/GeoData.body.php b/GeoData.body.php
index d9288dd..5c088c7 100644
--- a/GeoData.body.php
+++ b/GeoData.body.php
@@ -44,7 +44,7 @@
public static function getAllCoordinates( $pageId, $conds = array(),
$dbType = DB_SLAVE ) {
$db = wfGetDB( $dbType );
$conds['gt_page_id'] = $pageId;
- $res = $db-select( 'geo_tags', array_values(
Coord::$fieldMapping ), $conds, __METHOD__ );
+ $res = $db-select( 'geo_tags', Coord::getColumns(), $conds,
__METHOD__ );
$coords = array();
foreach ( $res as $row ) {
$coords[] = Coord::newFromRow( $row );
diff --git a/GeoData.php b/GeoData.php
index 24457ba..0b702a5 100644
--- a/GeoData.php
+++ b/GeoData.php
@@ -16,6 +16,7 @@
$wgAutoloadClasses['ApiQueryCoordinates'] = $dir/api/ApiQueryCoordinates.php;
$wgAutoloadClasses['ApiQueryGeoSearch'] = $dir/api/ApiQueryGeoSearch.php;
$wgAutoloadClasses['ApiQueryGeoSearchDb'] = $dir/api/ApiQueryGeoSearchDb.php;
+$wgAutoloadClasses['ApiQueryGeoSearchElastic'] =
$dir/api/ApiQueryGeoSearchElastic.php;
$wgAutoloadClasses['ApiQueryGeoSearchSolr'] =
$dir/api/ApiQueryGeoSearchSolr.php;
$wgAutoloadClasses['ApiQueryAllPages_GeoData'] =
$dir/api/ApiQueryAllPages_GeoData.php;
$wgAutoloadClasses['ApiQueryCategoryMembers_GeoData'] =
$dir/api/ApiQueryCategoryMembers_GeoData.php;
@@ -48,6 +49,8 @@
$wgHooks['LinksUpdate'][] = 'GeoDataHooks::onLinksUpdate';
$wgHooks['FileUpload'][] = 'GeoDataHooks::onFileUpload';
$wgHooks['OutputPageParserOutput'][] =
'GeoDataHooks::onOutputPageParserOutput';
+$wgHooks['CirrusSearchMappingConfig'][] =
'GeoDataHooks::onCirrusSearchMappingConfig';
+$wgHooks['CirrusSearchBuildDocumentParse'][] =
'GeoDataHooks::onCirrusSearchBuildDocumentParse';
// Use the proper search backend
$wgExtensionFunctions[] = 'efInitGeoData';
@@ -180,7 +183,7 @@
$wgGeoDataIndexGranularity = 10;
/**
- * Which backend should be used by spatial searhces: 'db' or 'solr'
+ * Which backend should be used by spatial searhces: 'db', 'solr' or 'elastic'
*/
$wgGeoDataBackend = 'db';
@@ -228,3 +231,10 @@
* Setting it to false or empty array will disable wgCoordinates.
*/
$wgGeoDataInJS = array( 'lat', 'lon' );
+
+/**
+ * Enables the use of GeoData as a CirrusSearch plugin for indexing.
+ * This is separate from $wgGeoDataBackend: you could be filling Elasticsearch
index and using old search
+ * meanwhile. However, if backend is already set to 'elastic', GeoData always
behaves as if it's true
+ */
+$wgGeoDataUseCirrusSearch = false;
diff --git a/GeoDataHooks.php b/GeoDataHooks.php
index 5d6338f..e67b448 100644
--- a/GeoDataHooks.php
+++
[MediaWiki-commits] [Gerrit] Prepare GeoData config for Elasticsearch switchover - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Prepare GeoData config for Elasticsearch switchover
..
Prepare GeoData config for Elasticsearch switchover
Make backend configurable per wiki and per realm.
Because neither of 2 variables have been changed, this commit is a no-op.
Change-Id: I7e9595ce0d2c05636eb654b3e1c91738fba6d669
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
3 files changed, 14 insertions(+), 1 deletion(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 4268384..0d4a6e4 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2241,13 +2241,14 @@
if ( $wmgEnableGeoData ) {
require_once( $IP/extensions/GeoData/GeoData.php );
- $wgGeoDataBackend = 'solr';
+ $wgGeoDataBackend = $wmgGeoDataBackend;
$wgGeoDataSolrMaster = 'solr1001.eqiad.wmnet';
$wgGeoDataSolrHosts = array(
'solr1001.eqiad.wmnet' = 75, // master, put less read load on
it
'solr1002.eqiad.wmnet' = 100,
'solr1003.eqiad.wmnet' = 100,
);
+ $wgGeoDataUseCirrusSearch = $wmgGeoDataUseCirrusSearch;
# Data collection mode
if ( !$wmgEnableGeoSearch ) {
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 8e3733b..a3a6190 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -223,6 +223,12 @@
'wmgEnableGeoData' = array(
'default' = true,
),
+ 'wmgGeoDataBackend' = array(
+ 'default' = 'solr',
+ ),
+ 'wmgGeoDataUseCirrusSearch' = array(
+ 'default' = false,
+ ),
'wmgULSPosition' = array(
# Beta-specific
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index d8dc33a..85a0d24 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12269,6 +12269,12 @@
'wiki' = true,
'wikivoyage' = true,
),
+'wmgGeoDataBackend' = array(
+ 'default' = 'solr',
+),
+'wmgGeoDataUseCirrusSearch' = array(
+ 'default' = false,
+),
'wmgEnableGeoSearch' = array(
'default' = true,
'loginwiki' = false,
--
To view, visit https://gerrit.wikimedia.org/r/121691
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7e9595ce0d2c05636eb654b3e1c91738fba6d669
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add token parameter to SF Autoedit API - change (mediawiki...SemanticForms)
Pawanseerwani has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121698
Change subject: Add token parameter to SF Autoedit API
..
Add token parameter to SF Autoedit API
Currently no such token is used which is a security issue. This patch requires
the API to have token parameter which is used to ensure it is an authentic
change.
Bug: 51505
Change-Id: Iee5b12763386da5d4dd9e3c5cfa18262e929ce61
---
M SemanticForms.php
M includes/SF_AutoeditAPI.php
2 files changed, 14 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms
refs/changes/98/121698/1
diff --git a/SemanticForms.php b/SemanticForms.php
index 9414d83..c35d49b 100644
--- a/SemanticForms.php
+++ b/SemanticForms.php
@@ -81,6 +81,10 @@
define( 'SF_SP_PAGE_HAS_DEFAULT_FORM', 4 );
define( 'SF_SP_HAS_FIELD_LABEL_FORMAT', 5 );
+// Constant for incorrect-edit-token
+
+define( 'SF_INCORRECT_EDIT_TOKEN', 6 );
+
/**
* This is a delayed init that makes sure that MediaWiki is set up
* properly before we add our stuff.
diff --git a/includes/SF_AutoeditAPI.php b/includes/SF_AutoeditAPI.php
index 2933a8d..23714a1 100644
--- a/includes/SF_AutoeditAPI.php
+++ b/includes/SF_AutoeditAPI.php
@@ -355,7 +355,7 @@
'wpSummary' = '',
'wpStarttime' = wfTimestampNow(),
'wpEdittime' = '',
- 'wpEditToken' = $wgUser-isLoggedIn()
? $wgUser-editToken() : EDIT_TOKEN_SUFFIX,
+ 'wpEditToken' =
$this-mOptions['token'],
'action' = 'submit',
),
$this-mOptions
@@ -461,10 +461,17 @@
$resultDetails = false;
# Allow bots to exempt some edits from bot flagging
$bot = $wgUser-isAllowed( 'bot' ) $editor-bot;
-
- $status = $editor-internalAttemptSave( $resultDetails, $bot );
+ if ( $editor-mTokenOk ) {
+ $status = $editor-internalAttemptSave( $resultDetails,
$bot );
+ }
+ else {
+ $status = new Status() ;
+ $status-setResult( false, SF_INCORRECT_EDIT_TOKEN );
+ }
switch ( $status-value ) {
+ case SF_INCORRECT_EDIT_TOKEN: // A hook function
returned an error
+ throw new MWException( This appears to be a
cross-site request forgery; canceling save.);
case EditPage::AS_HOOK_ERROR_EXPECTED: // A hook
function returned an error
case EditPage::AS_CONTENT_TOO_BIG: // Content too big
( $wgMaxArticleSize)
case EditPage::AS_ARTICLE_WAS_DELETED: // article was
deleted while editting and param wpRecreate == false or form was not posted
--
To view, visit https://gerrit.wikimedia.org/r/121698
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee5b12763386da5d4dd9e3c5cfa18262e929ce61
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Pawanseerwani pawanseerwani+bugzi...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable slow query logging while coredb::slow_digest is disa... - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: Disable slow query logging while coredb::slow_digest is disabled for s[1-7], so the log file does not grow. Has also been SET GLOBAL. .. Disable slow query logging while coredb::slow_digest is disabled for s[1-7], so the log file does not grow. Has also been SET GLOBAL. Change-Id: I50612405e1dcbd0148582d39ea4869a4a55e1964 --- M modules/coredb_mysql/templates/prod.my.cnf.erb 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/coredb_mysql/templates/prod.my.cnf.erb b/modules/coredb_mysql/templates/prod.my.cnf.erb index 22c09fd..c77b590 100644 --- a/modules/coredb_mysql/templates/prod.my.cnf.erb +++ b/modules/coredb_mysql/templates/prod.my.cnf.erb @@ -42,9 +42,9 @@ query_cache_size = 0 -log_slow_queries +#log_slow_queries #log_queries_not_using_indexes -long_query_time = 0.45 +#long_query_time = 0.45 % if @disable_binlogs != true then -% log_bin -- To view, visit https://gerrit.wikimedia.org/r/121576 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I50612405e1dcbd0148582d39ea4869a4a55e1964 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable GeoData as a CirrusSearch plugin on labs - change (operations/mediawiki-config)
MaxSem has uploaded a new change for review. https://gerrit.wikimedia.org/r/121699 Change subject: Enable GeoData as a CirrusSearch plugin on labs .. Enable GeoData as a CirrusSearch plugin on labs Change-Id: I51ff6b7320cf1b9c4bb4de423adf78806b679a5e --- M wmf-config/InitialiseSettings-labs.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/99/121699/1 diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index a3a6190..c5cf7ed 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -227,7 +227,7 @@ 'default' = 'solr', ), 'wmgGeoDataUseCirrusSearch' = array( - 'default' = false, + 'default' = true, ), 'wmgULSPosition' = array( -- To view, visit https://gerrit.wikimedia.org/r/121699 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I51ff6b7320cf1b9c4bb4de423adf78806b679a5e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MaxSem maxsem.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implemented changes for getting into translatewiki - change (mediawiki...BlueSpiceFoundation)
Smuggli has uploaded a new change for review. https://gerrit.wikimedia.org/r/121684 Change subject: Implemented changes for getting into translatewiki .. Implemented changes for getting into translatewiki Changed order of messages: FIRST en, SECOND qqq, AFTER THAT doesn't matter Change-Id: Id458b24c9acd10cb38d757caa05a10f24e787891 --- M languages/BlueSpice.Diagnostics.i18n.php 1 file changed, 6 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation refs/changes/84/121684/1 diff --git a/languages/BlueSpice.Diagnostics.i18n.php b/languages/BlueSpice.Diagnostics.i18n.php index 4aea322..414b144 100644 --- a/languages/BlueSpice.Diagnostics.i18n.php +++ b/languages/BlueSpice.Diagnostics.i18n.php @@ -5,7 +5,6 @@ * Part of BlueSpice for MediaWiki * * @author Stephan Muggli mug...@hallowelt.biz - * @packageBlueSpice_Core * @subpackage BlueSpice * @copyright Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All rights reserved. @@ -15,14 +14,14 @@ $messages = array(); -$messages['de'] = array( - 'diagnostics' = 'Systemdiagnose' -); - $messages['en'] = array( - 'diagnostics' = 'System diagnostics' + 'diagnostics' = 'System diagnostics' ); $messages['qqq'] = array( - 'diagnostics' = 'Special page title' + 'diagnostics' = 'Special page title' +); + +$messages['de'] = array( + 'diagnostics' = 'Systemdiagnose' ); \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/121684 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id458b24c9acd10cb38d757caa05a10f24e787891 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: Smuggli mug...@hallowelt.biz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Migrate to JSON i18n - change (mediawiki...ParserFunctions)
jenkins-bot has submitted this change and it was merged. Change subject: Migrate to JSON i18n .. Migrate to JSON i18n Procedure per https://www.mediawiki.org/wiki/Manual:GenerateJsonI18n.php with shim. Change-Id: I14f32ccb8bcaf3d3c38b3267b1fcb2a2f611c424 --- M ParserFunctions.i18n.php M ParserFunctions.php A i18n/af.json A i18n/aln.json A i18n/an.json A i18n/ar.json A i18n/arc.json A i18n/arz.json A i18n/as.json A i18n/ast.json A i18n/az.json A i18n/azb.json A i18n/ba.json A i18n/bcc.json A i18n/bcl.json A i18n/be-tarask.json A i18n/bg.json A i18n/bn.json A i18n/br.json A i18n/bs.json A i18n/ca.json A i18n/ce.json A i18n/cs.json A i18n/cy.json A i18n/da.json A i18n/de-ch.json A i18n/de.json A i18n/diq.json A i18n/dsb.json A i18n/el.json A i18n/en-gb.json A i18n/en.json A i18n/eo.json A i18n/es.json A i18n/et.json A i18n/eu.json A i18n/fa.json A i18n/fi.json A i18n/fr.json A i18n/frp.json A i18n/gl.json A i18n/grc.json A i18n/gsw.json A i18n/he.json A i18n/hi.json A i18n/hr.json A i18n/hsb.json A i18n/hu.json A i18n/ia.json A i18n/id.json A i18n/ilo.json A i18n/io.json A i18n/is.json A i18n/it.json A i18n/ja.json A i18n/jv.json A i18n/ka.json A i18n/kk-arab.json A i18n/kk-cyrl.json A i18n/kk-latn.json A i18n/km.json A i18n/ko.json A i18n/ksh.json A i18n/lb.json A i18n/li.json A i18n/lrc.json A i18n/lt.json A i18n/lv.json A i18n/min.json A i18n/mk.json A i18n/ml.json A i18n/mr.json A i18n/ms.json A i18n/myv.json A i18n/nah.json A i18n/nb.json A i18n/nds.json A i18n/ne.json A i18n/nl.json A i18n/nn.json A i18n/oc.json A i18n/or.json A i18n/pl.json A i18n/pms.json A i18n/pnb.json A i18n/ps.json A i18n/pt-br.json A i18n/pt.json A i18n/qqq.json A i18n/qu.json A i18n/ro.json A i18n/roa-tara.json A i18n/ru.json A i18n/rue.json A i18n/sah.json A i18n/scn.json A i18n/sh.json A i18n/si.json A i18n/sk.json A i18n/sl.json A i18n/sq.json A i18n/sr-ec.json A i18n/sr-el.json A i18n/stq.json A i18n/su.json A i18n/sv.json A i18n/ta.json A i18n/te.json A i18n/tg-cyrl.json A i18n/tg-latn.json A i18n/th.json A i18n/tk.json A i18n/tl.json A i18n/tr.json A i18n/ug-arab.json A i18n/uk.json A i18n/vec.json A i18n/vep.json A i18n/vi.json A i18n/vo.json A i18n/yi.json A i18n/yo.json A i18n/yue.json A i18n/zh-hans.json A i18n/zh-hant.json 125 files changed, 2,969 insertions(+), 2,875 deletions(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/121644 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I14f32ccb8bcaf3d3c38b3267b1fcb2a2f611c424 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ParserFunctions Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@kitano.nl Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable GeoData as a CirrusSearch plugin on labs - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Enable GeoData as a CirrusSearch plugin on labs .. Enable GeoData as a CirrusSearch plugin on labs Change-Id: I51ff6b7320cf1b9c4bb4de423adf78806b679a5e --- M wmf-config/InitialiseSettings-labs.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index a3a6190..c5cf7ed 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -227,7 +227,7 @@ 'default' = 'solr', ), 'wmgGeoDataUseCirrusSearch' = array( - 'default' = false, + 'default' = true, ), 'wmgULSPosition' = array( -- To view, visit https://gerrit.wikimedia.org/r/121699 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I51ff6b7320cf1b9c4bb4de423adf78806b679a5e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use DataValueMismatchException for Snak formatting [WIP] - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121678
Change subject: Use DataValueMismatchException for Snak formatting [WIP]
..
Use DataValueMismatchException for Snak formatting [WIP]
depends on https://github.com/DataValues/Common/pull/6
Change-Id: Ia2500cf0d3dc86cd8ae5e6fac2acdbfc4b54201b
---
M lib/includes/formatters/CommonsLinkFormatter.php
M lib/includes/formatters/GlobeCoordinateDetailsFormatter.php
M lib/includes/formatters/HtmlTimeFormatter.php
M lib/includes/formatters/QuantityDetailsFormatter.php
M lib/includes/formatters/TimeDetailsFormatter.php
M repo/includes/ClaimHtmlGenerator.php
M repo/includes/api/FormatSnakValue.php
7 files changed, 62 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/78/121678/2
diff --git a/lib/includes/formatters/CommonsLinkFormatter.php
b/lib/includes/formatters/CommonsLinkFormatter.php
index d406216..93dabbc 100644
--- a/lib/includes/formatters/CommonsLinkFormatter.php
+++ b/lib/includes/formatters/CommonsLinkFormatter.php
@@ -6,6 +6,7 @@
use Html;
use InvalidArgumentException;
use Title;
+use ValueFormatters\Exceptions\DataValueMismatchException;
use ValueFormatters\FormatterOptions;
use ValueFormatters\ValueFormatter;
@@ -46,7 +47,11 @@
*/
public function format( $value ) {
if ( !( $value instanceof StringValue ) ) {
- throw new InvalidArgumentException( 'Data value type
mismatch. Expected a StringValue.' );
+ throw new DataValueMismatchException(
+ $value-getType(),
+ StringValue::getType(),
+ 'Data value type mismatch. Expected a
StringValue.'
+ );
}
$fileName = $value-getValue();
diff --git a/lib/includes/formatters/GlobeCoordinateDetailsFormatter.php
b/lib/includes/formatters/GlobeCoordinateDetailsFormatter.php
index df0f02e..450f36f 100644
--- a/lib/includes/formatters/GlobeCoordinateDetailsFormatter.php
+++ b/lib/includes/formatters/GlobeCoordinateDetailsFormatter.php
@@ -4,8 +4,7 @@
use DataValues\GlobeCoordinateValue;
use Html;
-use InvalidArgumentException;
-use Message;
+use ValueFormatters\Exceptions\DataValueMismatchException;
use ValueFormatters\FormatterOptions;
use ValueFormatters\GeoCoordinateFormatter;
use ValueFormatters\GlobeCoordinateFormatter;
@@ -34,7 +33,7 @@
parent::__construct( $options );
if ( !$options-hasOption( GeoCoordinateFormatter::OPT_FORMAT )
) {
- //TODO: what'S a good default? Should this be locale
dependant? Configurable?
+ //TODO: what's a good default? Should this be locale
dependant? Configurable?
$options-setOption(
GeoCoordinateFormatter::OPT_FORMAT, GeoCoordinateFormatter::TYPE_DMS );
}
@@ -49,12 +48,16 @@
*
* @param GlobeCoordinateValue $value The ID to format
*
-* @throws InvalidArgumentException
+* @throws DataValueMismatchException
* @return string
*/
public function format( $value ) {
if ( !( $value instanceof GlobeCoordinateValue ) ) {
- throw new InvalidArgumentException( 'Data value type
mismatch. Expected an GlobeCoordinateValue.' );
+ throw new DataValueMismatchException(
+ $value-getType(),
+ GlobeCoordinateValue::getType(),
+ 'Data value type mismatch. Expected an
GlobeCoordinateValue.'
+ );
}
$html = '';
diff --git a/lib/includes/formatters/HtmlTimeFormatter.php
b/lib/includes/formatters/HtmlTimeFormatter.php
index 057cca2..42153cc 100644
--- a/lib/includes/formatters/HtmlTimeFormatter.php
+++ b/lib/includes/formatters/HtmlTimeFormatter.php
@@ -3,9 +3,9 @@
namespace Wikibase\Lib;
use DataValues\TimeValue;
-use InvalidArgumentException;
use Language;
use Message;
+use ValueFormatters\Exceptions\DataValueMismatchException;
use ValueFormatters\FormatterOptions;
use ValueFormatters\TimeFormatter;
use ValueFormatters\ValueFormatter;
@@ -49,11 +49,15 @@
* @param TimeValue $value The time to format
*
* @return string
-* @throws InvalidArgumentException
+* @throws DataValueMismatchException
*/
public function format( $value ) {
if ( !( $value instanceof TimeValue ) ) {
- throw new InvalidArgumentException( 'Data value type
mismatch. Expected a TimeValue.' );
+ throw new DataValueMismatchException(
+ $value-getType(),
+
[MediaWiki-commits] [Gerrit] MariaDB monitoring for disk and process(es) - change (operations/puppet)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121676
Change subject: MariaDB monitoring for disk and process(es)
..
MariaDB monitoring for disk and process(es)
Borrow these from coredb and add in some flexibility. Use a 'dba' contact
group consisting of me, for now, for non-front-line-site-killing stuff
like tendril and dbstore.
Change-Id: I9f06bbaa57e98bacffc0e5771430ae7eafc26871
---
M files/icinga/contactgroups.cfg
M manifests/role/mariadb.pp
M modules/mariadb/manifests/init.pp
A modules/mariadb/manifests/monitor_disk.pp
A modules/mariadb/manifests/monitor_process.pp
5 files changed, 41 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/76/121676/1
diff --git a/files/icinga/contactgroups.cfg b/files/icinga/contactgroups.cfg
index 2fb24e5..1e5257b 100644
--- a/files/icinga/contactgroups.cfg
+++ b/files/icinga/contactgroups.cfg
@@ -33,3 +33,8 @@
contactgroup_name contint
members amusso
}
+
+define contactgroup {
+contactgroup_name dba
+members springle
+}
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 82957d5..0c47890 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -52,6 +52,9 @@
datadir = '/a/sqldata',
tmpdir = '/a/tmp',
}
+
+include mariadb::monitor_disk
+include mariadb::monitor_process
}
# MariaDB 10 delayed slaves replicating all shards
@@ -75,4 +78,7 @@
datadir = '/a/sqldata',
tmpdir = '/a/tmp',
}
+
+include mariadb::monitor_disk
+include mariadb::monitor_process
}
diff --git a/modules/mariadb/manifests/init.pp
b/modules/mariadb/manifests/init.pp
index 91fcdc8..20fb7b3 100644
--- a/modules/mariadb/manifests/init.pp
+++ b/modules/mariadb/manifests/init.pp
@@ -2,4 +2,6 @@
include mariadb::config
include mariadb::packages
+include mariadb::monitor_disk
+include mariadb::monitor_process
}
\ No newline at end of file
diff --git a/modules/mariadb/manifests/monitor_disk.pp
b/modules/mariadb/manifests/monitor_disk.pp
new file mode 100644
index 000..7537959
--- /dev/null
+++ b/modules/mariadb/manifests/monitor_disk.pp
@@ -0,0 +1,14 @@
+
+class mariadb::monitor_disk(
+$is_critical = true,
+$contact_group = 'dba',
+$pct_warning = 10,
+$pct_critical = 5,
+) {
+nrpe::monitor_service { 'mariadb_disk_space':
+description = 'MariaDB disk space',
+nrpe_command = /usr/lib/nagios/plugins/check_disk -w
${pct_warning}% -c ${pct_critical}% -l -e,
+critical = $is_critical,
+contact_group = $contact_group,
+}
+}
\ No newline at end of file
diff --git a/modules/mariadb/manifests/monitor_process.pp
b/modules/mariadb/manifests/monitor_process.pp
new file mode 100644
index 000..7e03df6
--- /dev/null
+++ b/modules/mariadb/manifests/monitor_process.pp
@@ -0,0 +1,14 @@
+
+class mariadb::monitor_process(
+$is_critical= true,
+$contact_group = 'dba',
+$process_name = 'mysqld',
+$process_count = 1,
+) {
+nrpe::monitor_service { ${process_name}:
+description = ${process_name} processes,
+nrpe_command = /usr/lib/nagios/plugins/check_procs -c
${process_count}:{$process_count} -C ${process_name},
+critical = $is_critical,
+contact_group = $contact_group,
+}
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/121676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f06bbaa57e98bacffc0e5771430ae7eafc26871
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle sprin...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: remove hhvm from slaves - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121675
Change subject: contint: remove hhvm from slaves
..
contint: remove hhvm from slaves
hhvm and wikimedia-task-appserver depends on different libmemcached
version. Since we dont really care that much about hhvm right now,
remove it so wikimedia-task-appserver dependencies can be installed on
the slaves.
Change-Id: I46e51631c67553f14b03485508fffc532c096530
---
M modules/contint/manifests/packages/labs.pp
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/75/121675/1
diff --git a/modules/contint/manifests/packages/labs.pp
b/modules/contint/manifests/packages/labs.pp
index baf81fc..a8153cc 100644
--- a/modules/contint/manifests/packages/labs.pp
+++ b/modules/contint/manifests/packages/labs.pp
@@ -43,7 +43,9 @@
}
# Facebook Hiphop virtual machine
-package { 'hhvm': ensure = present }
+# Disabled 2014-03-28 -- hashar
+# Cause too much of a mess because of conflicting libmemcached dependencies
+#package { 'hhvm': ensure = present }
# Bring tox/virtualenv... from pip bug 3
# TODO: Reevaluate this once we switch to trusty. Maybe provider being apt
--
To view, visit https://gerrit.wikimedia.org/r/121675
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I46e51631c67553f14b03485508fffc532c096530
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added the cvv and avs antifraud tests to WorldPay. Advanced ... - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged.
Change subject: Added the cvv and avs antifraud tests to WorldPay. Advanced our
ability to unit test fraud filters (but it clearly still needs work).
..
Added the cvv and avs antifraud tests to WorldPay.
Advanced our ability to unit test fraud filters (but it clearly
still needs work).
Change-Id: I2a5740562de8ac21c020a22e8b27a82594cae003
---
M DonationInterface.php
M tests/Adapter/Adyen/AdyenTestCase.php
M tests/Adapter/WorldPay/WorldPayTestCase.php
M tests/AllTests.php
A tests/FraudFiltersTestCase.php
M tests/TestConfiguration.php
M tests/includes/test_gateway/test.adapter.php
M worldpay_gateway/worldpay.adapter.php
8 files changed, 348 insertions(+), 23 deletions(-)
Approvals:
Adamw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/DonationInterface.php b/DonationInterface.php
index bcd7fc2..85cf821 100644
--- a/DonationInterface.php
+++ b/DonationInterface.php
@@ -44,7 +44,7 @@
'CustomFilters' = false, //Also gets set in the next loop.
'Stomp' = false,
'ConversionLog' = false, //this is definitely an Extra
- 'Minfraud' = false, //this is definitely an Extra
+ 'Minfraud' = true, //this is definitely an Extra
'PayflowPro' = false,
'GlobalCollect' = true,
'Amazon' = true,
@@ -52,9 +52,9 @@
'Paypal' = true,
'WorldPay' = true,
'FormChooser' = true,
- 'ReferrerFilter' = false, //extra
- 'SourceFilter' = false, //extra
- 'FunctionsFilter' = false, //extra
+ 'ReferrerFilter' = true, //extra
+ 'SourceFilter' = true, //extra
+ 'FunctionsFilter' = true, //extra
'IPVelocityFilter' = false, //extra
'SessionVelocityFilter' = false, //extra
'SystemStatus' = false, //extra
@@ -65,6 +65,9 @@
global $$globalname;
if ( isset( $$globalname ) $$globalname === true ) {
$optionalParts[$subextension] = true;
+ }
+
+ if ( $optionalParts[$subextension] === true ) {
//this is getting annoying.
if ( $subextension === 'ReferrerFilter' ||
$subextension === 'SourceFilter' ||
@@ -89,10 +92,8 @@
$wgDonationInterfaceEnableCustomFilters = true;
//override this for specific gateways to disable
}
}
-
}
}
-
/**
* CLASSES
@@ -170,7 +171,7 @@
}
//Custom Filters classes
-if ($optionalParts['CustomFilters'] === true){
+if ( $optionalParts['CustomFilters'] === true ) {
$wgAutoloadClasses['Gateway_Extras_CustomFilters'] =
$donationinterface_dir . extras/custom_filters/custom_filters.body.php;
}
@@ -195,7 +196,7 @@
}
//Functions Filter classes
-if ( $optionalParts['FunctionsFilter'] === true ){
+if ( $optionalParts['FunctionsFilter'] === true ) {
$wgAutoloadClasses['Gateway_Extras_CustomFilters_Functions'] =
$donationinterface_dir .
extras/custom_filters/filters/functions/functions.body.php;
}
@@ -497,6 +498,43 @@
),
);
*/
+
+ $wgWorldPayGatewayCvvMap = array (
+ '0' = false, //No Match
+ '1' = true, //Match
+ '2' = false, //Not Checked
+ '3' = false, //Issuer is Not Certified or Unregistered
+ '4' = false, //Should have CVV2 on card - ??
+ '5' = false, //CVC1 Incorrect
+ '6' = false, //No service available.
+ '7' = false, //No code returned. All the points.
+ '8' = false, //No code returned. All the points.
+ '9' = false, //Not Performed
+ //(occurs when CVN value was not present in the STN string
+ //or when transaction was not sent to the acquiring bank)
+ '' = false, //No code returned. All the points.
+ );
+
+ $wgWorldPayGatewayAvsAddressMap = array (
+ '0' = 50, //No Match
+ '1' = 0, //Match
+ '2' = 12, //Not Checked/Not Available
+ '3' = 50, //Issuer is Not Certified or Unregistered
+ '4' = 12, //Not Supported
+ '9' = 50, //Not Performed (occurs when Address1, Address2 and
Address3 values were not present in the STN string or when transaction was not
sent to the acquiring bank)
+ '' = 50, //No code returned. All the points.
+ );
+
+ $wgWorldPayGatewayAvsZipMap = array (
+ '0' = 50, //No Match
+ '1' = 0, //Match
+ '2' = 12, //Not Checked/Not Available
+ '3' = 0, //9 digit zipcode match
+ '4' = 0, //5 digit zipcode match
+ '5' = 12, //Not Supported
+ '9' = 50, //Not Performed (occurs when ZipCode value was not
present in the STN string or when transaction was not sent to the acquiring
bank)
+
[MediaWiki-commits] [Gerrit] Hygiene: Handle fatal errors when loading talk page - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Handle fatal errors when loading talk page
..
Hygiene: Handle fatal errors when loading talk page
If there is a fatal error from the API when trying to load the talk
page, load it manually instead of just leaving the spinner forever.
Change-Id: Ifd19f20f8cf60efc3cecbb0bc03a25fc9bad606e
---
M javascripts/modules/talk/TalkOverlay.js
1 file changed, 12 insertions(+), 13 deletions(-)
Approvals:
Jdlrobson: Looks good to me, but someone else must approve
Awjrichards: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/modules/talk/TalkOverlay.js
b/javascripts/modules/talk/TalkOverlay.js
index 647b3f4..7006dff 100644
--- a/javascripts/modules/talk/TalkOverlay.js
+++ b/javascripts/modules/talk/TalkOverlay.js
@@ -25,21 +25,20 @@
// FIXME: use Page's mechanisms for retrieving
page data instead
M.pageApi.getPage( options.title ).fail(
function( resp ) {
- var code;
- if ( resp.error ) {
- code = resp.error.code;
- if ( code === 'missingtitle' ) {
- // Create an empty page
for new pages
- options.page = new
Page( { title: options.title, sections: [] } );
- _super.call( self,
options );
- self.show();
- // FIXME: [LQT] remove when
liquid threads is dead (see Bug 51586)
- } else if ( code === 'lqt' ) {
- // Force a visit to the
page
- window.location =
mw.util.getUrl( options.title );
- }
+ // If the API returns the error code
'missingtitle', that means the
+ // talk page doesn't exist yet.
+ if ( resp.error.code !== undefined
resp.error.code === 'missingtitle' ) {
+ // Create an empty page for new
pages
+ options.page = new Page( {
title: options.title, sections: [] } );
+ _super.call( self, options );
+ self.show();
+ } else {
+ // If the API request fails for
any other reason, load the talk
+ // page manually rather than
leaving the spinner spinning.
+ window.location =
mw.util.getUrl( options.title );
}
} ).done( function( pageData ) {
+ // API request was successful so show
the overlay with the talk page content
options.page = new Page( pageData );
_super.call( self, options );
self.show();
--
To view, visit https://gerrit.wikimedia.org/r/120864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd19f20f8cf60efc3cecbb0bc03a25fc9bad606e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: Awjrichards aricha...@wikimedia.org
Gerrit-Reviewer: JGonera jgon...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Return null in Element#getDocument - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Return null in Element#getDocument
..
Return null in Element#getDocument
Because throwing an exception is overkill.
Change-Id: I4b865c1397a76f732c4416b5348e58d46a80042b
---
M src/Element.js
M test/OO.ui.Element.test.js
2 files changed, 6 insertions(+), 15 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/Element.js b/src/Element.js
index 14539cf..04cbaf0 100644
--- a/src/Element.js
+++ b/src/Element.js
@@ -72,13 +72,11 @@
*
* @static
* @param {jQuery|HTMLElement|HTMLDocument|Window} obj Object to get the
document for
- * @return {HTMLDocument} Document object
- * @throws {Error} If context is invalid
+ * @return {HTMLDocument|null} Document object
*/
OO.ui.Element.getDocument = function ( obj ) {
- var doc =
- // jQuery - selections created offscreen won't have a
context, so .context isn't reliable
- ( obj[0] obj[0].ownerDocument ) ||
+ // jQuery - selections created offscreen won't have a context, so
.context isn't reliable
+ return ( obj[0] obj[0].ownerDocument ) ||
// Empty jQuery selections might have a context
obj.context ||
// HTMLElement
@@ -86,13 +84,8 @@
// Window
obj.document ||
// HTMLDocument
- ( obj.nodeType === 9 obj );
-
- if ( doc ) {
- return doc;
- }
-
- throw new Error( 'Invalid context' );
+ ( obj.nodeType === 9 obj ) ||
+ null;
};
/**
diff --git a/test/OO.ui.Element.test.js b/test/OO.ui.Element.test.js
index b5650e1..a98e894 100644
--- a/test/OO.ui.Element.test.js
+++ b/test/OO.ui.Element.test.js
@@ -29,7 +29,5 @@
assert.strictEqual( OO.ui.Element.getDocument( frameDiv ), frameDoc,
'HTMLElement (framed, detached)' );
assert.strictEqual( OO.ui.Element.getDocument( frameDoc ), frameDoc,
'HTMLDocument (framed)' );
- assert.throws( function () {
- OO.ui.Element.getDocument( {} );
- }, 'Invalid' );
+ assert.strictEqual( OO.ui.Element.getDocument( {} ), null, 'Invalid' );
} );
--
To view, visit https://gerrit.wikimedia.org/r/120969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b865c1397a76f732c4416b5348e58d46a80042b
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding scheduler mode for wikimetrics in puppet - change (operations...wikimetrics)
Nuria has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121700
Change subject: Adding scheduler mode for wikimetrics in puppet
..
Adding scheduler mode for wikimetrics in puppet
Files created by celery beat mode (recurrent reports)
will go under /var/run.
See:
http://celery.readthedocs.org/en/latest/userguide/periodic-tasks.html#starting-the-scheduler
Change-Id: Ifdf9ed504c5ed20f3628511f1242888742dd6092
---
M manifests/init.pp
A manifests/scheduler.pp
M templates/queue_config.yaml.erb
3 files changed, 51 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/wikimetrics
refs/changes/00/121700/1
diff --git a/manifests/init.pp b/manifests/init.pp
index a9120c5..336779e 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -100,6 +100,7 @@
$revision_tablename= undef,
$var_directory = '/var/lib/wikimetrics',
+$run_directory = '/var/run',
$config_directory = '/etc/wikimetrics',
$config_file_owner = 'root',
$config_file_group = 'root',
@@ -109,6 +110,8 @@
$user = 'wikimetrics'
$group = 'wikimetrics'
$public_directory = ${::wikimetrics::var_directory}/public
+$celery_beat_datafile =
${::wikimetrics::run_directory}/celerybeat_scheduled_tasks
+$celery_beat_pidfile = ${::wikimetrics::run_directory}/celerybeat.pid
group { $group:
ensure = present,
@@ -141,7 +144,7 @@
}
# These directories should be writable by
# the wikimetrics user.
-file { [$var_directory, $public_directory]:
+file { [$var_directory, $public_directory, $run_directory ]:
ensure = 'directory',
owner = $user,
group = $group,
diff --git a/manifests/scheduler.pp b/manifests/scheduler.pp
new file mode 100644
index 000..5382258
--- /dev/null
+++ b/manifests/scheduler.pp
@@ -0,0 +1,40 @@
+# == Class wikimetrics::queue
+#
+# Starts redis-server and the wikimetrics-queue service.
+# in scheduler mode
+# This class does not currently support running a redis instance
+# on a different node than the wikimetrics-queue service.
+#
+# This class depends on the redis module.
+#
+class wikimetrics::scheduler
+{
+require ::wikimetrics
+
+# Install and set up redis using the redis module.
+include ::redis
+
+$mode = 'scheduler'
+$config_directory = $::wikimetrics::config_directory
+$wikimetrics_path = $::wikimetrics::path
+$service_start_on = $::wikimetrics::service_start_on
+
+# install upstart init file
+file { '/etc/init/wikimetrics-scheduler.conf':
+content = template('wikimetrics/upstart.wikimetrics.conf.erb'),
+require = Class['::wikimetrics'],
+}
+
+service { 'wikimetrics-scheduler':
+ensure = 'running',
+provider = 'upstart',
+hasrestart = true,
+require= Class['::redis'],
+subscribe = [
+File['/etc/init/wikimetrics-scheduler.conf'],
+File[${config_directory}/queue_config.yaml],
+File[${config_directory}/db_config.yaml],
+File[${config_directory}/web_config.yaml],
+],
+}
+}
diff --git a/templates/queue_config.yaml.erb b/templates/queue_config.yaml.erb
index c7d9e7e..cb2b451 100644
--- a/templates/queue_config.yaml.erb
+++ b/templates/queue_config.yaml.erb
@@ -8,3 +8,10 @@
CELERYD_TASK_SOFT_TIME_LIMIT: 3600
DEBUG : %= @debug ? 'True' : 'False' %
LOG_LEVEL : %= @debug ? 'DEBUG' : 'INFO' %
+CELERY_BEAT_DATAFILE: %= @celery_beat_datafile%
+CELERY_BEAT_PIDFILE : %= @celery_beat_pidfile%
+CELERYBEAT_SCHEDULE :
+'update-daily-recurring-reports':
+'task' : 'wikimetrics.schedules.daily.recurring_reports'
+# The schedule can be set to 'daily' for a crontab-like daily
recurrence
+'schedule' : 'debug'
--
To view, visit https://gerrit.wikimedia.org/r/121700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifdf9ed504c5ed20f3628511f1242888742dd6092
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Nuria nu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jquery.suggestions: Hide the suggestions list asynchronously - change (mediawiki/core)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121701
Change subject: jquery.suggestions: Hide the suggestions list asynchronously
..
jquery.suggestions: Hide the suggestions list asynchronously
Hiding the link we're just clicking on causes problems when done
synchronously in at least Firefox 3.6 (bug 62858) – the link is not
followed.
Also update incorrect and misformatted comments.
Bug: 62858
Change-Id: I52ed745e66c477527b6af031c222f8f221e0328b
---
M resources/jquery/jquery.suggestions.js
1 file changed, 16 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/01/121701/1
diff --git a/resources/jquery/jquery.suggestions.js
b/resources/jquery/jquery.suggestions.js
index f9a225f..9bd198d 100644
--- a/resources/jquery/jquery.suggestions.js
+++ b/resources/jquery/jquery.suggestions.js
@@ -543,15 +543,20 @@
if ( $result.get( 0 )
!== $other.get( 0 ) ) {
return;
}
- // do not interfere
with non-left clicks or if modifier keys are pressed (e.g. ctrl-click)
+ // Do not interfere
with non-left clicks or if modifier keys are pressed (e.g. ctrl-click).
if ( !( e.which !== 1
|| e.altKey || e.ctrlKey || e.shiftKey || e.metaKey ) ) {
$.suggestions.highlight( context, $result, true );
-
$.suggestions.hide( context );
if ( typeof
context.config.result.select === 'function' ) {
context.config.result.select.call( $result, context.data.$textbox );
}
+ // This will
hide the link we're just clicking on, which causes problems
+ // when done
synchronously in at least Firefox 3.6 (bug 62858).
+ setTimeout(
function () {
+
$.suggestions.hide( context );
+ }, 0 );
}
- // but still restore
focus to the textbox, so that the suggestions will be hidden properly
+ // Always bring focus
to the textbox, as that's probably where the user expects it
+ // if they were just
typing.
context.data.$textbox.focus();
} )
)
@@ -571,14 +576,19 @@
if ( $special.get( 0 )
!== $other.get( 0 ) ) {
return;
}
- // do not interfere
with non-left clicks or if modifier keys are pressed (e.g. ctrl-click)
+ // Do not interfere
with non-left clicks or if modifier keys are pressed (e.g. ctrl-click).
if ( !( e.which !== 1
|| e.altKey || e.ctrlKey || e.shiftKey || e.metaKey ) ) {
-
$.suggestions.hide( context );
if ( typeof
context.config.special.select === 'function' ) {
context.config.special.select.call( $special, context.data.$textbox );
}
+ // This will
hide the link we're just clicking on, which causes problems
+ // when done
synchronously in at least Firefox 3.6 (bug 62858).
+ setTimeout(
function () {
+
$.suggestions.hide( context );
+ }, 0 );
[MediaWiki-commits] [Gerrit] Enable Compact Personal Bar and Winter on beta labs - change (operations/mediawiki-config)
JGonera has uploaded a new change for review. https://gerrit.wikimedia.org/r/121702 Change subject: Enable Compact Personal Bar and Winter on beta labs .. Enable Compact Personal Bar and Winter on beta labs New beta features to be released soon: https://www.mediawiki.org/wiki/Compact_Personal_Bar https://www.mediawiki.org/wiki/Winter Change-Id: Idb71d293162027189efd0a8367dd693b7e0b2a58 --- M wmf-config/InitialiseSettings-labs.php 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/02/121702/1 diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index c5cf7ed..c7e5a9d 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -282,6 +282,14 @@ 'default' = true, ), + 'wgVectorBetaPersonalBar' = array( + 'default' = true, + ), + + 'wgVectorBetaWinter' = array( + 'default' = true, + ), + 'wmgVisualEditorExperimental' = array( 'default' = true, ), -- To view, visit https://gerrit.wikimedia.org/r/121702 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idb71d293162027189efd0a8367dd693b7e0b2a58 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: JGonera jgon...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename Buttons to CanvasButtons - change (mediawiki...MultimediaViewer)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121703
Change subject: Rename Buttons to CanvasButtons
..
Rename Buttons to CanvasButtons
Less misleading as we have lots of buttons, and I plan to add a new
button class for the Commons/survey/reuse thing.
Change-Id: I74194e22e9066c58f9c1eba57629458b2b9148b5
---
M MultimediaViewer.php
M MultimediaViewerHooks.php
M resources/mmv/mmv.lightboxinterface.js
R resources/mmv/ui/mmv.ui.canvasButtons.js
R resources/mmv/ui/mmv.ui.canvasButtons.less
R tests/qunit/mmv/ui/mmv.ui.canvasButtons.test.js
6 files changed, 23 insertions(+), 20 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/03/121703/1
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index cdb9278..579f7b2 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -80,8 +80,8 @@
'dependencies' = array(
'mmv.base',
'mmv.ui',
- 'mmv.ui.buttons',
'mmv.ui.canvas',
+ 'mmv.ui.canvasButtons',
'mmv.ui.categories',
'mmv.ui.description',
'mmv.ui.fileUsage',
@@ -517,13 +517,13 @@
),
), $moduleInfo( 'mmv/ui' ) );
- $wgResourceModules['mmv.ui.buttons'] = array_merge( array(
+ $wgResourceModules['mmv.ui.canvasButtons'] = array_merge( array(
'scripts' = array(
- 'mmv.ui.buttons.js',
+ 'mmv.ui.canvasButtons.js',
),
'styles' = array(
- 'mmv.ui.buttons.less',
+ 'mmv.ui.canvasButtons.less',
),
'dependencies' = array(
diff --git a/MultimediaViewerHooks.php b/MultimediaViewerHooks.php
index a6ad791..08c50b4 100644
--- a/MultimediaViewerHooks.php
+++ b/MultimediaViewerHooks.php
@@ -197,8 +197,8 @@
'tests/qunit/mmv/provider/mmv.provider.UserInfo.test.js',
'tests/qunit/mmv/provider/mmv.provider.Image.test.js',
'tests/qunit/mmv/ui/mmv.ui.test.js',
- 'tests/qunit/mmv/ui/mmv.ui.buttons.test.js',
'tests/qunit/mmv/ui/mmv.ui.canvas.test.js',
+
'tests/qunit/mmv/ui/mmv.ui.canvasButtons.test.js',
'tests/qunit/mmv/ui/mmv.ui.categories.test.js',
'tests/qunit/mmv/ui/mmv.ui.description.test.js',
'tests/qunit/mmv/ui/mmv.ui.fileUsage.test.js',
diff --git a/resources/mmv/mmv.lightboxinterface.js
b/resources/mmv/mmv.lightboxinterface.js
index d330589..398108f 100644
--- a/resources/mmv/mmv.lightboxinterface.js
+++ b/resources/mmv/mmv.lightboxinterface.js
@@ -92,7 +92,7 @@
);
this.panel = new mw.mmv.ui.MetadataPanel( this.$postDiv,
this.$controlBar );
- this.buttons = new mw.mmv.ui.Buttons( this.$imageWrapper,
this.$closeButton, this.$fullscreenButton );
+ this.buttons = new mw.mmv.ui.CanvasButtons( this.$imageWrapper,
this.$closeButton, this.$fullscreenButton );
this.canvas = new mw.mmv.ui.Canvas( this.$innerWrapper,
this.$imageWrapper, this.$wrapper );
};
diff --git a/resources/mmv/ui/mmv.ui.buttons.js
b/resources/mmv/ui/mmv.ui.canvasButtons.js
similarity index 88%
rename from resources/mmv/ui/mmv.ui.buttons.js
rename to resources/mmv/ui/mmv.ui.canvasButtons.js
index e636056..090d488 100644
--- a/resources/mmv/ui/mmv.ui.buttons.js
+++ b/resources/mmv/ui/mmv.ui.canvasButtons.js
@@ -16,16 +16,19 @@
*/
( function ( mw, $, oo ) {
+ var CBP;
+
/**
-* Represents the buttons in the interface - next, previous, close, and
fullscreen.
-* @class mw.mmv.ui.Buttons
+* Represents the buttons which are displayed over the image - next,
previous, close
+* and fullscreen.
+* @class mw.mmv.ui.CanvasButtons
* @extends mw.mmv.ui.Element
* @constructor
* @param {jQuery} $container The parent element we should put the
buttons into.
* @param {jQuery} $closeButton The close button element from the
parent class.
* @param {jQuery} $fullscreenButton The fullscreen button from the
parent class.
*/
- function Buttons( $container, $closeButton, $fullscreenButton ) {
+ function CanvasButtons( $container, $closeButton, $fullscreenButton ) {
var buttons = this;
mw.mmv.ui.Element.call( this, $container );
@@ -79,14 +82,14 @@
$container.trigger( $.Event( 'mmv-prev' ) );
} );
}
-
- oo.inheritClass( Buttons,
[MediaWiki-commits] [Gerrit] Switch beta GeoData to Elasticsearch - change (operations/mediawiki-config)
MaxSem has uploaded a new change for review. https://gerrit.wikimedia.org/r/121704 Change subject: Switch beta GeoData to Elasticsearch .. Switch beta GeoData to Elasticsearch Change-Id: I004571a5e22f87b1a1cc7a9721fd89425d1eaacf --- M wmf-config/InitialiseSettings-labs.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/04/121704/1 diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index c5cf7ed..749ab12 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -224,7 +224,7 @@ 'default' = true, ), 'wmgGeoDataBackend' = array( - 'default' = 'solr', + 'default' = 'elastic', ), 'wmgGeoDataUseCirrusSearch' = array( 'default' = true, -- To view, visit https://gerrit.wikimedia.org/r/121704 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I004571a5e22f87b1a1cc7a9721fd89425d1eaacf Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MaxSem maxsem.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Switch beta GeoData to Elasticsearch - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Switch beta GeoData to Elasticsearch .. Switch beta GeoData to Elasticsearch Change-Id: I004571a5e22f87b1a1cc7a9721fd89425d1eaacf --- M wmf-config/InitialiseSettings-labs.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index c5cf7ed..749ab12 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -224,7 +224,7 @@ 'default' = true, ), 'wmgGeoDataBackend' = array( - 'default' = 'solr', + 'default' = 'elastic', ), 'wmgGeoDataUseCirrusSearch' = array( 'default' = true, -- To view, visit https://gerrit.wikimedia.org/r/121704 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I004571a5e22f87b1a1cc7a9721fd89425d1eaacf Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clean up Client Api Module - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121705
Change subject: Clean up Client Api Module
..
Clean up Client Api Module
Change-Id: I0151c83b9466d18ee451124252c5715647d54aa3
---
M client/includes/api/ApiClientInfo.php
1 file changed, 7 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/05/121705/1
diff --git a/client/includes/api/ApiClientInfo.php
b/client/includes/api/ApiClientInfo.php
index c8b1e85..563f972 100644
--- a/client/includes/api/ApiClientInfo.php
+++ b/client/includes/api/ApiClientInfo.php
@@ -1,6 +1,7 @@
?php
namespace Wikibase;
+
use ApiBase;
use Wikibase\Client\WikibaseClient;
@@ -16,6 +17,9 @@
*/
class ApiClientInfo extends \ApiQueryBase {
+ /**
+* @var SettingsArray
+*/
protected $settings;
/**
@@ -143,7 +147,7 @@
* @return string
*/
public function getHelpUrls() {
- return
'https://www.mediawiki.org/wiki/Extension:WikibaseClient#API';
+ return
'https://www.mediawiki.org/wiki/Extension:Wikibase_Client#API';
}
/**
@@ -154,7 +158,7 @@
* @return string
*/
public function getVersion() {
- return __CLASS__ . ': $Id$';
+ return __CLASS__ . '-' . WB_VERSION;
}
/**
@@ -165,7 +169,7 @@
* @return string
*/
public function getDescription() {
- return 'Get information about the Wikibase repository';
+ return 'Get information about the Wikibase repository.';
}
}
--
To view, visit https://gerrit.wikimedia.org/r/121705
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0151c83b9466d18ee451124252c5715647d54aa3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: include browsertest role on labs slaves - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: contint: include browsertest role on labs slaves
..
contint: include browsertest role on labs slaves
Any labs slave should be able to run browser tests. So include the role
in the labs::common class.
In eqiad we need /mnt to be mounted (via role::ci::slave::labs::common).
Make sure the browsertests class depends on it.
Harness openjdk packages which are also defined by the elasticsearch
module.
Change-Id: I121a256dcbd5ab1e4e7503e81a74ee32b63882a0
---
M manifests/role/ci.pp
M modules/contint/manifests/browsertests.pp
M modules/contint/manifests/packages.pp
3 files changed, 17 insertions(+), 7 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 4aee29a..5bbaf96 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -242,6 +242,7 @@
# configured in labs LDAP. Thus, we only need to install the dependencies
# needed by the slave agent.
include jenkins::slave::requisites
+
}
class role::ci::slave::browsertests {
@@ -324,6 +325,14 @@
fail(role::ci::slave::labs must only be applied in labs)
}
+class { 'role::ci::slave::browsertests':
+require = [
+Class['role::ci::slave::labs::common'], # /mnt
+Class['contint::packages::labs'], # realize common packages first
+]
+}
+
+
include role::ci::slave::labs::common,
role::package::builder::labs,
# git-deploy replacement on labs
diff --git a/modules/contint/manifests/browsertests.pp
b/modules/contint/manifests/browsertests.pp
index 0c78f99..1803e19 100644
--- a/modules/contint/manifests/browsertests.pp
+++ b/modules/contint/manifests/browsertests.pp
@@ -9,11 +9,13 @@
$docroot = '/srv/localhost/browsertests',
){
+# Ship several packages such as php5-sqlite or ruby1.9.3
+include contint::packages
+
# Dependencies for qa/browsertests.git
package { [
'ruby-bundler', # installer for qa/browsertests.git
'rubygems', # dependency of ruby-bundler
-'ruby1.9.3', # state of the art ruby
'phantomjs', # headless browser
]:
ensure = present
@@ -25,7 +27,6 @@
'firefox',
'xvfb', # headless testing
'wikimedia-task-appserver',
-'php5-sqlite', # MediaWiki DB backend
'libsikuli-script-java', # bug 54393
]: ensure = present
}
diff --git a/modules/contint/manifests/packages.pp
b/modules/contint/manifests/packages.pp
index 18ebeff..32b16c5 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -13,11 +13,11 @@
# applications.
# (openjdk is the default distribution for the java define.
# The java define is found in modules/java/manifests/init.pp )
-package { [
-'openjdk-6-jdk',
-'openjdk-7-jdk',
-]:
-ensure = present,
+if ! defined ( Package['openjdk-6-jdk'] ) {
+package { 'openjdk-6-jdk': ensure = present }
+}
+if ! defined ( Package['openjdk-7-jdk'] ) {
+package { 'openjdk-7-jdk': ensure = present }
}
package { 'maven2':
--
To view, visit https://gerrit.wikimedia.org/r/121645
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I121a256dcbd5ab1e4e7503e81a74ee32b63882a0
Gerrit-PatchSet: 12
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
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.util: Fix jsduck syntax and minor clean up - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.util: Fix jsduck syntax and minor clean up
..
mediawiki.util: Fix jsduck syntax and minor clean up
* Fix indentation of @param comment to not trigger pre context.
* Clean up descriptions.
* Apply coding conventions
- Function call one one line, or one line per argument.
Avoid arbitrary splitting mid-line when purely for the sake
of line length.
* Combine string concatenation in one expression instead of
adding twice.
Change-Id: Id9f2a7cef1c8bf1c01584fbb293d0605fc91337e
---
M resources/mediawiki/mediawiki.util.js
1 file changed, 10 insertions(+), 7 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mediawiki/mediawiki.util.js
b/resources/mediawiki/mediawiki.util.js
index 082f807..ffafd33 100644
--- a/resources/mediawiki/mediawiki.util.js
+++ b/resources/mediawiki/mediawiki.util.js
@@ -135,18 +135,21 @@
/**
* Get the link to a page name (relative to `wgServer`),
*
-* @param {string} str Page name to get the link for.
+* @param {string} str Page name
* @param {Object} [params] A mapping of query parameter names
to values,
-* e.g. `{ action: 'edit' }`.
-* @return {string} Location for a page with name of `str` or
boolean false on error.
+* e.g. `{ action: 'edit' }`
+* @return {string} Url of the page with name of `str`
*/
getUrl: function ( str, params ) {
- var url = mw.config.get( 'wgArticlePath' ).replace(
'$1',
- util.wikiUrlencode( typeof str === 'string' ?
str : mw.config.get( 'wgPageName' ) ) );
+ var url = mw.config.get( 'wgArticlePath' ).replace(
+ '$1',
+ util.wikiUrlencode( typeof str === 'string' ?
str : mw.config.get( 'wgPageName' ) )
+ );
+
if ( params !$.isEmptyObject( params ) ) {
- url += url.indexOf( '?' ) !== -1 ? '' : '?';
- url += $.param( params );
+ url += ( url.indexOf( '?' ) !== -1 ? '' : '?'
) + $.param( params );
}
+
return url;
},
--
To view, visit https://gerrit.wikimedia.org/r/121299
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id9f2a7cef1c8bf1c01584fbb293d0605fc91337e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Daniel Friesen dan...@nadir-seen-fire.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Puppet masters in labs needs puppet::self::geoip - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121677
Change subject: Puppet masters in labs needs puppet::self::geoip
..
Puppet masters in labs needs puppet::self::geoip
Puppet dies with:
err: /Stage[main]/Geoip::Data::Puppet/File[/usr/share/GeoIP]: Could not
evaluate: Could not retrieve information from environment production
source(s) puppet:///volatile/GeoIP at
/etc/puppet/modules/geoip/manifests/data/puppet.pp:22
Whenever role::puppetmaster::self is applied on a labs instance.
Supposedly applying puppet::self::geoip fix the problem.
Change-Id: I7561f649440871c06ac1c92144a3f1ba5c9557a1
---
M manifests/role/puppet.pp
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/77/121677/1
diff --git a/manifests/role/puppet.pp b/manifests/role/puppet.pp
index d5faf56..f610198 100644
--- a/manifests/role/puppet.pp
+++ b/manifests/role/puppet.pp
@@ -76,4 +76,8 @@
server = $server,
}
}
+
+if $::realm == 'labs' {
+include puppet::self::geoip
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/121677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7561f649440871c06ac1c92144a3f1ba5c9557a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix MwEmbedSupport message groups - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Fix MwEmbedSupport message groups .. Fix MwEmbedSupport message groups Change-Id: Icbf73c6d5b736a7aaff3df6b1f9dba080bb43914 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 80a5410..06da90d 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -1023,11 +1023,11 @@ MwEmbed Support format = json descmsg = mwembed-desc -file = MwEmbedSupport/MwEmbedSupport.i18n.php MwEmbed Support - MwEmbed Support format = json id = ext-mwembedsupport-mwembedsupport +descmsg = mwembed-desc file = MwEmbedSupport/MwEmbedModules/MwEmbedSupport/i18n/%CODE%.json optional = mwe-size-gigabytes, mwe-size-megabytes, mwe-size-kilobytes, mwe-size-bytes -- To view, visit https://gerrit.wikimedia.org/r/121666 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icbf73c6d5b736a7aaff3df6b1f9dba080bb43914 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@kitano.nl Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] package-builder.pp: duplicate $build_place - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: package-builder.pp: duplicate $build_place
..
package-builder.pp: duplicate $build_place
Change-Id: Ib1a0a2326a31bd61d48660a2ab2c73b324d615ff
---
M manifests/misc/package-builder.pp
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/package-builder.pp
b/manifests/misc/package-builder.pp
index 5427cb5..549ab2a 100644
--- a/manifests/misc/package-builder.pp
+++ b/manifests/misc/package-builder.pp
@@ -133,7 +133,6 @@
$packages= [ 'cowbuilder' ]
}
'pbuilder': {
-$build_place = --buildplace '${pbuilder_root}/build'
$base_option = '--basetgz'
$file_prefix = ''
$file_ext= 'tgz'
--
To view, visit https://gerrit.wikimedia.org/r/121631
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1a0a2326a31bd61d48660a2ab2c73b324d615ff
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: vary $wgGeoDataSolr* by datacenter - change (operations/mediawiki-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121682
Change subject: beta: vary $wgGeoDataSolr* by datacenter
..
beta: vary $wgGeoDataSolr* by datacenter
Change-Id: Ie98d371b235bdb615f31fe2c1cb94f86cad83a89
---
M wmf-config/CommonSettings-labs.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/82/121682/1
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index bdf2961..fd0f34f 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -55,9 +55,9 @@
$wgGroupPermissions['autoconfirmed']['skipcaptcha'] = false;
if ( $wmgEnableGeoData ) {
- $wgGeoDataSolrMaster = 'deployment-solr.pmtpa.wmflabs';
+ $wgGeoDataSolrMaster = deployment-solr.{$wmfDatacenter}.wmflabs;
$wgGeoDataSolrHosts = array(
- 'deployment-solr.pmtpa.wmflabs' = 100,
+ deployment-solr.{$wmfDatacenter}.wmflabs = 100,
);
}
--
To view, visit https://gerrit.wikimedia.org/r/121682
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie98d371b235bdb615f31fe2c1cb94f86cad83a89
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Migrate to JSON i18n - change (mediawiki...OAuth)
Siebrand has submitted this change and it was merged. Change subject: Migrate to JSON i18n .. Migrate to JSON i18n Procedure per https://www.mediawiki.org/wiki/Manual:GenerateJsonI18n.php with shim. Change-Id: I86e3bb9ed0979af8c663fe33aa9a9cce5f4dc63e --- M OAuth.php M OAuth.setup.php M frontend/language/MWOAuth.i18n.php A i18n/ar.json A i18n/as.json A i18n/ast.json A i18n/be-tarask.json A i18n/bn.json A i18n/br.json A i18n/ca.json A i18n/ce.json A i18n/ckb.json A i18n/cs.json A i18n/de.json A i18n/diq.json A i18n/en-gb.json A i18n/en.json A i18n/es.json A i18n/et.json A i18n/fa.json A i18n/fi.json A i18n/fr.json A i18n/fy.json A i18n/gl.json A i18n/he.json A i18n/hr.json A i18n/ia.json A i18n/it.json A i18n/ja.json A i18n/ka.json A i18n/kk-cyrl.json A i18n/ko.json A i18n/krc.json A i18n/lb.json A i18n/mk.json A i18n/ml.json A i18n/mr.json A i18n/ms.json A i18n/nb.json A i18n/nds-nl.json A i18n/nl.json A i18n/nn.json A i18n/oc.json A i18n/pl.json A i18n/ps.json A i18n/pt-br.json A i18n/pt.json A i18n/qqq.json A i18n/roa-tara.json A i18n/ru.json A i18n/sco.json A i18n/sk.json A i18n/sl.json A i18n/sr-ec.json A i18n/sr-el.json A i18n/sv.json A i18n/tr.json A i18n/uk.json A i18n/uz.json A i18n/vi.json A i18n/vo.json A i18n/wuu.json A i18n/yi.json A i18n/zh-hans.json A i18n/zh-hant.json 65 files changed, 6,137 insertions(+), 7,305 deletions(-) Approvals: Siebrand: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/121633 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I86e3bb9ed0979af8c663fe33aa9a9cce5f4dc63e Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/OAuth Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@kitano.nl Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Anomie bjor...@wikimedia.org Gerrit-Reviewer: CSteipp cste...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@kitano.nl ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] making js files pass jshint - change (mediawiki...SemanticFormsInputs)
Jatin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121679
Change subject: making js files pass jshint
..
making js files pass jshint
Bug: 61631
Change-Id: I0c25ff5363aa68f1a6484dad6054d026015fafca
---
M libs/datecheck.js
M libs/datepicker.js
M libs/datetimepicker.js
M libs/jquery.form-validator.js
M libs/jquery.multi-select.js
M libs/jquery.quicksearch.js
M libs/menuselect.js
M libs/regexp.js
M libs/timepicker.js
M libs/twolistboxes.js
10 files changed, 86 insertions(+), 76 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticFormsInputs
refs/changes/79/121679/1
diff --git a/libs/datecheck.js b/libs/datecheck.js
index 2440c2c..83f1984 100644
--- a/libs/datecheck.js
+++ b/libs/datecheck.js
@@ -5,6 +5,8 @@
*
*/
+var mw;
+
window.SFI_DateCheck_init = function(input_id, params) {
$.validate({
borderColorOnError : '', // Border color of elements with
invalid value; empty string to not change border color as it messes up the
style of the input box
diff --git a/libs/datepicker.js b/libs/datepicker.js
index 06cc483..e0b9494 100644
--- a/libs/datepicker.js
+++ b/libs/datepicker.js
@@ -30,7 +30,7 @@
var tabindex = inputShow.attr('tabindex');
- var re = /\d{4}\/\d{2}\/\d{2}/
+ var re = /\d{4}\/\d{2}\/\d{2}/;
if ( params.disabled ) {
@@ -97,35 +97,37 @@
inputShow.datepicker( 'widget' ).addClass(
params.userClasses );
jQuery( '#' + input_id + ' + button' ).addClass(
params.userClasses );
}
-
+ var i;
if ( params.disabledDates ) {
- var disabledDates = new Array();
-
+ var disabledDates = [];
+
for (i in params.disabledDates)
- disabledDates.push([
+ if ( params.disabledDates[i] )
+ disabledDates.push([
new Date(params.disabledDates[i][0],
params.disabledDates[i][1], params.disabledDates[i][2]),
new Date(params.disabledDates[i][3],
params.disabledDates[i][4], params.disabledDates[i][5])
- ]);
+ ]);
inputShow.datepicker( 'option', 'disabledDates',
disabledDates );
- delete disabledDates;
+ disabledDates = null;
}
if ( params.highlightedDates ) {
- var highlightedDates = new Array();
+ var highlightedDates = [];
for (i in params.highlightedDates)
- highlightedDates.push([
- new Date(params.highlightedDates[i][0],
params.highlightedDates[i][1], params.highlightedDates[i][2]),
- new Date(params.highlightedDates[i][3],
params.highlightedDates[i][4], params.highlightedDates[i][5])
- ]);
+ if ( params.highlightedDates[i])
+ highlightedDates.push([
+new Date(params.highlightedDates[i][0],
params.highlightedDates[i][1], params.highlightedDates[i][2]),
+new Date(params.highlightedDates[i][3],
params.highlightedDates[i][4], params.highlightedDates[i][5])
+ ]);
inputShow.datepicker( 'option', 'highlightedDates',
highlightedDates );
- delete highlightedDates;
+ highlightedDates = null;
}
if (params.disabledDays) {
@@ -163,7 +165,7 @@
inputShow.datepicker( 'widget' ).hide();
}
-}
+};
/**
* Checks a date if it is to be enabled or highlighted
@@ -179,7 +181,7 @@
var jInput = jQuery( input );
- var enable = true
+ var enable = true;
var disabledDays = jInput.datepicker( 'option', 'disabledDays' );
diff --git a/libs/datetimepicker.js b/libs/datetimepicker.js
index 255c85b..52acce7 100644
--- a/libs/datetimepicker.js
+++ b/libs/datetimepicker.js
@@ -4,7 +4,7 @@
* @author Stephan Gambke
*
*/
-
+/*jshint sub:true*/
window.SFI_DTP_init = function( inputId, params ) {
@@ -29,14 +29,16 @@
// call initialisation functions for subinputs
for (var subinputId in params.subinputsInitData) {
-
- for ( var index in params.subinputsInitData[subinputId] ) {
+ if ( params.subinputsInitDat[subinputId] ) {
+ for ( var index in params.subinputsInitData[subinputId] ) {
+if( params.subinputsInitData[subinputId][index] )
[MediaWiki-commits] [Gerrit] Update configuration for extensions migrated to JSON - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Update configuration for extensions migrated to JSON .. Update configuration for extensions migrated to JSON Change-Id: Ib9417d487a3e9edd537b1fd8c2ba0abf11beab97 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 14 insertions(+), 4 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index a51983a..012ddfa 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -1097,17 +1097,19 @@ OAI-PMH repository id = ext-oai -file = OAI/OAIRepo.i18n.php +format = json +file = OAI/i18n/%CODE%.json optional = oairepository # No need to translate the alias. Unlisted special page, it is used by a machine only. # aliasfile = OAI/OAIRepo.alias.php OATH Auth +format = json aliasfile = OATHAuth/OATHAuth.alias.php optional = oath OAuth -file = OAuth/frontend/language/MWOAuth.i18n.php +format = json aliasfile = OAuth/frontend/language/MWOAuth.alias.php descmsg = mwoauth-desc ignored = mwoauth-form-legal @@ -1137,8 +1139,10 @@ magicfile = OpenGraphMeta/OpenGraphMeta.magic.php Open Search Xml +format = json Open Stack Manager +format = json aliasfile = OpenStackManager/OpenStackManager.alias.php optional = openstackmanager-puppetdoclink, prefs-openstack @@ -1150,6 +1154,7 @@ Page Disqus Page Images +format = json ignored = pageimages-blacklist Page In Cat @@ -1163,6 +1168,7 @@ Page Tools Page Triage +format = json aliasfile = PageTriage/PageTriage.alias.php optional = pagetriage-creation-dateformat, pagetriage-user-creation-dateformat optional = pagetriage-tags-linkrot-label, pagetriage-tags-linkrot-desc @@ -1248,6 +1254,7 @@ ignored = pagetriage-special-contributions, pagetriage-tags-param-date-format Paged Tiff Handler +format = json descmsg = tiff-desc Pan Scroll @@ -1255,13 +1262,15 @@ Parser Fun Parser Functions +format = json descmsg = pfunc_desc magicfile = ParserFunctions/ParserFunctions.i18n.magic.php Parser Hooks -# No real extension, used for VisualEditor -# Parsoid +Parsoid +format = json +file = Parsoid/php/i18n/%CODE%.json Pdf Book @@ -1271,6 +1280,7 @@ ignored = pdf_size_default, pdf_size_options Pdf Handler +format = json descmsg = pdf-desc # Something wrong this the i18n file. Disable it for now - RS 2013-12-10 -- To view, visit https://gerrit.wikimedia.org/r/121649 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib9417d487a3e9edd537b1fd8c2ba0abf11beab97 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@kitano.nl Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: vary $wgGeoDataSolr* by datacenter - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: beta: vary $wgGeoDataSolr* by datacenter
..
beta: vary $wgGeoDataSolr* by datacenter
Change-Id: Ie98d371b235bdb615f31fe2c1cb94f86cad83a89
---
M wmf-config/CommonSettings-labs.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index bdf2961..fd0f34f 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -55,9 +55,9 @@
$wgGroupPermissions['autoconfirmed']['skipcaptcha'] = false;
if ( $wmgEnableGeoData ) {
- $wgGeoDataSolrMaster = 'deployment-solr.pmtpa.wmflabs';
+ $wgGeoDataSolrMaster = deployment-solr.{$wmfDatacenter}.wmflabs;
$wgGeoDataSolrHosts = array(
- 'deployment-solr.pmtpa.wmflabs' = 100,
+ deployment-solr.{$wmfDatacenter}.wmflabs = 100,
);
}
--
To view, visit https://gerrit.wikimedia.org/r/121682
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie98d371b235bdb615f31fe2c1cb94f86cad83a89
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sanitize embed HTML - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Sanitize embed HTML
..
Sanitize embed HTML
Make sure tables, lists and other complex stuff do not get into the
embed HTML code.
Change-Id: I559dc7892e058e403ddde6994a7e1ac0c9585325
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/369
---
M resources/mmv/mmv.EmbedFileFormatter.js
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mmv/mmv.EmbedFileFormatter.js
b/resources/mmv/mmv.EmbedFileFormatter.js
index 9181690..93766e3 100644
--- a/resources/mmv/mmv.EmbedFileFormatter.js
+++ b/resources/mmv/mmv.EmbedFileFormatter.js
@@ -76,6 +76,9 @@
* @return {string} byline (can contain HTML)
*/
EFFP.getByline = function ( author, source ) {
+ author = author this.htmlUtils.htmlToTextWithLinks( author );
+ source = source this.htmlUtils.htmlToTextWithLinks( source );
+
if ( author source) {
return mw.message(
'multimediaviewer-credit',
--
To view, visit https://gerrit.wikimedia.org/r/120953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I559dc7892e058e403ddde6994a7e1ac0c9585325
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Migrate amazon_gateway.i18n.php to JSON i18n - change (mediawiki...DonationInterface)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121670
Change subject: Migrate amazon_gateway.i18n.php to JSON i18n
..
Migrate amazon_gateway.i18n.php to JSON i18n
This was missed in 0e1f29e675393e9dcf because it is not actually used
anywhere in the extension. I'd expected it to be used in
DonationInterface.php in a block of code similar to this at line 1038:
if ( $optionalParts['Adyen'] === true )
Procedure per https://www.mediawiki.org/wiki/Manual:GenerateJsonI18n.php
with shim.
Change-Id: I45ece1dbda5b4cdfcb4a833e13da983fd63473c3
---
M amazon_gateway/amazon_gateway.i18n.php
A amazon_gateway/i18n/ast.json
A amazon_gateway/i18n/be-tarask.json
A amazon_gateway/i18n/br.json
A amazon_gateway/i18n/ca.json
A amazon_gateway/i18n/ce.json
A amazon_gateway/i18n/cs.json
A amazon_gateway/i18n/cy.json
A amazon_gateway/i18n/da.json
A amazon_gateway/i18n/de-formal.json
A amazon_gateway/i18n/de.json
A amazon_gateway/i18n/dsb.json
A amazon_gateway/i18n/el.json
A amazon_gateway/i18n/en.json
A amazon_gateway/i18n/eo.json
A amazon_gateway/i18n/es.json
A amazon_gateway/i18n/eu.json
A amazon_gateway/i18n/fa.json
A amazon_gateway/i18n/fi.json
A amazon_gateway/i18n/fr.json
A amazon_gateway/i18n/gl.json
A amazon_gateway/i18n/he.json
A amazon_gateway/i18n/hsb.json
A amazon_gateway/i18n/hu.json
A amazon_gateway/i18n/ia.json
A amazon_gateway/i18n/id.json
A amazon_gateway/i18n/it.json
A amazon_gateway/i18n/ja.json
A amazon_gateway/i18n/ka.json
A amazon_gateway/i18n/ko.json
A amazon_gateway/i18n/ksh.json
A amazon_gateway/i18n/lb.json
A amazon_gateway/i18n/mk.json
A amazon_gateway/i18n/ms.json
A amazon_gateway/i18n/mt.json
A amazon_gateway/i18n/nb.json
A amazon_gateway/i18n/nl.json
A amazon_gateway/i18n/oc.json
A amazon_gateway/i18n/pl.json
A amazon_gateway/i18n/pms.json
A amazon_gateway/i18n/pt-br.json
A amazon_gateway/i18n/qqq.json
A amazon_gateway/i18n/ro.json
A amazon_gateway/i18n/roa-tara.json
A amazon_gateway/i18n/ru.json
A amazon_gateway/i18n/si.json
A amazon_gateway/i18n/sv.json
A amazon_gateway/i18n/te.json
A amazon_gateway/i18n/tl.json
A amazon_gateway/i18n/tr.json
A amazon_gateway/i18n/uk.json
A amazon_gateway/i18n/ur.json
A amazon_gateway/i18n/vi.json
A amazon_gateway/i18n/zh-hans.json
A amazon_gateway/i18n/zh-hant.json
55 files changed, 502 insertions(+), 427 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/70/121670/1
diff --git a/amazon_gateway/amazon_gateway.i18n.php
b/amazon_gateway/amazon_gateway.i18n.php
index d71b78b..eeb2776 100644
--- a/amazon_gateway/amazon_gateway.i18n.php
+++ b/amazon_gateway/amazon_gateway.i18n.php
@@ -1,433 +1,31 @@
?php
/**
- * Internationalization file for the Donation Interface - Amazon - extension
+ * This is a backwards-compatibility shim, generated by:
+ *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
*
- * @file
- * @ingroup Extensions
+ * Beginning with MediaWiki 1.23, translation strings are stored in json files,
+ * and the EXTENSION.i18n.php file only exists to provide compatibility with
+ * older releases of MediaWiki. For more information about this migration, see:
+ * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
+ *
+ * This shim maintains compatibility back to MediaWiki 1.17.
*/
-
$messages = array();
+$GLOBALS['wgHooks']['LocalisationCacheRecache'][] = function ( $cache, $code,
$cachedData ) {
+ $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
+ foreach ( $codeSequence as $csCode ) {
+ $fileName = __DIR__ . /i18n/$csCode.json;
+ if ( is_readable( $fileName ) ) {
+ $data = FormatJson::decode( file_get_contents(
$fileName ), true );
+ foreach ( array_keys( $data ) as $key ) {
+ if ( $key === '' || $key[0] === '@' ) {
+ unset( $data[$key] );
+ }
+ }
+ $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
+ }
-/** English */
-$messages['en'] = array(
- 'amazongateway' = 'Make your donation now',
- 'amazon_gateway-desc' = 'Amazon payment processing',
-);
-
-/** Message documentation (Message documentation)
- * @author Shirayuki
- */
-$messages['qqq'] = array(
- 'amazongateway' = '{{Identical|Make your donation now}}',
- 'amazon_gateway-desc' = '{{desc}}',
-);
-
-/** Asturian (asturianu)
- * @author Xuacu
- */
-$messages['ast'] = array(
- 'amazongateway' = 'Fai la to donación agora',
- 'amazon_gateway-desc' = Procesamientu de pagos d'Amazon,
-);
-
-/** Belarusian (Taraškievica orthography) (беларуская (тарашкевіца))
- * @author Wizardist
- */
-$messages['be-tarask'] = array(
- 'amazongateway' =
[MediaWiki-commits] [Gerrit] package-builder.pp: create aptcache dir - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: package-builder.pp: create aptcache dir
..
package-builder.pp: create aptcache dir
cowbuilder does not create the aptcache dir, create it just before
running the command.
Change-Id: I4b324ab40b218113966698475bfa048c33cd3adc
---
M manifests/misc/package-builder.pp
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/package-builder.pp
b/manifests/misc/package-builder.pp
index f078d6c..5427cb5 100644
--- a/manifests/misc/package-builder.pp
+++ b/manifests/misc/package-builder.pp
@@ -122,7 +122,8 @@
require packages
-$apt_cache = --aptcache '${pbuilder_root}/aptcache'
+$apt_cache_dir = ${pbuilder_root}/aptcache
+$apt_cache = --aptcache '${$apt_cache_dir}'
$build_place = --buildplace '${pbuilder_root}/build'
case $realpbuilder {
'cowbuilder': {
@@ -148,7 +149,7 @@
$image_file = ${pbuilder_root}/${file_prefix}${realdist}.${file_ext}
exec { imaging ${realdist} for ${realpbuilder}:
-command = ${realpbuilder} ${apt_cache} ${build_place} --create
--distribution ${realdist} ${base_option} ${image_file} ${components}
${othermirror},
+command = /bin/mkdir -p ${apt_cache_dir}; ${realpbuilder}
${apt_cache} ${build_place} --create --distribution ${realdist} ${base_option}
${image_file} ${components} ${othermirror},
creates = $image_file,
path = '/bin:/sbin:/usr/bin:/usr/sbin',
timeout = 600,
--
To view, visit https://gerrit.wikimedia.org/r/121663
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b324ab40b218113966698475bfa048c33cd3adc
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable Compact Personal Bar and Winter on beta labs - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Enable Compact Personal Bar and Winter on beta labs
..
Enable Compact Personal Bar and Winter on beta labs
New beta features to be released soon:
https://www.mediawiki.org/wiki/Compact_Personal_Bar
https://www.mediawiki.org/wiki/Winter
Change-Id: Idb71d293162027189efd0a8367dd693b7e0b2a58
---
M wmf-config/CommonSettings-labs.php
M wmf-config/InitialiseSettings-labs.php
2 files changed, 10 insertions(+), 0 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index fd0f34f..b53ea1f 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -85,6 +85,8 @@
if ( $wmgUseVectorBeta ) {
require_once( $IP/extensions/VectorBeta/VectorBeta.php );
+ $wgVectorBetaPersonalBar = $wmgVectorBetaPersonalBar;
+ $wgVectorBetaWinter = $wmgVectorBetaWinter;
}
if ( $wmgUseParsoid ) {
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index c5cf7ed..47f1688 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -282,6 +282,14 @@
'default' = true,
),
+ 'wmgVectorBetaPersonalBar' = array(
+ 'default' = true,
+ ),
+
+ 'wmgVectorBetaWinter' = array(
+ 'default' = true,
+ ),
+
'wmgVisualEditorExperimental' = array(
'default' = true,
),
--
To view, visit https://gerrit.wikimedia.org/r/121702
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idb71d293162027189efd0a8367dd693b7e0b2a58
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: JGonera jgon...@wikimedia.org
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] package-builder.pp: --create must be 1st arg to pbuilder - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: package-builder.pp: --create must be 1st arg to pbuilder
..
package-builder.pp: --create must be 1st arg to pbuilder
Change-Id: Ic3c98feb5879905c821e84be899d413715719312
---
M manifests/misc/package-builder.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/package-builder.pp
b/manifests/misc/package-builder.pp
index 549ab2a..c276de4 100644
--- a/manifests/misc/package-builder.pp
+++ b/manifests/misc/package-builder.pp
@@ -148,7 +148,7 @@
$image_file = ${pbuilder_root}/${file_prefix}${realdist}.${file_ext}
exec { imaging ${realdist} for ${realpbuilder}:
-command = /bin/mkdir -p ${apt_cache_dir}; ${realpbuilder}
${apt_cache} ${build_place} --create --distribution ${realdist} ${base_option}
${image_file} ${components} ${othermirror},
+command = /bin/mkdir -p ${apt_cache_dir}; ${realpbuilder}
--create ${apt_cache} ${build_place} --distribution ${realdist} ${base_option}
${image_file} ${components} ${othermirror},
creates = $image_file,
path = '/bin:/sbin:/usr/bin:/usr/sbin',
timeout = 600,
--
To view, visit https://gerrit.wikimedia.org/r/121671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3c98feb5879905c821e84be899d413715719312
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Element#isElementAttached - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Add Element#isElementAttached
..
Add Element#isElementAttached
In general we may want to know if an element is attached
to the DOM.
Change-Id: I9a3d00a45323434adb54d7449a3a1dc01c2df245
---
M src/Element.js
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/Element.js b/src/Element.js
index 04cbaf0..5b66968 100644
--- a/src/Element.js
+++ b/src/Element.js
@@ -362,6 +362,14 @@
};
/**
+ * Check if the element is attached to the DOM
+ * @return {boolean} The element is attached to the DOM
+ */
+OO.ui.Element.prototype.isElementAttached = function () {
+ return $.contains( this.getElementDocument(), this.$element[0] );
+};
+
+/**
* Get the DOM document.
*
* @return {HTMLDocument} Document object
--
To view, visit https://gerrit.wikimedia.org/r/120970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a3d00a45323434adb54d7449a3a1dc01c2df245
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Return exit_status from Application._before_exit - change (mediawiki...scap)
jenkins-bot has submitted this change and it was merged.
Change subject: Return exit_status from Application._before_exit
..
Return exit_status from Application._before_exit
The default no-op implementation of Application._before_exit did not
return the input exit_status value as expected by the driver code. This
caused None to always be passed to sys.exit() regardless of any error
conditions encountered.
Bug: 62862
Change-Id: I67799553aed7a1544ef5d2f68c21bf8ecb777273
---
M scap/cli.py
M scap/main.py
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scap/cli.py b/scap/cli.py
index 3f497c4..387c852 100644
--- a/scap/cli.py
+++ b/scap/cli.py
@@ -182,7 +182,7 @@
:returns: exit status
-pass
+return exit_status
@classmethod
def run(cls, argv=sys.argv, exit=True):
diff --git a/scap/main.py b/scap/main.py
index 0d15c39..f214b19 100644
--- a/scap/main.py
+++ b/scap/main.py
@@ -192,3 +192,4 @@
if self.config:
self.stats.increment('scap.scap')
self.stats.timing('scap.scap', self.duration * 1000)
+return exit_status
--
To view, visit https://gerrit.wikimedia.org/r/121571
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I67799553aed7a1544ef5d2f68c21bf8ecb777273
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] HttpStatus: add RFC 6585 status codes - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: HttpStatus: add RFC 6585 status codes .. HttpStatus: add RFC 6585 status codes Add newer (Apr 2012) HTTP status codes their messages to HttpStatus' getMessage. Adds 428, 429, 431, 511 per RFC 6585, Additional HTTP Status Codes. Change-Id: Ia055880c4b2f3ac43cf5d94dbdd45a3690a58569 --- M includes/libs/HttpStatus.php 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/libs/HttpStatus.php b/includes/libs/HttpStatus.php index 4f626b2..d72ffca 100644 --- a/includes/libs/HttpStatus.php +++ b/includes/libs/HttpStatus.php @@ -75,13 +75,17 @@ 422 = 'Unprocessable Entity', 423 = 'Locked', 424 = 'Failed Dependency', + 428 = 'Precondition Required', + 429 = 'Too Many Requests', + 431 = 'Request Header Fields Too Large', 500 = 'Internal Server Error', 501 = 'Not Implemented', 502 = 'Bad Gateway', 503 = 'Service Unavailable', 504 = 'Gateway Timeout', 505 = 'HTTP Version Not Supported', - 507 = 'Insufficient Storage' + 507 = 'Insufficient Storage', + 511 = 'Network Authentication Required', ); return isset( $statusMessage[$code] ) ? $statusMessage[$code] : null; } -- To view, visit https://gerrit.wikimedia.org/r/121627 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia055880c4b2f3ac43cf5d94dbdd45a3690a58569 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: Parent5446 tylerro...@gmail.com Gerrit-Reviewer: PleaseStand pleasest...@live.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve post action action performance - change (mediawiki...Flow)
Bsitu has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121707
Change subject: Improve post action action performance
..
Improve post action action performance
load all action permission check at once, reduces the amount
of function calls related to revision model generation
Change-Id: I5bb92d878ebed0c30280fb6dc092a5c822db86ef
---
M includes/RevisionActionPermissions.php
M includes/View/PostActionMenu.php
M templates/post.html.php
M templates/topic.html.php
4 files changed, 52 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/07/121707/1
diff --git a/includes/RevisionActionPermissions.php
b/includes/RevisionActionPermissions.php
index 073e5d5..140325c 100644
--- a/includes/RevisionActionPermissions.php
+++ b/includes/RevisionActionPermissions.php
@@ -3,7 +3,7 @@
namespace Flow;
use Flow\Collection\CollectionCache;
-use Flow\Exception\InvalidDataException;
+use Flow\Exception\InvalidInputException;
use Flow\Model\AbstractRevision;
use Closure;
use User;
@@ -136,6 +136,26 @@
}
/**
+* Get all the allowed actions of a revision for user
+* @return array
+*/
+ public function getRevisionAllowedActions( AbstractRevision $revision =
null, array $actions ) {
+ $allowedActions = array();
+
+ foreach ( $actions as $action ) {
+ if ( $this-actions-getValue( $action ) ) {
+ $permission = $this-getPermission( $revision,
$action );
+ $allowedActions[$action] = call_user_func_array(
+ array( $this-user, 'isAllowedAny' ),
+ (array) $permission );
+ } else {
+ throw new InvalidInputException( 'Invalid
action: ' . $action, 'invalid-input' );
+ }
+ }
+ return $allowedActions;
+ }
+
+ /**
* Returns the permission specified in FlowActions for the given action
* against the given revision's moderation state.
*
diff --git a/includes/View/PostActionMenu.php b/includes/View/PostActionMenu.php
index 03b7e9e..19fd9f7 100644
--- a/includes/View/PostActionMenu.php
+++ b/includes/View/PostActionMenu.php
@@ -17,6 +17,7 @@
protected $block;
protected $editToken;
protected $post;
+ protected $allowedActions;
/**
* @param UrlGenerator $urlGenerator
@@ -33,6 +34,7 @@
$this-block = $block;
$this-post = $post;
$this-editToken = $editToken;
+ $this-allowedActions = array();
}
/**
@@ -75,7 +77,11 @@
* @return bool
*/
public function isAllowed( $action ) {
- return $this-permissions-isAllowed( $this-post, $action );
+ if ( isset( $this-allowedActions[$action] ) ) {
+ return $this-allowedActions[$action];
+ } else {
+ return $this-allowedActions[$action] =
$this-permissions-isAllowed( $this-post, $action );
+ }
}
/**
@@ -86,9 +92,27 @@
*/
public function isAllowedAny( $action /* [, $action2 [, ... ]] */ ) {
$arguments = func_get_args();
- array_unshift( $arguments, $this-post );
- return call_user_func_array( array( $this-permissions,
'isAllowedAny' ), $arguments );
+ foreach ( $arguments as $key = $action ) {
+ if ( isset( $this-allowedActions[$action] ) ) {
+ if ( $this-allowedActions[$action] ) {
+ return true;
+ } else {
+ unset( $arguments[$key] );
+ }
+ }
+ }
+ if ( $arguments ) {
+ array_unshift( $arguments, $this-post );
+ return call_user_func_array( array( $this-permissions,
'isAllowedAny' ), $arguments );
+ } else {
+ return false;
+ }
+
+ }
+
+ public function batchLoadAllowedActions( array $actions ) {
+ $this-allowedActions =
$this-permissions-getRevisionAllowedActions( $this-post, $actions );
}
/**
diff --git a/templates/post.html.php b/templates/post.html.php
index d92ecf1..e1991bc 100644
--- a/templates/post.html.php
+++ b/templates/post.html.php
@@ -1,6 +1,8 @@
?php
$replyForm = '';
+
+$postActionMenu-batchLoadAllowedActions( array( 'history', 'hide-post',
'delete-post', 'suppress-post', 'restore-post', 'view', 'reply' ) );
/*
* Only display
[MediaWiki-commits] [Gerrit] Adding scheduler mode to wikimetrics. Role change. - change (mediawiki/vagrant)
Nuria has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121708
Change subject: Adding scheduler mode to wikimetrics. Role change.
..
Adding scheduler mode to wikimetrics. Role change.
Companion to changeset: https://gerrit.wikimedia.org/r/#/c/121700/
Change-Id: I20e2566d489a83e2f966f9b3ef157605d2072650
---
M puppet/manifests/roles/wikimetrics.pp
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/08/121708/1
diff --git a/puppet/manifests/roles/wikimetrics.pp
b/puppet/manifests/roles/wikimetrics.pp
index 9eac165..beaebc7 100644
--- a/puppet/manifests/roles/wikimetrics.pp
+++ b/puppet/manifests/roles/wikimetrics.pp
@@ -78,6 +78,10 @@
require = Exec['install_wikimetrics_dependencies'],
}
+class { '::wikimetrics::scheduler':
+require = Exec['install_wikimetrics_dependencies'],
+}
+
# make sure wsgi is included in case we are running in apache WSGI mode.
include ::apache::mods::wsgi
class { 'wikimetrics::web':
--
To view, visit https://gerrit.wikimedia.org/r/121708
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I20e2566d489a83e2f966f9b3ef157605d2072650
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Nuria nu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change wgServer and wgCanonicalServer for arbcom wikis - change (operations/mediawiki-config)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/121709 Change subject: Change wgServer and wgCanonicalServer for arbcom wikis .. Change wgServer and wgCanonicalServer for arbcom wikis In order to make them work with our current SSL certs. The new domains are already working, so no DNS changes are needed. Change-Id: I4b18e4ce87aac74216b4cbe7156d32c195e95cf3 --- M wmf-config/InitialiseSettings.php 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/09/121709/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index d8dc33a..2394077 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -1154,10 +1154,10 @@ // Individual wikis 'advisorywiki' = '//advisory.wikimedia.org', - 'arbcom_dewiki' = '//arbcom.de.wikipedia.org', - 'arbcom_enwiki' = '//arbcom.en.wikipedia.org', - 'arbcom_fiwiki' = '//arbcom.fi.wikipedia.org', - 'arbcom_nlwiki' = '//arbcom.nl.wikipedia.org', + 'arbcom_dewiki' = '//arbcom-de.wikipedia.org', + 'arbcom_enwiki' = '//arbcom-en.wikipedia.org', + 'arbcom_fiwiki' = '//arbcom-fi.wikipedia.org', + 'arbcom_nlwiki' = '//arbcom-nl.wikipedia.org', 'arwikimedia' = '//ar.wikimedia.org', 'auditcomwiki' = '//auditcom.wikimedia.org', 'boardgovcomwiki' = '//boardgovcom.wikimedia.org', @@ -1235,10 +1235,10 @@ // Individual wikis 'advisorywiki' = 'http://advisory.wikimedia.org', - 'arbcom_dewiki' = 'http://arbcom.de.wikipedia.org', - 'arbcom_enwiki' = 'http://arbcom.en.wikipedia.org', - 'arbcom_fiwiki' = 'http://arbcom.fi.wikipedia.org', - 'arbcom_nlwiki' = 'http://arbcom.nl.wikipedia.org', + 'arbcom_dewiki' = 'http://arbcom-de.wikipedia.org', + 'arbcom_enwiki' = 'http://arbcom-en.wikipedia.org', + 'arbcom_fiwiki' = 'http://arbcom-fi.wikipedia.org', + 'arbcom_nlwiki' = 'http://arbcom-nl.wikipedia.org', 'arwikimedia' = 'http://ar.wikimedia.org', 'auditcomwiki' = 'https://auditcom.wikimedia.org', 'boardgovcomwiki' = 'https://boardgovcom.wikimedia.org', -- To view, visit https://gerrit.wikimedia.org/r/121709 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4b18e4ce87aac74216b4cbe7156d32c195e95cf3 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Hoo man h...@online.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding scheduler mode to wikimetrics. Role change. - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Adding scheduler mode to wikimetrics. Role change.
..
Adding scheduler mode to wikimetrics. Role change.
Companion to changeset: https://gerrit.wikimedia.org/r/#/c/121700/
Change-Id: I20e2566d489a83e2f966f9b3ef157605d2072650
---
M puppet/manifests/roles/wikimetrics.pp
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/manifests/roles/wikimetrics.pp
b/puppet/manifests/roles/wikimetrics.pp
index 9eac165..beaebc7 100644
--- a/puppet/manifests/roles/wikimetrics.pp
+++ b/puppet/manifests/roles/wikimetrics.pp
@@ -78,6 +78,10 @@
require = Exec['install_wikimetrics_dependencies'],
}
+class { '::wikimetrics::scheduler':
+require = Exec['install_wikimetrics_dependencies'],
+}
+
# make sure wsgi is included in case we are running in apache WSGI mode.
include ::apache::mods::wsgi
class { 'wikimetrics::web':
--
To view, visit https://gerrit.wikimedia.org/r/121708
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I20e2566d489a83e2f966f9b3ef157605d2072650
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Nuria nu...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Prevent warning when Echo is not installed - change (mediawiki...MobileFrontend)
Kaldari has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121710
Change subject: Hygiene: Prevent warning when Echo is not installed
..
Hygiene: Prevent warning when Echo is not installed
Previously prepareUserButton() would try to get the title of the
Notifications special page regardless of whether Echo was
installed. Now it makes sure that Echo is installed first. Rather
that splitting the default into 2 else statements, I just moved it
to the beginning.
Change-Id: Ia097a92fd88b740597faf736800ea812a920a14c
---
M includes/skins/SkinMinerva.php
1 file changed, 24 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/10/121710/1
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 6fa9d0f..727594f 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -192,33 +192,34 @@
* @param $tpl BaseTemplate
*/
protected function prepareUserButton( BaseTemplate $tpl ) {
+ // Set user button to empty string by default
+ $tpl-set( 'secondaryButton', '' );
+
$user = $this-getUser();
- $currentTitle = $this-getTitle();
- $notificationsTitle = SpecialPage::getTitleFor( 'Notifications'
);
// If Echo is available, the user is logged in, and they are
not already on the
// notifications archive, show the notifications icon in the
header.
- if ( class_exists( 'MWEchoNotifUser' ) $user-isLoggedIn()
-$currentTitle-getPrefixedText() !==
$notificationsTitle-getPrefixedText()
- ) {
- // FIXME: cap higher counts
- $count = MWEchoNotifUser::newFromUser( $user
)-getNotificationCount();
+ if ( class_exists( 'MWEchoNotifUser' ) $user-isLoggedIn() )
{
+ $currentTitle = $this-getTitle();
+ $notificationsTitle = SpecialPage::getTitleFor(
'Notifications' );
+ if ( $currentTitle-getPrefixedText() !==
$notificationsTitle-getPrefixedText() ) {
+ // FIXME: cap higher counts
+ $count = MWEchoNotifUser::newFromUser( $user
)-getNotificationCount();
- $tpl-set( 'secondaryButton',
- Html::openElement( 'a', array(
- 'title' = wfMessage(
'mobile-frontend-user-button-tooltip' ),
- 'href' =
$notificationsTitle-getLocalURL(
- array( 'returnto' =
$currentTitle-getPrefixedText() ) ),
- 'class' = 'user-button',
- 'id'= 'secondary-button',
- ) ) .
- Html::element(
- 'span',
- array( 'class' = $count ? '' : 'zero'
),
- $this-getLanguage()-formatNum( $count
) ) .
- Html::closeElement( 'a' )
- );
- } else {
- $tpl-set( 'secondaryButton', '' );
+ $tpl-set( 'secondaryButton',
+ Html::openElement( 'a', array(
+ 'title' = wfMessage(
'mobile-frontend-user-button-tooltip' ),
+ 'href' =
$notificationsTitle-getLocalURL(
+ array( 'returnto' =
$currentTitle-getPrefixedText() ) ),
+ 'class' = 'user-button',
+ 'id'= 'secondary-button',
+ ) ) .
+ Html::element(
+ 'span',
+ array( 'class' = $count ? '' :
'zero' ),
+
$this-getLanguage()-formatNum( $count ) ) .
+ Html::closeElement( 'a' )
+ );
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/121710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia097a92fd88b740597faf736800ea812a920a14c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Kaldari rkald...@wikimedia.org
___
MediaWiki-commits mailing list
[MediaWiki-commits] [Gerrit] Rename CSS file to relate to actual style names - change (mediawiki...VisualEditor)
Trevor Parscal has uploaded a new change for review. https://gerrit.wikimedia.org/r/121711 Change subject: Rename CSS file to relate to actual style names .. Rename CSS file to relate to actual style names Change-Id: Iece39a7cb34ea4a51e5aba10df60ea870bf912f8 --- M VisualEditor.php R modules/ve-mw/ui/styles/ve.ui.MWTemplatePage.css 2 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/11/121711/1 diff --git a/VisualEditor.php b/VisualEditor.php index 83acd23..4d5831a 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -993,7 +993,7 @@ 'modules/ve-mw/ui/styles/ve.ui.MWParameterSearchWidget.css', 'modules/ve-mw/ui/styles/ve.ui.MWTransclusionContentPage.css', 'modules/ve-mw/ui/styles/ve.ui.MWTransclusionDialog.css', - 'modules/ve-mw/ui/styles/ve.ui.TemplatePage.css', + 'modules/ve-mw/ui/styles/ve.ui.MWTemplatePage.css', ), 'dependencies' = array( 'ext.visualEditor.mwcore', diff --git a/modules/ve-mw/ui/styles/ve.ui.TemplatePage.css b/modules/ve-mw/ui/styles/ve.ui.MWTemplatePage.css similarity index 100% rename from modules/ve-mw/ui/styles/ve.ui.TemplatePage.css rename to modules/ve-mw/ui/styles/ve.ui.MWTemplatePage.css -- To view, visit https://gerrit.wikimedia.org/r/121711 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iece39a7cb34ea4a51e5aba10df60ea870bf912f8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Trevor Parscal tpars...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Barebones Wikipedia Zero support for FFOS. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Barebones Wikipedia Zero support for FFOS.
..
Barebones Wikipedia Zero support for FFOS.
* This gets us by for some future state.
* It alerts the user at app startup if Wikipedia Zero is on.
* It also updates the search bar.
* Finally, it tries to account for app quiesce and not overly prompt.
* In rebooted app we would do radio and some sort of header inspection.
Change-Id: I60c7c408a0e01b81e9d0fe2108de0138804e7b74
---
M app.appcache
M js/lib/chrome.js
M js/lib/menu.js
M manifest.webapp
M messages/messages-ast.properties
M messages/messages-br.properties
M messages/messages-ca.properties
M messages/messages-cs.properties
M messages/messages-cy.properties
M messages/messages-de.properties
M messages/messages-en.properties
M messages/messages-es.properties
M messages/messages-fa.properties
M messages/messages-fr.properties
M messages/messages-he.properties
M messages/messages-hsb.properties
M messages/messages-lb.properties
M messages/messages-mk.properties
M messages/messages-nl.properties
M messages/messages-ro.properties
M messages/messages-ru.properties
M messages/messages-sv.properties
M messages/messages-uk.properties
M messages/messages-vi.properties
24 files changed, 83 insertions(+), 4 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/app.appcache b/app.appcache
index dcf805c..43c11c0 100644
--- a/app.appcache
+++ b/app.appcache
@@ -1,5 +1,5 @@
CACHE MANIFEST
-# Wed Mar 19 22:41:08 UTC 2014
+# Wed Mar 26 01:05:53 UTC 2014
index.html
404.html
AUTHORS
diff --git a/js/lib/chrome.js b/js/lib/chrome.js
index f2bce57..b16ecff 100644
--- a/js/lib/chrome.js
+++ b/js/lib/chrome.js
@@ -202,7 +202,66 @@
}
function loadFirstPage() {
- var lastReadPage = localStorage[lastReadPage];
+ var lastReadPage = localStorage[lastReadPage],
+
+ /*
+We'll check one time here if it's Wikipedia Zero.
+It's possible the Wikipedia app for FFOS will have
+been shutdown due to general system memory constraints.
+So we may check sometimes more than we want.
+But we do have to check in that case. The alternative
+would be to not check, which would be wrong.
+To mitigate this, we'll reduce checks if Wikipedia
+Zero was known to be on within the last 15 minutes.
+One downside is users who actively quiesce the app
+won't get the prompt, but that's a tradeoff we'll accept,
+as we have evidence of app quiesce from Mozilla Bugzilla,
+whereas active quiesce in FFOS in practice is unresearched.
+Now, as we retain the last page visited, the user
+may not even notice that the app was shutdown. So
+even though we may make an extra check in this post-
+quiesced state, we shouldn't prompt the user more
+than necessary. In a reboot of this app, we'd have
+more visual polish (e.g., colorized UI) to make it
+more obvious, but this is a simpler approach for now.
+ */
+
+ lang = preferencesDB.get('language') || 'en',
+ wikipediaZeroMessageUrl = window.PROTOCOL + '://' +
lang + '.m.' + window.PROJECTNAME +
'.org/w/api.php?action=zeroconfigtype=messageagent=ffos-wikipedia',
+ wikipediaZeroShownDateTime =
localStorage['wikipediaZeroShownDateTime'],
+ dateDifference,
+ showZeroInSearch = function() {
$('#searchParam').attr('placeholder', mw.msg('zero-search-hint' ).toString());
};
+
+ if (wikipediaZeroShownDateTime) {
+ dateDifference = Date.now() -
wikipediaZeroShownDateTime;
+ }
+
+ if (dateDifference dateDifference 1000 * 60 * 15) {
+ /*
+ Allow the page load time to start before changing
searchbar.
+ The Ajax else{} below does so by its own nature.
+ */
+ setTimeout( function() { showZeroInSearch(); }, 200)
+ } else {
+ /* More than 15 minutes has passed since W0 on, or W0
was never on. */
+ $.ajax({
+ url: wikipediaZeroMessageUrl,
+ dataType: 'jsonp',
+ success: function(json) {
+ if(json json.message) {
+ showZeroInSearch();
+
localStorage['wikipediaZeroShownDateTime'] = Date.now();
+
[MediaWiki-commits] [Gerrit] Up the version for the Settings - About screen and manifest. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Up the version for the Settings - About screen and manifest.
..
Up the version for the Settings - About screen and manifest.
Change-Id: I1dcf6e66e779319ab9c047f07a32d479a588ea0a
---
M app.appcache
M js/lib/menu.js
M manifest.webapp
3 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/app.appcache b/app.appcache
index 66190b6..dcf805c 100644
--- a/app.appcache
+++ b/app.appcache
@@ -1,5 +1,5 @@
CACHE MANIFEST
-# Wed Mar 19 17:18:24 UTC 2014
+# Wed Mar 19 22:41:08 UTC 2014
index.html
404.html
AUTHORS
diff --git a/js/lib/menu.js b/js/lib/menu.js
index 7c06a4e..f4be605 100644
--- a/js/lib/menu.js
+++ b/js/lib/menu.js
@@ -14,7 +14,8 @@
}
function getAboutVersionString() {
- return 3.2.1;
+ /* window.navigator.mozApps.getSelf() turned out to be problematic here
*/
+ return 3.2.6;
}
var menu_items = [
diff --git a/manifest.webapp b/manifest.webapp
index 9cc7cf4..568a129 100644
--- a/manifest.webapp
+++ b/manifest.webapp
@@ -1,5 +1,5 @@
{
- version: 0.5,
+ version: 3.2.6,
name: Wikipedia,
description: Wikipedia Mobile for Firefox OS,
launch_path: /WikipediaMobileFirefoxOS/,
--
To view, visit https://gerrit.wikimedia.org/r/119652
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1dcf6e66e779319ab9c047f07a32d479a588ea0a
Gerrit-PatchSet: 1
Gerrit-Project: apps/firefox/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt ab...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Yurik yu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename CSS file to relate to actual style names - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Rename CSS file to relate to actual style names .. Rename CSS file to relate to actual style names Change-Id: Iece39a7cb34ea4a51e5aba10df60ea870bf912f8 --- M VisualEditor.php R modules/ve-mw/ui/styles/ve.ui.MWTemplatePage.css 2 files changed, 1 insertion(+), 1 deletion(-) Approvals: Catrope: Looks good to me, approved Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/VisualEditor.php b/VisualEditor.php index 83acd23..4d5831a 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -993,7 +993,7 @@ 'modules/ve-mw/ui/styles/ve.ui.MWParameterSearchWidget.css', 'modules/ve-mw/ui/styles/ve.ui.MWTransclusionContentPage.css', 'modules/ve-mw/ui/styles/ve.ui.MWTransclusionDialog.css', - 'modules/ve-mw/ui/styles/ve.ui.TemplatePage.css', + 'modules/ve-mw/ui/styles/ve.ui.MWTemplatePage.css', ), 'dependencies' = array( 'ext.visualEditor.mwcore', diff --git a/modules/ve-mw/ui/styles/ve.ui.TemplatePage.css b/modules/ve-mw/ui/styles/ve.ui.MWTemplatePage.css similarity index 100% rename from modules/ve-mw/ui/styles/ve.ui.TemplatePage.css rename to modules/ve-mw/ui/styles/ve.ui.MWTemplatePage.css -- To view, visit https://gerrit.wikimedia.org/r/121711 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iece39a7cb34ea4a51e5aba10df60ea870bf912f8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Trevor Parscal tpars...@wikimedia.org Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 6acac41..7a3c4ec - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/121712 Change subject: Syncronize VisualEditor: 6acac41..7a3c4ec .. Syncronize VisualEditor: 6acac41..7a3c4ec Change-Id: Ia18282b41c202cc004ffcfd7320d1cb3c60ac93e --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/12/121712/1 diff --git a/VisualEditor b/VisualEditor index 6acac41..7a3c4ec 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 6acac41490d7d765fad54c708244ad92c9dbcb83 +Subproject commit 7a3c4ecaaa66a04aac5764c5baed071835d506f9 -- To view, visit https://gerrit.wikimedia.org/r/121712 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia18282b41c202cc004ffcfd7320d1cb3c60ac93e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 6acac41..7a3c4ec - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 6acac41..7a3c4ec .. Syncronize VisualEditor: 6acac41..7a3c4ec Change-Id: Ia18282b41c202cc004ffcfd7320d1cb3c60ac93e --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 6acac41..7a3c4ec 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 6acac41490d7d765fad54c708244ad92c9dbcb83 +Subproject commit 7a3c4ecaaa66a04aac5764c5baed071835d506f9 -- To view, visit https://gerrit.wikimedia.org/r/121712 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia18282b41c202cc004ffcfd7320d1cb3c60ac93e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implemented changes for getting into translatewiki - change (mediawiki...BlueSpiceFoundation)
Smuggli has uploaded a new change for review. https://gerrit.wikimedia.org/r/121683 Change subject: Implemented changes for getting into translatewiki .. Implemented changes for getting into translatewiki Changed order of messages: FIRST en, SECOND qqq, AFTER THAT doesn't matter Change-Id: Idc2277aa6db3120ded45d39ccb801489077ba8ed --- M languages/Validator.i18n.php 1 file changed, 31 insertions(+), 34 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation refs/changes/83/121683/1 diff --git a/languages/Validator.i18n.php b/languages/Validator.i18n.php index cd0b85f..2d03229 100644 --- a/languages/Validator.i18n.php +++ b/languages/Validator.i18n.php @@ -5,7 +5,6 @@ * Part of BlueSpice for MediaWiki * * @author Stephan Muggli mug...@hallowelt.biz - * @packageBlueSpice_Core * @subpackage Validator * @copyright Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All rights reserved. @@ -15,57 +14,40 @@ $messages = array(); -$messages['de'] = array( - 'bs-validator-email-validation-approved' = 'Die Email-Adresse wurde erfolgreich validiert', - 'bs-validator-email-validation-not-approved' = 'Die Email-Adresse konnte nicht validiert werden', -//unused 'bs-validator-ip-validation-approved'= 'Die IP-Adresse wurde erfolgreich validiert', -//unused 'bs-validator-ip-validation-not-approved'= 'Die IP-Adresse konnte nicht validiert werden', - 'bs-validator-url-validation-approved' = 'Die URL wurde erfolgreich validiert', - 'bs-validator-url-validation-not-approved' = 'Die URL konnte nicht validiert werden', - 'bs-validator-arg-count-validation-approved' = 'Das Attribut count wurde erfolgreich validiert', - 'bs-validator-arg-count-validation-not-approved' = 'Das Attribut count muss einen positiven Wert haben', - 'bs-validator-set-validation-approved' = '$1 wurde erfolgreich validiert', - 'bs-validator-set-validation-not-approved' = 'Für $1 ist nur einer der folgenden Werte erlaubt: $2', - 'bs-validator-integer-range-validation-too-low' = 'Der angegebene Wert ist zu klein. Er darf nicht kleiner als $1 sein.', - 'bs-validator-integer-range-validation-too-high' = 'Der angegebene Wert ist zu groß. Er darf nicht größer als $1 sein.', -); - -$messages['de-formal'] = array(); - $messages['en'] = array( - 'bs-validator-email-validation-approved' = 'The email address has been successfully validated', - 'bs-validator-email-validation-not-approved' = 'The email address could not be validated', + 'bs-validator-email-validation-approved' = 'The email address has been successfully validated', + 'bs-validator-email-validation-not-approved' = 'The email address could not be validated', //unused 'bs-validator-ip-validation-approved'= 'The IP address has been successfully validated', //unused 'bs-validator-ip-validation-not-approved'= 'The IP address could not be validated', - 'bs-validator-url-validation-approved' = 'The URL was successfully validated', - 'bs-validator-url-validation-not-approved' = 'The URL could not be validated', - 'bs-validator-arg-count-validation-approved' = 'The attribute count has been successfully validated', + 'bs-validator-url-validation-approved' = 'The URL was successfully validated', + 'bs-validator-url-validation-not-approved' = 'The URL could not be validated', + 'bs-validator-arg-count-validation-approved' = 'The attribute count has been successfully validated', 'bs-validator-arg-count-validation-not-approved' = 'The attribute count could not be validated', - 'bs-validator-set-validation-approved' = '$1 was successfully validated', - 'bs-validator-set-validation-not-approved' = 'For $1 only one of the following values is allowed: $2', - 'bs-validator-integer-range-validation-too-low' = 'The provided value is to low. It may not be less than $1.', + 'bs-validator-set-validation-approved' = '$1 was successfully validated', + 'bs-validator-set-validation-not-approved' = 'For $1 only one of the following values is allowed: $2', + 'bs-validator-integer-range-validation-too-low' = 'The provided value is to low. It may not be less than $1.', 'bs-validator-integer-range-validation-too-high' = 'The provided value is to high. It may not be greater than $1.', ); $messages['qqq'] = array( - 'bs-validator-email-validation-approved' = 'Used if the email address given is syntactically correct', - 'bs-validator-email-validation-not-approved' = 'Used if the email address given contains syntax errors', + 'bs-validator-email-validation-approved' = 'Used if the email address
[MediaWiki-commits] [Gerrit] Split-up theme-specific styles - change (mediawiki...VisualEditor)
Trevor Parscal has uploaded a new change for review. https://gerrit.wikimedia.org/r/121713 Change subject: Split-up theme-specific styles .. Split-up theme-specific styles Change-Id: I4af6c03413d49cb05031d439caf340ddef996355 --- M VisualEditor.php R modules/ve-mw/ui/themes/apex/ve.ui.MWLinkTargetInputWidget.css 2 files changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/13/121713/1 diff --git a/VisualEditor.php b/VisualEditor.php index 4d5831a..36daee9 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -487,6 +487,12 @@ 'lib/ve/modules/ve/ui/styles/ve.ui.Surface.css', 'lib/ve/modules/ve/ui/styles/ve.ui.Toolbar.css', ), + 'skinStyles' = array( + 'default' = array( + 'lib/ve/modules/ve/ui/themes/apex/ve.ui.Inspector.css', + ), + 'minerva' = array(), + ), 'dependencies' = array( 'rangy', 'unicodejs.wordbreak', @@ -793,7 +799,12 @@ ), 'styles' = array( 'modules/ve-mw/ce/styles/ve.ce.MWNumberedExternalLinkNode.css', - 'modules/ve-mw/ui/styles/ve.ui.MWLinkTargetInputWidget.css', + ), + 'skinStyles' = array( + 'default' = array( + 'modules/ve-mw/ui/styles/ve.ui.MWLinkTargetInputWidget.css' + ), + 'minerva' = array(), ), 'dependencies' = array( 'ext.visualEditor.mwcore', diff --git a/modules/ve-mw/ui/styles/ve.ui.MWLinkTargetInputWidget.css b/modules/ve-mw/ui/themes/apex/ve.ui.MWLinkTargetInputWidget.css similarity index 100% rename from modules/ve-mw/ui/styles/ve.ui.MWLinkTargetInputWidget.css rename to modules/ve-mw/ui/themes/apex/ve.ui.MWLinkTargetInputWidget.css -- To view, visit https://gerrit.wikimedia.org/r/121713 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4af6c03413d49cb05031d439caf340ddef996355 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Trevor Parscal tpars...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Split-up theme-specific styles - change (VisualEditor/VisualEditor)
Trevor Parscal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121714
Change subject: Split-up theme-specific styles
..
Split-up theme-specific styles
Change-Id: I48c19640a287f443f07dfac926240851bc2d85d0
---
M build/modules.json
M modules/ve/ui/styles/ve.ui.Inspector.css
A modules/ve/ui/themes/apex/ve.ui.Inspector.css
3 files changed, 27 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/14/121714/1
diff --git a/build/modules.json b/build/modules.json
index e9ac94c..990ce0e 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -254,6 +254,11 @@
modules/ve/ui/styles/ve.ui.Icons-vector.css
]
},
+ visualEditor.desktop: {
+ styles: [
+ modules/ve/ui/themes/apex/ve.ui.Inspector.css
+ ]
+ },
visualEditor.mobile: {
scripts: [
modules/ve/ui/ve.ui.MobileSurface.js,
diff --git a/modules/ve/ui/styles/ve.ui.Inspector.css
b/modules/ve/ui/styles/ve.ui.Inspector.css
index 12346fa..78746d4 100644
--- a/modules/ve/ui/styles/ve.ui.Inspector.css
+++ b/modules/ve/ui/styles/ve.ui.Inspector.css
@@ -12,22 +12,6 @@
transition: opacity 100ms;
}
-.ve-ui-inspector .oo-ui-frame {
- width: 17.25em;
- height: 3em;
-}
-
-.ve-ui-inspector-content .oo-ui-window-head {
- height: 2em;
- padding: 0.5em;
-}
-
-.ve-ui-inspector-content .oo-ui-window-icon {
- padding-left: 0.5em;
- margin-left: 0.25em;
- border-left: solid 1px #eee;
-}
-
.ve-ui-inspector-content .ve-ui-inspector-closeButton {
float: left;
}
diff --git a/modules/ve/ui/themes/apex/ve.ui.Inspector.css
b/modules/ve/ui/themes/apex/ve.ui.Inspector.css
new file mode 100644
index 000..9799ddc
--- /dev/null
+++ b/modules/ve/ui/themes/apex/ve.ui.Inspector.css
@@ -0,0 +1,22 @@
+/*!
+ * ObjectOriented UserInterface Inspector styles.
+ *
+ * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+.ve-ui-inspector .oo-ui-frame {
+ width: 17.25em;
+ height: 3em;
+}
+
+.ve-ui-inspector-content .oo-ui-window-head {
+ height: 2em;
+ padding: 0.5em;
+}
+
+.ve-ui-inspector-content .oo-ui-window-icon {
+ padding-left: 0.5em;
+ margin-left: 0.25em;
+ border-left: solid 1px #eee;
+}
--
To view, visit https://gerrit.wikimedia.org/r/121714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I48c19640a287f443f07dfac926240851bc2d85d0
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal tpars...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
