Fix value for monthly quantity if unit type is hours (#200)

hiqdev · Feb 12, 2021 · 673801f · 673801f
1 parent 88a7b70
commit 673801f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/logic/bill/MonthlyQuantity.php b/src/logic/bill/MonthlyQuantity.php
@@ -31,9 +31,12 @@ class MonthlyQuantity extends DefaultQuantityFormatter implements ContextAwareQu
      */
     public function format(): string
     {
-        $text = Yii::t('hipanel:finance', '{quantity, plural, one{# day} other{# days}}', ['quantity' => $this->getClientValue()]);
+        $unitName = $this->getQuantity()->getUnit()->getName();
+        if ($unitName === 'hour') {
+            return Yii::t('hipanel:finance', '{quantity, plural, one{# hour} few{# hours} other{# hours}}', ['quantity' => $this->getQuantity()->getQuantity()]);
+        }
 
-        return $text;
+        return Yii::t('hipanel:finance', '{quantity, plural, one{# day} other{# days}}', ['quantity' => $this->getClientValue()]);
     }
 
     /**

diff --git a/src/messages/ru/hipanel:finance.php b/src/messages/ru/hipanel:finance.php
@@ -63,6 +63,7 @@
     '{quantity, plural, one{# day} other{# days}}' => '{quantity, plural, one{# день} few{# дня} other{# дней}}',
     '{quantity, plural, one{# year} other{# years}}' => '{quantity, plural, one{# год} few{# года} other{# лет}}',
     '{quantity, time, HH:mm} hour(s)' => '{quantity, time, HH:mm} час(ов)',
+    '{quantity, plural, one{# hour} few{# hours} other{# hours}}' => '{quantity, plural, one{# час} few{# часа} other{# часов}}',
     '{quantity} IP' => '{quantity} IP',
     'Held payments' => 'Ожидающие платежи',
     'Provided services' => 'Предоставленные услуги',