diff --git a/asuzr/common.py b/asuzr/common.py index f29e54b..d1d14ba 100644 --- a/asuzr/common.py +++ b/asuzr/common.py @@ -16,8 +16,8 @@ class custom_date(date): @property def date_dd_mm_yy(self): - return self.strftime("%d/%m/%Y") + return self.strftime('%d/%m/%Y') @property def is_weekend(self): - return self.weekday() >= 5 \ No newline at end of file + return self.weekday() >= 5 diff --git a/asuzr/models.py b/asuzr/models.py index bd96baa..032bad1 100644 --- a/asuzr/models.py +++ b/asuzr/models.py @@ -4,6 +4,7 @@ from django.db import models from django.contrib.auth.models import User from datetime import date, timedelta +from django.utils import dateformat from django.contrib.auth.signals import user_logged_in, user_logged_out, user_login_failed from django.contrib.admin.models import LogEntry @@ -76,7 +77,7 @@ class Order(models.Model): cost_items = models.ManyToManyField(CostItem, through='OrderCosts', related_name='+', null=True, blank=True) #статьи затрат def __unicode__(self): - return ', '.join((self.date.strftime('%d %b %Y'), self.product.name, self.address)) + return ', '.join((dateformat.format(self.date, 'd E Y'), self.product.name, self.address)) @property def date_dmy(self): diff --git a/asuzr/views.py b/asuzr/views.py index e07a6e9..7581255 100644 --- a/asuzr/views.py +++ b/asuzr/views.py @@ -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 @@ -120,7 +121,7 @@ def visit_view(request): order_form = OrderForm() - 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, @@ -215,7 +216,7 @@ def sketches(request, order_id): return render(request, 'asuzr/sketches.html', { 'order_id': order_id, 'sketch_list': sketch_list, - 'title': 'Эскизы заказа: %s' % curr_order}) + 'title': u'Эскизы заказа %s' % curr_order}) def add_order(request): new_order = Order(date=date.today(), designer = request.user) @@ -236,7 +237,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}) @@ -277,7 +278,6 @@ def prod_plan_view(request): days = [sdate + timedelta(days=i) for i in range(0,7)] week_days = {i.weekday(): {'date': custom_date(i.year,i.month,i.day)} for i in days} - print week_days prodplan_list = ProdPlan.objects.filter(start_date__range = (sdate,edate)) for prodplan in prodplan_list: diff --git a/record/settings.py b/record/settings.py index 796da90..e13cd80 100644 --- a/record/settings.py +++ b/record/settings.py @@ -71,7 +71,7 @@ DATABASES = { # Internationalization # https://docs.djangoproject.com/en/1.6/topics/i18n/ -LANGUAGE_CODE = 'ru-ru' +LANGUAGE_CODE = 'ru-RU' TIME_ZONE = 'Asia/Yekaterinburg' @@ -106,3 +106,4 @@ INPLACEEDIT_SUCCESS_TEXT = u'Сохранено' from django.utils.safestring import mark_safe INPLACEEDIT_EDIT_EMPTY_VALUE = mark_safe(u'
Редактировать
') +ADAPTOR_INPLACEEDIT_EDIT = 'inplaceeditform.perms.AdminDjangoPermEditInline'