Skip to content

Commit

Permalink
fix #118 in Russian
Browse files Browse the repository at this point in the history
  • Loading branch information
wapmorgan committed Jul 10, 2022
1 parent 21297f9 commit ab3773b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 3 additions & 1 deletion src/Russian/RussianLanguage.php
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,10 @@ public static function verb($verb, $gender)
public static function in($word)
{
$normalized = trim(S::lower($word));
if (in_array(S::slice($normalized, 0, 1), ['в', 'ф'], true))
if (in_array(S::slice($normalized, 0, 1), ['в', 'ф'], true)
&& static::isConsonant(S::slice($normalized, 1, 2))) {
return 'во '.$word;
}
return 'в '.$word;
}

Expand Down
4 changes: 3 additions & 1 deletion tests/Russian/RussianLanguageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ public function verbsProvider()
public function testIn()
{
$this->assertEquals('в море', RussianLanguage::in('море'));
$this->assertEquals('во Владивостоке', RussianLanguage::in('Владивостоке'));
$this->assertEquals('в фильме', RussianLanguage::in('фильме'));
$this->assertEquals('во флаконе', RussianLanguage::in('флаконе'));
$this->assertEquals('во Владивостоке', RussianLanguage::in('Владивостоке'));
}

public function testWith()
Expand Down
2 changes: 1 addition & 1 deletion tests/Russian/TimeSpellerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function intervalsProvider()
['P1Y5M10D', TimeSpeller::SEPARATE, '1 год, 5 месяцев и 10 дней'],
['P10Y1MT5H', TimeSpeller::DIRECTION, '10 лет 1 месяц 5 часов назад'],
['P3DT1H2M', TimeSpeller::SEPARATE | TimeSpeller::DIRECTION, '3 дня, 1 час и 2 минуты назад'],
['PT1M1S', TimeSpeller::SEPARATE | TimeSpeller::DIRECTION, '1 минуту и 1 секунду назад'],
['PT1M1S', TimeSpeller::SEPARATE | TimeSpeller::DIRECTION, '1 минута и 1 секунда назад'],
['P10MT40M30S', TimeSpeller::SEPARATE, '10 месяцев, 40 минут и 30 секунд'],
];
}
Expand Down

0 comments on commit ab3773b

Please sign in to comment.