From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 28 Sep 2015 13:41:33 +0000 (+0000)
Subject: Merge "Add new grammar forms for language names in Russian"
X-Git-Tag: 1.31.0-rc.0~9715
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=88081365b3604e51922151bb2de3185f6f8b5896;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Add new grammar forms for language names in Russian"
---

88081365b3604e51922151bb2de3185f6f8b5896
diff --combined tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
index b0ecd4e135,4ecd480033..e4c3851593
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
@@@ -99,7 -99,7 +99,7 @@@
  				word: 'Wikipedia',
  				grammarForm: 'תחילית',
  				expected: 'Ö¾Wikipedia',
 -				description: 'GAdd a hyphen (maqaf) before non-Hebrew letters'
 +				description: 'Add a hyphen (maqaf) before non-Hebrew letters'
  			},
  			{
  				word: '1995',
@@@ -307,6 -307,84 +307,84 @@@
  				grammarForm: 'prepositional',
  				expected: 'данных',
  				description: 'Grammar test for prepositional case, данные -> данных'
+ 			},
+ 			{
+ 				word: 'русский',
+ 				grammarForm: 'languagegen',
+ 				expected: 'русского',
+ 				description: 'Grammar test for languagegen case, русский -> русского'
+ 			},
+ 			{
+ 				word: 'немецкий',
+ 				grammarForm: 'languagegen',
+ 				expected: 'немецкого',
+ 				description: 'Grammar test for languagegen case, немецкий -> немецкого'
+ 			},
+ 			{
+ 				word: 'иврит',
+ 				grammarForm: 'languagegen',
+ 				expected: 'иврита',
+ 				description: 'Grammar test for languagegen case, иврит -> иврита'
+ 			},
+ 			{
+ 				word: 'эсперанто',
+ 				grammarForm: 'languagegen',
+ 				expected: 'эсперанто',
+ 				description: 'Grammar test for languagegen case, эсперанто -> эсперанто'
+ 			},
+ 			{
+ 				word: 'русский',
+ 				grammarForm: 'languageprep',
+ 				expected: 'русском',
+ 				description: 'Grammar test for languageprep case, русский -> русском'
+ 			},
+ 			{
+ 				word: 'немецкий',
+ 				grammarForm: 'languageprep',
+ 				expected: 'немецком',
+ 				description: 'Grammar test for languageprep case, немецкий -> немецком'
+ 			},
+ 			{
+ 				word: 'идиш',
+ 				grammarForm: 'languageprep',
+ 				expected: 'идише',
+ 				description: 'Grammar test for languageprep case, идиш -> идише'
+ 			},
+ 			{
+ 				word: 'эсперанто',
+ 				grammarForm: 'languageprep',
+ 				expected: 'эсперанто',
+ 				description: 'Grammar test for languageprep case, эсперанто -> эсперанто'
+ 			},
+ 			{
+ 				word: 'русский',
+ 				grammarForm: 'languageadverb',
+ 				expected: 'по-русски',
+ 				description: 'Grammar test for languageadverb case, русский -> по-русски'
+ 			},
+ 			{
+ 				word: 'немецкий',
+ 				grammarForm: 'languageadverb',
+ 				expected: 'по-немецки',
+ 				description: 'Grammar test for languageadverb case, немецкий -> по-немецки'
+ 			},
+ 			{
+ 				word: 'иврит',
+ 				grammarForm: 'languageadverb',
+ 				expected: 'на иврите',
+ 				description: 'Grammar test for languageadverb case, иврит -> на иврите'
+ 			},
+ 			{
+ 				word: 'эсперанто',
+ 				grammarForm: 'languageadverb',
+ 				expected: 'на эсперанто',
+ 				description: 'Grammar test for languageadverb case, эсперанто -> на эсперанто'
+ 			},
+ 			{
+ 				word: 'гуарани',
+ 				grammarForm: 'languageadverb',
+ 				expected: 'на языке гуарани',
+ 				description: 'Grammar test for languageadverb case, гуарани -> на языке гуарани'
  			}
  		],
  
@@@ -353,6 -431,12 +431,6 @@@
  		],
  
  		uk: [
 -			{
 -				word: 'тесть',
 -				grammarForm: 'genitive',
 -				expected: 'тестя',
 -				description: 'Grammar test for genitive case'
 -			},
  			{
  				word: 'Вікіпедія',
  				grammarForm: 'genitive',
@@@ -360,21 -444,27 +438,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'
  			},
  			{