jenkins-bot has submitted this change and it was merged.
Change subject: Send user information including gender to flow-subscribe message
......................................................................
Send user information including gender to flow-subscribe message
Make sure that the gender is resolved so the i18n message can be
displayed correctly between genders.
Bug: T96804
Change-Id: I1927190d313e341ce4b3a993a5de6b9c52f9fc23
---
M handlebars/flow_subscribed.partial.handlebars
M modules/engine/components/board/flow-board.js
M modules/engine/components/common/flow-component-events.js
3 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/handlebars/flow_subscribed.partial.handlebars
b/handlebars/flow_subscribed.partial.handlebars
index 21c5771..964b567 100644
--- a/handlebars/flow_subscribed.partial.handlebars
+++ b/handlebars/flow_subscribed.partial.handlebars
@@ -1,7 +1,9 @@
<div class="flow-notification-tooltip-icon"><span class="wikiglyph
wikiglyph-star-list mw-ui-constructive"></span></div>
<p class="flow-notification-tooltip-title">
- {{l10n (concat "flow-" type "-notification-subscribe-title") username}}
+ {{!-- flow-topic-notification-subscribe-title and
flow-board-notification-subscribe-title --}}
+ {{l10n (concat "flow-" type "-notification-subscribe-title") user }}
</p>
<p class="flow-notification-tooltip-content">
- {{l10n (concat "flow-" type "-notification-subscribe-description")
username}}
+ {{!-- flow-topic-notification-subscribe-description and
flow-board-notification-subscribe-description --}}
+ {{l10n (concat "flow-" type "-notification-subscribe-description") user
}}
</p>
diff --git a/modules/engine/components/board/flow-board.js
b/modules/engine/components/board/flow-board.js
index 6f3839a..5ae8f47 100644
--- a/modules/engine/components/board/flow-board.js
+++ b/modules/engine/components/board/flow-board.js
@@ -185,7 +185,7 @@
'flow_subscribed.partial',
{
type: 'board',
- username: mw.user.getName()
+ user: mw.user
}
) ).children();
}
diff --git a/modules/engine/components/common/flow-component-events.js
b/modules/engine/components/common/flow-component-events.js
index 21ffb69..f58dfbd 100644
--- a/modules/engine/components/common/flow-component-events.js
+++ b/modules/engine/components/common/flow-component-events.js
@@ -833,7 +833,7 @@
unsubscribe: false,
type: type,
direction: dir,
- username: mw.user.getName()
+ user: mw.user
}
)
).children(),
--
To view, visit https://gerrit.wikimedia.org/r/205796
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1927190d313e341ce4b3a993a5de6b9c52f9fc23
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <mor...@gmail.com>
Gerrit-Reviewer: Mattflaschen <mflasc...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
