* (bug 17311) Add a note beside the gender selection menu to tell users that this...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 84e3753..615a872 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -91,6 +91,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Preprocessor output now cached in memcached.
 * (bug 14468) Lines in classic RecentChanges and Watchlist have classes
   "mw-line-odd" and "mw-line-even" to make styling using css possible.
+* (bug 17311) Add a note beside the gender selection menu to tell users that
+  this information will be public
 
 === Bug fixes in 1.15 ===
 * (bug 16968) Special:Upload no longer throws useless warnings.

diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index 5b7e954..72bab7c 100644 (file)
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -755,7 +755,10 @@ class PreferencesForm {
                $wgOut->addHTML(
                        $this->tableRow(
                                Xml::label( wfMsg( 'yourgender' ), 'wpGender' ),
-                               $gender->getHTML()
+                               $gender->getHTML(),
+                               Xml::tags( 'div', array( 'class' => 'prefsectiontip' ),
+                                       wfMsgExt( 'prefs-help-gender', 'parseinline' )
+                               )
                        )
                );
 

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index c10be7b..39f9d6d 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -916,6 +916,7 @@ It must be under $1 {{PLURAL:$1|character|characters}}.',
 'gender-unknown'             => 'Unspecified',
 'gender-male'                => 'Male',
 'gender-female'              => 'Female',
+'prefs-help-gender'          => 'Optional: used for gender-correct addressing by the software. This information will be public.',
 'email'                      => 'E-mail',
 'prefs-help-realname'        => 'Real name is optional.
 If you choose to provide it, this will be used for giving you attribution for your work.',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index af8df2e..7c6f5a0 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -402,6 +402,7 @@ $wgMessageStructure = array(
                'gender-unknown',
                'gender-male',
                'gender-female',
+               'prefs-help-gender',
                'email',
                'prefs-help-realname',
                'loginerror',