r101548 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r101547‎ | r101548 | r101549 >
Date:23:00, 1 November 2011
Author:kaldari
Status:ok
Tags:
Comment:
legal terms update for WikiLove, part deux
Modified paths:
  • /trunk/extensions/WikiLove/WikiLove.i18n.php (modified) (history)
  • /trunk/extensions/WikiLove/WikiLove.php (modified) (history)
  • /trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.core.js (modified) (history)
  • /trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.css (modified) (history)

Diff [purge]

Index: trunk/extensions/WikiLove/WikiLove.php
@@ -145,6 +145,7 @@
146146 'wikilove-err-send-api',
147147 'wikilove-terms',
148148 'wikilove-terms-link',
 149+ 'wikilove-terms-url',
149150 ),
150151 'dependencies' => array(
151152 'ext.wikiLove.defaultOptions',
Index: trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.css
@@ -326,7 +326,7 @@
327327 }
328328
329329 #mw-wikilove-dialog #mw-wikilove-terms {
330 - margin: 0.5em 0;
 330+ margin-top: 0.5em;
331331 text-align: right;
332332 font-size: 0.9em;
333333 color: #888888;
Index: trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.core.js
@@ -109,7 +109,9 @@
110110 <span class="mw-wikilove-number">3</span>\
111111 <h3><html:msg key="wikilove-preview"/></h3>\
112112 <div id="mw-wikilove-preview-area"></div>\
113 - <div id="mw-wikilove-terms"></div>\
 113+ <div id="mw-wikilove-terms">\
 114+ ' + mw.msg( 'wikilove-terms', '<a href="' + mw.msg( 'wikilove-terms-url' ) + '" target="_blank">' + mw.msg( 'wikilove-terms-link' ) +'</a>' ) + '\
 115+ </div>\
114116 <form id="mw-wikilove-send-form">\
115117 <button class="submit" id="mw-wikilove-button-send" type="submit"></button>\
116118 <div id="mw-wikilove-send-spinner" class="mw-wikilove-spinner"></div>\
Index: trunk/extensions/WikiLove/WikiLove.i18n.php
@@ -58,6 +58,7 @@
5959 'wikilove-commons-url' => 'http://commons.wikimedia.org',
6060 'wikilove-terms' => 'By submitting, you agree to transparency under these $1.',
6161 'wikilove-terms-link' => 'terms',
 62+ 'wikilove-terms-url' => 'http://wikimediafoundation.org/wiki/Feedback_privacy_statement',
6263 );
6364
6465 /** Message documentation (Message documentation)
@@ -116,6 +117,7 @@
117118 'wikilove-terms' => '[[File:Wiki_Love_003.png]]
118119 A notice that appears above the Send WikiLove button in small text. Try to keep this concise. $1 is replaced with the actual link.',
119120 'wikilove-terms-link' => 'The text that links to the terms of service. Should not be capitalized.',
 121+ 'wikilove-terms-url' => 'This URL can be changed to point to a translated version of the page if it exists.',
120122 );
121123
122124 /** Afrikaans (Afrikaans)

Follow-up revisions

RevisionCommit summaryAuthorDate
r101618Followup r101548: build the link in a less scary way, with proper escapingcatrope11:34, 2 November 2011
r1016601.18wmf1: Merge stuff for editor engagement deployment...catrope19:01, 2 November 2011

Status & tagging log