From 4274c8968d5cc5b6b30d441575fefc5031af7512 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Mon, 22 Apr 2019 23:45:52 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B1=D0=B0=D0=BD=D0=BD=D0=B5=D1=80=20=D1=81?=
 =?UTF-8?q?=20=D0=BE=D0=B1=D1=80=D0=B0=D1=82=D0=BD=D1=8B=D0=BC=20=D0=BE?=
 =?UTF-8?q?=D1=82=D1=81=D1=87=D0=B5=D1=82=D0=BE=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/v1/serializers/content.py           |  3 +++
 web/src/components/blocks/Countdown.vue | 10 ++++++----
 web/src/js/utils.js                     |  7 +++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/api/v1/serializers/content.py b/api/v1/serializers/content.py
index 2632736d..f3553867 100644
--- a/api/v1/serializers/content.py
+++ b/api/v1/serializers/content.py
@@ -36,6 +36,9 @@ class BannerSerializer(serializers.ModelSerializer):
             'url',
             'image',
             'use',
+            'color',
+            'stretch_image',
+            'future_date',
             'created_at',
             'update_at',
         )
diff --git a/web/src/components/blocks/Countdown.vue b/web/src/components/blocks/Countdown.vue
index 788958a2..6e614bb7 100644
--- a/web/src/components/blocks/Countdown.vue
+++ b/web/src/components/blocks/Countdown.vue
@@ -6,7 +6,7 @@
         <div>{{ days[1] }}</div>
       </div>
       <div class="banner__countdown-descr">
-        Дней
+        {{ rupluralize(+days, ['День', 'Дня', 'Дней'], false) }}
       </div>
     </div>
     <div class="banner__countdown-delim"></div>
@@ -17,7 +17,7 @@
         <div>{{ hours[1] }}</div>
       </div>
       <div class="banner__countdown-descr">
-        Часов
+        {{ rupluralize(+hours, ['Час', 'Часа', 'Часов'], false) }}
       </div>
     </div>
     <div class="banner__countdown-delim">:</div>
@@ -28,7 +28,7 @@
         <div>{{ minutes[1] }}</div>
       </div>
       <div class="banner__countdown-descr">
-        Минут
+        {{ rupluralize(+minutes, ['Минута', 'Минуты', 'Минут'], false) }}
       </div>
     </div>
     <div class="banner__countdown-delim">:</div>
@@ -39,7 +39,7 @@
         <div>{{ seconds[1] }}</div>
       </div>
       <div class="banner__countdown-descr">
-        Секунд
+        {{ rupluralize(+seconds, ['Секунда', 'Секунды', 'Секунд'], false) }}
       </div>
     </div>
   </div>
@@ -47,6 +47,7 @@
 
 <script>
     import moment from 'moment';
+    import {rupluralize} from '../../js/utils'
 
     export default {
         name: "Countdown",
@@ -58,6 +59,7 @@
             minutes: '00',
             seconds: '00',
             i: 0,
+            rupluralize: rupluralize,
         }),
 
         beforeDestroy(){
diff --git a/web/src/js/utils.js b/web/src/js/utils.js
index 0cc69907..9d822ef3 100644
--- a/web/src/js/utils.js
+++ b/web/src/js/utils.js
@@ -1,7 +1,10 @@
-export const rupluralize = (value, args) => {
+export const rupluralize = (value, args, addValue=true) => {
     let digit = Math.trunc(value) + '';
     digit = digit[digit.length - 1];
-    return value + ' ' + args[digit == '1' ? 0 : ('234'.search(digit) > -1 ? 1 : 2)];
+    return (addValue ? value + ' ' : '') +
+      args[(+value > 10 && +value < 20)
+        ? 2
+        : (digit == '1' ? 0 : ('234'.search(digit) > -1 ? 1 : 2))];
 }
 
 export const loadScript = (url, onload) => {