diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:12:12 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:12:12 -0400 |
commit | c9aa36da061816dee256a979c2ff8d2ee41824d9 (patch) | |
tree | 29f7002b80ee984b488bd047dbbd80b36bf892e9 /languages/classes/LanguageRu.php | |
parent | b4274e0e33eafb5e9ead9d949ebf031a9fb8363b (diff) | |
parent | d1ba966140d7a60cd5ae4e8667ceb27c1a138592 (diff) |
Merge branch 'archwiki'
# Conflicts:
# skins/ArchLinux.php
# skins/ArchLinux/archlogo.gif
Diffstat (limited to 'languages/classes/LanguageRu.php')
-rw-r--r-- | languages/classes/LanguageRu.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/languages/classes/LanguageRu.php b/languages/classes/LanguageRu.php index d3ac1d22..226e313e 100644 --- a/languages/classes/LanguageRu.php +++ b/languages/classes/LanguageRu.php @@ -34,8 +34,8 @@ class LanguageRu extends Language { * Convert from the nominative form of a noun to some other case * Invoked with {{grammar:case|word}} * - * @param $word string - * @param $case string + * @param string $word + * @param string $case * @return string */ function convertGrammar( $word, $case ) { @@ -65,6 +65,8 @@ class LanguageRu extends Language { $word = join( '', array_slice( $chars[0], 0, -2 ) ) . 'тей'; } elseif ( join( '', array_slice( $chars[0], -2 ) ) === 'ды' ) { $word = join( '', array_slice( $chars[0], 0, -2 ) ) . 'дов'; + } elseif ( join( '', array_slice( $chars[0], -1 ) ) === 'д' ) { + $word = join( '', array_slice( $chars[0], 0, -1 ) ) . 'да'; } elseif ( join( '', array_slice( $chars[0], -3 ) ) === 'ник' ) { $word = join( '', array_slice( $chars[0], 0, -3 ) ) . 'ника'; } elseif ( join( '', array_slice( $chars[0], -3 ) ) === 'ные' ) { @@ -91,6 +93,8 @@ class LanguageRu extends Language { $word = join( '', array_slice( $chars[0], 0, -2 ) ) . 'тях'; } elseif ( join( '', array_slice( $chars[0], -2 ) ) === 'ды' ) { $word = join( '', array_slice( $chars[0], 0, -2 ) ) . 'дах'; + } elseif ( join( '', array_slice( $chars[0], -1 ) ) === 'д' ) { + $word = join( '', array_slice( $chars[0], 0, -1 ) ) . 'де'; } elseif ( join( '', array_slice( $chars[0], -3 ) ) === 'ник' ) { $word = join( '', array_slice( $chars[0], 0, -3 ) ) . 'нике'; } elseif ( join( '', array_slice( $chars[0], -3 ) ) === 'ные' ) { @@ -108,7 +112,7 @@ class LanguageRu extends Language { * See manual of style at http://ru.wikipedia.org/wiki/Википедия:Оформление_статей * So "1 234 567", "12 345" but "1234" * - * @param $_ string + * @param string $_ * * @return string */ |