Merge "Handle missing namespace prefix in XML dumps more gracefully"

[lhc/web/wiklou.git] / languages / classes / LanguageSr.php

diff --git a/languages/classes/LanguageSr.php b/languages/classes/LanguageSr.php
index 1ffb321..6491f55 100644 (file)
--- a/languages/classes/LanguageSr.php
+++ b/languages/classes/LanguageSr.php
@@ -31,7 +31,7 @@
  * @ingroup Language
  */
 class SrConverter extends LanguageConverter {
-       public $mToLatin = array(
+       public $mToLatin = [
                'а' => 'a', 'б' => 'b', 'в' => 'v', 'г' => 'g', 'д' => 'd',
                'ђ' => 'đ', 'е' => 'e', 'ж' => 'ž', 'з' => 'z', 'и' => 'i',
                'ј' => 'j', 'к' => 'k', 'л' => 'l', 'љ' => 'lj', 'м' => 'm',
@@ -45,9 +45,9 @@ class SrConverter extends LanguageConverter {
                'Н' => 'N', 'Њ' => 'Nj', 'О' => 'O', 'П' => 'P', 'Р' => 'R',
                'С' => 'S', 'Т' => 'T', 'Ћ' => 'Ć', 'У' => 'U', 'Ф' => 'F',
                'Х' => 'H', 'Ц' => 'C', 'Ч' => 'Č', 'Џ' => 'Dž', 'Ш' => 'Š',
-       );
+       ];
 
-       public $mToCyrillics = array(
+       public $mToCyrillics = [
                'a' => 'а', 'b' => 'б', 'c' => 'ц', 'č' => 'ч', 'ć' => 'ћ',
                'd' => 'д', 'dž' => 'џ', 'đ' => 'ђ', 'e' => 'е', 'f' => 'ф',
                'g' => 'г', 'h' => 'х', 'i' => 'и', 'j' => 'ј', 'k' => 'к',
@@ -65,39 +65,14 @@ class SrConverter extends LanguageConverter {
                'DŽ' => 'Џ', 'd!ž' => 'дж', 'D!ž' => 'Дж', 'D!Ž' => 'ДЖ',
                'Lj' => 'Љ', 'l!j' => 'лј', 'L!j' => 'Лј', 'L!J' => 'ЛЈ',
                'Nj' => 'Њ', 'n!j' => 'нј', 'N!j' => 'Нј', 'N!J' => 'НЈ'
-       );
+       ];
 
        function loadDefaultTables() {
-               $this->mTables = array(
+               $this->mTables = [
                        'sr-ec' => new ReplacementArray( $this->mToCyrillics ),
                        'sr-el' => new ReplacementArray( $this->mToLatin ),
                        'sr' => new ReplacementArray()
-               );
-       }
-
-       /**
-        * rules should be defined as -{ekavian | iyekavian-} -or-
-        * -{code:text | code:text | ...}-
-        *
-        * update: delete all rule parsing because it's not used
-        * currently, and just produces a couple of bugs
-        *
-        * @param string $rule
-        * @param array $flags
-        * @return array
-        */
-       function parseManualRule( $rule, $flags = array() ) {
-               if ( in_array( 'T', $flags ) ) {
-                       return parent::parseManualRule( $rule, $flags );
-               }
-
-               $carray = array();
-               // otherwise ignore all formatting
-               foreach ( $this->mVariants as $v ) {
-                       $carray[$v] = $rule;
-               }
-
-               return $carray;
+               ];
        }
 
        /**
@@ -186,7 +161,6 @@ class SrConverter extends LanguageConverter {
                } else {
                        return false;
                }
-
        }
 
 }
@@ -200,17 +174,17 @@ class LanguageSr extends Language {
        function __construct() {
                parent::__construct();
 
-               $variants = array( 'sr', 'sr-ec', 'sr-el' );
-               $variantfallbacks = array(
+               $variants = [ 'sr', 'sr-ec', 'sr-el' ];
+               $variantfallbacks = [
                        'sr' => 'sr-ec',
                        'sr-ec' => 'sr',
                        'sr-el' => 'sr',
-               );
+               ];
 
-               $flags = array(
+               $flags = [
                        'S' => 'S', 'писмо' => 'S', 'pismo' => 'S',
                        'W' => 'W', 'реч' => 'W', 'reč' => 'W', 'ријеч' => 'W', 'riječ' => 'W'
-               );
+               ];
                $this->mConverter = new SrConverter( $this, 'sr', $variants, $variantfallbacks, $flags );
        }
 }