From ebeea963331d9de2c6757946ffac649bd9f22cc9 Mon Sep 17 00:00:00 2001 From: bashmak Date: Fri, 2 Jun 2017 15:39:24 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D1=8F=D0=BB=20=D0=B0=D1=82=D0=BE=D0=BC=D0=B0=D1=80=D0=BD?= =?UTF-8?q?=D1=8B=D1=85=20=D1=82=D1=80=D0=B0=D0=BD=D0=B7=D0=B0=D0=BA=D1=86?= =?UTF-8?q?=D0=B8=D0=B8=20=D0=BA=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D1=80?= =?UTF-8?q?=D1=87=D0=B5=D1=81=D0=BA=D0=B8=D0=BC=20=D0=BF=D1=80=D0=B5=D0=B4?= =?UTF-8?q?=D1=81=D1=82=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clientsideapp/locale/ru/LC_MESSAGES/django.po | 38 ++++++++++++++++++ clientsideapp/views.py | 39 +++++++++++-------- 2 files changed, 61 insertions(+), 16 deletions(-) diff --git a/clientsideapp/locale/ru/LC_MESSAGES/django.po b/clientsideapp/locale/ru/LC_MESSAGES/django.po index 6b08e8a..d418db2 100644 --- a/clientsideapp/locale/ru/LC_MESSAGES/django.po +++ b/clientsideapp/locale/ru/LC_MESSAGES/django.po @@ -162,3 +162,41 @@ msgstr "Комментарий" #: clientsideapp/templates/clientsideapp/pays.html:25 msgid "You have not spent payments" msgstr "У вас нет проведённых платежей" + +msgid "Buy the service via user side, service '%s'" +msgstr "Покупка тарифного плана через личный кабинет, тариф '%s'" + +msgid "" +"You are subscribed on new service. " +"That will enable service when your current service has expired." + +msgstr "" +"Вы подписались на новую услугу. Она встала на очередь подключений. " +"Когда закончится ваша текущая услуга, то включится эта" + +msgid "Service '%s' has been finished" +msgstr "Услуга '%s' успешно завершена" + +msgid "The service '%s' wan successfully activated" +msgstr "Услуга '%s' успешно активирована" + +msgid "Early terminated service '%s' via client side" +msgstr "Досрочное завершение услуги '%s' из личного кабинета" + +msgid "Act is not confirmed" +msgstr "Действие не подтверждено" + +msgid "Temporary network bug" +msgstr "Временные неполадки в сети" + +msgid "You has been successfully unsubscribed from service, '%s'" +msgstr "Вы успешно отписались от услуги, '%s'" + +msgid "The service was not found" +msgstr "Указанная подписка на услугу не найдена" + +msgid "Are you not sure that you want buy the service?" +msgstr "Вы не уверены что хотите оплатить долг?" + +msgid "Your account have not enough money" +msgstr "Недостаточно средств на счету" diff --git a/clientsideapp/views.py b/clientsideapp/views.py index fb3d785..5db6210 100644 --- a/clientsideapp/views.py +++ b/clientsideapp/views.py @@ -4,6 +4,8 @@ from django.contrib.gis.shortcuts import render_to_text from django.shortcuts import render, get_object_or_404, redirect from django.contrib import messages from django.utils import timezone +from django.db.transaction import atomic +from django.utils.translation import ugettext_lazy as _ from abonapp.models import AbonLog, AbonTariff, InvoiceForPayment, Abon from tariff_app.models import Tariff @@ -41,16 +43,17 @@ def services(request): @login_required +@atomic def buy_service(request, srv_id): abon = get_object_or_404(Abon, pk=request.user.pk) service = get_object_or_404(Tariff, pk=srv_id) try: current_service = abon.active_tariff() if request.method == 'POST': - abon.pick_tariff(service, request.user, 'Покупка тарифного плана через личный кабинет, тариф "%s"' - % service) - messages.success(request, 'Вы подписались на новую услугу. Она встала на очередь подключений. ' - 'Когда закончится ваша текущая услуга, то включится эта') + abon.pick_tariff(service, request.user, _("Buy the service via user side, service '%s'") + % service) + messages.success(request, _('You are subscribed on new service. ' + 'That will enable service when your current service has expired.')) else: return render_to_text('clientsideapp/modal_service_buy.html', { 'service': service, @@ -64,6 +67,7 @@ def buy_service(request, srv_id): @login_required +@atomic def complete_service(request, srv_id): abtar = get_object_or_404(AbonTariff, id=srv_id) service = abtar.tariff @@ -75,15 +79,15 @@ def complete_service(request, srv_id): if finish_confirm == 'yes': # удаляем запись о текущей услуге. abtar.delete() - messages.success(request, 'Услуга "%s" успешно завершена' % service.title) + messages.success(request, _("Service '%s' has been finished") % service.title) AbonLog.objects.create( abon=abtar.abon, amount=0.0, author=abtar.abon, - comment='Досрочное завершение услуги "%s" из личного кабинета' % service.title + comment=_("Early terminated service '%s' via client side") % service.title ) else: - messages.error(request, 'Действие не подтверждено') + messages.error(request, _('Act is not confirmed')) else: time_use = RuTimedelta(timezone.now() - abtar.time_start) return render_to_text('clientsideapp/modal_complete_service.html', { @@ -96,11 +100,12 @@ def complete_service(request, srv_id): except NasFailedResult as e: messages.error(request, e) except NasNetworkError: - messages.error(request, 'Временные неполадки') + messages.error(request, _('Temporary network bug')) return redirect('client_side:services') @login_required +@atomic def unsubscribe_service(request, srv_id): abtar = get_object_or_404(AbonTariff, id=srv_id) service = abtar.tariff @@ -109,24 +114,25 @@ def unsubscribe_service(request, srv_id): # досрочно завершаем услугу if request.POST.get('finish_confirm') == 'yes': AbonTariff.objects.get(pk=srv_id).delete() - messages.success(request, 'Вы успешно отписались от услуги, "%s"' % service.title) + messages.success(request, _("You has been successfully unsubscribed from service, '%s'") % service.title) else: - messages.error(request, 'Действие не подтверждено') + messages.error(request, _('Act is not confirmed')) else: return render_to_text('clientsideapp/modal_unsubscribe_service.html', { 'abtar': abtar, 'service': service }, request=request) except AbonTariff.DoesNotExist: - messages.error(request, 'Указанная подписка на услугу не найдена') + messages.error(request, _('The service was not found')) except NasFailedResult as e: messages.error(request, e) except NasNetworkError: - messages.error(request, 'Временные неполадки') + messages.error(request, _('Temporary network bug')) return redirect('client_side:services') @login_required +@atomic def activate_service(request, srv_id): abtar = get_object_or_404(AbonTariff, id=srv_id) service = abtar.tariff @@ -136,9 +142,9 @@ def activate_service(request, srv_id): # активируем услугу if request.POST.get('finish_confirm') == 'yes': abtar.activate(request.user) - messages.success(request, 'Услуга "%s" успешно активирована' % service.title) + messages.success(request, _("The service '%s' wan successfully activated") % service.title) else: - messages.error(request, 'Запрос не подтверждён') + messages.error(request, _('Act is not confirmed')) return redirect('client_side:services') except NasFailedResult as e: messages.error(request, e) @@ -164,6 +170,7 @@ def debts_list(request): @login_required +@atomic def debt_buy(request, d_id): debt = get_object_or_404(InvoiceForPayment, id=d_id) abon = get_object_or_404(Abon, id=request.user.id) @@ -171,9 +178,9 @@ def debt_buy(request, d_id): try: sure = request.POST.get('sure') if sure != 'on': - raise LogicError('Вы не уверены что хотите оплатить долг?') + raise LogicError(_("Are you not sure that you want buy the service?")) if abon.ballance < debt.amount: - raise LogicError('Не достаточно средств на счету') + raise LogicError(_('Your account have not enough money')) abon.make_pay(request.user, debt.amount) debt.set_ok()