| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -402,6 +402,7 @@ |
| 403 | 403 | 'gender-unknown', |
| 404 | 404 | 'gender-male', |
| 405 | 405 | 'gender-female', |
| | 406 | + 'prefs-help-gender', |
| 406 | 407 | 'email', |
| 407 | 408 | 'prefs-help-realname', |
| 408 | 409 | 'loginerror', |
| Index: trunk/phase3/includes/specials/SpecialPreferences.php |
| — | — | @@ -755,7 +755,10 @@ |
| 756 | 756 | $wgOut->addHTML( |
| 757 | 757 | $this->tableRow( |
| 758 | 758 | Xml::label( wfMsg( 'yourgender' ), 'wpGender' ), |
| 759 | | - $gender->getHTML() |
| | 759 | + $gender->getHTML(), |
| | 760 | + Xml::tags( 'div', array( 'class' => 'prefsectiontip' ), |
| | 761 | + wfMsgExt( 'prefs-help-gender', 'parseinline' ) |
| | 762 | + ) |
| 760 | 763 | ) |
| 761 | 764 | ); |
| 762 | 765 | |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -916,6 +916,7 @@ |
| 917 | 917 | 'gender-unknown' => 'Unspecified', |
| 918 | 918 | 'gender-male' => 'Male', |
| 919 | 919 | 'gender-female' => 'Female', |
| | 920 | +'prefs-help-gender' => 'Optional: used for gender-correct addressing by the software. This information will be public.', |
| 920 | 921 | 'email' => 'E-mail', |
| 921 | 922 | 'prefs-help-realname' => 'Real name is optional. |
| 922 | 923 | If you choose to provide it, this will be used for giving you attribution for your work.', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -91,6 +91,8 @@ |
| 92 | 92 | * Preprocessor output now cached in memcached. |
| 93 | 93 | * (bug 14468) Lines in classic RecentChanges and Watchlist have classes |
| 94 | 94 | "mw-line-odd" and "mw-line-even" to make styling using css possible. |
| | 95 | +* (bug 17311) Add a note beside the gender selection menu to tell users that |
| | 96 | + this information will be public |
| 95 | 97 | |
| 96 | 98 | === Bug fixes in 1.15 === |
| 97 | 99 | * (bug 16968) Special:Upload no longer throws useless warnings. |