Пофиксил локаль

This commit is contained in:
2015-07-16 16:43:20 +05:00
parent 1b47a05d81
commit 7d8383f737
4 changed files with 10 additions and 16 deletions

View File

@@ -6,6 +6,7 @@ from django.template import RequestContext, Context, loader
from django.contrib.admin.models import LogEntry
from asuzr.models import *
from datetime import datetime, date, timedelta
from django.utils import dateformat
import calendar
from django.db.models import Count, Sum
from asuzr.common import custom_date
@@ -96,7 +97,7 @@ def get_day_orders_table(date, prefix):
orders = Order.objects.filter(date = date)
summaries = orders.aggregate(Sum('price'), Sum('paid'))
table = DayOrdersTable(orders, prefix = prefix)
table.verbose_name = 'Заказы на %s' % date.strftime('%d %B %Y г')
table.verbose_name = u'Заказы на %s' % dateformat.format(date, 'd E Y')
table.set_summary(summaries['price__sum'] or 0, summaries['paid__sum'] or 0)
return table
@@ -118,7 +119,7 @@ def visit_view(request):
orders_table = get_day_orders_table(curr_date, 'orders-')
RequestConfig(request).configure(orders_table)
title = 'Таблица посещаемости на %s' % curr_date.strftime('%B %Y г')
title = u'Таблица посещаемости на %s' % dateformat.format(curr_date, 'F Y')
return render(request, 'asuzr/table2.html', {
'table1': attendance_table,
'table2': orders_table,
@@ -212,7 +213,7 @@ def sketches(request, order_id):
return render(request, 'asuzr/sketches.html', {
'order_id': order_id,
'table': table,
'title': 'Эскизы заказа %s' % curr_order})
'title': u'Эскизы заказа %s' % curr_order})
def delete_sketch(request):
pk = request.GET.get('pk', -1)
@@ -227,7 +228,7 @@ def orders(request, archive):
is_archive = (archive == '1')
Table = ArchiveOrdersTable if is_archive else OrdersTable
table = Table(Order.objects.filter(is_done = is_archive))
title = 'Архивная таблица заказов' if is_archive else 'Таблица выхода заказов'
title = u'Архивная таблица заказов' if is_archive else u'Таблица выхода заказов'
RequestConfig(request).configure(table)
return render(request, 'asuzr/table.html', {'table': table, 'title': title})