Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/155857
Change subject: i18n: Translate reply button
......................................................................
i18n: Translate reply button
Deal with gender issue when there is a bug for it. French doesn't have
this issue with gender and we need to make Flow more ready for release
too them.
Change-Id: I6c65c7163b194cd19a416d1e1bf292247e0fa688
---
M Resources.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/compiled/flow_board.handlebars.php
M handlebars/flow_block_topic_reply.handlebars
M handlebars/flow_reply_form.handlebars
M handlebars/flow_topic_titlebar_content.handlebars
M i18n/en.json
M i18n/qqq.json
M modules/new/flow-handlebars.js
9 files changed, 10 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/57/155857/1
diff --git a/Resources.php b/Resources.php
index f055cdf..025d4ef 100644
--- a/Resources.php
+++ b/Resources.php
@@ -111,6 +111,7 @@
'flow-toggle-topics-posts',
'flow-topic-participants',
'flow-topic-comment-count',
+ 'flow-topic-reply',
'flow-topic-action-hide-topic',
'flow-topic-action-close-topic',
'flow-topic-action-delete-topic',
diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index 65b9c3b..6a6d6a1 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -515,4 +515,4 @@
</div>
';
}
-?>
+?>
\ No newline at end of file
diff --git a/handlebars/compiled/flow_board.handlebars.php
b/handlebars/compiled/flow_board.handlebars.php
index fcdc1aa..45b355b 100644
--- a/handlebars/compiled/flow_board.handlebars.php
+++ b/handlebars/compiled/flow_board.handlebars.php
@@ -34,7 +34,6 @@
' : '').'
</div>
-
<a href="'.((LCRun3::ifvar($cx, ((is_array($in) &&
isset($in['isWatched'])) ? $in['isWatched'] : null))) ?
''.htmlentities(((is_array($in['links']['unwatch-board']) &&
isset($in['links']['unwatch-board']['url'])) ?
$in['links']['unwatch-board']['url'] : null), ENT_QUOTES, 'UTF-8').'' :
''.htmlentities(((is_array($in['links']['watch-board']) &&
isset($in['links']['watch-board']['url'])) ? $in['links']['watch-board']['url']
: null), ENT_QUOTES, 'UTF-8').'').'"
class="mw-ui-constructive
'.((LCRun3::ifvar($cx, ((is_array($in) &&
isset($in['isWatched'])) ? $in['isWatched'] : null))) ?
'flow-watch-link-unwatch' : 'mw-ui-quiet flow-watch-link-watch').'"
diff --git a/handlebars/flow_block_topic_reply.handlebars
b/handlebars/flow_block_topic_reply.handlebars
index c26edbe..806f61e 100644
--- a/handlebars/flow_block_topic_reply.handlebars
+++ b/handlebars/flow_block_topic_reply.handlebars
@@ -21,7 +21,7 @@
</textarea>
<div class="flow-form-actions
flow-form-collapsible">
- <button data-role="submit"
class="mw-ui-button mw-ui-constructive mw-ui-flush-right">{{l10n "Reply"
author}}</button>
+ <button data-role="submit"
class="mw-ui-button mw-ui-constructive mw-ui-flush-right">{{l10n
"flow-topic-reply"}}</button>
{{> flow_form_buttons }}
<small class="flow-terms-of-use
plainlinks">{{l10nParse "flow-terms-of-use-reply"}}</small>
</div>
diff --git a/handlebars/flow_reply_form.handlebars
b/handlebars/flow_reply_form.handlebars
index b043efd..78ec08e 100644
--- a/handlebars/flow_reply_form.handlebars
+++ b/handlebars/flow_reply_form.handlebars
@@ -28,7 +28,7 @@
data-flow-interactive-handler="apiRequest"
data-flow-api-handler="submitReply"
data-flow-api-target="< .flow-topic">
- {{~l10n "Reply" author~}}
+ {{~l10n "flow-topic-reply"}}
</button>
{{> flow_form_buttons }}
<small class="flow-terms-of-use plainlinks">{{l10nParse
"flow-terms-of-use-reply"}}</small>
diff --git a/handlebars/flow_topic_titlebar_content.handlebars
b/handlebars/flow_topic_titlebar_content.handlebars
index 0562eb4..c587cf3 100644
--- a/handlebars/flow_topic_titlebar_content.handlebars
+++ b/handlebars/flow_topic_titlebar_content.handlebars
@@ -9,7 +9,7 @@
<div class="flow-topic-meta">
<a class="mw-ui-progressive mw-ui-quiet"
data-flow-interactive-handler="activateForm"
- href="#flow-post-{{postId}}-form-content">{{l10n "Reply"
author}}</a>
+ href="#flow-post-{{postId}}-form-content">{{l10n
"flow-topic-reply"}}</a>
• {{l10n "comment_count" this}} •
{{#if last_updated}}
<!--span class="wikiglyph wikiglyph-speech-bubbles"></span-->
{{timestamp last_updated "active_ago"}}
diff --git a/i18n/en.json b/i18n/en.json
index 88fa059..f11bcbc 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -356,6 +356,7 @@
"flow-topic-participants-second-try": "{{PLURAL:$2|0=$1
{{GENDER:$1|started}} this topic|1=$1 {{GENDER:$1|started}} this topic and
there was one other participant|$1 {{GENDER:$1|started}} this topic and there
were $2 other participants}}",
"flow-topic-permalink-warning": "This topic was started on [$2 $1]",
"flow-topic-permalink-warning-user-board": "This topic was started on [$2
{{GENDER:$1|$1}}'s board]",
+ "flow-topic-reply": "Reply",
"flow-user-moderated": "Moderated user",
"flow-whatlinkshere-header": "from the [$1 header]",
"flow-whatlinkshere-post": "from a [$1 post]",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 3d2eda1..cda0236 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -360,6 +360,7 @@
"flow-topic-participants-second-try": "Message to display the amount of
participants in this topic (and potentially a couple of
names).\n\nParameters:\n* $1 - The username that created the topic.\n* $2 - The
number of participants in the topic in addition to the topic creator.",
"flow-topic-permalink-warning": "Displayed at the top of a page when a
person has clicked on a permanent link to a topic.\n\nParameters:\n* $1 -
display text for a link to the board that the topic comes from\n* $2 - URL for
a link to the board that the topic comes from\nSee also:\n*
{{msg-mw|Flow-topic-permalink-warning-user-board}}",
"flow-topic-permalink-warning-user-board": "Displayed at the top of a
page when a person has clicked on a permanent link to a topic from a user's
board.\n\nParameters:\n* $1 - the user's name. Supports GENDER.\n* $2 - URL for
a link to the board that the topic comes from\nSee also:\n*
{{msg-mw|Flow-topic-permalink-warning}}",
+ "flow-topic-reply": "Reply to topic button label.",
"flow-user-moderated": "Name to display when the current user is not
allowed to see the users name due to moderation",
"flow-whatlinkshere-header": "Displayed in parentheses on
[[Special:WhatLinksHere]] for an entry that relates to a Flow Board
header.\n\nParameters:\n* $1 - a URL to the header\nSee also:\n*
{{msg-mw|Flow-whatlinkshere-post}}",
"flow-whatlinkshere-post": "Displayed in parentheses on
[[Special:WhatLinksHere]] for an entry that relates to a Flow
post.\n\nParameters:\n* $1 - a URL to the post\nSee also:\n*
{{msg-mw|Flow-whatlinkshere-header}}",
diff --git a/modules/new/flow-handlebars.js b/modules/new/flow-handlebars.js
index 5aa02e5..96cdd82 100644
--- a/modules/new/flow-handlebars.js
+++ b/modules/new/flow-handlebars.js
@@ -164,7 +164,9 @@
function flowMessages( str ) {
var parameters = Array.prototype.slice.call( arguments, 1 ),
strings = ( {
- "Reply": "Reply", // TODO: pass in and parse
$author['gender']
+ "Reply": function( context ) {
+ return mw.msg( 'flow-topic-reply' );
+ },
"Topics_n": function ( count, options ) {
return "Topics (" + count + ")";
},
--
To view, visit https://gerrit.wikimedia.org/r/155857
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c65c7163b194cd19a416d1e1bf292247e0fa688
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
