From 54690888a8c128e615f6f7035ab9772a28ed74c4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Tue, 28 Nov 2006 19:01:14 +0000
Subject: [PATCH] * (bug 6329) Date/Time settings on Frisian wikis do not
 conform to Frisian usage.

---
 RELEASE-NOTES                     |  1 +
 languages/messages/MessagesFy.php | 27 +++++++++++++++++----------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 88c32b7716..44fd74975e 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -229,6 +229,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 
 * Bishnupriya Manipuri (bpy)
 * Cantonese (zh-yue)
+* Frisian (fy)
 * German (de)
 * Hebrew (he)
 * Indonesian (id)
diff --git a/languages/messages/MessagesFy.php b/languages/messages/MessagesFy.php
index 882b6f9cbf..39b1d065bf 100644
--- a/languages/messages/MessagesFy.php
+++ b/languages/messages/MessagesFy.php
@@ -15,18 +15,25 @@ $skinNames = array(
 	'nostalgia' => 'Nostalgy',
 );
 
-$dateFormats = array(
-	'mdy time' => 'H.i',
-	'mdy date' => 'M j, Y',
-	'mdy both' => 'H.i, M j, Y',
+$datePreferences = array(
+	'default',
+	'fy normal',
+	'ISO 8601',
+);
+
+$defaultDateFormat = 'fy normal';
 
-	'dmy time' => 'H.i',
-	'dmy date' => 'j M Y',
-	'dmy both' => 'H.i, j M Y',
+$dateFormats = array(
+	'fy normal time' => 'H.i',
+	'fy normal date' => 'j M Y',
+	'fy normal both' => 'j M Y, H.i',
+);
 
-	'ymd time' => 'H.i',
-	'ymd date' => 'Y M j',
-	'ymd both' => 'H.i, Y M j',	
+$datePreferenceMigrationMap = array(
+	'default',
+	'fy normal',
+	'fy normal',
+	'fy normal',
 );
 
 $namespaceNames = array(
-- 
2.20.1