MegaAlex has uploaded a new change for review.
https://gerrit.wikimedia.org/r/150233
Change subject: Add GENDER support to flow-sorting-tooltip
......................................................................
Add GENDER support to flow-sorting-tooltip
Bug: 67191
Change-Id: Ia3e3f338f0861434251c137b6dd8e097f9c2d92a
---
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/flow_board_navigation.handlebars
M i18n/en.json
M i18n/qqq.json
4 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/33/150233/1
diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index 0996bfa..8ae4be3 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -15,6 +15,7 @@
'html' => 'Flow\TemplateHelper::htmlHelper',
'post' => 'Flow\TemplateHelper::post',
'l10nParse' => 'Flow\TemplateHelper::l10nParse',
+ 'user' => 'Flow\TemplateHelper::user',
'linkWithReturnTo' => 'Flow\TemplateHelper::linkWithReturnTo',
'escapeContent' => 'Flow\TemplateHelper::escapeContent',
'plaintextSnippet' => 'Flow\TemplateHelper::plaintextSnippet',
@@ -45,7 +46,7 @@
';}).'
'.'
- <a href="javascript:void(0);"
class="flow-board-navigator-active flow-board-navigator-first
flow-ui-tooltip-target" data-tooltip-pointing="down" title="'.LCRun3::ch($cx,
'l10n', Array(Array('flow-sorting-tooltip'),Array()), 'encq').'"
data-flow-interactive-handler="boardFilterMenuToggle">'.LCRun3::hbch($cx,
'ifEquals', Array(Array(((is_array($in) && isset($in['sortby'])) ?
$in['sortby'] : null),'updated'),Array()), $in, function($cx, $in) {return '
+ <a href="javascript:void(0);"
class="flow-board-navigator-active flow-board-navigator-first
flow-ui-tooltip-target" data-tooltip-pointing="down" title="'.LCRun3::ch($cx,
'l10n', Array(Array('flow-sorting-tooltip',LCRun3::ch($cx, 'user',
Array(Array(((is_array($in) && isset($in['name'])) ? $in['name'] :
null)),Array()), 'raw')),Array()), 'encq').'"
data-flow-interactive-handler="boardFilterMenuToggle">'.LCRun3::hbch($cx,
'ifEquals', Array(Array(((is_array($in) && isset($in['sortby'])) ?
$in['sortby'] : null),'updated'),Array()), $in, function($cx, $in) {return '
'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-recent-topics'),Array()), 'encq').'
';}, function($cx, $in) {return '
'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-newest-topics'),Array()), 'encq').'
diff --git a/handlebars/flow_board_navigation.handlebars
b/handlebars/flow_board_navigation.handlebars
index 6df58da..4308a2e 100644
--- a/handlebars/flow_board_navigation.handlebars
+++ b/handlebars/flow_board_navigation.handlebars
@@ -10,7 +10,7 @@
{{/progressiveEnhancement}}
{{!-- Click for sorting options, not sure what this url should
be --}}
- <a href="javascript:void(0);"
class="flow-board-navigator-active flow-board-navigator-first
flow-ui-tooltip-target" data-tooltip-pointing="down" title="{{l10n
"flow-sorting-tooltip"}}" data-flow-interactive-handler="boardFilterMenuToggle">
+ <a href="javascript:void(0);"
class="flow-board-navigator-active flow-board-navigator-first
flow-ui-tooltip-target" data-tooltip-pointing="down" title="{{l10n
"flow-sorting-tooltip" (user name)}}"
data-flow-interactive-handler="boardFilterMenuToggle">
{{~#ifEquals sortby "updated"}}
{{l10n "flow-recent-topics"}}
{{else}}
diff --git a/i18n/en.json b/i18n/en.json
index f379ffc..c3d2d34 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -329,7 +329,7 @@
"flow-add-topic": "Add Topic ",
"flow-newest-topics": "Newest topics",
"flow-recent-topics": "Recently active topics",
- "flow-sorting-tooltip": "You are currently reading the newest topics
first. Click for more sorting options.",
+ "flow-sorting-tooltip": "{{GENDER:$1|You}} are currently reading the
newest topics first. Click for more sorting options.",
"flow-toggle-small-topics": "Switch to small topics view",
"flow-toggle-topics": "Switch to topics only view",
"flow-toggle-topics-posts": "Switch to topics and posts view",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index dd5473d..138df87 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -333,7 +333,7 @@
"flow-add-topic": "Button text for submitting a new topic to the page",
"flow-newest-topics": "Filter label text for \"Newest topics\"",
"flow-recent-topics": "Filter label text for \"Recent active topics\"",
- "flow-sorting-tooltip": "Tooltip displayed when mouse hovering over the
sorting drop down menu",
+ "flow-sorting-tooltip": "Tooltip displayed when mouse hovering over the
sorting drop down menu\n\nParameters:\n* $1 - the name of the current user, can
be used for GENDER\n",
"flow-toggle-small-topics": "Tooltip displayed when mouse hovering over
the full page topic collapser. When clicked only topic titles are displayed.",
"flow-toggle-topics": "Tooltip displayed when mouse hovering over the
full page topic collapser. When clicked posts are not displayed, only topic
titles and metadata are visible.",
"flow-toggle-topics-posts": "Tooltip displayed when mouse hovering over
the full page topic collapser. When clicked posts will be displayed with topic
titles.",
--
To view, visit https://gerrit.wikimedia.org/r/150233
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3e3f338f0861434251c137b6dd8e097f9c2d92a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: MegaAlex <alexivano...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
