fix error, requirements

prod
Dmitriy Shesterkin 9 years ago
parent 4c8fdf35a6
commit 8d03c4a64f
  1. 7
      Makefile
  2. 3
      requirements/base.txt
  3. 1
      requirements/local.txt
  4. 2
      src/customer/models.py

@ -1,4 +1,4 @@
.PHONY: all help build virtualenv requirements-local loaddata run migrate shell collectstatic clean worker qa update-develop upgrade-develop
.PHONY: all help build virtualenv requirements-local loaddata run migrate shell collectstatic clean worker qa flush update-develop upgrade-develop
# target: all - Default target. Does nothing.
all:
@ -78,6 +78,11 @@ flower:
qa:
pytest
# target: flush - clean database
flush:
python3 manage.py flush
# target: update-develop - Run push change in repo develop branch and deploy for develop server with restart only web container
update-develop:
git push origin develop

@ -72,5 +72,8 @@ redis==2.10.5
trans==2.1.0
python-decouple==3.0
numpy==1.13.0
django-cleanup==1.0.0
flower==0.9.2
raven==6.1.0
django-debug-toolbar==1.5
sqlparse==0.2.3

@ -1,6 +1,5 @@
-r base.txt
ipython==2.1.0
django-debug-toolbar==1.5
sqlparse==0.2.3
django-eml-email-backend==0.1
ipdb==0.10.3

@ -644,7 +644,7 @@ class License(models.Model):
f'{left.days} {numeral.choose_plural(left.days, "день, дня, дней")}'
else:
left_str = f'{left.days} {numeral.choose_plural(left.days, "день, дня, дней")}'
remain_str = numeral.choose_plural(left.days, "остался, осталось, осталось")
remain_str = numeral.choose_plural(left.days, "остался, осталось, осталось")
return f'Лицензия активна, {remain_str} {left_str}'
elif self.status == 3:
return 'Время истекло'

Loading…
Cancel
Save