Sectionise preferences to make the form a bit more readable

diff --git a/includes/Preferences.php b/includes/Preferences.php
index fec3a74..a4cba79 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -86,7 +86,7 @@ class Preferences {
                                        'type' => 'info',
                                        'label-message' => 'username',
                                        'default' => $user->getName(),
-                                       'section' => 'personal',
+                                       'section' => 'personal/info',
                                );
                
                $defaultPreferences['userid'] =
@@ -94,7 +94,7 @@ class Preferences {
                                        'type' => 'info',
                                        'label-message' => 'uid',
                                        'default' => $user->getId(),
-                                       'section' => 'personal',
+                                       'section' => 'personal/info',
                                );
                
                # Get groups to which the user belongs
@@ -116,7 +116,7 @@ class Preferences {
                                                                count($userEffectiveGroupsArray) ),
                                        'default' => $wgLang->commaList( $userEffectiveGroupsArray ),
                                        'raw' => true,
-                                       'section' => 'personal',
+                                       'section' => 'personal/info',
                                );
                
                $defaultPreferences['editcount'] =
@@ -124,7 +124,7 @@ class Preferences {
                                        'type' => 'info',
                                        'label-message' => 'prefs-edits',
                                        'default' => $user->getEditCount(),
-                                       'section' => 'personal',
+                                       'section' => 'personal/info',
                                );
                
                if ($user->getRegistration()) {
@@ -133,7 +133,7 @@ class Preferences {
                                                'type' => 'info',
                                                'label-message' => 'prefs-registration',
                                                'default' => $wgLang->timeanddate( $user->getRegistration() ),
-                                               'section' => 'personal',
+                                               'section' => 'personal/info',
                                        );
                }
                                
@@ -144,7 +144,7 @@ class Preferences {
                                        array(
                                                'type' => 'text',
                                                'default' => $user->getRealName(),
-                                               'section' => 'personal',
+                                               'section' => 'personal/info',
                                                'label-message' => 'yourrealname',
                                                'help-message' => 'prefs-help-realname',
                                        );
@@ -163,14 +163,14 @@ class Preferences {
                                                'raw' => true,
                                                'default' => $link,
                                                'label-message' => 'yourpassword',
-                                               'section' => 'personal',
+                                               'section' => 'personal/info',
                                        );
                }
                
                $defaultPreferences['gender'] =
                                array(
                                        'type' => 'select',
-                                       'section' => 'personal',
+                                       'section' => 'personal/info',
                                        'options' => array(
                                                wfMsg('gender-male') => 'male',
                                                wfMsg('gender-female') => 'female',
@@ -196,7 +196,7 @@ class Preferences {
                $defaultPreferences['language'] =
                                array(
                                        'type' => 'select',
-                                       'section' => 'personal',
+                                       'section' => 'personal/i18n',
                                        'options' => $options,
                                        'label-message' => 'yourlanguage',
                                );
@@ -228,7 +228,7 @@ class Preferences {
                                                'label-message' => 'yourvariant',
                                                'type' => 'select',
                                                'options' => $options,
-                                               'section' => 'personal',
+                                               'section' => 'personal/i18n',
                                        );
                        }
                }
@@ -237,11 +237,18 @@ class Preferences {
                        $defaultPreferences['noconvertlink'] =
                                        array(
                                                'type' => 'toggle',
-                                               'section' => 'misc',
+                                               'section' => 'personal/i18n',
                                                'label-message' => 'tog-noconvertlink',
                                        );
                }
                
+               $defaultPreferences['rememberpassword'] =
+                               array(
+                                       'type' => 'toggle',
+                                       'label-message' => 'tog-rememberpassword',
+                                       'section' => 'personal/i18n',
+                               );
+               
                global $wgMaxSigChars;
                $defaultPreferences['nickname'] =
                                array(
@@ -250,21 +257,14 @@ class Preferences {
                                        'label-message' => 'yournick',
                                        'validation-callback' =>
                                                array( 'Preferences', 'validateSignature' ),
-                                       'section' => 'personal',
+                                       'section' => 'personal/signature',
                                        'filter-callback' => array( 'Preferences', 'cleanSignature' ),
                                );
                $defaultPreferences['fancysig'] =
                                array(
                                        'type' => 'toggle',
                                        'label-message' => 'tog-fancysig',
-                                       'section' => 'personal'
-                               );
-                               
-               $defaultPreferences['rememberpassword'] =
-                               array(
-                                       'type' => 'toggle',
-                                       'label-message' => 'tog-rememberpassword',
-                                       'section' => 'personal',
+                                       'section' => 'personal/signature'
                                );
                                
                ## Email stuff
@@ -275,7 +275,7 @@ class Preferences {
                                array(
                                        'type' => 'text',
                                        'default' => $user->getEmail(),
-                                       'section' => 'personal',
+                                       'section' => 'personal/email',
                                        'label-message' => 'youremail',
                                        'help-message' => $wgEmailConfirmToEdit
                                                                                ? 'prefs-help-email-required'
@@ -312,7 +312,7 @@ class Preferences {
                                        array(
                                                'type' => 'info',
                                                'raw' => true,
-                                               'section' => 'personal',
+                                               'section' => 'personal/email',
                                                'label-message' => 'prefs-emailconfirm-label',
                                                'default' => $emailauthenticated,
                                        );
@@ -325,13 +325,13 @@ class Preferences {
                                                array(
                                                        'type' => 'toggle',
                                                        'invert' => true,
-                                                       'section' => 'personal',
+                                                       'section' => 'personal/email',
                                                        'label-message' => 'allowemail',
                                                );
                                $defaultPreferences['ccmeonemails'] =
                                                array(
                                                        'type' => 'toggle',
-                                                       'section' => 'personal',
+                                                       'section' => 'personal/email',
                                                        'label-message' => 'tog-ccmeonemails',
                                                );
                        }
@@ -339,25 +339,25 @@ class Preferences {
                        $defaultPreferences['enotifwatchlistpages'] =
                                        array(
                                                'type' => 'toggle',
-                                               'section' => 'personal',
+                                               'section' => 'personal/email',
                                                'label-message' => 'tog-enotifwatchlistpages',
                                        );
                        $defaultPreferences['enotifusertalkpages'] =
                                        array(
                                                'type' => 'toggle',
-                                               'section' => 'personal',
+                                               'section' => 'personal/email',
                                                'label-message' => 'tog-enotifusertalkpages',
                                        );
                        $defaultPreferences['enotifminoredits'] =
                                        array(
                                                'type' => 'toggle',
-                                               'section' => 'personal',
+                                               'section' => 'personal/email',
                                                'label-message' => 'tog-enotifminoredits',
                                        );
                        $defaultPreferences['enotifrevealaddr'] =
                                        array(
                                                'type' => 'toggle',
-                                               'section' => 'personal',
+                                               'section' => 'personal/email',
                                                'label-message' => 'tog-enotifrevealaddr'
                                        );
                }
@@ -401,7 +401,7 @@ class Preferences {
                                                'options' =>
                                                        array_flip( array_map( 'wfMsg', $wgLang->getMathNames() ) ),
                                                'label' => ' ',
-                                               'section' => 'math',
+                                               'section' => 'rendering/math',
                                        );
                }
        }
@@ -413,14 +413,14 @@ class Preferences {
                                        'type' => 'select',
                                        'options' => self::getImageSizes(),
                                        'label-message' => 'imagemaxsize',
-                                       'section' => 'files',
+                                       'section' => 'rendering/files',
                                );
                $defaultPreferences['thumbsize'] =
                                array(
                                        'type' => 'select',
                                        'options' => self::getThumbSizes(),
                                        'label-message' => 'thumbsize',
-                                       'section' => 'files',
+                                       'section' => 'rendering/files',
                                );
        }
        
@@ -560,7 +560,7 @@ class Preferences {
                                array(
                                        'type' => 'int',
                                        'label-message' => 'columns',
-                                       'section' => 'editing',
+                                       'section' => 'editing/textboxsize',
                                        'min' => 4,
                                        'max' => 1000,
                                );
@@ -568,7 +568,7 @@ class Preferences {
                                array(
                                        'type' => 'int',
                                        'label-message' => 'rows',
-                                       'section' => 'editing',
+                                       'section' => 'editing/textboxsize',
                                        'min' => 4,
                                        'max' => 1000,
                                );

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 0a455ba..c69ee53 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -929,6 +929,11 @@ If you choose to provide it, this will be used for giving you attribution for yo
 'prefs-help-email'           => 'E-mail address is optional, but allows a new password to be e-mailed to you if you forget your password.
 You can also choose to let others contact you through your user or talk page without needing to reveal your identity.',
 'prefs-help-email-required'  => 'E-mail address is required.',
+'prefs-info'                            => 'Basic information',
+'prefs-i18n'                            => 'Internationalisation',
+'prefs-signature'                       => 'Signature',
+
+## User login
 'nocookiesnew'               => 'The user account was created, but you are not logged in.
 {{SITENAME}} uses cookies to log in users.
 You have cookies disabled.
@@ -1610,6 +1615,7 @@ Note that their indexes of {{SITENAME}} content may be out of date.',
 'prefs-reset-intro'         => 'You can use this page to reset your preferences to the site defaults.
 This cannot be undone.',
 'prefs-emailconfirm-label'  => 'E-mail confirmation:',
+'prefs-textboxsize'                    => 'Size of editing window',
 
 # User rights
 'userrights'                     => 'User rights management',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index be01e2a..16aa6d9 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -443,6 +443,10 @@ $wgMessageStructure = array(
                'login-throttled',
                'loginlanguagelabel',
                'loginlanguagelinks',
+               'prefs-info',
+               'prefs-i18n',
+               'prefs-signature',
+               'prefs-textboxsize',
        ),
        'resetpass' => array(
                'resetpass',