update to Mediawiki 1.13.3; some cleanups

1 files changed, 0 insertions, 224 deletions

diff --git a/languages/LanguageSr.php b/languages/LanguageSr.php
deleted file mode 100644
index ffbb6784..00000000
--- a/languages/LanguageSr.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/**
-  * @package MediaWiki
-  * @subpackage Language
-  */
-
-/*
-	There are two levels of conversion for Serbian: the script level
-	(Cyrillics <-> Latin), and the variant level (ekavian
-	<->iyekavian). The two are orthogonal. So we really only need two
-	dictionaries: one for Cyrillics and Latin, and one for ekavian and
-	iyekavian.
-*/
-require_once( "LanguageConverter.php" );
-require_once( "LanguageSr_ec.php" );
-require_once( "LanguageSr_el.php" );
-require_once( "LanguageSr_jc.php" );
-require_once( "LanguageSr_jl.php" );
-
-class SrConverter extends LanguageConverter {
-	var $mToLatin = array(
-		'а' => 'a', 'б' => 'b',  'в' => 'v', 'г' => 'g',  'д' => 'd',
-		'ђ' => 'đ', 'е' => 'e',  'ж' => 'ž', 'з' => 'z',  'и' => 'i',
-		'ј' => 'j', 'к' => 'k',  'л' => 'l', 'љ' => 'lj', 'м' => 'm',
-		'н' => 'n', 'њ' => 'nj', 'о' => 'o', 'п' => 'p',  'р' => 'r',
-		'с' => 's', 'т' => 't',  'ћ' => 'ć', 'у' => 'u',  'ф' => 'f',
-		'х' => 'h', 'ц' => 'c',  'ч' => 'č', 'џ' => 'dž', 'ш' => 'š',
-
-		'А' => 'A', 'Б' => 'B',  'В' => 'V', 'Г' => 'G',  'Д' => 'D',
-		'Ђ' => 'Đ', 'Е' => 'E',  'Ж' => 'Ž', 'З' => 'Z',  'И' => 'I',
-		'Ј' => 'J', 'К' => 'K',  'Л' => 'L', 'Љ' => 'Lj', 'М' => 'M',
-		'Н' => 'N', 'Њ' => 'Nj', 'О' => 'O', 'П' => 'P',  'Р' => 'R',
-		'С' => 'S', 'Т' => 'T',  'Ћ' => 'Ć', 'У' => 'U',  'Ф' => 'F',
-		'Х' => 'H', 'Ц' => 'C',  'Ч' => 'Č', 'Џ' => 'Dž', 'Ш' => 'Š',
-	);
-
-	var $mToCyrillics = array(
-		'a' => 'а', 'b'  => 'б', 'c' => 'ц', 'č' => 'ч', 'ć'  => 'ћ',
-		'd' => 'д', 'dž' => 'џ', 'đ' => 'ђ', 'e' => 'е', 'f'  => 'ф',
-		'g' => 'г', 'h'  => 'х', 'i' => 'и', 'j' => 'ј', 'k'  => 'к',
-		'l' => 'л', 'lj' => 'љ', 'm' => 'м', 'n' => 'н', 'nj' => 'њ',
-		'o' => 'о', 'p'  => 'п', 'r' => 'р', 's' => 'с', 'š'  => 'ш',
-		't' => 'т', 'u'  => 'у', 'v' => 'в', 'z' => 'з', 'ž'  => 'ж',
-
-		'A' => 'А', 'B'  => 'Б', 'C' => 'Ц', 'Č' => 'Ч', 'Ć'  => 'Ћ',
-		'D' => 'Д', 'Dž' => 'Џ', 'Đ' => 'Ђ', 'E' => 'Е', 'F'  => 'Ф',
-		'G' => 'Г', 'H'  => 'Х', 'I' => 'И', 'J' => 'Ј', 'K'  => 'К',
-		'L' => 'Л', 'LJ' => 'Љ', 'M' => 'М', 'N' => 'Н', 'NJ' => 'Њ',
-		'O' => 'О', 'P'  => 'П', 'R' => 'Р', 'S' => 'С', 'Š'  => 'Ш',
-		'T' => 'Т', 'U'  => 'У', 'V' => 'В', 'Z' => 'З', 'Ž'  => 'Ж',
-
-		'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'] = $this->mToCyrillics;
-		$this->mTables['sr-jc'] = $this->mToCyrillics;
-		$this->mTables['sr-el'] = $this->mToLatin;
-		$this->mTables['sr-jl'] = $this->mToLatin;
-		$this->mTables['sr'] = array();
-	}
-
-	/* rules should be defined as -{ekavian | iyekavian-} -or-
-		-{code:text | code:text | ...}-
-	*/
-	function parseManualRule($rule, $flags) {
-
-		$echoices = preg_split("/(<[^>]+>)/",$rule,-1,PREG_SPLIT_DELIM_CAPTURE);
-		$choices = array();
-
-		// check if we did a split across an HTML tag
-		// if so, glue them back together
-
-		$ctold = '';
-		foreach($echoices as $ct){
-			if($ct=='');
-			else if(preg_match('/<[^>]+>/',$ct)){ 
-				$ctold.=$ct;
-			}
-			else{
-				$c = explode($this->mMarkup['varsep'],$ct);
-				if(count($c)>1){
-					$choices[]=$ctold.array_shift($c);
-					$ctold=array_pop($c);
-					$choices=array_merge($choices,$c);
-				}
-				else $ctold.=array_pop($c);			
-			}
-		}
-		if($ctold!='') $choices[]=$ctold;
-
-		$carray = array();
-		if(sizeof($choices) == 1) {
-			if(in_array('W', $flags)) {
-				$carray['sr'] = $this->autoConvert($choices[0], 'sr-ec');
-				$carray['sr-ec'] = $this->autoConvert($choices[0], 'sr-ec');
-				$carray['sr-jc'] = $this->autoConvert($choices[0], 'sr-jc');
-				$carray['sr-el'] = $this->autoConvert($choices[0], 'sr-el');
-				$carray['sr-jl'] = $this->autoConvert($choices[0], 'sr-jl');
-			}
-			foreach($this->mVariants as $v) {
-				$carray[$v] = $choices[0];
-			}
-			return $carray;
-		}
-
-		/* detect which format is used, also trim the choices*/
-		$n=0;
-		foreach($choices as $c=>$t) {
-			if(strpos($t, $this->mMarkup['codesep']) !== false) { $n++; }
-			$choices[$c] = trim($t);
-		}
-		/* the -{code:text | ...}- format */
-		if($n == sizeof($choices)) {
-			foreach($choices as $c) {
-				list($code, $text) = explode($this->mMarkup['codesep'], $c);
-				$carray[trim($code)] = trim($text);
-			}
-			return $carray;
-		}
-
-		/* the two choice format -{choice1; choice2}-*/
-		if(sizeof($choices == 2) && $n==0) {
-			if(in_array('S', $flags)) {
-				// conversion between Cyrillics and Latin
-				$carray['sr'] = $carray['sr-ec'] =$carray['sr-jc'] = $choices[0];
-				$carray['sr-el'] =$carray['sr-jl'] = $choices[1];
-			}
-			else {
-				$carray['sr'] = $this->autoConvert($choices[0], 'sr-ec');
-				$carray['sr-ec'] = $this->autoConvert($choices[0], 'sr-ec');
-				$carray['sr-jc'] = $this->autoConvert($choices[1], 'sr-jc');
-				$carray['sr-el'] = $this->autoConvert($choices[0], 'sr-el');
-				$carray['sr-jl'] = $this->autoConvert($choices[1], 'sr-jl');
-			}
-			return $carray;
-		}
-		return $carray;
-	}
-
-	/*
-	 * Override function from LanguageConvertor
-	 * Additional checks: 
-	 *  - There should be no conversion for Talk pages
-	 */
-	function getPreferredVariant(){
-		global $wgTitle;
-		if($wgTitle!=NULL && $wgTitle->isTalkPage()){
-			return $this->mMainLanguageCode;
-		}
-		return parent::getPreferredVariant();
-	}
-
-
-	/*
-	 * A function wrapper, if there is no selected variant, 
-	 * leave the link names as they were
-	 */
-	function findVariantLink( &$link, &$nt ) {
-		$oldlink=$link;
-		parent::findVariantLink($link,$nt);
-		if($this->getPreferredVariant()==$this->mMainLanguageCode)
-			$link=$oldlink;
-	}
-
-
-	/*
-	 * We want our external link captions to be converted in variants,
-	 * so we return the original text instead -{$text}-, except for URLs
-	 */
-	function markNoConversion($text) {
-		if(preg_match("/^https?:\/\/|ftp:\/\/|irc:\/\//",$text))
-			return parent::markNoConversion($text);
-		return $text;
-	}
-
-	/*
-	 * An ugly function wrapper for parsing Image titles
-	 * (to prevent image name conversion)
-	 */
-	function autoConvert($text, $toVariant=false) {
-		global $wgTitle;
-		if($wgTitle->getNameSpace()==NS_IMAGE){ 
-			$imagename = $wgTitle->getNsText();
-			if(preg_match("/^$imagename:/",$text)) return $text;
-		}
-		return parent::autoConvert($text,$toVariant);
-	} 
-
-
-}
-
-class LanguageSr extends LanguageSr_ec {
-	function __construct() {
-		global $wgHooks;
-		$variants = array('sr', 'sr-ec', 'sr-jc', 'sr-el', 'sr-jl');
-		$variantfallbacks = array(
-			'sr'    => 'sr-ec',
-			'sr-ec' => 'sr-jc',
-			'sr-jc' => 'sr-ec',
-			'sr-el' => 'sr-jl',
-			'sr-jl' => 'sr-el'
-		);
-		$marker = array();//don't mess with these, leave them as they are
-		$flags = array(
-			'S' => 'S', 'писмо' => 'S', 'pismo' => 'S',
-			'W' => 'W', 'реч'   => 'W', 'reč'   => 'W', 'ријеч' => 'W', 'riječ' => 'W'
-		);
-		$this->mConverter = new SrConverter($this, 'sr', $variants, $variantfallbacks, $marker, $flags);
-		$wgHooks['ArticleSaveComplete'][] = $this->mConverter;
-	}
-	function getVariantname( $code ) {
-		return wfMsg( "variantname-$code" );
-	}
-
-	function linkTrail() {
-		return "/^([abvgdđežzijklljmnnjoprstćufhcčdžšабвгдђежзијклљмнњопрстћуфхцчџш]+)(.*)$/usD";
-	}
-
-}
-?>