[MediaWiki-commits] [Gerrit] Update version before MLEB release - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged. Change subject: Update version before MLEB release .. Update version before MLEB release Change-Id: If16619829401c018a786226bb4a30f00f4dcb23d --- M Translate.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/Translate.php b/Translate.php index b30d609..cb02535 100644 --- a/Translate.php +++ b/Translate.php @@ -17,7 +17,7 @@ /** * Version number used in extension credits and in other places where needed. */ -define( 'TRANSLATE_VERSION', '2014-10-31' ); +define( 'TRANSLATE_VERSION', '2014-11-28' ); /** * Extension credits properties. -- To view, visit https://gerrit.wikimedia.org/r/176365 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If16619829401c018a786226bb4a30f00f4dcb23d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Nikerabbit niklas.laxst...@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 missing SVG icons - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged. Change subject: Add missing SVG icons .. Add missing SVG icons Add add.svg, remove.svg and help.svg. Replace 1 use of action-edit.png with action-edit.svg. Bug: 60948 Change-Id: Id76046f7af2c05f3dd5fa8cef44e9370cd9c7a2d --- M resources/css/ext.translate.helplink.css M resources/css/ext.translate.special.aggregategroups.css A resources/images/add.svg A resources/images/help.svg A resources/images/remove.svg 5 files changed, 20 insertions(+), 4 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/css/ext.translate.helplink.css b/resources/css/ext.translate.helplink.css index c6887e9..2645749 100644 --- a/resources/css/ext.translate.helplink.css +++ b/resources/css/ext.translate.helplink.css @@ -1,6 +1,9 @@ .mw-translate-helplink { - /* @embed */ background: url(../images/help.png) no-repeat scroll left center transparent; + /* @embed */ + background-image: -webkit-linear-gradient(transparent, transparent), url('../images/help.svg'); + /* @embed */ + background-image: linear-gradient(transparent, transparent), url('../images/help.svg'); padding-left: 20px; } diff --git a/resources/css/ext.translate.special.aggregategroups.css b/resources/css/ext.translate.special.aggregategroups.css index 0468898..7b7b338 100644 --- a/resources/css/ext.translate.special.aggregategroups.css +++ b/resources/css/ext.translate.special.aggregategroups.css @@ -1,21 +1,31 @@ span.tp-aggregate-remove-ag-button, span.tp-aggregate-remove-button { - /* @embed */ background: url(../images/remove.png) no-repeat scroll left center transparent; + /* @embed */ + background-image: -webkit-linear-gradient(transparent, transparent), url('../images/remove.svg'); + /* @embed */ + background-image: linear-gradient(transparent, transparent), url('../images/remove.svg'); padding: 10px; cursor: pointer; } span.tp-aggregate-edit-ag-button { - /* @embed */ background: url(../images/action-edit.png) no-repeat scroll left center transparent; + /* @embed */ + background-image: -webkit-linear-gradient(transparent, transparent), url('../images/action-edit.svg'); + /* @embed */ + background-image: linear-gradient(transparent, transparent), url('../images/action-edit.svg'); + background-size: 18px 18px; padding: 10px; cursor: pointer; } a.tpt-add-new-group { - /* @embed */ background: url(../images/add.png) no-repeat scroll left center transparent; + /* @embed */ + background-image: -webkit-linear-gradient(transparent, transparent), url('../images/add.svg'); + /* @embed */ + background-image: linear-gradient(transparent, transparent), url('../images/add.svg'); padding-left: 20px; } diff --git a/resources/images/add.svg b/resources/images/add.svg new file mode 100644 index 000..238ebd1 --- /dev/null +++ b/resources/images/add.svg @@ -0,0 +1 @@ +?xml version=1.0 encoding=UTF-8?svg xmlns=http://www.w3.org/2000/svg; xmlns:xlink=http://www.w3.org/1999/xlink; width=16 height=16defslinearGradient id=cstop offset=0 stop-color=#8ccb81/stop offset=1 stop-color=#65ab55//linearGradientlinearGradientstop offset=0 stop-color=#74b75b/stop offset=1 stop-color=#86c97a//linearGradientlinearGradient id=bstop offset=0 stop-color=#dcf1d8/stop offset=1 stop-color=#89be78//linearGradientlinearGradient id=astop offset=0 stop-color=#34812c stop-opacity=.957/stop offset=1 stop-color=#87b870 stop-opacity=.957//linearGradientlinearGradient x1=12.758 y1=13.001 x2=2.583 y2=2.521 xlink:href=#a gradientUnits=userSpaceOnUse/linearGradient x1=2.583 y1=2.521 x2=12.758 y2=13.001 xlink:href=#b gradientUnits=userSpaceOnUse/linearGradient x1=4.551 y1=4.433 x2=11.459 y2=11.341 xlink:href=#c gradientUnits=userSpaceOnUse/linearGradient x1=4.551 y1=4.433 x2=11.459 y2=11.341 id=f xlink:href=#c gradientUnits=userSpaceOnUse gradientTransform=matrix(1.002 0 0 1.002 -.038 0)/linearGradient x1=2.583 y1=2.521 x2=12.758 y2=13.001 id=d xlink:href=#b gradientUnits=userSpaceOnUse gradientTransform=translate(.253 .127)/linearGradient x1=12.758 y1=13.001 x2=2.583 y2=2.521 id=e xlink:href=#a gradientUnits=userSpaceOnUse gradientTransform=translate(.253 .127)//defspath d=M14.9 7.95a6.85 6.85 0 1 1-13.7 0 6.85 6.85 0 1 1 13.7 0z fill=url(#d) fill-rule=evenodd stroke=url(#e)/path d=M13 8A5 5 0 1 1 3 8a5 5 0 1 1 10 0z fill=url(#f)/path d=M7.032 5v2.042H5v1.995h2.063V11h2V9.005H11V7.01H9.032V5.017z fill=#fff fill-opacity=.957//svg diff --git a/resources/images/help.svg b/resources/images/help.svg new file mode 100644 index 000..13b2027 --- /dev/null +++ b/resources/images/help.svg @@ -0,0 +1 @@ +?xml version=1.0 encoding=UTF-8?svg
[MediaWiki-commits] [Gerrit] Remove ComicNeue for languages which it does not support - change (mediawiki...UniversalLanguageSelector)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/176394 Change subject: Remove ComicNeue for languages which it does not support .. Remove ComicNeue for languages which it does not support List of characters coming from different font (not exhaustive list): af: ê bk: unknown language ca: óàéí da: æåø de: üäö es: áóñ et: üä fi: äö fo: ø fr: èé fy: úêâûô ga: íóáúé gd: òèà gl: áó hu: öáóűé is: Þýðí it: à lb: ëäé li: äöèó mi: ā nb: åø oc: çè pl: ęą pt: úêáçã sq: ë sv: äöå tr: ğıçİşöú wa: é Change-Id: I115724d644bf2efddfec2558dd386d24f6238f24 --- M data/fontrepo/fonts/ComicNeue/font.ini 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/94/176394/1 diff --git a/data/fontrepo/fonts/ComicNeue/font.ini b/data/fontrepo/fonts/ComicNeue/font.ini index 238766a..f681018 100644 --- a/data/fontrepo/fonts/ComicNeue/font.ini +++ b/data/fontrepo/fonts/ComicNeue/font.ini @@ -1,5 +1,5 @@ [ComicNeue] -languages=af,bk,ca,cy,da,de,en,es,et,fi,fo,fr,fy,ga,gd,gl,hu,id,is,it,lb,li,mi,ms,nb,nl,oc,pl,pt,sq,sv,sw,tl,tr,wa +languages=cy,en,id,ms,nl,sw,tl url=http://comicneue.com/ license=CC0 1.0 Universal licensefile=CC0-3.0.txt -- To view, visit https://gerrit.wikimedia.org/r/176394 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I115724d644bf2efddfec2558dd386d24f6238f24 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] mediawiki.ui: Add select/drop down - change (mediawiki/core)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/176395 Change subject: [WIP] mediawiki.ui: Add select/drop down .. [WIP] mediawiki.ui: Add select/drop down - Only hover state - select inside div - div clipping the arrow and adding image - Can't give state information to parent element :( Todo: - SVG chevron - Test on more browsers - Try more states - Get a spec Change-Id: Ie68f4b5025a54cf427c2891418c551c6cf8b2ba2 --- M docs/kss/Makefile M resources/Resources.php A resources/src/mediawiki.ui/components/images/chevron.png A resources/src/mediawiki.ui/components/select.less 4 files changed, 89 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/95/176395/1 diff --git a/docs/kss/Makefile b/docs/kss/Makefile index 31feec1..f382bfc 100644 --- a/docs/kss/Makefile +++ b/docs/kss/Makefile @@ -6,7 +6,7 @@ $(eval KSS_RL_TMP := $(shell mktemp /tmp/tmp.XX)) # Keep module names in strict alphabetical order, so CSS loads in the same order as ResourceLoader's addModuleStyles does; this can affect rendering. # See OutputPage::makeResourceLoaderLink. - @curl -sG ${MEDIAWIKI_LOAD_URL}?modules=mediawiki.legacy.commonPrint|mediawiki.legacy.shared|mediawiki.ui|mediawiki.ui.anchor|mediawiki.ui.button|mediawiki.ui.checkbox|mediawiki.ui.radio|mediawiki.ui.icon|mediawiki.ui.input|mediawiki.ui.textonly=styles $(KSS_RL_TMP) + @curl -sG ${MEDIAWIKI_LOAD_URL}?modules=mediawiki.legacy.commonPrint|mediawiki.legacy.shared|mediawiki.ui|mediawiki.ui.anchor|mediawiki.ui.button|mediawiki.ui.checkbox|mediawiki.ui.radio|mediawiki.ui.select|mediawiki.ui.icon|mediawiki.ui.input|mediawiki.ui.textonly=styles $(KSS_RL_TMP) @node_modules/.bin/kss-node ../../resources/src/mediawiki.ui static/ --css $(KSS_RL_TMP) -t styleguide-template @rm $(KSS_RL_TMP) diff --git a/resources/Resources.php b/resources/Resources.php index 88965d0..41010e1 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1533,7 +1533,15 @@ 'position' = 'top', 'targets' = array( 'desktop', 'mobile' ), ), - // Lightweight module for anchor styles + 'mediawiki.ui.select' = array( + 'skinStyles' = array( + 'default' = array( + 'resources/src/mediawiki.ui/components/select.less', + ), + ), + 'position' = 'top', + 'targets' = array( 'desktop', 'mobile' ), + ), 'mediawiki.ui.anchor' = array( 'skinStyles' = array( 'default' = array( diff --git a/resources/src/mediawiki.ui/components/images/chevron.png b/resources/src/mediawiki.ui/components/images/chevron.png new file mode 100644 index 000..5d8e1fe --- /dev/null +++ b/resources/src/mediawiki.ui/components/images/chevron.png Binary files differ diff --git a/resources/src/mediawiki.ui/components/select.less b/resources/src/mediawiki.ui/components/select.less new file mode 100644 index 000..7938e05 --- /dev/null +++ b/resources/src/mediawiki.ui/components/select.less @@ -0,0 +1,79 @@ +// Select +@import mediawiki.mixins; +@import mediawiki.ui/variables; +@import mediawiki.ui/mixins; + +// Select +// +// Apply the mw-ui-select class to select. +// +// Styleguide 9. + +// mw-ui-select +// +// Style an select using MediaWiki UI. +// Currently in draft status and subject to change. +// +// Markup: +// div class=mw-ui-select +// select +// optionInputs/option +// optionButtons/option +// optionCheckboxes/option +// optionRadioboxes/option +// /select +// /div +// +// Styleguide 9.1. +.mw-ui-select { + + width: 160px; + height: 2em; + overflow: hidden; + margin: 0; + padding: 0; + border-radius: @borderRadius; + border: 1px solid @colorGray8; + .box-sizing( border-box ); + background-color: #fff; + background-image: url( 'images/chevron.png' ); + background-repeat: no-repeat; + background-position: center right; + + select { + width: 180px; + + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + + border: none; + border-radius: 0; + background: transparent; + font-size: 1em; + line-height: 2em; + height: 100%; + .box-sizing( border-box ); + padding: 0 1em; + margin: 0; + border-bottom: 1px solid #fff; + outline: none; + + :focus { + outline: none; + } + + :-moz-focusring { + color: transparent; + text-shadow: 0 0 0 #000; + } +
[MediaWiki-commits] [Gerrit] mediawiki: Reduce indentation in theme-oo-ui-checkboxInputWi... - change (oojs/ui)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/176396 Change subject: mediawiki: Reduce indentation in theme-oo-ui-checkboxInputWidget .. mediawiki: Reduce indentation in theme-oo-ui-checkboxInputWidget Change-Id: I472283878f313a6b702ad4627c5765013c7292ca --- M src/themes/mediawiki/widgets.less 1 file changed, 27 insertions(+), 37 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/96/176396/1 diff --git a/src/themes/mediawiki/widgets.less b/src/themes/mediawiki/widgets.less index 9afb131..b9a0672 100644 --- a/src/themes/mediawiki/widgets.less +++ b/src/themes/mediawiki/widgets.less @@ -159,54 +159,44 @@ + span { cursor: pointer; margin: 0 0.4em; + } - ::before { - content: ''; - position: absolute; - left: 0; - border-radius: @border-radius; - width: @checkbox-size; - height: @checkbox-size; - background-color: #fff; - border: 1px solid grey; - } ++ span::before { + content: ''; + position: absolute; + left: 0; + border-radius: @border-radius; + width: @checkbox-size; + height: @checkbox-size; + background-color: #fff; + border: 1px solid grey; } // when the input is checked, style the span pseudo before element that followed as a checked checkbox - :checked { - + span { - ::before { - .oo-ui-background-image('@{oo-ui-default-image-path}/icons/check-constructive.svg'); - background-size: @checkbox-size, @checkbox-size; - background-repeat: no-repeat; - background-position: center top; - } - } + :checked + span::before { + .oo-ui-background-image('@{oo-ui-default-image-path}/icons/check-constructive.svg'); + background-size: @checkbox-size, @checkbox-size; + background-repeat: no-repeat; + background-position: center top; } @focus-bottom-border-size: 0.2em; - :active, - :focus { - + span { - ::after { - content: ''; - position: absolute; - width: @checkbox-size; - height: @checkbox-size - @focus-bottom-border-size + 0.1; // offset by bottom border - // offset from the checkbox by 1px to account for left border - left: 1px; - border-bottom: solid @focus-bottom-border-size lightgrey; - } - } + + :active + span::after, + :focus + span::after { + content: ''; + position: absolute; + width: @checkbox-size; + height: @checkbox-size - @focus-bottom-border-size + 0.1; // offset by bottom border + // offset from the checkbox by 1px to account for left border + left: 1px; + border-bottom: solid @focus-bottom-border-size lightgrey; } // disabled checked boxes have a gray background - :disabled + span { + :disabled + span::before { cursor: default; - - ::before { - background-color: lightgrey; - } + background-color: lightgrey; } } } -- To view, visit https://gerrit.wikimedia.org/r/176396 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I472283878f313a6b702ad4627c5765013c7292ca Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna psax...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] MediaWiki Theme: Add radio buttons - change (oojs/ui)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/176398 Change subject: MediaWiki Theme: Add radio buttons .. MediaWiki Theme: Add radio buttons Change-Id: I77195752d83c9902aaf9809fdb4d7cd10c3f2052 --- M src/themes/mediawiki/images.json A src/themes/mediawiki/images/icons/circle.svg A src/themes/mediawiki/images/icons/radio.svg~ M src/themes/mediawiki/widgets.less 4 files changed, 79 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/98/176398/1 diff --git a/src/themes/mediawiki/images.json b/src/themes/mediawiki/images.json index 5be0929..e047ef8 100644 --- a/src/themes/mediawiki/images.json +++ b/src/themes/mediawiki/images.json @@ -41,6 +41,7 @@ next: { file: move-ltr.svg }, picture: { file: picture.svg }, previous: { file: move-rtl.svg }, + circle: { file: circle.svg, variants: [ constructive ] }, redo: { file: arched-arrow-ltr.svg }, remove: { file: remove.svg, variants: [ destructive ] }, search: { file: search.svg }, diff --git a/src/themes/mediawiki/images/icons/circle.svg b/src/themes/mediawiki/images/icons/circle.svg new file mode 100644 index 000..a600581 --- /dev/null +++ b/src/themes/mediawiki/images/icons/circle.svg @@ -0,0 +1 @@ +?xml version=1.0 encoding=utf-8?svg xmlns=http://www.w3.org/2000/svg; width=24 height=24 viewBox=0 0 24 24circle cx=12 cy=12 r=6/circle/svg diff --git a/src/themes/mediawiki/images/icons/radio.svg~ b/src/themes/mediawiki/images/icons/radio.svg~ new file mode 100644 index 000..29e5dba --- /dev/null +++ b/src/themes/mediawiki/images/icons/radio.svg~ @@ -0,0 +1,6 @@ +?xml version=1.0 encoding=utf-8? +svg xmlns=http://www.w3.org/2000/svg; width=24 height=24 viewBox=0 0 24 24 +g id=add +path id=plus d=M13 8h-2v3h-3v2h3v3h2v-3h3v-2h-3z/ +/g +/svg diff --git a/src/themes/mediawiki/widgets.less b/src/themes/mediawiki/widgets.less index 2477752..83a2624 100644 --- a/src/themes/mediawiki/widgets.less +++ b/src/themes/mediawiki/widgets.less @@ -209,7 +209,77 @@ } } -.theme-oo-ui-radioInputWidget () {} +.theme-oo-ui-radioInputWidget () { + position: relative; + line-height: @input-size; + + * { + font: inherit; + vertical-align: middle; + } + + input[type=radio] { + // we hide the input element as instead we will style the span that follows + // we use opacity so that VoiceOver software can still identify it + opacity: 0; + + // ensure the invisible checkbox takes up the required width + width: @input-size; + height: @input-size; + + // This is needed for Firefox mobile (See bug 71750 to workaround default Firefox stylesheet) + max-width: none; + ++ span { + cursor: pointer; + margin: 0 0.4em; + } + ++ span::before { + content: ''; + .oo-ui-box-sizing( border-box ); + position: absolute; + left: 0; + border-radius: 100%; + width: @input-size; + height: @input-size; + background: white; + border: 1px solid @input-border-color; + } + + :checked + span::before { + .oo-ui-background-image('@{oo-ui-default-image-path}/icons/circle-constructive.svg'); + background-size: @input-size, @input-size; + background-repeat: no-repeat; + background-position: center center; + background-origin: border-box; + } + + :active + span::before { + background-color: @input-active-color; + border-color: @input-active-color; + } + + :focus + span::before { + border-width: @input-focus-border-width; + } + + :focus:hover + span::before, + :hover + span::before { + border-bottom-width: @input-hover-border-bottom-width; + } + + :disabled + span::before { + cursor: default; + background-color: @input-disabled-color; + border-color: @input-disabled-color; + } + + :disabled:checked + span::before { + .oo-ui-background-image('@{oo-ui-default-image-path}/icons/circle-invert.svg'); + } + } +} .theme-oo-ui-textInputWidget ()
[MediaWiki-commits] [Gerrit] mediawiki.ui: checkbox: Fix states according to spec - change (oojs/ui)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/176397 Change subject: mediawiki.ui: checkbox: Fix states according to spec .. mediawiki.ui: checkbox: Fix states according to spec * Color changes * Introduces hover state * Separates focus and active state * Removes need for inset border Design specification on Trello- https://trello.com/c/JETLmm7F/7-check-boxes Change-Id: Id31aa519fc26c710e4f2e0d7925d27cba2494af1 --- M src/themes/mediawiki/common.less M src/themes/mediawiki/widgets.less 2 files changed, 40 insertions(+), 26 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/97/176397/1 diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less index 70ff340..65f5acb 100644 --- a/src/themes/mediawiki/common.less +++ b/src/themes/mediawiki/common.less @@ -35,8 +35,14 @@ @oo-ui-default-image-path: 'themes/mediawiki/images'; -@checkbox-size: 1.6em; -@border-radius: 0.3em; +@input-border-color: #777; +@input-active-color: #ddd; +@input-disabled-color: #eee; +@input-hover-border-bottom-width: 3px; +@input-focus-border-width: 2px; +@input-size: 2em; +@border-radius: 2px; + // Theme mixins diff --git a/src/themes/mediawiki/widgets.less b/src/themes/mediawiki/widgets.less index b9a0672..2477752 100644 --- a/src/themes/mediawiki/widgets.less +++ b/src/themes/mediawiki/widgets.less @@ -139,9 +139,10 @@ .theme-oo-ui-checkboxInputWidget () { position: relative; - line-height: @checkbox-size; + line-height: @input-size; * { + font: inherit; vertical-align: middle; } @@ -149,13 +150,14 @@ // we hide the input element as instead we will style the span that follows // we use opacity so that VoiceOver software can still identify it opacity: 0; + // ensure the invisible checkbox takes up the required width - width: @checkbox-size; - height: @checkbox-size; + width: @input-size; + height: @input-size; + // This is needed for Firefox mobile (See bug 71750 to workaround default Firefox stylesheet) max-width: none; - // the pseudo before element of the span after the checkbox now looks like a checkbox + span { cursor: pointer; margin: 0 0.4em; @@ -163,40 +165,46 @@ + span::before { content: ''; + .oo-ui-box-sizing( border-box ); position: absolute; left: 0; border-radius: @border-radius; - width: @checkbox-size; - height: @checkbox-size; - background-color: #fff; - border: 1px solid grey; + width: @input-size; + height: @input-size; + background-color: white; + border: 1px solid @input-border-color; } - // when the input is checked, style the span pseudo before element that followed as a checked checkbox :checked + span::before { .oo-ui-background-image('@{oo-ui-default-image-path}/icons/check-constructive.svg'); - background-size: @checkbox-size, @checkbox-size; + background-size: @input-size, @input-size; background-repeat: no-repeat; - background-position: center top; + background-position: center center; + background-origin: border-box; } - @focus-bottom-border-size: 0.2em; - - :active + span::after, - :focus + span::after { - content: ''; - position: absolute; - width: @checkbox-size; - height: @checkbox-size - @focus-bottom-border-size + 0.1; // offset by bottom border - // offset from the checkbox by 1px to account for left border - left: 1px; - border-bottom: solid @focus-bottom-border-size lightgrey; + :active + span::before { + background-color: @input-active-color; + border-color: @input-active-color; } - // disabled checked boxes have a gray background + :focus + span::before { + border-width: @input-focus-border-width; + } + + :focus:hover + span::before, + :hover + span::before { + border-bottom-width:
[MediaWiki-commits] [Gerrit] Use DB_MASTER in loadFromDatabase()/getSectionsForSave() - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged. Change subject: Use DB_MASTER in loadFromDatabase()/getSectionsForSave() .. Use DB_MASTER in loadFromDatabase()/getSectionsForSave() The sections are then sent via checkInput() to markForTranslation() which will propagate them in various tables, jobs and caches. It seems much better to be sure that they're actually what we're looking for, i.e. the latest version. Change-Id: Iaeae257b7ebcfd901019c6c247284d29eef20bd4 --- M tag/TPParse.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/tag/TPParse.php b/tag/TPParse.php index ebe9378..cee3d53 100644 --- a/tag/TPParse.php +++ b/tag/TPParse.php @@ -133,7 +133,7 @@ $this-dbSections = array(); - $db = wfGetDB( DB_SLAVE ); + $db = wfGetDB( DB_MASTER ); $tables = 'translate_sections'; $vars = array( 'trs_key', 'trs_text' ); $conds = array( 'trs_page' = $this-title-getArticleID() ); -- To view, visit https://gerrit.wikimedia.org/r/173062 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaeae257b7ebcfd901019c6c247284d29eef20bd4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com 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] Add flake8 for server/bin of mediawiki/extensions/EventLogging - change (integration/config)
QChris has uploaded a new change for review. https://gerrit.wikimedia.org/r/176399 Change subject: Add flake8 for server/bin of mediawiki/extensions/EventLogging .. Add flake8 for server/bin of mediawiki/extensions/EventLogging Change-Id: I22bd3f8f198c0013ec8e692b13daf5a38ca66ea2 --- M jjb/mediawiki-extensions.yaml M zuul/layout.yaml 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/99/176399/1 diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index 55fdfc9..fb2c842 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -1261,6 +1261,7 @@ name: 'mwext-EventLogging' toxenv: - flake8 + - flake8-bin - py27 jobs: - python-jobs diff --git a/zuul/layout.yaml b/zuul/layout.yaml index a2d80ad..f162d21 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3165,11 +3165,14 @@ - name: extension-qunit check: - mwext-EventLogging-tox-flake8 + - mwext-EventLogging-tox-flake8-bin test: - mwext-EventLogging-tox-flake8 + - mwext-EventLogging-tox-flake8-bin - mwext-EventLogging-tox-py27 gate-and-submit: - mwext-EventLogging-tox-flake8 + - mwext-EventLogging-tox-flake8-bin - mwext-EventLogging-tox-py27 - name: mediawiki/extensions/ExpandTemplates -- To view, visit https://gerrit.wikimedia.org/r/176399 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I22bd3f8f198c0013ec8e692b13daf5a38ca66ea2 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: QChris christ...@quelltextlich.at ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Config for MLEB 2014.11 - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Config for MLEB 2014.11 .. Config for MLEB 2014.11 * Translate is at: f0436a8 * ULS is at: origin/master Change-Id: Icfce5457493d6d654e38e88dc888ccc122b67570 --- M melange/config.ini 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/melange/config.ini b/melange/config.ini index 9aebe83..06a5a60 100644 --- a/melange/config.ini +++ b/melange/config.ini @@ -2,8 +2,8 @@ mediawikirepo=ssh://kar...@gerrit.wikimedia.org:29418/mediawiki/core.git extensionrepo=ssh://kar...@gerrit.wikimedia.org:29418/mediawiki/extensions/ branches=origin/master origin/REL1_21 origin/REL1_20 -releasever=2014.10 -releasever-prev=2014.09 +releasever=2014.11 +releasever-prev=2014.10 bundlename=MediaWiki language extension bundle downloadurl=https://translatewiki.net/mleb hasher=sha256sum @@ -18,7 +18,7 @@ cldr=origin/master CleanChanges=origin/master LocalisationUpdate=origin/master -Translate=8d749c1 +Translate=f0436a8 UniversalLanguageSelector=origin/master [install] -- To view, visit https://gerrit.wikimedia.org/r/176363 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icfce5457493d6d654e38e88dc888ccc122b67570 Gerrit-PatchSet: 2 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Nikerabbit niklas.laxst...@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] Increase maximum_GET_length to 5000 on travis - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Increase maximum_GET_length to 5000 on travis .. Increase maximum_GET_length to 5000 on travis There hasnt been any problems with the default limit of 255. Increasing the limit on Travis will cause the GET code to be exercised more frequently. Change-Id: I50450f79e598dc5912a3139c4e4c7c0311964c37 --- M .travis.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index 55c827c..019338c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,7 @@ - touch ~/.pywikibot/passwordfile - echo max_retries = 2 ~/.pywikibot/user-config.py + - echo maximum_GET_length = 5000 ~/.pywikibot/user-config.py - if [[ $GITHUB_USER == wikimedia ]]; then PYWIKIBOT2_USERNAME=Pywikibot-test; fi -- To view, visit https://gerrit.wikimedia.org/r/176391 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I50450f79e598dc5912a3139c4e4c7c0311964c37 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: XZise commodorefabia...@gmx.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] Syncronize VisualEditor: d20cc32..59bccb0 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: d20cc32..59bccb0 .. Syncronize VisualEditor: d20cc32..59bccb0 Change-Id: I3f4cfd816fb937c462834438a03576667ea150ce --- 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 d20cc32..59bccb0 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit d20cc324fb43d88c3e77e25bea197f6242607894 +Subproject commit 59bccb0bd55413ad2f3b95373ff45b189d5c291a -- To view, visit https://gerrit.wikimedia.org/r/176461 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3f4cfd816fb937c462834438a03576667ea150ce 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: d20cc32..59bccb0 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/176461 Change subject: Syncronize VisualEditor: d20cc32..59bccb0 .. Syncronize VisualEditor: d20cc32..59bccb0 Change-Id: I3f4cfd816fb937c462834438a03576667ea150ce --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/61/176461/1 diff --git a/VisualEditor b/VisualEditor index d20cc32..59bccb0 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit d20cc324fb43d88c3e77e25bea197f6242607894 +Subproject commit 59bccb0bd55413ad2f3b95373ff45b189d5c291a -- To view, visit https://gerrit.wikimedia.org/r/176461 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f4cfd816fb937c462834438a03576667ea150ce 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] Fix Balloc() allocation exceeds list boundary - change (mediawiki...Lingo)
Foxtrott has uploaded a new change for review. https://gerrit.wikimedia.org/r/176462 Change subject: Fix Balloc() allocation exceeds list boundary .. Fix Balloc() allocation exceeds list boundary A similar error apparently occurred in the MW parser.and was worked around a while back (see T10689) by replacing == with ===. Might be connected to PHP trying to convert a string to a number value. Bug: T70710 Change-Id: I4e6fa33bd778945799df9c484c4eae3d891474ab --- M Lingo.php M LingoParser.php 2 files changed, 11 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Lingo refs/changes/62/176462/1 diff --git a/Lingo.php b/Lingo.php index 9cb52c2..6ec670f 100644 --- a/Lingo.php +++ b/Lingo.php @@ -19,7 +19,7 @@ die( 'This file is part of a MediaWiki extension, it is not a valid entry point.' ); } - define( 'LINGO_VERSION', '1.2.0' ); + define( 'LINGO_VERSION', '1.2.1-dev' ); // set defaults for settings diff --git a/LingoParser.php b/LingoParser.php index 799a523..f616b97 100644 --- a/LingoParser.php +++ b/LingoParser.php @@ -23,6 +23,10 @@ class LingoParser { private $mLingoTree = null; + + /** +* @var LingoBackend +*/ private $mLingoBackend = null; private static $parserSingleton = null; @@ -160,10 +164,10 @@ $action = $wgRequest-getVal( 'action', 'view' ); - if ( $text == null || - $text == '' || - $action == 'edit' || - $action == 'ajax' || + if ( $text === null || + $text === '' || + $action === 'edit' || + $action === 'ajax' || isset( $_POST['wpPreview'] ) ) { @@ -183,10 +187,8 @@ wfProfileIn( __METHOD__ . ' 1 loadHTML' ); wfSuppressWarnings(); - $doc = new DOMDocument(); - $doc-loadHTML( - 'htmlheadmeta http-equiv=content-type content=charset=utf-8//headbody' . $text . '/body/html' - ); + $doc = new DOMDocument('1.0','utf-8'); + $doc-loadHTML( 'htmlheadmeta http-equiv=content-type content=charset=utf-8//headbody' . $text . '/body/html' ); wfRestoreWarnings(); wfProfileOut( __METHOD__ . ' 1 loadHTML' ); -- To view, visit https://gerrit.wikimedia.org/r/176462 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e6fa33bd778945799df9c484c4eae3d891474ab Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Lingo Gerrit-Branch: master Gerrit-Owner: Foxtrott s7ep...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix Balloc() allocation exceeds list boundary - change (mediawiki...Lingo)
Foxtrott has submitted this change and it was merged. Change subject: Fix Balloc() allocation exceeds list boundary .. Fix Balloc() allocation exceeds list boundary A similar error apparently occurred in the MW parser.and was worked around a while back (see T10689) by replacing == with ===. Might be connected to PHP trying to convert a string to a number value. Bug: T70710 Change-Id: I4e6fa33bd778945799df9c484c4eae3d891474ab --- M Lingo.php M LingoParser.php 2 files changed, 11 insertions(+), 9 deletions(-) Approvals: Foxtrott: Verified; Looks good to me, approved diff --git a/Lingo.php b/Lingo.php index 9cb52c2..6ec670f 100644 --- a/Lingo.php +++ b/Lingo.php @@ -19,7 +19,7 @@ die( 'This file is part of a MediaWiki extension, it is not a valid entry point.' ); } - define( 'LINGO_VERSION', '1.2.0' ); + define( 'LINGO_VERSION', '1.2.1-dev' ); // set defaults for settings diff --git a/LingoParser.php b/LingoParser.php index 799a523..82a7cde 100644 --- a/LingoParser.php +++ b/LingoParser.php @@ -23,6 +23,10 @@ class LingoParser { private $mLingoTree = null; + + /** +* @var LingoBackend +*/ private $mLingoBackend = null; private static $parserSingleton = null; @@ -160,10 +164,10 @@ $action = $wgRequest-getVal( 'action', 'view' ); - if ( $text == null || - $text == '' || - $action == 'edit' || - $action == 'ajax' || + if ( $text === null || + $text === '' || + $action === 'edit' || + $action === 'ajax' || isset( $_POST['wpPreview'] ) ) { @@ -183,10 +187,8 @@ wfProfileIn( __METHOD__ . ' 1 loadHTML' ); wfSuppressWarnings(); - $doc = new DOMDocument(); - $doc-loadHTML( - 'htmlheadmeta http-equiv=content-type content=charset=utf-8//headbody' . $text . '/body/html' - ); + $doc = new DOMDocument('1.0','utf-8'); + $doc-loadHTML( 'htmlheadmeta http-equiv=content-type content=charset=utf-8//headbody' . $text . '/body/html' ); wfRestoreWarnings(); wfProfileOut( __METHOD__ . ' 1 loadHTML' ); -- To view, visit https://gerrit.wikimedia.org/r/176462 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4e6fa33bd778945799df9c484c4eae3d891474ab Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Lingo Gerrit-Branch: master Gerrit-Owner: Foxtrott s7ep...@gmail.com Gerrit-Reviewer: Foxtrott s7ep...@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] update mw version numbers - change (pywikibot/compat)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/176463 Change subject: update mw version numbers .. update mw version numbers Change-Id: I49134c0fedf71e25a8d70057ad4240c2cda57ac2 --- M family.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat refs/changes/63/176463/1 diff --git a/family.py b/family.py index 8b19856..724fdf5 100644 --- a/family.py +++ b/family.py @@ -4326,7 +4326,7 @@ # Don't use this, use versionnumber() instead. This only exists # to not break family files. # Here we return the latest mw release for downloading -return '1.23.6' +return '1.24.0' def versionnumber(self, code, version=None): Return an int identifying MediaWiki version. @@ -4962,7 +4962,7 @@ # Don't use this, use versionnumber() instead. This only exists # to not break family files. # Here we return the latest mw release of wikimedia projects -return '1.25wmf7' +return '1.25wmf9' def shared_image_repository(self, code): return ('commons', 'commons') -- To view, visit https://gerrit.wikimedia.org/r/176463 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I49134c0fedf71e25a8d70057ad4240c2cda57ac2 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update mw version numbers - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged. Change subject: update mw version numbers .. update mw version numbers Change-Id: I49134c0fedf71e25a8d70057ad4240c2cda57ac2 --- M family.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/family.py b/family.py index 8b19856..724fdf5 100644 --- a/family.py +++ b/family.py @@ -4326,7 +4326,7 @@ # Don't use this, use versionnumber() instead. This only exists # to not break family files. # Here we return the latest mw release for downloading -return '1.23.6' +return '1.24.0' def versionnumber(self, code, version=None): Return an int identifying MediaWiki version. @@ -4962,7 +4962,7 @@ # Don't use this, use versionnumber() instead. This only exists # to not break family files. # Here we return the latest mw release of wikimedia projects -return '1.25wmf7' +return '1.25wmf9' def shared_image_repository(self, code): return ('commons', 'commons') -- To view, visit https://gerrit.wikimedia.org/r/176463 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I49134c0fedf71e25a8d70057ad4240c2cda57ac2 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de Gerrit-Reviewer: Xqt i...@gno.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] Fix: Let .tleft float left - change (mediawiki...chameleon)
Foxtrott has uploaded a new change for review. https://gerrit.wikimedia.org/r/176464 Change subject: Fix: Let .tleft float left .. Fix: Let .tleft float left Bug: T76013 Change-Id: If157267780aad1ce6e8fb1544e01e46843232065 --- M resources/styles/utils.less 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/chameleon refs/changes/64/176464/1 diff --git a/resources/styles/utils.less b/resources/styles/utils.less index f533dc3..3e45517 100644 --- a/resources/styles/utils.less +++ b/resources/styles/utils.less @@ -55,7 +55,7 @@ } div.tleft { - .floatright; + .floatleft; margin: 0.5em 1.4em 1.3em 0; } -- To view, visit https://gerrit.wikimedia.org/r/176464 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If157267780aad1ce6e8fb1544e01e46843232065 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/chameleon Gerrit-Branch: master Gerrit-Owner: Foxtrott s7ep...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix: Let .tleft float left - change (mediawiki...chameleon)
Foxtrott has submitted this change and it was merged. Change subject: Fix: Let .tleft float left .. Fix: Let .tleft float left Bug: T76013 Change-Id: If157267780aad1ce6e8fb1544e01e46843232065 --- M resources/styles/utils.less 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Foxtrott: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/resources/styles/utils.less b/resources/styles/utils.less index f533dc3..3e45517 100644 --- a/resources/styles/utils.less +++ b/resources/styles/utils.less @@ -55,7 +55,7 @@ } div.tleft { - .floatright; + .floatleft; margin: 0.5em 1.4em 1.3em 0; } -- To view, visit https://gerrit.wikimedia.org/r/176464 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If157267780aad1ce6e8fb1544e01e46843232065 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/chameleon Gerrit-Branch: master Gerrit-Owner: Foxtrott s7ep...@gmail.com Gerrit-Reviewer: Foxtrott s7ep...@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] update namespace aliases - change (pywikibot/compat)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/176465 Change subject: update namespace aliases .. update namespace aliases Change-Id: I510698dd01de6b3d1d52983ed5b4d517f939e006 --- M family.py 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat refs/changes/65/176465/1 diff --git a/family.py b/family.py index 724fdf5..9eff658 100644 --- a/family.py +++ b/family.py @@ -742,7 +742,7 @@ 'als': [u'Benutzer', u'Benutzerin'], 'am': u'አባል', 'an': u'Usuario', -'ang': [u'User', u'Brucend'], +'ang': [u'Brūcend', u'Brucend'], 'ar': [u'مستخدم', u'مستخدمة'], 'arc': [u'ܡܦܠܚܢܐ', u'ܡܬܚܫܚܢܐ'], 'arz': [u'مستخدم', u'مستخدمة'], @@ -972,7 +972,7 @@ 'als': [u'Benutzer Diskussion', u'Benutzerin Diskussion'], 'am': u'አባል ውይይት', 'an': u'Descusión usuario', -'ang': [u'User talk', u'Brucendmotung'], +'ang': [u'Brūcendmōtung', u'Brucendmotung'], 'ar': [u'نقاش المستخدم', u'نقاش المستخدمة'], 'arc': [u'ܡܡܠܠܐ ܕܡܦܠܚܢܐ', u'ܡܡܠܠܐ ܕܡܬܚܫܚܢܐ'], 'arz': [u'نقاش المستخدم', u'نقاش المستخدمة'], @@ -1208,7 +1208,7 @@ 'als': [u'Datei', u'Bild'], 'am': u'ስዕል', 'an': u'Imachen', -'ang': u'Biliþ', +'ang': [u'Ymele', u'Biliþ'], 'ar': [u'ملف', u'صورة'], 'arc': u'ܠܦܦܐ', 'arz': [u'ملف', u'صورة'], @@ -1439,7 +1439,7 @@ 'als': [u'Datei Diskussion', u'Bild Diskussion'], 'am': u'ስዕል ውይይት', 'an': u'Descusión imachen', -'ang': [u'Biliþmōtung', u'Biliþgesprec', u'Biliþmotung'], +'ang': [u'Ymelmōtung', u'Biliþmotung', u'Biliþmōtung'], 'ar': [u'نقاش الملف', u'نقاش الصورة'], 'arc': u'ܡܡܠܠܐ ܕܠܦܦܐ', 'arz': [u'نقاش الملف', u'نقاش الصورة'], @@ -1750,6 +1750,7 @@ 'als': u'MediaWiki Diskussion', 'am': u'መልዕክት ውይይት', 'an': u'Descusión MediaWiki', +'ang': u'MediaWikimōtung', 'ar': u'نقاش ميدياويكي', 'arc': u'ܡܡܠܠܐ ܕܡܝܕܝܐܘܝܩܝ', 'arz': u'نقاش ميدياويكى', -- To view, visit https://gerrit.wikimedia.org/r/176465 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I510698dd01de6b3d1d52983ed5b4d517f939e006 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update namespace aliases - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged. Change subject: update namespace aliases .. update namespace aliases Change-Id: I510698dd01de6b3d1d52983ed5b4d517f939e006 --- M family.py 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/family.py b/family.py index 724fdf5..9eff658 100644 --- a/family.py +++ b/family.py @@ -742,7 +742,7 @@ 'als': [u'Benutzer', u'Benutzerin'], 'am': u'አባል', 'an': u'Usuario', -'ang': [u'User', u'Brucend'], +'ang': [u'Brūcend', u'Brucend'], 'ar': [u'مستخدم', u'مستخدمة'], 'arc': [u'ܡܦܠܚܢܐ', u'ܡܬܚܫܚܢܐ'], 'arz': [u'مستخدم', u'مستخدمة'], @@ -972,7 +972,7 @@ 'als': [u'Benutzer Diskussion', u'Benutzerin Diskussion'], 'am': u'አባል ውይይት', 'an': u'Descusión usuario', -'ang': [u'User talk', u'Brucendmotung'], +'ang': [u'Brūcendmōtung', u'Brucendmotung'], 'ar': [u'نقاش المستخدم', u'نقاش المستخدمة'], 'arc': [u'ܡܡܠܠܐ ܕܡܦܠܚܢܐ', u'ܡܡܠܠܐ ܕܡܬܚܫܚܢܐ'], 'arz': [u'نقاش المستخدم', u'نقاش المستخدمة'], @@ -1208,7 +1208,7 @@ 'als': [u'Datei', u'Bild'], 'am': u'ስዕል', 'an': u'Imachen', -'ang': u'Biliþ', +'ang': [u'Ymele', u'Biliþ'], 'ar': [u'ملف', u'صورة'], 'arc': u'ܠܦܦܐ', 'arz': [u'ملف', u'صورة'], @@ -1439,7 +1439,7 @@ 'als': [u'Datei Diskussion', u'Bild Diskussion'], 'am': u'ስዕል ውይይት', 'an': u'Descusión imachen', -'ang': [u'Biliþmōtung', u'Biliþgesprec', u'Biliþmotung'], +'ang': [u'Ymelmōtung', u'Biliþmotung', u'Biliþmōtung'], 'ar': [u'نقاش الملف', u'نقاش الصورة'], 'arc': u'ܡܡܠܠܐ ܕܠܦܦܐ', 'arz': [u'نقاش الملف', u'نقاش الصورة'], @@ -1750,6 +1750,7 @@ 'als': u'MediaWiki Diskussion', 'am': u'መልዕክት ውይይት', 'an': u'Descusión MediaWiki', +'ang': u'MediaWikimōtung', 'ar': u'نقاش ميدياويكي', 'arc': u'ܡܡܠܠܐ ܕܡܝܕܝܐܘܝܩܝ', 'arz': u'نقاش ميدياويكى', -- To view, visit https://gerrit.wikimedia.org/r/176465 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I510698dd01de6b3d1d52983ed5b4d517f939e006 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de Gerrit-Reviewer: Xqt i...@gno.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] make channel filter case-insensitive - change (labs...wikibugs2)
Merlijn van Deen has uploaded a new change for review. https://gerrit.wikimedia.org/r/176466 Change subject: make channel filter case-insensitive .. make channel filter case-insensitive Change-Id: I9d524c7fe7d0c67387ed28033b77ab8f35784767 --- M channelfilter.py 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 refs/changes/66/176466/1 diff --git a/channelfilter.py b/channelfilter.py index e8101e3..c908350 100644 --- a/channelfilter.py +++ b/channelfilter.py @@ -19,7 +19,9 @@ chan_proj_map = self.config['channels'] for channel in chan_proj_map: fullregex = ^( + |.join(chan_proj_map[channel]) + )$ -chan_proj_map[channel] = re.compile(fullregex) +chan_proj_map[channel] = re.compile(fullregex, +flags=(re.IGNORECASE | re.UNICODE) +) @property def firehose_channel(self): -- To view, visit https://gerrit.wikimedia.org/r/176466 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d524c7fe7d0c67387ed28033b77ab8f35784767 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikibugs2 Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] make channel filter case-insensitive - change (labs...wikibugs2)
Merlijn van Deen has submitted this change and it was merged. Change subject: make channel filter case-insensitive .. make channel filter case-insensitive Change-Id: I9d524c7fe7d0c67387ed28033b77ab8f35784767 --- M channelfilter.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Merlijn van Deen: Verified; Looks good to me, approved diff --git a/channelfilter.py b/channelfilter.py index e8101e3..c908350 100644 --- a/channelfilter.py +++ b/channelfilter.py @@ -19,7 +19,9 @@ chan_proj_map = self.config['channels'] for channel in chan_proj_map: fullregex = ^( + |.join(chan_proj_map[channel]) + )$ -chan_proj_map[channel] = re.compile(fullregex) +chan_proj_map[channel] = re.compile(fullregex, +flags=(re.IGNORECASE | re.UNICODE) +) @property def firehose_channel(self): -- To view, visit https://gerrit.wikimedia.org/r/176466 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d524c7fe7d0c67387ed28033b77ab8f35784767 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikibugs2 Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove broken detection of multiple empty listitems in sitel... - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Remove broken detection of multiple empty listitems in sitelinklistview .. Remove broken detection of multiple empty listitems in sitelinklistview Change-Id: I75a258b9e58da26846e97daab61d9ddcf458b978 --- M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js 1 file changed, 2 insertions(+), 18 deletions(-) Approvals: Hoo man: Looks good to me, but someone else must approve Thiemo Mättig (WMDE): Looks good to me, approved jenkins-bot: Verified diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js index 1f20009..a4d2107 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js @@ -217,36 +217,20 @@ }, _updateAutoInput: function() { - /** -* @param {jQuery} $sitelinkview -* @return {boolean} -*/ - function moreThanOneEmpty( $sitelinkview ) { - var emptyItems = 0; - - $sitelinkview.each( function() { - if( $( this ).data( 'sitelinkview' ).isEmpty() ) { - return ++emptyItems === 2; - } - } ); - - return emptyItems === 2; - } - var listview = this.$listview.data( 'listview' ), lia = listview.listItemAdapter(), $items = listview.items(), $lastSitelinkview = $items.last(), lastSitelinkview = lia.liInstance( $lastSitelinkview ), - multipleEmpty = moreThanOneEmpty( $items ).length 1, secondToLast = $items.length 1 lia.liInstance( $items.eq( -2 ) ), + secondToLastEmpty = secondToLast secondToLast.isEmpty(), secondToLastInvalidPending = secondToLast !secondToLast.isValid() !secondToLast.option( 'value' ); if( lastSitelinkview lastSitelinkview.isEmpty() -( multipleEmpty || secondToLastInvalidPending ) +( secondToLastEmpty || secondToLastInvalidPending ) ) { listview.removeItem( $lastSitelinkview ); } else if( !lastSitelinkview || lastSitelinkview.isValid() !this.isFull() ) { -- To view, visit https://gerrit.wikimedia.org/r/172510 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I75a258b9e58da26846e97daab61d9ddcf458b978 Gerrit-PatchSet: 4 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: Henning Snater henning.sna...@wikimedia.de Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@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] update mw version - change (pywikibot/core)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/176467 Change subject: update mw version .. update mw version Change-Id: Id06908ac2a08cdc5e1876544cc3fbb2e35758022 --- M pywikibot/family.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/67/176467/1 diff --git a/pywikibot/family.py b/pywikibot/family.py index 9daf228..8b7ab5c 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -1100,7 +1100,7 @@ Use L{pywikibot.tools.MediaWikiVersion} to compare version strings. # Here we return the latest mw release for downloading -return '1.23.6' +return '1.24.0' @deprecated(version()) def versionnumber(self, code): -- To view, visit https://gerrit.wikimedia.org/r/176467 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id06908ac2a08cdc5e1876544cc3fbb2e35758022 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update mw version - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: update mw version .. update mw version Change-Id: Id06908ac2a08cdc5e1876544cc3fbb2e35758022 --- M pywikibot/family.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/family.py b/pywikibot/family.py index 9daf228..8b7ab5c 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -1100,7 +1100,7 @@ Use L{pywikibot.tools.MediaWikiVersion} to compare version strings. # Here we return the latest mw release for downloading -return '1.23.6' +return '1.24.0' @deprecated(version()) def versionnumber(self, code): -- To view, visit https://gerrit.wikimedia.org/r/176467 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id06908ac2a08cdc5e1876544cc3fbb2e35758022 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de Gerrit-Reviewer: Xqt i...@gno.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] MT: Introduce MTClient and all other MT clients inherit it - change (mediawiki...cxserver)
jenkins-bot has submitted this change and it was merged. Change subject: MT: Introduce MTClient and all other MT clients inherit it .. MT: Introduce MTClient and all other MT clients inherit it This allows us to provide generic annotation mapping libraries from parent MTClient class. Apertium and Yandex code organized as classes Change-Id: I5880060274856ad499d98089fbd65b732c284d37 --- M ContentTranslationService.js M mt/Apertium.js A mt/Apertium.languagenames.json A mt/MTClient.js M mt/Yandex.js D mt/mappings.js M package.json M tests/mt/Apertium.test.js 8 files changed, 459 insertions(+), 383 deletions(-) Approvals: Divec: Looks good to me, approved Jsahleen: Looks good to me, but someone else must approve jenkins-bot: Verified Objections: Nikerabbit: There's a problem with this change, please improve diff --git a/ContentTranslationService.js b/ContentTranslationService.js index 142a1de..095e9f9 100644 --- a/ContentTranslationService.js +++ b/ContentTranslationService.js @@ -117,7 +117,7 @@ return; } - mtClient = mtClients[ provider ]; + mtClient = new mtClients[ provider ](); sourceHtmlChunks = [ 'div' ]; reqLength = 0; diff --git a/mt/Apertium.js b/mt/Apertium.js index 0c1f9bc..1ca46b2 100644 --- a/mt/Apertium.js +++ b/mt/Apertium.js @@ -1,309 +1,16 @@ -var apertiumLangMapping, - Q = require( 'q' ), +var Q = require( 'q' ), + util = require( 'util' ), request = require( 'request' ), conf = require( __dirname + '/../utils/Conf.js' ), LinearDoc = require( '../lineardoc/LinearDoc' ), - //logger = require( '../utils/Logger.js' ), - // TODO: Tokenize properly. These work for English/Spanish/Catalan - TOKENS = /[\wáàçéèíïóòúüñÁÀÇÉÈÍÏÓÒÚÜÑ]+(?:[·'][\wáàçéèíïóòúüñÁÀÇÉÈÍÏÓÒÚÜÑ]+)?|[^\wáàçéèíïóòúüñÁÀÇÉÈÍÏÓÒÚÜÑ]+/g, - IS_WORD = /^[\wáàçéèíïóòúüñÁÀÇÉÈÍÏÓÒÚÜÑ]+(?:[·'][\wáàçéèíïóòúüñÁÀÇÉÈÍÏÓÒÚÜÑ]+)?$/; + MTClient = require( './MTClient.js' ), + apertiumLangMapping = require( './Apertium.languagenames.json' ); -apertiumLangMapping = require( __dirname + '/mappings.js' ); +function Apertium() { -/** - * Split text into tokens - * @param {string} lang Language code - * @param {string} text Text to split - * @return {Object[]} List of tokens - * @return[].text Text of the token - * @return[].isWord Whether the token is a word - */ -function getTokens( lang, text ) { - // TODO: implement for other languages than English/Spanish/Catalan - return text.match( TOKENS ).map( function ( tokenText ) { - return { - text: tokenText, - isWord: !!tokenText.match( IS_WORD ) - }; - } ); } -/** - * Language-aware uppercasing - * @param {string} lang Language code - * @param {string} text Text to uppercase - * @return {string} Upper-cased text (possibly identical) - */ -function toUpperCase( lang, text ) { - // stub: just use the javascript ASCII method for now - return text.toUpperCase(); -} - -/** - * Create variants of the text, with a different annotation uppercased in each. - * @param {string} lang Language code - * @param {string} text Text - * @param {Object[]} annotationOffsets start and length of each annotation - * @return {Object[]} - * @return[].start {number} Start offset of uppercasing - * @return[].length {number} Length of uppercasing - * @return[].text {string} Text variant with uppercasing - */ -function getCaseVariants( lang, sourceText, annotationOffsets ) { - var i, len, offset, chunk, upperChunk, variantText, - caseVariants = []; - - for ( i = 0, len = annotationOffsets.length; i len; i++ ) { - offset = annotationOffsets[ i ]; - chunk = sourceText.slice( offset.start, offset.start + offset.length ); - upperChunk = toUpperCase( lang, chunk ); - if ( upperChunk === chunk ) { - // Already uppercased; can't detect change - continue; - } - variantText = [ - sourceText.slice( 0, offset.start ), - upperChunk, - sourceText.slice( offset.start + offset.length ) - ].join( '' ); - caseVariants.push( { - start: offset.start, - length: offset.length, - text: variantText - } ); - } - return caseVariants; -} - -/** - * Finds offsets of ranges at which tokens have changed to uppercase - * @param {string} text Original text - * @param {string} text Changed text - * @return {Object[]} start and length for each changed range - */ -function getChangedCaseRanges( lang, originalText, changedText ) { - var orig, upper, changed, len, ranges, start, startChar, end, endChar; -
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/176468 Change subject: Update Metrolook .. Update Metrolook * Add translation support to description and the label guest. Change-Id: I907e70b59159e5b3a2b10cad3eadff6c4e820892 --- A Metrolook.i18n.php M Metrolook.php M MetrolookTemplate.php 3 files changed, 32 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/68/176468/1 diff --git a/Metrolook.i18n.php b/Metrolook.i18n.php new file mode 100644 index 000..b00c65c --- /dev/null +++ b/Metrolook.i18n.php @@ -0,0 +1,27 @@ +?php + +/** + * Internationalization file for skin Foreground. + * + * @file + * @ingroup Skins + */ + +$messages = array(); + +/** English + * @author paladox + */ +$messages['en'] = array( + 'skinname-metrolook' = 'Metrolook', + 'metrolook-desc' = 'Metrolook skin for MediaWiki', + 'metrolook-guest' = 'Guest', +); + +/** qqq + * @author paladox + */ +$messages['qqq'] = array( + 'metrolook-desc' = '{{desc|name=Metrolook|url=http://www.mediawiki.org/wiki/Skin:Metrolook}}', + 'metrolook-guest' = 'Used for descbribing you as a guest editing the wiki.', +); diff --git a/Metrolook.php b/Metrolook.php index 858e66a..0449479 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -24,8 +24,8 @@ $GLOBALS['wgExtensionCredits']['skin'][] = array( 'path' = __FILE__, 'name' = 'Metrolook', - 'description' = 'Metrolook skin for MediaWiki.', - 'version' = '0.3.5', + 'descriptionmsg' = 'metrolook-desc', + 'version' = '0.3.6', 'url' = 'https://www.mediawiki.org/wiki/Skin:Metrolook', 'author' = array( 'immewnity', 'paladox2015', 'Craig Davison', 'lagleki' ), 'license-name' = 'GPLv2+', @@ -35,6 +35,8 @@ $GLOBALS['wgAutoloadClasses']['SkinMetrolook'] = __DIR__ . '/SkinMetrolook.php'; $GLOBALS['wgAutoloadClasses']['MetrolookTemplate'] = __DIR__ . '/MetrolookTemplate.php'; +$GLOBALS['wgExtensionMessagesFiles']['MetrolookTemplate'] = __DIR__.'/Metrolook.i18n.php'; + // Register skin $GLOBALS['wgValidSkinNames']['metrolook'] = 'Metrolook'; diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index 4344307..530f4eb 100644 --- a/MetrolookTemplate.php +++ b/MetrolookTemplate.php @@ -306,7 +306,7 @@ div class=vectorMenu style=float:right;background-image:none;vertical-align:middle;height:40px;padding-left:10px;padding-right:10px;position:relative;top:5px;right:10px;width:auto;text-align:right; a href=# style=text-decoration:none;span id=username-top?php if ($_SERVER[REMOTE_ADDR] == htmlspecialchars($this-getSkin()-getUser()-getName())) { -echo Guest; +echo wfMessage( 'metrolook-guest' )-text(); } else { echo htmlspecialchars( $this-getSkin()-getUser()-getName() ); -- To view, visit https://gerrit.wikimedia.org/r/176468 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I907e70b59159e5b3a2b10cad3eadff6c4e820892 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: REL1_22 Gerrit-Owner: Paladox thomasmulhall...@yahoo.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged. Change subject: Update Metrolook .. Update Metrolook * Add translation support to description and the label guest. Change-Id: I907e70b59159e5b3a2b10cad3eadff6c4e820892 --- A Metrolook.i18n.php M Metrolook.php M MetrolookTemplate.php 3 files changed, 32 insertions(+), 3 deletions(-) Approvals: Paladox: Verified; Looks good to me, approved diff --git a/Metrolook.i18n.php b/Metrolook.i18n.php new file mode 100644 index 000..b00c65c --- /dev/null +++ b/Metrolook.i18n.php @@ -0,0 +1,27 @@ +?php + +/** + * Internationalization file for skin Foreground. + * + * @file + * @ingroup Skins + */ + +$messages = array(); + +/** English + * @author paladox + */ +$messages['en'] = array( + 'skinname-metrolook' = 'Metrolook', + 'metrolook-desc' = 'Metrolook skin for MediaWiki', + 'metrolook-guest' = 'Guest', +); + +/** qqq + * @author paladox + */ +$messages['qqq'] = array( + 'metrolook-desc' = '{{desc|name=Metrolook|url=http://www.mediawiki.org/wiki/Skin:Metrolook}}', + 'metrolook-guest' = 'Used for descbribing you as a guest editing the wiki.', +); diff --git a/Metrolook.php b/Metrolook.php index 858e66a..0449479 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -24,8 +24,8 @@ $GLOBALS['wgExtensionCredits']['skin'][] = array( 'path' = __FILE__, 'name' = 'Metrolook', - 'description' = 'Metrolook skin for MediaWiki.', - 'version' = '0.3.5', + 'descriptionmsg' = 'metrolook-desc', + 'version' = '0.3.6', 'url' = 'https://www.mediawiki.org/wiki/Skin:Metrolook', 'author' = array( 'immewnity', 'paladox2015', 'Craig Davison', 'lagleki' ), 'license-name' = 'GPLv2+', @@ -35,6 +35,8 @@ $GLOBALS['wgAutoloadClasses']['SkinMetrolook'] = __DIR__ . '/SkinMetrolook.php'; $GLOBALS['wgAutoloadClasses']['MetrolookTemplate'] = __DIR__ . '/MetrolookTemplate.php'; +$GLOBALS['wgExtensionMessagesFiles']['MetrolookTemplate'] = __DIR__.'/Metrolook.i18n.php'; + // Register skin $GLOBALS['wgValidSkinNames']['metrolook'] = 'Metrolook'; diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index 4344307..530f4eb 100644 --- a/MetrolookTemplate.php +++ b/MetrolookTemplate.php @@ -306,7 +306,7 @@ div class=vectorMenu style=float:right;background-image:none;vertical-align:middle;height:40px;padding-left:10px;padding-right:10px;position:relative;top:5px;right:10px;width:auto;text-align:right; a href=# style=text-decoration:none;span id=username-top?php if ($_SERVER[REMOTE_ADDR] == htmlspecialchars($this-getSkin()-getUser()-getName())) { -echo Guest; +echo wfMessage( 'metrolook-guest' )-text(); } else { echo htmlspecialchars( $this-getSkin()-getUser()-getName() ); -- To view, visit https://gerrit.wikimedia.org/r/176468 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I907e70b59159e5b3a2b10cad3eadff6c4e820892 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: REL1_22 Gerrit-Owner: Paladox thomasmulhall...@yahoo.com Gerrit-Reviewer: Paladox thomasmulhall...@yahoo.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] Fix typo in comment - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/176469 Change subject: Fix typo in comment .. Fix typo in comment Change-Id: I96b31f4c903edc20b1582f3bab83384eb793b03a --- M src/dm/ve.dm.Node.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/69/176469/1 diff --git a/src/dm/ve.dm.Node.js b/src/dm/ve.dm.Node.js index 507975f..0dc5ffc 100644 --- a/src/dm/ve.dm.Node.js +++ b/src/dm/ve.dm.Node.js @@ -193,7 +193,7 @@ * Remap the store indexes stored in a linear model data element. * * The default implementation is empty. Nodes should override this if they store store indexes in -.* attributes. To remap, do something like + * attributes. To remap, do something like * dataElement.attributes.foo = mapping[dataElement.attributes.foo]; * * @static -- To view, visit https://gerrit.wikimedia.org/r/176469 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I96b31f4c903edc20b1582f3bab83384eb793b03a Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/176470 Change subject: Update Metrolook .. Update Metrolook * Add translation support to description and the label guest. Change-Id: If580e657b279638de9bc503dcaccc582907b1779 --- A Metrolook.i18n.php M Metrolook.php M MetrolookTemplate.php A i18n/en.json A i18n/qqq.json 5 files changed, 60 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/70/176470/1 diff --git a/Metrolook.i18n.php b/Metrolook.i18n.php new file mode 100644 index 000..8d63187 --- /dev/null +++ b/Metrolook.i18n.php @@ -0,0 +1,35 @@ +?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(); +if ( !function_exists( 'wfJsonI18nShim0ef389595e78ca38' ) ) { + function wfJsonI18nShim0ef389595e78ca38( $cache, $code, $cachedData ) { + $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); + foreach ( $codeSequence as $csCode ) { + $fileName = dirname( __FILE__ ) . /i18n/$csCode.json; + if ( is_readable( $fileName ) ) { + $data = FormatJson::decode( file_get_contents( $fileName ), true ); + foreach ( array_keys( $data ) as $key ) { + if ( $key === '' || $key[0] === '@' ) { + unset( $data[$key] ); + } + } + $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); + } + + $cachedData['deps'][] = new FileDependency( $fileName ); + } + return true; + } + + $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim0ef389595e78ca38'; +} diff --git a/Metrolook.php b/Metrolook.php index e27e628..8d375f1 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -24,8 +24,8 @@ $GLOBALS['wgExtensionCredits']['skin'][] = array( 'path' = __FILE__, 'name' = 'Metrolook', - 'description' = 'Metrolook skin for MediaWiki.', - 'version' = '1.3.7', + 'descriptionmsg' = 'metrolook-desc', + 'version' = '1.3.8', 'url' = 'https://www.mediawiki.org/wiki/Skin:Metrolook', 'author' = array( 'immewnity', 'paladox2015', 'Craig Davison', 'lagleki' ), 'license-name' = 'GPLv2+', @@ -35,6 +35,9 @@ $GLOBALS['wgAutoloadClasses']['SkinMetrolook'] = __DIR__ . '/SkinMetrolook.php'; $GLOBALS['wgAutoloadClasses']['MetrolookTemplate'] = __DIR__ . '/MetrolookTemplate.php'; +$GLOBALS['wgExtensionMessagesFiles']['MetrolookTemplate'] = __DIR__.'/Metrolook.i18n.php'; +$GLOBALS['wgMessagesDirs']['MetrolookTemplate'] = __DIR__ . '/i18n'; + // Register skin $GLOBALS['wgValidSkinNames']['metrolook'] = 'Metrolook'; diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index 929dda4..1408d32 100644 --- a/MetrolookTemplate.php +++ b/MetrolookTemplate.php @@ -307,7 +307,7 @@ div class=vectorMenu style=float:right;background-image:none;vertical-align:middle;height:40px;padding-left:10px;padding-right:10px;position:relative;top:0px;right:10px;width:auto;text-align:right; a href=# style=text-decoration:none;span id=username-top?php if ($_SERVER[REMOTE_ADDR] == htmlspecialchars($this-getSkin()-getUser()-getName())) { -echo Guest; +echo wfMessage( 'metrolook-guest' )-text(); } else { echo htmlspecialchars( $this-getSkin()-getUser()-getName() ); diff --git a/i18n/en.json b/i18n/en.json new file mode 100644 index 000..9c48239 --- /dev/null +++ b/i18n/en.json @@ -0,0 +1,10 @@ +{ + @metadata: { + authors: [ + paladox + ] + }, + skinname-metrolook: Metrolook, + metrolook-desc: Metrolook skin for MediaWiki, + metrolook-guest: Guest +} diff --git a/i18n/qqq.json b/i18n/qqq.json new file mode 100644 index 000..17cef92 --- /dev/null +++ b/i18n/qqq.json @@ -0,0 +1,9 @@ +{ + @metadata: { + authors: [ + paladox + ] + }, + metrolook-desc: {{desc|name=Metrolook|url=http://www.mediawiki.org/wiki/Skin:Metrolook}};, + metrolook-guest: Used for descbribing you as a guest editing the
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
jenkins-bot has submitted this change and it was merged. Change subject: Update Metrolook .. Update Metrolook * Add translation support to description and the label guest. Change-Id: If580e657b279638de9bc503dcaccc582907b1779 --- A Metrolook.i18n.php M Metrolook.php M MetrolookTemplate.php A i18n/en.json A i18n/qqq.json 5 files changed, 60 insertions(+), 3 deletions(-) Approvals: Paladox: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/Metrolook.i18n.php b/Metrolook.i18n.php new file mode 100644 index 000..8d63187 --- /dev/null +++ b/Metrolook.i18n.php @@ -0,0 +1,35 @@ +?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(); +if ( !function_exists( 'wfJsonI18nShim0ef389595e78ca38' ) ) { + function wfJsonI18nShim0ef389595e78ca38( $cache, $code, $cachedData ) { + $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); + foreach ( $codeSequence as $csCode ) { + $fileName = dirname( __FILE__ ) . /i18n/$csCode.json; + if ( is_readable( $fileName ) ) { + $data = FormatJson::decode( file_get_contents( $fileName ), true ); + foreach ( array_keys( $data ) as $key ) { + if ( $key === '' || $key[0] === '@' ) { + unset( $data[$key] ); + } + } + $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); + } + + $cachedData['deps'][] = new FileDependency( $fileName ); + } + return true; + } + + $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim0ef389595e78ca38'; +} diff --git a/Metrolook.php b/Metrolook.php index e27e628..8d375f1 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -24,8 +24,8 @@ $GLOBALS['wgExtensionCredits']['skin'][] = array( 'path' = __FILE__, 'name' = 'Metrolook', - 'description' = 'Metrolook skin for MediaWiki.', - 'version' = '1.3.7', + 'descriptionmsg' = 'metrolook-desc', + 'version' = '1.3.8', 'url' = 'https://www.mediawiki.org/wiki/Skin:Metrolook', 'author' = array( 'immewnity', 'paladox2015', 'Craig Davison', 'lagleki' ), 'license-name' = 'GPLv2+', @@ -35,6 +35,9 @@ $GLOBALS['wgAutoloadClasses']['SkinMetrolook'] = __DIR__ . '/SkinMetrolook.php'; $GLOBALS['wgAutoloadClasses']['MetrolookTemplate'] = __DIR__ . '/MetrolookTemplate.php'; +$GLOBALS['wgExtensionMessagesFiles']['MetrolookTemplate'] = __DIR__.'/Metrolook.i18n.php'; +$GLOBALS['wgMessagesDirs']['MetrolookTemplate'] = __DIR__ . '/i18n'; + // Register skin $GLOBALS['wgValidSkinNames']['metrolook'] = 'Metrolook'; diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index 929dda4..1408d32 100644 --- a/MetrolookTemplate.php +++ b/MetrolookTemplate.php @@ -307,7 +307,7 @@ div class=vectorMenu style=float:right;background-image:none;vertical-align:middle;height:40px;padding-left:10px;padding-right:10px;position:relative;top:0px;right:10px;width:auto;text-align:right; a href=# style=text-decoration:none;span id=username-top?php if ($_SERVER[REMOTE_ADDR] == htmlspecialchars($this-getSkin()-getUser()-getName())) { -echo Guest; +echo wfMessage( 'metrolook-guest' )-text(); } else { echo htmlspecialchars( $this-getSkin()-getUser()-getName() ); diff --git a/i18n/en.json b/i18n/en.json new file mode 100644 index 000..9c48239 --- /dev/null +++ b/i18n/en.json @@ -0,0 +1,10 @@ +{ + @metadata: { + authors: [ + paladox + ] + }, + skinname-metrolook: Metrolook, + metrolook-desc: Metrolook skin for MediaWiki, + metrolook-guest: Guest +} diff --git a/i18n/qqq.json b/i18n/qqq.json new file mode 100644 index 000..17cef92 --- /dev/null +++ b/i18n/qqq.json @@ -0,0 +1,9 @@ +{ + @metadata: { + authors: [ + paladox + ] + }, + metrolook-desc: {{desc|name=Metrolook|url=http://www.mediawiki.org/wiki/Skin:Metrolook}};, + metrolook-guest: Used for descbribing you as a guest editing the wiki. +} -- To view, visit
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/176471 Change subject: Update Metrolook .. Update Metrolook * Add translation support to description and the label guest. Change-Id: I6bd76426ada9b54c042a648d4c13be2d265d742b --- A Metrolook.i18n.php M Metrolook.php M MetrolookTemplate.php M composer.json A i18n/en.json A i18n/qqq.json 6 files changed, 62 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/71/176471/1 diff --git a/Metrolook.i18n.php b/Metrolook.i18n.php new file mode 100644 index 000..8d63187 --- /dev/null +++ b/Metrolook.i18n.php @@ -0,0 +1,35 @@ +?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(); +if ( !function_exists( 'wfJsonI18nShim0ef389595e78ca38' ) ) { + function wfJsonI18nShim0ef389595e78ca38( $cache, $code, $cachedData ) { + $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); + foreach ( $codeSequence as $csCode ) { + $fileName = dirname( __FILE__ ) . /i18n/$csCode.json; + if ( is_readable( $fileName ) ) { + $data = FormatJson::decode( file_get_contents( $fileName ), true ); + foreach ( array_keys( $data ) as $key ) { + if ( $key === '' || $key[0] === '@' ) { + unset( $data[$key] ); + } + } + $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); + } + + $cachedData['deps'][] = new FileDependency( $fileName ); + } + return true; + } + + $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim0ef389595e78ca38'; +} diff --git a/Metrolook.php b/Metrolook.php index f102585..7395910 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -24,8 +24,8 @@ $GLOBALS['wgExtensionCredits']['skin'][] = array( 'path' = __FILE__, 'name' = 'Metrolook', - 'description' = 'Metrolook skin for MediaWiki.', - 'version' = '2.4.10', + 'descriptionmsg' = 'metrolook-desc', + 'version' = '2.4.11', 'url' = 'https://www.mediawiki.org/wiki/Skin:Metrolook', 'author' = array( 'immewnity', 'paladox2015', 'Craig Davison', 'lagleki' ), 'license-name' = 'GPLv2+', @@ -35,6 +35,9 @@ $GLOBALS['wgAutoloadClasses']['SkinMetrolook'] = __DIR__ . '/SkinMetrolook.php'; $GLOBALS['wgAutoloadClasses']['MetrolookTemplate'] = __DIR__ . '/MetrolookTemplate.php'; +$GLOBALS['wgExtensionMessagesFiles']['MetrolookTemplate'] = __DIR__.'/Metrolook.i18n.php'; +$GLOBALS['wgMessagesDirs']['MetrolookTemplate'] = __DIR__ . '/i18n'; + // Register skin SkinFactory::getDefaultInstance()-register( 'metrolook', 'Metrolook', function(){ $config = ConfigFactory::getDefaultInstance()-makeConfig( 'metrolook' ); diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index 3b0a365..c630586 100644 --- a/MetrolookTemplate.php +++ b/MetrolookTemplate.php @@ -40,7 +40,7 @@ global $logo; global $SearchBar; global $DownArrow; - global $Line; + global $Line; global $image1; global $link1; global $picture1; @@ -376,7 +376,7 @@ div class=vectorMenu style=float:right;background-image:none;vertical-align:middle;height:40px;padding-left:10px;padding-right:10px;position:relative;top:0px;right:10px;width:auto;text-align:right; a href=# style=text-decoration:none;span id=username-top?php if ($_SERVER[REMOTE_ADDR] == htmlspecialchars($this-getSkin()-getUser()-getName())) { -echo Guest; +echo wfMessage( 'metrolook-guest' )-text(); } else { echo htmlspecialchars( $this-getSkin()-getUser()-getName() ); diff --git a/composer.json b/composer.json index abfde15..94d9b3e 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ license: GPL-2.0+, authors: [ { - name : immewnity + name : immewnity }, { name : paladox2015 diff
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged. Change subject: Update Metrolook .. Update Metrolook * Add translation support to description and the label guest. Change-Id: I6bd76426ada9b54c042a648d4c13be2d265d742b --- A Metrolook.i18n.php M Metrolook.php M MetrolookTemplate.php M composer.json A i18n/en.json A i18n/qqq.json 6 files changed, 61 insertions(+), 4 deletions(-) Approvals: Paladox: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/Metrolook.i18n.php b/Metrolook.i18n.php new file mode 100644 index 000..8d63187 --- /dev/null +++ b/Metrolook.i18n.php @@ -0,0 +1,35 @@ +?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(); +if ( !function_exists( 'wfJsonI18nShim0ef389595e78ca38' ) ) { + function wfJsonI18nShim0ef389595e78ca38( $cache, $code, $cachedData ) { + $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); + foreach ( $codeSequence as $csCode ) { + $fileName = dirname( __FILE__ ) . /i18n/$csCode.json; + if ( is_readable( $fileName ) ) { + $data = FormatJson::decode( file_get_contents( $fileName ), true ); + foreach ( array_keys( $data ) as $key ) { + if ( $key === '' || $key[0] === '@' ) { + unset( $data[$key] ); + } + } + $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); + } + + $cachedData['deps'][] = new FileDependency( $fileName ); + } + return true; + } + + $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim0ef389595e78ca38'; +} diff --git a/Metrolook.php b/Metrolook.php index f102585..7395910 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -24,8 +24,8 @@ $GLOBALS['wgExtensionCredits']['skin'][] = array( 'path' = __FILE__, 'name' = 'Metrolook', - 'description' = 'Metrolook skin for MediaWiki.', - 'version' = '2.4.10', + 'descriptionmsg' = 'metrolook-desc', + 'version' = '2.4.11', 'url' = 'https://www.mediawiki.org/wiki/Skin:Metrolook', 'author' = array( 'immewnity', 'paladox2015', 'Craig Davison', 'lagleki' ), 'license-name' = 'GPLv2+', @@ -35,6 +35,9 @@ $GLOBALS['wgAutoloadClasses']['SkinMetrolook'] = __DIR__ . '/SkinMetrolook.php'; $GLOBALS['wgAutoloadClasses']['MetrolookTemplate'] = __DIR__ . '/MetrolookTemplate.php'; +$GLOBALS['wgExtensionMessagesFiles']['MetrolookTemplate'] = __DIR__.'/Metrolook.i18n.php'; +$GLOBALS['wgMessagesDirs']['MetrolookTemplate'] = __DIR__ . '/i18n'; + // Register skin SkinFactory::getDefaultInstance()-register( 'metrolook', 'Metrolook', function(){ $config = ConfigFactory::getDefaultInstance()-makeConfig( 'metrolook' ); diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index 3b0a365..02acf76 100644 --- a/MetrolookTemplate.php +++ b/MetrolookTemplate.php @@ -376,7 +376,7 @@ div class=vectorMenu style=float:right;background-image:none;vertical-align:middle;height:40px;padding-left:10px;padding-right:10px;position:relative;top:0px;right:10px;width:auto;text-align:right; a href=# style=text-decoration:none;span id=username-top?php if ($_SERVER[REMOTE_ADDR] == htmlspecialchars($this-getSkin()-getUser()-getName())) { -echo Guest; +echo wfMessage( 'metrolook-guest' )-text(); } else { echo htmlspecialchars( $this-getSkin()-getUser()-getName() ); diff --git a/composer.json b/composer.json index abfde15..94d9b3e 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ license: GPL-2.0+, authors: [ { - name : immewnity + name : immewnity }, { name : paladox2015 diff --git a/i18n/en.json b/i18n/en.json new file mode 100644 index 000..9c48239 --- /dev/null +++ b/i18n/en.json @@ -0,0 +1,10 @@ +{ + @metadata: { + authors: [ + paladox + ] + }, + skinname-metrolook: Metrolook, + metrolook-desc: Metrolook skin for
[MediaWiki-commits] [Gerrit] .jshintrc based on Nimbus skin. - change (mediawiki...Bouquet)
jenkins-bot has submitted this change and it was merged. Change subject: .jshintrc based on Nimbus skin. .. .jshintrc based on Nimbus skin. Change-Id: I3975e9d6878c362995948ab3622a37a22a1b4d5e --- A .jshintrc M resources/js/navigation.js 2 files changed, 31 insertions(+), 4 deletions(-) Approvals: Lewis Cawte: Looks good to me, approved jenkins-bot: Verified diff --git a/.jshintrc b/.jshintrc new file mode 100644 index 000..180ac6a --- /dev/null +++ b/.jshintrc @@ -0,0 +1,26 @@ +{ + /* Common */ + + // Enforcing + camelcase: false, + curly: true, + eqeqeq: true, + immed: true, + latedef: true, + newcap: true, + noarg: true, + noempty: true, + nonew: true, + quotmark: single, + trailing: true, + undef: true, + unused: true, + // Legacy + onevar: true, + + /* Local */ + predef: [ + mediaWiki, + jQuery + ] +} diff --git a/resources/js/navigation.js b/resources/js/navigation.js index 3555f8c..1d732f2 100644 --- a/resources/js/navigation.js +++ b/resources/js/navigation.js @@ -3,21 +3,22 @@ * * Handles toggling the navigation menu for small screens. */ +/* global document */ ( function() { var container = document.getElementById( 'access' ); var button= container.getElementsByTagName( 'h1' )[0], menu = container.getElementsByTagName( 'ul' )[0]; - if ( undefined == button || undefined == menu ) { + if ( undefined === button || undefined === menu ) { return false; } button.onclick = function() { - if ( menu.className.indexOf( 'nav-menu' ) == -1 ) { + if ( menu.className.indexOf( 'nav-menu' ) === -1 ) { menu.className = 'nav-menu'; } - if ( button.className.indexOf( 'toggled-on' ) != -1 ) { + if ( button.className.indexOf( 'toggled-on' ) !== -1 ) { button.className = button.className.replace( ' toggled-on', '' ); menu.className = menu.className.replace( ' toggled-on', '' ); container.className = container.className.replace( 'main-small-navigation', 'navigation-main' ); @@ -32,4 +33,4 @@ if ( !menu.childNodes.length ) { button.style.display = 'none'; } -} )(); \ No newline at end of file +} )(); -- To view, visit https://gerrit.wikimedia.org/r/172269 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3975e9d6878c362995948ab3622a37a22a1b4d5e Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/skins/Bouquet Gerrit-Branch: master Gerrit-Owner: Lewis Cawte le...@lewiscawte.me Gerrit-Reviewer: Lewis Cawte le...@lewiscawte.me Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/176472 Change subject: Update Metrolook .. Update Metrolook * Add translation support to description and the label guest. Change-Id: I4769ea63234872e371ad5cac562fb65fba4743e1 --- A Metrolook.i18n.php M Metrolook.php M MetrolookTemplate.php M README.md M composer.json A i18n/en.json A i18n/qqq.json 7 files changed, 67 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/72/176472/1 diff --git a/Metrolook.i18n.php b/Metrolook.i18n.php new file mode 100644 index 000..8d63187 --- /dev/null +++ b/Metrolook.i18n.php @@ -0,0 +1,35 @@ +?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(); +if ( !function_exists( 'wfJsonI18nShim0ef389595e78ca38' ) ) { + function wfJsonI18nShim0ef389595e78ca38( $cache, $code, $cachedData ) { + $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); + foreach ( $codeSequence as $csCode ) { + $fileName = dirname( __FILE__ ) . /i18n/$csCode.json; + if ( is_readable( $fileName ) ) { + $data = FormatJson::decode( file_get_contents( $fileName ), true ); + foreach ( array_keys( $data ) as $key ) { + if ( $key === '' || $key[0] === '@' ) { + unset( $data[$key] ); + } + } + $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); + } + + $cachedData['deps'][] = new FileDependency( $fileName ); + } + return true; + } + + $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim0ef389595e78ca38'; +} diff --git a/Metrolook.php b/Metrolook.php index b169afa..2fcacfc 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -24,8 +24,8 @@ $GLOBALS['wgExtensionCredits']['skin'][] = array( 'path' = __FILE__, 'name' = 'Metrolook', - 'description' = 'Metrolook skin for MediaWiki.', - 'version' = '3.0 beta 11', + 'descriptionmsg' = 'metrolook-desc', + 'version' = '3.0 beta 12', 'url' = 'https://www.mediawiki.org/wiki/Skin:Metrolook', 'author' = array( 'immewnity', 'paladox2015', 'Craig Davison', 'lagleki' ), 'license-name' = 'GPLv2+', @@ -35,6 +35,9 @@ $GLOBALS['wgAutoloadClasses']['SkinMetrolook'] = __DIR__ . '/SkinMetrolook.php'; $GLOBALS['wgAutoloadClasses']['MetrolookTemplate'] = __DIR__ . '/MetrolookTemplate.php'; +$GLOBALS['wgExtensionMessagesFiles']['MetrolookTemplate'] = __DIR__.'/Metrolook.i18n.php'; +$GLOBALS['wgMessagesDirs']['MetrolookTemplate'] = __DIR__ . '/i18n'; + // Register skin SkinFactory::getDefaultInstance()-register( 'metrolook', 'Metrolook', function(){ $config = ConfigFactory::getDefaultInstance()-makeConfig( 'metrolook' ); diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index e28cede..7b39166 100644 --- a/MetrolookTemplate.php +++ b/MetrolookTemplate.php @@ -40,7 +40,7 @@ global $logo; global $SearchBar; global $DownArrow; - global $Line; + global $Line; global $image1; global $link1; global $picture1; @@ -377,7 +377,7 @@ div class=vectorMenu style=float:right;background-image:none;vertical-align:middle;height:40px;padding-left:10px;padding-right:10px;position:relative;top:0px;right:10px;width:auto;text-align:right; a href=# style=text-decoration:none;span id=username-top?php if ($_SERVER[REMOTE_ADDR] == htmlspecialchars($this-getSkin()-getUser()-getName())) { -echo Guest; +echo wfMessage( 'metrolook-guest' )-text(); } else { echo htmlspecialchars( $this-getSkin()-getUser()-getName() ); diff --git a/README.md b/README.md index fd46098..9c12b46 100644 --- a/README.md +++ b/README.md @@ -60,9 +60,6 @@ $SearchBar = true; -Default is - -$DownArrow = true; To turn it off @@ -70,12 +67,16 @@ Default is -$Line = true; +$DownArrow = true; To turn it off $Line = false; +Default is + +$Line = true; + to change link $link1 =
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged. Change subject: Update Metrolook .. Update Metrolook * Add translation support to description and the label guest. Change-Id: I4769ea63234872e371ad5cac562fb65fba4743e1 --- A Metrolook.i18n.php M Metrolook.php M MetrolookTemplate.php M README.md M composer.json A i18n/en.json A i18n/qqq.json 7 files changed, 66 insertions(+), 8 deletions(-) Approvals: Paladox: Verified; Looks good to me, approved diff --git a/Metrolook.i18n.php b/Metrolook.i18n.php new file mode 100644 index 000..8d63187 --- /dev/null +++ b/Metrolook.i18n.php @@ -0,0 +1,35 @@ +?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(); +if ( !function_exists( 'wfJsonI18nShim0ef389595e78ca38' ) ) { + function wfJsonI18nShim0ef389595e78ca38( $cache, $code, $cachedData ) { + $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); + foreach ( $codeSequence as $csCode ) { + $fileName = dirname( __FILE__ ) . /i18n/$csCode.json; + if ( is_readable( $fileName ) ) { + $data = FormatJson::decode( file_get_contents( $fileName ), true ); + foreach ( array_keys( $data ) as $key ) { + if ( $key === '' || $key[0] === '@' ) { + unset( $data[$key] ); + } + } + $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); + } + + $cachedData['deps'][] = new FileDependency( $fileName ); + } + return true; + } + + $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim0ef389595e78ca38'; +} diff --git a/Metrolook.php b/Metrolook.php index b169afa..2fcacfc 100644 --- a/Metrolook.php +++ b/Metrolook.php @@ -24,8 +24,8 @@ $GLOBALS['wgExtensionCredits']['skin'][] = array( 'path' = __FILE__, 'name' = 'Metrolook', - 'description' = 'Metrolook skin for MediaWiki.', - 'version' = '3.0 beta 11', + 'descriptionmsg' = 'metrolook-desc', + 'version' = '3.0 beta 12', 'url' = 'https://www.mediawiki.org/wiki/Skin:Metrolook', 'author' = array( 'immewnity', 'paladox2015', 'Craig Davison', 'lagleki' ), 'license-name' = 'GPLv2+', @@ -35,6 +35,9 @@ $GLOBALS['wgAutoloadClasses']['SkinMetrolook'] = __DIR__ . '/SkinMetrolook.php'; $GLOBALS['wgAutoloadClasses']['MetrolookTemplate'] = __DIR__ . '/MetrolookTemplate.php'; +$GLOBALS['wgExtensionMessagesFiles']['MetrolookTemplate'] = __DIR__.'/Metrolook.i18n.php'; +$GLOBALS['wgMessagesDirs']['MetrolookTemplate'] = __DIR__ . '/i18n'; + // Register skin SkinFactory::getDefaultInstance()-register( 'metrolook', 'Metrolook', function(){ $config = ConfigFactory::getDefaultInstance()-makeConfig( 'metrolook' ); diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php index e28cede..adf5564 100644 --- a/MetrolookTemplate.php +++ b/MetrolookTemplate.php @@ -377,7 +377,7 @@ div class=vectorMenu style=float:right;background-image:none;vertical-align:middle;height:40px;padding-left:10px;padding-right:10px;position:relative;top:0px;right:10px;width:auto;text-align:right; a href=# style=text-decoration:none;span id=username-top?php if ($_SERVER[REMOTE_ADDR] == htmlspecialchars($this-getSkin()-getUser()-getName())) { -echo Guest; +echo wfMessage( 'metrolook-guest' )-text(); } else { echo htmlspecialchars( $this-getSkin()-getUser()-getName() ); diff --git a/README.md b/README.md index fd46098..9c12b46 100644 --- a/README.md +++ b/README.md @@ -60,9 +60,6 @@ $SearchBar = true; -Default is - -$DownArrow = true; To turn it off @@ -70,12 +67,16 @@ Default is -$Line = true; +$DownArrow = true; To turn it off $Line = false; +Default is + +$Line = true; + to change link $link1 = false; diff --git a/composer.json b/composer.json index abfde15..94d9b3e 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ license: GPL-2.0+, authors: [ { - name : immewnity + name : immewnity }, {
[MediaWiki-commits] [Gerrit] replace.py and pagegenerators.py help improvements - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: replace.py and pagegenerators.py help improvements .. replace.py and pagegenerators.py help improvements - Move documentation of fixes from replace script into fixes module. - Remove duplicate -page argument documentation in replace script. - Add periods where missing in pagegenerators help. - remove ?? from -help. Change-Id: I8a3f83c319c3847673e994a433e128b5f4161862 --- M pywikibot/fixes.py M pywikibot/pagegenerators.py M scripts/replace.py 3 files changed, 16 insertions(+), 18 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/fixes.py b/pywikibot/fixes.py index 723631d..1a5fb07 100644 --- a/pywikibot/fixes.py +++ b/pywikibot/fixes.py @@ -1,15 +1,15 @@ # -*- coding: utf-8 -*- File containing all standard fixes. - # # (C) Pywikibot team, 2008-2010 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' -# -help = u +parameter_help = u + Currently available predefined fixes are: + * HTML- Convert HTML tags to wiki syntax, and fix XHTML. * isbn- Fix badly formatted ISBNs. @@ -31,9 +31,10 @@ * fckeditor - Try to convert FCKeditor HTML tags to wiki syntax. https://lists.wikimedia.org/pipermail/wikibots-l/2009-February/000290.html - +__doc__ = __doc__ + parameter_help + fixes = { # These replacements will convert HTML to wiki syntax where possible, and # make remaining tags XHTML compliant. diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index f2e8360..a4b5b43 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -103,7 +103,7 @@ so check your edits! -limit:n When used with any other argument that specifies a set - of pages, work on no more than n pages in total + of pages, work on no more than n pages in total. -linksWork on all pages that are linked from a certain page. Argument can also be given as -links:linkingpagetitle. @@ -136,7 +136,7 @@ -step:n When used with any other argument that specifies a set of pages, only retrieve n pages at a time from the wiki - server + server. -titleregex Work on titles that match the given regular expression. @@ -157,15 +157,15 @@ Argument can be given as -unwatched:n where n is the maximum number of articles to work on. --usercontribs Work on all articles that were edited by a certain user : - Example : -usercontribs:DumZiBoT +-usercontribs Work on all articles that were edited by a certain user. + (Example : -usercontribs:DumZiBoT) -weblink Work on all articles that contain an external link to a given URL; may be given as -weblink:url -withoutinterwiki Work on all pages that don't have interlanguage links. Argument can be given as -withoutinterwiki:n where - n is some number (??). + n is the total to fetch. -mysqlquery Takes a Mysql query string like SELECT page_namespace, page_title, FROM page @@ -199,7 +199,8 @@ config.py for instructions. -page Work on a single page. Argument can also be given as - -page:pagetitle. + -page:pagetitle, and supplied multiple times for + multiple pages. -grep A regular expression that needs to match the article otherwise the page won't be returned. diff --git a/scripts/replace.py b/scripts/replace.py index cd9fcfb..75f76d9 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -10,15 +10,11 @@ params; +Furthermore, the following command line parameters are supported: + -xml Retrieve information from a local XML dump (pages-articles or pages-meta-current, see https://download.wikimedia.org). Argument can also be given as -xml:filename. - --page Only edit a specific page. - Argument can also be given as -page:pagetitle. You can - give this parameter multiple times to edit multiple pages. - -Furthermore, the following command line parameters are supported: -regexMake replacements using regular expressions. If this argument isn't given, the bot will make simple text replacements. @@ -70,7 +66,7 @@ fixes.py and user-fixes.py. The
[MediaWiki-commits] [Gerrit] [Metrolook] Register skin - change (translatewiki)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/176473 Change subject: [Metrolook] Register skin .. [Metrolook] Register skin Change-Id: I285a546015fcf711e1cd9beb7997833c9f3c2e99 --- M groups/MediaWiki/mediawiki-skins.txt 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/73/176473/1 diff --git a/groups/MediaWiki/mediawiki-skins.txt b/groups/MediaWiki/mediawiki-skins.txt index 6239cf3..2c7b0a2 100644 --- a/groups/MediaWiki/mediawiki-skins.txt +++ b/groups/MediaWiki/mediawiki-skins.txt @@ -28,6 +28,8 @@ #MediaWiki Strapping #file = mediawiki-strapping/i18n/%CODE%.json +Metrolook + Modern optional = skinname-modern, modern.css, modern.js -- To view, visit https://gerrit.wikimedia.org/r/176473 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I285a546015fcf711e1cd9beb7997833c9f3c2e99 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Paladox thomasmulhall...@yahoo.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ve.dm.Node: Fix typo in comment - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: ve.dm.Node: Fix typo in comment .. ve.dm.Node: Fix typo in comment Change-Id: I96b31f4c903edc20b1582f3bab83384eb793b03a --- M src/dm/ve.dm.Node.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/src/dm/ve.dm.Node.js b/src/dm/ve.dm.Node.js index 507975f..0dc5ffc 100644 --- a/src/dm/ve.dm.Node.js +++ b/src/dm/ve.dm.Node.js @@ -193,7 +193,7 @@ * Remap the store indexes stored in a linear model data element. * * The default implementation is empty. Nodes should override this if they store store indexes in -.* attributes. To remap, do something like + * attributes. To remap, do something like * dataElement.attributes.foo = mapping[dataElement.attributes.foo]; * * @static -- To view, visit https://gerrit.wikimedia.org/r/176469 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I96b31f4c903edc20b1582f3bab83384eb793b03a Gerrit-PatchSet: 2 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org 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] TextInputWidget: Reuse a single clone instead of appending a... - change (oojs/ui)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/176476 Change subject: TextInputWidget: Reuse a single clone instead of appending and removing new ones .. TextInputWidget: Reuse a single clone instead of appending and removing new ones Bug: T75328 Change-Id: I45ba2ba9d0009918043a91888f5f281f7a67e65b --- M src/widgets/TextInputWidget.js 1 file changed, 25 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/76/176476/1 diff --git a/src/widgets/TextInputWidget.js b/src/widgets/TextInputWidget.js index 9b0da89..6e877bd 100644 --- a/src/widgets/TextInputWidget.js +++ b/src/widgets/TextInputWidget.js @@ -57,6 +57,14 @@ this.$input.attr( 'placeholder', config.placeholder ); } this.$element.attr( 'role', 'textbox' ); + + // Clone for Resizing + if ( this.autosize ) { + this.$clone = this.$input + .clone() + .insertAfter( this.$input ) + .hide(); + } }; /* Setup */ @@ -199,28 +207,33 @@ * @chainable */ OO.ui.TextInputWidget.prototype.adjustSize = function () { - var $clone, scrollHeight, innerHeight, outerHeight, maxInnerHeight, measurementError, idealHeight; + var scrollHeight, innerHeight, outerHeight, maxInnerHeight, measurementError, idealHeight; if ( this.multiline this.autosize this.$input.val() !== this.valCache ) { - $clone = this.$input.clone() + this.$clone .val( this.$input.val() ) + .attr( 'rows', '' ) // Set inline height property to 0 to measure scroll height - .css( 'height', 0 ) - .insertAfter( this.$input ); + .css( 'height', 0 ); + this.valCache = this.$input.val(); - scrollHeight = $clone[0].scrollHeight; + + scrollHeight = this.$clone[0].scrollHeight; + // Remove inline height property to measure natural heights - $clone.css( 'height', '' ); - innerHeight = $clone.innerHeight(); - outerHeight = $clone.outerHeight(); + this.$clone.css( 'height', '' ); + innerHeight = this.$clone.innerHeight(); + outerHeight = this.$clone.outerHeight(); + // Measure max rows height - $clone.attr( 'rows', this.maxRows ).css( 'height', 'auto' ).val( '' ); - maxInnerHeight = $clone.innerHeight(); + this.$clone.attr( 'rows', this.maxRows ).css( 'height', 'auto' ).val( '' ); + maxInnerHeight = this.$clone.innerHeight(); + // Difference between reported innerHeight and scrollHeight with no scrollbars present // Equals 1 on Blink-based browsers and 0 everywhere else - measurementError = maxInnerHeight - $clone[0].scrollHeight; - $clone.remove(); + measurementError = maxInnerHeight - this.$clone[0].scrollHeight; idealHeight = Math.min( maxInnerHeight, scrollHeight + measurementError ); + // Only apply inline height when expansion beyond natural height is needed if ( idealHeight innerHeight ) { // Use the difference between the inner and outer height as a buffer -- To view, visit https://gerrit.wikimedia.org/r/176476 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I45ba2ba9d0009918043a91888f5f281f7a67e65b Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna psax...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] TextInputWidget: Stop adjustSize if the value of the textare... - change (oojs/ui)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/176475 Change subject: TextInputWidget: Stop adjustSize if the value of the textarea is the same .. TextInputWidget: Stop adjustSize if the value of the textarea is the same As adjustSize gets called onEdit it was getting called multiple times per keystroke. This prevents the method from being executed if the value of the textarea hasn't changed. Bug: T75328 Change-Id: I51e58c8b07e87479ac17910145824d768025c05e --- M src/widgets/TextInputWidget.js 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/75/176475/1 diff --git a/src/widgets/TextInputWidget.js b/src/widgets/TextInputWidget.js index 5c16a6e..9b0da89 100644 --- a/src/widgets/TextInputWidget.js +++ b/src/widgets/TextInputWidget.js @@ -201,12 +201,13 @@ OO.ui.TextInputWidget.prototype.adjustSize = function () { var $clone, scrollHeight, innerHeight, outerHeight, maxInnerHeight, measurementError, idealHeight; - if ( this.multiline this.autosize ) { + if ( this.multiline this.autosize this.$input.val() !== this.valCache ) { $clone = this.$input.clone() .val( this.$input.val() ) // Set inline height property to 0 to measure scroll height .css( 'height', 0 ) .insertAfter( this.$input ); + this.valCache = this.$input.val(); scrollHeight = $clone[0].scrollHeight; // Remove inline height property to measure natural heights $clone.css( 'height', '' ); -- To view, visit https://gerrit.wikimedia.org/r/176475 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I51e58c8b07e87479ac17910145824d768025c05e Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna psax...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] TextInputWidget: Use .css( propertyName, value ) instead of ... - change (oojs/ui)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/176474 Change subject: TextInputWidget: Use .css( propertyName, value ) instead of .css( properties) for single property .. TextInputWidget: Use .css( propertyName, value ) instead of .css( properties) for single property Change-Id: I8dce6109ba5421c76df1a816e1c3b565087c3ffe --- M src/widgets/TextInputWidget.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/74/176474/1 diff --git a/src/widgets/TextInputWidget.js b/src/widgets/TextInputWidget.js index 70d194b..5c16a6e 100644 --- a/src/widgets/TextInputWidget.js +++ b/src/widgets/TextInputWidget.js @@ -205,7 +205,7 @@ $clone = this.$input.clone() .val( this.$input.val() ) // Set inline height property to 0 to measure scroll height - .css( { height: 0 } ) + .css( 'height', 0 ) .insertAfter( this.$input ); scrollHeight = $clone[0].scrollHeight; // Remove inline height property to measure natural heights -- To view, visit https://gerrit.wikimedia.org/r/176474 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8dce6109ba5421c76df1a816e1c3b565087c3ffe Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna psax...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Version 2.0 beta 3 - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Version 2.0 beta 3 .. Version 2.0 beta 3 Add list of major changes in new ChangeLog Change-Id: Iff3bf81448c678ca59fc1bae04c90d9ad337f3a4 --- A ChangeLog M pywikibot/__init__.py M setup.py 3 files changed, 32 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 000..12772a4 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,30 @@ + +Release 2.0b3 (30 November 2014) + +Major changes include: +- Library initialisation no longer connects to servers +- generate_user_files.py rewritten +- API Version 1.14 support +- Support HTTPS for families with certificate validation errors (Python 2 only) +- API HTTP(S) GET support +- API simplified continuation support +- Upload uses a fake filename to avoid various MIME encoding issues +- API class ParamInfo inspects API modules +- Several QueryGenerator efficiency improvements +- Improved 'same title' detection and 'get redirect target' handling +- Site interwiki methods now use dynamic Interwikimap +- Site methods return Namespace object instead of int +- New WikiStats module +- New PatchManager module used for showDiff +- New pagegenerators, including -intersect support +- Several category_redirect.py improvements +- archivebot: support more languages +- reflinks: changed from GPL to MIT + +Release 2.0b2 (7 October 2014) + +TODO: add list of major changes + +Release 2.0b1 (26 August 2013) + +TODO: add high level description of changes from pywikibot 1.0 diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index d60e45e..feee966 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -5,7 +5,7 @@ # # Distributed under the terms of the MIT license. # -__release__ = '2.0b2' +__release__ = '2.0b3' __version__ = '$Id$' import datetime diff --git a/setup.py b/setup.py index 503312a..a0be084 100644 --- a/setup.py +++ b/setup.py @@ -94,7 +94,7 @@ from setuptools import setup, find_packages name = 'pywikibot' -version = '2.0b2' +version = '2.0b3' github_url = 'https://github.com/wikimedia/pywikibot-core' download_url = github_url + '/archive/master.zip#egg=' + name + '-' + version -- To view, visit https://gerrit.wikimedia.org/r/176393 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iff3bf81448c678ca59fc1bae04c90d9ad337f3a4 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: Xqt i...@gno.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] TextInputWidget: Use .css( propertyName, value ) instead of ... - change (oojs/ui)
jenkins-bot has submitted this change and it was merged. Change subject: TextInputWidget: Use .css( propertyName, value ) instead of .css( properties) for single property .. TextInputWidget: Use .css( propertyName, value ) instead of .css( properties) for single property Change-Id: I8dce6109ba5421c76df1a816e1c3b565087c3ffe --- M src/widgets/TextInputWidget.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/src/widgets/TextInputWidget.js b/src/widgets/TextInputWidget.js index 70d194b..5c16a6e 100644 --- a/src/widgets/TextInputWidget.js +++ b/src/widgets/TextInputWidget.js @@ -205,7 +205,7 @@ $clone = this.$input.clone() .val( this.$input.val() ) // Set inline height property to 0 to measure scroll height - .css( { height: 0 } ) + .css( 'height', 0 ) .insertAfter( this.$input ); scrollHeight = $clone[0].scrollHeight; // Remove inline height property to measure natural heights -- To view, visit https://gerrit.wikimedia.org/r/176474 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8dce6109ba5421c76df1a816e1c3b565087c3ffe Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna psax...@wikimedia.org Gerrit-Reviewer: Bartosz Dziewoński matma@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] TextInputWidget: Stop adjustSize if the value of the textare... - change (oojs/ui)
jenkins-bot has submitted this change and it was merged. Change subject: TextInputWidget: Stop adjustSize if the value of the textarea is the same .. TextInputWidget: Stop adjustSize if the value of the textarea is the same As adjustSize gets called onEdit it was getting called multiple times per keystroke. This prevents the method from being executed if the value of the textarea hasn't changed. Bug: T75328 Change-Id: I51e58c8b07e87479ac17910145824d768025c05e --- M src/widgets/TextInputWidget.js 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/src/widgets/TextInputWidget.js b/src/widgets/TextInputWidget.js index 5c16a6e..9b0da89 100644 --- a/src/widgets/TextInputWidget.js +++ b/src/widgets/TextInputWidget.js @@ -201,12 +201,13 @@ OO.ui.TextInputWidget.prototype.adjustSize = function () { var $clone, scrollHeight, innerHeight, outerHeight, maxInnerHeight, measurementError, idealHeight; - if ( this.multiline this.autosize ) { + if ( this.multiline this.autosize this.$input.val() !== this.valCache ) { $clone = this.$input.clone() .val( this.$input.val() ) // Set inline height property to 0 to measure scroll height .css( 'height', 0 ) .insertAfter( this.$input ); + this.valCache = this.$input.val(); scrollHeight = $clone[0].scrollHeight; // Remove inline height property to measure natural heights $clone.css( 'height', '' ); -- To view, visit https://gerrit.wikimedia.org/r/176475 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I51e58c8b07e87479ac17910145824d768025c05e Gerrit-PatchSet: 2 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna psax...@wikimedia.org Gerrit-Reviewer: Bartosz Dziewoński matma@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] [FEAT] Add -keep option to keep the new link unchanged - change (pywikibot/core)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/176477 Change subject: [FEAT] Add -keep option to keep the new link unchanged .. [FEAT] Add -keep option to keep the new link unchanged Normaly solve_disambiguation replaces links by a new one but doesn't change the appearence. The old link becomes a pipe link to the new target. Now -keep is able to change both, the link and the content. Change-Id: I54cc7beec8d9a2037b28d4763dd57a44823fa457 --- M scripts/solve_disambiguation.py 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/77/176477/1 diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index fc03782..6308b26 100644 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -38,6 +38,8 @@ searching for alternatives in [[Keyword (disambiguation)]]. Note: this is the same as -primary -just -pos:XY + -keep Keep the new title unchanged without creating the pipe link. + -file:XYZ reads a list of pages from a text file. XYZ is the name of the file from which the list is taken. If XYZ is not given, the user is asked for a filename. Page titles should be inside @@ -470,7 +472,7 @@ } def __init__(self, always, alternatives, getAlternatives, dnSkip, generator, - primary, main_only, minimum=0): + primary, main_only, minimum=0, keep=False): super(DisambiguationRobot, self).__init__() self.always = always self.alternatives = alternatives @@ -480,6 +482,7 @@ self.primary = primary self.main_only = main_only self.minimum = minimum +self.keep = keep self.mysite = pywikibot.Site() self.mylang = self.mysite.language() @@ -774,6 +777,8 @@ choice = choice[1:] elif include == redirect: replaceit = True +elif self.keep and link_text == page_title: +replaceit = True else: replaceit = False @@ -1034,6 +1039,7 @@ alternatives = [] getAlternatives = True dnSkip = False +keep = False generator = None pageTitle = None primary = False @@ -1078,6 +1084,8 @@ getAlternatives = False elif arg == '-dnskip': dnSkip = True +elif arg == '-keep': +keep = True elif arg == '-main': main_only = True elif arg.startswith('-min:'): @@ -1113,7 +1121,7 @@ bot = DisambiguationRobot(always, alternatives, getAlternatives, dnSkip, generator, primary, main_only, - minimum=minimum) + minimum=minimum, keep=keep) bot.run() -- To view, visit https://gerrit.wikimedia.org/r/176477 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54cc7beec8d9a2037b28d4763dd57a44823fa457 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] InputWidget: Update DOM value before firing 'change' event - change (oojs/ui)
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/176478 Change subject: InputWidget: Update DOM value before firing 'change' event .. InputWidget: Update DOM value before firing 'change' event It seems sensible not to fire events while the object is in inconsistent state. It was previously done in this order before 8b32c7d2 was done to fix the behavior when #cleanUpValue is not a no-op. Change-Id: I5cc59b5c2682ece6b0df303c07b0c4dfa32d95ed --- M src/widgets/InputWidget.js 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/78/176478/1 diff --git a/src/widgets/InputWidget.js b/src/widgets/InputWidget.js index c0fa123..875aee7 100644 --- a/src/widgets/InputWidget.js +++ b/src/widgets/InputWidget.js @@ -111,14 +111,14 @@ */ OO.ui.InputWidget.prototype.setValue = function ( value ) { value = this.cleanUpValue( value ); + // Update the DOM if it has changed. Note that with cleanUpValue, it + // is possible for the DOM value to change without this.value changing. + if ( this.$input.val() !== value ) { + this.$input.val( value ); + } if ( this.value !== value ) { this.value = value; this.emit( 'change', this.value ); - } - // Update the DOM if it has changed. Note that with cleanUpValue, it - // is possible for the DOM value to change without this.value changing. - if ( this.$input.val() !== this.value ) { - this.$input.val( this.value ); } return this; }; -- To view, visit https://gerrit.wikimedia.org/r/176478 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5cc59b5c2682ece6b0df303c07b0c4dfa32d95ed Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński matma@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 39643) Allow 0 as the content of syntaxhighlight - change (mediawiki...SyntaxHighlight_GeSHi)
TheDJ has uploaded a new change for review. https://gerrit.wikimedia.org/r/176479 Change subject: (bug 39643) Allow 0 as the content of syntaxhighlight .. (bug 39643) Allow 0 as the content of syntaxhighlight The empty() function considers 0 to be empty. Makes empty() useless for strings. (cherry picked from commit 8d8fb22ebb508950d122474ccbbf3b18ddba8409) Change-Id: If0e647e3be269edcb23748d246bc564483aff0d2 --- M geshi/geshi.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi refs/changes/79/176479/1 diff --git a/geshi/geshi.php b/geshi/geshi.php index 405ff16..145be2f 100644 --- a/geshi/geshi.php +++ b/geshi/geshi.php @@ -595,10 +595,10 @@ * @since 1.0.0 */ function GeSHi($source = '', $language = '', $path = '') { -if (!empty($source)) { +if ($source !== '') { $this-set_source($source); } -if (!empty($language)) { +if ($language !== '') { $this-set_language($language); } $this-set_language_path($path); -- To view, visit https://gerrit.wikimedia.org/r/176479 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If0e647e3be269edcb23748d246bc564483aff0d2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi Gerrit-Branch: master Gerrit-Owner: TheDJ hartman.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add setContents to textSelection impl of CodeEditor - change (mediawiki...CodeEditor)
TheDJ has uploaded a new change for review. https://gerrit.wikimedia.org/r/176480 Change subject: Add setContents to textSelection impl of CodeEditor .. Add setContents to textSelection impl of CodeEditor Change-Id: I0a5434b9d40d8945b6b801e2aa2b4b23466ea71c --- M modules/jquery.codeEditor.js 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor refs/changes/80/176480/1 diff --git a/modules/jquery.codeEditor.js b/modules/jquery.codeEditor.js index a0cac77..e0c4803 100644 --- a/modules/jquery.codeEditor.js +++ b/modules/jquery.codeEditor.js @@ -559,6 +559,10 @@ return context.codeEditor.getSession().getValue(); }, + 'setContents': function ( newContents ) { + context.codeEditor.getSession().setValue( newContents ); + }, + /** * Gets the currently selected text in the content * DO NOT CALL THIS DIRECTLY, use $.textSelection( 'functionname', options ) instead -- To view, visit https://gerrit.wikimedia.org/r/176480 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a5434b9d40d8945b6b801e2aa2b4b23466ea71c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeEditor Gerrit-Branch: master Gerrit-Owner: TheDJ hartman.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add setContents to textSelection impl of CodeEditor - change (mediawiki...CodeEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Add setContents to textSelection impl of CodeEditor .. Add setContents to textSelection impl of CodeEditor Change-Id: I0a5434b9d40d8945b6b801e2aa2b4b23466ea71c --- M modules/jquery.codeEditor.js 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: He7d3r: Looks good to me, but someone else must approve Jackmcbarn: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/jquery.codeEditor.js b/modules/jquery.codeEditor.js index a0cac77..e0c4803 100644 --- a/modules/jquery.codeEditor.js +++ b/modules/jquery.codeEditor.js @@ -559,6 +559,10 @@ return context.codeEditor.getSession().getValue(); }, + 'setContents': function ( newContents ) { + context.codeEditor.getSession().setValue( newContents ); + }, + /** * Gets the currently selected text in the content * DO NOT CALL THIS DIRECTLY, use $.textSelection( 'functionname', options ) instead -- To view, visit https://gerrit.wikimedia.org/r/176480 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0a5434b9d40d8945b6b801e2aa2b4b23466ea71c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeEditor Gerrit-Branch: master Gerrit-Owner: TheDJ hartman.w...@gmail.com Gerrit-Reviewer: He7d3r he7...@gmail.com Gerrit-Reviewer: Helder.wiki helder.w...@gmail.com Gerrit-Reviewer: Jackmcbarn jackmcb...@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] Make indicators use nowiki strip markers - change (mediawiki/core)
Jackmcbarn has uploaded a new change for review. https://gerrit.wikimedia.org/r/176481 Change subject: Make indicators use nowiki strip markers .. Make indicators use nowiki strip markers Currently, the indicator tag returns an empty string wrapped in a general strip marker. This gets unstripped before doBlockLevels, which then sees more blank lines in a row than there are really are, producing unwanted blank lines in the output. This patch changes the empty string to be wrapped in a nowiki strip marker, which isn't unstripped until after doBlockLevels is done. Bug: T76234 Change-Id: I902882496972727f96a6f7cc7ee2b0c9c9c1e07e --- M includes/parser/CoreTagHooks.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/81/176481/1 diff --git a/includes/parser/CoreTagHooks.php b/includes/parser/CoreTagHooks.php index 9755ea9..7a9155b 100644 --- a/includes/parser/CoreTagHooks.php +++ b/includes/parser/CoreTagHooks.php @@ -144,6 +144,6 @@ Parser::stripOuterParagraph( $parser-recursiveTagParseFully( $content, $frame ) ) ); - return ''; + return array( '', 'markerType' = 'nowiki' ); } } -- To view, visit https://gerrit.wikimedia.org/r/176481 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I902882496972727f96a6f7cc7ee2b0c9c9c1e07e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jackmcbarn jackmcb...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] login: Use the site object’s username if defined - change (pywikibot/core)
Gallaecio has uploaded a new change for review. https://gerrit.wikimedia.org/r/176482 Change subject: login: Use the site object’s username if defined .. login: Use the site object’s username if defined Change-Id: Idac9c21f6b4d703bb464306cac82b7e61d2c31d8 --- M pywikibot/login.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/82/176482/1 diff --git a/pywikibot/login.py b/pywikibot/login.py index db7be8f..9178db2 100644 --- a/pywikibot/login.py +++ b/pywikibot/login.py @@ -59,6 +59,8 @@ self.site = pywikibot.Site() if user: self.username = user +elif self.site.username(): +self.username = self.site.username() elif sysop: try: family_sysopnames = config.sysopnames[self.site.family.name] -- To view, visit https://gerrit.wikimedia.org/r/176482 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idac9c21f6b4d703bb464306cac82b7e61d2c31d8 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Gallaecio adriyeticha...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ignore token:give events - change (labs...wikibugs2)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/176483 Change subject: Ignore token:give events .. Ignore token:give events Bug: T76246 Change-Id: I59d5a6ef2597599a9770a022d5fa7c92fbc9ffdf --- M wikibugs.py 1 file changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 refs/changes/83/176483/1 diff --git a/wikibugs.py b/wikibugs.py index 99836e9..b5f4ce0 100644 --- a/wikibugs.py +++ b/wikibugs.py @@ -232,12 +232,14 @@ } transactions = self.get_transaction_info(phid_info['name'], timestamp) -if 'ccs' in transactions and len(transactions) == 1: -# Ignore any only-CC updates -return -elif 'projectcolumn' in transactions and len(transactions) == 1: -# Ignore column changes, see T1204 -return +ignored = [ +'css', # Ignore any only-CC updates +'projectcolumn', # Ignore column changes, see T1204 +'token:give', # Ignore granting tokens, see T76246 +] +for event in ignored: +if event in transactions and len(transactions) == 1: +return if 'title' in transactions: useful_event_metadata['title'] = transactions['title']['new'] -- To view, visit https://gerrit.wikimedia.org/r/176483 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59d5a6ef2597599a9770a022d5fa7c92fbc9ffdf Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikibugs2 Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Window: Avoid height flickering when resizing dialogs - change (oojs/ui)
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/176484 Change subject: Window: Avoid height flickering when resizing dialogs .. Window: Avoid height flickering when resizing dialogs When you have a dialog open and resize the browser window, the dialog will appear to close and re-open (even if its size has not actually changed). This is because CSS transitions suck. * Factor out a Window#withoutSizeTransitions helper function from Window#getContentHeight, which disables resize transitions on the given window, runs some code and enables the transitions back. * Correct the code in Window#setDimensions which aimed to calculate the necessary window height after setting its width, but failed to do so because it didn't account for the transition on the width. Change-Id: I410f42949b81f439ab712a263498ba6012de2e23 --- M src/Window.js 1 file changed, 49 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/84/176484/1 diff --git a/src/Window.js b/src/Window.js index 7a16e87..4d7c597 100644 --- a/src/Window.js +++ b/src/Window.js @@ -303,25 +303,47 @@ }; /** - * Get the height of the dialog contents. + * Disable transitions on window's frame for the duration of the callback function, then enable them + * back. * - * @return {number} Content height + * @private + * @param {Function} callback Function to call while transitions are disabled */ -OO.ui.Window.prototype.getContentHeight = function () { +OO.ui.Window.prototype.withoutSizeTransitions = function ( callback ) { // Temporarily resize the frame so getBodyHeight() can use scrollHeight measurements. // Disable transitions first, otherwise we'll get values from when the window was animating. - var bodyHeight, oldHeight, oldTransition, + var oldTransition, styleObj = this.$frame[0].style; oldTransition = styleObj.transition || styleObj.OTransition || styleObj.MsTransition || styleObj.MozTransition || styleObj.WebkitTransition; styleObj.transition = styleObj.OTransition = styleObj.MsTransition = styleObj.MozTransition = styleObj.WebkitTransition = 'none'; - oldHeight = styleObj.height; - styleObj.height = '1px'; - bodyHeight = this.getBodyHeight(); - styleObj.height = oldHeight; + callback(); + // Force reflow to make sure the style changes done inside callback really are not transitioned + this.$frame.height(); styleObj.transition = styleObj.OTransition = styleObj.MsTransition = styleObj.MozTransition = styleObj.WebkitTransition = oldTransition; +}; + + +/** + * Get the height of the dialog contents. + * + * @return {number} Content height + */ +OO.ui.Window.prototype.getContentHeight = function () { + var bodyHeight, + window = this, + styleObj = this.$frame[0].style; + + // Temporarily resize the frame so getBodyHeight() can use scrollHeight measurements. + // Disable transitions first, otherwise we'll get values from when the window was animating. + this.withoutSizeTransitions( function () { + var oldHeight = styleObj.height; + styleObj.height = '1px'; + bodyHeight = window.getBodyHeight(); + styleObj.height = oldHeight; + } ); return Math.round( // Add buffer for border @@ -517,17 +539,31 @@ * @chainable */ OO.ui.Window.prototype.setDimensions = function ( dim ) { - // Apply width before height so height is not based on wrapping content using the wrong width + var height, + window = this, + styleObj = this.$frame[0].style; + + // Calculate the height we need to set using the correct width + if ( dim.height === undefined ) { + this.withoutSizeTransitions( function () { + var oldWidth = styleObj.width; + window.$frame.css( 'width', dim.width || '' ); + height = window.getContentHeight(); + styleObj.width = oldWidth; + } ); + } else { + height = dim.height; + } + this.$frame.css( { width: dim.width || '', minWidth: dim.minWidth || '', - maxWidth: dim.maxWidth || '' - } ); - this.$frame.css( { - height: ( dim.height !== undefined ? dim.height : this.getContentHeight() ) || '', + maxWidth: dim.maxWidth || '', + height: height || '', minHeight: dim.minHeight || '', maxHeight: dim.maxHeight || '' } ); + return this; }; -- To view, visit https://gerrit.wikimedia.org/r/176484 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
[MediaWiki-commits] [Gerrit] Ignore token:give events - change (labs...wikibugs2)
Legoktm has submitted this change and it was merged. Change subject: Ignore token:give events .. Ignore token:give events Bug: T76246 Change-Id: I59d5a6ef2597599a9770a022d5fa7c92fbc9ffdf --- M wikibugs.py 1 file changed, 8 insertions(+), 6 deletions(-) Approvals: Legoktm: Verified; Looks good to me, approved diff --git a/wikibugs.py b/wikibugs.py index 99836e9..b5f4ce0 100644 --- a/wikibugs.py +++ b/wikibugs.py @@ -232,12 +232,14 @@ } transactions = self.get_transaction_info(phid_info['name'], timestamp) -if 'ccs' in transactions and len(transactions) == 1: -# Ignore any only-CC updates -return -elif 'projectcolumn' in transactions and len(transactions) == 1: -# Ignore column changes, see T1204 -return +ignored = [ +'css', # Ignore any only-CC updates +'projectcolumn', # Ignore column changes, see T1204 +'token:give', # Ignore granting tokens, see T76246 +] +for event in ignored: +if event in transactions and len(transactions) == 1: +return if 'title' in transactions: useful_event_metadata['title'] = transactions['title']['new'] -- To view, visit https://gerrit.wikimedia.org/r/176483 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I59d5a6ef2597599a9770a022d5fa7c92fbc9ffdf Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikibugs2 Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] scripts.catall: Make script documentation more clear - change (pywikibot/core)
Gallaecio has uploaded a new change for review. https://gerrit.wikimedia.org/r/176485 Change subject: scripts.catall: Make script documentation more clear .. scripts.catall: Make script documentation more clear Fixes T60549 Change-Id: I9c980da9df2f3c83d6e27147831aa398ed4f4d3b --- M scripts/catall.py 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/85/176485/1 diff --git a/scripts/catall.py b/scripts/catall.py index dbd1705..bd4f938 100755 --- a/scripts/catall.py +++ b/scripts/catall.py @@ -1,6 +1,12 @@ # -*- coding: utf-8 -*- -Add or change categories on a number of pages. +For each page in the target wiki, this script lets you do either of the +following: + +* If a page contains no categories, you can specify a list of categories to add + to the page. +* If a page already contains one or more categories, you can specify a new list + of categories to replace the current list of categories of the page. Usage: catall.py [start] -- To view, visit https://gerrit.wikimedia.org/r/176485 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c980da9df2f3c83d6e27147831aa398ed4f4d3b Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Gallaecio adriyeticha...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix typo in ignore rules css -- ccs - change (labs...wikibugs2)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/176486 Change subject: Fix typo in ignore rules css -- ccs .. Fix typo in ignore rules css -- ccs Follows up f9533014196 Change-Id: Ib988d9790dfb237debb093e1657971eef263cabc --- M wikibugs.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 refs/changes/86/176486/1 diff --git a/wikibugs.py b/wikibugs.py index b5f4ce0..34ac353 100644 --- a/wikibugs.py +++ b/wikibugs.py @@ -233,7 +233,7 @@ transactions = self.get_transaction_info(phid_info['name'], timestamp) ignored = [ -'css', # Ignore any only-CC updates +'ccs', # Ignore any only-CC updates 'projectcolumn', # Ignore column changes, see T1204 'token:give', # Ignore granting tokens, see T76246 ] -- To view, visit https://gerrit.wikimedia.org/r/176486 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib988d9790dfb237debb093e1657971eef263cabc Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikibugs2 Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix typo in ignore rules css -- ccs - change (labs...wikibugs2)
Legoktm has submitted this change and it was merged. Change subject: Fix typo in ignore rules css -- ccs .. Fix typo in ignore rules css -- ccs Follows up f9533014196 Change-Id: Ib988d9790dfb237debb093e1657971eef263cabc --- M wikibugs.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Verified; Looks good to me, approved diff --git a/wikibugs.py b/wikibugs.py index b5f4ce0..34ac353 100644 --- a/wikibugs.py +++ b/wikibugs.py @@ -233,7 +233,7 @@ transactions = self.get_transaction_info(phid_info['name'], timestamp) ignored = [ -'css', # Ignore any only-CC updates +'ccs', # Ignore any only-CC updates 'projectcolumn', # Ignore column changes, see T1204 'token:give', # Ignore granting tokens, see T76246 ] -- To view, visit https://gerrit.wikimedia.org/r/176486 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib988d9790dfb237debb093e1657971eef263cabc Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikibugs2 Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove RELEASE-NOTES-1.24 - change (mediawiki/core)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/176487 Change subject: Remove RELEASE-NOTES-1.24 .. Remove RELEASE-NOTES-1.24 1.24 has been released, so any changes that need release notes should be targeting 1.25 Change-Id: Ie55c554131d750e22e6da1bf137279623325e67d --- D RELEASE-NOTES-1.24 1 file changed, 0 insertions(+), 756 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/87/176487/1 diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24 deleted file mode 100644 index 03cf277..000 --- a/RELEASE-NOTES-1.24 +++ /dev/null @@ -1,756 +0,0 @@ -Security reminder: If you have PHP's register_globals option set, you must -turn it off. MediaWiki will no longer work with it enabled. - -== MediaWiki 1.24 == - -THIS IS NOT A RELEASE YET - -MediaWiki 1.24 is an alpha-quality branch and is not recommended for use in -production. - -=== Configuration changes in 1.24 === -* MediaWiki will no longer run if register_globals is enabled. It has been - deprecated for 5 years now, and was removed in PHP 5.4. For more information - about why, see https://www.mediawiki.org/wiki/register_globals. -* MediaWiki now requires PHP's iconv extension. openSUSE users may need to - install the php5-iconv package. Users of other systems may need to add - extension=iconv.so to php.ini or recompile PHP without --without-iconv. -* MediaWiki will no longer function if magic quotes are enabled. It has - been deprecated for 5 years now, and was removed in PHP 5.4. -* The server's canonical hostname is available as $wgServerName, which is - exposed in both mw.config and ApiQuerySiteInfo. -* Introduced $wgPagePropsHaveSortkey as a backwards-compatibility switch, - for using the old schema of the page_props table, in case the respective - schema update was not applied. -* $wgSearchEverythingOnlyLoggedIn was removed as the 'searcheverything' - user option was removed. Use $wgNamespacesToBeSearchedDefault instead or - if you used to have $wgDefaultUserOptions['searcheverything'] = 1. -* $wgMasterWaitTimeout has been deprecated. -* $wgDBClusterTimeout has been removed. -* $wgProxyKey has been removed. It is no longer used by MediaWiki core. - Ensure $wgSecretKey is set in LocalSettings.php. -* $wgExtraInterlanguageLinkPrefixes is a new configuration variable that - contains an array of interwiki prefixes that should be treated as language - prefixes (i.e. turned into interlanguage links when $wgInterwikiMagic is set - to true). -* $wgParserTestRemote has been removed. -* $wgCountTotalSearchHits has been removed. If you're concerned about efficiency - of search, you should use something like CirrusSearch instead of built in - search. -* Users in the 'sysop' group have access to Special:MergeHistory by default. -* $wgFileStore was removed after having been deprecated in 1.17. Alternative - configurations are $wgDeletedDirectory and $wgHashedUploadDirectory. -* The deprecated $wgUseCommaCount variable has been removed. -* $wgEnableSorbs and $wgSorbsUrl have been removed. -* The UserCryptPassword and UserComparePassword hooks are no longer called. - Any extensions using them must be updated to use the Password Hashing API. -* $wgCompiledFiles has been removed. -* $wgSortSpecialPages was removed, the listing on Special:SpecialPages is - now always sorted. -* $wgSpecialPages may now use callback functions as an alternative to plain class names. - This allows more control over constructor parameters. -* $wgHTCPMulticastAddress, $wgHTCPMulticastRouting and $wgHTCPPort were removed. -* $wgRC2UDPAddress, $wgRC2UDPInterwikiPrefix, $wgRC2UDPOmitBots, $wgRC2UDPPort - and $wgRC2UDPPrefix have been removed. -* The default password type for MediaWiki has been changed from MD5 to PBKDF2. - Password hashes will automatically be updated as users log in. If necessary, the - old MD5 hashing can be restored by changing $wgPasswordDefault to 'B'. In addition, - there is a maintenance script wrapOldPassword.php that can wrap all passwords in - PBKDF2 (or the hashing algorithm of your choice) if you don't want to wait for your - users to log in. -* $wgImportSources can now either be a regular array, or an associative map - specifying subprojects on the interwiki map of the target wiki, or a mix of - the two. Existing configurations will still work. -* Users must be able to edit through a page's protection to be able to delete it. -* The default thumb size ($wgDefaultUserOptions['thumbsize']) is now 300px, up from - 180px. If you have altered the number of entries in $wgThumbLimits for your wiki, you - may need to adjust your default user settings to compensate for the index change. -* $wgDeferredUpdateList is now deprecated, you should use DeferredUpdates::addUpdate() - instead. -* $wgCanonicalLanguageLinks has been removed. Per Google recommendations, we - will not send a rel=canonical
[MediaWiki-commits] [Gerrit] [BREAKING CHANGE] ButtonWidget: Don't default 'target' to '_... - change (oojs/ui)
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/176488 Change subject: [BREAKING CHANGE] ButtonWidget: Don't default 'target' to '_blank' .. [BREAKING CHANGE] ButtonWidget: Don't default 'target' to '_blank' target=_blank has its use cases, but it definitely shouldn't be the default behavior. Bug: T75452 Change-Id: I88b7bc1b562bca2a63b611b1d33dd9d534297e68 --- M demos/widgets.php M php/widgets/ButtonWidget.php M src/widgets/ButtonWidget.js 3 files changed, 2 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/88/176488/1 diff --git a/demos/widgets.php b/demos/widgets.php index 305d7c7..1217289 100644 --- a/demos/widgets.php +++ b/demos/widgets.php @@ -31,12 +31,10 @@ new OOUI\ButtonWidget( array( 'label' = 'LTR', 'href' = '?dir=ltr', - 'target' = null, ) ), new OOUI\ButtonWidget( array( 'label' = 'RTL', 'href' = '?dir=rtl', - 'target' = null, ) ), ) ) ); diff --git a/php/widgets/ButtonWidget.php b/php/widgets/ButtonWidget.php index 0464ed2..1dff2bb 100644 --- a/php/widgets/ButtonWidget.php +++ b/php/widgets/ButtonWidget.php @@ -27,9 +27,6 @@ * @param string $config['target'] Target to open hyperlink in */ public function __construct( array $config = array() ) { - // Configuration initialization - $config = array_merge( array( 'target' = '_blank' ), $config ); - // Parent constructor parent::__construct( $config ); @@ -49,7 +46,7 @@ -appendContent( $this-button ); $this-setHref( isset( $config['href'] ) ? $config['href'] : null ); - $this-setTarget( $config['target'] ); + $this-setTarget( isset( $config['target'] ) ? $config['target'] : null ); } /** diff --git a/src/widgets/ButtonWidget.js b/src/widgets/ButtonWidget.js index 17ac0ee..a2484f2 100644 --- a/src/widgets/ButtonWidget.js +++ b/src/widgets/ButtonWidget.js @@ -17,7 +17,7 @@ */ OO.ui.ButtonWidget = function OoUiButtonWidget( config ) { // Configuration initialization - config = $.extend( { target: '_blank' }, config ); + config = config || {}; // Parent constructor OO.ui.ButtonWidget.super.call( this, config ); -- To view, visit https://gerrit.wikimedia.org/r/176488 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I88b7bc1b562bca2a63b611b1d33dd9d534297e68 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński matma@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Document external libraries changes in release notes - change (mediawiki/core)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/176489 Change subject: Document external libraries changes in release notes .. Document external libraries changes in release notes Bug: T1355 Change-Id: If3432d513e053742ef09f1330604e57918ab90b2 --- M RELEASE-NOTES-1.25 1 file changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/89/176489/1 diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25 index caf29f0..21d3c88 100644 --- a/RELEASE-NOTES-1.25 +++ b/RELEASE-NOTES-1.25 @@ -60,6 +60,31 @@ and images for ApiOpenSearch output. The semantics are identical to the OpenSearchXml hook provided by the OpenSearchXml extension. + External libraries +* MediaWiki now requires certain external libraries to be installed. In the past + these were bundled inside the git repository of MediaWiki core, but now they + need to be installed separately. For users using the tarball, this will be taken + care of and no action will be required. Users using git will either need to use + composer to fetch dependencies or use the mediawiki/vendor repository which includes + all dependencies for MediaWiki core and ones used in Wikimedia deployment. Detailed + instructions can be found at https://www.mediawiki.org/wiki/Download_from_Git#Fetch_external_libraries. +* The following libraries are now required: +** psr/log 1.0.0 +*** This library provides the interfaces set by the PSR-3 standard (http://www.php-fig.org/psr/psr-3/) +which are used by MediaWiki interally by the MWLogger class. +*** See the structured logging RfC (https://www.mediawiki.org/wiki/Requests_for_comment/Structured_logging) +for more background information. +** cssjanus/cssjanus 1.1.1 +*** This library was formerly bundled with MediaWiki core and has now been removed. It automatically +flips CSS for RTL support. +** leafo/lessphp 0.5.0 +*** This library was formerly bundled with MediaWiki core and has now been removed. It compiles LESS +files into CSS. +** cdb/cdb 1.0.0 +*** This library was formerly a part of MediaWiki core, and has now been split out into a separate library. +It provides CDB functions which are used in the Interwiki and Localization caches. More information +about the library can be found at https://www.mediawiki.org/wiki/CDB. + === Bug fixes in 1.25 === * (bug 71003) No additional code will be generated to try to load CSS-embedded SVG images in Internet Explorer 6 and 7, as they don't support them anyway. -- To view, visit https://gerrit.wikimedia.org/r/176489 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If3432d513e053742ef09f1330604e57918ab90b2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] scripts.catall: Make script documentation more clear - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: scripts.catall: Make script documentation more clear .. scripts.catall: Make script documentation more clear Bug: 58549 Change-Id: I9c980da9df2f3c83d6e27147831aa398ed4f4d3b --- M scripts/catall.py 1 file changed, 8 insertions(+), 3 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/catall.py b/scripts/catall.py index dbd1705..8585c91 100755 --- a/scripts/catall.py +++ b/scripts/catall.py @@ -1,11 +1,16 @@ # -*- coding: utf-8 -*- + -Add or change categories on a number of pages. +This script shows the categories on each page and lets you change them. + +For each page in the target wiki: +* If the page contains no categories, you can specify a list of categories to + add to the page. +* If the page already contains one or more categories, you can specify a new + list of categories to replace the current list of categories of the page. Usage: catall.py [start] - -Provides the categories on the page and asks whether to change them. If no starting name is provided, the bot starts at 'A'. -- To view, visit https://gerrit.wikimedia.org/r/176485 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9c980da9df2f3c83d6e27147831aa398ed4f4d3b Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Gallaecio adriyeticha...@gmail.com Gerrit-Reviewer: Gallaecio adriyeticha...@gmail.com Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.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] Comment out Bootstrap glyphicons - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged. Change subject: Comment out Bootstrap glyphicons .. Comment out Bootstrap glyphicons This was causing some browsers to preload nonexistent fonts. Change-Id: Ibfd11372c2083d88a647511fe8202fe00850e43d --- M worldpay_gateway/forms/css/bootstrap.css 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Ejegg: Looks good to me, approved jenkins-bot: Verified diff --git a/worldpay_gateway/forms/css/bootstrap.css b/worldpay_gateway/forms/css/bootstrap.css index 377dff3..69b4757 100755 --- a/worldpay_gateway/forms/css/bootstrap.css +++ b/worldpay_gateway/forms/css/bootstrap.css @@ -2679,6 +2679,7 @@ transition: height 0.35s ease; } +/* @font-face { font-family: 'Glyphicons Halflings'; src: url('../fonts/glyphicons-halflings-regular.eot'); @@ -2700,6 +2701,7 @@ .glyphicon:empty { width: 1em; } +*/ .glyphicon-asterisk:before { content: \2a; -- To view, visit https://gerrit.wikimedia.org/r/176030 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibfd11372c2083d88a647511fe8202fe00850e43d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Awight awi...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Ssmith ssm...@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 a monotonic clock implementation - change (mediawiki...EventLogging)
jenkins-bot has submitted this change and it was merged. Change subject: Add a monotonic clock implementation .. Add a monotonic clock implementation I needed a monotonic clock for a change I wanted to make to PeriodicThread. Python 3.3 introduced `time.monotonic`, but there's nothing equivalent for earlier versions of Python. So I set out to write a fallback implementation. One thing led to another, and I ended up with a small, self-standing library, which I published to GitHub and PyPI: - https://github.com/atdt/monotonic - https://pypi.python.org/pypi/monotonic So now there's the question of how to integrate it with EventLogging. We could treat it like a normal external dependency, but that's a lot of inconvenience for a library that fits in a single file and of which I am the primary author. So I decided to just bundle it here instead. Change-Id: If6166d2353f51d30a447b0a6405dbe8871431502 --- M server/eventlogging/compat.py A server/eventlogging/lib/__init__.py A server/eventlogging/lib/monotonic.py M server/tests/test_compat.py 4 files changed, 147 insertions(+), 2 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/server/eventlogging/compat.py b/server/eventlogging/compat.py index e85da14..608bc42 100644 --- a/server/eventlogging/compat.py +++ b/server/eventlogging/compat.py @@ -14,12 +14,22 @@ # pylint: disable=E0611, F0401, E1101 from __future__ import unicode_literals +import ctypes +import ctypes.util import functools import hashlib import operator import sys +import time import uuid +import warnings +try: +from .lib.monotonic import monotonic as monotonic_clock +except ImportError: +warnings.warn('Using non-monotonic time.time() as last-resort fallback ' + 'for eventlogging.monotonic_clock()', RuntimeWarning) +monotonic_clock = time.time try: import simplejson as json @@ -27,9 +37,11 @@ import json -__all__ = ('http_get', 'items', 'json', 'unquote_plus', 'urisplit', - 'urlopen', 'uuid5') +__all__ = ('http_get', 'items', 'json', 'monotonic_clock', 'unquote_plus', + 'urisplit', 'urlopen', 'uuid5') +LIBC = ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True) +CLOCK_MONOTONIC_RAW = 4 PY3 = sys.version_info[0] == 3 if PY3: diff --git a/server/eventlogging/lib/__init__.py b/server/eventlogging/lib/__init__.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/server/eventlogging/lib/__init__.py diff --git a/server/eventlogging/lib/monotonic.py b/server/eventlogging/lib/monotonic.py new file mode 100644 index 000..d6dff9f --- /dev/null +++ b/server/eventlogging/lib/monotonic.py @@ -0,0 +1,120 @@ +# -*- coding: utf-8 -*- + + monotonic + ~ + + This module provides a ``monotonic()`` function which returns the + value (in fractional seconds) of a clock which never goes backwards. + + On Python 3.3 or newer, ``monotonic`` will be an alias of + ``time.monotonic`` from the standard library. On older versions, + it will fall back to an equivalent implementation: + + +-++ + | Linux, BSD | clock_gettime(3) | + +-++ + | Windows | GetTickCount64 | + +-++ + | OS X| mach_absolute_time | + +-++ + + If no suitable implementation exists for the current platform, + attempting to import this module (or to import from it) will + cause a RuntimeError exception to be raised. + + + Copyright 2014 Ori Livneh o...@wikimedia.org + + Licensed under the Apache License, Version 2.0 (the License); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +from __future__ import absolute_import, division + +import ctypes +import ctypes.util +import os +import sys +import time + + +__all__ = ('monotonic',) + +try: +monotonic = time.monotonic +except AttributeError: +try: +if sys.platform == 'darwin': # OS X, iOS +# See Technical QA QA1398 of the Mac Developer Library: +# https://developer.apple.com/library/mac/qa/qa1398/ +libc = ctypes.CDLL('libc.dylib', use_errno=True) + +class mach_timebase_info_data_t(ctypes.Structure): +System timebase info. Defined in mach/mach_time.h. +_fields_ = (('numer', ctypes.c_uint32), +('denom', ctypes.c_uint32)) + +mach_absolute_time =
[MediaWiki-commits] [Gerrit] Add missing visibility keywords to all LoadBalancer methods - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add missing visibility keywords to all LoadBalancer methods .. Add missing visibility keywords to all LoadBalancer methods Quite a few methods are unused, at least in my code base (which does not cover all extensions). I made them public. All other decisions are based on the usage of that method in my code base. If you think a specific method should be public, please tell me. Change-Id: Ie83a2921fe02a198bd75c5ff7a41bcd4f0b4980b --- M includes/db/LBFactory.php M includes/db/LBFactoryMulti.php M includes/db/LBFactorySingle.php M includes/db/LoadBalancer.php 4 files changed, 113 insertions(+), 121 deletions(-) Approvals: Aaron Schulz: Looks good to me, approved Thiemo Mättig (WMDE): Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/includes/db/LBFactory.php b/includes/db/LBFactory.php index 2f93ce7..e049a5d 100644 --- a/includes/db/LBFactory.php +++ b/includes/db/LBFactory.php @@ -27,7 +27,7 @@ */ abstract class LBFactory { /** @var LBFactory */ - protected static $instance; + private static $instance; /** * Disables all access to the load balancer, will cause all database access @@ -43,7 +43,7 @@ * * @return LBFactory */ - static function singleton() { + public static function singleton() { global $wgLBFactoryConf; if ( is_null( self::$instance ) ) { @@ -87,7 +87,7 @@ /** * Shut down, close connections and destroy the cached instance. */ - static function destroyInstance() { + public static function destroyInstance() { if ( self::$instance ) { self::$instance-shutdown(); self::$instance-forEachLBCallMethod( 'closeAll' ); @@ -100,7 +100,7 @@ * * @param LBFactory $instance */ - static function setInstance( $instance ) { + public static function setInstance( $instance ) { self::destroyInstance(); self::$instance = $instance; } @@ -109,7 +109,7 @@ * Construct a factory based on a configuration array (typically from $wgLBFactoryConf) * @param array $conf */ - abstract function __construct( array $conf ); + public abstract function __construct( array $conf ); /** * Create a new load balancer object. The resulting object will be untracked, @@ -118,7 +118,7 @@ * @param bool|string $wiki Wiki ID, or false for the current wiki * @return LoadBalancer */ - abstract function newMainLB( $wiki = false ); + public abstract function newMainLB( $wiki = false ); /** * Get a cached (tracked) load balancer object. @@ -126,7 +126,7 @@ * @param bool|string $wiki Wiki ID, or false for the current wiki * @return LoadBalancer */ - abstract function getMainLB( $wiki = false ); + public abstract function getMainLB( $wiki = false ); /** * Create a new load balancer for external storage. The resulting object will be @@ -137,7 +137,7 @@ * @param bool|string $wiki Wiki ID, or false for the current wiki * @return LoadBalancer */ - abstract function newExternalLB( $cluster, $wiki = false ); + protected abstract function newExternalLB( $cluster, $wiki = false ); /** * Get a cached (tracked) load balancer for external storage @@ -146,7 +146,7 @@ * @param bool|string $wiki Wiki ID, or false for the current wiki * @return LoadBalancer */ - abstract function getExternalLB( $cluster, $wiki = false ); + public abstract function getExternalLB( $cluster, $wiki = false ); /** * Execute a function for each tracked load balancer @@ -156,13 +156,13 @@ * @param callable $callback * @param array $params */ - abstract function forEachLB( $callback, array $params = array() ); + public abstract function forEachLB( $callback, array $params = array() ); /** * Prepare all tracked load balancers for shutdown * STUB */ - function shutdown() { + public function shutdown() { } /** @@ -171,24 +171,16 @@ * @param string $methodName * @param array $args */ - function forEachLBCallMethod( $methodName, array $args = array() ) { - $this-forEachLB( array( $this, 'callMethod' ), array( $methodName, $args ) ); - } - - /** -* Private helper for forEachLBCallMethod -* @param LoadBalancer $loadBalancer -* @param string $methodName -* @param array $args -*/ - function callMethod( $loadBalancer,
[MediaWiki-commits] [Gerrit] Clean up some stray bits from 2108ecc - change (mediawiki...EventLogging)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/176490 Change subject: Clean up some stray bits from 2108ecc .. Clean up some stray bits from 2108ecc Change-Id: Ic3e24bf8eb1e39a394b081179006875f7a1cfe64 --- M server/eventlogging/compat.py 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging refs/changes/90/176490/1 diff --git a/server/eventlogging/compat.py b/server/eventlogging/compat.py index 608bc42..d087f31 100644 --- a/server/eventlogging/compat.py +++ b/server/eventlogging/compat.py @@ -14,8 +14,6 @@ # pylint: disable=E0611, F0401, E1101 from __future__ import unicode_literals -import ctypes -import ctypes.util import functools import hashlib import operator @@ -40,8 +38,6 @@ __all__ = ('http_get', 'items', 'json', 'monotonic_clock', 'unquote_plus', 'urisplit', 'urlopen', 'uuid5') -LIBC = ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True) -CLOCK_MONOTONIC_RAW = 4 PY3 = sys.version_info[0] == 3 if PY3: -- To view, visit https://gerrit.wikimedia.org/r/176490 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic3e24bf8eb1e39a394b081179006875f7a1cfe64 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/EventLogging Gerrit-Branch: master Gerrit-Owner: Ori.livneh o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clean up some stray bits from 2108ecc - change (mediawiki...EventLogging)
jenkins-bot has submitted this change and it was merged. Change subject: Clean up some stray bits from 2108ecc .. Clean up some stray bits from 2108ecc Change-Id: Ic3e24bf8eb1e39a394b081179006875f7a1cfe64 --- M server/eventlogging/compat.py 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/server/eventlogging/compat.py b/server/eventlogging/compat.py index 608bc42..d087f31 100644 --- a/server/eventlogging/compat.py +++ b/server/eventlogging/compat.py @@ -14,8 +14,6 @@ # pylint: disable=E0611, F0401, E1101 from __future__ import unicode_literals -import ctypes -import ctypes.util import functools import hashlib import operator @@ -40,8 +38,6 @@ __all__ = ('http_get', 'items', 'json', 'monotonic_clock', 'unquote_plus', 'urisplit', 'urlopen', 'uuid5') -LIBC = ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True) -CLOCK_MONOTONIC_RAW = 4 PY3 = sys.version_info[0] == 3 if PY3: -- To view, visit https://gerrit.wikimedia.org/r/176490 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic3e24bf8eb1e39a394b081179006875f7a1cfe64 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/EventLogging Gerrit-Branch: master Gerrit-Owner: Ori.livneh o...@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] Make PeriodicThread more regular - change (mediawiki...EventLogging)
jenkins-bot has submitted this change and it was merged. Change subject: Make PeriodicThread more regular .. Make PeriodicThread more regular Right now, PeriodicThread will sleep the full duration of the interval regardless of how long the target function takes to complete. This can make the queue back up precipitously during high load. Mitigate this by subtracting the run-time of the target function from the sleep interval. Change-Id: Ib746a2571ea25058de49caeae9aad83ec4c32157 --- M server/eventlogging/utils.py 1 file changed, 17 insertions(+), 3 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/server/eventlogging/utils.py b/server/eventlogging/utils.py index 5fcc5fe..8c441ad 100644 --- a/server/eventlogging/utils.py +++ b/server/eventlogging/utils.py @@ -12,12 +12,14 @@ import re import threading +from .compat import monotonic_clock + __all__ = ('PeriodicThread', 'uri_delete_query_item') class PeriodicThread(threading.Thread): -Represents a threaded job that runs repeatedly at regular intervals. +Represents a threaded job that runs repeatedly at a regular interval. def __init__(self, interval, *args, **kwargs): self.interval = interval @@ -27,12 +29,24 @@ def run(self): while not self.stopping.is_set(): -if self.ready.wait(self.interval): +# Run the target function. Check the clock before +# and after to determine how long it took to run. +time_start = monotonic_clock() +self._Thread__target(*self._Thread__args, **self._Thread__kwargs) +time_stop = monotonic_clock() + +run_duration = time_stop - time_start + +# Subtract the time it took the target function to run +# from the desired run interval. The result is how long +# we have to sleep before the next run. +time_to_next_run = self.interval - run_duration + +if self.ready.wait(time_to_next_run): # If the internal flag of `self.ready` was set, we were # interrupted mid-nap to run immediately. But before we # do, we reset the flag. self.ready.clear() -self._Thread__target(*self._Thread__args, **self._Thread__kwargs) def stop(self): Graceful stop: stop once the current iteration is complete. -- To view, visit https://gerrit.wikimedia.org/r/175322 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib746a2571ea25058de49caeae9aad83ec4c32157 Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/extensions/EventLogging Gerrit-Branch: master Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Nuria nu...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: QChris christ...@quelltextlich.at Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jobqueue: switch redis server due to outage - change (operations/mediawiki-config)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/176492 Change subject: jobqueue: switch redis server due to outage .. jobqueue: switch redis server due to outage Change-Id: Ic5a38965b242523cd4e31fdfbfdd8c1c937e996f Signed-off-by: joe j...@autistici.org --- M wmf-config/jobqueue-eqiad.php 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/92/176492/1 diff --git a/wmf-config/jobqueue-eqiad.php b/wmf-config/jobqueue-eqiad.php index cce7f24..fcf333b 100644 --- a/wmf-config/jobqueue-eqiad.php +++ b/wmf-config/jobqueue-eqiad.php @@ -7,8 +7,8 @@ 'configByPartition' = array( 'rdb1' = array( 'class' = 'JobQueueRedis', - 'redisServer' = '10.64.32.76', # rdb1001 (master) - #'redisServer' = '10.64.32.77', # rdb1002 (slave) + #'redisServer' = '10.64.32.76', # rdb1001 (master) + 'redisServer' = '10.64.32.77', # rdb1002 (slave) 'redisConfig' = array( 'connectTimeout' = 2, 'password' = $wmgRedisPassword, @@ -45,4 +45,3 @@ 'password' = $wmgRedisPassword, ) ); - -- To view, visit https://gerrit.wikimedia.org/r/176492 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic5a38965b242523cd4e31fdfbfdd8c1c937e996f Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jobqueue: switch redis server due to outage - change (operations/mediawiki-config)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: jobqueue: switch redis server due to outage .. jobqueue: switch redis server due to outage Change-Id: Ic5a38965b242523cd4e31fdfbfdd8c1c937e996f Signed-off-by: joe j...@autistici.org --- M wmf-config/jobqueue-eqiad.php 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved BBlack: Looks good to me, but someone else must approve diff --git a/wmf-config/jobqueue-eqiad.php b/wmf-config/jobqueue-eqiad.php index cce7f24..fcf333b 100644 --- a/wmf-config/jobqueue-eqiad.php +++ b/wmf-config/jobqueue-eqiad.php @@ -7,8 +7,8 @@ 'configByPartition' = array( 'rdb1' = array( 'class' = 'JobQueueRedis', - 'redisServer' = '10.64.32.76', # rdb1001 (master) - #'redisServer' = '10.64.32.77', # rdb1002 (slave) + #'redisServer' = '10.64.32.76', # rdb1001 (master) + 'redisServer' = '10.64.32.77', # rdb1002 (slave) 'redisConfig' = array( 'connectTimeout' = 2, 'password' = $wmgRedisPassword, @@ -45,4 +45,3 @@ 'password' = $wmgRedisPassword, ) ); - -- To view, visit https://gerrit.wikimedia.org/r/176492 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic5a38965b242523cd4e31fdfbfdd8c1c937e996f Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits