[MediaWiki-commits] [Gerrit] Use inContentLanguage for dropdown messages in HTMLFormField - change (mediawiki/core)

2014-02-28 Thread Anomie (Code Review) 
Anomie has uploaded a new change for review.

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

Change subject: Use inContentLanguage for dropdown messages in HTMLFormField
..

Use inContentLanguage for dropdown messages in HTMLFormField

to restore b/c for now.

Bug: 61942
Change-Id: I2741ef940d83eeb564e89e20378fb4004cfe5b83
(cherry picked from commit 9e66a63af83427a01d66795ac64b793ff4473218)
---
M includes/htmlform/HTMLFormField.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/95/116095/1

diff --git a/includes/htmlform/HTMLFormField.php 
b/includes/htmlform/HTMLFormField.php
index 27d9594..3c4ecd0 100644
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -558,7 +558,7 @@
$this-mOptions = self::forceToStringRecursive( 
$this-mParams['options'] );
} elseif ( array_key_exists( 'options-message', 
$this-mParams ) ) {
/** @todo This is copied from 
Xml::listDropDown(), deprecate/avoid duplication? */
-   $message = $this-msg( 
$this-mParams['options-message'] )-plain();
+   $message = $this-msg( 
$this-mParams['options-message'] )-inContentLanguage()-plain();
 
$optgroup = false;
$this-mOptions = array();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2741ef940d83eeb564e89e20378fb4004cfe5b83
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf15
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de

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

[MediaWiki-commits] [Gerrit] Use inContentLanguage for dropdown messages in HTMLFormField - change (mediawiki/core)

2014-02-28 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Use inContentLanguage for dropdown messages in HTMLFormField
..


Use inContentLanguage for dropdown messages in HTMLFormField

to restore b/c for now.

Bug: 61942
Change-Id: I2741ef940d83eeb564e89e20378fb4004cfe5b83
(cherry picked from commit 9e66a63af83427a01d66795ac64b793ff4473218)
---
M includes/htmlform/HTMLFormField.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Anomie: Looks good to me, but someone else must approve
  Hoo man: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/htmlform/HTMLFormField.php 
b/includes/htmlform/HTMLFormField.php
index 27d9594..3c4ecd0 100644
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -558,7 +558,7 @@
$this-mOptions = self::forceToStringRecursive( 
$this-mParams['options'] );
} elseif ( array_key_exists( 'options-message', 
$this-mParams ) ) {
/** @todo This is copied from 
Xml::listDropDown(), deprecate/avoid duplication? */
-   $message = $this-msg( 
$this-mParams['options-message'] )-plain();
+   $message = $this-msg( 
$this-mParams['options-message'] )-inContentLanguage()-plain();
 
$optgroup = false;
$this-mOptions = array();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2741ef940d83eeb564e89e20378fb4004cfe5b83
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf15
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Greg Grossmeier g...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Use inContentLanguage for dropdown messages in HTMLFormField - change (mediawiki/core)

2014-02-27 Thread Hoo man (Code Review) 
Hoo man has uploaded a new change for review.

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

Change subject: Use inContentLanguage for dropdown messages in HTMLFormField
..

Use inContentLanguage for dropdown messages in HTMLFormField

to restore b/c for now.

Bug: 61942
Change-Id: I2741ef940d83eeb564e89e20378fb4004cfe5b83
---
M includes/htmlform/HTMLFormField.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/htmlform/HTMLFormField.php 
b/includes/htmlform/HTMLFormField.php
index 27d9594..3c4ecd0 100644
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -558,7 +558,7 @@
$this-mOptions = self::forceToStringRecursive( 
$this-mParams['options'] );
} elseif ( array_key_exists( 'options-message', 
$this-mParams ) ) {
/** @todo This is copied from 
Xml::listDropDown(), deprecate/avoid duplication? */
-   $message = $this-msg( 
$this-mParams['options-message'] )-plain();
+   $message = $this-msg( 
$this-mParams['options-message'] )-inContentLanguage()-plain();
 
$optgroup = false;
$this-mOptions = array();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2741ef940d83eeb564e89e20378fb4004cfe5b83
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de

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

[MediaWiki-commits] [Gerrit] Use inContentLanguage for dropdown messages in HTMLFormField - change (mediawiki/core)

2014-02-27 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review.

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

Change subject: Use inContentLanguage for dropdown messages in HTMLFormField
..

Use inContentLanguage for dropdown messages in HTMLFormField

to restore b/c for now.

Bug: 61942
Change-Id: I2741ef940d83eeb564e89e20378fb4004cfe5b83
---
M includes/htmlform/HTMLFormField.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/41/116041/1

diff --git a/includes/htmlform/HTMLFormField.php 
b/includes/htmlform/HTMLFormField.php
index 27d9594..3c4ecd0 100644
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -558,7 +558,7 @@
$this-mOptions = self::forceToStringRecursive( 
$this-mParams['options'] );
} elseif ( array_key_exists( 'options-message', 
$this-mParams ) ) {
/** @todo This is copied from 
Xml::listDropDown(), deprecate/avoid duplication? */
-   $message = $this-msg( 
$this-mParams['options-message'] )-plain();
+   $message = $this-msg( 
$this-mParams['options-message'] )-inContentLanguage()-plain();
 
$optgroup = false;
$this-mOptions = array();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2741ef940d83eeb564e89e20378fb4004cfe5b83
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf16
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de

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

[MediaWiki-commits] [Gerrit] Use inContentLanguage for dropdown messages in HTMLFormField - change (mediawiki/core)

2014-02-27 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Use inContentLanguage for dropdown messages in HTMLFormField
..


Use inContentLanguage for dropdown messages in HTMLFormField

to restore b/c for now.

Bug: 61942
Change-Id: I2741ef940d83eeb564e89e20378fb4004cfe5b83
---
M includes/htmlform/HTMLFormField.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/htmlform/HTMLFormField.php 
b/includes/htmlform/HTMLFormField.php
index 27d9594..3c4ecd0 100644
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -558,7 +558,7 @@
$this-mOptions = self::forceToStringRecursive( 
$this-mParams['options'] );
} elseif ( array_key_exists( 'options-message', 
$this-mParams ) ) {
/** @todo This is copied from 
Xml::listDropDown(), deprecate/avoid duplication? */
-   $message = $this-msg( 
$this-mParams['options-message'] )-plain();
+   $message = $this-msg( 
$this-mParams['options-message'] )-inContentLanguage()-plain();
 
$optgroup = false;
$this-mOptions = array();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2741ef940d83eeb564e89e20378fb4004cfe5b83
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Daniel Friesen dan...@nadir-seen-fire.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Use inContentLanguage for dropdown messages in HTMLFormField - change (mediawiki/core)

2014-02-27 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Use inContentLanguage for dropdown messages in HTMLFormField
..


Use inContentLanguage for dropdown messages in HTMLFormField

to restore b/c for now.

Bug: 61942
Change-Id: I2741ef940d83eeb564e89e20378fb4004cfe5b83
---
M includes/htmlform/HTMLFormField.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/htmlform/HTMLFormField.php 
b/includes/htmlform/HTMLFormField.php
index 27d9594..3c4ecd0 100644
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -558,7 +558,7 @@
$this-mOptions = self::forceToStringRecursive( 
$this-mParams['options'] );
} elseif ( array_key_exists( 'options-message', 
$this-mParams ) ) {
/** @todo This is copied from 
Xml::listDropDown(), deprecate/avoid duplication? */
-   $message = $this-msg( 
$this-mParams['options-message'] )-plain();
+   $message = $this-msg( 
$this-mParams['options-message'] )-inContentLanguage()-plain();
 
$optgroup = false;
$this-mOptions = array();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2741ef940d83eeb564e89e20378fb4004cfe5b83
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf16
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Daniel Friesen dan...@nadir-seen-fire.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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