From f3cb3efdc55292cab49f327e1fada96105740740 Mon Sep 17 00:00:00 2001 From: Mark Walker Date: Wed, 6 Dec 2023 11:59:02 +0000 Subject: [PATCH] chore: Improve ruff config (#64) * fix: Remove isort because ruff is running it * chore: Run pyupgrade * chore: Run codespell * chore: Run trailing-whitespace * chore: Trial preferred ruff rules * chore: Rearrange ruff rules and add ignore on setup.py * chore: Run new ruff rules * chore: Fix coverage result ignore * chore: Fix comma --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .gitignore | 2 +- .pre-commit-config.yaml | 5 - README.rst | 6 +- aldryn_config.py | 30 ++--- djangocms_style/__init__.py | 2 +- djangocms_style/cms_plugins.py | 42 +++---- .../locale/af/LC_MESSAGES/django.po | 2 +- .../locale/ar/LC_MESSAGES/django.po | 2 +- .../locale/be/LC_MESSAGES/django.po | 2 +- .../locale/bg/LC_MESSAGES/django.po | 2 +- .../locale/ca/LC_MESSAGES/django.po | 2 +- .../locale/cmn/LC_MESSAGES/django.po | 2 +- .../locale/cs/LC_MESSAGES/django.po | 2 +- .../locale/da/LC_MESSAGES/django.po | 2 +- .../locale/de/LC_MESSAGES/django.po | 2 +- .../locale/el/LC_MESSAGES/django.po | 2 +- .../locale/en/LC_MESSAGES/django.po | 2 +- .../locale/es/LC_MESSAGES/django.po | 2 +- .../locale/es_AR/LC_MESSAGES/django.po | 2 +- .../locale/es_BO/LC_MESSAGES/django.po | 2 +- .../locale/et/LC_MESSAGES/django.po | 2 +- .../locale/eu/LC_MESSAGES/django.po | 2 +- .../locale/fa/LC_MESSAGES/django.po | 2 +- .../locale/fi/LC_MESSAGES/django.po | 2 +- .../locale/fr/LC_MESSAGES/django.po | 2 +- .../locale/ga/LC_MESSAGES/django.po | 2 +- .../locale/gl/LC_MESSAGES/django.po | 2 +- .../locale/gu/LC_MESSAGES/django.po | 2 +- .../locale/he/LC_MESSAGES/django.po | 2 +- .../locale/hi/LC_MESSAGES/django.po | 2 +- .../locale/hr/LC_MESSAGES/django.po | 2 +- .../locale/hu/LC_MESSAGES/django.po | 2 +- .../locale/id/LC_MESSAGES/django.po | 2 +- .../locale/is/LC_MESSAGES/django.po | 2 +- .../locale/is_IS/LC_MESSAGES/django.po | 2 +- .../locale/it/LC_MESSAGES/django.po | 2 +- .../locale/ja/LC_MESSAGES/django.po | 2 +- .../locale/kk/LC_MESSAGES/django.po | 2 +- .../locale/km/LC_MESSAGES/django.po | 2 +- .../locale/ko/LC_MESSAGES/django.po | 2 +- .../locale/ko_KR/LC_MESSAGES/django.po | 2 +- .../locale/ku_IQ/LC_MESSAGES/django.po | 2 +- .../locale/lt/LC_MESSAGES/django.po | 2 +- .../locale/mn/LC_MESSAGES/django.po | 2 +- .../locale/mn_MN/LC_MESSAGES/django.po | 2 +- .../locale/mt/LC_MESSAGES/django.po | 2 +- .../locale/nb/LC_MESSAGES/django.po | 2 +- .../locale/nl/LC_MESSAGES/django.po | 2 +- .../locale/no/LC_MESSAGES/django.po | 2 +- .../locale/pl/LC_MESSAGES/django.po | 2 +- .../locale/pt/LC_MESSAGES/django.po | 2 +- .../locale/pt_BR/LC_MESSAGES/django.po | 2 +- .../locale/ro/LC_MESSAGES/django.po | 2 +- .../locale/ru/LC_MESSAGES/django.po | 2 +- .../locale/sk/LC_MESSAGES/django.po | 2 +- .../locale/sl/LC_MESSAGES/django.po | 2 +- .../locale/sl_SI/LC_MESSAGES/django.po | 2 +- .../locale/sq/LC_MESSAGES/django.po | 2 +- .../locale/sq_AL/LC_MESSAGES/django.po | 2 +- .../locale/sr/LC_MESSAGES/django.po | 2 +- .../locale/sr@latin/LC_MESSAGES/django.po | 2 +- .../locale/sv/LC_MESSAGES/django.po | 2 +- .../locale/ta/LC_MESSAGES/django.po | 2 +- .../locale/th/LC_MESSAGES/django.po | 2 +- .../locale/tlh/LC_MESSAGES/django.po | 2 +- .../locale/tr/LC_MESSAGES/django.po | 2 +- .../locale/uk/LC_MESSAGES/django.po | 2 +- .../locale/ur/LC_MESSAGES/django.po | 2 +- .../locale/vi/LC_MESSAGES/django.po | 2 +- .../locale/vi_VN/LC_MESSAGES/django.po | 2 +- .../locale/zh/LC_MESSAGES/django.po | 2 +- .../locale/zh_CN/LC_MESSAGES/django.po | 2 +- .../locale/zh_TW/LC_MESSAGES/django.po | 2 +- djangocms_style/models.py | 109 +++++++++--------- pyproject.toml | 36 +++++- setup.py | 78 ++++++------- tests/requirements/compile.py | 6 +- tests/settings.py | 16 +-- tests/test_migrations.py | 16 +-- tests/test_models.py | 22 ++-- 81 files changed, 262 insertions(+), 244 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index dc334a2..8f0dc78 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -26,5 +26,5 @@ Use 'x' to check each item: [x] I have ... * [ ] I have opened this pull request against ``master`` * [ ] I have added or modified the tests when changing logic * [ ] I have followed [the conventional commits guidelines](https://www.conventionalcommits.org/) to add meaningful information into the changelog -* [ ] I have read the [contribution guidelines ](https://github.com/django-cms/django-cms/blob/develop/CONTRIBUTING.rst) and I have joined #workgroup-pr-review on +* [ ] I have read the [contribution guidelines ](https://github.com/django-cms/django-cms/blob/develop/CONTRIBUTING.rst) and I have joined #workgroup-pr-review on [Slack](https://www.django-cms.org/slack) to find a “pr review buddy” who is going to review my pull request. diff --git a/.gitignore b/.gitignore index 560c3a0..77040f1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ *.log *.pot .DS_Store -.coverage +.coverage* .coverage/ .eggs/ .idea/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d00ab37..507980d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -39,11 +39,6 @@ repos: - id: mixed-line-ending - id: trailing-whitespace - - repo: https://github.com/pycqa/isort - rev: 5.12.0 - hooks: - - id: isort - - repo: https://github.com/codespell-project/codespell rev: v2.2.5 hooks: diff --git a/README.rst b/README.rst index 41123a3..0efe436 100644 --- a/README.rst +++ b/README.rst @@ -9,7 +9,7 @@ that allows you to create a HTML container containing classes, styles, ids and other attributes definable through the plugins settings. -.. note:: +.. note:: This project is considered 3rd party (no supervision by the `django CMS Association `_). Join us on `Slack `_ for more information. @@ -22,8 +22,8 @@ Contribute to this project and win rewards Because this is a an open-source project, we welcome everyone to `get involved in the project `_ and -`receive a reward `_ for their contribution. -Become part of a fantastic community and help us make django CMS the best CMS in the world. +`receive a reward `_ for their contribution. +Become part of a fantastic community and help us make django CMS the best CMS in the world. We'll be delighted to receive your feedback in the form of issues and pull requests. Before submitting your diff --git a/aldryn_config.py b/aldryn_config.py index 0c78def..e019b0d 100644 --- a/aldryn_config.py +++ b/aldryn_config.py @@ -2,41 +2,41 @@ def split_and_strip(string): - return [item.strip() for item in string.split(',') if item] + return [item.strip() for item in string.split(",") if item] class Form(forms.BaseForm): templates = forms.CharField( - 'List of additional templates (comma separated)', + "List of additional templates (comma separated)", required=False, ) class_names = forms.CharField( - 'List of classes (comma separated)', + "List of classes (comma separated)", required=False, ) tag_types = forms.CharField( - 'List of HTML tags (comma separated)', + "List of HTML tags (comma separated)", required=False, ) def clean(self): - data = super(Form, self).clean() + data = super().clean() # prettify - data['templates'] = ', '.join(split_and_strip(data['templates'])) - data['class_names'] = ', '.join(split_and_strip(data['class_names'])) - data['tag_types'] = ', '.join(split_and_strip(data['tag_types'])) + data["templates"] = ", ".join(split_and_strip(data["templates"])) + data["class_names"] = ", ".join(split_and_strip(data["class_names"])) + data["tag_types"] = ", ".join(split_and_strip(data["tag_types"])) return data def to_settings(self, data, settings): - if data['templates']: - settings['DJANGOCMS_STYLE_TEMPLATES'] = [ + if data["templates"]: + settings["DJANGOCMS_STYLE_TEMPLATES"] = [ (item, item) - for item in split_and_strip(data['templates']) + for item in split_and_strip(data["templates"]) ] - if data['class_names']: - settings['DJANGOCMS_STYLE_CHOICES'] = split_and_strip(data['class_names']) - if data['tag_types']: - settings['DJANGOCMS_STYLE_TAGS'] = split_and_strip(data['tag_types']) + if data["class_names"]: + settings["DJANGOCMS_STYLE_CHOICES"] = split_and_strip(data["class_names"]) + if data["tag_types"]: + settings["DJANGOCMS_STYLE_TAGS"] = split_and_strip(data["tag_types"]) return settings diff --git a/djangocms_style/__init__.py b/djangocms_style/__init__.py index 4eb28e3..528787c 100644 --- a/djangocms_style/__init__.py +++ b/djangocms_style/__init__.py @@ -1 +1 @@ -__version__ = '3.0.0' +__version__ = "3.0.0" diff --git a/djangocms_style/cms_plugins.py b/djangocms_style/cms_plugins.py index 1811567..e221c04 100644 --- a/djangocms_style/cms_plugins.py +++ b/djangocms_style/cms_plugins.py @@ -7,42 +7,42 @@ class StylePlugin(CMSPluginBase): model = Style - name = _('Style') - render_template = 'djangocms_style/style.html' + name = _("Style") + render_template = "djangocms_style/style.html" allow_children = True fieldsets = ( (None, { - 'fields': ( - 'label', - ('class_name', 'tag_type'), + "fields": ( + "label", + ("class_name", "tag_type"), ) }), - (_('Advanced settings'), { - 'classes': ('collapse',), - 'fields': ( - 'additional_classes', - 'id_name', - 'template', - 'attributes', + (_("Advanced settings"), { + "classes": ("collapse",), + "fields": ( + "additional_classes", + "id_name", + "template", + "attributes", ), }), - (_('Inline style settings'), { - 'classes': ('collapse',), - 'fields': ( - ('padding_top', 'padding_right', - 'padding_bottom', 'padding_left'), - ('margin_top', 'margin_right', - 'margin_bottom', 'margin_left'), + (_("Inline style settings"), { + "classes": ("collapse",), + "fields": ( + ("padding_top", "padding_right", + "padding_bottom", "padding_left"), + ("margin_top", "margin_right", + "margin_bottom", "margin_left"), ), }), ) def get_render_template(self, context, instance, placeholder): - return 'djangocms_style/{}/style.html'.format(instance.template) + return f"djangocms_style/{instance.template}/style.html" def render(self, context, instance, placeholder): - context['inline_styles'] = instance.get_styles() + context["inline_styles"] = instance.get_styles() return super().render(context, instance, placeholder) diff --git a/djangocms_style/locale/af/LC_MESSAGES/django.po b/djangocms_style/locale/af/LC_MESSAGES/django.po index a9feb98..8f13694 100644 --- a/djangocms_style/locale/af/LC_MESSAGES/django.po +++ b/djangocms_style/locale/af/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/ar/LC_MESSAGES/django.po b/djangocms_style/locale/ar/LC_MESSAGES/django.po index cb8bbc6..7595c29 100644 --- a/djangocms_style/locale/ar/LC_MESSAGES/django.po +++ b/djangocms_style/locale/ar/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/be/LC_MESSAGES/django.po b/djangocms_style/locale/be/LC_MESSAGES/django.po index 6fd96a6..9f2a79a 100644 --- a/djangocms_style/locale/be/LC_MESSAGES/django.po +++ b/djangocms_style/locale/be/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/bg/LC_MESSAGES/django.po b/djangocms_style/locale/bg/LC_MESSAGES/django.po index 8fe0d3e..99d90a4 100644 --- a/djangocms_style/locale/bg/LC_MESSAGES/django.po +++ b/djangocms_style/locale/bg/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/ca/LC_MESSAGES/django.po b/djangocms_style/locale/ca/LC_MESSAGES/django.po index bb47153..7b985b0 100644 --- a/djangocms_style/locale/ca/LC_MESSAGES/django.po +++ b/djangocms_style/locale/ca/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/cmn/LC_MESSAGES/django.po b/djangocms_style/locale/cmn/LC_MESSAGES/django.po index b8f808d..f3d1cdd 100644 --- a/djangocms_style/locale/cmn/LC_MESSAGES/django.po +++ b/djangocms_style/locale/cmn/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/cs/LC_MESSAGES/django.po b/djangocms_style/locale/cs/LC_MESSAGES/django.po index bf84c89..de9a304 100644 --- a/djangocms_style/locale/cs/LC_MESSAGES/django.po +++ b/djangocms_style/locale/cs/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/da/LC_MESSAGES/django.po b/djangocms_style/locale/da/LC_MESSAGES/django.po index 6dcf2c0..e820927 100644 --- a/djangocms_style/locale/da/LC_MESSAGES/django.po +++ b/djangocms_style/locale/da/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/de/LC_MESSAGES/django.po b/djangocms_style/locale/de/LC_MESSAGES/django.po index 18e48b6..527584e 100644 --- a/djangocms_style/locale/de/LC_MESSAGES/django.po +++ b/djangocms_style/locale/de/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/el/LC_MESSAGES/django.po b/djangocms_style/locale/el/LC_MESSAGES/django.po index 523fcbd..af4572a 100644 --- a/djangocms_style/locale/el/LC_MESSAGES/django.po +++ b/djangocms_style/locale/el/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/en/LC_MESSAGES/django.po b/djangocms_style/locale/en/LC_MESSAGES/django.po index ff68e1e..85148a9 100644 --- a/djangocms_style/locale/en/LC_MESSAGES/django.po +++ b/djangocms_style/locale/en/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/es/LC_MESSAGES/django.po b/djangocms_style/locale/es/LC_MESSAGES/django.po index e4885a8..6ad1308 100644 --- a/djangocms_style/locale/es/LC_MESSAGES/django.po +++ b/djangocms_style/locale/es/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/es_AR/LC_MESSAGES/django.po b/djangocms_style/locale/es_AR/LC_MESSAGES/django.po index 602afd1..11632fa 100644 --- a/djangocms_style/locale/es_AR/LC_MESSAGES/django.po +++ b/djangocms_style/locale/es_AR/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/es_BO/LC_MESSAGES/django.po b/djangocms_style/locale/es_BO/LC_MESSAGES/django.po index 145f423..0b79775 100644 --- a/djangocms_style/locale/es_BO/LC_MESSAGES/django.po +++ b/djangocms_style/locale/es_BO/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/et/LC_MESSAGES/django.po b/djangocms_style/locale/et/LC_MESSAGES/django.po index 7e14e94..b34f828 100644 --- a/djangocms_style/locale/et/LC_MESSAGES/django.po +++ b/djangocms_style/locale/et/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/eu/LC_MESSAGES/django.po b/djangocms_style/locale/eu/LC_MESSAGES/django.po index b0fa234..4d38d51 100644 --- a/djangocms_style/locale/eu/LC_MESSAGES/django.po +++ b/djangocms_style/locale/eu/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/fa/LC_MESSAGES/django.po b/djangocms_style/locale/fa/LC_MESSAGES/django.po index 1ccb483..b795965 100644 --- a/djangocms_style/locale/fa/LC_MESSAGES/django.po +++ b/djangocms_style/locale/fa/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/fi/LC_MESSAGES/django.po b/djangocms_style/locale/fi/LC_MESSAGES/django.po index d5c7194..1dfca14 100644 --- a/djangocms_style/locale/fi/LC_MESSAGES/django.po +++ b/djangocms_style/locale/fi/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/fr/LC_MESSAGES/django.po b/djangocms_style/locale/fr/LC_MESSAGES/django.po index b718a63..c97b9f5 100644 --- a/djangocms_style/locale/fr/LC_MESSAGES/django.po +++ b/djangocms_style/locale/fr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/ga/LC_MESSAGES/django.po b/djangocms_style/locale/ga/LC_MESSAGES/django.po index 9a2477a..859c7fa 100644 --- a/djangocms_style/locale/ga/LC_MESSAGES/django.po +++ b/djangocms_style/locale/ga/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/gl/LC_MESSAGES/django.po b/djangocms_style/locale/gl/LC_MESSAGES/django.po index 3af03e7..50b8c5c 100644 --- a/djangocms_style/locale/gl/LC_MESSAGES/django.po +++ b/djangocms_style/locale/gl/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/gu/LC_MESSAGES/django.po b/djangocms_style/locale/gu/LC_MESSAGES/django.po index 9ac90b6..2960022 100644 --- a/djangocms_style/locale/gu/LC_MESSAGES/django.po +++ b/djangocms_style/locale/gu/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/he/LC_MESSAGES/django.po b/djangocms_style/locale/he/LC_MESSAGES/django.po index ae26e92..94b5b4a 100644 --- a/djangocms_style/locale/he/LC_MESSAGES/django.po +++ b/djangocms_style/locale/he/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/hi/LC_MESSAGES/django.po b/djangocms_style/locale/hi/LC_MESSAGES/django.po index a1cb438..1d44c22 100644 --- a/djangocms_style/locale/hi/LC_MESSAGES/django.po +++ b/djangocms_style/locale/hi/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/hr/LC_MESSAGES/django.po b/djangocms_style/locale/hr/LC_MESSAGES/django.po index ff15517..8a8d8de 100644 --- a/djangocms_style/locale/hr/LC_MESSAGES/django.po +++ b/djangocms_style/locale/hr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/hu/LC_MESSAGES/django.po b/djangocms_style/locale/hu/LC_MESSAGES/django.po index 169ac1c..11ca73d 100644 --- a/djangocms_style/locale/hu/LC_MESSAGES/django.po +++ b/djangocms_style/locale/hu/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/id/LC_MESSAGES/django.po b/djangocms_style/locale/id/LC_MESSAGES/django.po index 5be114f..bb6f82f 100644 --- a/djangocms_style/locale/id/LC_MESSAGES/django.po +++ b/djangocms_style/locale/id/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/is/LC_MESSAGES/django.po b/djangocms_style/locale/is/LC_MESSAGES/django.po index b0373e2..3877e9f 100644 --- a/djangocms_style/locale/is/LC_MESSAGES/django.po +++ b/djangocms_style/locale/is/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/is_IS/LC_MESSAGES/django.po b/djangocms_style/locale/is_IS/LC_MESSAGES/django.po index 0dc779d..e8dd2d5 100644 --- a/djangocms_style/locale/is_IS/LC_MESSAGES/django.po +++ b/djangocms_style/locale/is_IS/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/it/LC_MESSAGES/django.po b/djangocms_style/locale/it/LC_MESSAGES/django.po index a8f2f66..c4f8c6b 100644 --- a/djangocms_style/locale/it/LC_MESSAGES/django.po +++ b/djangocms_style/locale/it/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/ja/LC_MESSAGES/django.po b/djangocms_style/locale/ja/LC_MESSAGES/django.po index 3959e6f..17762f7 100644 --- a/djangocms_style/locale/ja/LC_MESSAGES/django.po +++ b/djangocms_style/locale/ja/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/kk/LC_MESSAGES/django.po b/djangocms_style/locale/kk/LC_MESSAGES/django.po index c6f4bc0..6010c47 100644 --- a/djangocms_style/locale/kk/LC_MESSAGES/django.po +++ b/djangocms_style/locale/kk/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/km/LC_MESSAGES/django.po b/djangocms_style/locale/km/LC_MESSAGES/django.po index 1fc709b..b5885e8 100644 --- a/djangocms_style/locale/km/LC_MESSAGES/django.po +++ b/djangocms_style/locale/km/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/ko/LC_MESSAGES/django.po b/djangocms_style/locale/ko/LC_MESSAGES/django.po index e559a2a..6c87d71 100644 --- a/djangocms_style/locale/ko/LC_MESSAGES/django.po +++ b/djangocms_style/locale/ko/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/ko_KR/LC_MESSAGES/django.po b/djangocms_style/locale/ko_KR/LC_MESSAGES/django.po index 77b2d27..5879aa1 100644 --- a/djangocms_style/locale/ko_KR/LC_MESSAGES/django.po +++ b/djangocms_style/locale/ko_KR/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/ku_IQ/LC_MESSAGES/django.po b/djangocms_style/locale/ku_IQ/LC_MESSAGES/django.po index f5c1d04..e28c424 100644 --- a/djangocms_style/locale/ku_IQ/LC_MESSAGES/django.po +++ b/djangocms_style/locale/ku_IQ/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/lt/LC_MESSAGES/django.po b/djangocms_style/locale/lt/LC_MESSAGES/django.po index d4e97ee..c1a28b3 100644 --- a/djangocms_style/locale/lt/LC_MESSAGES/django.po +++ b/djangocms_style/locale/lt/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/mn/LC_MESSAGES/django.po b/djangocms_style/locale/mn/LC_MESSAGES/django.po index b167f89..4815046 100644 --- a/djangocms_style/locale/mn/LC_MESSAGES/django.po +++ b/djangocms_style/locale/mn/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/mn_MN/LC_MESSAGES/django.po b/djangocms_style/locale/mn_MN/LC_MESSAGES/django.po index c02b3d2..7c600f8 100644 --- a/djangocms_style/locale/mn_MN/LC_MESSAGES/django.po +++ b/djangocms_style/locale/mn_MN/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/mt/LC_MESSAGES/django.po b/djangocms_style/locale/mt/LC_MESSAGES/django.po index 3d8310c..ec67820 100644 --- a/djangocms_style/locale/mt/LC_MESSAGES/django.po +++ b/djangocms_style/locale/mt/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/nb/LC_MESSAGES/django.po b/djangocms_style/locale/nb/LC_MESSAGES/django.po index 773c197..92e692d 100644 --- a/djangocms_style/locale/nb/LC_MESSAGES/django.po +++ b/djangocms_style/locale/nb/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/nl/LC_MESSAGES/django.po b/djangocms_style/locale/nl/LC_MESSAGES/django.po index 79441a5..3bf0d43 100644 --- a/djangocms_style/locale/nl/LC_MESSAGES/django.po +++ b/djangocms_style/locale/nl/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/no/LC_MESSAGES/django.po b/djangocms_style/locale/no/LC_MESSAGES/django.po index f79c022..e5b9bd9 100644 --- a/djangocms_style/locale/no/LC_MESSAGES/django.po +++ b/djangocms_style/locale/no/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/pl/LC_MESSAGES/django.po b/djangocms_style/locale/pl/LC_MESSAGES/django.po index 69d82eb..0eba4d1 100644 --- a/djangocms_style/locale/pl/LC_MESSAGES/django.po +++ b/djangocms_style/locale/pl/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/pt/LC_MESSAGES/django.po b/djangocms_style/locale/pt/LC_MESSAGES/django.po index c8b5134..d844f79 100644 --- a/djangocms_style/locale/pt/LC_MESSAGES/django.po +++ b/djangocms_style/locale/pt/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/pt_BR/LC_MESSAGES/django.po b/djangocms_style/locale/pt_BR/LC_MESSAGES/django.po index a4c6caa..2813c52 100644 --- a/djangocms_style/locale/pt_BR/LC_MESSAGES/django.po +++ b/djangocms_style/locale/pt_BR/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/ro/LC_MESSAGES/django.po b/djangocms_style/locale/ro/LC_MESSAGES/django.po index 5593167..b403cf4 100644 --- a/djangocms_style/locale/ro/LC_MESSAGES/django.po +++ b/djangocms_style/locale/ro/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/ru/LC_MESSAGES/django.po b/djangocms_style/locale/ru/LC_MESSAGES/django.po index 01af5b4..a3041c5 100644 --- a/djangocms_style/locale/ru/LC_MESSAGES/django.po +++ b/djangocms_style/locale/ru/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/sk/LC_MESSAGES/django.po b/djangocms_style/locale/sk/LC_MESSAGES/django.po index 60f8475..250990d 100644 --- a/djangocms_style/locale/sk/LC_MESSAGES/django.po +++ b/djangocms_style/locale/sk/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/sl/LC_MESSAGES/django.po b/djangocms_style/locale/sl/LC_MESSAGES/django.po index 1666278..8a304fe 100644 --- a/djangocms_style/locale/sl/LC_MESSAGES/django.po +++ b/djangocms_style/locale/sl/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/sl_SI/LC_MESSAGES/django.po b/djangocms_style/locale/sl_SI/LC_MESSAGES/django.po index 3cea713..a9b0f0f 100644 --- a/djangocms_style/locale/sl_SI/LC_MESSAGES/django.po +++ b/djangocms_style/locale/sl_SI/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/sq/LC_MESSAGES/django.po b/djangocms_style/locale/sq/LC_MESSAGES/django.po index 8489f61..b97b397 100644 --- a/djangocms_style/locale/sq/LC_MESSAGES/django.po +++ b/djangocms_style/locale/sq/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/sq_AL/LC_MESSAGES/django.po b/djangocms_style/locale/sq_AL/LC_MESSAGES/django.po index 9f8793d..0aed184 100644 --- a/djangocms_style/locale/sq_AL/LC_MESSAGES/django.po +++ b/djangocms_style/locale/sq_AL/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/sr/LC_MESSAGES/django.po b/djangocms_style/locale/sr/LC_MESSAGES/django.po index 1c96fe5..51b8bb0 100644 --- a/djangocms_style/locale/sr/LC_MESSAGES/django.po +++ b/djangocms_style/locale/sr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/sr@latin/LC_MESSAGES/django.po b/djangocms_style/locale/sr@latin/LC_MESSAGES/django.po index 6cf90a1..d6e393d 100644 --- a/djangocms_style/locale/sr@latin/LC_MESSAGES/django.po +++ b/djangocms_style/locale/sr@latin/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/sv/LC_MESSAGES/django.po b/djangocms_style/locale/sv/LC_MESSAGES/django.po index e3fa81e..c348765 100644 --- a/djangocms_style/locale/sv/LC_MESSAGES/django.po +++ b/djangocms_style/locale/sv/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/ta/LC_MESSAGES/django.po b/djangocms_style/locale/ta/LC_MESSAGES/django.po index 069a32e..e968c70 100644 --- a/djangocms_style/locale/ta/LC_MESSAGES/django.po +++ b/djangocms_style/locale/ta/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/th/LC_MESSAGES/django.po b/djangocms_style/locale/th/LC_MESSAGES/django.po index a29ba64..196c0d7 100644 --- a/djangocms_style/locale/th/LC_MESSAGES/django.po +++ b/djangocms_style/locale/th/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/tlh/LC_MESSAGES/django.po b/djangocms_style/locale/tlh/LC_MESSAGES/django.po index 30d979a..a98adc4 100644 --- a/djangocms_style/locale/tlh/LC_MESSAGES/django.po +++ b/djangocms_style/locale/tlh/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/tr/LC_MESSAGES/django.po b/djangocms_style/locale/tr/LC_MESSAGES/django.po index 6bfc6b1..6470e40 100644 --- a/djangocms_style/locale/tr/LC_MESSAGES/django.po +++ b/djangocms_style/locale/tr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/uk/LC_MESSAGES/django.po b/djangocms_style/locale/uk/LC_MESSAGES/django.po index 6991e7f..9870a30 100644 --- a/djangocms_style/locale/uk/LC_MESSAGES/django.po +++ b/djangocms_style/locale/uk/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/ur/LC_MESSAGES/django.po b/djangocms_style/locale/ur/LC_MESSAGES/django.po index 5a071e1..04395ae 100644 --- a/djangocms_style/locale/ur/LC_MESSAGES/django.po +++ b/djangocms_style/locale/ur/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/vi/LC_MESSAGES/django.po b/djangocms_style/locale/vi/LC_MESSAGES/django.po index 907654b..16ff0ff 100644 --- a/djangocms_style/locale/vi/LC_MESSAGES/django.po +++ b/djangocms_style/locale/vi/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/vi_VN/LC_MESSAGES/django.po b/djangocms_style/locale/vi_VN/LC_MESSAGES/django.po index 00e3feb..de4b79a 100644 --- a/djangocms_style/locale/vi_VN/LC_MESSAGES/django.po +++ b/djangocms_style/locale/vi_VN/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/zh/LC_MESSAGES/django.po b/djangocms_style/locale/zh/LC_MESSAGES/django.po index 0d802f9..358f1f3 100644 --- a/djangocms_style/locale/zh/LC_MESSAGES/django.po +++ b/djangocms_style/locale/zh/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/zh_CN/LC_MESSAGES/django.po b/djangocms_style/locale/zh_CN/LC_MESSAGES/django.po index 3643d0d..836e9da 100644 --- a/djangocms_style/locale/zh_CN/LC_MESSAGES/django.po +++ b/djangocms_style/locale/zh_CN/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/locale/zh_TW/LC_MESSAGES/django.po b/djangocms_style/locale/zh_TW/LC_MESSAGES/django.po index 893ddba..c5e80bf 100644 --- a/djangocms_style/locale/zh_TW/LC_MESSAGES/django.po +++ b/djangocms_style/locale/zh_TW/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" diff --git a/djangocms_style/models.py b/djangocms_style/models.py index 500ccb4..96bb87b 100644 --- a/djangocms_style/models.py +++ b/djangocms_style/models.py @@ -14,29 +14,29 @@ CLASS_CHOICES = getattr( settings, - 'DJANGOCMS_STYLE_CHOICES', - ['container', 'content', 'teaser'], + "DJANGOCMS_STYLE_CHOICES", + ["container", "content", "teaser"], ) CLASS_CHOICES = tuple((entry, entry) for entry in CLASS_CHOICES) TAG_CHOICES = getattr( settings, - 'DJANGOCMS_STYLE_TAGS', - ['div', 'article', 'section', 'header', 'footer', 'aside', - 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'], + "DJANGOCMS_STYLE_TAGS", + ["div", "article", "section", "header", "footer", "aside", + "h1", "h2", "h3", "h4", "h5", "h6"], ) TAG_CHOICES = tuple((entry, entry) for entry in TAG_CHOICES) -CLASS_NAME_FORMAT = re.compile(r'^\w[\w_-]*$') -TAG_TYPE_FORMAT = re.compile(r'\w[\w\d]*$') +CLASS_NAME_FORMAT = re.compile(r"^\w[\w_-]*$") +TAG_TYPE_FORMAT = re.compile(r"\w[\w\d]*$") # Add additional choices through the ``settings.py``. def get_templates(): choices = [ - ('default', _('Default')), + ("default", _("Default")), ] choices += getattr( settings, - 'DJANGOCMS_STYLE_TEMPLATES', + "DJANGOCMS_STYLE_TEMPLATES", [], ) return choices @@ -47,86 +47,86 @@ class Style(CMSPlugin): Renders a given ``TAG_CHOICES`` element with additional attributes """ template = models.CharField( - verbose_name=_('Template'), + verbose_name=_("Template"), choices=get_templates(), default=get_templates()[0][0], max_length=255, ) label = models.CharField( - verbose_name=_('Label'), + verbose_name=_("Label"), blank=True, max_length=255, - help_text=_('Overrides the display name in the structure mode.'), + help_text=_("Overrides the display name in the structure mode."), ) tag_type = models.CharField( - verbose_name=_('Tag type'), + verbose_name=_("Tag type"), choices=TAG_CHOICES, default=TAG_CHOICES[0][0], max_length=255, ) class_name = models.CharField( - verbose_name=_('Class name'), + verbose_name=_("Class name"), choices=CLASS_CHOICES, default=CLASS_CHOICES[0][0], blank=True, max_length=255, ) additional_classes = models.CharField( - verbose_name=_('Additional classes'), + verbose_name=_("Additional classes"), blank=True, max_length=255, help_text=_('Additional comma separated list of classes ' 'to be added to the element e.g. "row, column-12, clearfix".'), ) id_name = models.CharField( - verbose_name=_('ID name'), + verbose_name=_("ID name"), blank=True, max_length=255, ) attributes = AttributesField( - verbose_name=_('Attributes'), + verbose_name=_("Attributes"), blank=True, - excluded_keys=['class', 'id', 'style'], + excluded_keys=["class", "id", "style"], ) padding_top = models.PositiveSmallIntegerField( - verbose_name=_('Padding top'), + verbose_name=_("Padding top"), blank=True, null=True, ) padding_right = models.PositiveSmallIntegerField( - verbose_name=_('Padding right'), + verbose_name=_("Padding right"), blank=True, null=True, ) padding_bottom = models.PositiveSmallIntegerField( - verbose_name=_('Padding bottom'), + verbose_name=_("Padding bottom"), blank=True, null=True, ) padding_left = models.PositiveSmallIntegerField( - verbose_name=_('Padding left'), + verbose_name=_("Padding left"), blank=True, null=True, ) margin_top = models.PositiveSmallIntegerField( - verbose_name=_('Margin top'), + verbose_name=_("Margin top"), blank=True, null=True, ) margin_right = models.PositiveSmallIntegerField( - verbose_name=_('Margin right'), + verbose_name=_("Margin right"), blank=True, null=True, ) margin_bottom = models.PositiveSmallIntegerField( - verbose_name=_('Margin bottom'), + verbose_name=_("Margin bottom"), blank=True, null=True, ) margin_left = models.PositiveSmallIntegerField( - verbose_name=_('Margin left'), + verbose_name=_("Margin left"), blank=True, null=True, ) @@ -137,7 +137,7 @@ class Style(CMSPlugin): # https://github.com/divio/django-cms/issues/5030 cmsplugin_ptr = models.OneToOneField( CMSPlugin, - related_name='%(app_label)s_%(class)s', + related_name="%(app_label)s_%(class)s", parent_link=True, on_delete=models.CASCADE, ) @@ -153,61 +153,60 @@ def get_short_description(self): if self.label: display.append(self.label) if self.tag_type: - display.append('<{0}>'.format(self.tag_type)) + display.append(f"<{self.tag_type}>") if self.class_name: classes.append(self.class_name) if self.additional_classes: - classes.extend(item.strip() for item in self.additional_classes.split(',') if item.strip()) + classes.extend(item.strip() for item in self.additional_classes.split(",") if item.strip()) if classes: - display.append('.{0}'.format(' .'.join(classes))) + display.append(".{}".format(" .".join(classes))) if self.id_name: - display.append('#{0}'.format(self.id_name)) - return ' '.join(display) + display.append(f"#{self.id_name}") + return " ".join(display) def get_additional_classes(self): - classes = '' + classes = "" if self.additional_classes: - classes = ' '.join(item.strip() for item in self.additional_classes.split(',') if item.strip()) + classes = " ".join(item.strip() for item in self.additional_classes.split(",") if item.strip()) return classes def get_styles(self): styles = [] # padding values if self.padding_top: - styles.append('padding-top: {0:d}px;'.format(self.padding_top)) + styles.append(f"padding-top: {self.padding_top:d}px;") if self.padding_right: - styles.append('padding-right: {0:d}px;'.format(self.padding_right)) + styles.append(f"padding-right: {self.padding_right:d}px;") if self.padding_bottom: - styles.append('padding-bottom: {0:d}px;'.format(self.padding_bottom)) + styles.append(f"padding-bottom: {self.padding_bottom:d}px;") if self.padding_left: - styles.append('padding-left: {0:d}px;'.format(self.padding_left)) + styles.append(f"padding-left: {self.padding_left:d}px;") # margin values if self.margin_top: - styles.append('margin-top: {0:d}px;'.format(self.margin_top)) + styles.append(f"margin-top: {self.margin_top:d}px;") if self.margin_right: - styles.append('margin-right: {0:d}px;'.format(self.margin_right)) + styles.append(f"margin-right: {self.margin_right:d}px;") if self.margin_bottom: - styles.append('margin-bottom: {0:d}px;'.format(self.margin_bottom)) + styles.append(f"margin-bottom: {self.margin_bottom:d}px;") if self.margin_left: - styles.append('margin-left: {0:d}px;'.format(self.margin_left)) - return ' '.join(styles) + styles.append(f"margin-left: {self.margin_left:d}px;") + return " ".join(styles) def clean(self): # validate for correct class name settings if self.additional_classes: - additional_classes = list( - html_class.strip() for html_class in self.additional_classes.split(',') - ) + additional_classes = [ + html_class.strip() for html_class in self.additional_classes.split(",") + ] for class_name in additional_classes: - class_name = class_name.strip() - if not CLASS_NAME_FORMAT.match(class_name): + _class_name = class_name.strip() + if not CLASS_NAME_FORMAT.match(_class_name): raise ValidationError( - _('"{name}" is not a proper CSS class name.').format(name=class_name) + _('"{name}" is not a proper CSS class name.').format(name=_class_name) ) - self.additional_classes = ', '.join(OrderedSet(additional_classes)) + self.additional_classes = ", ".join(OrderedSet(additional_classes)) # validate for correct tag type settings - if self.tag_type: - if not TAG_TYPE_FORMAT.match(self.tag_type): - raise ValidationError( - _('"{name}" is not a proper HTML tag.').format(name=self.tag_type) - ) + if self.tag_type and not TAG_TYPE_FORMAT.match(self.tag_type): + raise ValidationError( + _('"{name}" is not a proper HTML tag.').format(name=self.tag_type) + ) diff --git a/pyproject.toml b/pyproject.toml index 64bdc3d..bb29ac2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,4 +1,31 @@ +[tool.codespell] +skip = '*.po' + [tool.ruff] +line-length = 119 +select = [ + "E", # pycodestyle errors + "W", # pycodestyle warnings + "F", # pyflakes + "I", # isort + "FBT", # flake8-boolean-trap + "B", # flake8-bugbear + "C", # flake8-comprehensions + "DJ", # flake8-django + "INT", # flake8-gettext + "PIE", # flake8-pie + "Q", # flake8-quotes + "SIM", # flake8-simplify + "PGH", # pygrep-hooks + "PLE", # pylint error + "PLR", # pylint refactor + "PLW", # pylint warning + "UP", # pyupgrade + "C901", # mccabe + "N", # pep8-naming + "YTT", # flake8-2020 + "RUF" +] exclude = [ ".env", ".venv", @@ -10,10 +37,7 @@ ignore = [ "E701", # multiple statements on one line (colon) "F401", # module imported but unused ] -line-length = 119 -select = [ - "I", - "E", - "F", - "W", +[tool.ruff.per-file-ignores] +"setup.py" = [ + "SIM115" # Use context handler for opening files ] diff --git a/setup.py b/setup.py index 35361a9..faf4199 100644 --- a/setup.py +++ b/setup.py @@ -4,57 +4,57 @@ from djangocms_style import __version__ REQUIREMENTS = [ - 'django-cms>=3.7', - 'djangocms-attributes-field>=1', + "django-cms>=3.7", + "djangocms-attributes-field>=1", ] CLASSIFIERS = [ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Web Environment', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: BSD License', - 'Operating System :: OS Independent', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', - 'Programming Language :: Python :: 3.11', - 'Framework :: Django', - 'Framework :: Django :: 3.2', - 'Framework :: Django :: 4.0', - 'Framework :: Django :: 4.1', - 'Framework :: Django :: 4.2', - 'Framework :: Django CMS', - 'Framework :: Django CMS :: 3.7', - 'Framework :: Django CMS :: 3.8', - 'Framework :: Django CMS :: 3.9', - 'Framework :: Django CMS :: 3.10', - 'Framework :: Django CMS :: 3.11', - 'Framework :: Django CMS :: 4.1', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', - 'Topic :: Software Development', - 'Topic :: Software Development :: Libraries', + "Development Status :: 5 - Production/Stable", + "Environment :: Web Environment", + "Intended Audience :: Developers", + "License :: OSI Approved :: BSD License", + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Framework :: Django", + "Framework :: Django :: 3.2", + "Framework :: Django :: 4.0", + "Framework :: Django :: 4.1", + "Framework :: Django :: 4.2", + "Framework :: Django CMS", + "Framework :: Django CMS :: 3.7", + "Framework :: Django CMS :: 3.8", + "Framework :: Django CMS :: 3.9", + "Framework :: Django CMS :: 3.10", + "Framework :: Django CMS :: 3.11", + "Framework :: Django CMS :: 4.1", + "Topic :: Internet :: WWW/HTTP", + "Topic :: Internet :: WWW/HTTP :: Dynamic Content", + "Topic :: Software Development", + "Topic :: Software Development :: Libraries", ] setup( - name='djangocms-style', + name="djangocms-style", version=__version__, - author='Divio AG', - author_email='info@divio.ch', - maintainer='Django CMS Association and contributors', - maintainer_email='info@django-cms.org', - url='https://github.com/django-cms/djangocms-style', - license='BSD-3-Clause', - description='Adds style plugin to django CMS', - long_description=open('README.rst').read(), + author="Divio AG", + author_email="info@divio.ch", + maintainer="Django CMS Association and contributors", + maintainer_email="info@django-cms.org", + url="https://github.com/django-cms/djangocms-style", + license="BSD-3-Clause", + description="Adds style plugin to django CMS", + long_description=open("README.rst").read(), packages=find_packages(), include_package_data=True, zip_safe=False, install_requires=REQUIREMENTS, classifiers=CLASSIFIERS, - test_suite='tests.settings.run', + test_suite="tests.settings.run", ) diff --git a/tests/requirements/compile.py b/tests/requirements/compile.py index 447a5e4..38cc474 100755 --- a/tests/requirements/compile.py +++ b/tests/requirements/compile.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# This script requries multiple python versions to be installed. +# This script requires multiple python versions to be installed. # You can use pyenv for that. # # See: https://github.com/pyenv/pyenv#installation @@ -16,7 +16,7 @@ # Now install python versions: # pyenv install 3.8 3.9 3.10 3.11 # -# Then activate them globaly with the systems default to be still default: +# Then activate them globally with the systems default to be still default: # pyenv global system 3.11 3.10 3.9 3.8 # # Also pip-tools must be installed for every version of python. @@ -84,4 +84,4 @@ # check=True, capture_output=True, ) - print(output.stderr.decode('utf-8')) + print(output.stderr.decode("utf-8")) diff --git a/tests/settings.py b/tests/settings.py index d2c1295..af1800a 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -1,21 +1,21 @@ #!/usr/bin/env python HELPER_SETTINGS = { - 'INSTALLED_APPS': [], - 'CMS_LANGUAGES': { + "INSTALLED_APPS": [], + "CMS_LANGUAGES": { 1: [{ - 'code': 'en', - 'name': 'English', + "code": "en", + "name": "English", }] }, - 'LANGUAGE_CODE': 'en', - 'ALLOWED_HOSTS': ['localhost'], + "LANGUAGE_CODE": "en", + "ALLOWED_HOSTS": ["localhost"], } def run(): from app_helper import runner - runner.cms('djangocms_style') + runner.cms("djangocms_style") -if __name__ == '__main__': +if __name__ == "__main__": run() diff --git a/tests/test_migrations.py b/tests/test_migrations.py index 29c4a94..2d860a0 100644 --- a/tests/test_migrations.py +++ b/tests/test_migrations.py @@ -12,19 +12,19 @@ class MigrationTestCase(TestCase): def test_for_missing_migrations(self): output = StringIO() options = { - 'interactive': False, - 'dry_run': True, - 'stdout': output, - 'check_changes': True, + "interactive": False, + "dry_run": True, + "stdout": output, + "check_changes": True, } try: - call_command('makemigrations', **options) + call_command("makemigrations", **options) except SystemExit as e: status_code = str(e) else: # the "no changes" exit code is 0 - status_code = '0' + status_code = "0" - if status_code == '1': - self.fail('There are missing migrations:\n {}'.format(output.getvalue())) + if status_code == "1": + self.fail(f"There are missing migrations:\n {output.getvalue()}") diff --git a/tests/test_models.py b/tests/test_models.py index 235870f..e6da5cd 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -13,21 +13,21 @@ class StyleModelTestCase(TestCase): def test_settings(self): - self.assertEqual(get_templates(), [('default', 'Default')]) - settings.DJANGOCMS_STYLE_TEMPLATES = [('feature', 'Feature')] - self.assertEqual(get_templates(), [('default', 'Default'), ('feature', 'Feature')]) + self.assertEqual(get_templates(), [("default", "Default")]) + settings.DJANGOCMS_STYLE_TEMPLATES = [("feature", "Feature")] + self.assertEqual(get_templates(), [("default", "Default"), ("feature", "Feature")]) # class choices self.assertEqual(CLASS_CHOICES, ( - ('container', 'container'), - ('content', 'content'), - ('teaser', 'teaser'), + ("container", "container"), + ("content", "content"), + ("teaser", "teaser"), )) self.assertEqual(TAG_CHOICES, ( - ('div', 'div'), ('article', 'article'), - ('section', 'section'), ('header', 'header'), - ('footer', 'footer'), ('aside', 'aside'), - ('h1', 'h1'), ('h2', 'h2'), ('h3', 'h3'), - ('h4', 'h4'), ('h5', 'h5'), ('h6', 'h6'), + ("div", "div"), ("article", "article"), + ("section", "section"), ("header", "header"), + ("footer", "footer"), ("aside", "aside"), + ("h1", "h1"), ("h2", "h2"), ("h3", "h3"), + ("h4", "h4"), ("h5", "h5"), ("h6", "h6"), )) def test_style_instance(self):