Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174794
Change subject: Fix topic list sort tooltip. Was always showing as 'newest'
ordering
......................................................................
Fix topic list sort tooltip. Was always showing as 'newest' ordering
Bug: 73669
Change-Id: I9ea05388857fa48d4a53a164fb7112e67d84e3d3
---
M Resources.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/flow_board_navigation.handlebars
M i18n/en.json
M i18n/qqq.json
5 files changed, 14 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/94/174794/1
diff --git a/Resources.php b/Resources.php
index bfd7f89..5279340 100644
--- a/Resources.php
+++ b/Resources.php
@@ -121,7 +121,8 @@
'flow-recent-topics',
'flow-reply-submit',
'flow-reply-topic-title-placeholder',
- 'flow-sorting-tooltip',
+ 'flow-sorting-tooltip-newest',
+ 'flow-sorting-tooltip-recent',
'flow-summarize-topic-submit',
'flow-unlock-topic-submit',
'flow-lock-topic-submit',
diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index c1e2e44..a37eb9f 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -44,7 +44,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').'"
+ title="'.LCRun3::hbch($cx, 'ifCond',
Array(Array(((isset($in['sortby']) && is_array($in)) ? $in['sortby'] :
null),'===','updated'),Array()), $in, function($cx, $in) {return
''.LCRun3::ch($cx, 'l10n', Array(Array('flow-sorting-tooltip-recent'),Array()),
'encq').'';}, function($cx, $in) {return ''.LCRun3::ch($cx, 'l10n',
Array(Array('flow-sorting-tooltip-newest'),Array()), 'encq').'';}).'"
data-flow-interactive-handler="menuToggle"
data-flow-menu-target="< .flow-board-navigation
.flow-menu">'.LCRun3::hbch($cx, 'ifCond', Array(Array(((isset($in['sortby']) &&
is_array($in)) ? $in['sortby'] : null),'===','updated'),Array()), $in,
function($cx, $in) {return '
'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-recent-topics'),Array()), 'encq').'
diff --git a/handlebars/flow_board_navigation.handlebars
b/handlebars/flow_board_navigation.handlebars
index 8c6a389..3e67cd2 100644
--- a/handlebars/flow_board_navigation.handlebars
+++ b/handlebars/flow_board_navigation.handlebars
@@ -12,7 +12,13 @@
<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"}}"
+ title="
+ {{~#ifCond sortby "===" "updated"~}}
+ {{~l10n "flow-sorting-tooltip-recent"~}}
+ {{~else~}}
+ {{~l10n "flow-sorting-tooltip-newest"~}}
+ {{~/ifCond~}}
+ "
data-flow-interactive-handler="menuToggle"
data-flow-menu-target="< .flow-board-navigation .flow-menu">
{{~#ifCond sortby "===" "updated"}}
diff --git a/i18n/en.json b/i18n/en.json
index 369a75c..fc97177 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -353,7 +353,8 @@
"flow-add-topic": "Add Topic ",
"flow-newest-topics": "Newest topics",
"flow-recent-topics": "Recently active topics",
- "flow-sorting-tooltip": "{{GENDER:|You}} are currently reading the
newest topics first. Click for more sorting options.",
+ "flow-sorting-tooltip-newest": "{{GENDER:|You}} are currently reading
the newest topics first. Click for more sorting options.",
+ "flow-sorting-tooltip-recent": "{{GENDER:|You}} are currently reading
the most recently active 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 cfd195b..0abfb5b 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -357,7 +357,8 @@
"flow-add-topic": "Button text for submitting a new topic to the page",
"flow-newest-topics": "Filter label text for \"Newest topics\".\n\nSee
also:\n* {{msg-mw|Flow-recent-topics}}",
"flow-recent-topics": "Filter label text for \"Recent active
topics\".\n\nSee also:\n* {{msg-mw|Flow-newest-topics}}",
- "flow-sorting-tooltip": "Tooltip displayed when mouse hovering over the
sorting drop down menu.",
+ "flow-sorting-tooltip-newest": "Tooltip displayed when mouse hovering
over the sorting drop down menu and '{{msg-mw|flow-newest-topics}}' is
selected.",
+ "flow-sorting-tooltip-recent": "Tooltip displayed when mouse hovering
over the sorting drop down menu and '{{msg-mw|flow-recent-topics}}' is
selected.",
"flow-toggle-small-topics": "Tooltip displayed when mouse hovering over
the full page topic collapser. When clicked only topic titles are
displayed.\n\nSee also:\n* {{msg-mw|Flow-toggle-topics}}\n*
{{msg-mw|Flow-toggle-topics-posts}}",
"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.\n\nSee also:\n*
{{msg-mw|Flow-toggle-small-topics}}\n* {{msg-mw|Flow-toggle-topics-posts}}",
"flow-toggle-topics-posts": "Tooltip displayed when mouse hovering over
the full page topic collapser. When clicked posts will be displayed with topic
titles.\n\nSee also:\n* {{msg-mw|Flow-toggle-small-topics}}\n*
{{msg-mw|Flow-toggle-topics}}",
--
To view, visit https://gerrit.wikimedia.org/r/174794
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ea05388857fa48d4a53a164fb7112e67d84e3d3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
