[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: ApiQueryMessageGroups: pass context to get descriptions in u...

2016-12-20 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/328034 )

Change subject: ApiQueryMessageGroups: pass context to get descriptions in user 
language
..


ApiQueryMessageGroups: pass context to get descriptions in user language

This only affected groups which use i18n key, not those using
Special:MyLanguage hack.

Bug: T153512
Change-Id: Ieaf3096a6e0c098fa2b790fefbe8c00493391d8c
---
M api/ApiQueryMessageGroups.php
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Huji: Looks good to me, but someone else must approve
  Amire80: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/api/ApiQueryMessageGroups.php b/api/ApiQueryMessageGroups.php
index d6a5a3e..d5967b2 100644
--- a/api/ApiQueryMessageGroups.php
+++ b/api/ApiQueryMessageGroups.php
@@ -109,6 +109,7 @@
 */
protected function formatGroup( $mixed, $props, $depth = 0 ) {
$params = $this->extractRequestParams();
+   $context = $this->getContext();
 
// Default
$g = $mixed;
@@ -129,11 +130,11 @@
}
 
if ( isset( $props['label'] ) ) {
-   $a['label'] = $g->getLabel();
+   $a['label'] = $g->getLabel( $context );
}
 
if ( isset( $props['description'] ) ) {
-   $a['description'] = $g->getDescription();
+   $a['description'] = $g->getDescription( $context );
}
 
if ( isset( $props['class'] ) ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieaf3096a6e0c098fa2b790fefbe8c00493391d8c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: Huji 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: ApiQueryMessageGroups: pass context to get descriptions in u...

2016-12-18 Thread Nikerabbit (Code Review) 
Nikerabbit has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/328034 )

Change subject: ApiQueryMessageGroups: pass context to get descriptions in user 
language
..

ApiQueryMessageGroups: pass context to get descriptions in user language

This only affected groups which use i18n key, not those using
Special:MyLanguage hack.

Bug: T153512
Change-Id: Ieaf3096a6e0c098fa2b790fefbe8c00493391d8c
---
M api/ApiQueryMessageGroups.php
1 file changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/api/ApiQueryMessageGroups.php b/api/ApiQueryMessageGroups.php
index d6a5a3e..d5967b2 100644
--- a/api/ApiQueryMessageGroups.php
+++ b/api/ApiQueryMessageGroups.php
@@ -109,6 +109,7 @@
 */
protected function formatGroup( $mixed, $props, $depth = 0 ) {
$params = $this->extractRequestParams();
+   $context = $this->getContext();
 
// Default
$g = $mixed;
@@ -129,11 +130,11 @@
}
 
if ( isset( $props['label'] ) ) {
-   $a['label'] = $g->getLabel();
+   $a['label'] = $g->getLabel( $context );
}
 
if ( isset( $props['description'] ) ) {
-   $a['description'] = $g->getDescription();
+   $a['description'] = $g->getDescription( $context );
}
 
if ( isset( $props['class'] ) ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieaf3096a6e0c098fa2b790fefbe8c00493391d8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

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