X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=languages%2Fclasses%2FLanguageUk.php;h=4ad272ba9075ed00c70aba0f100e6ceab66a05cd;hb=b5ef545ae319e9f0d653e7997c202a052132aca6;hp=7d2f58bfbfa792fb286c2c40599b75141d12febb;hpb=6d97bfde475170d2ba75991578e560e211333c79;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/classes/LanguageUk.php b/languages/classes/LanguageUk.php
index 7d2f58bfbf..4ad272ba90 100644
--- a/languages/classes/LanguageUk.php
+++ b/languages/classes/LanguageUk.php
@@ -1,90 +1,138 @@
 <?php
-/** Ukrainian (українська мова)
-  *
-  * @package MediaWiki
-  * @subpackage Language
-  */
+/**
+ * Ukrainian (українська мова) specific code.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Language
+ */
 
-/* Please, see Language.php for general function comments */
+/**
+ * Ukrainian (українська мова)
+ *
+ * @ingroup Language
+ */
 class LanguageUk extends Language {
-	# Convert from the nominative form of a noun to some other case
-	# Invoked with {{grammar:case|word}}
+
+	/**
+	 * Convert from the nominative form of a noun to some other case
+	 * Invoked with {{grammar:case|word}}
+	 *
+	 * @param $word string
+	 * @param $case string
+	 * @return string
+	 */
 	function convertGrammar( $word, $case ) {
 		global $wgGrammarForms;
-		if ( isset($wgGrammarForms['uk'][$case][$word]) ) {
+		if ( isset( $wgGrammarForms['uk'][$case][$word] ) ) {
 			return $wgGrammarForms['uk'][$case][$word];
 		}
 
 		# These rules are not perfect, but they are currently only used for site names so it doesn't
 		# matter if they are wrong sometimes. Just add a special case for your site name if necessary.
 
-		#join and array_slice instead mb_substr
+		# 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))=='ь')
-						$word = join('',array_slice($ar[0],0,-1)).'я';
-					elseif (join('',array_slice($ar[0],-2))=='ія')
-						$word=join('',array_slice($ar[0],0,-2)).'ії';
-					elseif (join('',array_slice($ar[0],-2))=='ка')
-						$word=join('',array_slice($ar[0],0,-2)).'ки';
-					elseif (join('',array_slice($ar[0],-2))=='ти')
-						$word=join('',array_slice($ar[0],0,-2)).'тей';
-					elseif (join('',array_slice($ar[0],-2))=='ди')
-						$word=join('',array_slice($ar[0],0,-2)).'дів';
-					elseif (join('',array_slice($ar[0],-3))=='ник')
-						$word=join('',array_slice($ar[0],0,-3)).'ника';
+				case 'genitive': # родовий відмінок
+					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 ) ) == 'ія' ) {
+						$word = join( '', array_slice( $ar[0], 0, -2 ) ) . 'ії';
+					} elseif ( join( '', array_slice( $ar[0], -2 ) ) == 'ка' ) {
+						$word = join( '', array_slice( $ar[0], 0, -2 ) ) . 'ки';
+					} elseif ( join( '', array_slice( $ar[0], -2 ) ) == 'ти' ) {
+						$word = join( '', array_slice( $ar[0], 0, -2 ) ) . 'тей';
+					} elseif ( join( '', array_slice( $ar[0], -2 ) ) == 'ди' ) {
+						$word = join( '', array_slice( $ar[0], 0, -2 ) ) . 'дів';
+					} elseif ( join( '', array_slice( $ar[0], -3 ) ) == 'ник' ) {
+						$word = join( '', array_slice( $ar[0], 0, -3 ) ) . 'ника';
+					}
 					break;
-				case 'dative':  #давальний відмінок
-					#stub
+				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))=='ія')
-						$word=join('',array_slice($ar[0],0,-2)).'ію';
+				case 'accusative': # знахідний відмінок
+					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
+				case 'instrumental':  # орудний відмінок
+					# stub
 					break;
-				case 'prepositional': #місцевий відмінок
-					#stub
+				case 'prepositional': # місцевий відмінок
+					# stub
 					break;
 			}
+		}
 		return $word;
 	}
 
+	/**
+	 * @param $count int
+	 * @param $forms array
+	 * @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];
+		}
+
+		// @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
 		$forms = $this->preConvertPlural( $forms, 3 );
 
-		if ($count > 10 && floor(($count % 100) / 10) == 1) {
+		if ( $count > 10 && floor( ( $count % 100 ) / 10 ) == 1 ) {
 			return $forms[2];
 		} else {
-			switch ($count % 10) {
-				case 1:  return $forms[0];
+			switch ( $count % 10 ) {
+				case 1: return $forms[0];
 				case 2:
 				case 3:
-				case 4:  return $forms[1];
+				case 4: return $forms[1];
 				default: return $forms[2];
 			}
 		}
 	}
 
-	/*
+	/**
 	 * Ukrainian numeric format is "12 345,67" but "1234,56"
+	 *
+	 * @param $_ string
+	 *
+	 * @return string
 	 */
-
-	function commafy($_) {
-		if (!preg_match('/^\d{1,4}$/',$_)) {
-			return strrev((string)preg_replace('/(\d{3})(?=\d)(?!\d*\.)/','$1,',strrev($_)));
+	function commafy( $_ ) {
+		if ( !preg_match( '/^\-?\d{1,4}(\.\d+)?$/', $_ ) ) {
+			return strrev( (string)preg_replace( '/(\d{3})(?=\d)(?!\d*\.)/', '$1,', strrev( $_ ) ) );
 		} else {
 			return $_;
 		}
 	}
 }
-