[MediaWiki-commits] [Gerrit] i18n: get rid of hardcoded 'reply' text - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: i18n: get rid of hardcoded 'reply' text
..
i18n: get rid of hardcoded 'reply' text
Change-Id: I50dc6784ecc535654a6ac1b56ab61b32a823e309
---
M Resources.php
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topic_reply.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/flow_block_topic_reply.handlebars
M handlebars/flow_reply_form.handlebars
M handlebars/flow_topic_titlebar_content.handlebars
M includes/TemplateHelper.php
M modules/new/components/flow-board.js
M modules/new/flow-handlebars.js
10 files changed, 40 insertions(+), 25 deletions(-)
Approvals:
Bsitu: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Resources.php b/Resources.php
index 09319b9..b372fe7 100644
--- a/Resources.php
+++ b/Resources.php
@@ -300,6 +300,7 @@
'flow-error-http',
'flow-error-fetch-after-open-close',
'mw-ui-unsubmitted-confirm',
+ 'flow-reply-link',
)
) + $mobile,
'ext.flow.vendor.storer' => $flowResourceTemplate + array(
diff --git a/handlebars/compiled/flow_block_topic.handlebars.php
b/handlebars/compiled/flow_block_topic.handlebars.php
index 8622dfe..38690ba 100644
--- a/handlebars/compiled/flow_block_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic.handlebars.php
@@ -50,10 +50,16 @@
' : '').'
'.LCRun3::ch($cx, 'l10n',
Array(Array('started_with_participants',$in),Array()), 'encq').'
- '.LCRun3::ch($cx, 'l10n',
Array(Array('Reply',((is_array($in) && isset($in['author'])) ? $in['author'] :
null)),Array()), 'encq').'
- • '.LCRun3::ch($cx, 'l10n',
Array(Array('comment_count',$in),Array()), 'encq').' •
+ '.((LCRun3::ifvar($cx, ((is_array($in['actions']) &&
isset($in['actions']['reply'])) ? $in['actions']['reply'] : null))) ? '
+ '.htmlentities(((is_array($in['actions']['reply'])
&& isset($in['actions']['reply']['title'])) ? $in['actions']['reply']['title']
: null), ENT_QUOTES, 'UTF-8').'
+ •
+ ' : '').'
+
+ '.LCRun3::ch($cx, 'l10n', Array(Array('comment_count',$in),Array()),
'encq').' •
+
'.((LCRun3::ifvar($cx, ((is_array($in) && isset($in['last_updated'])) ?
$in['last_updated'] : null))) ? '
'.LCRun3::ch($cx, 'timestamp', Array(Array(((is_array($in) &&
isset($in['last_updated'])) ? $in['last_updated'] :
null),'active_ago'),Array()), 'encq').'
' : '
@@ -344,7 +350,7 @@
class="mw-ui-button mw-ui-constructive"
data-flow-interactive-handler="apiRequest"
data-flow-api-handler="submitReply"
- data-flow-api-target="<
.flow-topic">'.LCRun3::ch($cx, 'l10n', Array(Array('Reply',((is_array($in) &&
isset($in['author'])) ? $in['author'] : null)),Array()), 'encq').'
+ data-flow-api-target="<
.flow-topic">'.htmlentities(((is_array($in['actions']['reply']) &&
isset($in['actions']['reply']['title'])) ? $in['actions']['reply']['title'] :
null), ENT_QUOTES, 'UTF-8').'
'.LCRun3::hbch($cx, 'ifEquals',
Array(Array(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['postId'])) ?
$cx['scopes'][0]['submitted']['postId'] : null),((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null)),Array()), $in, function($cx,
$in) {return ''.htmlentities(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['content'])) ?
$cx['scopes'][0]['submitted']['content'] : null), ENT_QUOTES,
'UTF-8').'';}).'
- '.LCRun3::ch($cx,
'l10n', Array(Array('Reply',((is_array($in) && isset($in['author'])) ?
$in['author'] : null)),Array()), 'encq').'
+ '.htmlentities(((is_array($in['actions']['reply']) &&
isset($in['actions']['reply']['title'])) ? $in['actions']['reply']['title'] :
null), ENT_QUOTES, 'UTF-8').'
'.LCRun3::ch($cx, 'l10n',
Array(Array('started_with_participants',$in),Array()), 'encq').'
- '.LCRun3::ch($cx, 'l10n',
Array(Array('Reply',((is_array($in) && isset($in['author'])) ? $in['author'] :
null)),Array()), 'encq').'
- • '.LCRun3::ch($cx, 'l10n',
Array(Array('comment_count',$in),Array()), 'encq').' •
+ '.((LCRun3::ifvar($cx, ((is_array($in['actions']) &&
isset($in['actions']['reply'])) ? $in['actions']['reply'] : null))) ? '
+ '.htmlentities(((is_array($in['actions']['reply'])
&& isset($in['actions']['reply']['title'])) ? $in['actions']['reply']['title']
: null), ENT_QUOTES, 'UTF-8').'
+ •
+ ' : '').'
+
+ '.LCRun3::ch($c
[MediaWiki-commits] [Gerrit] i18n: get rid of hardcoded 'reply' text - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/156094
Change subject: i18n: get rid of hardcoded 'reply' text
..
i18n: get rid of hardcoded 'reply' text
Change-Id: I50dc6784ecc535654a6ac1b56ab61b32a823e309
---
M Resources.php
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topic_reply.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/flow_block_topic_reply.handlebars
M handlebars/flow_reply_form.handlebars
M handlebars/flow_topic_titlebar_content.handlebars
M includes/TemplateHelper.php
M modules/new/components/flow-board.js
M modules/new/flow-handlebars.js
10 files changed, 40 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/94/156094/1
diff --git a/Resources.php b/Resources.php
index 1eeefe9..1feee2c 100644
--- a/Resources.php
+++ b/Resources.php
@@ -301,6 +301,7 @@
'flow-error-http',
'flow-error-fetch-after-open-close',
'mw-ui-unsubmitted-confirm',
+ 'flow-reply-link',
)
) + $mobile,
'ext.flow.vendor.storer' => $flowResourceTemplate + array(
diff --git a/handlebars/compiled/flow_block_topic.handlebars.php
b/handlebars/compiled/flow_block_topic.handlebars.php
index 8622dfe..38690ba 100644
--- a/handlebars/compiled/flow_block_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic.handlebars.php
@@ -50,10 +50,16 @@
' : '').'
'.LCRun3::ch($cx, 'l10n',
Array(Array('started_with_participants',$in),Array()), 'encq').'
- '.LCRun3::ch($cx, 'l10n',
Array(Array('Reply',((is_array($in) && isset($in['author'])) ? $in['author'] :
null)),Array()), 'encq').'
- • '.LCRun3::ch($cx, 'l10n',
Array(Array('comment_count',$in),Array()), 'encq').' •
+ '.((LCRun3::ifvar($cx, ((is_array($in['actions']) &&
isset($in['actions']['reply'])) ? $in['actions']['reply'] : null))) ? '
+ '.htmlentities(((is_array($in['actions']['reply'])
&& isset($in['actions']['reply']['title'])) ? $in['actions']['reply']['title']
: null), ENT_QUOTES, 'UTF-8').'
+ •
+ ' : '').'
+
+ '.LCRun3::ch($cx, 'l10n', Array(Array('comment_count',$in),Array()),
'encq').' •
+
'.((LCRun3::ifvar($cx, ((is_array($in) && isset($in['last_updated'])) ?
$in['last_updated'] : null))) ? '
'.LCRun3::ch($cx, 'timestamp', Array(Array(((is_array($in) &&
isset($in['last_updated'])) ? $in['last_updated'] :
null),'active_ago'),Array()), 'encq').'
' : '
@@ -344,7 +350,7 @@
class="mw-ui-button mw-ui-constructive"
data-flow-interactive-handler="apiRequest"
data-flow-api-handler="submitReply"
- data-flow-api-target="<
.flow-topic">'.LCRun3::ch($cx, 'l10n', Array(Array('Reply',((is_array($in) &&
isset($in['author'])) ? $in['author'] : null)),Array()), 'encq').'
+ data-flow-api-target="<
.flow-topic">'.htmlentities(((is_array($in['actions']['reply']) &&
isset($in['actions']['reply']['title'])) ? $in['actions']['reply']['title'] :
null), ENT_QUOTES, 'UTF-8').'
'.LCRun3::hbch($cx, 'ifEquals',
Array(Array(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['postId'])) ?
$cx['scopes'][0]['submitted']['postId'] : null),((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null)),Array()), $in, function($cx,
$in) {return ''.htmlentities(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['content'])) ?
$cx['scopes'][0]['submitted']['content'] : null), ENT_QUOTES,
'UTF-8').'';}).'
- '.LCRun3::ch($cx,
'l10n', Array(Array('Reply',((is_array($in) && isset($in['author'])) ?
$in['author'] : null)),Array()), 'encq').'
+ '.htmlentities(((is_array($in['actions']['reply']) &&
isset($in['actions']['reply']['title'])) ? $in['actions']['reply']['title'] :
null), ENT_QUOTES, 'UTF-8').'
'.LCRun3::ch($cx, 'l10n',
Array(Array('started_with_participants',$in),Array()), 'encq').'
- '.LCRun3::ch($cx, 'l10n',
Array(Array('Reply',((is_array($in) && isset($in['author'])) ? $in['author'] :
null)),Array()), 'encq').'
- • '.LCRun3::ch($cx, 'l10n',
Array(Array('comment_count',$in),Array()), 'encq').' •
+ '.((LCRun3::ifvar($cx, ((is_array($in['actions']) &&
isset($in['actions']['reply'])) ? $in['actions']['reply'] : null))) ? '
+ '.htmlentities(((is_array($in['actions']['reply'])
&& isset($in['actions']['reply']['title'])) ? $in['actions']['reply']['title']
: null), ENT_QUOTES, 'UTF-8').'
