diff --git a/docker/Makefile b/docker/Makefile index d726617c..2d250bf4 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -98,6 +98,8 @@ deploy-dev: # update internationalization messages i18n: + # @todo #934:15m Wait user approval for `make i18n` + # See the parent issue for details $(dc) run --rm app bash -c "\ python manage.py makemessages --ignore 'venv/**' \ && python manage.py compilemessages -l ru \ diff --git a/front/js/components/admin.es6 b/front/js/components/admin.es6 index c3ba903f..d76dbbb6 100644 --- a/front/js/components/admin.es6 +++ b/front/js/components/admin.es6 @@ -1,8 +1,7 @@ const customColModels = [ { name: 'in_pack', - // @todo #858:15m Localize Product.in_pack field - label: 'in pack', + label: 'в упаковке', editable: true, editoptions: { type: 'number', diff --git a/shopelectro/admin.py b/shopelectro/admin.py index fb0831f9..cee888d6 100644 --- a/shopelectro/admin.py +++ b/shopelectro/admin.py @@ -287,6 +287,11 @@ def id_(self, obj): return obj.fake_order_number +class MatrixBlockAdmin(mixins.PermissionsControl): + + list_display = ['category', 'block_size'] + + se_admin = SEAdminSite(name='se_admin') se_admin.register(CustomPage, models.CustomPageAdmin) se_admin.register(FlatPage, models.FlatPageAdmin) @@ -298,5 +303,6 @@ def id_(self, obj): se_admin.register(se_models.ProductFeedback, ProductFeedbackPageAdmin) se_admin.register(se_models.TagGroup, TagGroupAdmin) se_admin.register(se_models.Tag, TagAdmin) +se_admin.register(se_models.MatrixBlock, MatrixBlockAdmin) se_admin.register(Redirect) diff --git a/shopelectro/locale/ru/LC_MESSAGES/django.mo b/shopelectro/locale/ru/LC_MESSAGES/django.mo index 0684cf2c..2da3c131 100644 Binary files a/shopelectro/locale/ru/LC_MESSAGES/django.mo and b/shopelectro/locale/ru/LC_MESSAGES/django.mo differ diff --git a/shopelectro/locale/ru/LC_MESSAGES/django.po b/shopelectro/locale/ru/LC_MESSAGES/django.po index 9d8195d5..d4a2126a 100644 --- a/shopelectro/locale/ru/LC_MESSAGES/django.po +++ b/shopelectro/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-03 10:00+0000\n" +"POT-Creation-Date: 2019-07-05 12:54+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,88 +20,124 @@ msgstr "" "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n" "%100>=11 && n%100<=14)? 2 : 3);\n" -#: shopelectro/admin.py:25 +#: shopelectro/admin.py:45 msgid "has tags" msgstr "По тегам" -#: shopelectro/admin.py:30 +#: shopelectro/admin.py:50 msgid "Has tags" msgstr "С тегами" -#: shopelectro/admin.py:31 +#: shopelectro/admin.py:51 msgid "Has no tags" msgstr "Без тегов" -#: shopelectro/admin.py:47 +#: shopelectro/admin.py:65 msgid "has category" msgstr "По категориями" -#: shopelectro/admin.py:52 +#: shopelectro/admin.py:70 msgid "Has category" msgstr "С категориями" -#: shopelectro/admin.py:53 +#: shopelectro/admin.py:71 msgid "Has no category" msgstr "Без категорий" -#: shopelectro/admin.py:146 +#: shopelectro/admin.py:178 +#, fuzzy +#| msgid "vendor_code" +msgid "Vendor code" +msgstr "артикул" + +#: shopelectro/admin.py:184 +msgid "Price" +msgstr "Цена" + +#: shopelectro/admin.py:210 msgid "Link" msgstr "Ссылка" -#: shopelectro/admin.py:189 +#: shopelectro/admin.py:253 msgid "Group" msgstr "Группа тегов" +#: shopelectro/admin.py:274 +msgid "Sends email notifications about placed orders" +msgstr "Отправить письмо" + #: shopelectro/models.py:81 +msgid "Matrix block" +msgstr "Раздел на странице каталога" + +#: shopelectro/models.py:82 +msgid "Matrix blocks" +msgstr "Разделы на странице каталога" + +#: shopelectro/models.py:91 shopelectro/models.py:132 msgid "category" msgstr "категория" -#: shopelectro/models.py:88 +#: shopelectro/models.py:98 +msgid "block size" +msgstr "размер раздела" + +#: shopelectro/models.py:139 msgid "tags" msgstr "теги" -#: shopelectro/models.py:91 +#: shopelectro/models.py:149 msgid "vendor_code" msgstr "артикул" -#: shopelectro/models.py:93 +#: shopelectro/models.py:152 msgid "purchase_price" msgstr "закупочная цена" -#: shopelectro/models.py:94 +#: shopelectro/models.py:154 msgid "wholesale_small" msgstr "мелкий опт" -#: shopelectro/models.py:95 +#: shopelectro/models.py:156 msgid "wholesale_medium" msgstr "средний опт" -#: shopelectro/models.py:96 +#: shopelectro/models.py:158 msgid "wholesale_large" msgstr "крупный опт" -#: shopelectro/models.py:118 +#: shopelectro/models.py:162 +msgid "in pack" +msgstr "в упаковке" + +#: shopelectro/models.py:198 msgid "date" msgstr "дата" -#: shopelectro/models.py:119 shopelectro/models.py:167 -#: shopelectro/models.py:206 +#: shopelectro/models.py:200 msgid "name" msgstr "название" -#: shopelectro/models.py:120 +#: shopelectro/models.py:202 msgid "rating" msgstr "рейтинг" -#: shopelectro/models.py:121 +#: shopelectro/models.py:204 msgid "dignities" msgstr "достоинства" -#: shopelectro/models.py:122 shopelectro/models.py:123 +#: shopelectro/models.py:206 shopelectro/models.py:208 msgid "limitations" msgstr "недостатки" -#: shopelectro/models.py:169 shopelectro/models.py:208 +#: shopelectro/models.py:248 +msgid "revenue" +msgstr "прибыль" + +#: shopelectro/tests/tests_views.py:754 +msgid "Product" +msgstr "Товар" + msgid "position" msgstr "позиция" @@ -117,9 +153,6 @@ msgstr "Категории" msgid "parent" msgstr "родитель" -msgid "Product" -msgstr "Товар" - msgid "Products" msgstr "Товары" @@ -186,9 +219,6 @@ msgstr "Сделать неактивными" msgid "Parent" msgstr "Родитель" -msgid "Price" -msgstr "Цена" - msgid "Table editor" msgstr "Табличный редактор" diff --git a/shopelectro/models.py b/shopelectro/models.py index d6e29354..8fff0213 100644 --- a/shopelectro/models.py +++ b/shopelectro/models.py @@ -71,12 +71,6 @@ def blocks(self): class MatrixBlock(models.Model): """It is an UI element of catalog matrix.""" - # @todo #880:30m Add MatrixBlock to the admin panel. - # Inline it on Category Edit page. - - # @todo #880:60m Use MatrixBlock in the matrix view. - # Get the block_size data from the matrix view and fill out the model. - class Meta: verbose_name = _('Matrix block') verbose_name_plural = _('Matrix blocks') @@ -89,7 +83,7 @@ class Meta: on_delete=models.CASCADE, primary_key=True, verbose_name=_('category'), - related_name=_('matrix_block'), + related_name='matrix_block', limit_choices_to={'level': 0}, )