* (bug 6329) Date/Time settings on Frisian wikis do not conform to Frisian usage.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 88c32b7..44fd749 100644 (file)
--- 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 882b6f9..39b1d06 100644 (file)
--- 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(