From: Tony Thomas <01tonythomas@gmail.com>
Date: Thu, 10 Apr 2014 18:41:01 +0000 (+0530)
Subject: Moved "Date format" user preference to "Appearance" tab
X-Git-Tag: 1.31.0-rc.0~16258^2
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=a3ffeffe185076234e3d7ecef31b3c457030673d;p=lhc%2Fweb%2Fwiklou.git

Moved "Date format" user preference to "Appearance" tab

This user preference affects the appearance of the site,
so this feels like a natural fit

Bug: 63582
Change-Id: Ib97b1b39723f1835b7f6086ff1418ab5de13a7a1
---

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 33d9333975..d026b97297 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -84,8 +84,8 @@ class Preferences {
 
 		self::profilePreferences( $user, $context, $defaultPreferences );
 		self::skinPreferences( $user, $context, $defaultPreferences );
-		self::filesPreferences( $user, $context, $defaultPreferences );
 		self::datetimePreferences( $user, $context, $defaultPreferences );
+		self::filesPreferences( $user, $context, $defaultPreferences );
 		self::renderingPreferences( $user, $context, $defaultPreferences );
 		self::editingPreferences( $user, $context, $defaultPreferences );
 		self::rcPreferences( $user, $context, $defaultPreferences );
@@ -648,7 +648,7 @@ class Preferences {
 				'type' => 'radio',
 				'options' => $dateOptions,
 				'label' => '&#160;',
-				'section' => 'datetime/dateformat',
+				'section' => 'rendering/dateformat',
 			);
 		}
 
@@ -665,7 +665,7 @@ class Preferences {
 			'raw' => 1,
 			'label-message' => 'servertime',
 			'default' => $nowserver,
-			'section' => 'datetime/timeoffset',
+			'section' => 'rendering/timeoffset',
 		);
 
 		$defaultPreferences['nowlocal'] = array(
@@ -673,7 +673,7 @@ class Preferences {
 			'raw' => 1,
 			'label-message' => 'localtime',
 			'default' => $nowlocal,
-			'section' => 'datetime/timeoffset',
+			'section' => 'rendering/timeoffset',
 		);
 
 		// Grab existing pref.
@@ -703,7 +703,7 @@ class Preferences {
 			'options' => $tzOptions,
 			'default' => $tzSetting,
 			'size' => 20,
-			'section' => 'datetime/timeoffset',
+			'section' => 'rendering/timeoffset',
 		);
 	}
 
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 00745d8002..9fc392f3bb 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -932,7 +932,6 @@
     "prefs-skin": "Skin",
     "skin-preview": "Preview",
     "datedefault": "No preference",
-    "prefs-datetime": "Date and time",
     "prefs-labs": "Labs features",
     "prefs-user-pages": "User pages",
     "prefs-personal": "User profile",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 61c9c0dd52..0a37451d1f 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1084,7 +1084,6 @@
     "prefs-skin": "Used in user preferences.\n{{Identical|Skin}}",
     "skin-preview": "{{doc-actionlink}}\nThe link beside each skin name in [[Special:Preferences|your user preferences]], tab \"skin\".\n{{Identical|Preview}}",
     "datedefault": "Used as checkbox label in [[Special:Preferences#mw-prefsection-datetime|user preferences]], {{msg-mw|prefs-datetime}} tab.\n\nThis message indicates {{msg-mw|prefs-dateformat}} is default (= not specified).",
-    "prefs-datetime": "{{Identical|Date}}",
     "prefs-labs": "Header of a subsection at [[Special:Preferences]], tab ''{{int:prefs-editing}}'', listing features that are experimental",
     "prefs-user-pages": "Header of a subsection at [[Special:Preferences]], tab ''{{int:prefs-misc}}'', listing features that are related to user pages",
     "prefs-personal": "Title of a tab in [[Special:Preferences]].\n{{Identical|User profile}}",