X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=languages%2Fclasses%2FLanguageCrh.php;h=d5418b9a6d2af4836e80755afe388cd815dff176;hb=edf7224639b6f45c0e6762a664cfb2e84beb8e0a;hp=f384471dabfd4a49d2ee892f70e6c913d7134470;hpb=9a6b2a4fffb82840d0bf780eb4ecb873ad64fa54;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/classes/LanguageCrh.php b/languages/classes/LanguageCrh.php
index f384471dab..d5418b9a6d 100644
--- a/languages/classes/LanguageCrh.php
+++ b/languages/classes/LanguageCrh.php
@@ -58,6 +58,26 @@ class CrhConverter extends LanguageConverter {
 	const L_F_UC = 'EİÖÜ'; # Crimean Tatar Latin uppercase front vowels
 	const L_F = 'eiöüEİÖÜ'; # Crimean Tatar Latin front vowels
 
+	/**
+	 * @param Language $langobj
+	 * @param string $maincode
+	 * @param array $variants
+	 * @param array $variantfallbacks
+	 * @param array $flags
+	 */
+	function __construct( $langobj, $maincode,
+								$variants = [],
+								$variantfallbacks = [],
+								$flags = [] ) {
+		parent::__construct( $langobj, $maincode,
+			$variants, $variantfallbacks, $flags );
+
+		// No point delaying this since they're in code.
+		// Waiting until loadDefaultTables() means they never get loaded
+		// when the tables themselves are loaded from cache.
+		$this->loadExceptions();
+	}
+
 	public $mCyrillicToLatin = [
 
 		## these are independent of location in the word, but have
@@ -106,9 +126,8 @@ class CrhConverter extends LanguageConverter {
 
 		// hack, hack, hack
 		'A' => 'А', 'a' => 'а', 'E' => 'Е', 'e' => 'е',
-		'Ö' => 'О', 'ö' => 'о', 'U' => 'У', 'u' => 'у',
-		'Ü' => 'У', 'ü' => 'у', 'Y' => 'Й', 'y' => 'й',
-
+		'Ö' => 'Ё', 'ö' => 'ё', 'U' => 'У', 'u' => 'у',
+		'Ü' => 'Ю', 'ü' => 'ю', 'Y' => 'Й', 'y' => 'й',
 		'C' => 'Дж', 'c' => 'дж', 'Ğ' => 'Гъ', 'ğ' => 'гъ',
 		'Ñ' => 'Нъ', 'ñ' => 'нъ', 'Q' => 'Къ', 'q' => 'къ',
 
@@ -129,10 +148,6 @@ class CrhConverter extends LanguageConverter {
 		];
 	}
 
-	function postLoadTables() {
-		$this->loadExceptions();
-	}
-
 	function loadExceptions() {
 		if ( $this->mExceptionsLoaded ) {
 			return;