X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=languages%2Fclasses%2FLanguageHy.php;h=527a55f5968b720680ad9f1b59caa9d7b0a7f571;hb=e77aa77cd80d402c765bede04f1ebc64993058e4;hp=236e8ba2782564b95fca7044be9c5fbb46b055ba;hpb=c031d6ea3103614c79940e66bc5a685866b52fdf;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/classes/LanguageHy.php b/languages/classes/LanguageHy.php
index 236e8ba278..527a55f596 100644
--- a/languages/classes/LanguageHy.php
+++ b/languages/classes/LanguageHy.php
@@ -1,73 +1,69 @@
 <?php
-/** Armenian (Հայերեն)
-  *
-  * @addtogroup Language
-  * @author Ruben Vardanyan (Me@RubenVardanyan.com)
-  */
 
-/* Please, see Language.php for general function comments */
+/** Armenian (Հայերեն)
+ *
+ * @ingroup Language
+ * @author Ruben Vardanyan (Me@RubenVardanyan.com)
+ */
 class LanguageHy extends Language {
 	# Convert from the nominative form of a noun to some other case
 	# Invoked with {{grammar:case|word}}
 	function convertGrammar( $word, $case ) {
 		global $wgGrammarForms;
-		if ( isset($wgGrammarForms['hy'][$case][$word]) ) {
+		if ( isset( $wgGrammarForms['hy'][$case][$word] ) ) {
 			return $wgGrammarForms['hy'][$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],-1))=='Õ¡')
-						$word = join('',array_slice($ar[0],0,-1)).'Õ¡ÕµÕ«';
-					elseif (join('',array_slice($ar[0],-1))=='Õ¸')
-						$word=join('',array_slice($ar[0],0,-1)).'Õ¸ÕµÕ«';
-					elseif (join('',array_slice($ar[0],-4))=='գիրք')
-						$word=join('',array_slice($ar[0],0,-4)).'գրքի';
+				case 'genitive': # Õ½Õ¥Õ¼Õ¡Õ¯Õ¡Õ¶ Õ°Õ¸Õ¬Õ¸Õ¾
+					if ( join( '', array_slice( $ar[0], -1 ) ) == 'Õ¡' )
+						$word = join( '', array_slice( $ar[0], 0, -1 ) ) . 'Õ¡ÕµÕ«';
+					elseif ( join( '', array_slice( $ar[0], -1 ) ) == 'Õ¸' )
+						$word = join( '', array_slice( $ar[0], 0, -1 ) ) . 'Õ¸ÕµÕ«';
+					elseif ( join( '', array_slice( $ar[0], -4 ) ) == 'գիրք' )
+						$word = join( '', array_slice( $ar[0], 0, -4 ) ) . 'գրքի';
 					else
-						$word.='Õ«';
+						$word .= 'Õ«';
 					break;
-				case 'dative':  #Տրական հոլով
-					#stub
+				case 'dative':  # Տրական հոլով
+					# stub
 					break;
-				case 'accusative': #Հայցական հոլով
-					#stub
+				case 'accusative': # Հայցական հոլով
+					# stub
 					break;
 				case 'instrumental':  #
-					#stub
+					# stub
 					break;
 				case 'prepositional': #
-					#stub
+					# stub
 					break;
 			}
 		return $word;
 	}
 
-	function convertPlural( $count, $wordform1, $wordform2, $w3, $w4, $w5) {
-		$count = str_replace (' ', '', $count);
-		if (abs($count) <= 1) {
-			return $wordform1;
-		} else {
-			return $wordform2;
-		}
+	function convertPlural( $count, $forms ) {
+		if ( !count( $forms ) ) { return ''; }
+		$forms = $this->preConvertPlural( $forms, 2 );
+
+		return ( abs( $count ) <= 1 ) ? $forms[0] : $forms[1];
 	}
 
 	/*
 	 * Armenian numeric format is "12 345,67" but "1234,56"
 	 */
 
-	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}$/', $_ ) ) {
+			return strrev( (string)preg_replace( '/(\d{3})(?=\d)(?!\d*\.)/', '$1,', strrev( $_ ) ) );
 		} else {
 			return $_;
 		}
 	}
 }
-