* Removed language conversion support from Icelandic

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 27e2cae..dee70ce 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -464,6 +464,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 2181) basic CSB language localisation by Tomasz G. Sienicki (thanks for the patch)
 * (bug 2632) also adjust height when zooming an image by giving only width
 * Fix correct use of escaping in edit toolbar bits
+* Removed language conversion support from Icelandic
 
 
 === Caveats ===

diff --git a/languages/Language.php b/languages/Language.php
index e156374..5e0890d 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1786,9 +1786,6 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'View the category page\');
 'variantname-zh-sg' => 'sg',
 'variantname-zh' => 'zh',
 
-'variantname-is' => 'is',
-'variantname-iz' => 'iz',
-
 # labels for User: and Title: on Special:Log pages
 'specialloguserlabel' => 'User: ',
 'speciallogtitlelabel' => 'Title: ',

diff --git a/languages/LanguageIs.php b/languages/LanguageIs.php
index 717cf72..b1e2842 100644 (file)
--- a/languages/LanguageIs.php
+++ b/languages/LanguageIs.php
@@ -726,39 +726,14 @@ Query: $2",
 'yourpasswordagain' => "Lykilorð (aftur)",
 'yourrealname' => "Fullt nafn þitt*",
 'yourtext' => "Þinn texti",
-
-'variantname-is' => 'Íslenska',
-'variantname-iz' => 'Íslenzka',
-'yourvariant' => 'Ritkerfi'
 );
 
 #--------------------------------------------------------------------------
 # Internationalisation code
 #--------------------------------------------------------------------------
 
-require_once( 'LanguageConverter.php' );
-class IsConverter extends LanguageConverter {
-       function loadDefaultTables() {
-               $this->mTables = array();
-               $this->mTables['iz'] = array();
-               $this->mTables['is'] = array();
-               $this->mUcfirst = true;
-       }
-}
-
 class LanguageIs extends LanguageUtf8 {
-       function LanguageIs() {
-               global $wgHooks;
-               $this->mConverter = new IsConverter($this, 'is',
-                       array('is', 'iz'),
-                       array(
-                               'is' => 'iz',
-                               'iz' => 'is'
-                       )
-               );
-               $wgHooks['ArticleSaveComplete'][] = $this->mConverter;
-       }
-       
+
        function getNamespaces() {
                global $wgNamespaceNamesIs;
                return $wgNamespaceNamesIs;
@@ -859,6 +834,4 @@ class LanguageIs extends LanguageUtf8 {
        }
 }
 
-class LanguageIz extends LanguageIs {}
-
 ?>

diff --git a/languages/Names.php b/languages/Names.php
index 626d0af..eafb524 100644 (file)
--- a/languages/Names.php
+++ b/languages/Names.php
@@ -88,7 +88,6 @@
        'ik' => 'Iñupiak',     # Inupiak
        'io' => 'Ido',                  # Ido
        'is' => 'Íslenska',    # Icelandic
-       'iz' => 'Íslenzka',    # Icelandic
        'it' => 'Italiano',             # Italian
        'iu' => 'ᐃᓄᒃᑎᑐᑦ',   # Inuktitut
        'ja' => '日本語',    # Japanese