jenkins-bot has submitted this change and it was merged.
Change subject: (bug 43483) MediaWiki:Moodbar-privacy and
MediaWiki:Moodbar-privacy-link use lego
......................................................................
(bug 43483) MediaWiki:Moodbar-privacy and MediaWiki:Moodbar-privacy-link use
lego
Merged messages as appropriate to make them fully translatable.
Change-Id: If396da6655e998a4bca481fa43fa38afd7b85f77
---
M MoodBar.i18n.php
M MoodBar.php
M modules/ext.moodBar/ext.moodBar.core.js
3 files changed, 3 insertions(+), 28 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MoodBar.i18n.php b/MoodBar.i18n.php
index f4cee0b..28e46d6 100644
--- a/MoodBar.i18n.php
+++ b/MoodBar.i18n.php
@@ -47,9 +47,7 @@
'moodbar-what-content' => 'This feature is designed to help the
community understand the experience of people editing the site.
For more information, please visit the $1.',
'moodbar-what-link' => 'feature page',
- 'moodbar-privacy' => 'By submitting, you agree to transparency under
these $1.',
- 'moodbar-privacy-link' => 'terms',
- 'moodbar-privacy-link-title' => 'Terms of Use',
+ 'moodbar-privacy' => 'By submitting, you agree to transparency under
these [$1 Terms of Use].',
'moodbar-fbd-link-title' => 'feedback',
'moodbar-disable-link' => "I'm not interested. Please disable this
feature.",
'moodbar-form-title' => 'Because...',
@@ -266,14 +264,9 @@
'moodbar-what-content' => '$1 is the message
{{msg-mw|moodbar-what-link}} which links to the page [[mw:MoodBar|MoodBar]] on
MediaWiki.org.',
'moodbar-what-link' => 'This is the link embedded as parameter $1 in
{{msg-mw|moodbar-what-content}}.',
'moodbar-privacy' => 'Parameters:
-*$1 - a link having the anchor text {{msg-mw|moodbar-privacy-link}}
-
-The link is to the privacy policy of the wiki.
+*$1 - an external link to the privacy policy of the wiki.
See [[Thread:Support/About MediaWiki:Moodbar-privacy/en (2)/reply
(4)|discussion]].',
- 'moodbar-privacy-link' => 'This is the anchor text being used in the
link replacing $1 in the message {{msg-mw|moodbar-privacy}}',
- 'moodbar-privacy-link-title' => 'This is the title of the anchor link
being used for the privacy message.
-{{Identical|Terms of use}}',
'moodbar-fbd-link-title' => 'This is the link text of $FBD-LINK in
{{msg-mw|moodbar-success-subtitle}}. Shown after leaving moodbar feedback.',
'moodbar-form-note-dynamic' => 'Parameters:
* $1 - number of characters, can be used for PLURAL',
diff --git a/MoodBar.php b/MoodBar.php
index 0c528e5..5e76937 100644
--- a/MoodBar.php
+++ b/MoodBar.php
@@ -158,8 +158,6 @@
'moodbar-form-policy-label',
'moodbar-form-submit',
'moodbar-privacy',
- 'moodbar-privacy-link',
- 'moodbar-privacy-link-title',
'moodbar-disable-link',
'moodbar-loading-title',
'moodbar-error-title',
diff --git a/modules/ext.moodBar/ext.moodBar.core.js
b/modules/ext.moodBar/ext.moodBar.core.js
index 8d2f20b..9d9898a 100644
--- a/modules/ext.moodBar/ext.moodBar.core.js
+++ b/modules/ext.moodBar/ext.moodBar.core.js
@@ -307,23 +307,7 @@
.end()
.end()
.find( '.mw-moodBar-privacy' )
- .html(
- function() {
- var message,
linkMessage, linkTitle, link;
-
- message = mw.msg(
'moodbar-privacy' );
- linkMessage = mw.msg(
'moodbar-privacy-link' );
- linkTitle = mw.msg(
'moodbar-privacy-link-title' );
- link = mw.html.element(
'a', {
- 'href':
mb.conf.privacyUrl,
-
'title': linkTitle,
-
'target': '_blank'
- }, linkMessage
);
-
- return mw.html.escape(
message )
- .replace(
/\$1/, link );
- }
- )
+ .html( mw.message( 'moodbar-privacy',
mb.conf.privacyUrl ).parse() )
.end()
// set up character count
.find( '.mw-moodBar-formNote' )
--
To view, visit https://gerrit.wikimedia.org/r/50040
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If396da6655e998a4bca481fa43fa38afd7b85f77
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MoodBar
Gerrit-Branch: master
Gerrit-Owner: Nischayn22 <[email protected]>
Gerrit-Reviewer: Lwelling <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Nemo bis <[email protected]>
Gerrit-Reviewer: Nischayn22 <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Robmoen <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
