[MediaWiki-commits] [Gerrit] Parser for CLDR data -- into PHP for Twig - change (wikimedia...tools)

2013-03-14 Thread Mwalker (Code Review) 
Mwalker has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53722


Change subject: Parser for CLDR data -- into PHP for Twig
..

Parser for CLDR data -- into PHP for Twig

The initial L10n filter extension for twig consumes CLDR data.
This gets it into the correct format.

Change-Id: I676f8281ec823d5f08a05ad049d99a892870c960
---
A CldrParser/CldrParser.py
1 file changed, 287 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/22/53722/1

diff --git a/CldrParser/CldrParser.py b/CldrParser/CldrParser.py
new file mode 100644
index 000..09edf20
--- /dev/null
+++ b/CldrParser/CldrParser.py
@@ -0,0 +1,287 @@
+#!/usr/bin/python3
+# coding=utf-8
+
+
+Generate a PHP file with Locale data in it from CLDR data. Run with --help for 
all options.
+
+
+from optparse import OptionParser
+import xml.etree.ElementTree as ET
+import os
+import codecs
+
+
+def parseCLDR(cldr_path):
+Parse CLDR XML files into currency and locale data
+Returns a set of: (
+cldr date
+{currencyIso: {digits, rounding}},
+{locale: {positive_currency_str, negative_currency_str, grouping: []}}
+{locale: {group_char, decimal_char}}
+)
+
+In the currency strings: $1 is the symbol, $2 is the formatted number
+If the group_char is '', there is no grouping
+In grouping, if there is multiple elements then the apply the groups from 
the decimal point forwards
+
+
+# === Obtain currency data information (digits, rounding)
+currencyData = {}
+supData = ET.parse(cldr_path + 
'supplemental/supplementalData.xml').getroot()
+
+for child in supData.findall(./currencyData/fractions/*):
+code = child.attrib['iso4217']
+digits = int(child.attrib['digits'])
+rounding = int(child.attrib['rounding'])
+
+if code == 'DEFAULT':
+# Check some assumptions
+if digits != 2 and rounding != 0:
+print(Assumptions did not hold on currency data default 
digits and rounding!)
+exit(1)
+else:
+currencyData[code] = {'digits': digits, 'rounding': rounding}
+
+# --- Get the CLDR version/date
+cldrVersion = supData.find(./version).attrib['number'] +  -  + 
supData.find(./generation).attrib['date']
+
+# === Now, for each locale... ===
+localeNumericFormat = {}
+localeSymbols = {}
+
+for filename in os.listdir(cldr_path + 'main/'):
+locale = filename[:-4]
+data = ET.parse(cldr_path + main/%s % filename).getroot()
+
+# --- ... information on the symbols used ---
+decimalChar = 
data.find(./numbers/symbols[@numberSystem='latn']/decimal)
+groupChar = data.find(./numbers/symbols[@numberSystem='latn']/group)
+
+if decimalChar is not None and groupChar is not None:
+localeSymbols[locale] = {'decimal_char': decimalChar.text, 
'group_char': groupChar.text}
+elif decimalChar is not None:
+localeSymbols[locale] = {'decimal_char': decimalChar.text, 
'group_char': ','}
+elif groupChar is not None:
+localeSymbols[locale] = {'decimal_char': '.', 'group_char': 
groupChar.text}
+
+# --- ... information on number and currency formatting ---
+patternNode = data.find(
+
./numbers/currencyFormats[@numberSystem='latn']/currencyFormatLength/currencyFormat/pattern
+)
+if patternNode is not None:
+pattern = patternNode.text
+if len(pattern.split(';')) == 2:
+localeNumericFormat[locale] = extractNumericLocale(locale, 
pattern.split(';')[0], pattern.split(';')[1])
+else:
+localeNumericFormat[locale] = extractNumericLocale(locale, 
pattern)
+
+return cldrVersion, currencyData, localeNumericFormat, localeSymbols
+
+
+def extractNumericLocale(locale, pPattern, nPattern=None):
+Extract grouping char, decimal char, digit grouping, positive, and 
negative format strings from a pattern
+pPattern -- the positive pattern
+nPattern -- the negative pattern if given
+
+# Replace a unicode character with something more MediaWiki
+pPattern = pPattern.replace('¤', '$1')
+if nPattern is not None:
+nPattern = nPattern.replace('¤', '$1')
+
+# Work from the positive pattern first; these come in like ¤ #,##,##0.00 
where ¤ is the currency symbol
+# Find the start and end of the numeric pattern -- this seems to always 
start with # and end with 0
+# We know that , and . are placeholders that should always exist
+start = pPattern.find('#')
+end = pPattern.rfind('0')
+
+# Find the decimal char
+decimalLoc = pPattern.find('.')
+if decimalLoc == -1:
+# The assumption being it has one...
+print(Locale %s breaks the decimal separator assumption! Pattern: %s 
% (locale, pPattern))
+

[MediaWiki-commits] [Gerrit] Defaults: Also add ansicolor to global.wrappers - change (integration/jenkins-job-builder-config)

2013-03-14 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53723


Change subject: Defaults: Also add ansicolor to global.wrappers
..

Defaults: Also add ansicolor to global.wrappers

Since defaults don't inherit from each other we have to manually
keep them in sync where appropiate.

Change-Id: I5a37aeaa72fe51ef1edb58abce96fe4a0c605aec
---
M defaults.yaml
1 file changed, 6 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/23/53723/1

diff --git a/defaults.yaml b/defaults.yaml
index c83e460..681e6f8 100644
--- a/defaults.yaml
+++ b/defaults.yaml
@@ -1,7 +1,7 @@
 - defaults:
 name: global
 description: |
-  pbJob is managed by Jenkins job builder/b/p
+  pJob is managed by a 
href=https://www.mediawiki.org/wiki/CI/JJB;Jenkins Job Builder/a./p
 
 project-type: freestyle
 
@@ -10,13 +10,14 @@
   timeout: 360
   fail: true
   - timestamps
+  - ansicolor
 
 - defaults:
 name: use-zuul
-#defaults: global
+# defaults: global
 
 description: |
-  pbJob is managed by Jenkins job builder/b/p
+  pJob is managed by a 
href=https://www.mediawiki.org/wiki/CI/JJB;Jenkins Job Builder/a./p
   pThis job is triggered by Zuul/p
 
 project-type: freestyle
@@ -37,10 +38,10 @@
 
 - defaults:
 name: use-zuul-for-mw-ext
-#defaults: global
+# defaults: global
 
 description: |
-  pbJob is managed by Jenkins job builder/b/p
+  pJob is managed by a 
href=https://www.mediawiki.org/wiki/CI/JJB;Jenkins Job Builder/a./p
   pThis job is triggered by Zuul/p
 
 project-type: freestyle

-- 
To view, visit https://gerrit.wikimedia.org/r/53723
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a37aeaa72fe51ef1edb58abce96fe4a0c605aec
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Defaults: Also add ansicolor to global.wrappers - change (integration/jenkins-job-builder-config)

2013-03-14 Thread Krinkle (Code Review) 
Krinkle has submitted this change and it was merged.

Change subject: Defaults: Also add ansicolor to global.wrappers
..


Defaults: Also add ansicolor to global.wrappers

Since defaults don't inherit from each other we have to manually
keep them in sync where appropiate.

Change-Id: I5a37aeaa72fe51ef1edb58abce96fe4a0c605aec
---
M defaults.yaml
1 file changed, 6 insertions(+), 5 deletions(-)

Approvals:
  Krinkle: Verified; Looks good to me, approved



diff --git a/defaults.yaml b/defaults.yaml
index c83e460..681e6f8 100644
--- a/defaults.yaml
+++ b/defaults.yaml
@@ -1,7 +1,7 @@
 - defaults:
 name: global
 description: |
-  pbJob is managed by Jenkins job builder/b/p
+  pJob is managed by a 
href=https://www.mediawiki.org/wiki/CI/JJB;Jenkins Job Builder/a./p
 
 project-type: freestyle
 
@@ -10,13 +10,14 @@
   timeout: 360
   fail: true
   - timestamps
+  - ansicolor
 
 - defaults:
 name: use-zuul
-#defaults: global
+# defaults: global
 
 description: |
-  pbJob is managed by Jenkins job builder/b/p
+  pJob is managed by a 
href=https://www.mediawiki.org/wiki/CI/JJB;Jenkins Job Builder/a./p
   pThis job is triggered by Zuul/p
 
 project-type: freestyle
@@ -37,10 +38,10 @@
 
 - defaults:
 name: use-zuul-for-mw-ext
-#defaults: global
+# defaults: global
 
 description: |
-  pbJob is managed by Jenkins job builder/b/p
+  pJob is managed by a 
href=https://www.mediawiki.org/wiki/CI/JJB;Jenkins Job Builder/a./p
   pThis job is triggered by Zuul/p
 
 project-type: freestyle

-- 
To view, visit https://gerrit.wikimedia.org/r/53723
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a37aeaa72fe51ef1edb58abce96fe4a0c605aec
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
Gerrit-Reviewer: Krinkle ttij...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] doc/configuration: Fix incorrect name defaults - change (integration/jenkins-job-builder)

2013-03-14 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53724


Change subject: doc/configuration: Fix incorrect name defaults
..

doc/configuration: Fix incorrect name defaults

See YamlParser#applyDefaults in builder.py.

Change-Id: I763d23608b79f7b1c560ae41cf5ca0d2dcc19d60
---
M doc/source/configuration.rst
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder 
refs/changes/24/53724/1

diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index 01fd2ae..5c1bdc5 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -269,7 +269,7 @@
 the 'Job'_ definition.  If a set of Defaults is specified with the
 name ``global``, that will be used by all `Job`_ (and `Job Template`_)
 definitions unless they specify a different Default object with the
-``default`` attribute.  For example::
+``defaults`` attribute.  For example::
 
   - defaults:
   name: global

-- 
To view, visit https://gerrit.wikimedia.org/r/53724
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I763d23608b79f7b1c560ae41cf5ca0d2dcc19d60
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove suggestions and other unused tasks - change (mediawiki...Translate)

2013-03-14 Thread Nikerabbit (Code Review) 
Nikerabbit has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53725


Change subject: Remove suggestions and other unused tasks
..

Remove suggestions and other unused tasks

Change-Id: Ic89b7cad4418d2b561e51ec9bea3ad4ab5731698
---
M Translate.i18n.php
M Translate.php
M TranslateTasks.php
M _autoload.php
M specials/SpecialTranslate.php
5 files changed, 3 insertions(+), 71 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/25/53725/1

diff --git a/Translate.i18n.php b/Translate.i18n.php
index 184a988..9ee181a 100644
--- a/Translate.i18n.php
+++ b/Translate.i18n.php
@@ -21,7 +21,6 @@
'translate-taskui-view' = 'Show all messages',
'translate-taskui-untranslated' = 'Show untranslated messages',
'translate-taskui-optional' = 'Show optional messages',
-   'translate-taskui-suggestions' = 'Show messages with suggestions from 
translation memory',
'translate-taskui-acceptqueue' = 'Only messages I can accept',
'translate-taskui-reviewall' = 'Review all translations',
'translate-taskui-export-to-file' = 'Export in native format',
diff --git a/Translate.php b/Translate.php
index 8e9cb83..f85a3b5 100644
--- a/Translate.php
+++ b/Translate.php
@@ -610,9 +610,6 @@
'view' = 'ViewMessagesTask',
'untranslated' = 'ViewUntranslatedTask',
'optional' = 'ViewOptionalTask',
-   'suggestions' = 'ViewWithSuggestionsTask',
-// 'untranslatedoptional' = 'ViewUntranslatedOptionalTask',
-// 'review'   = 'ReviewMessagesTask',
'acceptqueue' = 'AcceptQueueMessagesTask',
'reviewall' = 'ReviewAllMessagesTask',
'export-as-po' = 'ExportasPoMessagesTask',
diff --git a/TranslateTasks.php b/TranslateTasks.php
index 53cda3b..74e6565 100644
--- a/TranslateTasks.php
+++ b/TranslateTasks.php
@@ -246,61 +246,6 @@
 }
 
 /**
- * Lists messages with good translation memory suggestions.
- * The number of results is limited by the speed of translation memory.
- */
-class ViewWithSuggestionsTask extends ViewMessagesTask {
-   protected $id = 'suggestions';
-
-   protected function preinit() {
-   $code = $this-options['language'];
-   $sourceLanguage = $this-group-getSourceLanguage();
-
-   $this-collection = $this-group-initCollection( $code );
-   $this-collection-filter( 'ignored' );
-   $this-collection-filter( 'optional' );
-   $this-collection-filter( 'translated' );
-   $this-collection-filter( 'fuzzy' );
-   $this-collection-loadTranslations();
-
-   $start = time();
-
-   foreach ( $this-collection-getMessageKeys() as $key ) {
-   // Allow up to 10 seconds to search for suggestions.
-   if ( time() - $start  10 ) {
-   unset( $this-collection[$key] );
-   continue;
-   }
-
-   $definition = $this-collection[$key]-definition();
-   $suggestions = TTMServer::primary()-query( 
$sourceLanguage, $code, $definition );
-   foreach ( $suggestions as $s ) {
-   // We have a good suggestion, do not filter.
-   if ( $s['quality']  0.80 ) {
-   continue 2;
-   }
-   }
-   unset( $this-collection[$key] );
-   }
-   }
-}
-
-/**
- * Lists untranslated optional messages.
- */
-class ViewUntranslatedOptionalTask extends ViewOptionalTask {
-   protected $id = 'untranslatedoptional';
-
-   protected function preinit() {
-   $code = $this-options['language'];
-   $this-collection = $this-group-initCollection( $code );
-   $this-collection-filter( 'ignored' );
-   $this-collection-filter( 'optional', false );
-   $this-collection-filter( 'translated' );
-   }
-}
-
-/**
  * Lists all translations for reviewing.
  */
 class ReviewAllMessagesTask extends ReviewMessagesTask {
@@ -446,7 +391,6 @@
// Tasks not to be available in page translation.
$filterTasks = array(
'optional',
-   'untranslatedoptional',
'export-to-file',
);
 
@@ -454,10 +398,6 @@
 
if ( $pageTranslation ) {
$allTasks = array_diff( $allTasks, $filterTasks );
-   }
-
-   if ( !isset( $wgTranslateTranslationServices['tmserver'] ) ) {
-   unset( $allTasks['suggestions'] );
}
 
return $allTasks;
diff --git a/_autoload.php b/_autoload.php
index b8be167..7d3dec0 100644
---

[MediaWiki-commits] [Gerrit] Fixes for Monobook button issue - change (mediawiki...Translate)

2013-03-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fixes for Monobook button issue
..


Fixes for Monobook button issue

Monobook CSS was conflicting with the action bar buttons.
Two CSS rules have been added to avoid these values to be modified by
skin specific CSS rules.

Change-Id: Iaf2f2e1a5d0f97d72f7b797f2b208b44476177c6
---
M resources/css/ext.translate.messagetable.css
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/css/ext.translate.messagetable.css 
b/resources/css/ext.translate.messagetable.css
index 82d8070..b136c2f 100644
--- a/resources/css/ext.translate.messagetable.css
+++ b/resources/css/ext.translate.messagetable.css
@@ -208,6 +208,8 @@
vertical-align: middle;
border-radius: 0;
text-shadow: none;
+   margin: 0;
+   text-indent: 0;
 }
 
 .tux-action-bar .tux-view-switcher {

-- 
To view, visit https://gerrit.wikimedia.org/r/53613
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf2f2e1a5d0f97d72f7b797f2b208b44476177c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@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] [Scribunto] Update tag to ignore - change (translatewiki)

2013-03-14 Thread Raimond Spekking (Code Review) 
Raimond Spekking has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53726


Change subject: [Scribunto] Update tag to ignore
..

[Scribunto] Update tag to ignore

https://gerrit.wikimedia.org/r/#/c/52875/5/Scribunto.i18n.php,unified

Change-Id: I5e834d67b413227ebfa605905703c000f3d52242
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/26/53726/1

diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index 7e0ac38..52066f3 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -1123,7 +1123,7 @@
 Scribunto
 magicfile = Scribunto/Scribunto.magic.php
 optional = scribunto-lua-backtrace-line
-ignored = scribunto-doc-subpage-show
+ignored = scribunto-doc-page-show
 
 Search Extra NS
 

-- 
To view, visit https://gerrit.wikimedia.org/r/53726
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e834d67b413227ebfa605905703c000f3d52242
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] [ArticleFeedbackv5] Add new message keys to ignore - change (translatewiki)

2013-03-14 Thread Raimond Spekking (Code Review) 
Raimond Spekking has submitted this change and it was merged.

Change subject: [ArticleFeedbackv5] Add new message keys to ignore
..


[ArticleFeedbackv5] Add new message keys to ignore

https://gerrit.wikimedia.org/r/#/c/52652/6/ArticleFeedbackv5.i18n.php,unified

Change-Id: Ic101c3a5c5556e17c4fd27e7380e140c4f1958c0
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index 52066f3..a2fb0d5 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -69,7 +69,7 @@
 ignored=articlefeedbackv5-noteflyover-requestoversight-help-link, 
articlefeedbackv5-noteflyover-resolve-help-link, 
articlefeedbackv5-noteflyover-show-help-link, 
articlefeedbackv5-noteflyover-unfeature-help-link
 ignored=articlefeedbackv5-noteflyover-unoversight-help-link, 
articlefeedbackv5-noteflyover-unrequestoversight-help-link, 
articlefeedbackv5-noteflyover-unresolve-help-link, 
articlefeedbackv5-pitch-edit-body
 ignored=articlefeedbackv5-pitch-survey-body, 
articlefeedbackv5-special-filter-label-after, 
articlefeedbackv5-special-sort-label-after
-ignored=articlefeedbackv5-cta6-button-link
+ignored=articlefeedbackv5-cta6-button-link, 
articlefeedbackv5-noteflyover-inappropriate-description, 
articlefeedbackv5-noteflyover-uninappropriate-description
 
 Ask
 

-- 
To view, visit https://gerrit.wikimedia.org/r/53727
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic101c3a5c5556e17c4fd27e7380e140c4f1958c0
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Raimond Spekking raimond.spekk...@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] Fix unclosed div in TUX mode - change (mediawiki...Translate)

2013-03-14 Thread Nikerabbit (Code Review) 
Nikerabbit has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53728


Change subject: Fix unclosed div in TUX mode
..

Fix unclosed div in TUX mode

Also changed the mix of raw html and Html:: functions
to use only one way at a time (this should be moved
to JS anyway)

Bug: 46077
Change-Id: Iadd6f097a828b157333761cbac53e9c16c0a8da3
---
M resources/js/ext.translate.special.translate.js
M utils/TuxMessageTable.php
2 files changed, 42 insertions(+), 56 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/28/53728/1

diff --git a/resources/js/ext.translate.special.translate.js 
b/resources/js/ext.translate.special.translate.js
index dd1259a..06c8aba 100644
--- a/resources/js/ext.translate.special.translate.js
+++ b/resources/js/ext.translate.special.translate.js
@@ -347,6 +347,10 @@
 
$translateContainer = $( '.ext-translate-container' );
 
+   if ( mw.translate.canProofread() ) {
+   $translateContainer.find( '.tux-proofread-button' 
).removeClass( 'hide' );
+   }
+
$hideTranslatedButton = $translateContainer.find( 
'.tux-editor-clear-translated' );
$hideTranslatedButton
.prop( 'disabled', !getTranslatedMessages( 
$translateContainer ).length )
diff --git a/utils/TuxMessageTable.php b/utils/TuxMessageTable.php
index 99b6f47..7192bba 100644
--- a/utils/TuxMessageTable.php
+++ b/utils/TuxMessageTable.php
@@ -9,78 +9,60 @@
$this-group = $group;
$this-language = $language;
}
+   public function fullTable() {
+   $modules = array( 'ext.translate.editor' );
+   wfRunHooks( 'TranslateBeforeAddModules', array( $modules ) );
+   $this-getOutput()-addModules( $modules );
 
-   public function header() {
$sourceLang = Language::factory( 
$this-group-getSourceLanguage() );
$targetLang = Language::factory( $this-language );
+   $batchSize = 100;
 
-   return Xml::openElement( 'div', array(
+   $list = Html::element( 'div', array(
'class' = 'row tux-messagelist',
'data-sourcelangcode' = $sourceLang-getCode(),
'data-sourcelangdir' = $sourceLang-getDir(),
'data-targetlangcode' = $targetLang-getCode(),
'data-targetlangdir' = $targetLang-getDir(),
) );
-   }
 
-   public function fullTable() {
-   $modules = array( 'ext.translate.editor' );
-   wfRunHooks( 'TranslateBeforeAddModules', array( $modules ) );
-   $this-getOutput()-addModules( $modules );
+   $groupId = htmlspecialchars( $this-group-getId() );
+   $msg = $this-msg( 'tux-messagetable-loading-messages' )
+   -numParams( $batchSize )
+   -escaped();
 
-   $batchSize = 100;
+   $loader = HTML
+div class=tux-messagetable-loader hide data-messagegroup=$groupId 
data-pagesize=$batchSize
+   span class=tux-loading-indicator/span
+   div class=tux-messagetable-loader-count/div
+   div class=tux-messagetable-loader-more$msg/div
+/div
+HTML;
 
-   $footer = Html::openElement( 'div',
-   array(
-   'class' = 'tux-messagetable-loader hide',
-   'data-messagegroup' = $this-group-getId(),
-   'data-pagesize' = $batchSize,
-   ) )
-   . 'span class=tux-loading-indicator/span'
-   . 'div class=tux-messagetable-loader-count/div'
-   . 'div class=tux-messagetable-loader-more'
-   . $this-msg( 'tux-messagetable-loading-messages' 
)-numParams( $batchSize )-escaped()
-   . '/div'
-   . Html::closeElement( 'div' );
+   $hideOwn = $this-msg( 
'tux-editor-proofreading-hide-own-translations' )-escaped();
+   $clearTranslated = $this-msg( 'tux-editor-clear-translated' 
)-escaped();
+   $modeTranslate = $this-msg( 'tux-editor-translate-mode' 
)-escaped();
+   $modePage = $this-msg( 'tux-editor-page-mode' )-escaped();
+   $modeProofread = $this-msg( 'tux-editor-proofreading-mode' 
)-escaped();
 
-   $footer .= 'div class=tux-action-bar row'
-   . Html::element( 'div',
-   array(
-   'class' = 'three columns 
tux-message-list-statsbar',
-   'data-messagegroup' = 
$this-group-getId(),
-   ) );
-
-   // Hide this button by default and show it

[MediaWiki-commits] [Gerrit] Implement front-end of dynamic GettingStartedv2, with new lo... - change (mediawiki...GettingStarted)

2013-03-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Implement front-end of dynamic GettingStartedv2, with new 
logging.
..


Implement front-end of dynamic GettingStartedv2, with new logging.

* Add Steven's improved wording.
* Minor adjustments and documentation for Redis backend.

Change-Id: I00c639992638253e50a6931a108715070e325dbc
---
M CategoryRoulette.php
M GettingStarted.i18n.php
M GettingStarted.php
M README
M RedisCategorySync.php
M SpecialGettingStarted.php
M resources/ext.gettingstarted.openTask.js
A resources/images/question-icon-darker.png
M resources/tours/gettingstartedpage.js
9 files changed, 143 insertions(+), 65 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/CategoryRoulette.php b/CategoryRoulette.php
index 4b92961..70d0448 100644
--- a/CategoryRoulette.php
+++ b/CategoryRoulette.php
@@ -1,8 +1,7 @@
 ?php
 /**
  * Helper class for retrieving random pages from a category.
- * Requires redis 2.6. phpredis needs to be (re-)compiled against 2.6 if
- * upgrading from 2.4 to ensure SRANDMEMBER takes count parameter.
+ * See Redis requirements in README.
  *
  * Sample usage:
  * code
@@ -15,7 +14,7 @@
 class CategoryRoulette {
 
/** @var Category **/
-   var $category = null;
+   public $category = null;
 
/**
 * Constructor.
diff --git a/GettingStarted.i18n.php b/GettingStarted.i18n.php
index 696584f..11c313d 100644
--- a/GettingStarted.i18n.php
+++ b/GettingStarted.i18n.php
@@ -17,12 +17,9 @@
'gettingstarted-welcomesiteuser' = Welcome to $1, $2!,
'gettingstarted-welcomesiteuseranon' = Getting started,
'gettingstarted-welcome-back-site-user' = Welcome back, $2,
-   'gettingstarted-task-header' = We're glad you're here. Below are some 
easy ways to get started with contributing.,
+   'gettingstarted-task-header' = 'Looking for an easy way to get 
started? Just choose a page from one of the three lists below.',
'gettingstarted-return' = ← No thanks, go back to where I was,
'gettingstarted-project-link' = '{{ns:Project}}:GettingStarted',
-   'gettingstarted-task-1' = '',
-   'gettingstarted-task-2' = '',
-   'gettingstarted-task-3' = '',
// Change tags
'tag-gettingstarted_edit' = '[[Special:Tags|Tag]]: new editor 
[[{{MediaWiki:gettingstarted-project-link}}|getting started]]',
'tag-gettingstarted_edit-description' = 'Edit of a page that the user 
chose from the task list in [[Special:GettingStarted|Getting started]]',
@@ -30,12 +27,12 @@
// Tours
 
// gettingstartedpage
-   'guidedtour-tour-gettingstartedpage-copy-editing-title' = 'Copyedit',
-   'guidedtour-tour-gettingstartedpage-copy-editing-description' = 'Copy 
editing is simply improving the spelling, grammar, and style. The pages below 
are in decent shape, but some people felt they could be better. See if you can 
improve things.',
+   'guidedtour-tour-gettingstartedpage-copy-editing-title' = 'Fix grammar 
 spelling',
+   'guidedtour-tour-gettingstartedpage-copy-editing-description' = 'These 
pages are in decent shape, but some people felt they could be better. See if 
you can improve the grammar, spelling, and style.',
'guidedtour-tour-gettingstartedpage-clarification-title' = 'Improve 
clarity',
-   'guidedtour-tour-gettingstartedpage-clarification-description' = 
'Other people have marked these pages as confusing, unclear, or vague. You 
don\'t have to be an expert in the topic, just look for \'Clarification 
needed\' tags to see what needs fixing.',
-   'guidedtour-tour-gettingstartedpage-add-links-title' = 'Add links',
-   'guidedtour-tour-gettingstartedpage-add-links-description' = 'Ever 
spent hours just clicking around on {{SITENAME}}? Every link is added by hand, 
and we need your help adding some.'
+   'guidedtour-tour-gettingstartedpage-clarification-description' = 
Other people have tagged these pages as confusing, unclear, or vague. It might 
be the whole page that needs fixing, or just a sentence. You don't need to be 
an expert in the topic, just try to make things easier to understand.,
+   'guidedtour-tour-gettingstartedpage-add-links-title' = 'Link pages 
together',
+   'guidedtour-tour-gettingstartedpage-add-links-description' = Every 
link between {{SITENAME}} pages is added by hand, and these pages don't have 
enough. Just add two square brackets around key topics when you're editing, and 
it will link to the relevant {{SITENAME}} page.
 
 );
 
@@ -61,9 +58,6 @@
'gettingstarted-task-header' = 'Header above task information',
'gettingstarted-return' = 'Text of navigation button for returning to 
previous page',
'gettingstarted-project-link' = 'Name of page that describes how 
GettingStarted is used on the wiki',
-   'gettingstarted-task-1' = 'Wikitext for first

[MediaWiki-commits] [Gerrit] Move resources to separate file - change (mediawiki...Translate)

2013-03-14 Thread Nikerabbit (Code Review) 
Nikerabbit has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53729


Change subject: Move resources to separate file
..

Move resources to separate file

Translate.php was getting over 1000 lines long

Change-Id: Ie3e2fdfb820a74083e76e143b830cbb161f416be
---
A Resources.php
M Translate.php
2 files changed, 306 insertions(+), 297 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/29/53729/1

diff --git a/Resources.php b/Resources.php
new file mode 100644
index 000..dff7552
--- /dev/null
+++ b/Resources.php
@@ -0,0 +1,305 @@
+?php
+/**
+ * Javascript and CSS resource definitions.
+ *
+ * @file
+ * @license GPL2+
+ */
+
+$resourcePaths = array(
+   'localBasePath' = dirname( __FILE__ ),
+   'remoteExtPath' = 'Translate'
+);
+
+// Client-side resource modules
+
+$wgResourceModules['ext.translate.base'] = array(
+   'scripts' = 'resources/js/ext.translate.base.js',
+   'dependencies' = array(
+   'mediawiki.util',
+   'mediawiki.api',
+   ),
+) + $resourcePaths;
+
+$wgResourceModules['ext.translate'] = array(
+   'styles' = 'resources/css/ext.translate.css',
+   'position' = 'top',
+) + $resourcePaths;
+
+$wgResourceModules['ext.translate.hooks'] = array(
+   'scripts' = 'resources/js/ext.translate.hooks.js',
+   'position' = 'top',
+) + $resourcePaths;
+
+$wgResourceModules['ext.translate.helplink'] = array(
+   'styles' = 'resources/css/ext.translate.helplink.css',
+   'position' = 'top',
+) + $resourcePaths;
+
+// TODO: jquery.uls uses the same grid system. So don't duplicate
+$wgResourceModules['ext.translate.grid'] = array(
+   'styles' = 'resources/css/ext.translate.grid.css',
+   'position' = 'top',
+) + $resourcePaths;
+
+$wgResourceModules['ext.translate.editor'] = array(
+   'scripts' = array(
+   'resources/js/ext.translate.editor.js',
+   'resources/js/ext.translate.editor.helpers.js',
+   'resources/js/ext.translate.proofread.js',
+   ),
+   'styles' = array(
+   'resources/css/ext.translate.editor.css',
+   'resources/css/ext.translate.proofread.css',
+   ),
+   'dependencies' = array(
+   'ext.translate.base',
+   'ext.translate.grid',
+   'mediawiki.util',
+   'mediawiki.Uri',
+   'mediawiki.api',
+   'mediawiki.api.parse',
+   'mediawiki.user',
+   'mediawiki.jqueryMsg',
+   'jquery.makeCollapsible',
+   'jquery.tipsy',
+   ),
+   'messages' = array(
+   'tux-status-translated',
+   'tux-status-saving',
+   'tux-status-unsaved',
+   'tux-editor-placeholder',
+   'tux-editor-paste-original-button-label',
+   'tux-editor-save-button-label',
+   'tux-editor-skip-button-label',
+   'tux-editor-confirm-button-label',
+   'tux-editor-shortcut-info',
+   'tux-editor-edit-desc',
+   'tux-editor-add-desc',
+   'tux-editor-message-desc-more',
+   'tux-editor-message-desc-less',
+   'tux-editor-suggestions-title',
+   'tux-editor-in-other-languages',
+   'tux-editor-need-more-help',
+   'tux-editor-ask-help',
+   'tux-editor-tm-match',
+   'tux-warnings-more',
+   'tux-warnings-hide',
+   'tux-editor-save-failed',
+   'tux-editor-use-this-translation',
+   'tux-editor-n-uses',
+   'tux-editor-doc-editor-placeholder',
+   'tux-editor-doc-editor-save',
+   'tux-editor-doc-editor-cancel',
+   'translate-edit-nopermission',
+   'translate-edit-askpermission',
+   'tux-editor-outdated-warning',
+   'tux-editor-outdated-warning-diff-link',
+   'tux-proofread-action-tooltip',
+   'tux-proofread-edit-tooltip',
+   'tux-proofread-translated-by-self',
+   'tux-editor-close-tooltip',
+   'tux-editor-expand-tooltip',
+   'tux-editor-collapse-tooltip',
+   'tux-editor-loading',
+   ),
+   'position' = 'top',
+) + $resourcePaths;
+
+$wgResourceModules['ext.translate.groupselector'] = array(
+   'styles' = 'resources/css/ext.translate.groupselector.css',
+   'scripts' = 'resources/js/ext.translate.groupselector.js',
+   'position' = 'top',
+   'dependencies' = array(
+   'ext.translate.grid',
+   'ext.translate.statsbar',
+   'mediawiki.jqueryMsg',
+   ),
+   'messages' = array(
+   'translate-msggroupselector-projects',
+

[MediaWiki-commits] [Gerrit] Use __DIR__ - change (mediawiki...Translate)

2013-03-14 Thread Nikerabbit (Code Review) 
Nikerabbit has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53730


Change subject: Use __DIR__
..

Use __DIR__

Change-Id: I970e89193aac6040b1dbd92120ac00a107dcbe78
---
M Resources.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/30/53730/1

diff --git a/Resources.php b/Resources.php
index dff7552..a294ef1 100644
--- a/Resources.php
+++ b/Resources.php
@@ -7,7 +7,7 @@
  */
 
 $resourcePaths = array(
-   'localBasePath' = dirname( __FILE__ ),
+   'localBasePath' = __DIR__,
'remoteExtPath' = 'Translate'
 );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/53730
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I970e89193aac6040b1dbd92120ac00a107dcbe78
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
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] Alphabetical order of modules - change (mediawiki...Translate)

2013-03-14 Thread Nikerabbit (Code Review) 
Nikerabbit has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53731


Change subject: Alphabetical order of modules
..

Alphabetical order of modules

Change-Id: I0cf32d08fa85a882b5d1f84641dbfd290c09086d
---
M Resources.php
1 file changed, 60 insertions(+), 62 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/31/53731/1

diff --git a/Resources.php b/Resources.php
index a294ef1..cbbb1f7 100644
--- a/Resources.php
+++ b/Resources.php
@@ -11,7 +11,10 @@
'remoteExtPath' = 'Translate'
 );
 
-// Client-side resource modules
+$wgResourceModules['ext.translate'] = array(
+   'styles' = 'resources/css/ext.translate.css',
+   'position' = 'top',
+) + $resourcePaths;
 
 $wgResourceModules['ext.translate.base'] = array(
'scripts' = 'resources/js/ext.translate.base.js',
@@ -19,27 +22,6 @@
'mediawiki.util',
'mediawiki.api',
),
-) + $resourcePaths;
-
-$wgResourceModules['ext.translate'] = array(
-   'styles' = 'resources/css/ext.translate.css',
-   'position' = 'top',
-) + $resourcePaths;
-
-$wgResourceModules['ext.translate.hooks'] = array(
-   'scripts' = 'resources/js/ext.translate.hooks.js',
-   'position' = 'top',
-) + $resourcePaths;
-
-$wgResourceModules['ext.translate.helplink'] = array(
-   'styles' = 'resources/css/ext.translate.helplink.css',
-   'position' = 'top',
-) + $resourcePaths;
-
-// TODO: jquery.uls uses the same grid system. So don't duplicate
-$wgResourceModules['ext.translate.grid'] = array(
-   'styles' = 'resources/css/ext.translate.grid.css',
-   'position' = 'top',
 ) + $resourcePaths;
 
 $wgResourceModules['ext.translate.editor'] = array(
@@ -106,6 +88,12 @@
'position' = 'top',
 ) + $resourcePaths;
 
+// TODO: jquery.uls uses the same grid system. So don't duplicate
+$wgResourceModules['ext.translate.grid'] = array(
+   'styles' = 'resources/css/ext.translate.grid.css',
+   'position' = 'top',
+) + $resourcePaths;
+
 $wgResourceModules['ext.translate.groupselector'] = array(
'styles' = 'resources/css/ext.translate.groupselector.css',
'scripts' = 'resources/js/ext.translate.groupselector.js',
@@ -122,6 +110,16 @@
'translate-msggroupselector-search-recent',
'translate-msggroupselector-view-subprojects',
),
+) + $resourcePaths;
+
+$wgResourceModules['ext.translate.helplink'] = array(
+   'styles' = 'resources/css/ext.translate.helplink.css',
+   'position' = 'top',
+) + $resourcePaths;
+
+$wgResourceModules['ext.translate.hooks'] = array(
+   'scripts' = 'resources/js/ext.translate.hooks.js',
+   'position' = 'top',
 ) + $resourcePaths;
 
 $wgResourceModules['ext.translate.messagetable'] = array(
@@ -169,14 +167,16 @@
),
 ) + $resourcePaths;
 
-$wgResourceModules['ext.translate.statsbar'] = array(
-   'styles' = 'resources/css/ext.translate.statsbar.css',
-   'scripts' = 'resources/js/ext.translate.statsbar.js',
+$wgResourceModules['ext.translate.messagewebimporter'] = array(
+   'styles' = 'resources/css/ext.translate.messagewebimporter.css',
'position' = 'top',
 ) + $resourcePaths;
 
-$wgResourceModules['ext.translate.tabgroup'] = array(
-   'styles' = 'resources/css/ext.translate.tabgroup.css',
+$wgResourceModules['ext.translate.multiselectautocomplete'] = array(
+   'scripts' = 'resources/js/ext.translate.multiselectautocomplete.js',
+   'dependencies' = array(
+   'jquery.ui.autocomplete',
+   ),
'position' = 'top',
 ) + $resourcePaths;
 
@@ -197,16 +197,21 @@
'scripts' = 'resources/js/ext.translate.selecttoinput.js',
 ) + $resourcePaths;
 
+$wgResourceModules['ext.translate.special.aggregategroups'] = array(
+   'scripts' = 'resources/js/ext.translate.special.aggregategroups.js',
+   'styles' = 'resources/css/ext.translate.special.aggregategroups.css',
+   'position' = 'top',
+   'dependencies' = array( 'mediawiki.util' ),
+   'messages' = array(
+   'tpt-aggregategroup-remove-confirm',
+   ),
+) + $resourcePaths;
+
 $wgResourceModules['ext.translate.special.importtranslations'] = array(
'scripts' = 'resources/js/ext.translate.special.importtranslations.js',
'dependencies' = array(
'jquery.ui.autocomplete',
),
-) + $resourcePaths;
-
-$wgResourceModules['ext.translate.messagewebimporter'] = array(
-   'styles' = 'resources/css/ext.translate.messagewebimporter.css',
-   'position' = 'top',
 ) + $resourcePaths;
 
 $wgResourceModules['ext.translate.special.languagestats'] = array(
@@ -219,14 +224,6 @@
'translate-langstats-collapse'
),
'dependencies' = 'jquery.tablesorter',
-) + $resourcePaths;
-
-$wgResourceModules['ext.translate.multiselectautocomplete'] = array(
-   'scripts' =

[MediaWiki-commits] [Gerrit] PHPUnit code coverage for mediawiki-core - change (integration/jenkins-job-builder-config)

2013-03-14 Thread Hashar (Code Review) 
Hashar has submitted this change and it was merged.

Change subject: PHPUnit code coverage for mediawiki-core
..


PHPUnit code coverage for mediawiki-core

Exclude the usual unit tests groups as well as the Dump group which is
way too slow.

Bug: 31518
Change-Id: Ic521c23e26d28b7e8e117f7d04daf1073e75b625
---
M mediawiki.yaml
1 file changed, 18 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Verified; Looks good to me, approved



diff --git a/mediawiki.yaml b/mediawiki.yaml
index 3ec4b0c..d19b125 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -148,6 +148,24 @@
 targets: 'phpunit-all'
 buildfile: '/var/lib/jenkins/jobs/_shared/build.xml'
 
+- job:
+name: 'mediawiki-core-code-coverage'
+defaults: global
+
+builders:
+ - get-mw-core:
+branch: 'master'
+ - mw-install-sqlite
+ - shell: |
+php tests/phpunit/phpunit.php \
+--exclude-group Dump,Broken,ParserFuzz,Stub \
+--coverage-html /srv/org/mediawiki/integration/coverage/
+triggers:
+ - timed: '0 3 * * *'
+wrappers:
+ - ansicolor
+ - timestamps
+
 - project:
 name: mediawiki-core-regression
 gerrit-name: mediawiki/core

-- 
To view, visit https://gerrit.wikimedia.org/r/53532
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic521c23e26d28b7e8e117f7d04daf1073e75b625
Gerrit-PatchSet: 6
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Krinkle ttij...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Use ULS for long language list in SearchTranslations page - change (mediawiki...Translate)

2013-03-14 Thread Santhosh (Code Review) 
Santhosh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53732


Change subject: Use ULS for long language list in SearchTranslations page
..

Use ULS for long language list in SearchTranslations page

Change-Id: I19d85fe30a142317f4c24251856f735eaaad4882
---
M Translate.i18n.php
M Translate.php
M resources/css/ext.translate.special.searchtranslations.css
M resources/js/ext.translate.special.searchtranslations.js
M specials/SpecialSearchTranslations.php
5 files changed, 126 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/32/53732/1

diff --git a/Translate.i18n.php b/Translate.i18n.php
index 4ed5653..5f58baf 100644
--- a/Translate.i18n.php
+++ b/Translate.i18n.php
@@ -500,6 +500,7 @@
'tux-editor-expand-tooltip' = 'Expand',
'tux-editor-collapse-tooltip' = 'Collapse',
'tux-editor-loading' = 'Loading...',
+   'translate-search-more-languages-info' = '$1 more 
{{PLURAL:$1|language|languages}}',
 );
 
 /** Message documentation (Message documentation)
@@ -1037,6 +1038,9 @@
 {{Identical|Collapse}}',
'tux-editor-loading' = 'Loading message while translation editor is 
being prepared with helper information.
 {{Identical|Loading}}',
+   'translate-search-more-languages-info' = 'Information shown as number 
of languages matching the query using
+[[Special:SearchTranslations]]
+* $1 - number of languages',
 );
 
 /** Afrikaans (Afrikaans)
diff --git a/Translate.php b/Translate.php
index 8e9cb83..f49c86f 100644
--- a/Translate.php
+++ b/Translate.php
@@ -464,6 +464,9 @@
'scripts' = 'resources/js/ext.translate.special.searchtranslations.js',
'styles' = 
'resources/css/ext.translate.special.searchtranslations.css',
'dependencies' = array( 'ext.translate.editor' ),
+   'messages' = array(
+   'translate-search-more-languages-info'
+   ),
'position' = 'top',
 ) + $resourcePaths;
 
diff --git a/resources/css/ext.translate.special.searchtranslations.css 
b/resources/css/ext.translate.special.searchtranslations.css
index ecbe62d..c3d77d2 100644
--- a/resources/css/ext.translate.special.searchtranslations.css
+++ b/resources/css/ext.translate.special.searchtranslations.css
@@ -116,3 +116,15 @@
background-image: linear-gradient(#D3D3D3, #D8D8D8);
border-color: #C9C9C9;
 }
+
+.translate-search-more-languages {
+   background-color: #F0F0F0;
+   font-size: 16px;
+   cursor: pointer;
+}
+
+.translate-search-more-languages-info {
+   padding: 5px;
+   color: #554;
+   font-size: 16px;
+}
diff --git a/resources/js/ext.translate.special.searchtranslations.js 
b/resources/js/ext.translate.special.searchtranslations.js
index f954e4c..197f739 100644
--- a/resources/js/ext.translate.special.searchtranslations.js
+++ b/resources/js/ext.translate.special.searchtranslations.js
@@ -1,4 +1,4 @@
-( function ( $ ) {
+( function ( $, mw ) {
'use strict';
 
$( document ).ready( function () {
@@ -19,5 +19,97 @@
}
} );
} );
+
+   showLanguages();
+
} );
-}( jQuery ) );
+
+   // ES5-compatible Chrome, IE 9+, FF 4+, or Safari 5+ has Object.keys.
+   // Make other old browsers happy
+   if ( !Object.keys ) {
+   Object.keys = function ( obj ) {
+   var keys = [],
+   k;
+   for ( k in obj ) {
+   if ( Object.prototype.hasOwnProperty.call( obj, 
k ) ) {
+   keys.push( k );
+   }
+   }
+   return keys;
+   };
+   }
+
+   function showLanguages() {
+   var $languages,
+   languages,
+   languageCount = 0,
+   resultCount = 0,
+   $count,
+   result,
+   i,
+   languageCode,
+   quickLanguageList = [],
+   $ulsTrigger;
+
+   $languages = $( '.facet.languages');
+   languages = $languages.data( 'facets' );
+
+   resultCount = Object.keys(languages).length;
+
+   if ( $languages.data( 'language' ) ) {
+   languageCount++;
+   quickLanguageList = [ $languages.data( 'language' ) ];
+   }
+
+   quickLanguageList= quickLanguageList.concat( 
mw.uls.getFrequentLanguageList() )
+   .concat( Object.keys(languages) );
+
+   for( i=0; i=quickLanguageList.length; i++ ) {
+   languageCode = quickLanguageList[i],
+   result = languages[languageCode];
+
+

[MediaWiki-commits] [Gerrit] Ensure task targets are editable and bite-sized - change (mediawiki...GettingStarted)

2013-03-14 Thread Ori.livneh (Code Review) 
Ori.livneh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53733


Change subject: Ensure task targets are editable and bite-sized
..

Ensure task targets are editable and bite-sized

Instead of fetching three articles, we'll fetch six and grab the first
three (or fewer, if fewer than three are available) that are editable by
the current user and not too big.

Change-Id: I963553dcce90b93d363c9e740561fd89c902badf
---
M SpecialGettingStarted.php
1 file changed, 21 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GettingStarted 
refs/changes/33/53733/1

diff --git a/SpecialGettingStarted.php b/SpecialGettingStarted.php
index 4681128..80e9212 100644
--- a/SpecialGettingStarted.php
+++ b/SpecialGettingStarted.php
@@ -1,6 +1,8 @@
 ?php
 class SpecialGettingStarted extends SpecialPage {
+
const ARTICLE_COUNT = 3;
+   const MAX_ARTICLE_LENGTH = 1;
 
public function __construct() {
parent::__construct( 'GettingStarted' );
@@ -32,6 +34,8 @@
 
public function getHtmlResult() {
global $wgExtensionAssetsPath, $wgGettingStartedTasks;
+
+   $user = $this-getUser();
$result = '';
$headerText = $this-msg( 'gettingstarted-task-header' 
)-escaped();
 
@@ -57,7 +61,23 @@
);
foreach ( $tasks as $task ) {
$roulette = new CategoryRoulette( 
Category::newFromName( $task['category']  ) );
-   $taskArticles = $roulette-getRandomArticles( 
self::ARTICLE_COUNT );
+
+   // Get ARTICLE_COUNT * 2 articles and pick the first 
ARTICLE_COUNT
+   // articles that meet the requirements (not too big and 
is editable
+   // by the current user). If fewer than ARTICLE_COUNT 
articles in
+   // result set meet requirements, get as many as 
possible.
+   // FIXME(ori-l, 14-March-2013): should be a separate 
method.
+   $taskArticles = array();
+   foreach( $roulette-getRandomArticles( 
self::ARTICLE_COUNT * 2 ) as $article ) {
+   $length = $article-getLength();
+   $editRestrictions = 
$article-getUserPermissionsErrors( 'edit', $user );
+   if ( $length  0  $length = 
self::MAX_ARTICLE_LENGTH  empty( $editRestrictions ) ) {
+   $taskArticles[] = $article;
+   }
+   if ( count( $taskArticles ) === 
self::ARTICLE_COUNT ) {
+   break;
+   }
+   }
 
$imageSrc = wfFindFile( $task['image'] )-getURL();
$descriptionMessage = $this-msg( 
$task['descriptionMessage'] );

-- 
To view, visit https://gerrit.wikimedia.org/r/53733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I963553dcce90b93d363c9e740561fd89c902badf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
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] Add comments for grep - change (mediawiki...Translate)

2013-03-14 Thread Shirayuki (Code Review) 
Shirayuki has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53735


Change subject: Add comments for grep
..

Add comments for grep

Change-Id: I40c7fb549c6ed1af9842fa7a9823684a619930f3
---
M specials/SpecialMagic.php
M specials/SpecialTranslate.php
M specials/SpecialTranslationStats.php
M tag/SpecialPageTranslationMovePage.php
4 files changed, 13 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/35/53735/1

diff --git a/specials/SpecialMagic.php b/specials/SpecialMagic.php
index c4dd96d..6380096 100644
--- a/specials/SpecialMagic.php
+++ b/specials/SpecialMagic.php
@@ -88,6 +88,8 @@
 * @return \string HTML5-compatible select-element.
 */
protected function moduleSelector( $selectedId ) {
+   // Give grep a chance to find the usages:
+   // translate-magic-words, translate-magic-special, 
translate-magic-namespace
$selector = new XmlSelect( 'module', 'module', $selectedId );
foreach ( $this-aModules as $code ) {
$selector-addOption( $this-msg( 'translate-magic-' . 
$code )-text(), $code );
diff --git a/specials/SpecialTranslate.php b/specials/SpecialTranslate.php
index 5ce5c64..549859f 100644
--- a/specials/SpecialTranslate.php
+++ b/specials/SpecialTranslate.php
@@ -331,6 +331,8 @@
 
$options = array();
foreach ( $selectors as $g = $selector ) {
+   // Give grep a chance to find the usages:
+   // translate-page-group, translate-page-language, 
translate-page-limit
$options[] = self::optionRow(
$this-msg( 'translate-page-' . $g )-escaped(),
$selector,
diff --git a/specials/SpecialTranslationStats.php 
b/specials/SpecialTranslationStats.php
index df55266..0b2ff4f 100644
--- a/specials/SpecialTranslationStats.php
+++ b/specials/SpecialTranslationStats.php
@@ -234,6 +234,9 @@
 * @return string Html.
 */
protected function eLabel( $name ) {
+   // Give grep a chance to find the usages:
+   // translate-statsf-width, translate-statsf-height, 
translate-statsf-start, translate-statsf-days,
+   // translate-statsf-scale, translate-statsf-count, 
translate-statsf-language, translate-statsf-group
$label = 'translate-statsf-' . $name;
$label = $this-msg( $label )-escaped();
 
@@ -248,6 +251,8 @@
 * @return string Html.
 */
protected function eRadio( $name, FormOptions $opts, array $alts ) {
+   // Give grep a chance to find the usages:
+   // translate-statsf-scale, translate-statsf-count
$label = 'translate-statsf-' . $name;
$label = $this-msg( $label )-escaped();
$s = 'trtd' . $label . '/tdtd';
diff --git a/tag/SpecialPageTranslationMovePage.php 
b/tag/SpecialPageTranslationMovePage.php
index 835b316..e647022 100644
--- a/tag/SpecialPageTranslationMovePage.php
+++ b/tag/SpecialPageTranslationMovePage.php
@@ -505,6 +505,8 @@
// Check that all new titles are valid
$lb = new LinkBatch();
foreach ( $titles as $type = $list ) {
+   // Give grep a chance to find the usages:
+   // pt-movepage-block-tp-invalid, 
pt-movepage-block-section-invalid, pt-movepage-block-subpage-invalid
foreach ( $list as $pair ) {
list( $old, $new ) = $pair;
if ( $new === null ) {
@@ -523,6 +525,8 @@
// Check that there are no move blockers
$lb-execute();
foreach ( $titles as $type = $list ) {
+   // Give grep a chance to find the usages:
+   // pt-movepage-block-tp-exists, 
pt-movepage-block-section-exists, pt-movepage-block-subpage-exists
foreach ( $list as $pair ) {
list( $old, $new ) = $pair;
if ( $new-exists() ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/53735
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I40c7fb549c6ed1af9842fa7a9823684a619930f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Shirayuki shirayuk...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] puppet now manage jenkins ssh authorized_keys - change (operations/puppet)

2013-03-14 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53736


Change subject: puppet now manage jenkins ssh authorized_keys
..

puppet now manage jenkins ssh authorized_keys

I am going to setup some slaves on labs and need an easy way to publish
the authorized keys there.  The Jenkins master is gallium, from=ip
should ensure that only gallium can connect to the slaves.

The class dependency is required since puppet does not manage the home
directory for the user jenkins.

Change-Id: If719f2d5b610815e205b46d63b36bb64d95e2083
---
M modules/jenkins/manifests/user.pp
1 file changed, 20 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/53736/1

diff --git a/modules/jenkins/manifests/user.pp 
b/modules/jenkins/manifests/user.pp
index 949172a..2d532ee 100644
--- a/modules/jenkins/manifests/user.pp
+++ b/modules/jenkins/manifests/user.pp
@@ -2,14 +2,32 @@
 
   include jenkins::group
 
+  $JENKINS_HOME = '/var/lib/jenkins'
+
   user { 'jenkins':
 name   = 'jenkins',
-home   = '/var/lib/jenkins',
+home   = $JENKINS_HOME,
 shell  = '/bin/bash',
 gid=  'jenkins',
 system = true,
 managehome = false,
-require= Group['jenkins'];
+require= Group['jenkins'],
+  }
+
+  Ssh_authorized_key {
+require = User['jenkins']
+  }
+
+  ssh_authorized_key {
+'jenkins@gallium':
+  ensure  = present,
+  user= 'jenkins',
+  type= 'ssh-rsa',
+  key = 
'B3NzaC1yc2EBIwAAAQEA4QGc1Zs/S4s7znEYw7RifTuZ4y4iYvXl5jp5tJA9kGUGzzfL0dc4ZEEhpu+4C/TixZJXqv0N6yke67cM8hfdXnLOVJc4n/Z02uYHQpRDeLAJUAlGlbGZNvzsOLw39dGF0u3YmwDm6rj85RSvGqz8ExbvrneCVJSaYlIRvOEKw0e0FYs8Yc7aqFRV60M6fGzWVaC3lQjSnEFMNGdSiLp3Vl/GB4GgvRJpbNENRrTS3Te9BPtPAGhJVPliTflVYvULCjYVtPEbvabkW+vZznlcVHAZJVTTgmqpDZEHqp4bzyO8rBNhMc7BjUVyNVNC5FCk+D2LagmIriYxjirXDNrWlw==',
+  target  = ${JENKINS_HOME}/.ssh/authorized_keys,
+  # Lame restriction from gallium
+  options = [ 'from=208.80.154.191' ],
+
   }
 
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/53736
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If719f2d5b610815e205b46d63b36bb64d95e2083
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] (bug 39381) Add Javanese font to WebFonts - change (mediawiki...WebFonts)

2013-03-14 Thread Santhosh (Code Review) 
Santhosh has submitted this change and it was merged.

Change subject: (bug 39381) Add Javanese font to WebFonts
..


(bug 39381) Add Javanese font to WebFonts

Mapping the font to jv-java - Javanese with Java script.
That meeans, this font will not work with the usual user interface
or content language trick. Lating is the default script for jv.
But still font can be used by explicit tagging of the content
with lang=jv-java attribute.

Change-Id: I0fbae92178d9f6bcfa0a163375bc1cbe2fec6876
---
A fonts/Java/TuladhaJejeg_gr.eot
A fonts/Java/TuladhaJejeg_gr.ttf
A fonts/Java/TuladhaJejeg_gr.woff
M resources/ext.webfonts.fontlist.js
4 files changed, 7 insertions(+), 1 deletion(-)

Approvals:
  Santhosh: Verified; Looks good to me, approved



diff --git a/fonts/Java/TuladhaJejeg_gr.eot b/fonts/Java/TuladhaJejeg_gr.eot
new file mode 100644
index 000..33d11ba
--- /dev/null
+++ b/fonts/Java/TuladhaJejeg_gr.eot
Binary files differ
diff --git a/fonts/Java/TuladhaJejeg_gr.ttf b/fonts/Java/TuladhaJejeg_gr.ttf
new file mode 100644
index 000..3246f64
--- /dev/null
+++ b/fonts/Java/TuladhaJejeg_gr.ttf
Binary files differ
diff --git a/fonts/Java/TuladhaJejeg_gr.woff b/fonts/Java/TuladhaJejeg_gr.woff
new file mode 100644
index 000..caf9620
--- /dev/null
+++ b/fonts/Java/TuladhaJejeg_gr.woff
Binary files differ
diff --git a/resources/ext.webfonts.fontlist.js 
b/resources/ext.webfonts.fontlist.js
index c132071..4935a4c 100644
--- a/resources/ext.webfonts.fontlist.js
+++ b/resources/ext.webfonts.fontlist.js
@@ -413,7 +413,12 @@
woff: Mymr/TharLon.woff,
version: 1.0
},
-
+   Tuladha Jejeg: {
+   eot: Java/TuladhaJejeg_gr.eot,
+   ttf: Java/TuladhaJejeg_gr.ttf,
+   woff: Java/TuladhaJejeg_gr.woff,
+   version: 1.92
+   },
Libertine: {
eot: Latn/LinLibertine_R.eot,
ttf: Latn/LinLibertine_R.ttf,
@@ -492,6 +497,7 @@
hbo: [ Taamey Frank CLM ],
he:  [ Miriam CLM, Taamey Frank CLM ],
hi:  [ Lohit Devanagari ],
+   'jv-java':  [ Tuladha Jejeg ],
km:  [ KhmerOSbattambang, KhmerOSsiemreap, 
KhmerOS, KhmerOSbokor,
   KhmerOSmuollight, KhmerOSmuol, 
KhmerOSmuolpali,
   KhmerOSfreehand, KhmerOSfasthand ],

-- 
To view, visit https://gerrit.wikimedia.org/r/24403
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0fbae92178d9f6bcfa0a163375bc1cbe2fec6876
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/WebFonts
Gerrit-Branch: master
Gerrit-Owner: Logicwiki srik@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Bennylin bennylin.idw...@hotmail.com
Gerrit-Reviewer: Dereckson dereck...@espace-win.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add more parsoid tests - change (integration/zuul-config)

2013-03-14 Thread Hashar (Code Review) 
Hashar has submitted this change and it was merged.

Change subject: Add more parsoid tests
..


Add more parsoid tests

These tests are already on the server, and they test other components of
Parsoid that until now have only been tested manually.

Change-Id: I78d1d376355bca349cfd299313dd0d7a415f581b
---
M layout.yaml
1 file changed, 10 insertions(+), 1 deletion(-)

Approvals:
  Hashar: Verified; Looks good to me, approved



diff --git a/layout.yaml b/layout.yaml
index 7f84bed..337af0b 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -324,8 +324,14 @@
   - name: ^mwext-TranslationNotifications-testextensions.*
 voting: false
 
-  # New parsoid test, not sure if it's working yet, but we want to run it to 
find out.
+  # New parsoid tests, not sure if they're working yet, but we want to run it 
to find out.
   - name: ^parsoid-testCommit$
+voting: false
+  - name: ^parsoid-server-sanity-check$
+voting: false
+  - name: ^parsoid-parse-tool-check$
+voting: false
+  - name: ^parsoid-roundtrip-test-check$
 voting: false
 
 # Register the Gerrit project name, apply them pipelines that in turn trigger
@@ -1146,6 +1152,9 @@
 - mwext-Parsoid-jslint
 - Parsoid-parserTests
 - parsoid-testCommit
+- parsoid-server-sanity-check
+- parsoid-parse-tool-check
+- parsoid-roundtrip-test-check
 gate-and-submit:
   - mwext-Parsoid-merge:
 - mwext-Parsoid-jslint

-- 
To view, visit https://gerrit.wikimedia.org/r/53700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I78d1d376355bca349cfd299313dd0d7a415f581b
Gerrit-PatchSet: 2
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Hashar has...@free.fr

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] (bug 45906) remove title attribute from description - change (mediawiki...UploadWizard)

2013-03-14 Thread Nischayn22 (Code Review) 
Nischayn22 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53737


Change subject: (bug 45906) remove title attribute from description
..

(bug 45906) remove title attribute from description

All other input types don't use the title attribute and all the help is
put in the tipsy it therefore makes sense for the description field to
follow the same.

Change-Id: I615433de761118c45756d37b72150296bb72107d
---
M resources/mw.UploadWizardDescription.js
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard 
refs/changes/37/53737/1

diff --git a/resources/mw.UploadWizardDescription.js 
b/resources/mw.UploadWizardDescription.js
index 82a4a11..86f5c72 100644
--- a/resources/mw.UploadWizardDescription.js
+++ b/resources/mw.UploadWizardDescription.js
@@ -35,7 +35,6 @@
$j(_this.languageMenu).addClass( 'mwe-upwiz-desc-lang-select' );
 
_this.input = $j( 'textarea name=' + _this.id  + ' rows=2 
cols=36 class=mwe-upwiz-desc-lang-text/textarea' )
-   .attr( 'title', gM( 
'mwe-upwiz-tooltip-description' ) )
.growTextArea();
 
if ( initialValue !== undefined ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/53737
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I615433de761118c45756d37b72150296bb72107d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Nischayn22 nischay...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] 1379b783 was missed before 1.19 came out and causes problem ... - change (mediawiki/core)

2013-03-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: 1379b783 was missed before 1.19 came out and causes problem for 
php without zlib.
..


1379b783 was missed before 1.19 came out and causes problem for php
without zlib.

Bug: 45903
Change-Id: I4213401502584dcc49339c6a32e92a5d49e4ab47
---
M includes/cache/FileCacheBase.php
1 file changed, 6 insertions(+), 3 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/cache/FileCacheBase.php b/includes/cache/FileCacheBase.php
index 3740165..c6150c7 100644
--- a/includes/cache/FileCacheBase.php
+++ b/includes/cache/FileCacheBase.php
@@ -116,9 +116,12 @@
 * @return string
 */
public function fetchText() {
-   // gzopen can transparently read from gziped or plain text
-   $fh = gzopen( $this-cachePath(), 'rb' );
-   return stream_get_contents( $fh );
+   if( $this-useGzip() ) {
+   $fh = gzopen( $this-cachePath(), 'rb' );
+   return stream_get_contents( $fh );
+   } else {
+   return file_get_contents( $this-cachePath() );
+   }
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/52937
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4213401502584dcc49339c6a32e92a5d49e4ab47
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_19
Gerrit-Owner: MarkAHershberger mhershber...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] High priority fixes - change (mediawiki...ArticleFeedbackv5)

2013-03-14 Thread Matthias Mullie (Code Review) 
Matthias Mullie has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53738


Change subject: High priority fixes
..

High priority fixes

* Helpful/unhelpful did not work; JS error (var id was not set)
* Renamed Hide to Hide this post
* Autohide did not trigger mask and had some missing i18n
* Unrequest oversight should not trigger tipsy

Change-Id: I16491a1af5c460a72481d32cfc7fbd44ecb9d836
---
M ArticleFeedbackv5.activity.php
M ArticleFeedbackv5.i18n.php
M api/ApiAddFlagNoteArticleFeedbackv5.php
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
5 files changed, 37 insertions(+), 23 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 
refs/changes/38/53738/1

diff --git a/ArticleFeedbackv5.activity.php b/ArticleFeedbackv5.activity.php
index 728e50f..61d6fd1 100644
--- a/ArticleFeedbackv5.activity.php
+++ b/ArticleFeedbackv5.activity.php
@@ -389,29 +389,32 @@
if ( $cache !== false ) {
$activity[$feedback-aft_id] = $cache;
} else {
+   $actions = array();
+
// we know exactly which status entry we want 
to fetch
if ( $feedback-isOversighted() ) {
-   $action = 'oversight';
+   $actions[] = 'oversight';
} elseif ( $feedback-isHidden() ) {
-   $action = 'hide';
+   $actions[] = 'hide';
+   $actions[] = 'autohide';
} elseif ( $feedback-isArchived() ) {
-   $action = 'archive';
+   $actions[] = 'archive';
} elseif ( $feedback-isResolved() ) {
-   $action = 'resolve';
+   $actions[] = 'resolve';
} elseif ( $feedback-isFeatured() ) {
-   $action = 'feature';
+   $actions[] = 'feature';
} elseif ( $feedback-isNonActionable() ) {
-   $action = 'noaction';
+   $actions[] = 'noaction';
} elseif ( $feedback-isInappropriate() ) {
-   $action = 'inappropriate';
+   $actions[] = 'inappropriate';
} else {
continue;
}
 
-   $action = self::buildWhereActions( array(), 
array( $action ) );
-   if ( $action ) {
+   $actions = self::buildWhereActions( array(), 
$actions );
+   if ( $actions ) {
$title = self::buildWhereFeedback( 
$feedback );
-   $where[] = 'log_title = 
'.$dbr-addQuotes( $title ).' AND '.$action;
+   $where[] = 'log_title = 
'.$dbr-addQuotes( $title ).' AND '.$actions;
}
}
}
diff --git a/ArticleFeedbackv5.i18n.php b/ArticleFeedbackv5.i18n.php
index dec5063..0c8f894 100644
--- a/ArticleFeedbackv5.i18n.php
+++ b/ArticleFeedbackv5.i18n.php
@@ -175,7 +175,8 @@
'articlefeedbackv5-status-unarchive' = 'This post was un-archived by 
$1 on $2 at $3',
'articlefeedbackv5-new-marker' = 'New',
'articlefeedbackv5-oversight-marker' = 'Oversighted',
-   'articlefeedbackv5-hide-marker' = 'Hide',
+   'articlefeedbackv5-autohide-marker' = 'Hidden',
+   'articlefeedbackv5-hide-marker' = 'Hidden',
'articlefeedbackv5-feature-marker' = 'Useful',
'articlefeedbackv5-resolve-marker' = 'Resolved',
'articlefeedbackv5-noaction-marker' = 'No action needed',
@@ -191,7 +192,7 @@
'articlefeedbackv5-form-unnoaction' = 'Undo',
'articlefeedbackv5-form-inappropriate' = 'Inappropriate',
'articlefeedbackv5-form-uninappropriate' = 'Undo',
-   'articlefeedbackv5-form-hide' = 'Hide',
+   'articlefeedbackv5-form-hide' = 'Hide this post',
'articlefeedbackv5-form-unhide' = 'Undo',
'articlefeedbackv5-form-hide-own' = 'Hide my post',
'articlefeedbackv5-form-unhide-own' = 'Show my post',
@@ -981,6 +982,7 @@
'articlefeedbackv5-new-marker' = 'The marker that appears on a comment 
is new and highlighted.
 {{Identical|New}}',

[MediaWiki-commits] [Gerrit] contint: get rid of Sun JDK - change (operations/puppet)

2013-03-14 Thread Faidon (Code Review) 
Faidon has submitted this change and it was merged.

Change subject: contint: get rid of Sun JDK
..


contint: get rid of Sun JDK

We no more need the Sun JDK so just remove the class. Will purge the
packages manually once this is merged.

Change-Id: If4030ed7e6334f8c2df129183fe2e091d067a0ff
---
M manifests/misc/contint.pp
1 file changed, 0 insertions(+), 35 deletions(-)

Approvals:
  Faidon: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/misc/contint.pp b/manifests/misc/contint.pp
index 100cc6c..bccc931 100644
--- a/manifests/misc/contint.pp
+++ b/manifests/misc/contint.pp
@@ -1,44 +1,9 @@
-class misc::contint::jdk {
-# JDK for android continuous integration
-# extra stuff for license agreement acceptance
-# Based off of 
http://offbytwo.com/2011/07/20/scripted-installation-java-ubuntu.html
-
-   package { debconf-utils:
-   ensure = installed
-   }
-
-   exec { agree-to-jdk-license:
-   command = /bin/echo -e sun-java6-jdk 
shared/accepted-sun-dlj-v1-1 select true | debconf-set-selections,
-   unless = debconf-get-selections | grep 
'sun-java6-jdk.*shared/accepted-sun-dlj-v1-1.*true',
-   path = [/bin, /usr/bin], require = 
Package[debconf-utils],
-   }
-
-   exec { agree-to-jre-license:
-   command = /bin/echo -e sun-java6-jre 
shared/accepted-sun-dlj-v1-1 select true | debconf-set-selections,
-   unless = debconf-get-selections | grep 
'sun-java6-jre.*shared/accepted-sun-dlj-v1-1.*true',
-   path = [/bin, /usr/bin], require = 
Package[debconf-utils],
-   }
-
-   package { sun-java6-jdk:
-   ensure = latest,
-   require = [ Exec[agree-to-jdk-license] ],
-   }
-
-   package { sun-java6-jre:
-   ensure = latest,
-   require = [ Exec[agree-to-jre-license] ],
-   }
-
-}
-
 class misc::contint::android::sdk {
# Class installing prerequisites to the Android SDK
# The SDK itself need to be installed manually for now.
#
# Help link: http://developer.android.com/sdk/installing.html
 
-   # We really want Sun/Oracle JDK
-   require misc::contint::jdk
include generic::packages::ant18
 
# 32bit libs needed by Android SDK

-- 
To view, visit https://gerrit.wikimedia.org/r/53423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If4030ed7e6334f8c2df129183fe2e091d067a0ff
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Faidon fai...@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] contint: move tmpfs disk to the module - change (operations/puppet)

2013-03-14 Thread Faidon (Code Review) 
Faidon has submitted this change and it was merged.

Change subject: contint: move tmpfs disk to the module
..


contint: move tmpfs disk to the module

The continuous integration server requires a tmpfs mount to write sqlite
files too. This is due to Precise introducing some slower disks access
that cripples the tests.

Change-Id: I659c126abe3917d7ca4d0215582c008ac9ae8d1f
---
M manifests/misc/contint.pp
A modules/contint/manifests/tmpfs.pp
2 files changed, 24 insertions(+), 17 deletions(-)

Approvals:
  Faidon: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/misc/contint.pp b/manifests/misc/contint.pp
index bccc931..422aba3 100644
--- a/manifests/misc/contint.pp
+++ b/manifests/misc/contint.pp
@@ -60,6 +60,7 @@
java { 'java-6-openjdk': version = 6, alternative = true  }
java { 'java-7-openjdk': version = 7, alternative = false }
 
+   include ::contint::tmpfs
 
file {
/var/lib/jenkins/.gitconfig:
@@ -69,23 +70,6 @@
ensure = present,
source = 
puppet:///files/misc/jenkins/gitconfig,
require = User['jenkins'];
-   }
-
-   # Setup tmpfs to write SQLite files to
-   file { '/var/lib/jenkins/tmpfs':
-   ensure = directory,
-   mode = 0755,
-   owner = jenkins,
-   group = jenkins,
-   require = [ User['jenkins'], Group['jenkins'] ];
-   }
-
-   mount { '/var/lib/jenkins/tmpfs':
-   ensure = mounted,
-   device = 'tmpfs',
-   fstype = 'tmpfs',
-   options = 
'noatime,defaults,size=512M,mode=755,uid=jenkins,gid=jenkins',
-   require = [ User['jenkins'], Group['jenkins'], 
File['/var/lib/jenkins/tmpfs'] ];
}
 
file {
diff --git a/modules/contint/manifests/tmpfs.pp 
b/modules/contint/manifests/tmpfs.pp
new file mode 100644
index 000..3311ec1
--- /dev/null
+++ b/modules/contint/manifests/tmpfs.pp
@@ -0,0 +1,23 @@
+class contint::tmpfs {
+
+  include jenkins::user
+
+  # Setup tmpfs to write SQLite files to
+  file { '/var/lib/jenkins/tmpfs':
+ensure  = directory,
+mode= '0755',
+owner   = jenkins,
+group   = jenkins,
+require = [ User['jenkins'], Group['jenkins'] ],
+  }
+
+  mount { '/var/lib/jenkins/tmpfs':
+ensure  = mounted,
+device  = 'tmpfs',
+fstype  = 'tmpfs',
+options = 'noatime,defaults,size=512M,mode=755,uid=jenkins,gid=jenkins',
+require = [ User['jenkins'], Group['jenkins'],
+  File['/var/lib/jenkins/tmpfs'] ],
+  }
+
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/53424
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I659c126abe3917d7ca4d0215582c008ac9ae8d1f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Faidon fai...@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] contint: move analytics packages to the contint module - change (operations/puppet)

2013-03-14 Thread Faidon (Code Review) 
Faidon has submitted this change and it was merged.

Change subject: contint: move analytics packages to the contint module
..


contint: move analytics packages to the contint module

Change-Id: Icad5ed3756ee03cc9e4d964a8741aa2d752ddc0d
---
M manifests/misc/contint.pp
M manifests/site.pp
M modules/contint/manifests/packages.pp
3 files changed, 18 insertions(+), 19 deletions(-)

Approvals:
  Faidon: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/misc/contint.pp b/manifests/misc/contint.pp
index 100cc6c..a74b314 100644
--- a/manifests/misc/contint.pp
+++ b/manifests/misc/contint.pp
@@ -54,24 +54,6 @@
}
 }
 
-# Includes packages needed for building
-# analytics and statistics related packages.
-# E.g. udp-filter, etc.
-class misc::contint::analytics::packages {
-   # these are needed to build libanon and udp-filter
-   package { [pkg-config, libpcap-dev, libdb-dev]:
-   ensure = installed,
-   }
-
-# these packages are used by the tests for wikistats to parse the
-# generated reports to see if they are correct
-   package { [libhtml-treebuilder-xpath-perl,libweb-scraper-perl]:
-   ensure = installed,
-   }
-   # need geoip to build udp-filter
-   include geoip
-}
-
 # CI test server as per RT #1204
 class misc::contint::test {
 
diff --git a/manifests/site.pp b/manifests/site.pp
index a512855..27854e5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -775,7 +775,6 @@
contint::website,
misc::contint::test,
misc::contint::test::packages,
-   misc::contint::analytics::packages,
misc::contint::test::jenkins,
misc::contint::android::sdk,
testswarm::systemuser,
diff --git a/modules/contint/manifests/packages.pp 
b/modules/contint/manifests/packages.pp
index 9ef4baf..370993c 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -64,6 +64,24 @@
 ]: ensure = present,
   }
 
+  # Includes packages needed for building
+  # analytics and statistics related packages.
+
+  # these are needed to build libanon and udp-filter
+  package { ['pkg-config', 'libpcap-dev', 'libdb-dev']:
+ensure = 'installed',
+  }
+
+  # these packages are used by the tests for wikistats to parse the
+  # generated reports to see if they are correct
+  package { ['libhtml-treebuilder-xpath-perl','libweb-scraper-perl']:
+ensure = 'installed',
+  }
+
+  # need geoip to build udp-filter
+  include geoip
+
+
   # Node.js evolves quickly so we want to update it
   # automatically.
   package { 'nodejs':

-- 
To view, visit https://gerrit.wikimedia.org/r/53422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icad5ed3756ee03cc9e4d964a8741aa2d752ddc0d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Faidon fai...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] contint: move apache proxy configuration to module - change (operations/puppet)

2013-03-14 Thread Faidon (Code Review) 
Faidon has submitted this change and it was merged.

Change subject: contint: move apache proxy configuration to module
..


contint: move apache proxy configuration to module

Continuous integration has two internal webservices (Jenkins and Zuul)
which are exposed publicly via an Apache proxy. This patch moves the
definitions under the contint module and factor out common code in a new
contint::proxy_common class.

The Zuul proxy is included in the role::zuul::* class.
The Jenkins proxy is included from the old misc::contint::test::jenkins
which is roughly the equivalent of a role class.

Change-Id: Ia140f6ed7ab9dc12d41422f109750e4018211516
---
M manifests/misc/contint.pp
M manifests/role/zuul.pp
R modules/contint/files/apache/proxy_jenkins
R modules/contint/files/apache/proxy_zuul
A modules/contint/manifests/proxy_common.pp
A modules/contint/manifests/proxy_jenkins.pp
A modules/contint/manifests/proxy_zuul.pp
7 files changed, 45 insertions(+), 19 deletions(-)

Approvals:
  Faidon: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/misc/contint.pp b/manifests/misc/contint.pp
index 422aba3..c0c4d2e 100644
--- a/manifests/misc/contint.pp
+++ b/manifests/misc/contint.pp
@@ -54,6 +54,8 @@
# We need a basic site to publish nightly builds in
include contint::website
 
+   include contint::proxy_jenkins
+
# Get several OpenJDK packages including the jdk.
# (openjdk is the default distribution for the java define.
# The java define is found in modules/java/manifests/init.pp )
@@ -133,25 +135,6 @@
recurse = true;
}
 
-   # run jenkins behind Apache and have pretty URLs / proxy port 80
-   # 
https://wiki.jenkins-ci.org/display/JENKINS/Running+Jenkins+behind+Apache
-   class {'webserver::php5': ssl = 'true'; }
-
-   apache_module { proxy: name = proxy }
-   apache_module { proxy_http: name = proxy_http }
-
-   file {
-   /etc/apache2/conf.d/jenkins_proxy:
-   owner = root,
-   group = root,
-   mode = 0444,
-   source = 
puppet:///files/misc/jenkins/apache_proxy;
-   /etc/apache2/conf.d/zuul_proxy:
-   owner = root,
-   group = root,
-   mode = 0444,
-   source = puppet:///files/zuul/apache_proxy;
-   }
}
 
# prevent users from accessing port 8080 directly (but still allow from 
localhost and own net)
diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp
index 24c16b7..4a63f93 100644
--- a/manifests/role/zuul.pp
+++ b/manifests/role/zuul.pp
@@ -8,6 +8,8 @@
 
system_role { role::zuul::labs: description = Zuul on 
labs! }
 
+   include contint::proxy_zuul
+
# Setup the instance for labs usage
zuulwikimedia::instance { zuul-labs:
jenkins_server = 'http://10.4.0.172:8080/ci',
@@ -27,6 +29,7 @@
 
# We will receive replication of git bare repositories from 
Gerrit
include role::gerrit::production::replicationdest
+   include contint::proxy_zuul
 
file { /var/lib/git:
ensure = 'directory',
diff --git a/files/misc/jenkins/apache_proxy 
b/modules/contint/files/apache/proxy_jenkins
similarity index 100%
rename from files/misc/jenkins/apache_proxy
rename to modules/contint/files/apache/proxy_jenkins
diff --git a/files/zuul/apache_proxy b/modules/contint/files/apache/proxy_zuul
similarity index 100%
rename from files/zuul/apache_proxy
rename to modules/contint/files/apache/proxy_zuul
diff --git a/modules/contint/manifests/proxy_common.pp 
b/modules/contint/manifests/proxy_common.pp
new file mode 100644
index 000..c69b367
--- /dev/null
+++ b/modules/contint/manifests/proxy_common.pp
@@ -0,0 +1,9 @@
+# Basic configuration of Apache as a proxy
+class contint::proxy_common {
+
+  class {'webserver::php5': ssl = true; }
+
+  apache_module { 'contint_mod_proxy': name = 'proxy' }
+  apache_module { 'contint_mod_proxy_http': name = 'proxy_http' }
+
+}
diff --git a/modules/contint/manifests/proxy_jenkins.pp 
b/modules/contint/manifests/proxy_jenkins.pp
new file mode 100644
index 000..6302d2d
--- /dev/null
+++ b/modules/contint/manifests/proxy_jenkins.pp
@@ -0,0 +1,17 @@
+# A http proxy in front of Jenkins
+class contint::proxy_jenkins {
+
+  include proxy_common
+
+  # run jenkins behind Apache and have pretty URLs / proxy port 80
+  # https://wiki.jenkins-ci.org/display/JENKINS/Running+Jenkins+behind+Apache
+
+  file {
+'/etc/apache2/conf.d/jenkins_proxy':
+

[MediaWiki-commits] [Gerrit] Add new extension: NavigationTiming - change (mediawiki/core)

2013-03-14 Thread Ori.livneh (Code Review) 
Ori.livneh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53739


Change subject: Add new extension: NavigationTiming
..

Add new extension: NavigationTiming

NavigationTiming is an extension for logging perceived latency
measurements, exposed by browsers as part of the proposed Navigation
Timing API, using EventLogging.

Change-Id: Id5d1bd8e931aaa9b8407fde5ec1bd9011e6adc6e
---
M .gitmodules
A extensions/NavigationTiming
2 files changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/39/53739/1

diff --git a/.gitmodules b/.gitmodules
index edda282..9d0ac8e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -445,3 +445,6 @@
 [submodule extensions/Wikibase]
path = extensions/Wikibase
url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Wikibase.git
+[submodule extensions/NavigationTiming]
+   path = extensions/NavigationTiming
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/NavigationTiming.git
diff --git a/extensions/NavigationTiming b/extensions/NavigationTiming
new file mode 16
index 000..8e78572
--- /dev/null
+++ b/extensions/NavigationTiming
+Subproject commit 8e78572ec2ade116b8cd3dda74b251b91935da9a

-- 
To view, visit https://gerrit.wikimedia.org/r/53739
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5d1bd8e931aaa9b8407fde5ec1bd9011e6adc6e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.21wmf11
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] contint: xdebug + code coverage directory - change (operations/puppet)

2013-03-14 Thread Faidon (Code Review) 
Faidon has submitted this change and it was merged.

Change subject: contint: xdebug + code coverage directory
..


contint: xdebug + code coverage directory

The PHP xdebug extension is required to let us generate unit tests code
coverage.  The HTML reports will be published at
http://integration.mediawiki.org/coverage/

Change-Id: I074bd194e84ea9d9d8263908fc6f1769ab840839
---
M modules/contint/manifests/packages.pp
M modules/contint/manifests/website.pp
2 files changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Faidon: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/contint/manifests/packages.pp 
b/modules/contint/manifests/packages.pp
index 370993c..c91a7d6 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -26,6 +26,7 @@
 'php5-pgsql',
 'php5-sqlite',
 'php5-tidy',
+'php5-xdebug',
 ]: ensure = present,
   }
 
diff --git a/modules/contint/manifests/website.pp 
b/modules/contint/manifests/website.pp
index 667626a..29b03c6 100644
--- a/modules/contint/manifests/website.pp
+++ b/modules/contint/manifests/website.pp
@@ -24,6 +24,13 @@
 owner  = 'www-data',
 group  = 'wikidev',
   }
+  # MediaWiki code coverage
+  file { '/srv/org/mediawiki/integration/coverage':
+ensure = directory,
+mode   = '0775',
+owner  = 'jenkins',
+group  = 'wikidev',
+  }
 
   # Apache configuration for integration.mediawiki.org
   file { '/etc/apache2/sites-available/integration.mediawiki.org':

-- 
To view, visit https://gerrit.wikimedia.org/r/53531
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I074bd194e84ea9d9d8263908fc6f1769ab840839
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Faidon fai...@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 new extension: NavigationTiming - change (mediawiki/core)

2013-03-14 Thread Ori.livneh (Code Review) 
Ori.livneh has submitted this change and it was merged.

Change subject: Add new extension: NavigationTiming
..


Add new extension: NavigationTiming

NavigationTiming is an extension for logging perceived latency
measurements, exposed by browsers as part of the proposed Navigation
Timing API, using EventLogging.

Change-Id: Id5d1bd8e931aaa9b8407fde5ec1bd9011e6adc6e
---
M .gitmodules
A extensions/NavigationTiming
2 files changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/.gitmodules b/.gitmodules
index edda282..9d0ac8e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -445,3 +445,6 @@
 [submodule extensions/Wikibase]
path = extensions/Wikibase
url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Wikibase.git
+[submodule extensions/NavigationTiming]
+   path = extensions/NavigationTiming
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/NavigationTiming.git
diff --git a/extensions/NavigationTiming b/extensions/NavigationTiming
new file mode 16
index 000..8e78572
--- /dev/null
+++ b/extensions/NavigationTiming
+Subproject commit 8e78572ec2ade116b8cd3dda74b251b91935da9a

-- 
To view, visit https://gerrit.wikimedia.org/r/53739
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id5d1bd8e931aaa9b8407fde5ec1bd9011e6adc6e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.21wmf11
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] Add converted namespace names as aliases to avoid confusion. - change (mediawiki/core)

2013-03-14 Thread Liangent (Code Review) 
Liangent has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53740


Change subject: Add converted namespace names as aliases to avoid confusion.
..

Add converted namespace names as aliases to avoid confusion.

Currently if the site language is zh and a user is using variant zh-tw,
namespace names from zh-hant are displayed because of the language
converter, but they're not accepted by MediaWiki as valid namespace names
by default because zh falls back to zh-hans.

For core namespaces, all converted namespace names are manually added as
$namespaceAliases in MessagesZh.php but it's not always done in extensions.
With this patch converted namespace names are automatically added as
namespace aliases when namespace aliases are loaded.

In some followup commit it makes sense to remove existing core namespace
aliases which were created for this reason.

Change-Id: I01873d9c64a9943afbb655d6203cec9ebd39fb72
---
M languages/Language.php
M languages/LanguageConverter.php
2 files changed, 18 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/40/53740/1

diff --git a/languages/Language.php b/languages/Language.php
index 01751db..fa4cef4 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -662,7 +662,18 @@
}
}
 
-   $this-namespaceAliases = $aliases;
+   # Also add converted namespace names as aliases, to 
avoid confusion.
+   $convertedNames = array();
+   foreach ( $this-getVariants() as $variant ) {
+   if ( $variant === $this-mCode ) {
+   continue;
+   }
+   foreach ( $this-getNamespaces() as $ns = $_ ) 
{
+   
$convertedNames[$this-getConverter()-convertNamespace( $ns, $variant )] = $ns;
+   }
+   }
+
+   $this-namespaceAliases = $aliases + $convertedNames;
}
return $this-namespaceAliases;
}
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 43afe65..ae948b2 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -551,7 +551,7 @@
$variant = $this-getPreferredVariant();
$index = $title-getNamespace();
if ( $index !== NS_MAIN ) {
-   $text = $this-convertNamespace( $index ) . ':';
+   $text = $this-convertNamespace( $index, $variant ) . 
':';
} else {
$text = '';
}
@@ -563,10 +563,13 @@
 * Get the namespace display name in the preferred variant.
 *
 * @param $index int namespace id
+* @param $variant string|null variant code or null for preferred 
variant
 * @return String: namespace name for display
 */
-   public function convertNamespace( $index ) {
-   $variant = $this-getPreferredVariant();
+   public function convertNamespace( $index, $variant = null ) {
+   if ( $variant === null ) {
+   $variant = $this-getPreferredVariant();
+   }
if ( $index === NS_MAIN ) {
return '';
} else {

-- 
To view, visit https://gerrit.wikimedia.org/r/53740
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I01873d9c64a9943afbb655d6203cec9ebd39fb72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Liangent liang...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Styling adjustments for self-translations - change (mediawiki...Translate)

2013-03-14 Thread Pginer (Code Review) 
Pginer has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53741


Change subject: Styling adjustments for self-translations
..

Styling adjustments for self-translations

Adjustment of style for translations from the current user in proofreading mode.

Change-Id: Ifc5ac0eba16622eaca845b9d04ac853aee8e4ee3
---
M resources/css/ext.translate.proofread.css
1 file changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/41/53741/1

diff --git a/resources/css/ext.translate.proofread.css 
b/resources/css/ext.translate.proofread.css
index 823d546..47dc439 100644
--- a/resources/css/ext.translate.proofread.css
+++ b/resources/css/ext.translate.proofread.css
@@ -54,9 +54,15 @@
right: -5px;
 }
 
+.ext-translate-container .tux-messagelist 
.tux-message-proofread.own-translation,
+.ext-translate-container .tux-messagelist 
.tux-message-proofread.own-translation:hover {
+   background: #FBFBFB;
+}
+
 .translated-by-self {
+   color: #777;
text-align: right;
-   font-size: x-small;
+   font-size: 12px;
margin-right: 5px;
padding-top: 18px; /* Icon height + 3px */
/* @embed */

-- 
To view, visit https://gerrit.wikimedia.org/r/53741
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc5ac0eba16622eaca845b9d04ac853aee8e4ee3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Pginer pgi...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] import web files from puppet - change (integration/docroot)

2013-03-14 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53743


Change subject: import web files from puppet
..

import web files from puppet

Change-Id: I2d1a12008b9245f66b08e87d5db810b8cee1822a
---
A org/mediawiki/integration/WLMMobile/HEADER.html
A org/mediawiki/integration/WLMMobile/README.html
A org/mediawiki/integration/WikipediaMobile/HEADER.html
A org/mediawiki/integration/WikipediaMobile/README.html
A org/mediawiki/integration/WiktionaryMobile/HEADER.html
A org/mediawiki/integration/WiktionaryMobile/README.html
A org/mediawiki/integration/index.html
A org/mediawiki/integration/nightly.css
8 files changed, 217 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/docroot 
refs/changes/43/53743/1

diff --git a/org/mediawiki/integration/WLMMobile/HEADER.html 
b/org/mediawiki/integration/WLMMobile/HEADER.html
new file mode 100644
index 000..4653648
--- /dev/null
+++ b/org/mediawiki/integration/WLMMobile/HEADER.html
@@ -0,0 +1,17 @@
+!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN 
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;
+html xmlns=http://www.w3.org/1999/xhtml; lang=en xml:lang=en
+head
+   titleWLMMobile nightly builds/title
+   link rel=stylesheet href=../../nightly.css type=text/css /
+   meta name=viewport content=width=device-width, initial-scale=1.0, 
maximum-scale=1.0, user-scalable=no /
+/head
+body
+
+h1WLMMobile nightly builds/h1
+h2Only for testing purposes!/h2
+p
+WLMMobile nightly builds are automatically generated from time to time.
+For more information, have a look at our a 
href=https://github.com/wikimedia/WLMMobile;github project page/a./p
+p
+The very latest build is a 
href=WLMMobile_latest.apkWLMMobile_latest.apk/a.
+/p
diff --git a/org/mediawiki/integration/WLMMobile/README.html 
b/org/mediawiki/integration/WLMMobile/README.html
new file mode 100644
index 000..dc49a06
--- /dev/null
+++ b/org/mediawiki/integration/WLMMobile/README.html
@@ -0,0 +1,5 @@
+div id=footer
+Wikimedia Foundation 2012
+/div
+/body
+/html
diff --git a/org/mediawiki/integration/WikipediaMobile/HEADER.html 
b/org/mediawiki/integration/WikipediaMobile/HEADER.html
new file mode 100644
index 000..a5c98a4
--- /dev/null
+++ b/org/mediawiki/integration/WikipediaMobile/HEADER.html
@@ -0,0 +1,17 @@
+!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN 
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;
+html xmlns=http://www.w3.org/1999/xhtml; lang=en xml:lang=en
+head
+   titleWikipediaMobile nightly builds/title
+   link rel=stylesheet href=../../nightly.css type=text/css /
+   meta name=viewport content=width=device-width, initial-scale=1.0, 
maximum-scale=1.0, user-scalable=no /
+/head
+body
+
+h1WikipediaMobile nightly builds/h1
+h2Only for testing purposes!/h2
+p
+WikipediaMobile nightly builds are automatically generated from time to time.
+For more information, have a look at our a 
href=https://github.com/wikimedia/WikipediaMobile;github project page/a./p
+p
+The very latest build is a 
href=Wikipedia_latest.apkWikipedia_latest.apk/a.
+/p
diff --git a/org/mediawiki/integration/WikipediaMobile/README.html 
b/org/mediawiki/integration/WikipediaMobile/README.html
new file mode 100644
index 000..dc49a06
--- /dev/null
+++ b/org/mediawiki/integration/WikipediaMobile/README.html
@@ -0,0 +1,5 @@
+div id=footer
+Wikimedia Foundation 2012
+/div
+/body
+/html
diff --git a/org/mediawiki/integration/WiktionaryMobile/HEADER.html 
b/org/mediawiki/integration/WiktionaryMobile/HEADER.html
new file mode 100644
index 000..53b972e
--- /dev/null
+++ b/org/mediawiki/integration/WiktionaryMobile/HEADER.html
@@ -0,0 +1,17 @@
+!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN 
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;
+html xmlns=http://www.w3.org/1999/xhtml; lang=en xml:lang=en
+head
+   titleWiktionaryMobile nightly builds/title
+   link rel=stylesheet href=../../nightly.css type=text/css /
+   meta name=viewport content=width=device-width, initial-scale=1.0, 
maximum-scale=1.0, user-scalable=no /
+/head
+body
+
+h1WiktionaryMobile nightly builds/h1
+h2Only for testing purposes!/h2
+p
+WiktionaryMobile nightly builds are automatically generated from time to time.
+For more information, have a look at our a 
href=https://github.com/wikimedia/WiktionaryMobile;github project 
page/a./p
+p
+The very latest build is a 
href=Wiktionary_latest.apkWiktionary_latest.apk/a.
+/p
diff --git a/org/mediawiki/integration/WiktionaryMobile/README.html 
b/org/mediawiki/integration/WiktionaryMobile/README.html
new file mode 100644
index 000..dc49a06
--- /dev/null
+++ b/org/mediawiki/integration/WiktionaryMobile/README.html
@@ -0,0 +1,5 @@
+div id=footer
+Wikimedia Foundation 2012
+/div
+/body
+/html
diff --git a/org/mediawiki/integration/index.html 
b/org/mediawiki/integration/index.html
new file mode 100644
index 000..8a1a56d
---

[MediaWiki-commits] [Gerrit] remove contint web material - change (operations/puppet)

2013-03-14 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53744


Change subject: remove contint web material
..

remove contint web material

We used puppet to maintain the continuous integration webportal at
http://integration.mediawiki.org/, that in turn require us to ask ops to
merge the changes for which you guys have no real added value.

I have migrated all those files to the integration/docroot.git
repository with  https://gerrit.wikimedia.org/r/53743  That will let us
deploy updates of the website without vasting ops precious time.

Change-Id: Ie6a53bd73a5d8d72278191d94f299cb13230661e
---
D files/misc/jenkins/WLMMobile/HEADER.html
D files/misc/jenkins/WLMMobile/README.html
D files/misc/jenkins/WikipediaMobile/HEADER.html
D files/misc/jenkins/WikipediaMobile/README.html
D files/misc/jenkins/WiktionaryMobile/HEADER.html
D files/misc/jenkins/WiktionaryMobile/README.html
D files/misc/jenkins/index.html
D files/misc/jenkins/nightly.css
M manifests/misc/contint.pp
9 files changed, 0 insertions(+), 266 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/44/53744/1

diff --git a/files/misc/jenkins/WLMMobile/HEADER.html 
b/files/misc/jenkins/WLMMobile/HEADER.html
deleted file mode 100644
index 4653648..000
--- a/files/misc/jenkins/WLMMobile/HEADER.html
+++ /dev/null
@@ -1,17 +0,0 @@
-!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN 
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;
-html xmlns=http://www.w3.org/1999/xhtml; lang=en xml:lang=en
-head
-   titleWLMMobile nightly builds/title
-   link rel=stylesheet href=../../nightly.css type=text/css /
-   meta name=viewport content=width=device-width, initial-scale=1.0, 
maximum-scale=1.0, user-scalable=no /
-/head
-body
-
-h1WLMMobile nightly builds/h1
-h2Only for testing purposes!/h2
-p
-WLMMobile nightly builds are automatically generated from time to time.
-For more information, have a look at our a 
href=https://github.com/wikimedia/WLMMobile;github project page/a./p
-p
-The very latest build is a 
href=WLMMobile_latest.apkWLMMobile_latest.apk/a.
-/p
diff --git a/files/misc/jenkins/WLMMobile/README.html 
b/files/misc/jenkins/WLMMobile/README.html
deleted file mode 100644
index dc49a06..000
--- a/files/misc/jenkins/WLMMobile/README.html
+++ /dev/null
@@ -1,5 +0,0 @@
-div id=footer
-Wikimedia Foundation 2012
-/div
-/body
-/html
diff --git a/files/misc/jenkins/WikipediaMobile/HEADER.html 
b/files/misc/jenkins/WikipediaMobile/HEADER.html
deleted file mode 100644
index a5c98a4..000
--- a/files/misc/jenkins/WikipediaMobile/HEADER.html
+++ /dev/null
@@ -1,17 +0,0 @@
-!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN 
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;
-html xmlns=http://www.w3.org/1999/xhtml; lang=en xml:lang=en
-head
-   titleWikipediaMobile nightly builds/title
-   link rel=stylesheet href=../../nightly.css type=text/css /
-   meta name=viewport content=width=device-width, initial-scale=1.0, 
maximum-scale=1.0, user-scalable=no /
-/head
-body
-
-h1WikipediaMobile nightly builds/h1
-h2Only for testing purposes!/h2
-p
-WikipediaMobile nightly builds are automatically generated from time to time.
-For more information, have a look at our a 
href=https://github.com/wikimedia/WikipediaMobile;github project page/a./p
-p
-The very latest build is a 
href=Wikipedia_latest.apkWikipedia_latest.apk/a.
-/p
diff --git a/files/misc/jenkins/WikipediaMobile/README.html 
b/files/misc/jenkins/WikipediaMobile/README.html
deleted file mode 100644
index dc49a06..000
--- a/files/misc/jenkins/WikipediaMobile/README.html
+++ /dev/null
@@ -1,5 +0,0 @@
-div id=footer
-Wikimedia Foundation 2012
-/div
-/body
-/html
diff --git a/files/misc/jenkins/WiktionaryMobile/HEADER.html 
b/files/misc/jenkins/WiktionaryMobile/HEADER.html
deleted file mode 100644
index 53b972e..000
--- a/files/misc/jenkins/WiktionaryMobile/HEADER.html
+++ /dev/null
@@ -1,17 +0,0 @@
-!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN 
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;
-html xmlns=http://www.w3.org/1999/xhtml; lang=en xml:lang=en
-head
-   titleWiktionaryMobile nightly builds/title
-   link rel=stylesheet href=../../nightly.css type=text/css /
-   meta name=viewport content=width=device-width, initial-scale=1.0, 
maximum-scale=1.0, user-scalable=no /
-/head
-body
-
-h1WiktionaryMobile nightly builds/h1
-h2Only for testing purposes!/h2
-p
-WiktionaryMobile nightly builds are automatically generated from time to time.
-For more information, have a look at our a 
href=https://github.com/wikimedia/WiktionaryMobile;github project 
page/a./p
-p
-The very latest build is a 
href=Wiktionary_latest.apkWiktionary_latest.apk/a.
-/p
diff --git a/files/misc/jenkins/WiktionaryMobile/README.html 
b/files/misc/jenkins/WiktionaryMobile/README.html
deleted file mode 100644
index dc49a06..000
---

[MediaWiki-commits] [Gerrit] (Bug 45959) - [TUX] Workflow state selector hard to hide/de-... - change (mediawiki...Translate)

2013-03-14 Thread Santhosh (Code Review) 
Santhosh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53745


Change subject: (Bug 45959) - [TUX] Workflow state selector hard to 
hide/de-expand
..

(Bug 45959) - [TUX] Workflow state selector hard to hide/de-expand

Change-Id: I8dca0dd859b700eddd1b68e27001aa08188ea82c
---
M resources/js/ext.translate.special.translate.js
1 file changed, 9 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/45/53745/1

diff --git a/resources/js/ext.translate.special.translate.js 
b/resources/js/ext.translate.special.translate.js
index dd1259a..6406257 100644
--- a/resources/js/ext.translate.special.translate.js
+++ b/resources/js/ext.translate.special.translate.js
@@ -373,8 +373,10 @@
 
// Workflow state selector
$translateContainer.find( '.tux-workflow-status' )
-   .on( 'click', function () {
+   .on( 'click', function ( e ) {
$( this ).next( 'ul' ).toggleClass( 'hide' );
+   e.preventDefault();
+   e.stopPropagation();
} );
 
$translateContainer.find( '.tux-workflow-status-selector li' )
@@ -451,6 +453,12 @@
mw.translate.changeUrl( { optional: checked ? 1 : 0 } );
mw.translate.changeFilter( uri.query.filter );
} );
+
+   // Hide the workflow selector when clicking outside of it
+   $( 'html' ).on( 'click', function () {
+   $( 'ul.tux-workflow-status-selector' ).addClass( 'hide' 
);
+   } );
+
} );
 
 }( jQuery, mediaWiki ) );

-- 
To view, visit https://gerrit.wikimedia.org/r/53745
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8dca0dd859b700eddd1b68e27001aa08188ea82c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] postmerge for integration/docroot - change (integration/zuul-config)

2013-03-14 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53746


Change subject: postmerge for integration/docroot
..

postmerge for integration/docroot

Whenever a change is merged in integration/docroot we will run the
Jenkins job integration-docroot-deploy which will pull the new change on
gallium thus updating the websites :-]

Change-Id: I9ddfcf652851b5ea376178a04ba71854b7075bd8
---
M layout.yaml
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config 
refs/changes/46/53746/1

diff --git a/layout.yaml b/layout.yaml
index 337af0b..f369dcd 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -411,6 +411,10 @@
 check-voter:
   - labs-nagios-builder-pep8
 
+  - name: integration/docroot
+postmerge:
+ - integration-docroot-deploy
+
   - name: mediawiki/tools/code-utils
 check-voter:
  - mw-tools-codeutils-pep8

-- 
To view, visit https://gerrit.wikimedia.org/r/53746
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ddfcf652851b5ea376178a04ba71854b7075bd8
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] postmerge for integration/docroot - change (integration/zuul-config)

2013-03-14 Thread Hashar (Code Review) 
Hashar has submitted this change and it was merged.

Change subject: postmerge for integration/docroot
..


postmerge for integration/docroot

Whenever a change is merged in integration/docroot we will run the
Jenkins job integration-docroot-deploy which will pull the new change on
gallium thus updating the websites :-]

Change-Id: I9ddfcf652851b5ea376178a04ba71854b7075bd8
---
M layout.yaml
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Verified; Looks good to me, approved



diff --git a/layout.yaml b/layout.yaml
index 337af0b..f369dcd 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -411,6 +411,10 @@
 check-voter:
   - labs-nagios-builder-pep8
 
+  - name: integration/docroot
+postmerge:
+ - integration-docroot-deploy
+
   - name: mediawiki/tools/code-utils
 check-voter:
  - mw-tools-codeutils-pep8

-- 
To view, visit https://gerrit.wikimedia.org/r/53746
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ddfcf652851b5ea376178a04ba71854b7075bd8
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] (Bug 45013) Remove duplicate aliases - change (mediawiki...Wikibase)

2013-03-14 Thread Tobias Gritschacher (Code Review) 
Tobias Gritschacher has submitted this change and it was merged.

Change subject: (Bug 45013) Remove duplicate aliases
..


(Bug 45013) Remove duplicate aliases

This changeset will remove duplicates both on set, add and remove
operations so the store does not holds duplicate aliases for a
single entity. It will also remove them in get operations so they
will not show up in reports or in the UI even if they do exist in
the store. They will although show up in the diff after new set,
add or remove operations. Slowly all erroneous entries should go
away, but it will take some time. When the store is clean the
uniquness filter on get operations can be removed, but it should
not be very important to do that.

This changeset seems to not interfer with normal use of the UI
or the EditConflict handling, that is the diff-patch operations.
Still check that normal operation is not hampered after merging
this, and as soon as possible check that existing erroneous
items can be clensed for duplicates. That means inspect the
database for some of those items before and after set, add and
remove.

Change-Id: I847513a2d640fd8c6c554d33102e1aa0d35166e6
---
M lib/includes/entity/Entity.php
M lib/tests/phpunit/entity/EntityTest.php
2 files changed, 22 insertions(+), 6 deletions(-)

Approvals:
  Tobias Gritschacher: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/lib/includes/entity/Entity.php b/lib/includes/entity/Entity.php
index 3dce23e..9da117c 100644
--- a/lib/includes/entity/Entity.php
+++ b/lib/includes/entity/Entity.php
@@ -282,6 +282,7 @@
 
/**
 * Returns the aliases for the item in the language with the specified 
code.
+* TODO: decide on how to deal with duplicates, it is assumed all 
duplicates should be removed
 *
 * @since 0.1
 *
@@ -291,12 +292,13 @@
 */
public function getAliases( $languageCode ) {
return array_key_exists( $languageCode, $this-data['aliases'] 
) ?
-   $this-data['aliases'][$languageCode] : array();
+   array_unique( $this-data['aliases'][$languageCode] ) : 
array();
}
 
/**
 * Returns all the aliases for the item.
 * The result is an array with language codes pointing to an array of 
aliases in the language they specify.
+* TODO: decide on how to deal with duplicates, it is assumed all 
duplicates should be removed
 *
 * @since 0.1
 *
@@ -311,11 +313,17 @@
$textList = array_intersect_key( $textList, array_flip( 
$languages ) );
}
 
+   $textList = array_map(
+   'array_unique',
+   $textList
+   );
+
return $textList;
}
 
/**
 * Sets the aliases for the item in the language with the specified 
code.
+* TODO: decide on how to deal with duplicates, it is assumed all 
duplicates should be removed
 *
 * @since 0.1
 *
@@ -323,12 +331,12 @@
 * @param array $aliases
 */
public function setAliases( $languageCode, array $aliases ) {
-   $this-data['aliases'][$languageCode] = $aliases;
+   $this-data['aliases'][$languageCode] = array_unique( $aliases 
);
}
 
/**
 * Add the provided aliases to the aliases list of the item in the 
language with the specified code.
-* TODO: decide on how to deal with duplicates
+* TODO: decide on how to deal with duplicates, it is assumed all 
duplicates should be removed
 *
 * @since 0.1
 *
@@ -347,6 +355,7 @@
 
/**
 * Removed the provided aliases from the aliases list of the item in 
the language with the specified code.
+* TODO: decide on how to deal with duplicates, it is assumed all 
duplicates should be removed
 *
 * @since 0.1
 *
diff --git a/lib/tests/phpunit/entity/EntityTest.php 
b/lib/tests/phpunit/entity/EntityTest.php
index 645fb73..8b75a94 100644
--- a/lib/tests/phpunit/entity/EntityTest.php
+++ b/lib/tests/phpunit/entity/EntityTest.php
@@ -190,6 +190,13 @@
'en' = array( array( 'foo', 'bar', 'baz' ) ),
'de' = array( array( 'foobar' ), array( 'baz' 
) ),
) ),
+   // with duplicates
+   array( array(
+   'en' = array( array( 'spam', 'ham', 'ham' ) )
+   ) ),
+   array( array(
+   'en' = array( array( 'foo', 'bar' ), array( 
'bar', 'spam' ) )
+   ) ),
);
}
 
@@ -206,7 +213,7 @@
}
 
foreach ( $aliasesLists as $langCode = $aliasesList ) {
-

[MediaWiki-commits] [Gerrit] integration/docroot only for master, and tweak messages - change (integration/zuul-config)

2013-03-14 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53747


Change subject: integration/docroot only for master, and tweak messages
..

integration/docroot only for master, and tweak messages

Change-Id: I7ed58d03c18845f782a434b425cb501f612ff038
---
M layout.yaml
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config 
refs/changes/47/53747/1

diff --git a/layout.yaml b/layout.yaml
index f369dcd..663e6b6 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -240,6 +240,10 @@
   #
   # Individual adjustments
   #
+  - name: integration-docroot-deploy
+branch: ^master$
+success-message: 'Change has been deployed on the server and should be 
live.'
+failure-message: 'FAILED to deploy change. Please contact a member of the 
continuous integration team to fixup the docroot on the destination server.'
 
   - name: mwext-EventLogging-pep8
 voting: true

-- 
To view, visit https://gerrit.wikimedia.org/r/53747
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ed58d03c18845f782a434b425cb501f612ff038
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/docroot only for master, and tweak messages - change (integration/zuul-config)

2013-03-14 Thread Hashar (Code Review) 
Hashar has submitted this change and it was merged.

Change subject: integration/docroot only for master, and tweak messages
..


integration/docroot only for master, and tweak messages

Change-Id: I7ed58d03c18845f782a434b425cb501f612ff038
---
M layout.yaml
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Verified; Looks good to me, approved



diff --git a/layout.yaml b/layout.yaml
index f369dcd..663e6b6 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -240,6 +240,10 @@
   #
   # Individual adjustments
   #
+  - name: integration-docroot-deploy
+branch: ^master$
+success-message: 'Change has been deployed on the server and should be 
live.'
+failure-message: 'FAILED to deploy change. Please contact a member of the 
continuous integration team to fixup the docroot on the destination server.'
 
   - name: mwext-EventLogging-pep8
 voting: true

-- 
To view, visit https://gerrit.wikimedia.org/r/53747
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7ed58d03c18845f782a434b425cb501f612ff038
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration-docroot-deploy - change (integration/jenkins-job-builder-config)

2013-03-14 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53748


Change subject: integration-docroot-deploy
..

integration-docroot-deploy

Automatically deploy integration/docroot in gallium /srv/

Change-Id: I8db0e7d3a21a7c2d98872312b43c2635c80e0224
---
A integration.yaml
1 file changed, 16 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/48/53748/1

diff --git a/integration.yaml b/integration.yaml
new file mode 100644
index 000..9ad030b
--- /dev/null
+++ b/integration.yaml
@@ -0,0 +1,16 @@
+- job-template:
+name: 'integration-docroot-deploy'
+defaults: global
+triggers:
+ - zuul-post
+builders:
+ - shell: |
+#!/bin/bash -e
+cd /srv/
+git remote update
+git checkout $ZUUL_COMMIT
+
+- project:
+name: 'integration-docroot'
+jobs:
+ - 'integration-docroot-deploy'

-- 
To view, visit https://gerrit.wikimedia.org/r/53748
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8db0e7d3a21a7c2d98872312b43c2635c80e0224
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Sort use statements in SQLStore - change (mediawiki...Wikibase)

2013-03-14 Thread Tobias Gritschacher (Code Review) 
Tobias Gritschacher has submitted this change and it was merged.

Change subject: Sort use statements in SQLStore
..


Sort use statements in SQLStore

Change-Id: I154fb4373f9d99b00d017e2630efe63270e18f36
---
M repo/includes/Query/SQLStore/DVHandler/BooleanHandler.php
M repo/includes/Query/SQLStore/DVHandler/EntityIdHandler.php
M repo/includes/Query/SQLStore/DVHandler/GeoCoordinateHandler.php
M repo/includes/Query/SQLStore/DVHandler/IriHandler.php
M repo/includes/Query/SQLStore/DVHandler/MonolingualTextHandler.php
M repo/includes/Query/SQLStore/DVHandler/NumberHandler.php
M repo/includes/Query/SQLStore/DVHandler/StringHandler.php
M repo/includes/Query/SQLStore/DataValueHandler.php
M repo/includes/Query/SQLStore/Engine.php
M repo/includes/Query/SQLStore/Setup.php
M repo/includes/Query/SQLStore/Store.php
M repo/includes/Query/SQLStore/Updater.php
12 files changed, 37 insertions(+), 39 deletions(-)

Approvals:
  Tobias Gritschacher: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/repo/includes/Query/SQLStore/DVHandler/BooleanHandler.php 
b/repo/includes/Query/SQLStore/DVHandler/BooleanHandler.php
index e073cb8..60b8a21 100644
--- a/repo/includes/Query/SQLStore/DVHandler/BooleanHandler.php
+++ b/repo/includes/Query/SQLStore/DVHandler/BooleanHandler.php
@@ -2,12 +2,12 @@
 
 namespace Wikibase\Repo\Query\SQLStore\DVHandler;
 
-use Wikibase\Repo\Query\SQLStore\DataValueHandler;
-use Wikibase\Repo\Database\TableDefinition;
-use Wikibase\Repo\Database\FieldDefinition;
-use DataValues\DataValue;
 use DataValues\BooleanValue;
+use DataValues\DataValue;
 use InvalidArgumentException;
+use Wikibase\Repo\Database\FieldDefinition;
+use Wikibase\Repo\Database\TableDefinition;
+use Wikibase\Repo\Query\SQLStore\DataValueHandler;
 
 /**
  * Represents the mapping between Wikibase\BooleanValue and
diff --git a/repo/includes/Query/SQLStore/DVHandler/EntityIdHandler.php 
b/repo/includes/Query/SQLStore/DVHandler/EntityIdHandler.php
index 8381802..49f0447 100644
--- a/repo/includes/Query/SQLStore/DVHandler/EntityIdHandler.php
+++ b/repo/includes/Query/SQLStore/DVHandler/EntityIdHandler.php
@@ -2,12 +2,12 @@
 
 namespace Wikibase\Repo\Query\SQLStore\DVHandler;
 
-use Wikibase\Repo\Query\SQLStore\DataValueHandler;
-use Wikibase\Repo\Database\TableDefinition;
-use Wikibase\Repo\Database\FieldDefinition;
 use DataValues\DataValue;
-use Wikibase\EntityId;
 use InvalidArgumentException;
+use Wikibase\EntityId;
+use Wikibase\Repo\Database\FieldDefinition;
+use Wikibase\Repo\Database\TableDefinition;
+use Wikibase\Repo\Query\SQLStore\DataValueHandler;
 
 /**
  * Represents the mapping between Wikibase\EntityId and
diff --git a/repo/includes/Query/SQLStore/DVHandler/GeoCoordinateHandler.php 
b/repo/includes/Query/SQLStore/DVHandler/GeoCoordinateHandler.php
index 99fa5c1..722fcbc 100644
--- a/repo/includes/Query/SQLStore/DVHandler/GeoCoordinateHandler.php
+++ b/repo/includes/Query/SQLStore/DVHandler/GeoCoordinateHandler.php
@@ -2,12 +2,12 @@
 
 namespace Wikibase\Repo\Query\SQLStore\DVHandler;
 
-use Wikibase\Repo\Query\SQLStore\DataValueHandler;
-use Wikibase\Repo\Database\TableDefinition;
-use Wikibase\Repo\Database\FieldDefinition;
 use DataValues\DataValue;
 use DataValues\GeoCoordinateValue;
 use InvalidArgumentException;
+use Wikibase\Repo\Database\FieldDefinition;
+use Wikibase\Repo\Database\TableDefinition;
+use Wikibase\Repo\Query\SQLStore\DataValueHandler;
 
 /**
  * Represents the mapping between DataValues\GeoCoordinateValue and
diff --git a/repo/includes/Query/SQLStore/DVHandler/IriHandler.php 
b/repo/includes/Query/SQLStore/DVHandler/IriHandler.php
index 4dc25a5..e507134 100644
--- a/repo/includes/Query/SQLStore/DVHandler/IriHandler.php
+++ b/repo/includes/Query/SQLStore/DVHandler/IriHandler.php
@@ -2,13 +2,13 @@
 
 namespace Wikibase\Repo\Query\SQLStore\DVHandler;
 
-use Wikibase\Repo\Query\SQLStore\DataValueHandler;
-use Wikibase\Repo\Database\TableDefinition;
-use Wikibase\Repo\Database\FieldDefinition;
-use Wikibase\Repo\Database\FieldDefinition as FD;
 use DataValues\DataValue;
 use DataValues\IriValue;
 use InvalidArgumentException;
+use Wikibase\Repo\Database\FieldDefinition;
+use Wikibase\Repo\Database\FieldDefinition as FD;
+use Wikibase\Repo\Database\TableDefinition;
+use Wikibase\Repo\Query\SQLStore\DataValueHandler;
 
 /**
  * Represents the mapping between DataValues\IriValue and
diff --git a/repo/includes/Query/SQLStore/DVHandler/MonolingualTextHandler.php 
b/repo/includes/Query/SQLStore/DVHandler/MonolingualTextHandler.php
index af658d8..24e2522 100644
--- a/repo/includes/Query/SQLStore/DVHandler/MonolingualTextHandler.php
+++ b/repo/includes/Query/SQLStore/DVHandler/MonolingualTextHandler.php
@@ -2,12 +2,12 @@
 
 namespace Wikibase\Repo\Query\SQLStore\DVHandler;
 
-use Wikibase\Repo\Query\SQLStore\DataValueHandler;
-use Wikibase\Repo\Database\TableDefinition;
-use Wikibase\Repo\Database\FieldDefinition;
 use

[MediaWiki-commits] [Gerrit] Correct name of can(Node)HaveGrandchildren functions - change (mediawiki...VisualEditor)

2013-03-14 Thread Esanders (Code Review) 
Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53750


Change subject: Correct name of can(Node)HaveGrandchildren functions
..

Correct name of can(Node)HaveGrandchildren functions

Bug: 43893
Change-Id: I9fd2a1fd6e3ee0a7bdfc357b5d4e4e0fd3efa0a5
---
M modules/ve/ce/ve.ce.BranchNode.js
M modules/ve/ce/ve.ce.Node.js
M modules/ve/ce/ve.ce.SurfaceObserver.js
M modules/ve/dm/ve.dm.Document.js
M modules/ve/dm/ve.dm.Node.js
M modules/ve/dm/ve.dm.NodeFactory.js
M modules/ve/test/ce/ve.ce.BranchNode.test.js
M modules/ve/test/ce/ve.ce.LeafNode.test.js
M modules/ve/test/dm/ve.dm.BranchNode.test.js
M modules/ve/test/dm/ve.dm.LeafNode.test.js
M modules/ve/test/dm/ve.dm.Node.test.js
M modules/ve/test/dm/ve.dm.NodeFactory.test.js
M modules/ve/ve.Document.js
M modules/ve/ve.Node.js
14 files changed, 37 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/50/53750/1

diff --git a/modules/ve/ce/ve.ce.BranchNode.js 
b/modules/ve/ce/ve.ce.BranchNode.js
index f705f18..2bc6c48 100644
--- a/modules/ve/ce/ve.ce.BranchNode.js
+++ b/modules/ve/ce/ve.ce.BranchNode.js
@@ -230,7 +230,7 @@
delete this.slugs[key];
}
 
-   if ( this.canHaveGrandchildren() ) {
+   if ( this.canHaveChildrenNotContent() ) {
$slug = ve.ce.BranchNode.$blockSlugTemplate.clone();
} else {
$slug = ve.ce.BranchNode.$inlineSlugTemplate.clone();
diff --git a/modules/ve/ce/ve.ce.Node.js b/modules/ve/ce/ve.ce.Node.js
index 3b9d0f9..6332f14 100644
--- a/modules/ve/ce/ve.ce.Node.js
+++ b/modules/ve/ce/ve.ce.Node.js
@@ -160,15 +160,15 @@
 };
 
 /**
- * Check if the node can have grandchildren.
+ * Check if the node can have children but not content nor be content.
  *
  * This method passes through to the model.
  *
  * @method
- * @returns {boolean} Model node can have grandchildren
+ * @returns {boolean} Model node can have children but not content nor be 
content
  */
-ve.ce.Node.prototype.canHaveGrandchildren = function () {
-   return this.model.canHaveGrandchildren();
+ve.ce.Node.prototype.canHaveChildrenNotContent = function () {
+   return this.model.canHaveChildrenNotContent();
 };
 
 /**
diff --git a/modules/ve/ce/ve.ce.SurfaceObserver.js 
b/modules/ve/ce/ve.ce.SurfaceObserver.js
index 833215d..879f411 100644
--- a/modules/ve/ce/ve.ce.SurfaceObserver.js
+++ b/modules/ve/ce/ve.ce.SurfaceObserver.js
@@ -125,7 +125,7 @@
$branch = $( rangyRange.anchorNode ).closest( 
'.ve-ce-branchNode' );
if ( $branch.length ) {
node = $branch.data( 'node' );
-   if ( node.canHaveGrandchildren() ) {
+   if ( node.canHaveChildrenNotContent() ) {
node = null;
} else {
range = rangyRange.getRange();
diff --git a/modules/ve/dm/ve.dm.Document.js b/modules/ve/dm/ve.dm.Document.js
index c8ba4e0..8d048df 100644
--- a/modules/ve/dm/ve.dm.Document.js
+++ b/modules/ve/dm/ve.dm.Document.js
@@ -353,7 +353,7 @@
// Inside empty element
'/' + left.type === right.type 
// Both are non-content branches (right is the 
same type)
-   factory.canNodeHaveGrandchildren( left.type ) 
+   factory.canNodeHaveChildrenNotContent( 
left.type ) 
(
// Only apply this rule in unrestricted 
mode
!unrestricted ||
diff --git a/modules/ve/dm/ve.dm.Node.js b/modules/ve/dm/ve.dm.Node.js
index a53b05a..acf357c 100644
--- a/modules/ve/dm/ve.dm.Node.js
+++ b/modules/ve/dm/ve.dm.Node.js
@@ -315,13 +315,13 @@
 };
 
 /**
- * Check if the node can have grandchildren.
+ * Check if the node can have children but not content nor be content.
  *
  * @method
- * @returns {boolean} Node can have grandchildren
+ * @returns {boolean} Node can have children but not content nor be content
  */
-ve.dm.Node.prototype.canHaveGrandchildren = function () {
-   return ve.dm.nodeFactory.canNodeHaveGrandchildren( this.type );
+ve.dm.Node.prototype.canHaveChildrenNotContent = function () {
+   return ve.dm.nodeFactory.canNodeHaveChildrenNotContent( this.type );
 };
 
 /**
diff --git a/modules/ve/dm/ve.dm.NodeFactory.js 
b/modules/ve/dm/ve.dm.NodeFactory.js
index df364e1..b116d31 100644
--- a/modules/ve/dm/ve.dm.NodeFactory.js
+++ b/modules/ve/dm/ve.dm.NodeFactory.js
@@ -108,14 +108,14 @@
 };
 
 /**
- * Check if a node can have grandchildren.
+ * Check if a node can have children but not content nor be content.
  *
  * @method
  * @param {string} type Node type
- * @returns {boolean} The node can have grandchildren
+ * @returns {boolean} The node

[MediaWiki-commits] [Gerrit] failsafe to make sure that feedback that doesn't get archive... - change (mediawiki...ArticleFeedbackv5)

2013-03-14 Thread Matthias Mullie (Code Review) 
Matthias Mullie has submitted this change and it was merged.

Change subject: failsafe to make sure that feedback that doesn't get archived, 
does not continue to show up in archive_scheduled
..


failsafe to make sure that feedback that doesn't get archived, does not 
continue to show up in archive_scheduled

Change-Id: Ia7db0db8799ea535fbe614838949b83182c0f841
---
M maintenance/archiveFeedback.php
1 file changed, 8 insertions(+), 2 deletions(-)

Approvals:
  Matthias Mullie: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/maintenance/archiveFeedback.php b/maintenance/archiveFeedback.php
index 1f75c0a..dc78c10 100644
--- a/maintenance/archiveFeedback.php
+++ b/maintenance/archiveFeedback.php
@@ -84,9 +84,15 @@
$note = wfMessage( 
'articlefeedbackv5-activity-note-archive', $days )-escaped();
 
$flagger = new 
ArticleFeedbackv5Flagging( null, $feedback-aft_id, $feedback-aft_page );
-   $flagger-run( 'archive', $note, false, 
'job' );
+   $success = $flagger-run( 'archive', 
$note, false, 'job' );
 
-   $this-completeCount++;
+   if ( $success ) {
+   $this-completeCount++;
+   } else {
+   // if we could not flag, unmark 
as archive_schedule
+   $feedback-aft_archive_date = 
null;
+   $feedback-update();
+   }
 
$break = false;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/53573
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7db0db8799ea535fbe614838949b83182c0f841
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@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] integration-docroot-deploy - change (integration/jenkins-job-builder-config)

2013-03-14 Thread Hashar (Code Review) 
Hashar has submitted this change and it was merged.

Change subject: integration-docroot-deploy
..


integration-docroot-deploy

Automatically deploy integration/docroot in gallium /srv/

Change-Id: I8db0e7d3a21a7c2d98872312b43c2635c80e0224
---
A integration.yaml
1 file changed, 17 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Verified; Looks good to me, approved



diff --git a/integration.yaml b/integration.yaml
new file mode 100644
index 000..4a2b34d
--- /dev/null
+++ b/integration.yaml
@@ -0,0 +1,17 @@
+- job-template:
+name: 'integration-docroot-deploy'
+defaults: global
+triggers:
+ - zuul
+builders:
+ - shell: |
+#!/bin/bash -e
+cd /srv/
+git remote update
+git checkout $ZUUL_COMMIT
+echo `date -R` $ZUUL_COMMIT  /srv/jenkins-autodeploy
+
+- project:
+name: 'integration-docroot'
+jobs:
+ - 'integration-docroot-deploy'

-- 
To view, visit https://gerrit.wikimedia.org/r/53748
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8db0e7d3a21a7c2d98872312b43c2635c80e0224
Gerrit-PatchSet: 3
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] rm old files - change (integration/docroot)

2013-03-14 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53751


Change subject: rm old files
..

rm old files

The root of this repository was meant to be fetched under
/srv/org/mediawiki/integration. But overtime we end up maintaing
wikimedia domains too so the root is no more serving any files. The up
to date copies comes from puppet in /srv/org/mediawiki/integration.

Change-Id: Ibfeaa10a47066f6adeccac42f50f7b312eaf3a0b
---
D index.html
D nightly.css
2 files changed, 0 insertions(+), 147 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/docroot 
refs/changes/51/53751/1

diff --git a/index.html b/index.html
deleted file mode 100644
index e405479..000
--- a/index.html
+++ /dev/null
@@ -1,89 +0,0 @@
-!DOCTYPE html
-html dir=ltr lang=en-US
-head
-   meta charset=utf-8
-   titleMediaWiki Continuous Integration/title
-   meta name=viewport content=width=device-width, initial-scale=1.0, 
maximum-scale=1.0, user-scalable=no /
-   style type=text/css
-   body {
-   margin: 0;
-   font-size: 14px;
-   line-height: 1.231;
-   font-family: sans-serif;
-   color: #333;
-   background: rgb(233, 233, 233);
-   }
-
-   h1 {
-   overflow: hidden;
-   vertical-align:middle;
-   }
-
-   div {
-   width: 700px;
-   margin: 25px auto 40px;
-   padding: 5px 20px;
-   background: white;
-   }
-
-   p {
-   color: #666;
-   }
-   img.logo {
-   float: right;
-   margin: 5px;
-   width:66px;
-   height:50px;
-   }
-   ul {
-   line-height: 1.5em;
-   }
-
-   /** Mobile overrides */
-   @media only screen and (max-width:480px) {
-   div {
-   width: auto;
-   margin: 0px 10px;
-   padding:0;
-   }
-   h1 { margin:0; }
-   ul {
-   line-height: 2em;
-   }
-   }
-   /style
-/head
-body
-   div
-   img 
src=https://upload.wikimedia.org/wikipedia/commons/3/3d/Mediawiki-logo.png; 
class=logo
-   h1Welcome!/h1
-   pThis is our continous integration server for MediaWiki./p
-   pRight now, we are running Jenkins:/p
-   ul
-   lia href=ci/Jenkins (PHPUnit/PHP)/a/li
-   lisTestSwarm (QUnit/Javascript)/s, disabled/li
-   liNightly builds:br/
-   ul
-   li
-   a href=nightly/mediawiki/core/MediaWiki Core/a 
(a href=nightly/mediawiki/core/mediawiki-latest.ziplatest/a)
-   /li
-   li
-   a href=WikipediaMobile/nightly/Wikipedia/a 
Android application
-   (github: a 
href=https://github.com/wikimedia/WikipediaMobile;WikipediaMobile/a)
-   /li
-   li
-   a href=WiktionaryMobile/nightly/Wiktionary/a 
Android application
-   (github: a 
href=https://github.com/wikimedia/WiktionaryMobile;WiktionaryMobile/a)
-   /li
-   li
-   a href=WLMMobile/nightly/Wikimedia Loves 
Monument/a Android application
-   (github: a 
href=https://github.com/wikimedia/WLMMobile;WLMMobile/a)
-   /li
-   /ul
-   /li
-   /ul
-   pOur tools are available using either HTTP or HTTPS./p
-   pQuestions? Comments? Concerns? Contact em^demon/em, 
emKrinkle/em or emhashar/em on a 
href=irc://irc.freenode.net/#mediawiki#mediawiki/a./p
-   /div
-/body
-/html
diff --git a/nightly.css b/nightly.css
deleted file mode 100644
index 4a61f87..000
--- a/nightly.css
+++ /dev/null
@@ -1,58 +0,0 @@
-body {
-   margin:0em;
-   padding: 0 1em;
-   background-color: #FFF;
-   color: #26004D;
-   font-family: monospace, Courrier New;
-}
-
-a {
-   color:black;
-}
-
-div#footer {
-   text-align:center;
-   margin-top: 3em;
-}
-
-table {
-   font-family: monospace, Courrier New;
-   margin: 1em;
-   margin-top: 2em;
-   background-color: #F9F9F9;
-   border: 1px #aaa solid;
-   border-collapse: collapse;
-   color:black;
-   margin-left:auto;
-   margin-right:auto;
-}
-table th,
-table td {
-   border: 1px #aaa solid;
-   padding: 0.2em 1em;
-}
-table th {
-   background-color: #F2F2F2;
-   text-align:center;
-}
-
-/** Mobile overrides */
-@media only screen and (max-width:480px) {
-   body { padding:0; }
-   h1 {
-   margin:0;
-   font-size:1.5em;
-

[MediaWiki-commits] [Gerrit] rm old files - change (integration/docroot)

2013-03-14 Thread Hashar (Code Review) 
Hashar has submitted this change and it was merged.

Change subject: rm old files
..


rm old files

The root of this repository was meant to be fetched under
/srv/org/mediawiki/integration. But overtime we end up maintaing
wikimedia domains too so the root is no more serving any files. The up
to date copies comes from puppet in /srv/org/mediawiki/integration.

Change-Id: Ibfeaa10a47066f6adeccac42f50f7b312eaf3a0b
---
D index.html
D nightly.css
2 files changed, 0 insertions(+), 147 deletions(-)

Approvals:
  Hashar: Verified; Looks good to me, approved



diff --git a/index.html b/index.html
deleted file mode 100644
index e405479..000
--- a/index.html
+++ /dev/null
@@ -1,89 +0,0 @@
-!DOCTYPE html
-html dir=ltr lang=en-US
-head
-   meta charset=utf-8
-   titleMediaWiki Continuous Integration/title
-   meta name=viewport content=width=device-width, initial-scale=1.0, 
maximum-scale=1.0, user-scalable=no /
-   style type=text/css
-   body {
-   margin: 0;
-   font-size: 14px;
-   line-height: 1.231;
-   font-family: sans-serif;
-   color: #333;
-   background: rgb(233, 233, 233);
-   }
-
-   h1 {
-   overflow: hidden;
-   vertical-align:middle;
-   }
-
-   div {
-   width: 700px;
-   margin: 25px auto 40px;
-   padding: 5px 20px;
-   background: white;
-   }
-
-   p {
-   color: #666;
-   }
-   img.logo {
-   float: right;
-   margin: 5px;
-   width:66px;
-   height:50px;
-   }
-   ul {
-   line-height: 1.5em;
-   }
-
-   /** Mobile overrides */
-   @media only screen and (max-width:480px) {
-   div {
-   width: auto;
-   margin: 0px 10px;
-   padding:0;
-   }
-   h1 { margin:0; }
-   ul {
-   line-height: 2em;
-   }
-   }
-   /style
-/head
-body
-   div
-   img 
src=https://upload.wikimedia.org/wikipedia/commons/3/3d/Mediawiki-logo.png; 
class=logo
-   h1Welcome!/h1
-   pThis is our continous integration server for MediaWiki./p
-   pRight now, we are running Jenkins:/p
-   ul
-   lia href=ci/Jenkins (PHPUnit/PHP)/a/li
-   lisTestSwarm (QUnit/Javascript)/s, disabled/li
-   liNightly builds:br/
-   ul
-   li
-   a href=nightly/mediawiki/core/MediaWiki Core/a 
(a href=nightly/mediawiki/core/mediawiki-latest.ziplatest/a)
-   /li
-   li
-   a href=WikipediaMobile/nightly/Wikipedia/a 
Android application
-   (github: a 
href=https://github.com/wikimedia/WikipediaMobile;WikipediaMobile/a)
-   /li
-   li
-   a href=WiktionaryMobile/nightly/Wiktionary/a 
Android application
-   (github: a 
href=https://github.com/wikimedia/WiktionaryMobile;WiktionaryMobile/a)
-   /li
-   li
-   a href=WLMMobile/nightly/Wikimedia Loves 
Monument/a Android application
-   (github: a 
href=https://github.com/wikimedia/WLMMobile;WLMMobile/a)
-   /li
-   /ul
-   /li
-   /ul
-   pOur tools are available using either HTTP or HTTPS./p
-   pQuestions? Comments? Concerns? Contact em^demon/em, 
emKrinkle/em or emhashar/em on a 
href=irc://irc.freenode.net/#mediawiki#mediawiki/a./p
-   /div
-/body
-/html
diff --git a/nightly.css b/nightly.css
deleted file mode 100644
index 4a61f87..000
--- a/nightly.css
+++ /dev/null
@@ -1,58 +0,0 @@
-body {
-   margin:0em;
-   padding: 0 1em;
-   background-color: #FFF;
-   color: #26004D;
-   font-family: monospace, Courrier New;
-}
-
-a {
-   color:black;
-}
-
-div#footer {
-   text-align:center;
-   margin-top: 3em;
-}
-
-table {
-   font-family: monospace, Courrier New;
-   margin: 1em;
-   margin-top: 2em;
-   background-color: #F9F9F9;
-   border: 1px #aaa solid;
-   border-collapse: collapse;
-   color:black;
-   margin-left:auto;
-   margin-right:auto;
-}
-table th,
-table td {
-   border: 1px #aaa solid;
-   padding: 0.2em 1em;
-}
-table th {
-   background-color: #F2F2F2;
-   text-align:center;
-}
-
-/** Mobile overrides */
-@media only screen and (max-width:480px) {
-   body { padding:0; }
-   h1 {
-   margin:0;
-   font-size:1.5em;
-   }
-   h2 {
-   margin:0.5em 0;
-

[MediaWiki-commits] [Gerrit] (bug 45540) Show the Accept tooltip to first-time proofrea... - change (mediawiki...Translate)

2013-03-14 Thread Amire80 (Code Review) 
Amire80 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53752


Change subject: (bug 45540) Show the Accept tooltip to first-time proofreaders
..

(bug 45540) Show the Accept tooltip to first-time proofreaders

Added a tux-did-proofread user preference for this.

Change-Id: Icff6250195c1c23e21eb419d2ff57a039217d4b5
---
M resources/js/ext.translate.proofread.js
M utils/UserToggles.php
2 files changed, 58 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/52/53752/1

diff --git a/resources/js/ext.translate.proofread.js 
b/resources/js/ext.translate.proofread.js
index a8459a6..e16b4db 100644
--- a/resources/js/ext.translate.proofread.js
+++ b/resources/js/ext.translate.proofread.js
@@ -20,17 +20,21 @@
 * @return {jqXHR}
 */
proofread: function ( params, ok, err ) {
-   var useTokenToPost, getTokenIfBad,
-   api = this;
+   var useTokenToPost, getTokenIfBad, promise,
+   proofreadPlugin = this,
+   api = new mw.Api(),
+   didProofreadOption = 'tux-did-proofread';
+
if ( cachedToken === null ) {
// We don't have a valid cached token, so get a 
fresh one and try posting.
// We do not trap any 'badtoken' or 'notoken' 
errors, because we don't want
// an infinite loop. If this fresh token is 
bad, something else is very wrong.
useTokenToPost = function ( token ) {
params.token = token;
-   new mw.Api().post( params, ok, err );
+   api.post( params, ok, err );
};
-   return api.getProofreadToken( useTokenToPost, 
err );
+
+   promise = proofreadPlugin.getProofreadToken( 
useTokenToPost, err );
} else {
// We do have a token, but it might be expired. 
So if it is 'bad' then
// start over with a new token.
@@ -39,13 +43,32 @@
if ( code === 'badtoken' ) {
// force a new token, clear any 
old one
cachedToken = null;
-   api.proofread( params, ok, err 
);
+   proofreadPlugin.proofread( 
params, ok, err );
} else {
err( code, result );
}
};
-   return new mw.Api().post( params, { ok : ok, 
err : getTokenIfBad });
+
+   promise = api.post( params, { ok : ok, err : 
getTokenIfBad });
}
+
+   if ( mw.user.options.get( didProofreadOption ) !== '1' 
) {
+   mw.user.options.set( didProofreadOption, '1' );
+
+   api.get( {
+   action: 'tokens',
+   type: 'options'
+   } ).done( function ( data ) {
+   api.post( {
+   action: 'options',
+   token: data.tokens.optionstoken,
+   optionname: didProofreadOption,
+   optionvalue: '1'
+   } );
+   } );
+   }
+
+   return promise;
},
 
/**
@@ -201,6 +224,10 @@
$proofreadEdit.tipsy( {
gravity: 'n'
} );
+
+   if ( mw.user.options.get( 'tux-did-proofread' ) !== '1' 
) {
+   $proofreadAction.tipsy( 'show' );
+   }
},
 
hide: function () {
diff --git a/utils/UserToggles.php b/utils/UserToggles.php
index 4ffc2ba..4953cbb 100644
--- a/utils/UserToggles.php
+++ b/utils/UserToggles.php
@@ -14,38 +14,42 @@
  */
 class TranslatePreferences {
/**
-* Add 'translate-pref-nonewsletter' preference.
-* This is most probably specific to translatewiki.net. Can be enabled
+* Add 'translate-pref-nonewsletter' preference,
+* which is

[MediaWiki-commits] [Gerrit] remove contint web material - change (operations/puppet)

2013-03-14 Thread Faidon (Code Review) 
Faidon has submitted this change and it was merged.

Change subject: remove contint web material
..


remove contint web material

We used puppet to maintain the continuous integration webportal at
http://integration.mediawiki.org/, that in turn require us to ask ops to
merge the changes for which you guys have no real added value.

I have migrated all those files to the integration/docroot.git
repository with  https://gerrit.wikimedia.org/r/53743  That will let us
deploy updates of the website without vasting ops precious time.

Change-Id: Ie6a53bd73a5d8d72278191d94f299cb13230661e
---
D files/misc/jenkins/WLMMobile/HEADER.html
D files/misc/jenkins/WLMMobile/README.html
D files/misc/jenkins/WikipediaMobile/HEADER.html
D files/misc/jenkins/WikipediaMobile/README.html
D files/misc/jenkins/WiktionaryMobile/HEADER.html
D files/misc/jenkins/WiktionaryMobile/README.html
D files/misc/jenkins/index.html
D files/misc/jenkins/nightly.css
M manifests/misc/contint.pp
9 files changed, 0 insertions(+), 266 deletions(-)

Approvals:
  Faidon: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/files/misc/jenkins/WLMMobile/HEADER.html 
b/files/misc/jenkins/WLMMobile/HEADER.html
deleted file mode 100644
index 4653648..000
--- a/files/misc/jenkins/WLMMobile/HEADER.html
+++ /dev/null
@@ -1,17 +0,0 @@
-!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN 
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;
-html xmlns=http://www.w3.org/1999/xhtml; lang=en xml:lang=en
-head
-   titleWLMMobile nightly builds/title
-   link rel=stylesheet href=../../nightly.css type=text/css /
-   meta name=viewport content=width=device-width, initial-scale=1.0, 
maximum-scale=1.0, user-scalable=no /
-/head
-body
-
-h1WLMMobile nightly builds/h1
-h2Only for testing purposes!/h2
-p
-WLMMobile nightly builds are automatically generated from time to time.
-For more information, have a look at our a 
href=https://github.com/wikimedia/WLMMobile;github project page/a./p
-p
-The very latest build is a 
href=WLMMobile_latest.apkWLMMobile_latest.apk/a.
-/p
diff --git a/files/misc/jenkins/WLMMobile/README.html 
b/files/misc/jenkins/WLMMobile/README.html
deleted file mode 100644
index dc49a06..000
--- a/files/misc/jenkins/WLMMobile/README.html
+++ /dev/null
@@ -1,5 +0,0 @@
-div id=footer
-Wikimedia Foundation 2012
-/div
-/body
-/html
diff --git a/files/misc/jenkins/WikipediaMobile/HEADER.html 
b/files/misc/jenkins/WikipediaMobile/HEADER.html
deleted file mode 100644
index a5c98a4..000
--- a/files/misc/jenkins/WikipediaMobile/HEADER.html
+++ /dev/null
@@ -1,17 +0,0 @@
-!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN 
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;
-html xmlns=http://www.w3.org/1999/xhtml; lang=en xml:lang=en
-head
-   titleWikipediaMobile nightly builds/title
-   link rel=stylesheet href=../../nightly.css type=text/css /
-   meta name=viewport content=width=device-width, initial-scale=1.0, 
maximum-scale=1.0, user-scalable=no /
-/head
-body
-
-h1WikipediaMobile nightly builds/h1
-h2Only for testing purposes!/h2
-p
-WikipediaMobile nightly builds are automatically generated from time to time.
-For more information, have a look at our a 
href=https://github.com/wikimedia/WikipediaMobile;github project page/a./p
-p
-The very latest build is a 
href=Wikipedia_latest.apkWikipedia_latest.apk/a.
-/p
diff --git a/files/misc/jenkins/WikipediaMobile/README.html 
b/files/misc/jenkins/WikipediaMobile/README.html
deleted file mode 100644
index dc49a06..000
--- a/files/misc/jenkins/WikipediaMobile/README.html
+++ /dev/null
@@ -1,5 +0,0 @@
-div id=footer
-Wikimedia Foundation 2012
-/div
-/body
-/html
diff --git a/files/misc/jenkins/WiktionaryMobile/HEADER.html 
b/files/misc/jenkins/WiktionaryMobile/HEADER.html
deleted file mode 100644
index 53b972e..000
--- a/files/misc/jenkins/WiktionaryMobile/HEADER.html
+++ /dev/null
@@ -1,17 +0,0 @@
-!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN 
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;
-html xmlns=http://www.w3.org/1999/xhtml; lang=en xml:lang=en
-head
-   titleWiktionaryMobile nightly builds/title
-   link rel=stylesheet href=../../nightly.css type=text/css /
-   meta name=viewport content=width=device-width, initial-scale=1.0, 
maximum-scale=1.0, user-scalable=no /
-/head
-body
-
-h1WiktionaryMobile nightly builds/h1
-h2Only for testing purposes!/h2
-p
-WiktionaryMobile nightly builds are automatically generated from time to time.
-For more information, have a look at our a 
href=https://github.com/wikimedia/WiktionaryMobile;github project 
page/a./p
-p
-The very latest build is a 
href=Wiktionary_latest.apkWiktionary_latest.apk/a.
-/p
diff --git a/files/misc/jenkins/WiktionaryMobile/README.html 
b/files/misc/jenkins/WiktionaryMobile/README.html
deleted file mode 100644
index dc49a06..000
--- a/files/misc/jenkins/WiktionaryMobile/README.html
+++

[MediaWiki-commits] [Gerrit] Add comments for grep - change (mediawiki...Translate)

2013-03-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add comments for grep
..


Add comments for grep

Change-Id: I40c7fb549c6ed1af9842fa7a9823684a619930f3
---
M specials/SpecialMagic.php
M specials/SpecialTranslate.php
M specials/SpecialTranslationStats.php
M tag/SpecialPageTranslationMovePage.php
4 files changed, 13 insertions(+), 0 deletions(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/specials/SpecialMagic.php b/specials/SpecialMagic.php
index c4dd96d..6380096 100644
--- a/specials/SpecialMagic.php
+++ b/specials/SpecialMagic.php
@@ -88,6 +88,8 @@
 * @return \string HTML5-compatible select-element.
 */
protected function moduleSelector( $selectedId ) {
+   // Give grep a chance to find the usages:
+   // translate-magic-words, translate-magic-special, 
translate-magic-namespace
$selector = new XmlSelect( 'module', 'module', $selectedId );
foreach ( $this-aModules as $code ) {
$selector-addOption( $this-msg( 'translate-magic-' . 
$code )-text(), $code );
diff --git a/specials/SpecialTranslate.php b/specials/SpecialTranslate.php
index 5ce5c64..549859f 100644
--- a/specials/SpecialTranslate.php
+++ b/specials/SpecialTranslate.php
@@ -331,6 +331,8 @@
 
$options = array();
foreach ( $selectors as $g = $selector ) {
+   // Give grep a chance to find the usages:
+   // translate-page-group, translate-page-language, 
translate-page-limit
$options[] = self::optionRow(
$this-msg( 'translate-page-' . $g )-escaped(),
$selector,
diff --git a/specials/SpecialTranslationStats.php 
b/specials/SpecialTranslationStats.php
index df55266..0b2ff4f 100644
--- a/specials/SpecialTranslationStats.php
+++ b/specials/SpecialTranslationStats.php
@@ -234,6 +234,9 @@
 * @return string Html.
 */
protected function eLabel( $name ) {
+   // Give grep a chance to find the usages:
+   // translate-statsf-width, translate-statsf-height, 
translate-statsf-start, translate-statsf-days,
+   // translate-statsf-scale, translate-statsf-count, 
translate-statsf-language, translate-statsf-group
$label = 'translate-statsf-' . $name;
$label = $this-msg( $label )-escaped();
 
@@ -248,6 +251,8 @@
 * @return string Html.
 */
protected function eRadio( $name, FormOptions $opts, array $alts ) {
+   // Give grep a chance to find the usages:
+   // translate-statsf-scale, translate-statsf-count
$label = 'translate-statsf-' . $name;
$label = $this-msg( $label )-escaped();
$s = 'trtd' . $label . '/tdtd';
diff --git a/tag/SpecialPageTranslationMovePage.php 
b/tag/SpecialPageTranslationMovePage.php
index 835b316..e647022 100644
--- a/tag/SpecialPageTranslationMovePage.php
+++ b/tag/SpecialPageTranslationMovePage.php
@@ -505,6 +505,8 @@
// Check that all new titles are valid
$lb = new LinkBatch();
foreach ( $titles as $type = $list ) {
+   // Give grep a chance to find the usages:
+   // pt-movepage-block-tp-invalid, 
pt-movepage-block-section-invalid, pt-movepage-block-subpage-invalid
foreach ( $list as $pair ) {
list( $old, $new ) = $pair;
if ( $new === null ) {
@@ -523,6 +525,8 @@
// Check that there are no move blockers
$lb-execute();
foreach ( $titles as $type = $list ) {
+   // Give grep a chance to find the usages:
+   // pt-movepage-block-tp-exists, 
pt-movepage-block-section-exists, pt-movepage-block-subpage-exists
foreach ( $list as $pair ) {
list( $old, $new ) = $pair;
if ( $new-exists() ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/53735
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I40c7fb549c6ed1af9842fa7a9823684a619930f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Shirayuki shirayuk...@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] Styling adjustments for self-translations - change (mediawiki...Translate)

2013-03-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Styling adjustments for self-translations
..


Styling adjustments for self-translations

Adjustment of style for translations from the current user in proofreading mode.

Change-Id: Ifc5ac0eba16622eaca845b9d04ac853aee8e4ee3
---
M resources/css/ext.translate.proofread.css
1 file changed, 7 insertions(+), 1 deletion(-)

Approvals:
  Amire80: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/css/ext.translate.proofread.css 
b/resources/css/ext.translate.proofread.css
index 823d546..47dc439 100644
--- a/resources/css/ext.translate.proofread.css
+++ b/resources/css/ext.translate.proofread.css
@@ -54,9 +54,15 @@
right: -5px;
 }
 
+.ext-translate-container .tux-messagelist 
.tux-message-proofread.own-translation,
+.ext-translate-container .tux-messagelist 
.tux-message-proofread.own-translation:hover {
+   background: #FBFBFB;
+}
+
 .translated-by-self {
+   color: #777;
text-align: right;
-   font-size: x-small;
+   font-size: 12px;
margin-right: 5px;
padding-top: 18px; /* Icon height + 3px */
/* @embed */

-- 
To view, visit https://gerrit.wikimedia.org/r/53741
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc5ac0eba16622eaca845b9d04ac853aee8e4ee3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Santhosh santhosh.thottin...@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] operations-puppet-doc for docs.wikimedia.org/puppet - change (integration/jenkins-job-builder-config)

2013-03-14 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53753


Change subject: operations-puppet-doc for docs.wikimedia.org/puppet
..

operations-puppet-doc for docs.wikimedia.org/puppet

Require JJB to support setting the 'workspace' on a job.
Upstream patch is https://review.openstack.org/24427

Change-Id: Iae192f6380e72c46822f0a738ab88a1d452aad2e
---
M operations-puppet.yaml
1 file changed, 17 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/53/53753/1

diff --git a/operations-puppet.yaml b/operations-puppet.yaml
index 27dbc3e..09d38d7 100644
--- a/operations-puppet.yaml
+++ b/operations-puppet.yaml
@@ -28,6 +28,22 @@
 rake --rakefile rakefile validate
 )
 
+# Documentation for our puppet repository
+- job-template:
+name: 'operations-puppet-doc'
+defaults: use-zuul
+triggers:
+ - zuul
+workspace: '/srv/org/wikimedia/doc/puppetsource'
+builders:
+ - shell: |
+#!/bin/bash -e
+/usr/bin/puppet doc \
+--mode rdoc \
+--outputdir /srv/org/wikimedia/doc/puppet \
+--modulepath $WORKSPACE/modules \
+--manifestdir $WORKSPACE/manifests
+
 # Find out common typos in any files of ops/puppet
 - job-template:
 name: 'operations-puppet-typos'
@@ -52,3 +68,4 @@
  - '{name}-pep8'
  - operations-puppet-typos
  - operations-puppet-validate
+ - operations-puppet-doc

-- 
To view, visit https://gerrit.wikimedia.org/r/53753
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae192f6380e72c46822f0a738ab88a1d452aad2e
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Portable DIRECTORY_SEPARATOR :) - change (mediawiki...Scribunto)

2013-03-14 Thread Jens Ohlig (Code Review) 
Jens Ohlig has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53754


Change subject: Portable DIRECTORY_SEPARATOR :)
..

Portable DIRECTORY_SEPARATOR :)

Change-Id: I61d2ddc5367c2ffacd68c12bf9b6037cfc39d487
---
M engines/LuaCommon/LuaCommon.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto 
refs/changes/54/53754/1

diff --git a/engines/LuaCommon/LuaCommon.php b/engines/LuaCommon/LuaCommon.php
index cbf15d2..10f126c 100644
--- a/engines/LuaCommon/LuaCommon.php
+++ b/engines/LuaCommon/LuaCommon.php
@@ -135,7 +135,7 @@
 * @return string
 */
protected function normalizeModuleFileName( $fileName ) {
-   return $fileName[0] !== '/' ? 
{$this-getLuaLibDir()}/{$fileName} : $fileName;
+   return $fileName[0] !== DIRECTORY_SEPARATOR ? 
{$this-getLuaLibDir()}/{$fileName} : $fileName;
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/53754
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I61d2ddc5367c2ffacd68c12bf9b6037cfc39d487
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Jens Ohlig jens.oh...@wikimedia.de

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Portable DIRECTORY_SEPARATOR :) - change (mediawiki...Scribunto)

2013-03-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Portable DIRECTORY_SEPARATOR :)
..


Portable DIRECTORY_SEPARATOR :)

Change-Id: I61d2ddc5367c2ffacd68c12bf9b6037cfc39d487
---
M engines/LuaCommon/LuaCommon.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Demon: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/engines/LuaCommon/LuaCommon.php b/engines/LuaCommon/LuaCommon.php
index cbf15d2..10f126c 100644
--- a/engines/LuaCommon/LuaCommon.php
+++ b/engines/LuaCommon/LuaCommon.php
@@ -135,7 +135,7 @@
 * @return string
 */
protected function normalizeModuleFileName( $fileName ) {
-   return $fileName[0] !== '/' ? 
{$this-getLuaLibDir()}/{$fileName} : $fileName;
+   return $fileName[0] !== DIRECTORY_SEPARATOR ? 
{$this-getLuaLibDir()}/{$fileName} : $fileName;
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/53754
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I61d2ddc5367c2ffacd68c12bf9b6037cfc39d487
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Jens Ohlig jens.oh...@wikimedia.de
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Demon ch...@wikimedia.org
Gerrit-Reviewer: Tim Starling tstarl...@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] Proofread by others styling - change (mediawiki...Translate)

2013-03-14 Thread Pginer (Code Review) 
Pginer has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53755


Change subject: Proofread by others styling
..

Proofread by others styling

Adjustment of markesrs and the counter of votes depending on
whether other users proofread a translation.

Change-Id: I2aba06cc0eeb51c165e36b22132c6e5fc0841067
---
M resources/css/ext.translate.proofread.css
M resources/images/check-sprite.png
M resources/images/check-sprite.svg
M resources/js/ext.translate.proofread.js
4 files changed, 60 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/55/53755/1

diff --git a/resources/css/ext.translate.proofread.css 
b/resources/css/ext.translate.proofread.css
index 823d546..c1d8cfe 100644
--- a/resources/css/ext.translate.proofread.css
+++ b/resources/css/ext.translate.proofread.css
@@ -111,6 +111,23 @@
background-position: right -93px;
 }
 
+.proofread-by-others .tux-proofread-action {
+   background-position: right -124px;
+}
+
+.proofread-by-others .tux-proofread-action:hover {
+   background-position: right -155px;
+}
+
+.proofread-by-others .tux-proofread-action.proofread {
+   background-position: right -186px;
+}
+
+.proofread-by-others .tux-proofread-action.proofread:hover {
+   background-position: right -217px;
+}
+
+
 .tux-proofread-edit {
/* @embed */
background-image: url(../images/edit-mark.png);
@@ -132,6 +149,7 @@
color: #55;
font-size: 14px;
padding-right: 5px;
+   text-align: right;
 }
 
 .tux-proofread-count:before {
diff --git a/resources/images/check-sprite.png 
b/resources/images/check-sprite.png
index f73a4bb..8993c92 100644
--- a/resources/images/check-sprite.png
+++ b/resources/images/check-sprite.png
Binary files differ
diff --git a/resources/images/check-sprite.svg 
b/resources/images/check-sprite.svg
index f115937..fead121 100644
--- a/resources/images/check-sprite.svg
+++ b/resources/images/check-sprite.svg
@@ -9,7 +9,7 @@
xmlns=http://www.w3.org/2000/svg;
version=1.1
width=44
-   height=124
+   height=248
id=svg10555
   defs
  id=defs10557 /
@@ -26,39 +26,64 @@
 /rdf:RDF
   /metadata
   g
- transform=translate(0,-928.36218)
+ transform=translate(0,-804.36218)
  id=layer1
 path
-   d=m 44,990.36218 -34.02216,0 -9.80064,15.2 9.80064,15 34.02216,0 z
+   d=m 44,866.36218 -34.02216,0 -9.80064,15.2 9.80064,15 34.02216,0 z
id=rect12220

style=color:#00;fill:#e5e5e5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate
 /
 path
-   d=m 34.7936,993.20616 -10.28928,17.72734 -4.02912,-2.9752 
-3.16104,4.2149 6.4464,4.7727 2.35524,1.7356 1.48776,-2.5413 11.71476,-20.33072 
-4.52472,-2.60332 z
+   d=m 34.7936,869.20616 -10.28928,17.72734 -4.02912,-2.9752 
-3.16104,4.2149 6.4464,4.7727 2.35524,1.7356 1.48776,-2.5413 11.71476,-20.33072 
-4.52472,-2.60332 z
id=path12436-0-1-2-8-1-9-2-9

style=font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#00;fill:#3e3e3e;fill-opacity:1;stroke:none;stroke-width:2.6545198;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans
 /
 path
-   d=m 44,1021.3622 -34.02216,0 -9.80064,15 9.80064,15 34.02216,0 z
+   d=m 44,897.3622 -34.02216,0 -9.80064,15 9.80064,15 34.02216,0 z
id=rect12220-7

style=color:#00;fill:#c8dbf3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate
 /
 path
-   d=m 34.7936,1024.2062 -10.28928,17.7273 -4.02912,-2.9752 
-3.16104,4.2149 6.4464,4.7727 2.35524,1.7356 1.48776,-2.5413 11.71476,-20.3307 
-4.52472,-2.6033 z
+   d=m 34.7936,900.2062 -10.28928,17.7273 -4.02912,-2.9752 
-3.16104,4.2149 6.4464,4.7727 2.35524,1.7356 1.48776,-2.5413 11.71476,-20.3307 
-4.52472,-2.6033 z
id=path12436-0-1-2-8-1-9-2-9-9

[MediaWiki-commits] [Gerrit] (Bug 31880) add column class (based on dataValue typeId) - change (mediawiki...SemanticMediaWiki)

2013-03-14 Thread Jeroen De Dauw (Code Review) 
Jeroen De Dauw has submitted this change and it was merged.

Change subject: (Bug 31880) add column class (based on dataValue typeId)
..


(Bug 31880) add column class (based on dataValue typeId)

Depending on the datavalue type a class attribute (_str, _dat, _num etc.)
is amended which can be used to adjust in-table formatting.

The class attribute is concatenated string of
smwtype + typeId (e.g smwtype_dat, smwtype_num)

dataValue typeID is language independant and is also available via the
SMWApi which means a similar approach can be applied (see [1]).

For example:

td class=Has-event-end smwtype_dat5 March 2013 05:00:00/td

[1] https://gerrit.wikimedia.org/r/#/c/53544

Change-Id: I361c93b95240e0719929de12901ce63d7e5978f6
---
M includes/queryprinters/SMW_QP_Table.php
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Jeroen De Dauw: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/queryprinters/SMW_QP_Table.php 
b/includes/queryprinters/SMW_QP_Table.php
index 714d649..f3d1b9f 100644
--- a/includes/queryprinters/SMW_QP_Table.php
+++ b/includes/queryprinters/SMW_QP_Table.php
@@ -133,6 +133,7 @@

if ( count( $dataValues )  0 ) {
$sortkey = $dataValues[0]-getDataItem()-getSortKey();
+   $dataValueType = $dataValues[0]-getTypeID();

if ( is_numeric( $sortkey ) ) {
$attribs['data-sort-value'] = $sortkey;
@@ -143,7 +144,7 @@
if ( in_array( $alignment, array( 'right', 'left', 
'center' ) ) ) {
$attribs['style'] = text-align:' . $alignment 
. ';;
}
-   $attribs['class'] = $columnClass;
+   $attribs['class'] = $columnClass . ( $dataValueType !== 
'' ? ' smwtype' . $dataValueType : '' );
 
$content = $this-getCellContent(
$dataValues,

-- 
To view, visit https://gerrit.wikimedia.org/r/53520
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I361c93b95240e0719929de12901ce63d7e5978f6
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Mwjames jamesin.hongkon...@gmail.com
Gerrit-Reviewer: Foxtrott s7ep...@gmail.com
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Mwjames jamesin.hongkon...@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] Apply conversion on namespace names on Special:Search - change (mediawiki/core)

2013-03-14 Thread Liangent (Code Review) 
Liangent has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53756


Change subject: Apply conversion on namespace names on Special:Search
..

Apply conversion on namespace names on Special:Search

Change-Id: I2dc8d1a28dd6b273a63dc6e5a06d3c18c720b3f7
---
M includes/specials/SpecialSearch.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/56/53756/1

diff --git a/includes/specials/SpecialSearch.php 
b/includes/specials/SpecialSearch.php
index 0d54e76..c1603d7 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -856,6 +856,7 @@
 * @return String: HTML form
 */
protected function powerSearchBox( $term, $opts ) {
+   global $wgContLang;
// Groups namespaces into rows according to subject
$rows = array();
foreach( SearchEngine::searchableNamespaces() as $namespace = 
$name ) {
@@ -863,7 +864,7 @@
if( !array_key_exists( $subject, $rows ) ) {
$rows[$subject] = ;
}
-   $name = str_replace( '_', ' ', $name );
+   $name = $wgContLang-getConverter()-convertNamespace( 
$namespace );
if( $name == '' ) {
$name = $this-msg( 'blanknamespace' )-text();
}

-- 
To view, visit https://gerrit.wikimedia.org/r/53756
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2dc8d1a28dd6b273a63dc6e5a06d3c18c720b3f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Liangent liang...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration portal ported to twitter bootstrap - change (integration/docroot)

2013-03-14 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53757


Change subject: integration portal ported to twitter bootstrap
..

integration portal ported to twitter bootstrap

* dump Twitter bootstrap under the /shared/ directory
* integration.mediawiki.org now has bootstrap linked in
* port the old HTML to Twitter bootstrap

Change-Id: I0ab5321f01260f21cf59d907fcc8ac0c268aa8b4
---
A org/mediawiki/integration/bootstrap
M org/mediawiki/integration/index.html
A shared/bootstrap/css/bootstrap-responsive.css
A shared/bootstrap/css/bootstrap-responsive.min.css
A shared/bootstrap/css/bootstrap.css
A shared/bootstrap/css/bootstrap.min.css
A shared/bootstrap/img/glyphicons-halflings-white.png
A shared/bootstrap/img/glyphicons-halflings.png
A shared/bootstrap/js/bootstrap.js
A shared/bootstrap/js/bootstrap.min.js
10 files changed, 9,615 insertions(+), 69 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/docroot 
refs/changes/57/53757/1


-- 
To view, visit https://gerrit.wikimedia.org/r/53757
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ab5321f01260f21cf59d907fcc8ac0c268aa8b4
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] (bug 45484) Add 'Revert translation' button - change (mediawiki...Translate)

2013-03-14 Thread Amire80 (Code Review) 
Amire80 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53758


Change subject: (bug 45484) Add 'Revert translation' button
..

(bug 45484) Add 'Revert translation' button

Change-Id: I570d590c519f142c6a023a795ce9205a6f6738e0
---
M Translate.i18n.php
M Translate.php
M resources/js/ext.translate.editor.js
3 files changed, 33 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/58/53758/1

diff --git a/Translate.i18n.php b/Translate.i18n.php
index 4ed5653..a96e869 100644
--- a/Translate.i18n.php
+++ b/Translate.i18n.php
@@ -446,6 +446,7 @@
 
'tux-editor-placeholder' = 'Your translation',
'tux-editor-paste-original-button-label' = 'Paste source text',
+   'tux-editor-revert-translation-button-label' = 'Revert translation',
'tux-editor-save-button-label' = 'Save translation',
'tux-editor-skip-button-label' = 'Skip to next',
'tux-editor-confirm-button-label' = 'Confirm translation',
@@ -944,6 +945,7 @@
'tux-status-unsaved' = 'Status label in [[Special:Translate]] 
indicating that the translation is not saved yet.',
'tux-editor-placeholder' = 'Placeholder text for the translation 
editor textbox',
'tux-editor-paste-original-button-label' = 'Label for a button that 
pastes the text in the source language to the translation editor.',
+   'tux-editor-revert-translation-button-label' = 'Label for a button 
that reverts the translation that was saved previously.',
'tux-editor-save-button-label' = 'Label for save translation button',
'tux-editor-skip-button-label' = 'Label for skip button',
'tux-editor-confirm-button-label' = 'Label for confirm button',
diff --git a/Translate.php b/Translate.php
index e19fe0b..35cf69e 100644
--- a/Translate.php
+++ b/Translate.php
@@ -265,6 +265,7 @@
'tux-status-unsaved',
'tux-editor-placeholder',
'tux-editor-paste-original-button-label',
+   'tux-editor-revert-translation-button-label',
'tux-editor-save-button-label',
'tux-editor-skip-button-label',
'tux-editor-confirm-button-label',
diff --git a/resources/js/ext.translate.editor.js 
b/resources/js/ext.translate.editor.js
index f82300c..f7f0e39 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -201,6 +201,7 @@
prepareEditorColumn: function () {
var translateEditor = this,
sourceString,
+   originalTranslation,
$editorColumn,
$messageKeyLabel,
$moreWarningsTab,
@@ -211,6 +212,7 @@
$controlButtonBlock,
$editingButtonBlock,
$pasteOriginalButton,
+   $revertTranslationButton,
$saveButton,
$requestRight,
$skipButton,
@@ -255,6 +257,7 @@
);
 
$messageList = $( '.tux-messagelist' );
+   originalTranslation = this.message.translation;
sourceString = this.message.definition;
$sourceString = $( 'span' )
.addClass( 'eleven column sourcemessage' )
@@ -322,6 +325,11 @@
} )
.on( 'input propertychange', function () {
var $this = $( this );
+
+   if ( originalTranslation !== null ) {
+   $revertTranslationButton
+   .removeClass( 'hide' );
+   }
 
translateEditor.dirty = true;
 
@@ -392,13 +400,34 @@
$pasteOriginalButton.addClass( 
'hide' );
} );
 
+   if ( originalTranslation === null ) {
+   $revertTranslationButton = $( [] );
+   } else {
+   $revertTranslationButton = $( 
'button' )
+   .addClass( 
'tux-editor-revert-translation-button hide' ) // Initially hidden
+   .text( mw.msg( 
'tux-editor-revert-translation-button-label' ) )
+   .on( 'click', function () {
+   // Restore the

[MediaWiki-commits] [Gerrit] Don't announce comments on drafts to IRC - change (operations/puppet)

2013-03-14 Thread Demon (Code Review) 
Demon has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53759


Change subject: Don't announce comments on drafts to IRC
..

Don't announce comments on drafts to IRC

Bug: 37538
Change-Id: I8662bf45f1fb89fcb0695b559617fc584fc17318
---
M files/gerrit/hooks/comment-added
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/59/53759/1

diff --git a/files/gerrit/hooks/comment-added b/files/gerrit/hooks/comment-added
index 3e87aaf..c3a8bfa 100755
--- a/files/gerrit/hooks/comment-added
+++ b/files/gerrit/hooks/comment-added
@@ -16,7 +16,10 @@
 self.parser.add_option(--topic, dest=topic)
 self.parser.add_option(--VRIF, dest=verified)
 self.parser.add_option(--CRVW, dest=codereview)
+self.parser.add_option(--is-draft, dest=draft)
 (options, args) = self.parser.parse_args()
+if options.draft == true:
+return  # Don't report drafts to IRC!
 comment = re.sub(r^\s*Patch Set \d+:.*$, '', options.comment, 
flags=re.MULTILINE).strip().splitlines()
 if comment:
 comment = comment[0]

-- 
To view, visit https://gerrit.wikimedia.org/r/53759
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8662bf45f1fb89fcb0695b559617fc584fc17318
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Demon ch...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Removed deprecated usage of 2nd param in Title::getLocalUrl ... - change (mediawiki/core)

2013-03-14 Thread Daniel Werner (Code Review) 
Daniel Werner has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53760


Change subject: Removed deprecated usage of 2nd param in Title::getLocalUrl in 
SpecialAllpages
..

Removed deprecated usage of 2nd param in Title::getLocalUrl in SpecialAllpages

Before this change-set, a deprecated warning has been thrown when 
SpecialAllpges::showline would
be called with the last parameter ($hideredirect) set to false.

Change-Id: I4072a4a19a8f6403f3979c731974baba88ab574a
---
M includes/specials/SpecialAllpages.php
1 file changed, 12 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/60/53760/1

diff --git a/includes/specials/SpecialAllpages.php 
b/includes/specials/SpecialAllpages.php
index f9cb5cd..f137d1c 100644
--- a/includes/specials/SpecialAllpages.php
+++ b/includes/specials/SpecialAllpages.php
@@ -297,10 +297,10 @@
 * @param string $inpoint lower limit of pagenames
 * @param string $outpoint upper limit of pagenames
 * @param $namespace Integer (Default NS_MAIN)
-* @param bool $hideredirects dont show redirects (default FALSE)
+* @param bool $hideRedirects don't show redirects. Default: false
 * @return string
 */
-   function showline( $inpoint, $outpoint, $namespace = NS_MAIN, 
$hideredirects ) {
+   function showline( $inpoint, $outpoint, $namespace = NS_MAIN, 
$hideRedirects = false ) {
global $wgContLang;
$inpointf = htmlspecialchars( str_replace( '_', ' ', $inpoint ) 
);
$outpointf = htmlspecialchars( str_replace( '_', ' ', $outpoint 
) );
@@ -308,15 +308,20 @@
$inpointf = $wgContLang-truncate( $inpointf, 
$this-maxPageLength );
$outpointf = $wgContLang-truncate( $outpointf, 
$this-maxPageLength );
 
-   $queryparams = $namespace ? namespace=$namespace : '';
+   $queryParams = array (
+   'from' = $inpoint,
+   'to' = $outpoint,
+   );
 
-   $queryhideredirects = array();
-   if ( $hideredirects ) {
-   $queryhideredirects['hideredirects'] = 1;
+   if( $namespace ) {
+   $queryParams['namespace'] = $namespace;
+   }
+   if ( $hideRedirects ) {
+   $queryParams['hideredirects'] = 1;
}
 
$special = $this-getTitle();
-   $link = htmlspecialchars( $special-getLocalUrl( $queryparams . 
'from=' . urlencode( $inpoint ) . 'to=' . urlencode( $outpoint ), 
$queryhideredirects ) );
+   $link = htmlspecialchars( $special-getLocalUrl( $queryParams ) 
);
 
$out = $this-msg( 'alphaindexline' )-rawParams(
a href=\$link\$inpointf/a/tdtd,

-- 
To view, visit https://gerrit.wikimedia.org/r/53760
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4072a4a19a8f6403f3979c731974baba88ab574a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Daniel Werner daniel.wer...@wikimedia.de

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Prepare AFTv5 config for deployment new features - change (operations/mediawiki-config)

2013-03-14 Thread Matthias Mullie (Code Review) 
Matthias Mullie has submitted this change and it was merged.

Change subject: Prepare AFTv5 config for deployment new features
..


Prepare AFTv5 config for deployment new features

* cleanup permissions
* set different permission-levels for dewiki (aft-monitor)
* add auto-archive config
* (temporarily) disable AFT v5
* set cluster extension1

Change-Id: I4d6af946c9993bb69d36c20185f850f1ea3e56b3
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 73 insertions(+), 40 deletions(-)

Approvals:
  Lwelling: Looks good to me, but someone else must approve
  Matthias Mullie: Verified; Looks good to me, approved



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index e6fcace..56a7ae8 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2037,6 +2037,7 @@
 if ( $wmgUseArticleFeedbackv5 ) {
require_once( $IP/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php 
);
 
+   $wgArticleFeedbackv5Cluster = $wmgArticleFeedbackv5Cluster;
$wgArticleFeedbackv5Categories = $wmgArticleFeedbackv5Categories;
$wgArticleFeedbackv5BlacklistCategories = 
$wmgArticleFeedbackv5BlacklistCategories;
$wgArticleFeedbackv5OversightEmails = 
$wmgArticleFeedbackv5OversightEmails;
@@ -2045,46 +2046,24 @@
$wgArticleFeedbackv5LearnToEdit = $wmgArticleFeedbackv5LearnToEdit;
$wgArticleFeedbackv5Namespaces = $wmgArticleFeedbackv5Namespaces;
$wgArticleFeedbackv5LotteryOdds = $wmgArticleFeedbackv5LotteryOdds;
+   $wgArticleFeedbackAutoArchiveEnabled = 
$wmgArticleFeedbackAutoArchiveEnabled;
+   $wgArticleFeedbackAutoArchiveTtl = $wmgArticleFeedbackAutoArchiveTtl;
 
-   // every member (apart from blocked users) = reader
-   foreach ( array( '*', 'user', 'confirmed', 'autoconfirmed', 
'rollbacker', 'reviewer', 'sysop', 'oversight' ) as $group ) {
-   if ( isset( $wgGroupPermissions[$group] ) ) { // skip 
rollbacker group on wikis without that
-   $wgGroupPermissions[$group]['aft-reader'] = true;
+   // clear default permissions set in ArticleFeedbackv5.php
+   foreach ( $wgGroupPermissions as $group = $permissions ) {
+   foreach ( $wmgArticleFeedbackv5Permissions as $permission = 
$groups ) {
+   if ( isset( $wgGroupPermissions[$group][$permission] ) 
) {
+   unset( $wgGroupPermissions[$group][$permission] 
);
+   }
}
}
 
-   // registered member = member
-   foreach ( array( 'user', 'confirmed', 'autoconfirmed', 'rollbacker', 
'reviewer', 'sysop', 'oversight' ) as $group ) {
-   if ( isset( $wgGroupPermissions[$group] ) ) { // skip 
rollbacker group on wikis without that
-   $wgGroupPermissions[$group]['aft-member'] = true;
-   }
-   }
-
-   // (auto-)confirmed user = editor
-   foreach ( array( 'confirmed', 'autoconfirmed', 'rollbacker', 
'reviewer', 'sysop', 'oversight' ) as $group ) {
-   if ( isset( $wgGroupPermissions[$group] ) ) { // skip 
rollbacker group on wikis without that
-   $wgGroupPermissions[$group]['aft-editor'] = true;
-   }
-   }
-
-   // rollbacker/reviewer = monitor
-   foreach ( array( 'rollbacker', 'reviewer', 'sysop', 'oversight' ) as 
$group ) {
-   if ( isset( $wgGroupPermissions[$group] ) ) { // skip 
rollbacker group on wikis without that
-   $wgGroupPermissions[$group]['aft-monitor'] = true;
-   }
-   }
-
-   // administrator = administrator
-   foreach ( array( 'sysop', 'oversight' ) as $group ) {
-   if ( isset( $wgGroupPermissions[$group] ) ) { // skip 
rollbacker group on wikis without that
-   $wgGroupPermissions[$group]['aft-administrator'] = true;
-   }
-   }
-
-   // oversight = oversighter
-   foreach ( array( 'oversight' ) as $group ) {
-   if ( isset( $wgGroupPermissions[$group] ) ) { // skip 
rollbacker group on wikis without that
-   $wgGroupPermissions[$group]['aft-oversighter'] = true;
+   // set permissions as defined for selected wiki
+   foreach ( $wmgArticleFeedbackv5Permissions as $permission = $groups ) {
+   foreach ( (array) $groups as $group ) {
+   if ( isset( $wgGroupPermissions[$group] ) ) {
+   $wgGroupPermissions[$group][$permission] = true;
+   }
}
}
 
@@ -2093,7 +2072,7 @@
'aft-reader' = true,
'aft-member' = true,
'aft-editor' = true,
-   'aft-monitor' = true,
+   'aft-monitor' = false,
'aft-administrator' = false,
'aft-oversighter' = false,

[MediaWiki-commits] [Gerrit] Make ganglia-monitor-aggregator not fail if an instance is r... - change (operations/puppet)

2013-03-14 Thread Mark Bergsma (Code Review) 
Mark Bergsma has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53761


Change subject: Make ganglia-monitor-aggregator not fail if an instance is 
running
..

Make ganglia-monitor-aggregator not fail if an instance is running

Change-Id: I54c1c8fd597308449ca5b828d0e7bc3abbeae8be
---
M modules/ganglia_new/files/upstart/ganglia-monitor-aggregator.conf
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/61/53761/1

diff --git a/modules/ganglia_new/files/upstart/ganglia-monitor-aggregator.conf 
b/modules/ganglia_new/files/upstart/ganglia-monitor-aggregator.conf
index 8bba792..b189426 100644
--- a/modules/ganglia_new/files/upstart/ganglia-monitor-aggregator.conf
+++ b/modules/ganglia_new/files/upstart/ganglia-monitor-aggregator.conf
@@ -11,6 +11,6 @@
for gmonconf in /etc/ganglia/aggregators/*.conf
do
gmonid=${gmonconf##*/}
-   /sbin/start ganglia-monitor-aggregator-instance 
ID=${gmonid%.conf}
+   start ganglia-monitor-aggregator-instance ID=${gmonid%.conf} || 
true
done
 end script

-- 
To view, visit https://gerrit.wikimedia.org/r/53761
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I54c1c8fd597308449ca5b828d0e7bc3abbeae8be
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] High priority fixes - change (mediawiki...ArticleFeedbackv5)

2013-03-14 Thread Matthias Mullie (Code Review) 
Matthias Mullie has submitted this change and it was merged.

Change subject: High priority fixes
..


High priority fixes

* Helpful/unhelpful did not work; JS error (var id was not set)
* Renamed Hide to Hide this post
* Autohide did not trigger mask and had some missing i18n
* Unrequest oversight should not trigger tipsy
* Hide content when AFTv5 isn't active on any namespace
* Offset 0 is also valid; only false should not set offset
* Improved display of Hide my post
* Fix typo usepful

Change-Id: I16491a1af5c460a72481d32cfc7fbd44ecb9d836
---
M ArticleFeedbackv5.activity.php
M ArticleFeedbackv5.i18n.php
M api/ApiAddFlagNoteArticleFeedbackv5.php
M data/DataModel.php
M modules/ext.articleFeedbackv5/ext.articleFeedbackv5.dashboard.js
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.utils.js
8 files changed, 53 insertions(+), 34 deletions(-)

Approvals:
  Lwelling: Looks good to me, but someone else must approve
  Matthias Mullie: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/ArticleFeedbackv5.activity.php b/ArticleFeedbackv5.activity.php
index 728e50f..61d6fd1 100644
--- a/ArticleFeedbackv5.activity.php
+++ b/ArticleFeedbackv5.activity.php
@@ -389,29 +389,32 @@
if ( $cache !== false ) {
$activity[$feedback-aft_id] = $cache;
} else {
+   $actions = array();
+
// we know exactly which status entry we want 
to fetch
if ( $feedback-isOversighted() ) {
-   $action = 'oversight';
+   $actions[] = 'oversight';
} elseif ( $feedback-isHidden() ) {
-   $action = 'hide';
+   $actions[] = 'hide';
+   $actions[] = 'autohide';
} elseif ( $feedback-isArchived() ) {
-   $action = 'archive';
+   $actions[] = 'archive';
} elseif ( $feedback-isResolved() ) {
-   $action = 'resolve';
+   $actions[] = 'resolve';
} elseif ( $feedback-isFeatured() ) {
-   $action = 'feature';
+   $actions[] = 'feature';
} elseif ( $feedback-isNonActionable() ) {
-   $action = 'noaction';
+   $actions[] = 'noaction';
} elseif ( $feedback-isInappropriate() ) {
-   $action = 'inappropriate';
+   $actions[] = 'inappropriate';
} else {
continue;
}
 
-   $action = self::buildWhereActions( array(), 
array( $action ) );
-   if ( $action ) {
+   $actions = self::buildWhereActions( array(), 
$actions );
+   if ( $actions ) {
$title = self::buildWhereFeedback( 
$feedback );
-   $where[] = 'log_title = 
'.$dbr-addQuotes( $title ).' AND '.$action;
+   $where[] = 'log_title = 
'.$dbr-addQuotes( $title ).' AND '.$actions;
}
}
}
diff --git a/ArticleFeedbackv5.i18n.php b/ArticleFeedbackv5.i18n.php
index dec5063..3ce5745 100644
--- a/ArticleFeedbackv5.i18n.php
+++ b/ArticleFeedbackv5.i18n.php
@@ -175,7 +175,8 @@
'articlefeedbackv5-status-unarchive' = 'This post was un-archived by 
$1 on $2 at $3',
'articlefeedbackv5-new-marker' = 'New',
'articlefeedbackv5-oversight-marker' = 'Oversighted',
-   'articlefeedbackv5-hide-marker' = 'Hide',
+   'articlefeedbackv5-autohide-marker' = 'Hidden',
+   'articlefeedbackv5-hide-marker' = 'Hidden',
'articlefeedbackv5-feature-marker' = 'Useful',
'articlefeedbackv5-resolve-marker' = 'Resolved',
'articlefeedbackv5-noaction-marker' = 'No action needed',
@@ -191,7 +192,7 @@
'articlefeedbackv5-form-unnoaction' = 'Undo',
'articlefeedbackv5-form-inappropriate' = 'Inappropriate',
'articlefeedbackv5-form-uninappropriate' = 'Undo',
-   'articlefeedbackv5-form-hide' = 'Hide',
+   'articlefeedbackv5-form-hide' = 'Hide this

[MediaWiki-commits] [Gerrit] Make ganglia-monitor-aggregator not fail if an instance is r... - change (operations/puppet)

2013-03-14 Thread Mark Bergsma (Code Review) 
Mark Bergsma has submitted this change and it was merged.

Change subject: Make ganglia-monitor-aggregator not fail if an instance is 
running
..


Make ganglia-monitor-aggregator not fail if an instance is running

Change-Id: I54c1c8fd597308449ca5b828d0e7bc3abbeae8be
---
M modules/ganglia_new/files/upstart/ganglia-monitor-aggregator.conf
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mark Bergsma: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ganglia_new/files/upstart/ganglia-monitor-aggregator.conf 
b/modules/ganglia_new/files/upstart/ganglia-monitor-aggregator.conf
index 8bba792..b189426 100644
--- a/modules/ganglia_new/files/upstart/ganglia-monitor-aggregator.conf
+++ b/modules/ganglia_new/files/upstart/ganglia-monitor-aggregator.conf
@@ -11,6 +11,6 @@
for gmonconf in /etc/ganglia/aggregators/*.conf
do
gmonid=${gmonconf##*/}
-   /sbin/start ganglia-monitor-aggregator-instance 
ID=${gmonid%.conf}
+   start ganglia-monitor-aggregator-instance ID=${gmonid%.conf} || 
true
done
 end script

-- 
To view, visit https://gerrit.wikimedia.org/r/53761
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I54c1c8fd597308449ca5b828d0e7bc3abbeae8be
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@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] Aggregators should not collect metrics themselves - change (operations/puppet)

2013-03-14 Thread Mark Bergsma (Code Review) 
Mark Bergsma has submitted this change and it was merged.

Change subject: Aggregators should not collect metrics themselves
..


Aggregators should not collect metrics themselves

Change-Id: Ieaf39c5022e54eedf747ea891ec2ad03b8424b3a
---
M modules/ganglia_new/templates/gmond.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mark Bergsma: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ganglia_new/templates/gmond.conf.erb 
b/modules/ganglia_new/templates/gmond.conf.erb
index 305e145..e6cacaf 100644
--- a/modules/ganglia_new/templates/gmond.conf.erb
+++ b/modules/ganglia_new/templates/gmond.conf.erb
@@ -72,7 +72,6 @@
 % end -%
   }
 }
-% end -%
 
 /* Each metrics module that is referenced by gmond must be specified and
loaded. If the module has been statically linked with gmond, it does not
@@ -358,4 +357,5 @@
 title = Maximum Disk Space Used
   }
 }
+% end -%
 

-- 
To view, visit https://gerrit.wikimedia.org/r/53762
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieaf39c5022e54eedf747ea891ec2ad03b8424b3a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@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] Invert - change (operations/puppet)

2013-03-14 Thread Mark Bergsma (Code Review) 
Mark Bergsma has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53763


Change subject: Invert
..

Invert

Change-Id: I132cc245b44892301f745246b01747d180be2485
---
M modules/ganglia_new/templates/gmond.conf.erb
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/63/53763/1

diff --git a/modules/ganglia_new/templates/gmond.conf.erb 
b/modules/ganglia_new/templates/gmond.conf.erb
index e6cacaf..fc50d38 100644
--- a/modules/ganglia_new/templates/gmond.conf.erb
+++ b/modules/ganglia_new/templates/gmond.conf.erb
@@ -72,7 +72,9 @@
 % end -%
   }
 }
+% end -%
 
+% if not aggregator -%
 /* Each metrics module that is referenced by gmond must be specified and
loaded. If the module has been statically linked with gmond, it does not
require a load path. However all dynamically loadable modules must include

-- 
To view, visit https://gerrit.wikimedia.org/r/53763
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I132cc245b44892301f745246b01747d180be2485
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update ArticleFeedbackv5 to master - change (mediawiki/core)

2013-03-14 Thread Matthias Mullie (Code Review) 
Matthias Mullie has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53764


Change subject: Update ArticleFeedbackv5 to master
..

Update ArticleFeedbackv5 to master

Change-Id: I5bf7bcdce2ccebe5dae3bb1bc6e97001176bc9dc
---
M extensions/ArticleFeedbackv5
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/64/53764/1

diff --git a/extensions/ArticleFeedbackv5 b/extensions/ArticleFeedbackv5
index 3e4fac9..efdb78b 16
--- a/extensions/ArticleFeedbackv5
+++ b/extensions/ArticleFeedbackv5
-Subproject commit 3e4fac90b7bc7c19af28f55a03be65ad5477bf06
+Subproject commit efdb78b498a558f86c26e86b04e71d1791295389

-- 
To view, visit https://gerrit.wikimedia.org/r/53764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5bf7bcdce2ccebe5dae3bb1bc6e97001176bc9dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.21wmf11
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update ArticleFeedbackv5 to master - change (mediawiki/core)

2013-03-14 Thread Matthias Mullie (Code Review) 
Matthias Mullie has submitted this change and it was merged.

Change subject: Update ArticleFeedbackv5 to master
..


Update ArticleFeedbackv5 to master

Change-Id: I5bf7bcdce2ccebe5dae3bb1bc6e97001176bc9dc
---
M extensions/ArticleFeedbackv5
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Matthias Mullie: Verified; Looks good to me, approved

Objections:
  jenkins-bot: Fails



diff --git a/extensions/ArticleFeedbackv5 b/extensions/ArticleFeedbackv5
index 3e4fac9..efdb78b 16
--- a/extensions/ArticleFeedbackv5
+++ b/extensions/ArticleFeedbackv5
-Subproject commit 3e4fac90b7bc7c19af28f55a03be65ad5477bf06
+Subproject commit efdb78b498a558f86c26e86b04e71d1791295389

-- 
To view, visit https://gerrit.wikimedia.org/r/53764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5bf7bcdce2ccebe5dae3bb1bc6e97001176bc9dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.21wmf11
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@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] Manage aggregator instances through upstart directly - change (operations/puppet)

2013-03-14 Thread Mark Bergsma (Code Review) 
Mark Bergsma has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53765


Change subject: Manage aggregator instances through upstart directly
..

Manage aggregator instances through upstart directly

The ganglia-monitor-aggregator instance is still installed
to start all instances at boot time.

Change-Id: Ifae8ef7ab64dd1c0b26df0e978ac00cf87f2c95e
---
M modules/ganglia_new/manifests/monitor/aggregator.pp
M modules/ganglia_new/manifests/monitor/aggregator/instance.pp
2 files changed, 12 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/65/53765/1

diff --git a/modules/ganglia_new/manifests/monitor/aggregator.pp 
b/modules/ganglia_new/manifests/monitor/aggregator.pp
index 2ba6f95..c0afab3 100644
--- a/modules/ganglia_new/manifests/monitor/aggregator.pp
+++ b/modules/ganglia_new/manifests/monitor/aggregator.pp
@@ -18,15 +18,9 @@
mode = 0444;
}
 
-   upstart_job { ganglia-monitor-aggregator-instance: }
+   upstart_job { [ganglia-monitor-aggregator, 
ganglia-monitor-aggregator-instance]: }
 
# Instantiate aggregators for all clusters
$cluster_list = keys($ganglia_new::configuration::clusters)
instance{ $cluster_list: }
-
-   service { ganglia-monitor-aggregator:
-   provider = upstart,
-   name = ganglia-monitor-aggregator,
-   ensure = running
-   }
 }
diff --git a/modules/ganglia_new/manifests/monitor/aggregator/instance.pp 
b/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
index 4e952c8..099da04 100644
--- a/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
+++ b/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
@@ -1,6 +1,4 @@
 define ganglia_new::monitor::aggregator::instance() {
-   Ganglia_new::Monitor::Aggregator::Instance[$title] - 
Service[ganglia-monitor-aggregator]
-
include ganglia_new::configuration, network::constants
 
$aggregator = true
@@ -20,6 +18,16 @@
require = File[/etc/ganglia/aggregators],
mode = 0444,
content = template($module_name/gmond.conf.erb),
-   notify = Service[ganglia-monitor-aggregator]
+   notify = Service[ganglia-monitor-aggregator-instance 
ID=${id}]
+   }
+
+   service { ganglia-monitor-aggregator-instance ID=${id}:
+   require = File[/etc/ganglia/aggregators/${id}.conf],
+   provider = upstart,
+   name = ganglia-monitor-aggregator-instance,
+   start = /sbin/start ganglia-monitor-aggregator-instance 
ID=${id},
+   stop = /sbin/stop ganglia-monitor-aggregator-instance 
ID=${id},
+   restart = /sbin/restart ganglia-monitor-aggregator-instance 
ID=${id},
+   ensure = running
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/53765
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifae8ef7ab64dd1c0b26df0e978ac00cf87f2c95e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Manage aggregator instances through upstart directly - change (operations/puppet)

2013-03-14 Thread Mark Bergsma (Code Review) 
Mark Bergsma has submitted this change and it was merged.

Change subject: Manage aggregator instances through upstart directly
..


Manage aggregator instances through upstart directly

The ganglia-monitor-aggregator instance is still installed
to start all instances at boot time.

Change-Id: Ifae8ef7ab64dd1c0b26df0e978ac00cf87f2c95e
---
M modules/ganglia_new/manifests/monitor/aggregator.pp
M modules/ganglia_new/manifests/monitor/aggregator/instance.pp
2 files changed, 12 insertions(+), 10 deletions(-)

Approvals:
  Mark Bergsma: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ganglia_new/manifests/monitor/aggregator.pp 
b/modules/ganglia_new/manifests/monitor/aggregator.pp
index 2ba6f95..c0afab3 100644
--- a/modules/ganglia_new/manifests/monitor/aggregator.pp
+++ b/modules/ganglia_new/manifests/monitor/aggregator.pp
@@ -18,15 +18,9 @@
mode = 0444;
}
 
-   upstart_job { ganglia-monitor-aggregator-instance: }
+   upstart_job { [ganglia-monitor-aggregator, 
ganglia-monitor-aggregator-instance]: }
 
# Instantiate aggregators for all clusters
$cluster_list = keys($ganglia_new::configuration::clusters)
instance{ $cluster_list: }
-
-   service { ganglia-monitor-aggregator:
-   provider = upstart,
-   name = ganglia-monitor-aggregator,
-   ensure = running
-   }
 }
diff --git a/modules/ganglia_new/manifests/monitor/aggregator/instance.pp 
b/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
index 4e952c8..7dce11e 100644
--- a/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
+++ b/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
@@ -1,6 +1,4 @@
 define ganglia_new::monitor::aggregator::instance() {
-   Ganglia_new::Monitor::Aggregator::Instance[$title] - 
Service[ganglia-monitor-aggregator]
-
include ganglia_new::configuration, network::constants
 
$aggregator = true
@@ -20,6 +18,16 @@
require = File[/etc/ganglia/aggregators],
mode = 0444,
content = template($module_name/gmond.conf.erb),
-   notify = Service[ganglia-monitor-aggregator]
+   notify = Service[ganglia-monitor-aggregator-instance 
ID=${id}]
+   }
+
+   service { ganglia-monitor-aggregator-instance ID=${id}:
+   require = File[/etc/ganglia/aggregators/${id}.conf],
+   provider = upstart,
+   name = ganglia-monitor-aggregator-instance,
+   start = /sbin/start ganglia-monitor-aggregator-instance 
ID=${id},
+   stop = /sbin/stop ganglia-monitor-aggregator-instance 
ID=${id},
+   restart = /sbin/restart ganglia-monitor-aggregator-instance 
ID=${id},
+   ensure = running
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/53765
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifae8ef7ab64dd1c0b26df0e978ac00cf87f2c95e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@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] pulling db1009 for upgrade - change (operations/mediawiki-config)

2013-03-14 Thread Asher (Code Review) 
Asher has submitted this change and it was merged.

Change subject: pulling db1009 for upgrade
..


pulling db1009 for upgrade

Change-Id: I4855deb9606b3afac4decae60842b9fed83f5174
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Asher: Verified; Looks good to me, approved



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 179eaa4..8c4a85f 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -90,7 +90,7 @@
's2' = array(
'db1034'= 0,
'db1002'= 400,
-   'db1009'= 400,
+   #'db1009'= 400,
'db1018'= 100, # snaphsot
),
/* s3 */ 'DEFAULT' = array(

-- 
To view, visit https://gerrit.wikimedia.org/r/53766
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4855deb9606b3afac4decae60842b9fed83f5174
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Asher afeld...@wikimedia.org
Gerrit-Reviewer: Asher afeld...@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] db1009 - mariadb, max_cons - 1000 - change (operations/puppet)

2013-03-14 Thread Asher (Code Review) 
Asher has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53767


Change subject: db1009 - mariadb, max_cons - 1000
..

db1009 - mariadb, max_cons - 1000

Change-Id: Id0752ddb985dd9367d291b63347c6b6aa7333f3c
---
M manifests/site.pp
M modules/coredb_mysql/templates/prod.my.cnf.erb
2 files changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/67/53767/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 405e7d2..56f8118 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -489,7 +489,11 @@
 }
 
 node /db10(02|09|18|34)\.eqiad\.wmnet/ {
-   include role::coredb::s2
+   if $hostname == db1009 {
+   class { role::coredb::s2 : mariadb = true }
+   } else {
+   include role::coredb::s2
+   }
 }
 
 node /db10(03|10|19|35)\.eqiad\.wmnet/ {
diff --git a/modules/coredb_mysql/templates/prod.my.cnf.erb 
b/modules/coredb_mysql/templates/prod.my.cnf.erb
index 8a80067..eac9705 100644
--- a/modules/coredb_mysql/templates/prod.my.cnf.erb
+++ b/modules/coredb_mysql/templates/prod.my.cnf.erb
@@ -35,7 +35,7 @@
 thread_stack   = 192K
 thread_cache_size  = 300
 
-max_connections= 5000
+max_connections= 1000
 table_open_cache= 5
 table_definition_cache = 4
 

-- 
To view, visit https://gerrit.wikimedia.org/r/53767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0752ddb985dd9367d291b63347c6b6aa7333f3c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher afeld...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] noexternallanglinks needs to be serialized - change (mediawiki...Wikibase)

2013-03-14 Thread Aude (Code Review) 
Aude has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53768


Change subject: noexternallanglinks needs to be serialized
..

noexternallanglinks needs to be serialized

- there was a reason we serialized it...

LinksUpdate does array_diff_assoc.  If the property is set (as array), and 
compared
with empty property (a string), then we have a problem.

If the array values are strings, regardless if it's set or not then all is good.

Change-Id: Ie8796ebcc774b3c9aa91bc7c0555917ec66b66dd
---
M client/includes/LangLinkHandler.php
1 file changed, 3 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/68/53768/1

diff --git a/client/includes/LangLinkHandler.php 
b/client/includes/LangLinkHandler.php
index 6226f75..0cf009d 100644
--- a/client/includes/LangLinkHandler.php
+++ b/client/includes/LangLinkHandler.php
@@ -203,11 +203,8 @@
 */
public function getNoExternalLangLinks( ParserOutput $out ) {
wfProfileIn( __METHOD__ );
-   $nel = $out-getProperty( 'noexternallanglinks' );
-
-   if( empty( $nel ) ) {
-   $nel = array();
-   }
+   $property = $out-getProperty( 'noexternallanglinks' );
+   $nel = is_string( $property ) ? unserialize( $property ) : 
array();
 
wfProfileOut( __METHOD__ );
return $nel;
@@ -224,7 +221,7 @@
 */
public function setNoExternalLangLinks( ParserOutput $out, array 
$noexternallanglinks ) {
wfProfileIn( __METHOD__ );
-   $out-setProperty( 'noexternallanglinks', $noexternallanglinks 
);
+   $out-setProperty( 'noexternallanglinks', serialize( 
$noexternallanglinks ) );
wfProfileOut( __METHOD__ );
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/53768
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8796ebcc774b3c9aa91bc7c0555917ec66b66dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Story 347: Provide nicer filenames - change (mediawiki...MobileFrontend)

2013-03-14 Thread Jdlrobson (Code Review) 
Jdlrobson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53769


Change subject: Story 347: Provide nicer filenames
..

Story 347: Provide nicer filenames

Filenames are descriptions with date appended accurate to minutes

Change-Id: I8b5f2a78b9f73a23abc505ac424ab3926b81bf6d
---
M MobileFrontend.i18n.php
M MobileFrontend.php
M javascripts/modules/mf-photo.js
M tests/js/test_mf-photo.js
4 files changed, 122 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/69/53769/1

diff --git a/MobileFrontend.i18n.php b/MobileFrontend.i18n.php
index 0b3be89..792e2fc 100644
--- a/MobileFrontend.i18n.php
+++ b/MobileFrontend.i18n.php
@@ -233,6 +233,7 @@
'mobile-frontend-image-uploading-long' = 'Image still uploading! 
Thanks for your patience.',
'mobile-frontend-image-uploading-cancel' = 'a href=#Cancel/a if 
this is taking too long.',
'mobile-frontend-photo-upload-error' = 'Error, try again.',
+   'mobile-frontend-photo-upload-error-filename' = 'Error, please provide 
a more descriptive summary.',
'mobile-frontend-photo-upload-success-article' = 'Success! Your image 
is now live on this page.',
'mobile-frontend-photo-license' = 'By clicking Submit, you agree to 
our [//wikimediafoundation.org/wiki/Terms_of_use Terms of Use] and agree to 
release your photo under the [//creativecommons.org/licenses/by-sa/3.0/ 
Creative Commons Attribution-ShareAlike 3.0 License].',
'mobile-frontend-photo-submit' = 'Submit',
@@ -577,6 +578,7 @@
'mobile-frontend-image-uploading-long' = 'Text that displays whilst an 
image is taking long to upload',
'mobile-frontend-image-uploading-cancel' = 'Text saying that user can 
cancel the image upload. Word cancel should be a link.',
'mobile-frontend-photo-upload-error' = 'Text that displays when a 
photo fails to upload',
+   'mobile-frontend-photo-upload-error-filename' = 'Text that displays 
when a photo fails to upload due to filename',
'mobile-frontend-photo-upload-success-article' = 'Text that displays 
when a photo has been successfully added to a page.',
'mobile-frontend-photo-license' = 'Text notifying user of license that 
image will be published under. You can change the URL to a local Wikipedia 
URL, but you cannot make it point to the country specific CC BY-SA 3.0 
license.',
'mobile-frontend-photo-submit' = 'Caption for the submit button on the 
photo uplaod form.
diff --git a/MobileFrontend.php b/MobileFrontend.php
index 573a344..7bef703 100644
--- a/MobileFrontend.php
+++ b/MobileFrontend.php
@@ -378,6 +378,7 @@
'mobile-frontend-photo-article-edit-comment',
'mobile-frontend-photo-article-donate-comment',
'mobile-frontend-photo-upload-error',
+   'mobile-frontend-photo-upload-error-filename',
'mobile-frontend-photo-upload-success-article',
'mobile-frontend-photo-caption-placeholder',
'mobile-frontend-image-loading',
diff --git a/javascripts/modules/mf-photo.js b/javascripts/modules/mf-photo.js
index 1c4071e..1c91dbd 100644
--- a/javascripts/modules/mf-photo.js
+++ b/javascripts/modules/mf-photo.js
@@ -52,15 +52,75 @@
};
}
 
-   function generateFileName( file, pageTitle ) {
-   // FIXME: deal with long and invalid names
-   var name = 'Lead_Photo_For_' + pageTitle.replace( / /g, '_' ) + 
Math.random(),
-   extension;
+   // Originally written by Brion for WikiLovesMonuments app
+   function trimUtf8String( str, allowedLength ) {
+   // Count UTF-8 bytes to see where we need to crop long names.
+   var bytes = 0, chars = 0, codeUnit, len, i;
 
-   name = name.replace( String.fromCharCode( 27 ), '-' );
-   name = name.replace( /[\x7f\.\[#\[\]\|\{\}\/:]/g, '-' );
-   extension = file.name.slice( file.name.lastIndexOf( '.' ) + 1 );
-   return name + '.' + extension;
+   for ( i = 0; i  str.length; i++ ) {
+   // JavaScript strings are UTF-16.
+   codeUnit = str.charCodeAt( i );
+
+   // http://en.wikipedia.org/wiki/UTF-8#Description
+   if ( codeUnit  0x80 ) {
+   len = 1;
+   } else if ( codeUnit  0x800 ) {
+   len = 2;
+   } else if ( codeUnit = 0xd800  codeUnit  0xe000 ) {
+   // 
http://en.wikipedia.org/wiki/UTF-16#Description
+   // Code point is one half of a surrogate pair.
+   // This and its partner combine to form a 
single 4 byte character in UTF-8.
+   len =

[MediaWiki-commits] [Gerrit] Make description an input element - change (mediawiki...MobileFrontend)

2013-03-14 Thread Jdlrobson (Code Review) 
Jdlrobson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53770


Change subject: Make description an input element
..

Make description an input element

Encourage single lines rather than multilines

Change-Id: I2ce019aab4053fa017e60f2e36e72f07b44f3e2a
---
M javascripts/modules/mf-photo.js
M less/modules/mf-photo.less
M stylesheets/modules/mf-photo.css
M templates/photoUploadPreview.html
4 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/70/53770/1

diff --git a/javascripts/modules/mf-photo.js b/javascripts/modules/mf-photo.js
index 1c91dbd..ccff974 100644
--- a/javascripts/modules/mf-photo.js
+++ b/javascripts/modules/mf-photo.js
@@ -251,7 +251,7 @@
 
initialize: function() {
var self = this,
-   $description = this.$( 'textarea' ),
+   $description = this.$( 'input' ),
$submitButton = this.$( 'button.submit' );
this.$description = $description;
 
diff --git a/less/modules/mf-photo.less b/less/modules/mf-photo.less
index 648115e..80c1915 100644
--- a/less/modules/mf-photo.less
+++ b/less/modules/mf-photo.less
@@ -57,7 +57,7 @@
line-height: 150%;
}
 
-   textarea {
+   input {
width: 100%;
height: 6em;
 
diff --git a/stylesheets/modules/mf-photo.css b/stylesheets/modules/mf-photo.css
index 7ffeb7c..2d13b6e 100644
--- a/stylesheets/modules/mf-photo.css
+++ b/stylesheets/modules/mf-photo.css
@@ -48,12 +48,12 @@
   font-size: .75em;
   line-height: 150%;
 }
-.photoPreview textarea {
+.photoPreview input {
   width: 100%;
   height: 6em;
 }
-.photoPreview textarea::-webkit-input-placeholder,
-.photoPreview textarea::-moz-placeholder {
+.photoPreview input::-webkit-input-placeholder,
+.photoPreview input::-moz-placeholder {
   text-align: center;
   line-height: 6em;
 }
diff --git a/templates/photoUploadPreview.html 
b/templates/photoUploadPreview.html
index 9da5a07..60dd34f 100644
--- a/templates/photoUploadPreview.html
+++ b/templates/photoUploadPreview.html
@@ -1,6 +1,6 @@
 div class=content photoPreview
p class=loading{{loadingMessage}}/p
-   textarea name=description 
placeholder={{descriptionPlaceholder}}/textarea
+   input name=description placeholder={{descriptionPlaceholder}}
div class=license{{{license}}}/div
 /div
 div class=buttonBar position-fixed

-- 
To view, visit https://gerrit.wikimedia.org/r/53770
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ce019aab4053fa017e60f2e36e72f07b44f3e2a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] remove steps that depend on All comments link which no longe... - change (qa/browsertests)

2013-03-14 Thread Cmcmahon (Code Review) 
Cmcmahon has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53772


Change subject: remove steps that depend on All comments link which no longer 
exists for now
..

remove steps that depend on All comments link which no longer exists for now

Change-Id: I7b748d609549d679ac856dc2f01276a76d72ebe2
---
M features/aftv5.feature
1 file changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/72/53772/1

diff --git a/features/aftv5.feature b/features/aftv5.feature
index 6d2f61b..963dee0 100644
--- a/features/aftv5.feature
+++ b/features/aftv5.feature
@@ -25,7 +25,3 @@
 Given I am at an AFTv5 page
 When I click Yes
 Then I can enter and save text
-  And After saving I have links to feedback page and See all comments 
available
-  And When I click to navigate to comments page my saved comment appears
-  And Comments are shown Relevant and All and Sort By
-  And I have links to Learn more and View Article

-- 
To view, visit https://gerrit.wikimedia.org/r/53772
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b748d609549d679ac856dc2f01276a76d72ebe2
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] puppetizing apache-fast-test qa script - change (operations/puppet)

2013-03-14 Thread Jgreen (Code Review) 
Jgreen has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53773


Change subject: puppetizing apache-fast-test qa script
..

puppetizing apache-fast-test qa script

Change-Id: Ia61798ba59205475b55cd7b7b7d94275fda215eb
---
M manifests/misc/deployment.pp
1 file changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/53773/1

diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 9a572ba..266192f 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -32,7 +32,9 @@
# TODO: Should this be in a package instead, maybe? It's conceptually 
nicer than keeping scripts in the puppet git repo,
# but rebuilding packages isn't as easy as updating a file through this 
mechanism, right?
 
-   package { php5-parsekit: ensure = present; }
+   package { [php5-parsekit, libwww-perl, libnet-dns-perl]:
+ensure = present;
+   }
 
$scriptpath = /usr/local/bin
 
@@ -152,6 +154,11 @@
group = root,
mode = 0555,
source = 
puppet:///files/misc/scripts/set-group-write2;
+   ${scriptpath}/apache-fast-test:
+   owner = root,
+   group = root,
+   mode = 0555,
+   source = 
puppet:///files/misc/scripts/apache-fast-test;
 
# Manpages
# Need to be generated manually using make in files/misc/scripts

-- 
To view, visit https://gerrit.wikimedia.org/r/53773
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia61798ba59205475b55cd7b7b7d94275fda215eb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen jgr...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] puppetizing apache-fast-test qa script - change (operations/puppet)

2013-03-14 Thread Jgreen (Code Review) 
Jgreen has submitted this change and it was merged.

Change subject: puppetizing apache-fast-test qa script
..


puppetizing apache-fast-test qa script

Change-Id: Ia61798ba59205475b55cd7b7b7d94275fda215eb
---
M manifests/misc/deployment.pp
1 file changed, 8 insertions(+), 1 deletion(-)

Approvals:
  Jgreen: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 9a572ba..266192f 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -32,7 +32,9 @@
# TODO: Should this be in a package instead, maybe? It's conceptually 
nicer than keeping scripts in the puppet git repo,
# but rebuilding packages isn't as easy as updating a file through this 
mechanism, right?
 
-   package { php5-parsekit: ensure = present; }
+   package { [php5-parsekit, libwww-perl, libnet-dns-perl]:
+ensure = present;
+   }
 
$scriptpath = /usr/local/bin
 
@@ -152,6 +154,11 @@
group = root,
mode = 0555,
source = 
puppet:///files/misc/scripts/set-group-write2;
+   ${scriptpath}/apache-fast-test:
+   owner = root,
+   group = root,
+   mode = 0555,
+   source = 
puppet:///files/misc/scripts/apache-fast-test;
 
# Manpages
# Need to be generated manually using make in files/misc/scripts

-- 
To view, visit https://gerrit.wikimedia.org/r/53773
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia61798ba59205475b55cd7b7b7d94275fda215eb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen jgr...@wikimedia.org
Gerrit-Reviewer: Jgreen jgr...@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] Set job queue aggregator to redis. - change (operations/mediawiki-config)

2013-03-14 Thread Aaron Schulz (Code Review) 
Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53774


Change subject: Set job queue aggregator to redis.
..

Set job queue aggregator to redis.

Change-Id: I6b99685b70d1b329ed3ba7effdfa447fd8ea1443
---
M .gitignore
M wmf-config/CommonSettings.php
A wmf-config/jobqueue-eqiad.php
A wmf-config/jobqueue-pmtpa.php
4 files changed, 27 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/74/53774/1

diff --git a/.gitignore b/.gitignore
index 53edc0e..e0e117b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@
 # Operating system stuff
 ## Mac OS X
 .DS_Store
+/nbproject/private/
\ No newline at end of file
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 56a7ae8..4d92fc4 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1168,8 +1168,12 @@
 # e-mailing password based on e-mail address (bug 34386)
 $wgPasswordResetRoutes['email'] = true;
 
+# Cluster-dependent files for file backend
 require( getRealmSpecificFilename( $wmfConfigDir/filebackend.php ) );
 
+# Cluster-dependent files for job queue and job queue aggregator
+require( getRealmSpecificFilename( $wmfConfigDir/jobqueue.php ) );
+
 if( $wgDBname != 'commonswiki' ) {
$wgDefaultUserOptions['watchcreations'] = 1;
 }
diff --git a/wmf-config/jobqueue-eqiad.php b/wmf-config/jobqueue-eqiad.php
new file mode 100644
index 000..a6ce6a8
--- /dev/null
+++ b/wmf-config/jobqueue-eqiad.php
@@ -0,0 +1,11 @@
+?php
+# WARNING: This file is publically viewable on the web. Do not put private 
data here.
+$wgJobQueueAggregator = array(
+   'class'   = 'JobQueueAggregatorRedis',
+   'redisServer' = '10.64.0.180', # mc1001
+   'redisConfig' = array(
+   'connectTimeout' = 1,
+   'serializer' = 'igbinary'
+   )
+);
+# vim: set sts=4 sw=4 et :
diff --git a/wmf-config/jobqueue-pmtpa.php b/wmf-config/jobqueue-pmtpa.php
new file mode 100644
index 000..3e10451
--- /dev/null
+++ b/wmf-config/jobqueue-pmtpa.php
@@ -0,0 +1,11 @@
+?php
+# WARNING: This file is publically viewable on the web. Do not put private 
data here.
+$wgJobQueueAggregator = array(
+   'class'   = 'JobQueueAggregatorRedis',
+   'redisServer' = '10.0.12.1', # mc1
+   'redisConfig' = array(
+   'connectTimeout' = 1,
+   'serializer' = 'igbinary'
+   )
+);
+# vim: set sts=4 sw=4 et :

-- 
To view, visit https://gerrit.wikimedia.org/r/53774
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b99685b70d1b329ed3ba7effdfa447fd8ea1443
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Set job queue aggregator to redis. - change (operations/mediawiki-config)

2013-03-14 Thread Aaron Schulz (Code Review) 
Aaron Schulz has submitted this change and it was merged.

Change subject: Set job queue aggregator to redis.
..


Set job queue aggregator to redis.

Change-Id: I6b99685b70d1b329ed3ba7effdfa447fd8ea1443
---
M .gitignore
M wmf-config/CommonSettings.php
A wmf-config/jobqueue-eqiad.php
A wmf-config/jobqueue-pmtpa.php
4 files changed, 27 insertions(+), 0 deletions(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.gitignore b/.gitignore
index 53edc0e..e0e117b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@
 # Operating system stuff
 ## Mac OS X
 .DS_Store
+/nbproject/private/
\ No newline at end of file
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 56a7ae8..4d92fc4 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1168,8 +1168,12 @@
 # e-mailing password based on e-mail address (bug 34386)
 $wgPasswordResetRoutes['email'] = true;
 
+# Cluster-dependent files for file backend
 require( getRealmSpecificFilename( $wmfConfigDir/filebackend.php ) );
 
+# Cluster-dependent files for job queue and job queue aggregator
+require( getRealmSpecificFilename( $wmfConfigDir/jobqueue.php ) );
+
 if( $wgDBname != 'commonswiki' ) {
$wgDefaultUserOptions['watchcreations'] = 1;
 }
diff --git a/wmf-config/jobqueue-eqiad.php b/wmf-config/jobqueue-eqiad.php
new file mode 100644
index 000..a6ce6a8
--- /dev/null
+++ b/wmf-config/jobqueue-eqiad.php
@@ -0,0 +1,11 @@
+?php
+# WARNING: This file is publically viewable on the web. Do not put private 
data here.
+$wgJobQueueAggregator = array(
+   'class'   = 'JobQueueAggregatorRedis',
+   'redisServer' = '10.64.0.180', # mc1001
+   'redisConfig' = array(
+   'connectTimeout' = 1,
+   'serializer' = 'igbinary'
+   )
+);
+# vim: set sts=4 sw=4 et :
diff --git a/wmf-config/jobqueue-pmtpa.php b/wmf-config/jobqueue-pmtpa.php
new file mode 100644
index 000..3e10451
--- /dev/null
+++ b/wmf-config/jobqueue-pmtpa.php
@@ -0,0 +1,11 @@
+?php
+# WARNING: This file is publically viewable on the web. Do not put private 
data here.
+$wgJobQueueAggregator = array(
+   'class'   = 'JobQueueAggregatorRedis',
+   'redisServer' = '10.0.12.1', # mc1
+   'redisConfig' = array(
+   'connectTimeout' = 1,
+   'serializer' = 'igbinary'
+   )
+);
+# vim: set sts=4 sw=4 et :

-- 
To view, visit https://gerrit.wikimedia.org/r/53774
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b99685b70d1b329ed3ba7effdfa447fd8ea1443
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@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] Revert Manage aggregator instances through upstart directly - change (operations/puppet)

2013-03-14 Thread Mark Bergsma (Code Review) 
Mark Bergsma has submitted this change and it was merged.

Change subject: Revert Manage aggregator instances through upstart directly
..


Revert Manage aggregator instances through upstart directly

Puppet doesn't allow specifying env variables for instances

This reverts commit 1f1dae0eac8e8b4ea5ecde8261c8d6b0bd942919

Change-Id: I19519a78401fdd7aa7f1c395b3e1f46c0cf22bba
---
M modules/ganglia_new/manifests/monitor/aggregator.pp
M modules/ganglia_new/manifests/monitor/aggregator/instance.pp
2 files changed, 10 insertions(+), 12 deletions(-)

Approvals:
  Mark Bergsma: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ganglia_new/manifests/monitor/aggregator.pp 
b/modules/ganglia_new/manifests/monitor/aggregator.pp
index c0afab3..2ba6f95 100644
--- a/modules/ganglia_new/manifests/monitor/aggregator.pp
+++ b/modules/ganglia_new/manifests/monitor/aggregator.pp
@@ -18,9 +18,15 @@
mode = 0444;
}
 
-   upstart_job { [ganglia-monitor-aggregator, 
ganglia-monitor-aggregator-instance]: }
+   upstart_job { ganglia-monitor-aggregator-instance: }
 
# Instantiate aggregators for all clusters
$cluster_list = keys($ganglia_new::configuration::clusters)
instance{ $cluster_list: }
+
+   service { ganglia-monitor-aggregator:
+   provider = upstart,
+   name = ganglia-monitor-aggregator,
+   ensure = running
+   }
 }
diff --git a/modules/ganglia_new/manifests/monitor/aggregator/instance.pp 
b/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
index 7dce11e..4e952c8 100644
--- a/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
+++ b/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
@@ -1,4 +1,6 @@
 define ganglia_new::monitor::aggregator::instance() {
+   Ganglia_new::Monitor::Aggregator::Instance[$title] - 
Service[ganglia-monitor-aggregator]
+
include ganglia_new::configuration, network::constants
 
$aggregator = true
@@ -18,16 +20,6 @@
require = File[/etc/ganglia/aggregators],
mode = 0444,
content = template($module_name/gmond.conf.erb),
-   notify = Service[ganglia-monitor-aggregator-instance 
ID=${id}]
-   }
-
-   service { ganglia-monitor-aggregator-instance ID=${id}:
-   require = File[/etc/ganglia/aggregators/${id}.conf],
-   provider = upstart,
-   name = ganglia-monitor-aggregator-instance,
-   start = /sbin/start ganglia-monitor-aggregator-instance 
ID=${id},
-   stop = /sbin/stop ganglia-monitor-aggregator-instance 
ID=${id},
-   restart = /sbin/restart ganglia-monitor-aggregator-instance 
ID=${id},
-   ensure = running
+   notify = Service[ganglia-monitor-aggregator]
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/53775
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I19519a78401fdd7aa7f1c395b3e1f46c0cf22bba
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@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] Update Math to master - change (mediawiki/core)

2013-03-14 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53776


Change subject: Update Math to master
..

Update Math to master

Change-Id: Idaf81d69fafb5a2876f147d134452d130fe35aed
---
M extensions/Math
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/76/53776/1

diff --git a/extensions/Math b/extensions/Math
index aa8a0ea..20192a1 16
--- a/extensions/Math
+++ b/extensions/Math
-Subproject commit aa8a0eaf19b88e28bd15d5eb03ca8a9831e40866
+Subproject commit 20192a1ab87d092963af732fdd8c95e5e60509a8

-- 
To view, visit https://gerrit.wikimedia.org/r/53776
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idaf81d69fafb5a2876f147d134452d130fe35aed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.21wmf11
Gerrit-Owner: Reedy re...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Set serializer to php instead. - change (operations/mediawiki-config)

2013-03-14 Thread Aaron Schulz (Code Review) 
Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53777


Change subject: Set serializer to php instead.
..

Set serializer to php instead.

Change-Id: I791423366382c4db480b61cefe2af7bf1b18063e
---
M wmf-config/jobqueue-eqiad.php
M wmf-config/jobqueue-pmtpa.php
2 files changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/77/53777/1

diff --git a/wmf-config/jobqueue-eqiad.php b/wmf-config/jobqueue-eqiad.php
index a6ce6a8..0b70e2c 100644
--- a/wmf-config/jobqueue-eqiad.php
+++ b/wmf-config/jobqueue-eqiad.php
@@ -4,8 +4,7 @@
'class'   = 'JobQueueAggregatorRedis',
'redisServer' = '10.64.0.180', # mc1001
'redisConfig' = array(
-   'connectTimeout' = 1,
-   'serializer' = 'igbinary'
+   'connectTimeout' = 1
)
 );
 # vim: set sts=4 sw=4 et :
diff --git a/wmf-config/jobqueue-pmtpa.php b/wmf-config/jobqueue-pmtpa.php
index 3e10451..0d1c97a 100644
--- a/wmf-config/jobqueue-pmtpa.php
+++ b/wmf-config/jobqueue-pmtpa.php
@@ -4,8 +4,7 @@
'class'   = 'JobQueueAggregatorRedis',
'redisServer' = '10.0.12.1', # mc1
'redisConfig' = array(
-   'connectTimeout' = 1,
-   'serializer' = 'igbinary'
+   'connectTimeout' = 1
)
 );
 # vim: set sts=4 sw=4 et :

-- 
To view, visit https://gerrit.wikimedia.org/r/53777
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I791423366382c4db480b61cefe2af7bf1b18063e
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Set serializer to php instead. - change (operations/mediawiki-config)

2013-03-14 Thread Aaron Schulz (Code Review) 
Aaron Schulz has submitted this change and it was merged.

Change subject: Set serializer to php instead.
..


Set serializer to php instead.

Change-Id: I791423366382c4db480b61cefe2af7bf1b18063e
---
M wmf-config/jobqueue-eqiad.php
M wmf-config/jobqueue-pmtpa.php
2 files changed, 2 insertions(+), 4 deletions(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/jobqueue-eqiad.php b/wmf-config/jobqueue-eqiad.php
index a6ce6a8..0b70e2c 100644
--- a/wmf-config/jobqueue-eqiad.php
+++ b/wmf-config/jobqueue-eqiad.php
@@ -4,8 +4,7 @@
'class'   = 'JobQueueAggregatorRedis',
'redisServer' = '10.64.0.180', # mc1001
'redisConfig' = array(
-   'connectTimeout' = 1,
-   'serializer' = 'igbinary'
+   'connectTimeout' = 1
)
 );
 # vim: set sts=4 sw=4 et :
diff --git a/wmf-config/jobqueue-pmtpa.php b/wmf-config/jobqueue-pmtpa.php
index 3e10451..0d1c97a 100644
--- a/wmf-config/jobqueue-pmtpa.php
+++ b/wmf-config/jobqueue-pmtpa.php
@@ -4,8 +4,7 @@
'class'   = 'JobQueueAggregatorRedis',
'redisServer' = '10.0.12.1', # mc1
'redisConfig' = array(
-   'connectTimeout' = 1,
-   'serializer' = 'igbinary'
+   'connectTimeout' = 1
)
 );
 # vim: set sts=4 sw=4 et :

-- 
To view, visit https://gerrit.wikimedia.org/r/53777
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I791423366382c4db480b61cefe2af7bf1b18063e
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@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] remove steps that depend on All comments link which no longe... - change (qa/browsertests)

2013-03-14 Thread Zfilipin (Code Review) 
Zfilipin has submitted this change and it was merged.

Change subject: remove steps that depend on All comments link which no longer 
exists for now
..


remove steps that depend on All comments link which no longer exists for now

Change-Id: I7b748d609549d679ac856dc2f01276a76d72ebe2
---
M features/aftv5.feature
1 file changed, 0 insertions(+), 4 deletions(-)

Approvals:
  Zfilipin: Verified; Looks good to me, approved



diff --git a/features/aftv5.feature b/features/aftv5.feature
index 6d2f61b..963dee0 100644
--- a/features/aftv5.feature
+++ b/features/aftv5.feature
@@ -25,7 +25,3 @@
 Given I am at an AFTv5 page
 When I click Yes
 Then I can enter and save text
-  And After saving I have links to feedback page and See all comments 
available
-  And When I click to navigate to comments page my saved comment appears
-  And Comments are shown Relevant and All and Sort By
-  And I have links to Learn more and View Article

-- 
To view, visit https://gerrit.wikimedia.org/r/53772
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b748d609549d679ac856dc2f01276a76d72ebe2
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fixing issue with RTL display of badge and pokey - change (mediawiki...Echo)

2013-03-14 Thread Bsitu (Code Review) 
Bsitu has submitted this change and it was merged.

Change subject: Fixing issue with RTL display of badge and pokey
..


Fixing issue with RTL display of badge and pokey

Change-Id: I49ab97ef062fd9a58da80ff0f5fbd21a72770855
---
M modules/overlay/ext.echo.overlay.css
M modules/overlay/ext.echo.overlay.js
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Bsitu: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/modules/overlay/ext.echo.overlay.css 
b/modules/overlay/ext.echo.overlay.css
index adcfe34..81b893e 100644
--- a/modules/overlay/ext.echo.overlay.css
+++ b/modules/overlay/ext.echo.overlay.css
@@ -106,8 +106,8 @@
margin-left: 3px;
 }
 
-#pt-notifications .mw-badge {
-   margin-left: 3px;
+#pt-notifications a.mw-echo-short-link .mw-badge {
+   margin-left: -5px;
 }
 
 .mw-echo-overlay-none {
diff --git a/modules/overlay/ext.echo.overlay.js 
b/modules/overlay/ext.echo.overlay.js
index 9415f74..fb9cd9e 100644
--- a/modules/overlay/ext.echo.overlay.js
+++ b/modules/overlay/ext.echo.overlay.js
@@ -17,9 +17,9 @@
.badge( newCount, true, true );
} else {
$( '#pt-notifications  a' )
+   .addClass( 'mw-echo-short-link' )
.text( '' )
.badge( newCount, true, true );
-   $( '#pt-notifications .mw-badge' ).css( 
'margin-left', '-6px' );
}
 
mw.echo.overlay.notification_count = newCount;

-- 
To view, visit https://gerrit.wikimedia.org/r/51073
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I49ab97ef062fd9a58da80ff0f5fbd21a72770855
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: Bsitu bs...@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 description message more descriptive - change (mediawiki...NavigationTiming)

2013-03-14 Thread Raimond Spekking (Code Review) 
Raimond Spekking has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53778


Change subject: Make description message more descriptive
..

Make description message more descriptive

Change-Id: Ifb2d3086a4b69ea7fcf492133ad7587195f94c12
---
M NavigationTiming.i18n.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NavigationTiming 
refs/changes/78/53778/1

diff --git a/NavigationTiming.i18n.php b/NavigationTiming.i18n.php
index 8a47415..9ff08a8 100644
--- a/NavigationTiming.i18n.php
+++ b/NavigationTiming.i18n.php
@@ -12,7 +12,7 @@
  * @author Patrick Reilly
  */
 $messages['en'] = array(
-   'navigationtiming-desc' = 'Navigation Timing for timing navigation',
+   'navigationtiming-desc' = 'Logs perceived latency measurements from 
client-side',
 );
 
 /** Message documentation (Message documentation)

-- 
To view, visit https://gerrit.wikimedia.org/r/53778
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb2d3086a4b69ea7fcf492133ad7587195f94c12
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NavigationTiming
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] (hot fix) Activated language terms table would not allow for... - change (mediawiki...Wikibase)

2013-03-14 Thread Daniel Werner (Code Review) 
Daniel Werner has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53779


Change subject: (hot fix) Activated language terms table would not allow for 
editing statements
..

(hot fix) Activated language terms table would not allow for editing statements

When the language terms table is active, editing/adding of statements is not 
working since
e142e96f4f83bc413606ba8f236ea1c2de229cf6. This is because that change-set 
introduced having the
second parameter of the startItemPageEditMode event set to a DOM node instead 
of undefined in
case of a jQuery.wikibase widget would be responsible for triggering the event. 
In case of
wikibase.ui.PropertyEditTool related ui components triggering the event, a
wikibase.ui.PropertyEditTool.EditableValue would be given as second parameter. 
Code expecting a
EditableValue failed when after e142e96f4f83bc413606ba8f236ea1c2de229cf6 a DOM 
node would be
given on statements related edit interaction.

Change-Id: Ifd908f481f0f671797f2d0ff503fd2125dc9b91d
---
M lib/resources/wikibase.js
M repo/resources/wikibase.ui.entityViewInit.js
2 files changed, 15 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/79/53779/1

diff --git a/lib/resources/wikibase.js b/lib/resources/wikibase.js
index e0ed59f..78dbb0b 100644
--- a/lib/resources/wikibase.js
+++ b/lib/resources/wikibase.js
@@ -13,10 +13,16 @@
  * Global 'Wikibase' extension singleton.
  * @since 0.1
  *
+ * TODO: startItemPageEditMode and stopItemPageEditMode should be removed or 
marked deprecated as
+ *   soon as we can get rid of old wb.ui.PropertyEditTool ui. There should 
be no global edit
+ *   mode event anymore since with the new jQuery.wikibase widgets all 
editing related events
+ *   bubble through the DOM anyhow, so everyone can listen to those on any 
level of a pages DOM.
  *
  * @event startItemPageEditMode: Triggered when any edit mode on the item page 
is started
  *(1) {jQuery.Event}
- *(2) {wb.ui.PropertyEditTool.EditableValue} origin Object which 
triggered the event
+ *(2) {wb.ui.PropertyEditTool.EditableValue|jQuery} origin Object 
which triggered the event.
+ *If the origin of the event is one of the new (jQuery.wikibase) 
widgets, then this will
+ *be the widget's DOM node.
  *
  * @event newItemCreated: Triggered after an item has been created and the 
necessary API request has
  *returned.
@@ -26,7 +32,9 @@
  *
  * @event stopItemPageEditMode: Triggered when any edit mode on the item page 
is stopped.
  *(1) {jQuery.Event}
- *(2) {wb.ui.PropertyEditTool.EditableValue} origin Object which 
triggered the event
+ *(2) {wb.ui.PropertyEditTool.EditableValue|jQuery} origin Object 
which triggered the event.
+ *If the origin of the event is one of the new (jQuery.wikibase) 
widgets, then this will
+ *be the widget's DOM node.
  *(3) {Boolean} wasPending Whether value was a previously not 
existent/new value that has
  *just been added
  *
diff --git a/repo/resources/wikibase.ui.entityViewInit.js 
b/repo/resources/wikibase.ui.entityViewInit.js
index 53e5880..73a9f21 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -167,8 +167,12 @@
}
 
$( wb ).on( 'startItemPageEditMode', function( event, origin, 
options ) {
+   // disable language terms table's editable value or 
mark it as the active one if it is
+   // the one being edited by the user and therefore the 
origin of the event
$.each( termsValueTools, function( i, termValueTool ) {
-   if ( !origin || origin.getSubject() !== 
termValueTool.getSubject() ) {
+   if ( !( origin instanceof 
wb.ui.PropertyEditTool.EditableValue )
+   || origin.getSubject() !== 
termValueTool.getSubject()
+   ) {
termValueTool.disable();
} else if ( origin  origin.getSubject() === 
termValueTool.getSubject() ) {
$( 'table.wb-terms' ).addClass( 
'wb-edit' );

-- 
To view, visit https://gerrit.wikimedia.org/r/53779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd908f481f0f671797f2d0ff503fd2125dc9b91d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Werner daniel.wer...@wikimedia.de

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix Surface constructor in IndentationAction tests - change (mediawiki...VisualEditor)

2013-03-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fix Surface constructor in IndentationAction tests
..


Fix Surface constructor in IndentationAction tests

The IndentationAction was created against a version of master which
didn't have the new Surface constructor signature. This commit resolves
that conflict.

Change-Id: Ifc17f95acfa6057963d503448405355831b1ff97
---
M modules/ve/test/actions/ve.IndentationAction.test.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve/test/actions/ve.IndentationAction.test.js 
b/modules/ve/test/actions/ve.IndentationAction.test.js
index 2561a46..762d69d 100644
--- a/modules/ve/test/actions/ve.IndentationAction.test.js
+++ b/modules/ve/test/actions/ve.IndentationAction.test.js
@@ -11,7 +11,7 @@
 
 function runIndentationTest( assert, range, method, expectedSelection, 
expectedData, label ) {
var dom = ve.createDocumentFromHTML( ve.dm.example.isolationHTML ),
-   surface = new ve.Surface( $('div'),  dom ),
+   surface = new ve.Surface( new ve.init.Target( $( 'div' ) ),  
dom ),
indentationAction = new ve.IndentationAction( surface ),
data = ve.copyArray( 
surface.getModel().getDocument().getFullData() );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/53707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc17f95acfa6057963d503448405355831b1ff97
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@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 tests for ve.dm.Document.getNearestWordBoundary - change (mediawiki...VisualEditor)

2013-03-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add tests for ve.dm.Document.getNearestWordBoundary
..


Add tests for ve.dm.Document.getNearestWordBoundary

Also in this commit is a minor fix to the regular expression so it
behaves as documented (the hyphen needed escaping).

Bug: 44085
Change-Id: Idc315e2dce79be8f028b5681c60f74e175b9d869
---
M modules/ve/dm/ve.dm.Document.js
M modules/ve/test/dm/ve.dm.Document.test.js
2 files changed, 39 insertions(+), 1 deletion(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve/dm/ve.dm.Document.js b/modules/ve/dm/ve.dm.Document.js
index c8ba4e0..31eb36d 100644
--- a/modules/ve/dm/ve.dm.Document.js
+++ b/modules/ve/dm/ve.dm.Document.js
@@ -164,7 +164,7 @@
  *
  * This pattern is tested against one character at a time.
  */
-ve.dm.SurfaceFragment.wordBoundaryPattern = /[^\w'-\(\)\[\]]+/;
+ve.dm.SurfaceFragment.wordBoundaryPattern = /[^\w'\-\(\)\[\]]+/;
 
 /**
  * Apply annotations to content data.
diff --git a/modules/ve/test/dm/ve.dm.Document.test.js 
b/modules/ve/test/dm/ve.dm.Document.test.js
index 64e7c44..8c0051a 100644
--- a/modules/ve/test/dm/ve.dm.Document.test.js
+++ b/modules/ve/test/dm/ve.dm.Document.test.js
@@ -1332,6 +1332,44 @@
}
 } );
 
+QUnit.test( 'getNearestWordBoundary', function ( assert ) {
+   var i, doc, left, right, word,
+   cases = [
+   {
+   'phrase': 'visual editor test',
+   'msg': 'simple Latin word',
+   'offset': 10,
+   'expected': 'editor'
+   },
+   {
+   'phrase': 'Computer-aided design',
+   'msg': 'hyphenated Latin word',
+   'offset': 2,
+   'expected': 'Computer-aided'
+   },
+   {
+   'phrase': 'Water (l\'eau) is',
+   'msg': 'apostrophe and parentheses (Latin)',
+   'offset': 8,
+   'expected': '(l\'eau)'
+   },
+   {
+   'phrase': 'Water (H2O) is',
+   'msg': 'number in word (Latin)',
+   'offset': 9,
+   'expected': '(H2O)'
+   }
+   ];
+   QUnit.expect( cases.length );
+   for ( i = 0; i  cases.length; i++ ) {
+   doc = new ve.dm.Document( cases[i].phrase.split('') );
+   left = doc.getNearestWordBoundary( cases[i].offset, -1 );
+   right = doc.getNearestWordBoundary( cases[i].offset, 1 );
+   word = cases[i].phrase.substring( left, right );
+   assert.strictEqual( word, cases[i].expected, cases[i].msg );
+   }
+} );
+
 QUnit.test( 'selectNodes', 21, function ( assert ) {
var i,
doc = new ve.dm.Document( ve.copyArray( ve.dm.example.data ) ),

-- 
To view, visit https://gerrit.wikimedia.org/r/53564
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc315e2dce79be8f028b5681c60f74e175b9d869
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Enabled $wgEnableAsyncUploads on all wikis. - change (operations/mediawiki-config)

2013-03-14 Thread Aaron Schulz (Code Review) 
Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53780


Change subject: Enabled $wgEnableAsyncUploads on all wikis.
..

Enabled $wgEnableAsyncUploads on all wikis.

Change-Id: I54d7fe3d2b550c3313b1ce7f5872923a70136a72
---
M wmf-config/InitialiseSettings.php
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/80/53780/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 2ccd576..0ae82d6 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -969,6 +969,11 @@
 ),
 # @} end of wgEnableUpload
 
+// Wikis which allow async uploads via the job queue if uploads are enabled
+'wgEnableAsyncUploads' = array(
+   'default' = true,
+),
+
 # wgUploadNavigationUrl @{
 'wgUploadNavigationUrl' = array(
'default' = false,

-- 
To view, visit https://gerrit.wikimedia.org/r/53780
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I54d7fe3d2b550c3313b1ce7f5872923a70136a72
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Correct name of can(Node)HaveGrandchildren functions - change (mediawiki...VisualEditor)

2013-03-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Correct name of can(Node)HaveGrandchildren functions
..


Correct name of can(Node)HaveGrandchildren functions

Bug: 43893
Change-Id: I9fd2a1fd6e3ee0a7bdfc357b5d4e4e0fd3efa0a5
---
M modules/ve/ce/ve.ce.BranchNode.js
M modules/ve/ce/ve.ce.Node.js
M modules/ve/ce/ve.ce.SurfaceObserver.js
M modules/ve/dm/ve.dm.Document.js
M modules/ve/dm/ve.dm.Node.js
M modules/ve/dm/ve.dm.NodeFactory.js
M modules/ve/test/ce/ve.ce.BranchNode.test.js
M modules/ve/test/ce/ve.ce.LeafNode.test.js
M modules/ve/test/dm/ve.dm.BranchNode.test.js
M modules/ve/test/dm/ve.dm.LeafNode.test.js
M modules/ve/test/dm/ve.dm.Node.test.js
M modules/ve/test/dm/ve.dm.NodeFactory.test.js
M modules/ve/ve.Document.js
M modules/ve/ve.Node.js
14 files changed, 37 insertions(+), 37 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve/ce/ve.ce.BranchNode.js 
b/modules/ve/ce/ve.ce.BranchNode.js
index f705f18..2bc6c48 100644
--- a/modules/ve/ce/ve.ce.BranchNode.js
+++ b/modules/ve/ce/ve.ce.BranchNode.js
@@ -230,7 +230,7 @@
delete this.slugs[key];
}
 
-   if ( this.canHaveGrandchildren() ) {
+   if ( this.canHaveChildrenNotContent() ) {
$slug = ve.ce.BranchNode.$blockSlugTemplate.clone();
} else {
$slug = ve.ce.BranchNode.$inlineSlugTemplate.clone();
diff --git a/modules/ve/ce/ve.ce.Node.js b/modules/ve/ce/ve.ce.Node.js
index 3b9d0f9..6332f14 100644
--- a/modules/ve/ce/ve.ce.Node.js
+++ b/modules/ve/ce/ve.ce.Node.js
@@ -160,15 +160,15 @@
 };
 
 /**
- * Check if the node can have grandchildren.
+ * Check if the node can have children but not content nor be content.
  *
  * This method passes through to the model.
  *
  * @method
- * @returns {boolean} Model node can have grandchildren
+ * @returns {boolean} Model node can have children but not content nor be 
content
  */
-ve.ce.Node.prototype.canHaveGrandchildren = function () {
-   return this.model.canHaveGrandchildren();
+ve.ce.Node.prototype.canHaveChildrenNotContent = function () {
+   return this.model.canHaveChildrenNotContent();
 };
 
 /**
diff --git a/modules/ve/ce/ve.ce.SurfaceObserver.js 
b/modules/ve/ce/ve.ce.SurfaceObserver.js
index 833215d..879f411 100644
--- a/modules/ve/ce/ve.ce.SurfaceObserver.js
+++ b/modules/ve/ce/ve.ce.SurfaceObserver.js
@@ -125,7 +125,7 @@
$branch = $( rangyRange.anchorNode ).closest( 
'.ve-ce-branchNode' );
if ( $branch.length ) {
node = $branch.data( 'node' );
-   if ( node.canHaveGrandchildren() ) {
+   if ( node.canHaveChildrenNotContent() ) {
node = null;
} else {
range = rangyRange.getRange();
diff --git a/modules/ve/dm/ve.dm.Document.js b/modules/ve/dm/ve.dm.Document.js
index c8ba4e0..8d048df 100644
--- a/modules/ve/dm/ve.dm.Document.js
+++ b/modules/ve/dm/ve.dm.Document.js
@@ -353,7 +353,7 @@
// Inside empty element
'/' + left.type === right.type 
// Both are non-content branches (right is the 
same type)
-   factory.canNodeHaveGrandchildren( left.type ) 
+   factory.canNodeHaveChildrenNotContent( 
left.type ) 
(
// Only apply this rule in unrestricted 
mode
!unrestricted ||
diff --git a/modules/ve/dm/ve.dm.Node.js b/modules/ve/dm/ve.dm.Node.js
index a53b05a..acf357c 100644
--- a/modules/ve/dm/ve.dm.Node.js
+++ b/modules/ve/dm/ve.dm.Node.js
@@ -315,13 +315,13 @@
 };
 
 /**
- * Check if the node can have grandchildren.
+ * Check if the node can have children but not content nor be content.
  *
  * @method
- * @returns {boolean} Node can have grandchildren
+ * @returns {boolean} Node can have children but not content nor be content
  */
-ve.dm.Node.prototype.canHaveGrandchildren = function () {
-   return ve.dm.nodeFactory.canNodeHaveGrandchildren( this.type );
+ve.dm.Node.prototype.canHaveChildrenNotContent = function () {
+   return ve.dm.nodeFactory.canNodeHaveChildrenNotContent( this.type );
 };
 
 /**
diff --git a/modules/ve/dm/ve.dm.NodeFactory.js 
b/modules/ve/dm/ve.dm.NodeFactory.js
index df364e1..b116d31 100644
--- a/modules/ve/dm/ve.dm.NodeFactory.js
+++ b/modules/ve/dm/ve.dm.NodeFactory.js
@@ -108,14 +108,14 @@
 };
 
 /**
- * Check if a node can have grandchildren.
+ * Check if a node can have children but not content nor be content.
  *
  * @method
  * @param {string} type Node type
- * @returns {boolean} The node can have grandchildren
+ * @returns {boolean} The node can have children but not content nor be content
  *

[MediaWiki-commits] [Gerrit] Add NavigationTiming extension - change (mediawiki...release)

2013-03-14 Thread Ori.livneh (Code Review) 
Ori.livneh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53781


Change subject: Add NavigationTiming extension
..

Add NavigationTiming extension

Change-Id: Ieaff5638f1ed5c1cd281532c3c68bc6eed3d4612
---
M make-wmf-branch/default.conf
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/81/53781/1

diff --git a/make-wmf-branch/default.conf b/make-wmf-branch/default.conf
index 1344d1b..6f68c01 100644
--- a/make-wmf-branch/default.conf
+++ b/make-wmf-branch/default.conf
@@ -83,6 +83,7 @@
'MwEmbedSupport',
'MWSearch',
'Narayam',
+   'NavigationTiming',
'NewUserMessage',
'Nuke',
'OAI',

-- 
To view, visit https://gerrit.wikimedia.org/r/53781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieaff5638f1ed5c1cd281532c3c68bc6eed3d4612
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
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] Add support for non-Latin scripts to wordBoundaryPattern - change (mediawiki...VisualEditor)

2013-03-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add support for non-Latin scripts to wordBoundaryPattern
..


Add support for non-Latin scripts to wordBoundaryPattern

Replacing [a-zA-Z] with a long unicode expression which encompasses
all the characters in the unicode 'letters' category. Similarly replacing
[0-9] with an expression for 'numbers'.

Bug: 44085
Change-Id: Idd403339caa24769ce08133dda06ab6d4b9d694e
---
M modules/ve/dm/ve.dm.Document.js
M modules/ve/test/dm/ve.dm.Document.test.js
2 files changed, 41 insertions(+), 2 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve/dm/ve.dm.Document.js b/modules/ve/dm/ve.dm.Document.js
index 31eb36d..febaa94 100644
--- a/modules/ve/dm/ve.dm.Document.js
+++ b/modules/ve/dm/ve.dm.Document.js
@@ -157,14 +157,23 @@
  * better internationalization support.
  *
  * Allowed characters:
- * * Numbers and letters: a-z, A-Z, 0-9
+ * * Unicode 'letters' and 'numbers' categories
  * * Underscores and dashes: _, -
  * * Brackets and parenthesis: (), []
  * * Apostrophes and double quotes: ', 
  *
  * This pattern is tested against one character at a time.
  */
-ve.dm.SurfaceFragment.wordBoundaryPattern = /[^\w'\-\(\)\[\]]+/;
+ve.dm.SurfaceFragment.wordBoundaryPattern = new RegExp(
+   '[^' +
+   // Letters
+

[MediaWiki-commits] [Gerrit] s@node /db@node /^db@g - change (operations/puppet)

2013-03-14 Thread Asher (Code Review) 
Asher has submitted this change and it was merged.

Change subject: s@node /db@node /^db@g
..


s@node /db@node /^db@g

Change-Id: Ib5dd2b1e787556a1b3d46e4316cc7477ad2e6aba
---
M manifests/site.pp
1 file changed, 23 insertions(+), 23 deletions(-)

Approvals:
  Asher: Verified; Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index 56f8118..e7836ba 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -340,7 +340,7 @@
 }
 
 # pmtpa dbs
-node /db(32|59|60|63|69|71)\.pmtpa\.wmnet/ {
+node /^db(32|59|60|63|69|71)\.pmtpa\.wmnet/ {
if $hostname == db59 {
class { role::coredb::s1 : mariadb = true }
} elsif $hostname == db71{
@@ -350,7 +350,7 @@
}
 }
 
-node /db(52|53|54|57)\.pmtpa\.wmnet/ {
+node /^db(52|53|54|57)\.pmtpa\.wmnet/ {
if $hostname == db52 {
class { role::coredb::s2 : mariadb = true }
} elsif $hostname == db57{
@@ -360,7 +360,7 @@
}
 }
 
-node /db(34|39|64|66)\.pmtpa\.wmnet/ {
+node /^db(34|39|64|66)\.pmtpa\.wmnet/ {
if $hostname == db39 {
class { role::coredb::s3 : mariadb = true }
} elsif $hostname == db66{
@@ -370,7 +370,7 @@
}
 }
 
-node /db(31|33|51|65)\.pmtpa\.wmnet/ {
+node /^db(31|33|51|65)\.pmtpa\.wmnet/ {
if $hostname =~ /^db51/ {
$ganglia_aggregator = true
}
@@ -383,7 +383,7 @@
}
 }
 
-node /db(35|44|45|55)\.pmtpa\.wmnet/ {
+node /^db(35|44|45|55)\.pmtpa\.wmnet/ {
if $hostname == db35 {
class { role::coredb::s5 : mariadb = true }
} elsif $hostname == db55{
@@ -393,7 +393,7 @@
}
 }
 
-node /db(43|46|47|50)\.pmtpa\.wmnet/ {
+node /^db(43|46|47|50)\.pmtpa\.wmnet/ {
if $hostname =~ /^db50/ {
$ganglia_aggregator = true
}
@@ -406,7 +406,7 @@
}
 }
 
-node /db(37|56|58|68)\.pmtpa\.wmnet/ {
+node /^db(37|56|58|68)\.pmtpa\.wmnet/ {
if $hostname == db58 {
class { role::coredb::s7 : mariadb = true }
} elsif $hostname == db68{
@@ -417,7 +417,7 @@
 }
 
 ## x1 shard
-node /db(36|38)\.pmtpa\.wmnet/ {
+node /^db(36|38)\.pmtpa\.wmnet/ {
   include role::coredb::x1
 }
 
@@ -435,7 +435,7 @@
 }
 
 ## m2 shard
-node /db4[89]\.pmtpa\.wmnet/ {
+node /^db4[89]\.pmtpa\.wmnet/ {
include role::coredb::m2
 }
 
@@ -445,12 +445,12 @@
 }
 
 ## researchdb
-node /db67\.pmtpa\.wmnet/ {
+node /^db67\.pmtpa\.wmnet/ {
include role::coredb::researchdb
 }
 
 ## pgehres special project
-node /db29\.pmtpa\.wmnet/{
+node /^db29\.pmtpa\.wmnet/{
$gid = 500
system_role { role::admin_tools_sul_audit_db: description = Admin 
Tools/SUL Audit database }
include base,
@@ -470,12 +470,12 @@
 
 
 ## not in use for various reasons
-node /db(42|6[12]|7[1-7])\.pmtpa\.wmnet/{
+node /^db(42|6[12]|7[1-7])\.pmtpa\.wmnet/{
include standard
 }
 
 # eqiad dbs
-node /db10(01|17|42|43|49|50)\.eqiad\.wmnet/ {
+node /^db10(01|17|42|43|49|50)\.eqiad\.wmnet/ {
if $hostname =~ /^db10(01|17)/ {
$ganglia_aggregator = true
include mha::manager
@@ -488,7 +488,7 @@
}
 }
 
-node /db10(02|09|18|34)\.eqiad\.wmnet/ {
+node /^db10(02|09|18|34)\.eqiad\.wmnet/ {
if $hostname == db1009 {
class { role::coredb::s2 : mariadb = true }
} else {
@@ -496,15 +496,15 @@
}
 }
 
-node /db10(03|10|19|35)\.eqiad\.wmnet/ {
+node /^db10(03|10|19|35)\.eqiad\.wmnet/ {
include role::coredb::s3
 }
 
-node /db10(04|11|20|38)\.eqiad\.wmnet/ {
+node /^db10(04|11|20|38)\.eqiad\.wmnet/ {
include role::coredb::s4
 }
 
-node /db10(05|21|26|39)\.eqiad\.wmnet/ {
+node /^db10(05|21|26|39)\.eqiad\.wmnet/ {
if $hostname =~ /^db1021/ {
$ganglia_aggregator = true
}
@@ -512,21 +512,21 @@
include role::coredb::s5
 }
 
-node /db10(06|22|27|40)\.eqiad\.wmnet/ {
+node /^db10(06|22|27|40)\.eqiad\.wmnet/ {
include role::coredb::s6
 }
 
-node /db10(07|24|28|41)\.eqiad\.wmnet/ {
+node /^db10(07|24|28|41)\.eqiad\.wmnet/ {
include role::coredb::s7
 }
 
 ## x1 shard
-node /db10(29|30|31)\.eqiad\.wmnet/ {
+node /^db10(29|30|31)\.eqiad\.wmnet/ {
include role::coredb::x1
 }
 
 ## m2 shard
-node /db104[68]\.eqiad\.wmnet/ {
+node /^db104[68]\.eqiad\.wmnet/ {
include role::coredb::m2
 }
 
@@ -545,12 +545,12 @@
 }
 
 ## researchdb
-node /db1047\.eqiad\.wmnet/ {
+node /^db1047\.eqiad\.wmnet/ {
class { role::coredb::researchdb : mariadb = true, 
innodb_file_per_table = true }
 }
 
 ## not currently in production and/or hardware issues
-node /db10(1[23456]|2[3]|3[2367]|4[45])\.eqiad\.wmnet/ {
+node /^db10(1[23456]|2[3]|3[2367]|4[45])\.eqiad\.wmnet/ {
include standard
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/53782
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged

[MediaWiki-commits] [Gerrit] Revert pulling db1009 for upgrade - change (operations/mediawiki-config)

2013-03-14 Thread Asher (Code Review) 
Asher has submitted this change and it was merged.

Change subject: Revert pulling db1009 for upgrade
..


Revert pulling db1009 for upgrade

This reverts commit e4664446af3d2ea3de7bbe419eae5957993c3146

Change-Id: I264735c28ca374f4e04d160955d4726c0c29a5bf
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Asher: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 8c4a85f..179eaa4 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -90,7 +90,7 @@
's2' = array(
'db1034'= 0,
'db1002'= 400,
-   #'db1009'= 400,
+   'db1009'= 400,
'db1018'= 100, # snaphsot
),
/* s3 */ 'DEFAULT' = array(

-- 
To view, visit https://gerrit.wikimedia.org/r/53783
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I264735c28ca374f4e04d160955d4726c0c29a5bf
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Asher afeld...@wikimedia.org
Gerrit-Reviewer: Asher afeld...@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] Work on data value tables access [DO NOT MERGE] - change (mediawiki...Wikibase)

2013-03-14 Thread Jeroen De Dauw (Code Review) 
Jeroen De Dauw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53784


Change subject: Work on data value tables access [DO NOT MERGE]
..

Work on data value tables access [DO NOT MERGE]

Change-Id: Idd882b70fb96cc68e3261849756e19698b05f84b
---
M repo/includes/Query/SQLStore/DVHandler/BooleanHandler.php
M repo/includes/Query/SQLStore/DVHandler/EntityIdHandler.php
M repo/includes/Query/SQLStore/DVHandler/GeoCoordinateHandler.php
M repo/includes/Query/SQLStore/DVHandler/IriHandler.php
M repo/includes/Query/SQLStore/DVHandler/MonolingualTextHandler.php
M repo/includes/Query/SQLStore/DVHandler/NumberHandler.php
M repo/includes/Query/SQLStore/DVHandler/StringHandler.php
M repo/includes/Query/SQLStore/DataValueHandler.php
A repo/includes/Query/SQLStore/DataValueTable.php
A repo/includes/Query/SQLStore/DataValueTables.php
M repo/includes/Query/SQLStore/Setup.php
M repo/includes/Query/SQLStore/StoreConfig.php
M repo/includes/Query/SQLStore/Updater.php
13 files changed, 404 insertions(+), 384 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/84/53784/1

diff --git a/repo/includes/Query/SQLStore/DVHandler/BooleanHandler.php 
b/repo/includes/Query/SQLStore/DVHandler/BooleanHandler.php
index 60b8a21..886cda4 100644
--- a/repo/includes/Query/SQLStore/DVHandler/BooleanHandler.php
+++ b/repo/includes/Query/SQLStore/DVHandler/BooleanHandler.php
@@ -39,43 +39,6 @@
 class BooleanHandler extends DataValueHandler {
 
/**
-* @see DataValueHandler::getTableDefinition
-*
-* @since wd.qe
-*
-* @return TableDefinition
-*/
-   public function getTableDefinition() {
-   $fields = array(
-   new FieldDefinition( 'value', 
FieldDefinition::TYPE_BOOLEAN, false ),
-   );
-
-   return new TableDefinition( 'boolean', $fields );
-   }
-
-   /**
-* @see DataValueHandler::getValueFieldName
-*
-* @since wd.qe
-*
-* @return string
-*/
-   public function getValueFieldName() {
-   return 'value';
-   }
-
-   /**
-* @see DataValueHandler::getSortFieldName
-*
-* @since wd.qe
-*
-* @return string
-*/
-   public function getSortFieldName() {
-   return 'value';
-   }
-
-   /**
 * @see DataValueHandler::newDataValueFromValueField
 *
 * @since wd.qe
diff --git a/repo/includes/Query/SQLStore/DVHandler/EntityIdHandler.php 
b/repo/includes/Query/SQLStore/DVHandler/EntityIdHandler.php
index 49f0447..75ced1d 100644
--- a/repo/includes/Query/SQLStore/DVHandler/EntityIdHandler.php
+++ b/repo/includes/Query/SQLStore/DVHandler/EntityIdHandler.php
@@ -39,45 +39,6 @@
 class EntityIdHandler extends DataValueHandler {
 
/**
-* @see DataValueHandler::getTableDefinition
-*
-* @since wd.qe
-*
-* @return TableDefinition
-*/
-   public function getTableDefinition() {
-   $fields = array(
-   new FieldDefinition( 'type', 
FieldDefinition::TYPE_TEXT, false ),
-   new FieldDefinition( 'number', 
FieldDefinition::TYPE_INTEGER, false ),
-   new FieldDefinition( 'json', 
FieldDefinition::TYPE_TEXT, false ),
-   );
-
-   return new TableDefinition( 'entityid', $fields );
-   }
-
-   /**
-* @see DataValueHandler::getValueFieldName
-*
-* @since wd.qe
-*
-* @return string
-*/
-   public function getValueFieldName() {
-   return 'json';
-   }
-
-   /**
-* @see DataValueHandler::getSortFieldName
-*
-* @since wd.qe
-*
-* @return string
-*/
-   public function getSortFieldName() {
-   return 'number';
-   }
-
-   /**
 * @see DataValueHandler::newDataValueFromValueField
 *
 * @since wd.qe
diff --git a/repo/includes/Query/SQLStore/DVHandler/GeoCoordinateHandler.php 
b/repo/includes/Query/SQLStore/DVHandler/GeoCoordinateHandler.php
index 722fcbc..26586ae 100644
--- a/repo/includes/Query/SQLStore/DVHandler/GeoCoordinateHandler.php
+++ b/repo/includes/Query/SQLStore/DVHandler/GeoCoordinateHandler.php
@@ -39,47 +39,6 @@
 class GeoCoordinateHandler extends DataValueHandler {
 
/**
-* @see DataValueHandler::getTableDefinition
-*
-* @since wd.qe
-*
-* @return TableDefinition
-*/
-   public function getTableDefinition() {
-   $fields = array(
-   new FieldDefinition( 'lat', 
FieldDefinition::TYPE_FLOAT, false ),
-   new FieldDefinition( 'lon', 
FieldDefinition::TYPE_FLOAT, false ),
-   new FieldDefinition(

[MediaWiki-commits] [Gerrit] Enable wgEnableAsyncUploads only on testwikis for now. - change (operations/mediawiki-config)

2013-03-14 Thread Aaron Schulz (Code Review) 
Aaron Schulz has submitted this change and it was merged.

Change subject: Enable wgEnableAsyncUploads only on testwikis for now.
..


Enable wgEnableAsyncUploads only on testwikis for now.

Change-Id: I3a32c08a4501cf4f274ba85991ccd0dd8f7aa4e4
---
M wmf-config/InitialiseSettings.php
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Aaron Schulz: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 0ae82d6..4517ee4 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -971,7 +971,9 @@
 
 // Wikis which allow async uploads via the job queue if uploads are enabled
 'wgEnableAsyncUploads' = array(
-   'default' = true,
+   'default' = false,
+   'testwiki' = true,
+   'test2wiki' = true,
 ),
 
 # wgUploadNavigationUrl @{

-- 
To view, visit https://gerrit.wikimedia.org/r/53786
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a32c08a4501cf4f274ba85991ccd0dd8f7aa4e4
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@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] Cleaned up upload job error reporting. - change (mediawiki/core)

2013-03-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Cleaned up upload job error reporting.
..


Cleaned up upload job error reporting.

Change-Id: I2379d235eb9fed58412c9fefb9cabe56868395b9
---
M includes/job/jobs/AssembleUploadChunksJob.php
M includes/job/jobs/PublishStashedFileJob.php
2 files changed, 17 insertions(+), 13 deletions(-)

Approvals:
  Demon: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/job/jobs/AssembleUploadChunksJob.php 
b/includes/job/jobs/AssembleUploadChunksJob.php
index 840a398..f243b0c 100644
--- a/includes/job/jobs/AssembleUploadChunksJob.php
+++ b/includes/job/jobs/AssembleUploadChunksJob.php
@@ -39,7 +39,7 @@
$user = $context-getUser();
if ( !$user-isLoggedIn() || $user-getId() != 
$this-params['userid'] ) {
$this-setLastError( Could not load the author 
user from session. );
-   return true; // no retries
+   return false;
}
 
UploadBase::setSessionStatus(
@@ -62,7 +62,7 @@
array( 'result' = 'Failure', 'stage' 
= 'assembling', 'status' = $status )
);
$this-setLastError( $status-getWikiText() );
-   return true; // no retries
+   return false;
}
 
// We have a new filekey for the fully concatenated file
@@ -99,13 +99,11 @@
)
);
$this-setLastError( get_class( $e ) . :  . 
$e-getText() );
+   return false;
}
-   return true; // returns true on success and erro (no retries)
+   return true;
}
 
-   /**
-* @return Array
-*/
public function getDeduplicationInfo() {
$info = parent::getDeduplicationInfo();
if ( is_array( $info['params'] ) ) {
@@ -113,4 +111,8 @@
}
return $info;
}
+
+   public function allowRetries() {
+   return false;
+   }
 }
diff --git a/includes/job/jobs/PublishStashedFileJob.php 
b/includes/job/jobs/PublishStashedFileJob.php
index 594d304..87dffc9 100644
--- a/includes/job/jobs/PublishStashedFileJob.php
+++ b/includes/job/jobs/PublishStashedFileJob.php
@@ -39,7 +39,7 @@
$user = $context-getUser();
if ( !$user-isLoggedIn() || $user-getId() != 
$this-params['userid'] ) {
$this-setLastError( Could not load the author 
user from session. );
-   return true; // no retries
+   return false;
}
 
UploadBase::setSessionStatus(
@@ -64,7 +64,7 @@
array( 'result' = 'Failure', 'stage' 
= 'publish', 'status' = $status )
);
$this-setLastError( Could not verify upload. 
);
-   return true; // no retries
+   return false;
}
 
// Upload the stashed file to a permanent location
@@ -80,7 +80,7 @@
array( 'result' = 'Failure', 'stage' 
= 'publish', 'status' = $status )
);
$this-setLastError( $status-getWikiText() );
-   return true; // no retries
+   return false;
}
 
// Build the image info array while we have the local 
reference handy
@@ -111,13 +111,11 @@
)
);
$this-setLastError( get_class( $e ) . :  . 
$e-getText() );
+   return false;
}
-   return true; // returns true on success and erro (no retries)
+   return true;
}
 
-   /**
-* @return Array
-*/
public function getDeduplicationInfo() {
$info = parent::getDeduplicationInfo();
if ( is_array( $info['params'] ) ) {
@@ -125,4 +123,8 @@
}
return $info;
}
+
+   public function allowRetries() {
+   return false;
+   }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/53785
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2379d235eb9fed58412c9fefb9cabe56868395b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron

  1   2   3   >