* (bug 19809) Split the North Korean language, move the North Korean calendar from...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8ba8d00..b6a218f 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -419,6 +419,7 @@ changes to languages because of MediaZilla reports.
 * (bug 19441) Updated date formatting for Lithuanian
 * (bug 19630) Added ÄäÇçĞğŇňÖöŞşÜüÝýŽž to Turkmen (tk) linktrail
 * (bug 19949) New linktrail for Greek (el)
+* (bug 19809) Korean (North Korea) (ko-kp) (new)
 
 == Compatibility ==
 

diff --git a/languages/Names.php b/languages/Names.php
index cf89d22..9e85fc8 100644 (file)
--- a/languages/Names.php
+++ b/languages/Names.php
@@ -102,9 +102,9 @@
        'fy' => 'Frysk',                # Frisian
        'ga' => 'Gaeilge',              # Irish
        'gag' => 'Gagauz',              # Gagauz
-       'gan' => '贛語',              # Gan-hant
-       'gan-hans' => '赣语(简体)', # Gan-hans
-       'gan-hant' => '贛語(繁體)', # Gan-hant
+       'gan' => '贛語',              # Gan
+       'gan-hans' => '赣语(简体)', # Gan (Simplified Han)
+       'gan-hant' => '贛語(繁體)', # Gan (Traditional Han)
        'gd' => 'Gàidhlig',    # Scots Gaelic
        'gl' => 'Galego',               # Galician
        'glk' => 'گیلکی',  # Gilaki
@@ -165,6 +165,7 @@
        'km' => 'ភាសាខ្មែរ',  # Khmer, Central
        'kn' => 'ಕನ್ನಡ',      # Kannada
        'ko' => '한국어',    # Korean
+       'ko-kp' => '한국어 (조선)',        # Korean (DPRK)
        'kr' => 'Kanuri',               # Kanuri, Central
        'kri' => 'Krio', # Krio
        'krj' => 'Kinaray-a', # Kinaray-a

diff --git a/languages/messages/MessagesKo.php b/languages/messages/MessagesKo.php
index dd4dd15..3659379 100644 (file)
--- a/languages/messages/MessagesKo.php
+++ b/languages/messages/MessagesKo.php
@@ -252,8 +252,6 @@ $bookstoreList = array(
 
 $datePreferences = array(
        'default',
-       'juche',
-       'juche bracket',
        'ISO 8601',
 );
 $defaultDateFormat = 'ko';
@@ -261,14 +259,6 @@ $dateFormats = array(
        'ko time'            => 'H:i',
        'ko date'            => 'Y년 M월 j일 (D)',
        'ko both'            => 'Y년 M월 j일 (D) H:i',
-
-       'juche time'         => 'H:i',
-       'juche date'         => 'xoY년 M월 j일 (D)',
-       'juche both'         => 'xoY년 M월 j일 (D) H:i',
-
-       'juche bracket time' => 'H:i',
-       'juche bracket date' => '주체xoY년 (Y년) M월 j일 (D)',
-       'juche bracket both' => '주체xoY년 (Y년) M월 j일 (D) H:i',
 );
 
 $messages = array(

diff --git a/languages/messages/MessagesKo_kp.php b/languages/messages/MessagesKo_kp.php
new file mode 100644 (file)
index 0000000..3ac6f08
--- /dev/null
+++ b/languages/messages/MessagesKo_kp.php
@@ -0,0 +1,33 @@
+<?php
+/** Korean (한국어(조선))
+ *
+ * See MessagesQqq.php for message documentation incl. usage of parameters
+ * To improve a translation please visit http://translatewiki.net
+ *
+ * @ingroup Language
+ * @file
+ *
+ */
+
+$fallback = 'ko';
+
+$datePreferences = array(
+       'default',
+       'juche',
+       'juche bracket',
+       'ISO 8601',
+);
+$defaultDateFormat = 'ko';
+$dateFormats = array(
+       'ko time'            => 'H:i',
+       'ko date'            => 'Y년 M월 j일 (D)',
+       'ko both'            => 'Y년 M월 j일 (D) H:i',
+
+       'juche time'         => 'H:i',
+       'juche date'         => 'xoY년 M월 j일 (D)',
+       'juche both'         => 'xoY년 M월 j일 (D) H:i',
+
+       'juche bracket time' => 'H:i',
+       'juche bracket date' => '주체xoY년 (Y년) M월 j일 (D)',
+       'juche bracket both' => '주체xoY년 (Y년) M월 j일 (D) H:i',
+);