From 90b0ef0098ec2cea8630333d013fb554d9753fac Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Tue, 30 Oct 2012 07:53:44 +0200 Subject: [PATCH] Try to improve the wording of gender option * Move the gender option to the internationalisation section, because it's mostly used for that. * Change the displayed values: rather then gender identifiers, it demonstrates the usage of the option. * Update documentation accordingly. Change-Id: I81f02f03f5992ad5f0501e0a7552bdee9f2c1d5e Bug: 31816 --- includes/Preferences.php | 24 ++++++++++++------------ languages/messages/MessagesEn.php | 11 ++++++----- languages/messages/MessagesQqq.php | 29 +++++++++++++++++++++-------- 3 files changed, 39 insertions(+), 25 deletions(-) diff --git a/includes/Preferences.php b/includes/Preferences.php index 9791d8bdd3..39a399fd8e 100644 --- a/includes/Preferences.php +++ b/includes/Preferences.php @@ -281,18 +281,6 @@ class Preferences { 'help-message' => 'prefs-help-realname', ); - $defaultPreferences['gender'] = array( - 'type' => 'select', - 'section' => 'personal/info', - 'options' => array( - $context->msg( 'gender-male' )->text() => 'male', - $context->msg( 'gender-female' )->text() => 'female', - $context->msg( 'gender-unknown' )->text() => 'unknown', - ), - 'label-message' => 'yourgender', - 'help-message' => 'prefs-help-gender', - ); - if ( $canEditPrivateInfo && $wgAuth->allowPasswordChange() ) { $link = Linker::link( SpecialPage::getTitleFor( 'ChangePassword' ), $context->msg( 'prefs-resetpass' )->escaped(), array(), @@ -343,6 +331,18 @@ class Preferences { 'label-message' => 'yourlanguage', ); + $defaultPreferences['gender'] = array( + 'type' => 'radio', + 'section' => 'personal/i18n', + 'options' => array( + $context->msg( 'gender-male' )->text() => 'male', + $context->msg( 'gender-female' )->text() => 'female', + $context->msg( 'gender-unknown' )->text() => 'unknown', + ), + 'label-message' => 'yourgender', + 'help-message' => 'prefs-help-gender', + ); + // see if there are multiple language variants to choose from if ( !$wgDisableLangConversion ) { foreach ( LanguageConverter::$languagesWithVariants as $langCode ) { diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index a28d739885..414a0f2517 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1987,11 +1987,12 @@ This cannot be undone.', Check HTML tags.', 'badsiglength' => 'Your signature is too long. It must not be more than $1 {{PLURAL:$1|character|characters}} long.', -'yourgender' => 'Gender:', -'gender-unknown' => 'Undisclosed', -'gender-male' => 'Male', -'gender-female' => 'Female', -'prefs-help-gender' => 'Optional: Used for gender-correct addressing by the software. +'yourgender' => 'How do you prefer to be described?', +'gender-unknown' => 'I prefer not to detail', +'gender-male' => 'He edits wiki pages', +'gender-female' => 'She edits wiki pages', +'prefs-help-gender' => 'Setting this preference is optional. +The software uses its value to address you and to mention you to others using the appropriate grammatical gender. This information will be public.', 'email' => 'Email', 'prefs-help-realname' => 'Real name is optional. diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php index ac948566e6..46ccf3f4f9 100644 --- a/languages/messages/MessagesQqq.php +++ b/languages/messages/MessagesQqq.php @@ -2941,14 +2941,27 @@ Used in [[Special:Preferences]]. Parameters are: 'prefs-help-signature' => 'Used in [[Special:Preferences]], tab User profile.', 'badsig' => 'Error message displayed when entering invalid signature in user preferences', 'badsiglength' => 'Warning message that is displayed on [[Special:Preferences]] when trying to save a signature that is too long. Parameter $1 is the maximum number of characters that is allowed in a signature (multi-byte characters are counted as one character).', -'yourgender' => 'Used in [[Special:Preferences]], first tab. -{{Identical|Gender}}', -'gender-unknown' => 'Used in [[Special:Preferences]], first tab, as one of the selectable options of the {{msg-mw|Yourgender}} prompt. Choosing it indicates that the grammatical gender of the user name is not to be made public, cannot be determined, or matches none of the other choices preset in the select.', -'gender-male' => 'Used in [[Special:Preferences]], first tab, as one of the selectable options of the {{msg-mw|Yourgender}} prompt. Choosing it indicates that the grammatical gender of the user name should be "male" for those languages having a "normal" male grammatical gender. -{{Identical|Male}}', -'gender-female' => 'Used in [[Special:Preferences]], first tab, as one of the selectable options of the {{msg-mw|Yourgender}} prompt. Choosing it indicates that the grammatical gender of the user name should be "female" for those languages having a "normal" female grammatical gender. -{{Identical|Female}}', -'prefs-help-gender' => 'Used as additional description for {{msg-mw|yourgender}} field in [[Special:Preferences]], section {{msg-mw|prefs-info}}.', +'yourgender' => 'Used in [[Special:Preferences]], first tab, in the Internationalisation section. +This may be customized for other languages. This should sound like a question, the answer to which can be selected in one of these: +* {{msg-mw|gender-unknown}} +* {{msg-mw|gender-male}} +* {{msg-mw|gender-female}} +The idea is that this preference is used for speaking to the user and about the user, and the label and the preference are supposed to demonstrate it.', +'gender-unknown' => 'Used in [[Special:Preferences]], first tab, as one of the selectable options of the {{msg-mw|gender}} prompt. Choosing it indicates that the grammatical gender of the user name is not to be made public, cannot be determined, or matches none of the other choices preset in the select. +This may appropriately customized for your language. It should sound like a reply to {{msg-mw|yourgender}}.', +'gender-male' => 'Used in [[Special:Preferences]], first tab, as one of the selectable options of the {{msg-mw|gender}} prompt. +Choosing it indicates that the grammatical gender of the user name should be "male" for those languages having a "normal" male grammatical gender. +You have to customize this example for your language if needed to have a sentence which varies depending on the grammatical gender. +The wording must demonstrate the actual usage of the option. It should sound like a reply to {{msg-mw|yourgender}}. +For example, if the verb "I edit" in your language is different in masculine and feminine, translate "I edit" in masculine here. +If your language does not make a distinction at all, use sentences like "he is male/a man".', +'gender-female' => 'Used in [[Special:Preferences]], first tab, as one of the selectable options of the {{msg-mw|gender}} prompt. +Choosing it indicates that the grammatical gender of the user name should be "female" for those languages having a "normal" female grammatical gender. +You have to customize this example for your language if needed to have a sentence which varies depending on the grammatical gender. +The wording must demonstrate the actual usage of the option. It should sound like a reply to {{msg-mw|yourgender}}. +For example, if the verb "I edit" in your language is different in masculine and feminine, translate "I edit" in feminine here. +If your language does not make a distinction at all, use sentences like "she is female/woman".', +'prefs-help-gender' => 'Help text for the gender option.', 'email' => '{{Identical|E-mail}}', 'prefs-help-realname' => 'In user preferences. {{Identical|Real name attribution}}', -- 2.20.1