From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Dec 2013 09:55:49 +0100
Subject: Update to MediaWiki 1.22.0

---
 languages/classes/LanguageUk.php | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

(limited to 'languages/classes/LanguageUk.php')

diff --git a/languages/classes/LanguageUk.php b/languages/classes/LanguageUk.php
index ce9ed33c..4ad272ba 100644
--- a/languages/classes/LanguageUk.php
+++ b/languages/classes/LanguageUk.php
@@ -48,32 +48,32 @@ class LanguageUk extends Language {
 		# join and array_slice instead mb_substr
 		$ar = array();
 		preg_match_all( '/./us', $word, $ar );
-		if ( !preg_match( "/[a-zA-Z_]/us", $word ) )
+		if ( !preg_match( "/[a-zA-Z_]/us", $word ) ) {
 			switch ( $case ) {
 				case 'genitive': # родовий відмінок
-					if ( ( join( '', array_slice( $ar[0], -4 ) ) == 'вікі' ) || ( join( '', array_slice( $ar[0], -4 ) ) == 'Вікі' ) )
-						{ }
-					elseif ( join( '', array_slice( $ar[0], -1 ) ) == 'ь' )
+					if ( ( join( '', array_slice( $ar[0], -4 ) ) == 'вікі' ) || ( join( '', array_slice( $ar[0], -4 ) ) == 'Вікі' ) ) {
+					} elseif ( join( '', array_slice( $ar[0], -1 ) ) == 'ь' ) {
 						$word = join( '', array_slice( $ar[0], 0, -1 ) ) . 'я';
-					elseif ( join( '', array_slice( $ar[0], -2 ) ) == 'ія' )
+					} elseif ( join( '', array_slice( $ar[0], -2 ) ) == 'ія' ) {
 						$word = join( '', array_slice( $ar[0], 0, -2 ) ) . 'ії';
-					elseif ( join( '', array_slice( $ar[0], -2 ) ) == 'ка' )
+					} elseif ( join( '', array_slice( $ar[0], -2 ) ) == 'ка' ) {
 						$word = join( '', array_slice( $ar[0], 0, -2 ) ) . 'ки';
-					elseif ( join( '', array_slice( $ar[0], -2 ) ) == 'ти' )
+					} elseif ( join( '', array_slice( $ar[0], -2 ) ) == 'ти' ) {
 						$word = join( '', array_slice( $ar[0], 0, -2 ) ) . 'тей';
-					elseif ( join( '', array_slice( $ar[0], -2 ) ) == 'ди' )
+					} elseif ( join( '', array_slice( $ar[0], -2 ) ) == 'ди' ) {
 						$word = join( '', array_slice( $ar[0], 0, -2 ) ) . 'дів';
-					elseif ( join( '', array_slice( $ar[0], -3 ) ) == 'ник' )
+					} elseif ( join( '', array_slice( $ar[0], -3 ) ) == 'ник' ) {
 						$word = join( '', array_slice( $ar[0], 0, -3 ) ) . 'ника';
+					}
 					break;
 				case 'dative':  # давальний відмінок
 					# stub
 					break;
 				case 'accusative': # знахідний відмінок
-					if ( ( join( '', array_slice( $ar[0], -4 ) ) == 'вікі' ) || ( join( '', array_slice( $ar[0], -4 ) ) == 'Вікі' ) )
-						{ }
-					elseif ( join( '', array_slice( $ar[0], -2 ) ) == 'ія' )
+					if ( ( join( '', array_slice( $ar[0], -4 ) ) == 'вікі' ) || ( join( '', array_slice( $ar[0], -4 ) ) == 'Вікі' ) ) {
+					} elseif ( join( '', array_slice( $ar[0], -2 ) ) == 'ія' ) {
 						$word = join( '', array_slice( $ar[0], 0, -2 ) ) . 'ію';
+					}
 					break;
 				case 'instrumental':  # орудний відмінок
 					# stub
@@ -82,6 +82,7 @@ class LanguageUk extends Language {
 					# stub
 					break;
 			}
+		}
 		return $word;
 	}
 
@@ -91,13 +92,17 @@ class LanguageUk extends Language {
 	 * @return string
 	 */
 	function convertPlural( $count, $forms ) {
-		if ( !count( $forms ) ) { return ''; }
+		if ( !count( $forms ) ) {
+			return '';
+		}
 
 		// If the actual number is not mentioned in the expression, then just two forms are enough:
 		// singular for $count == 1
 		// plural   for $count != 1
 		// For example, "This user belongs to {{PLURAL:$1|one group|several groups}}."
-		if ( count( $forms ) === 2 ) return $count == 1 ? $forms[0] : $forms[1];
+		if ( count( $forms ) === 2 ) {
+			return $count == 1 ? $forms[0] : $forms[1];
+		}
 
 		// @todo FIXME: CLDR defines 4 plural forms. Form for decimals is missing/
 		// See http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#uk
@@ -107,10 +112,10 @@ class LanguageUk extends Language {
 			return $forms[2];
 		} else {
 			switch ( $count % 10 ) {
-				case 1:  return $forms[0];
+				case 1: return $forms[0];
 				case 2:
 				case 3:
-				case 4:  return $forms[1];
+				case 4: return $forms[1];
 				default: return $forms[2];
 			}
 		}
-- 
cgit v1.2.2