From: Amir E. Aharoni <amir.aharoni@mail.huji.ac.il>
Date: Sun, 27 Sep 2015 12:21:49 +0000 (+0300)
Subject: Update Ukrainian grammar rules and tests
X-Git-Tag: 1.31.0-rc.0~9740^2
X-Git-Url: http://git.cyclocoop.org/%27.parametre_url%28%20%20%20generer_action_auteur%28%27charger_plugin%27%2C%20%27update_flux%27%29%2C%27update_flux%27%2C%20%27oui%27%29.%27?a=commitdiff_plain;h=b175f585dbc45b224f9ddd4ba01cc5ce7650a4e6;p=lhc%2Fweb%2Fwiklou.git

Update Ukrainian grammar rules and tests

* Fix the '-ти' rule to match the name of Wikiquote.
* Add tests for '-ти' and '-ник' rules.
* Remove the '-ь' and '-ка' rules, which were copied from Russian
  and are not used in Ukrainian, and remove their tests as well.
* Remove non-implemented ("stub") cases.
* Cleanup the code of commafy().

Change-Id: I98647ceb8806d845f3c8150b92a5d9f7fe5866f2
---

diff --git a/languages/classes/LanguageUk.php b/languages/classes/LanguageUk.php
index 5215da029c..8261f11876 100644
--- a/languages/classes/LanguageUk.php
+++ b/languages/classes/LanguageUk.php
@@ -42,8 +42,8 @@ class LanguageUk extends Language {
 			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.
+		# These rules don't cover the whole language.
+		# They are used only for site names.
 
 		# join and array_slice instead mb_substr
 		$ar = array();
@@ -51,40 +51,21 @@ class LanguageUk extends Language {
 		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 ) ) == 'ія' ) {
+					if ( 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 ) ) == 'ди' ) {
+					} 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 ) ) == 'ник' ) {
+					} 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], -2 ) ) === 'ія' ) {
 						$word = join( '', array_slice( $ar[0], 0, -2 ) ) . 'ію';
 					}
 					break;
-				case 'instrumental':  # орудний відмінок
-					# stub
-					break;
-				case 'prepositional': # місцевий відмінок
-					# stub
-					break;
 			}
 		}
 		return $word;
@@ -99,7 +80,11 @@ class LanguageUk extends Language {
 	 */
 	function commafy( $_ ) {
 		if ( !preg_match( '/^\-?\d{1,4}(\.\d+)?$/', $_ ) ) {
-			return strrev( (string)preg_replace( '/(\d{3})(?=\d)(?!\d*\.)/', '$1,', strrev( $_ ) ) );
+			return strrev( (string)preg_replace(
+				'/(\d{3})(?=\d)(?!\d*\.)/',
+				'$1,',
+				strrev( $_ )
+			) );
 		} else {
 			return $_;
 		}
diff --git a/resources/src/mediawiki.language/languages/uk.js b/resources/src/mediawiki.language/languages/uk.js
index 2e17808a4e..f33144306a 100644
--- a/resources/src/mediawiki.language/languages/uk.js
+++ b/resources/src/mediawiki.language/languages/uk.js
@@ -10,14 +10,12 @@ mediaWiki.language.convertGrammar = function ( word, form ) {
 	switch ( form ) {
 		case 'genitive': // родовий відмінок
 			if ( word.slice( -4 ) !== 'вікі' && word.slice( -4 ) !== 'Вікі' ) {
-				if ( word.slice( -1 ) === 'ь' ) {
-					word = word.slice( 0, -1 ) + 'я';
-				} else if ( word.slice( -2 ) === 'ія' ) {
+				if ( word.slice( -2 ) === 'ія' ) {
 					word = word.slice( 0, -2 ) + 'ії';
 				} else if ( word.slice( -2 ) === 'ка' ) {
 					word = word.slice( 0, -2 ) + 'ки';
 				} else if ( word.slice( -2 ) === 'ти' ) {
-					word = word.slice( 0, -2 ) + 'тей';
+					word = word.slice( 0, -2 ) + 'т';
 				} else if ( word.slice( -2 ) === 'ди' ) {
 					word = word.slice( 0, -2 ) + 'дів';
 				} else if ( word.slice( -3 ) === 'ник' ) {
diff --git a/tests/phpunit/languages/classes/LanguageUkTest.php b/tests/phpunit/languages/classes/LanguageUkTest.php
index bd3e5603cd..5912df68a3 100644
--- a/tests/phpunit/languages/classes/LanguageUkTest.php
+++ b/tests/phpunit/languages/classes/LanguageUkTest.php
@@ -90,6 +90,16 @@ class LanguageUkTest extends LanguageClassesTestCase {
 				'Віківиди',
 				'genitive',
 			),
+			array(
+				'Вікіцитат',
+				'Вікіцитати',
+				'genitive',
+			),
+			array(
+				'Вікіпідручника',
+				'Вікіпідручник',
+				'genitive',
+			),
 			array(
 				'Вікіпедію',
 				'Вікіпедія',
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
index fcbcada4aa..b0ecd4e135 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
@@ -353,12 +353,6 @@
 		],
 
 		uk: [
-			{
-				word: 'тесть',
-				grammarForm: 'genitive',
-				expected: 'тестя',
-				description: 'Grammar test for genitive case'
-			},
 			{
 				word: 'Вікіпедія',
 				grammarForm: 'genitive',
@@ -366,27 +360,21 @@
 				description: 'Grammar test for genitive case'
 			},
 			{
-				word: 'установка',
-				grammarForm: 'genitive',
-				expected: 'установки',
-				description: 'Grammar test for genitive case'
-			},
-			{
-				word: 'похоти',
+				word: 'Віківиди',
 				grammarForm: 'genitive',
-				expected: 'похотей',
+				expected: 'Віківидів',
 				description: 'Grammar test for genitive case'
 			},
 			{
-				word: 'Віківиди',
+				word: 'Вікіцитати',
 				grammarForm: 'genitive',
-				expected: 'Віківидів',
+				expected: 'Вікіцитат',
 				description: 'Grammar test for genitive case'
 			},
 			{
-				word: 'песчаник',
+				word: 'Вікіпідручник',
 				grammarForm: 'genitive',
-				expected: 'песчаника',
+				expected: 'Вікіпідручника',
 				description: 'Grammar test for genitive case'
 			},
 			{