From 3d81699a424e53035a854309258b193183dea054 Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Mon, 28 Oct 2024 22:36:03 +0100 Subject: [PATCH 1/6] [pre-commit] Upgrade tooling --- .pre-commit-config.yaml | 14 +- example_project/example_project/urls.py | 1 + pyproject.toml | 184 +++++++++--------- survey/apps.py | 1 - survey/exporter/survey2x.py | 1 - survey/exporter/tex/configuration.py | 2 +- survey/exporter/tex/configuration_builder.py | 1 - survey/exporter/tex/latex_file.py | 9 +- survey/exporter/tex/question2tex.py | 1 - survey/exporter/tex/question2tex_chart.py | 11 +- survey/exporter/tex/question2tex_raw.py | 1 - survey/exporter/tex/question2tex_sankey.py | 1 - survey/exporter/tex/survey2tex.py | 2 +- survey/locale/de/LC_MESSAGES/django.po | 53 ++--- survey/locale/es/LC_MESSAGES/django.po | 53 ++--- survey/locale/fr/LC_MESSAGES/django.po | 53 ++--- survey/locale/gr/LC_MESSAGES/django.po | 53 ++--- survey/locale/id/LC_MESSAGES/django.po | 53 ++--- survey/locale/ja/LC_MESSAGES/django.po | 51 +++-- survey/locale/nl/LC_MESSAGES/django.po | 53 ++--- survey/locale/pl/LC_MESSAGES/django.po | 53 ++--- survey/locale/pt/LC_MESSAGES/django.po | 51 +++-- survey/locale/ru/LC_MESSAGES/django.po | 51 +++-- survey/locale/tr/LC_MESSAGES/django.po | 53 ++--- survey/locale/zh/LC_MESSAGES/django.po | 53 ++--- survey/management/commands/exportresult.py | 1 - survey/management/commands/generatetexconf.py | 1 - survey/models/question.py | 2 +- survey/models/response.py | 1 - survey/tests/exporter/csv/test_survey2csv.py | 1 - .../management/commands/test_exportresult.py | 1 - survey/tests/management/test_management.py | 1 - survey/tests/test_survey_auth_required.py | 1 - 33 files changed, 431 insertions(+), 437 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index df4993de..614fa35f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,19 +3,23 @@ ci: repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v5.0.0 hooks: - id: check-merge-conflict - id: trailing-whitespace - id: end-of-file-fixer - id: check-json - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.1.8" + rev: "v0.7.1" hooks: - id: ruff args: ["--fix"] + - repo: https://github.com/tox-dev/pyproject-fmt + rev: "2.3.1" + hooks: + - id: pyproject-fmt - repo: https://github.com/psf/black - rev: 23.12.0 + rev: 24.10.0 hooks: - id: black args: [--line-length, "120"] @@ -23,8 +27,8 @@ repos: rev: v1.1.3 hooks: - id: black-disable-checker - - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.1.0 + - repo: https://github.com/rbubley/mirrors-prettier + rev: v3.3.3 hooks: - id: prettier args: [--prose-wrap=always, --print-width=88] diff --git a/example_project/example_project/urls.py b/example_project/example_project/urls.py index 505e9be6..180436c7 100644 --- a/example_project/example_project/urls.py +++ b/example_project/example_project/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.conf.urls import url, include 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) """ + from django.conf.urls import include try: diff --git a/pyproject.toml b/pyproject.toml index 472b8044..ad11f40b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,121 +1,119 @@ [build-system] -requires = ["setuptools>=67.5.1", "wheel"] build-backend = "setuptools.build_meta" -[tool.setuptools.packages.find] -include = ["survey*"] +requires = [ "setuptools>=67.5.1", "wheel" ] [project] name = "django-survey-and-report" -description = "A django survey app that can export results as CSV or PDF using your native language." version = "1.4.8" +description = "A django survey app that can export results as CSV or PDF using your native language." readme = "README.md" +license = { text = "AGPL-3.0" } authors = [ - {email="pierre.sassoulas@gmail.com", name="Pierre SASSOULAS"} + { email = "pierre.sassoulas@gmail.com", name = "Pierre SASSOULAS" }, ] -license = {text = "AGPL-3.0"} classifiers = [ - "Development Status :: 5 - Production/Stable", - "Natural Language :: English", - "Natural Language :: Russian", - "Natural Language :: Spanish", - "Natural Language :: French", - "Natural Language :: Japanese", - "Natural Language :: Dutch", - "Natural Language :: Chinese (Traditional)", - "Natural Language :: German", - "Natural Language :: Indonesian", - "Natural Language :: Portuguese", - "Natural Language :: Polish", - "Topic :: Utilities", - "Environment :: Web Environment", - "Intended Audience :: Developers", - "License :: OSI Approved :: GNU Affero General Public License v3", - "Operating System :: OS Independent", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "Framework :: Django" + "Development Status :: 5 - Production/Stable", + "Environment :: Web Environment", + "Framework :: Django", + "Intended Audience :: Developers", + "License :: OSI Approved :: GNU Affero General Public License v3", + "Natural Language :: Chinese (Traditional)", + "Natural Language :: Dutch", + "Natural Language :: English", + "Natural Language :: French", + "Natural Language :: German", + "Natural Language :: Indonesian", + "Natural Language :: Japanese", + "Natural Language :: Polish", + "Natural Language :: Portuguese", + "Natural Language :: Russian", + "Natural Language :: Spanish", + "Operating System :: OS Independent", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Topic :: Utilities", ] dependencies = [ - "django>=2.2,<5", - "django-bootstrap-form>=3.4", - "django-tastypie>=0.14.2", - "django-registration>=3.0", - "pytz>=2018.9", - "ordereddict>=1.1", - "pyyaml>=4.2b1", + "django>=2.2,<5", + "django-bootstrap-form>=3.4", + "django-registration>=3", + "django-tastypie>=0.14.2", + "ordereddict>=1.1", + "pytz>=2018.9", + "pyyaml>=4.2b1", ] -[project.urls] -"Source Code" = "https://github.com/Pierre-Sassoulas/django-survey" -"Bug Tracker" = "https://github.com/Pierre-Sassoulas/django-survey/issues" - -[project.optional-dependencies] -dev = [ - "pySankeyBeta~=1.3.0", - "django-rosetta", - "coverage", - "python-coveralls", - "coveralls", - "colorama", - "pylint", - "pylint-django", - "pre-commit" +optional-dependencies.dev = [ + "colorama", + "coverage", + "coveralls", + "django-rosetta", + "pre-commit", + "pylint>=3.3.1", + "pylint-django", + "pysankeybeta~=1.3.0", + "python-coveralls", ] -sankey = [ - "pySankeyBeta~=1.3.0", +optional-dependencies.sankey = [ + "pysankeybeta~=1.3.0", ] +urls."Bug Tracker" = "https://github.com/Pierre-Sassoulas/django-survey/issues" +urls."Source Code" = "https://github.com/Pierre-Sassoulas/django-survey" + +[tool.setuptools.packages.find] +include = [ "survey*" ] [tool.ruff] line-length = 120 - -select = [ - "E", # pycodestyle - "F", # pyflakes - "W", # pycodestyle - "B", # bugbear - "I", # isort - "RUF", # ruff - "UP", # pyupgrade +lint.select = [ + "B", # bugbear + "E", # pycodestyle + "F", # pyflakes + "I", # isort + "RUF", # ruff + "UP", # pyupgrade + "W", # pycodestyle ] - -ignore = [ - "RUF012", # mutable default values in class attributes +lint.ignore = [ + "RUF012", # mutable default values in class attributes ] [tool.pylint.main] -load-plugins ="pylint_django" +load-plugins = "pylint_django" -disable=[ - # I0011 Warning locally suppressed using disable-msg - "I0011", - "no-member", - "missing-docstring", # We don't want docstring everywhere - "too-few-public-methods", # More harmful than beneficial in django project - "too-many-arguments", - "too-many-instance-attributes", - # TODO Fix - "unspecified-encoding", - "inconsistent-return-statements", - "consider-using-with", - "fixme", - "no-else-return", - "imported-auth-user", - "unused-argument", - "arguments-differ", - "consider-using-f-string", - "too-many-branches", - "redefined-builtin", - "superfluous-parens", - "useless-parent-delegation", - "unused-private-member", - "duplicate-code", - "attribute-defined-outside-init", +disable = [ + # I0011 Warning locally suppressed using disable-msg + "I0011", + "no-member", + "missing-docstring", # We don't want docstring everywhere + "too-few-public-methods", # More harmful than beneficial in django project + "too-many-arguments", + "too-many-instance-attributes", + # TODO Fix + "too-many-positional-arguments", # Bad API + "unspecified-encoding", + "inconsistent-return-statements", + "consider-using-with", + "fixme", + "no-else-return", + "imported-auth-user", + "unused-argument", + "arguments-differ", + "consider-using-f-string", + "too-many-branches", + "redefined-builtin", + "superfluous-parens", + "useless-parent-delegation", + "unused-private-member", + "duplicate-code", + "attribute-defined-outside-init", ] -ignore="migrations" -good-names="i,j,k,ex,Run,_,f,e,maxDiff" +ignore = "migrations" +good-names = "i,j,k,ex,Run,_,f,e,maxDiff" max-line-length = 120 diff --git a/survey/apps.py b/survey/apps.py index 413502a0..68414965 100644 --- a/survey/apps.py +++ b/survey/apps.py @@ -2,7 +2,6 @@ class DjangoSurveyAndReportConfig(AppConfig): - """ See https://docs.djangoproject.com/en/2.1/ref/applications/#django.apps.AppConfig """ diff --git a/survey/exporter/survey2x.py b/survey/exporter/survey2x.py index 63d42f8a..5fceabdd 100755 --- a/survey/exporter/survey2x.py +++ b/survey/exporter/survey2x.py @@ -14,7 +14,6 @@ class Survey2X: - """Abstract class for Survey exporter.""" def __init__(self, survey=None): diff --git a/survey/exporter/tex/configuration.py b/survey/exporter/tex/configuration.py index 93db6460..3e3ad210 100755 --- a/survey/exporter/tex/configuration.py +++ b/survey/exporter/tex/configuration.py @@ -68,7 +68,7 @@ def _init_from_file(self, filepath): for survey_name in list(configuration.keys()): self.check_survey_exists(survey_name) if not configuration[survey_name]: - raise ValueError("Nothing in %s's configuration" % survey_name) + raise ValueError(f"Nothing in {survey_name}'s configuration") return configuration def optional_update(self, dict_, update_dict, key): diff --git a/survey/exporter/tex/configuration_builder.py b/survey/exporter/tex/configuration_builder.py index de1f26c0..06071807 100755 --- a/survey/exporter/tex/configuration_builder.py +++ b/survey/exporter/tex/configuration_builder.py @@ -4,7 +4,6 @@ class ConfigurationBuilder(Configuration): - """ Permit to create serializable uninitialized configuration easily. We just use the default dict for a Builder, the user will be able to diff --git a/survey/exporter/tex/latex_file.py b/survey/exporter/tex/latex_file.py index 6c85958d..b1d970cc 100755 --- a/survey/exporter/tex/latex_file.py +++ b/survey/exporter/tex/latex_file.py @@ -5,7 +5,6 @@ class LatexFile: - """Permit to handle the content of a LatexFile""" def __init__(self, document_class, document_option=None, header=None, intro=None, footer=None, date=None, **kwargs): @@ -36,11 +35,11 @@ def header(self): header = "\\documentclass" if self.document_option: header += f"[{self.document_option}]" - header += "{%s}\n" % self.document_class - header += "\\date{%s}\n" % self.date - header += "%s\n" % self._header + header += f"{{{self.document_class}}}\n" + header += f"\\date{{{self.date}}}\n" + header += f"{self._header}\n" header += "\\begin{document}\n" - header += "%s\n" % self.intro + header += f"{self.intro}\n" return header @property diff --git a/survey/exporter/tex/question2tex.py b/survey/exporter/tex/question2tex.py index 811dd8b7..111154ee 100755 --- a/survey/exporter/tex/question2tex.py +++ b/survey/exporter/tex/question2tex.py @@ -10,7 +10,6 @@ class Question2Tex: - """ This class permit to generate latex code directly from the Question object after overriding the tex() function. diff --git a/survey/exporter/tex/question2tex_chart.py b/survey/exporter/tex/question2tex_chart.py index 26ba84b4..de805835 100755 --- a/survey/exporter/tex/question2tex_chart.py +++ b/survey/exporter/tex/question2tex_chart.py @@ -9,7 +9,6 @@ class Question2TexChart(Question2Tex): - """ This class permit to generate latex code directly from the Question object. @@ -52,11 +51,11 @@ def get_colors(self): try: colors.append(self.color[answer]) except (KeyError, ValueError): - msg = "Color for '%s' not provided. You could " % answer - msg += "add '%s: \"red!50\"', in your color config." % answer + msg = f"Color for '{answer}' not provided. You could " + msg += f"add '{answer}: \"red!50\"', in your color config." LOGGER.warning(msg) colors.append(settings.SURVEY_DEFAULT_PIE_COLOR) - return "{%s}" % ", ".join(colors) + return "{{{}}}".format(", ".join(colors)) def get_results(self): """Return a formatted string for a tikz pgf-pie chart.""" @@ -78,9 +77,9 @@ def get_pie_options(self): r"""Return the options of the pie for: \pie[options]{data}""" options = "" if self.pos: - options += "pos={%s}," % self.pos + options += f"pos={{{self.pos}}}," if self.explode: - options += "explode={%s}," % self.explode + options += f"explode={{{self.explode}}}," if self.rotate: options += f"rotate={self.rotate}," if self.radius: diff --git a/survey/exporter/tex/question2tex_raw.py b/survey/exporter/tex/question2tex_raw.py index 3994fd0b..5a3be685 100755 --- a/survey/exporter/tex/question2tex_raw.py +++ b/survey/exporter/tex/question2tex_raw.py @@ -4,7 +4,6 @@ class Question2TexRaw(Question2Tex): - """ This class permit to generate latex code directly from the Question object. diff --git a/survey/exporter/tex/question2tex_sankey.py b/survey/exporter/tex/question2tex_sankey.py index 1633f205..84913be2 100755 --- a/survey/exporter/tex/question2tex_sankey.py +++ b/survey/exporter/tex/question2tex_sankey.py @@ -29,7 +29,6 @@ def __init__(self): class Question2TexSankey(Question2Tex): - """ This class permit to generate latex code directly from the Question object. diff --git a/survey/exporter/tex/survey2tex.py b/survey/exporter/tex/survey2tex.py index c4d82883..8960894e 100755 --- a/survey/exporter/tex/survey2tex.py +++ b/survey/exporter/tex/survey2tex.py @@ -189,7 +189,7 @@ def export_as_tex(modeladmin, request, queryset): try: s2tex.generate_pdf() except subprocess.CalledProcessError as exc: - modeladmin.message_user(request, _("Error during PDF generation: %s" % exc), level=ERROR) + modeladmin.message_user(request, _("Error during PDF generation: {}".format(exc)), level=ERROR) return with open(s2tex.pdf_filename, "rb") as f: response.write(f.read()) diff --git a/survey/locale/de/LC_MESSAGES/django.po b/survey/locale/de/LC_MESSAGES/django.po index 9acc6dde..e6a5f759 100644 --- a/survey/locale/de/LC_MESSAGES/django.po +++ b/survey/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-19 14:50+0000\n" +"POT-Creation-Date: 2024-10-28 22:03+0000\n" "PO-Revision-Date: 2021-01-23 11:53+0000\n" "Last-Translator: b' <>'\n" "Language-Team: LANGUAGE \n" @@ -54,50 +54,50 @@ msgstr "Benutzer" msgid "Export to CSV" msgstr "Exportiere als CSV" -#: survey/exporter/tex/question2tex.py:62 +#: survey/exporter/tex/question2tex.py:61 msgid "with" msgstr "mit" -#: survey/exporter/tex/question2tex.py:64 +#: survey/exporter/tex/question2tex.py:63 #, python-format msgid "%(min_cardinality)d respondents or more" msgid_plural "%(min_cardinality)d respondent or more" msgstr[0] "%(min_cardinality)d Teilnehmer oder mehr" msgstr[1] "%(min_cardinality)d Teilnehmer oder mehr" -#: survey/exporter/tex/question2tex.py:76 +#: survey/exporter/tex/question2tex.py:75 msgid "excluding" msgstr "ausgenommen" -#: survey/exporter/tex/question2tex.py:81 -#: survey/exporter/tex/question2tex.py:115 -#: survey/exporter/tex/question2tex.py:118 +#: survey/exporter/tex/question2tex.py:80 +#: survey/exporter/tex/question2tex.py:114 +#: survey/exporter/tex/question2tex.py:117 msgid "and" msgstr "und" +#: survey/exporter/tex/question2tex.py:111 #: survey/exporter/tex/question2tex.py:112 -#: survey/exporter/tex/question2tex.py:113 msgid "or" msgstr "oder" -#: survey/exporter/tex/question2tex.py:127 +#: survey/exporter/tex/question2tex.py:126 msgid "Repartition of answers" msgstr "Neueinteilung von Antworten" -#: survey/exporter/tex/question2tex_chart.py:66 +#: survey/exporter/tex/question2tex_chart.py:65 msgid "Left blank" msgstr "Frei gelassen" -#: survey/exporter/tex/question2tex_chart.py:111 -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_chart.py:110 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "for the question" msgstr "für die Frage" -#: survey/exporter/tex/question2tex_chart.py:121 +#: survey/exporter/tex/question2tex_chart.py:120 msgid "No answers for this question." msgstr "Keine Antwort auf diese Frage." -#: survey/exporter/tex/question2tex_raw.py:24 +#: survey/exporter/tex/question2tex_raw.py:23 msgid "Participant" msgstr "Teilnehmer" @@ -105,15 +105,15 @@ msgstr "Teilnehmer" msgid "Cannot generate PDF, we need 'pySankeyBeta' to be installed." msgstr "Kann PDF nicht exportieren, denn 'pySankeyBeta' muss installiert sein!" -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "left" msgstr "links" -#: survey/exporter/tex/question2tex_sankey.py:58 +#: survey/exporter/tex/question2tex_sankey.py:57 msgid "in relation with the question" msgstr "in Zusammenhang mit der Frage" -#: survey/exporter/tex/question2tex_sankey.py:60 +#: survey/exporter/tex/question2tex_sankey.py:59 msgid "right" msgstr "rechts" @@ -138,8 +138,9 @@ msgid "Cannot export multiple PDF, choose only one." msgstr "Kann nicht mehrere PDFs exportieren. Es kann nur eins ausgewählt werden." #: survey/exporter/tex/survey2tex.py:192 -#, python-format -msgid "Error during PDF generation: %s" +#, fuzzy +#| msgid "Error during PDF generation: %s" +msgid "Error during PDF generation: {}" msgstr "Fehler beim erstellen des PDFs: %s" #: survey/exporter/tex/survey2tex.py:199 @@ -154,11 +155,11 @@ msgstr "Frage" msgid "Response" msgstr "Antwort" -#: survey/models/answer.py:22 survey/models/response.py:25 +#: survey/models/answer.py:22 survey/models/response.py:24 msgid "Creation date" msgstr "Datum der Erstellung" -#: survey/models/answer.py:23 survey/models/response.py:26 +#: survey/models/answer.py:23 survey/models/response.py:25 msgid "Update date" msgstr "Datum der letzten Bearbeitung" @@ -171,7 +172,7 @@ msgid "Name" msgstr "Name" #: survey/models/category.py:10 survey/models/question.py:77 -#: survey/models/response.py:27 +#: survey/models/response.py:26 msgid "Survey" msgstr "Umfrage" @@ -267,19 +268,19 @@ msgstr "Frage" msgid "questions" msgstr "Fragen" -#: survey/models/response.py:28 +#: survey/models/response.py:27 msgid "User" msgstr "Benutzer" -#: survey/models/response.py:29 +#: survey/models/response.py:28 msgid "Interview unique identifier" msgstr "Interview eindeutiger Identifizierer" -#: survey/models/response.py:32 +#: survey/models/response.py:31 msgid "Set of answers to surveys" msgstr "Satz an Antworten zu Umfragen" -#: survey/models/response.py:33 +#: survey/models/response.py:32 msgid "Sets of answers to surveys" msgstr "Sätze von Antworten zu Umfragen" diff --git a/survey/locale/es/LC_MESSAGES/django.po b/survey/locale/es/LC_MESSAGES/django.po index 66cd766c..57fd3374 100644 --- a/survey/locale/es/LC_MESSAGES/django.po +++ b/survey/locale/es/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-19 14:50+0000\n" +"POT-Creation-Date: 2024-10-28 22:03+0000\n" "PO-Revision-Date: 2018-10-06 20:42+0000\n" "Last-Translator: Javier Ordóñez <>\n" "Language-Team: \n" @@ -54,52 +54,52 @@ msgstr "usuario" msgid "Export to CSV" msgstr "Exporta como CSV" -#: survey/exporter/tex/question2tex.py:62 +#: survey/exporter/tex/question2tex.py:61 msgid "with" msgstr "con" # there is a mistake in the EN singular and plural cases. # Entrevistado refers to all surveyed. -#: survey/exporter/tex/question2tex.py:64 +#: survey/exporter/tex/question2tex.py:63 #, python-format msgid "%(min_cardinality)d respondents or more" msgid_plural "%(min_cardinality)d respondent or more" msgstr[0] "%(min_cardinality)d entrevistado o más" msgstr[1] "%(min_cardinality)d entrevistados o más." -#: survey/exporter/tex/question2tex.py:76 +#: survey/exporter/tex/question2tex.py:75 msgid "excluding" msgstr "excluyendo" -#: survey/exporter/tex/question2tex.py:81 -#: survey/exporter/tex/question2tex.py:115 -#: survey/exporter/tex/question2tex.py:118 +#: survey/exporter/tex/question2tex.py:80 +#: survey/exporter/tex/question2tex.py:114 +#: survey/exporter/tex/question2tex.py:117 msgid "and" msgstr "y" +#: survey/exporter/tex/question2tex.py:111 #: survey/exporter/tex/question2tex.py:112 -#: survey/exporter/tex/question2tex.py:113 msgid "or" msgstr "o" -#: survey/exporter/tex/question2tex.py:127 +#: survey/exporter/tex/question2tex.py:126 msgid "Repartition of answers" msgstr "Distribución de respuestas" -#: survey/exporter/tex/question2tex_chart.py:66 +#: survey/exporter/tex/question2tex_chart.py:65 msgid "Left blank" msgstr "Dejada en blanco" -#: survey/exporter/tex/question2tex_chart.py:111 -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_chart.py:110 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "for the question" msgstr "para la pregunta" -#: survey/exporter/tex/question2tex_chart.py:121 +#: survey/exporter/tex/question2tex_chart.py:120 msgid "No answers for this question." msgstr "No hay respuestas para esta pregunta." -#: survey/exporter/tex/question2tex_raw.py:24 +#: survey/exporter/tex/question2tex_raw.py:23 msgid "Participant" msgstr "Participante" @@ -108,16 +108,16 @@ msgid "Cannot generate PDF, we need 'pySankeyBeta' to be installed." msgstr "No podemos generar el PDF, necesitamos instalar 'pySankeyBeta'" # as in "opposite of right" -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "left" msgstr "izquierda" -#: survey/exporter/tex/question2tex_sankey.py:58 +#: survey/exporter/tex/question2tex_sankey.py:57 msgid "in relation with the question" msgstr "en relación con la pregunta" # as in "opposite of left" -#: survey/exporter/tex/question2tex_sankey.py:60 +#: survey/exporter/tex/question2tex_sankey.py:59 msgid "right" msgstr "derecha" @@ -142,8 +142,9 @@ msgid "Cannot export multiple PDF, choose only one." msgstr "No se pueden exportar varios PDF, elije solo uno." #: survey/exporter/tex/survey2tex.py:192 -#, python-format -msgid "Error during PDF generation: %s" +#, fuzzy +#| msgid "Error during PDF generation: %s" +msgid "Error during PDF generation: {}" msgstr "Error durante la generación del PDF: %s" #: survey/exporter/tex/survey2tex.py:199 @@ -158,11 +159,11 @@ msgstr "Pregunta" msgid "Response" msgstr "Respuesta" -#: survey/models/answer.py:22 survey/models/response.py:25 +#: survey/models/answer.py:22 survey/models/response.py:24 msgid "Creation date" msgstr "Fecha de creación" -#: survey/models/answer.py:23 survey/models/response.py:26 +#: survey/models/answer.py:23 survey/models/response.py:25 msgid "Update date" msgstr "Fecha de actualización" @@ -175,7 +176,7 @@ msgid "Name" msgstr "Nombre" #: survey/models/category.py:10 survey/models/question.py:77 -#: survey/models/response.py:27 +#: survey/models/response.py:26 msgid "Survey" msgstr "Encuesta" @@ -275,19 +276,19 @@ msgstr "pregunta" msgid "questions" msgstr "preguntas" -#: survey/models/response.py:28 +#: survey/models/response.py:27 msgid "User" msgstr "Usuario" -#: survey/models/response.py:29 +#: survey/models/response.py:28 msgid "Interview unique identifier" msgstr "Identificador único de entrevista" -#: survey/models/response.py:32 +#: survey/models/response.py:31 msgid "Set of answers to surveys" msgstr "Conjunto de respuestas a encuestas" -#: survey/models/response.py:33 +#: survey/models/response.py:32 msgid "Sets of answers to surveys" msgstr "Conjuntos de respuestas a encuestas" diff --git a/survey/locale/fr/LC_MESSAGES/django.po b/survey/locale/fr/LC_MESSAGES/django.po index 81f88bd9..f053f45e 100644 --- a/survey/locale/fr/LC_MESSAGES/django.po +++ b/survey/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-19 14:50+0000\n" +"POT-Creation-Date: 2024-10-28 22:03+0000\n" "PO-Revision-Date: 2020-02-23 14:44+0000\n" "Last-Translator: b' <>'\n" "Language-Team: LANGUAGE \n" @@ -54,50 +54,50 @@ msgstr "Utilisateur" msgid "Export to CSV" msgstr "Export vers CSV" -#: survey/exporter/tex/question2tex.py:62 +#: survey/exporter/tex/question2tex.py:61 msgid "with" msgstr "avec" -#: survey/exporter/tex/question2tex.py:64 +#: survey/exporter/tex/question2tex.py:63 #, python-format msgid "%(min_cardinality)d respondents or more" msgid_plural "%(min_cardinality)d respondent or more" msgstr[0] "%(min_cardinality)d réponse ou plus" msgstr[1] "%(min_cardinality)d réponses ou plus" -#: survey/exporter/tex/question2tex.py:76 +#: survey/exporter/tex/question2tex.py:75 msgid "excluding" msgstr "excluant" -#: survey/exporter/tex/question2tex.py:81 -#: survey/exporter/tex/question2tex.py:115 -#: survey/exporter/tex/question2tex.py:118 +#: survey/exporter/tex/question2tex.py:80 +#: survey/exporter/tex/question2tex.py:114 +#: survey/exporter/tex/question2tex.py:117 msgid "and" msgstr "et" +#: survey/exporter/tex/question2tex.py:111 #: survey/exporter/tex/question2tex.py:112 -#: survey/exporter/tex/question2tex.py:113 msgid "or" msgstr "ou" -#: survey/exporter/tex/question2tex.py:127 +#: survey/exporter/tex/question2tex.py:126 msgid "Repartition of answers" msgstr "Répartition des réponses" -#: survey/exporter/tex/question2tex_chart.py:66 +#: survey/exporter/tex/question2tex_chart.py:65 msgid "Left blank" msgstr "Laissé vide" -#: survey/exporter/tex/question2tex_chart.py:111 -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_chart.py:110 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "for the question" msgstr "pour la question" -#: survey/exporter/tex/question2tex_chart.py:121 +#: survey/exporter/tex/question2tex_chart.py:120 msgid "No answers for this question." msgstr "Aucune réponse pour cette question." -#: survey/exporter/tex/question2tex_raw.py:24 +#: survey/exporter/tex/question2tex_raw.py:23 msgid "Participant" msgstr "Participant" @@ -107,15 +107,15 @@ msgstr "Participant" msgid "Cannot generate PDF, we need 'pySankeyBeta' to be installed." msgstr "Impossible de générer le PDF, 'xelatex' doit être installé." -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "left" msgstr "à gauche" -#: survey/exporter/tex/question2tex_sankey.py:58 +#: survey/exporter/tex/question2tex_sankey.py:57 msgid "in relation with the question" msgstr "mise en relation avec la question" -#: survey/exporter/tex/question2tex_sankey.py:60 +#: survey/exporter/tex/question2tex_sankey.py:59 msgid "right" msgstr "à droite" @@ -140,8 +140,9 @@ msgid "Cannot export multiple PDF, choose only one." msgstr "Impossible d'exporter plusieurs PDF, choisissez en un seul." #: survey/exporter/tex/survey2tex.py:192 -#, python-format -msgid "Error during PDF generation: %s" +#, fuzzy +#| msgid "Error during PDF generation: %s" +msgid "Error during PDF generation: {}" msgstr "Erreur durant la génération du PDF: %s" #: survey/exporter/tex/survey2tex.py:199 @@ -156,11 +157,11 @@ msgstr "Question" msgid "Response" msgstr "Réponse" -#: survey/models/answer.py:22 survey/models/response.py:25 +#: survey/models/answer.py:22 survey/models/response.py:24 msgid "Creation date" msgstr "Date de création" -#: survey/models/answer.py:23 survey/models/response.py:26 +#: survey/models/answer.py:23 survey/models/response.py:25 msgid "Update date" msgstr "Date de mise à jour" @@ -173,7 +174,7 @@ msgid "Name" msgstr "Nom" #: survey/models/category.py:10 survey/models/question.py:77 -#: survey/models/response.py:27 +#: survey/models/response.py:26 msgid "Survey" msgstr "Sondage" @@ -269,19 +270,19 @@ msgstr "question" msgid "questions" msgstr "questions" -#: survey/models/response.py:28 +#: survey/models/response.py:27 msgid "User" msgstr "Utilisateur" -#: survey/models/response.py:29 +#: survey/models/response.py:28 msgid "Interview unique identifier" msgstr "Identifiant unique de la réponse" -#: survey/models/response.py:32 +#: survey/models/response.py:31 msgid "Set of answers to surveys" msgstr "Ensemble de réponse aux sondages" -#: survey/models/response.py:33 +#: survey/models/response.py:32 msgid "Sets of answers to surveys" msgstr "Ensembles de réponse aux sondages" diff --git a/survey/locale/gr/LC_MESSAGES/django.po b/survey/locale/gr/LC_MESSAGES/django.po index a3c90bb8..c2fc0913 100644 --- a/survey/locale/gr/LC_MESSAGES/django.po +++ b/survey/locale/gr/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-19 14:55+0000\n" +"POT-Creation-Date: 2024-10-28 22:03+0000\n" "PO-Revision-Date: 2022-04-10 22:53+0000\n" "Last-Translator: b' <>'\n" "Language-Team: \n" @@ -51,50 +51,50 @@ msgstr "χρήστης" msgid "Export to CSV" msgstr "Εξαγωγή ως CSV" -#: survey/exporter/tex/question2tex.py:62 +#: survey/exporter/tex/question2tex.py:61 msgid "with" msgstr "με" -#: survey/exporter/tex/question2tex.py:64 +#: survey/exporter/tex/question2tex.py:63 #, python-format msgid "%(min_cardinality)d respondents or more" msgid_plural "%(min_cardinality)d respondent or more" msgstr[0] "%(min_cardinality)d ερωτώμενους ή περισσότερους" msgstr[1] "%(min_cardinality)d ερωτώμενους ή περισσότερους" -#: survey/exporter/tex/question2tex.py:76 +#: survey/exporter/tex/question2tex.py:75 msgid "excluding" msgstr "εξαιρουμένων" -#: survey/exporter/tex/question2tex.py:81 -#: survey/exporter/tex/question2tex.py:115 -#: survey/exporter/tex/question2tex.py:118 +#: survey/exporter/tex/question2tex.py:80 +#: survey/exporter/tex/question2tex.py:114 +#: survey/exporter/tex/question2tex.py:117 msgid "and" msgstr "και" +#: survey/exporter/tex/question2tex.py:111 #: survey/exporter/tex/question2tex.py:112 -#: survey/exporter/tex/question2tex.py:113 msgid "or" msgstr "ή" -#: survey/exporter/tex/question2tex.py:127 +#: survey/exporter/tex/question2tex.py:126 msgid "Repartition of answers" msgstr "Ανακατανομή των απαντήσεων" -#: survey/exporter/tex/question2tex_chart.py:66 +#: survey/exporter/tex/question2tex_chart.py:65 msgid "Left blank" msgstr "Έμεινε κενό" -#: survey/exporter/tex/question2tex_chart.py:111 -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_chart.py:110 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "for the question" msgstr "για την ερώτηση" -#: survey/exporter/tex/question2tex_chart.py:121 +#: survey/exporter/tex/question2tex_chart.py:120 msgid "No answers for this question." msgstr "Καμία απάντηση για αυτήν την ερώτηση." -#: survey/exporter/tex/question2tex_raw.py:24 +#: survey/exporter/tex/question2tex_raw.py:23 msgid "Participant" msgstr "Συμμετέχων" @@ -102,15 +102,15 @@ msgstr "Συμμετέχων" msgid "Cannot generate PDF, we need 'pySankeyBeta' to be installed." msgstr "Το PDF δεν μπορεί να δημιουργηθεί, χρειαζόμαστε το 'pySankeyBeta' να εγκατασταθεί!" -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "left" msgstr "αριστερά" -#: survey/exporter/tex/question2tex_sankey.py:58 +#: survey/exporter/tex/question2tex_sankey.py:57 msgid "in relation with the question" msgstr "σε σχέση με την ερώτηση" -#: survey/exporter/tex/question2tex_sankey.py:60 +#: survey/exporter/tex/question2tex_sankey.py:59 msgid "right" msgstr "δεξιά" @@ -135,8 +135,9 @@ msgid "Cannot export multiple PDF, choose only one." msgstr "Δεν είναι δυνατή η εξαγωγή πολλών PDF, επιλέξτε μόνο ένα." #: survey/exporter/tex/survey2tex.py:192 -#, python-format -msgid "Error during PDF generation: %s" +#, fuzzy +#| msgid "Error during PDF generation: %s" +msgid "Error during PDF generation: {}" msgstr "Σφάλμα κατά τη δημιουργία PDF: %s" #: survey/exporter/tex/survey2tex.py:199 @@ -151,11 +152,11 @@ msgstr "Ερώτηση" msgid "Response" msgstr "Απάντηση" -#: survey/models/answer.py:22 survey/models/response.py:25 +#: survey/models/answer.py:22 survey/models/response.py:24 msgid "Creation date" msgstr "Ημερομηνία δημιουργίας" -#: survey/models/answer.py:23 survey/models/response.py:26 +#: survey/models/answer.py:23 survey/models/response.py:25 msgid "Update date" msgstr "Ημερομηνία ενημέρωσης" @@ -168,7 +169,7 @@ msgid "Name" msgstr "Όνομα" #: survey/models/category.py:10 survey/models/question.py:77 -#: survey/models/response.py:27 +#: survey/models/response.py:26 msgid "Survey" msgstr "Έρευνα" @@ -268,19 +269,19 @@ msgstr "ερώτηση" msgid "questions" msgstr "ερωτήσεις" -#: survey/models/response.py:28 +#: survey/models/response.py:27 msgid "User" msgstr "Χρήστης" -#: survey/models/response.py:29 +#: survey/models/response.py:28 msgid "Interview unique identifier" msgstr "Μοναδικό αναγνωριστικό της συνέντευξης" -#: survey/models/response.py:32 +#: survey/models/response.py:31 msgid "Set of answers to surveys" msgstr "Σύνολο απαντήσεων σε έρευνες" -#: survey/models/response.py:33 +#: survey/models/response.py:32 msgid "Sets of answers to surveys" msgstr "Σύνολα απαντήσεων σε έρευνες" diff --git a/survey/locale/id/LC_MESSAGES/django.po b/survey/locale/id/LC_MESSAGES/django.po index 9a771e88..c8242ef9 100644 --- a/survey/locale/id/LC_MESSAGES/django.po +++ b/survey/locale/id/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-19 14:50+0000\n" +"POT-Creation-Date: 2024-10-28 22:03+0000\n" "PO-Revision-Date: 2020-10-04 15:40+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,49 +54,49 @@ msgstr "pengguna" msgid "Export to CSV" msgstr "Ekspor sebagai CSV" -#: survey/exporter/tex/question2tex.py:62 +#: survey/exporter/tex/question2tex.py:61 msgid "with" msgstr "dengan" -#: survey/exporter/tex/question2tex.py:64 +#: survey/exporter/tex/question2tex.py:63 #, python-format msgid "%(min_cardinality)d respondents or more" msgid_plural "%(min_cardinality)d respondent or more" msgstr[0] "%(min_cardinality)d responden atau lebih" -#: survey/exporter/tex/question2tex.py:76 +#: survey/exporter/tex/question2tex.py:75 msgid "excluding" msgstr "selain" -#: survey/exporter/tex/question2tex.py:81 -#: survey/exporter/tex/question2tex.py:115 -#: survey/exporter/tex/question2tex.py:118 +#: survey/exporter/tex/question2tex.py:80 +#: survey/exporter/tex/question2tex.py:114 +#: survey/exporter/tex/question2tex.py:117 msgid "and" msgstr "dan" +#: survey/exporter/tex/question2tex.py:111 #: survey/exporter/tex/question2tex.py:112 -#: survey/exporter/tex/question2tex.py:113 msgid "or" msgstr "atau" -#: survey/exporter/tex/question2tex.py:127 +#: survey/exporter/tex/question2tex.py:126 msgid "Repartition of answers" msgstr "Partisi ulang respon-respon" -#: survey/exporter/tex/question2tex_chart.py:66 +#: survey/exporter/tex/question2tex_chart.py:65 msgid "Left blank" msgstr "Dikosongkan saja" -#: survey/exporter/tex/question2tex_chart.py:111 -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_chart.py:110 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "for the question" msgstr "untuk pertanyaan" -#: survey/exporter/tex/question2tex_chart.py:121 +#: survey/exporter/tex/question2tex_chart.py:120 msgid "No answers for this question." msgstr "Tidak ada jawaban untuk pertanyaan ini." -#: survey/exporter/tex/question2tex_raw.py:24 +#: survey/exporter/tex/question2tex_raw.py:23 msgid "Participant" msgstr "Partisipan" @@ -104,15 +104,15 @@ msgstr "Partisipan" msgid "Cannot generate PDF, we need 'pySankeyBeta' to be installed." msgstr "Tidak dapat menghasilkan PDF, 'pySankeyBeta' perlu dipasang terlebih dahulu" -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "left" msgstr "kiri" -#: survey/exporter/tex/question2tex_sankey.py:58 +#: survey/exporter/tex/question2tex_sankey.py:57 msgid "in relation with the question" msgstr "hubungannya dengan pertanyaan" -#: survey/exporter/tex/question2tex_sankey.py:60 +#: survey/exporter/tex/question2tex_sankey.py:59 msgid "right" msgstr "kanan" @@ -137,8 +137,9 @@ msgid "Cannot export multiple PDF, choose only one." msgstr "Tidak dapat ekspor beberapa PDF sekaligus, pilih satu saja." #: survey/exporter/tex/survey2tex.py:192 -#, python-format -msgid "Error during PDF generation: %s" +#, fuzzy +#| msgid "Error during PDF generation: %s" +msgid "Error during PDF generation: {}" msgstr "Terjadi kesalahan dalam membuat berkas PDF: %s" #: survey/exporter/tex/survey2tex.py:199 @@ -153,11 +154,11 @@ msgstr "Pertanyaan" msgid "Response" msgstr "Respon" -#: survey/models/answer.py:22 survey/models/response.py:25 +#: survey/models/answer.py:22 survey/models/response.py:24 msgid "Creation date" msgstr "Tanggal pembuatan" -#: survey/models/answer.py:23 survey/models/response.py:26 +#: survey/models/answer.py:23 survey/models/response.py:25 msgid "Update date" msgstr "Tanggal pembaruan" @@ -170,7 +171,7 @@ msgid "Name" msgstr "Nama" #: survey/models/category.py:10 survey/models/question.py:77 -#: survey/models/response.py:27 +#: survey/models/response.py:26 msgid "Survey" msgstr "Survei" @@ -270,19 +271,19 @@ msgstr "pertanyaan" msgid "questions" msgstr "pertanyaan-pertanyaan" -#: survey/models/response.py:28 +#: survey/models/response.py:27 msgid "User" msgstr "Pengguna" -#: survey/models/response.py:29 +#: survey/models/response.py:28 msgid "Interview unique identifier" msgstr "ID wawancara (unik)" -#: survey/models/response.py:32 +#: survey/models/response.py:31 msgid "Set of answers to surveys" msgstr "Kumpulan jawaban dari survei" -#: survey/models/response.py:33 +#: survey/models/response.py:32 msgid "Sets of answers to surveys" msgstr "Kumpulan jawaban dari survei" diff --git a/survey/locale/ja/LC_MESSAGES/django.po b/survey/locale/ja/LC_MESSAGES/django.po index a66e0400..ea7d62b7 100644 --- a/survey/locale/ja/LC_MESSAGES/django.po +++ b/survey/locale/ja/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-19 14:50+0000\n" +"POT-Creation-Date: 2024-10-28 22:03+0000\n" "PO-Revision-Date: 2018-04-09 00:52+0000\n" "Last-Translator: b' '\n" "Language-Team: LANGUAGE \n" @@ -53,50 +53,50 @@ msgstr "" msgid "Export to CSV" msgstr "" -#: survey/exporter/tex/question2tex.py:62 +#: survey/exporter/tex/question2tex.py:61 msgid "with" msgstr "と一緒に" -#: survey/exporter/tex/question2tex.py:64 +#: survey/exporter/tex/question2tex.py:63 #, python-format msgid "%(min_cardinality)d respondents or more" msgid_plural "%(min_cardinality)d respondent or more" msgstr[0] "%(min_cardinality)d 回答者数またはそれ以上" msgstr[1] "%(min_cardinality)d 回答者数またはそれ以上" -#: survey/exporter/tex/question2tex.py:76 +#: survey/exporter/tex/question2tex.py:75 msgid "excluding" msgstr "除く" -#: survey/exporter/tex/question2tex.py:81 -#: survey/exporter/tex/question2tex.py:115 -#: survey/exporter/tex/question2tex.py:118 +#: survey/exporter/tex/question2tex.py:80 +#: survey/exporter/tex/question2tex.py:114 +#: survey/exporter/tex/question2tex.py:117 msgid "and" msgstr "かつ" +#: survey/exporter/tex/question2tex.py:111 #: survey/exporter/tex/question2tex.py:112 -#: survey/exporter/tex/question2tex.py:113 msgid "or" msgstr "または" -#: survey/exporter/tex/question2tex.py:127 +#: survey/exporter/tex/question2tex.py:126 msgid "Repartition of answers" msgstr "回答の再分割" -#: survey/exporter/tex/question2tex_chart.py:66 +#: survey/exporter/tex/question2tex_chart.py:65 msgid "Left blank" msgstr "空白のまま" -#: survey/exporter/tex/question2tex_chart.py:111 -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_chart.py:110 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "for the question" msgstr "質問の為に" -#: survey/exporter/tex/question2tex_chart.py:121 +#: survey/exporter/tex/question2tex_chart.py:120 msgid "No answers for this question." msgstr "この質問に答えない" -#: survey/exporter/tex/question2tex_raw.py:24 +#: survey/exporter/tex/question2tex_raw.py:23 msgid "Participant" msgstr "参加者" @@ -104,15 +104,15 @@ msgstr "参加者" msgid "Cannot generate PDF, we need 'pySankeyBeta' to be installed." msgstr "" -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "left" msgstr "左" -#: survey/exporter/tex/question2tex_sankey.py:58 +#: survey/exporter/tex/question2tex_sankey.py:57 msgid "in relation with the question" msgstr "質問に関連して" -#: survey/exporter/tex/question2tex_sankey.py:60 +#: survey/exporter/tex/question2tex_sankey.py:59 msgid "right" msgstr "右" @@ -137,8 +137,7 @@ msgid "Cannot export multiple PDF, choose only one." msgstr "" #: survey/exporter/tex/survey2tex.py:192 -#, python-format -msgid "Error during PDF generation: %s" +msgid "Error during PDF generation: {}" msgstr "" #: survey/exporter/tex/survey2tex.py:199 @@ -153,11 +152,11 @@ msgstr "質問" msgid "Response" msgstr "反応" -#: survey/models/answer.py:22 survey/models/response.py:25 +#: survey/models/answer.py:22 survey/models/response.py:24 msgid "Creation date" msgstr "作成日" -#: survey/models/answer.py:23 survey/models/response.py:26 +#: survey/models/answer.py:23 survey/models/response.py:25 msgid "Update date" msgstr "更新日" @@ -170,7 +169,7 @@ msgid "Name" msgstr "名前" #: survey/models/category.py:10 survey/models/question.py:77 -#: survey/models/response.py:27 +#: survey/models/response.py:26 msgid "Survey" msgstr "調査" @@ -266,19 +265,19 @@ msgstr "質問" msgid "questions" msgstr "質問" -#: survey/models/response.py:28 +#: survey/models/response.py:27 msgid "User" msgstr "ユーザー" -#: survey/models/response.py:29 +#: survey/models/response.py:28 msgid "Interview unique identifier" msgstr "インタービューのユニークな識別子" -#: survey/models/response.py:32 +#: survey/models/response.py:31 msgid "Set of answers to surveys" msgstr "調査に対する回答集" -#: survey/models/response.py:33 +#: survey/models/response.py:32 msgid "Sets of answers to surveys" msgstr "調査に対する回答セット" diff --git a/survey/locale/nl/LC_MESSAGES/django.po b/survey/locale/nl/LC_MESSAGES/django.po index 8a65a561..d7b1044c 100644 --- a/survey/locale/nl/LC_MESSAGES/django.po +++ b/survey/locale/nl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-19 14:50+0000\n" +"POT-Creation-Date: 2024-10-28 22:03+0000\n" "PO-Revision-Date: 2021-01-23 11:53+0000\n" "Last-Translator: b' <>'\n" "Language-Team: LANGUAGE \n" @@ -53,50 +53,50 @@ msgstr "gebruiker" msgid "Export to CSV" msgstr "Exporteer als CSV" -#: survey/exporter/tex/question2tex.py:62 +#: survey/exporter/tex/question2tex.py:61 msgid "with" msgstr "met" -#: survey/exporter/tex/question2tex.py:64 +#: survey/exporter/tex/question2tex.py:63 #, python-format msgid "%(min_cardinality)d respondents or more" msgid_plural "%(min_cardinality)d respondent or more" msgstr[0] "%(min_cardinality)d respondent of meer" msgstr[1] "%(min_cardinality)d respondenten of meerr" -#: survey/exporter/tex/question2tex.py:76 +#: survey/exporter/tex/question2tex.py:75 msgid "excluding" msgstr "uitgesloten" -#: survey/exporter/tex/question2tex.py:81 -#: survey/exporter/tex/question2tex.py:115 -#: survey/exporter/tex/question2tex.py:118 +#: survey/exporter/tex/question2tex.py:80 +#: survey/exporter/tex/question2tex.py:114 +#: survey/exporter/tex/question2tex.py:117 msgid "and" msgstr "en" +#: survey/exporter/tex/question2tex.py:111 #: survey/exporter/tex/question2tex.py:112 -#: survey/exporter/tex/question2tex.py:113 msgid "or" msgstr "of" -#: survey/exporter/tex/question2tex.py:127 +#: survey/exporter/tex/question2tex.py:126 msgid "Repartition of answers" msgstr "Terughalen van de antwoorden" -#: survey/exporter/tex/question2tex_chart.py:66 +#: survey/exporter/tex/question2tex_chart.py:65 msgid "Left blank" msgstr "Leeg gelaten" -#: survey/exporter/tex/question2tex_chart.py:111 -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_chart.py:110 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "for the question" msgstr "voor de vraag" -#: survey/exporter/tex/question2tex_chart.py:121 +#: survey/exporter/tex/question2tex_chart.py:120 msgid "No answers for this question." msgstr "Geen antwoord op deze vraag." -#: survey/exporter/tex/question2tex_raw.py:24 +#: survey/exporter/tex/question2tex_raw.py:23 msgid "Participant" msgstr "Deelnemer" @@ -104,15 +104,15 @@ msgstr "Deelnemer" msgid "Cannot generate PDF, we need 'pySankeyBeta' to be installed." msgstr "Kan geen PDF exporteren. Installeer 'pySankeyBeta' door middel van " -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "left" msgstr "links" -#: survey/exporter/tex/question2tex_sankey.py:58 +#: survey/exporter/tex/question2tex_sankey.py:57 msgid "in relation with the question" msgstr "in relatie met de vraag" -#: survey/exporter/tex/question2tex_sankey.py:60 +#: survey/exporter/tex/question2tex_sankey.py:59 msgid "right" msgstr "rechts" @@ -137,8 +137,9 @@ msgid "Cannot export multiple PDF, choose only one." msgstr "Kan geen meerdere PDF bestanden exporteren. Kies er een." #: survey/exporter/tex/survey2tex.py:192 -#, python-format -msgid "Error during PDF generation: %s" +#, fuzzy +#| msgid "Error during PDF generation: %s" +msgid "Error during PDF generation: {}" msgstr "Fout tijdens het genereren van PDFs: %s" #: survey/exporter/tex/survey2tex.py:199 @@ -153,11 +154,11 @@ msgstr "Vraag" msgid "Response" msgstr "Antwoord" -#: survey/models/answer.py:22 survey/models/response.py:25 +#: survey/models/answer.py:22 survey/models/response.py:24 msgid "Creation date" msgstr "Creatie datum" -#: survey/models/answer.py:23 survey/models/response.py:26 +#: survey/models/answer.py:23 survey/models/response.py:25 msgid "Update date" msgstr "Update datum" @@ -170,7 +171,7 @@ msgid "Name" msgstr "Naam" #: survey/models/category.py:10 survey/models/question.py:77 -#: survey/models/response.py:27 +#: survey/models/response.py:26 msgid "Survey" msgstr "Survey" @@ -266,19 +267,19 @@ msgstr "vraag" msgid "questions" msgstr "vragen" -#: survey/models/response.py:28 +#: survey/models/response.py:27 msgid "User" msgstr "Gebruiker" -#: survey/models/response.py:29 +#: survey/models/response.py:28 msgid "Interview unique identifier" msgstr "Interview unieke identifier" -#: survey/models/response.py:32 +#: survey/models/response.py:31 msgid "Set of answers to surveys" msgstr "Verzameling van survey antwoorden" -#: survey/models/response.py:33 +#: survey/models/response.py:32 msgid "Sets of answers to surveys" msgstr "Verzmaleing van survey antwoorden" diff --git a/survey/locale/pl/LC_MESSAGES/django.po b/survey/locale/pl/LC_MESSAGES/django.po index 27b1579b..7ab64e52 100644 --- a/survey/locale/pl/LC_MESSAGES/django.po +++ b/survey/locale/pl/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-19 14:50+0000\n" +"POT-Creation-Date: 2024-10-28 22:03+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -53,50 +53,50 @@ msgstr "użytkownik" msgid "Export to CSV" msgstr "Eksportuj do CSV" -#: survey/exporter/tex/question2tex.py:62 +#: survey/exporter/tex/question2tex.py:61 msgid "with" msgstr "z" -#: survey/exporter/tex/question2tex.py:64 +#: survey/exporter/tex/question2tex.py:63 #, python-format msgid "%(min_cardinality)d respondents or more" msgid_plural "%(min_cardinality)d respondent or more" msgstr[0] "%(min_cardinality)d respondentów lub więcej" msgstr[1] "%(min_cardinality)d respondent lub więcej" -#: survey/exporter/tex/question2tex.py:76 +#: survey/exporter/tex/question2tex.py:75 msgid "excluding" msgstr "wyłączając" -#: survey/exporter/tex/question2tex.py:81 -#: survey/exporter/tex/question2tex.py:115 -#: survey/exporter/tex/question2tex.py:118 +#: survey/exporter/tex/question2tex.py:80 +#: survey/exporter/tex/question2tex.py:114 +#: survey/exporter/tex/question2tex.py:117 msgid "and" msgstr "i" +#: survey/exporter/tex/question2tex.py:111 #: survey/exporter/tex/question2tex.py:112 -#: survey/exporter/tex/question2tex.py:113 msgid "or" msgstr "lub" -#: survey/exporter/tex/question2tex.py:127 +#: survey/exporter/tex/question2tex.py:126 msgid "Repartition of answers" msgstr "Podział odpowiedzi" -#: survey/exporter/tex/question2tex_chart.py:66 +#: survey/exporter/tex/question2tex_chart.py:65 msgid "Left blank" msgstr "Pozostaw puste" -#: survey/exporter/tex/question2tex_chart.py:111 -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_chart.py:110 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "for the question" msgstr "dla pytania" -#: survey/exporter/tex/question2tex_chart.py:121 +#: survey/exporter/tex/question2tex_chart.py:120 msgid "No answers for this question." msgstr "Brak odpowiedzi na to pytanie." -#: survey/exporter/tex/question2tex_raw.py:24 +#: survey/exporter/tex/question2tex_raw.py:23 msgid "Participant" msgstr "Uczestnik" @@ -104,15 +104,15 @@ msgstr "Uczestnik" msgid "Cannot generate PDF, we need 'pySankeyBeta' to be installed." msgstr "Nie można utworzyć PDF, wymagana instalacja 'pySankeyBeta'." -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "left" msgstr "lewo" -#: survey/exporter/tex/question2tex_sankey.py:58 +#: survey/exporter/tex/question2tex_sankey.py:57 msgid "in relation with the question" msgstr "w związku z pytaniem" -#: survey/exporter/tex/question2tex_sankey.py:60 +#: survey/exporter/tex/question2tex_sankey.py:59 msgid "right" msgstr "prawo" @@ -137,8 +137,9 @@ msgid "Cannot export multiple PDF, choose only one." msgstr "Nie można eksportować wielu PDF, wybierz tylko jeden." #: survey/exporter/tex/survey2tex.py:192 -#, python-format -msgid "Error during PDF generation: %s" +#, fuzzy +#| msgid "Error during PDF generation: %s" +msgid "Error during PDF generation: {}" msgstr "Błąd podczas generowania PDF: %s" #: survey/exporter/tex/survey2tex.py:199 @@ -153,11 +154,11 @@ msgstr "Pytanie" msgid "Response" msgstr "Odpowiedź" -#: survey/models/answer.py:22 survey/models/response.py:25 +#: survey/models/answer.py:22 survey/models/response.py:24 msgid "Creation date" msgstr "Data utworzenia" -#: survey/models/answer.py:23 survey/models/response.py:26 +#: survey/models/answer.py:23 survey/models/response.py:25 msgid "Update date" msgstr "Zaktualizuj datę" @@ -170,7 +171,7 @@ msgid "Name" msgstr "Imię" #: survey/models/category.py:10 survey/models/question.py:77 -#: survey/models/response.py:27 +#: survey/models/response.py:26 msgid "Survey" msgstr "Ankieta" @@ -270,19 +271,19 @@ msgstr "pytanie" msgid "questions" msgstr "pytania" -#: survey/models/response.py:28 +#: survey/models/response.py:27 msgid "User" msgstr "Użytkownik" -#: survey/models/response.py:29 +#: survey/models/response.py:28 msgid "Interview unique identifier" msgstr "Unikalny identyfikator wywiadu" -#: survey/models/response.py:32 +#: survey/models/response.py:31 msgid "Set of answers to surveys" msgstr "Zestaw odpowiedzi do ankiet" -#: survey/models/response.py:33 +#: survey/models/response.py:32 msgid "Sets of answers to surveys" msgstr "Zestawy odpowiedzi do ankiet" diff --git a/survey/locale/pt/LC_MESSAGES/django.po b/survey/locale/pt/LC_MESSAGES/django.po index 706fa987..761c5754 100644 --- a/survey/locale/pt/LC_MESSAGES/django.po +++ b/survey/locale/pt/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-19 14:50+0000\n" +"POT-Creation-Date: 2024-10-28 22:03+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -53,50 +53,50 @@ msgstr "" msgid "Export to CSV" msgstr "" -#: survey/exporter/tex/question2tex.py:62 +#: survey/exporter/tex/question2tex.py:61 msgid "with" msgstr "" -#: survey/exporter/tex/question2tex.py:64 +#: survey/exporter/tex/question2tex.py:63 #, python-format msgid "%(min_cardinality)d respondents or more" msgid_plural "%(min_cardinality)d respondent or more" msgstr[0] "" msgstr[1] "" -#: survey/exporter/tex/question2tex.py:76 +#: survey/exporter/tex/question2tex.py:75 msgid "excluding" msgstr "" -#: survey/exporter/tex/question2tex.py:81 -#: survey/exporter/tex/question2tex.py:115 -#: survey/exporter/tex/question2tex.py:118 +#: survey/exporter/tex/question2tex.py:80 +#: survey/exporter/tex/question2tex.py:114 +#: survey/exporter/tex/question2tex.py:117 msgid "and" msgstr "" +#: survey/exporter/tex/question2tex.py:111 #: survey/exporter/tex/question2tex.py:112 -#: survey/exporter/tex/question2tex.py:113 msgid "or" msgstr "" -#: survey/exporter/tex/question2tex.py:127 +#: survey/exporter/tex/question2tex.py:126 msgid "Repartition of answers" msgstr "" -#: survey/exporter/tex/question2tex_chart.py:66 +#: survey/exporter/tex/question2tex_chart.py:65 msgid "Left blank" msgstr "" -#: survey/exporter/tex/question2tex_chart.py:111 -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_chart.py:110 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "for the question" msgstr "" -#: survey/exporter/tex/question2tex_chart.py:121 +#: survey/exporter/tex/question2tex_chart.py:120 msgid "No answers for this question." msgstr "" -#: survey/exporter/tex/question2tex_raw.py:24 +#: survey/exporter/tex/question2tex_raw.py:23 msgid "Participant" msgstr "" @@ -104,15 +104,15 @@ msgstr "" msgid "Cannot generate PDF, we need 'pySankeyBeta' to be installed." msgstr "" -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "left" msgstr "" -#: survey/exporter/tex/question2tex_sankey.py:58 +#: survey/exporter/tex/question2tex_sankey.py:57 msgid "in relation with the question" msgstr "" -#: survey/exporter/tex/question2tex_sankey.py:60 +#: survey/exporter/tex/question2tex_sankey.py:59 msgid "right" msgstr "" @@ -137,8 +137,7 @@ msgid "Cannot export multiple PDF, choose only one." msgstr "" #: survey/exporter/tex/survey2tex.py:192 -#, python-format -msgid "Error during PDF generation: %s" +msgid "Error during PDF generation: {}" msgstr "" #: survey/exporter/tex/survey2tex.py:199 @@ -153,11 +152,11 @@ msgstr "" msgid "Response" msgstr "" -#: survey/models/answer.py:22 survey/models/response.py:25 +#: survey/models/answer.py:22 survey/models/response.py:24 msgid "Creation date" msgstr "" -#: survey/models/answer.py:23 survey/models/response.py:26 +#: survey/models/answer.py:23 survey/models/response.py:25 msgid "Update date" msgstr "" @@ -170,7 +169,7 @@ msgid "Name" msgstr "" #: survey/models/category.py:10 survey/models/question.py:77 -#: survey/models/response.py:27 +#: survey/models/response.py:26 msgid "Survey" msgstr "" @@ -266,19 +265,19 @@ msgstr "" msgid "questions" msgstr "" -#: survey/models/response.py:28 +#: survey/models/response.py:27 msgid "User" msgstr "" -#: survey/models/response.py:29 +#: survey/models/response.py:28 msgid "Interview unique identifier" msgstr "" -#: survey/models/response.py:32 +#: survey/models/response.py:31 msgid "Set of answers to surveys" msgstr "" -#: survey/models/response.py:33 +#: survey/models/response.py:32 msgid "Sets of answers to surveys" msgstr "" diff --git a/survey/locale/ru/LC_MESSAGES/django.po b/survey/locale/ru/LC_MESSAGES/django.po index 0b9f0f66..a51a4806 100644 --- a/survey/locale/ru/LC_MESSAGES/django.po +++ b/survey/locale/ru/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-19 14:50+0000\n" +"POT-Creation-Date: 2024-10-28 22:03+0000\n" "PO-Revision-Date: 2019-03-10 22:53+0230\n" "Last-Translator: b' '\n" "Language-Team: \n" @@ -54,52 +54,52 @@ msgstr "" msgid "Export to CSV" msgstr "" -#: survey/exporter/tex/question2tex.py:62 +#: survey/exporter/tex/question2tex.py:61 msgid "with" msgstr "с" # there is a mistake in the EN singular and plural cases. # Entrevistado reffers to all surveyed. -#: survey/exporter/tex/question2tex.py:64 +#: survey/exporter/tex/question2tex.py:63 #, python-format msgid "%(min_cardinality)d respondents or more" msgid_plural "%(min_cardinality)d respondent or more" msgstr[0] "%(min_cardinality)d отвечает или более" msgstr[1] "%(min_cardinality)d отвечают или более" -#: survey/exporter/tex/question2tex.py:76 +#: survey/exporter/tex/question2tex.py:75 msgid "excluding" msgstr "за исключением" -#: survey/exporter/tex/question2tex.py:81 -#: survey/exporter/tex/question2tex.py:115 -#: survey/exporter/tex/question2tex.py:118 +#: survey/exporter/tex/question2tex.py:80 +#: survey/exporter/tex/question2tex.py:114 +#: survey/exporter/tex/question2tex.py:117 msgid "and" msgstr "и" +#: survey/exporter/tex/question2tex.py:111 #: survey/exporter/tex/question2tex.py:112 -#: survey/exporter/tex/question2tex.py:113 msgid "or" msgstr "или" -#: survey/exporter/tex/question2tex.py:127 +#: survey/exporter/tex/question2tex.py:126 msgid "Repartition of answers" msgstr "Перераспределение ответов" -#: survey/exporter/tex/question2tex_chart.py:66 +#: survey/exporter/tex/question2tex_chart.py:65 msgid "Left blank" msgstr "Оставить пустым" -#: survey/exporter/tex/question2tex_chart.py:111 -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_chart.py:110 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "for the question" msgstr "для вопроса" -#: survey/exporter/tex/question2tex_chart.py:121 +#: survey/exporter/tex/question2tex_chart.py:120 msgid "No answers for this question." msgstr "Нет ответов для этого вопроса." -#: survey/exporter/tex/question2tex_raw.py:24 +#: survey/exporter/tex/question2tex_raw.py:23 msgid "Participant" msgstr "Участник" @@ -108,16 +108,16 @@ msgid "Cannot generate PDF, we need 'pySankeyBeta' to be installed." msgstr "" # as in "opposite of right" -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "left" msgstr "не правильно" -#: survey/exporter/tex/question2tex_sankey.py:58 +#: survey/exporter/tex/question2tex_sankey.py:57 msgid "in relation with the question" msgstr "в связи с вопросом" # as in "opposite of left" -#: survey/exporter/tex/question2tex_sankey.py:60 +#: survey/exporter/tex/question2tex_sankey.py:59 msgid "right" msgstr "правильно" @@ -142,8 +142,7 @@ msgid "Cannot export multiple PDF, choose only one." msgstr "" #: survey/exporter/tex/survey2tex.py:192 -#, python-format -msgid "Error during PDF generation: %s" +msgid "Error during PDF generation: {}" msgstr "" #: survey/exporter/tex/survey2tex.py:199 @@ -158,11 +157,11 @@ msgstr "Вопрос" msgid "Response" msgstr "Ответ" -#: survey/models/answer.py:22 survey/models/response.py:25 +#: survey/models/answer.py:22 survey/models/response.py:24 msgid "Creation date" msgstr "Дата создания" -#: survey/models/answer.py:23 survey/models/response.py:26 +#: survey/models/answer.py:23 survey/models/response.py:25 msgid "Update date" msgstr "Дата обновления" @@ -175,7 +174,7 @@ msgid "Name" msgstr "Название" #: survey/models/category.py:10 survey/models/question.py:77 -#: survey/models/response.py:27 +#: survey/models/response.py:26 msgid "Survey" msgstr "Тест" @@ -276,19 +275,19 @@ msgstr "вопрос" msgid "questions" msgstr "вопросы" -#: survey/models/response.py:28 +#: survey/models/response.py:27 msgid "User" msgstr "Пользователь" -#: survey/models/response.py:29 +#: survey/models/response.py:28 msgid "Interview unique identifier" msgstr "Уникальный идентификатор интервью" -#: survey/models/response.py:32 +#: survey/models/response.py:31 msgid "Set of answers to surveys" msgstr "Набор ответов на опросы" -#: survey/models/response.py:33 +#: survey/models/response.py:32 msgid "Sets of answers to surveys" msgstr "Наборы ответов на опросы" diff --git a/survey/locale/tr/LC_MESSAGES/django.po b/survey/locale/tr/LC_MESSAGES/django.po index 206667f8..a2147b42 100644 --- a/survey/locale/tr/LC_MESSAGES/django.po +++ b/survey/locale/tr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-19 14:50+0000\n" +"POT-Creation-Date: 2024-10-28 22:03+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -53,50 +53,50 @@ msgstr "kullanıcı" msgid "Export to CSV" msgstr "CSV'ye aktar" -#: survey/exporter/tex/question2tex.py:62 +#: survey/exporter/tex/question2tex.py:61 msgid "with" msgstr "ile" -#: survey/exporter/tex/question2tex.py:64 +#: survey/exporter/tex/question2tex.py:63 #, python-format msgid "%(min_cardinality)d respondents or more" msgid_plural "%(min_cardinality)d respondent or more" msgstr[0] "%(min_cardinality)d veya daha fazla katılımcı" msgstr[1] "%(min_cardinality)d veya daha fazla katılımcı" -#: survey/exporter/tex/question2tex.py:76 +#: survey/exporter/tex/question2tex.py:75 msgid "excluding" msgstr "hariç" -#: survey/exporter/tex/question2tex.py:81 -#: survey/exporter/tex/question2tex.py:115 -#: survey/exporter/tex/question2tex.py:118 +#: survey/exporter/tex/question2tex.py:80 +#: survey/exporter/tex/question2tex.py:114 +#: survey/exporter/tex/question2tex.py:117 msgid "and" msgstr "ve" +#: survey/exporter/tex/question2tex.py:111 #: survey/exporter/tex/question2tex.py:112 -#: survey/exporter/tex/question2tex.py:113 msgid "or" msgstr "veya" -#: survey/exporter/tex/question2tex.py:127 +#: survey/exporter/tex/question2tex.py:126 msgid "Repartition of answers" msgstr "Yanıtların yeniden bölümlendirilmesi" -#: survey/exporter/tex/question2tex_chart.py:66 +#: survey/exporter/tex/question2tex_chart.py:65 msgid "Left blank" msgstr "Boşluk bırak" -#: survey/exporter/tex/question2tex_chart.py:111 -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_chart.py:110 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "for the question" msgstr "soru için" -#: survey/exporter/tex/question2tex_chart.py:121 +#: survey/exporter/tex/question2tex_chart.py:120 msgid "No answers for this question." msgstr "Bu soru için hiç yanıt yok." -#: survey/exporter/tex/question2tex_raw.py:24 +#: survey/exporter/tex/question2tex_raw.py:23 msgid "Participant" msgstr "Katılımcı" @@ -104,15 +104,15 @@ msgstr "Katılımcı" msgid "Cannot generate PDF, we need 'pySankeyBeta' to be installed." msgstr "PDF oluşturulamıyor, 'pySankeyBeta'nın indilmesine ihtiyacımız var." -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "left" msgstr "sol" -#: survey/exporter/tex/question2tex_sankey.py:58 +#: survey/exporter/tex/question2tex_sankey.py:57 msgid "in relation with the question" msgstr "soru ile ilgili olarak" -#: survey/exporter/tex/question2tex_sankey.py:60 +#: survey/exporter/tex/question2tex_sankey.py:59 msgid "right" msgstr "sağ" @@ -137,8 +137,9 @@ msgid "Cannot export multiple PDF, choose only one." msgstr "Birden fazla PDF dışa aktarılamıyor, yalnızca birini seçin." #: survey/exporter/tex/survey2tex.py:192 -#, python-format -msgid "Error during PDF generation: %s" +#, fuzzy +#| msgid "Error during PDF generation: %s" +msgid "Error during PDF generation: {}" msgstr "PDF oluşturma sırasında hata: %s" #: survey/exporter/tex/survey2tex.py:199 @@ -153,11 +154,11 @@ msgstr "Soru" msgid "Response" msgstr "Yanıt" -#: survey/models/answer.py:22 survey/models/response.py:25 +#: survey/models/answer.py:22 survey/models/response.py:24 msgid "Creation date" msgstr "Oluşturulma tarihi" -#: survey/models/answer.py:23 survey/models/response.py:26 +#: survey/models/answer.py:23 survey/models/response.py:25 msgid "Update date" msgstr "Güncelleme tarihi" @@ -170,7 +171,7 @@ msgid "Name" msgstr "İsim" #: survey/models/category.py:10 survey/models/question.py:77 -#: survey/models/response.py:27 +#: survey/models/response.py:26 msgid "Survey" msgstr "Anket" @@ -270,19 +271,19 @@ msgstr "soru" msgid "questions" msgstr "sorular" -#: survey/models/response.py:28 +#: survey/models/response.py:27 msgid "User" msgstr "Kullanıcı" -#: survey/models/response.py:29 +#: survey/models/response.py:28 msgid "Interview unique identifier" msgstr "Görüşmenin benzersiz tanımlayıcısı" -#: survey/models/response.py:32 +#: survey/models/response.py:31 msgid "Set of answers to surveys" msgstr "Anketlere verilen yanıt seti" -#: survey/models/response.py:33 +#: survey/models/response.py:32 msgid "Sets of answers to surveys" msgstr "Anketlere verilen yanıt setleri" diff --git a/survey/locale/zh/LC_MESSAGES/django.po b/survey/locale/zh/LC_MESSAGES/django.po index 70b956b0..2e25560c 100644 --- a/survey/locale/zh/LC_MESSAGES/django.po +++ b/survey/locale/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-19 14:50+0000\n" +"POT-Creation-Date: 2024-10-28 22:03+0000\n" "PO-Revision-Date: 2018-04-09 00:52+0000\n" "Last-Translator: Zhu Sheng Li \n" "Language-Team: LANGUAGE \n" @@ -54,50 +54,50 @@ msgstr "用户" msgid "Export to CSV" msgstr "导出为CSV" -#: survey/exporter/tex/question2tex.py:62 +#: survey/exporter/tex/question2tex.py:61 msgid "with" msgstr "和" -#: survey/exporter/tex/question2tex.py:64 +#: survey/exporter/tex/question2tex.py:63 #, python-format msgid "%(min_cardinality)d respondents or more" msgid_plural "%(min_cardinality)d respondent or more" msgstr[0] "%(min_cardinality)d 位参与者或更多" msgstr[1] "%(min_cardinality)d 位参与者或更多" -#: survey/exporter/tex/question2tex.py:76 +#: survey/exporter/tex/question2tex.py:75 msgid "excluding" msgstr "除了" -#: survey/exporter/tex/question2tex.py:81 -#: survey/exporter/tex/question2tex.py:115 -#: survey/exporter/tex/question2tex.py:118 +#: survey/exporter/tex/question2tex.py:80 +#: survey/exporter/tex/question2tex.py:114 +#: survey/exporter/tex/question2tex.py:117 msgid "and" msgstr "和" +#: survey/exporter/tex/question2tex.py:111 #: survey/exporter/tex/question2tex.py:112 -#: survey/exporter/tex/question2tex.py:113 msgid "or" msgstr "或" -#: survey/exporter/tex/question2tex.py:127 +#: survey/exporter/tex/question2tex.py:126 msgid "Repartition of answers" msgstr "回答的重构" -#: survey/exporter/tex/question2tex_chart.py:66 +#: survey/exporter/tex/question2tex_chart.py:65 msgid "Left blank" msgstr "留空" -#: survey/exporter/tex/question2tex_chart.py:111 -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_chart.py:110 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "for the question" msgstr "为此问题" -#: survey/exporter/tex/question2tex_chart.py:121 +#: survey/exporter/tex/question2tex_chart.py:120 msgid "No answers for this question." msgstr "该问题尚无回答" -#: survey/exporter/tex/question2tex_raw.py:24 +#: survey/exporter/tex/question2tex_raw.py:23 msgid "Participant" msgstr "参与者" @@ -107,15 +107,15 @@ msgstr "参与者" msgid "Cannot generate PDF, we need 'pySankeyBeta' to be installed." msgstr "无法生成PDF，我们需要安装“ xelatex”。" -#: survey/exporter/tex/question2tex_sankey.py:56 +#: survey/exporter/tex/question2tex_sankey.py:55 msgid "left" msgstr "左" -#: survey/exporter/tex/question2tex_sankey.py:58 +#: survey/exporter/tex/question2tex_sankey.py:57 msgid "in relation with the question" msgstr "和此问题相关" -#: survey/exporter/tex/question2tex_sankey.py:60 +#: survey/exporter/tex/question2tex_sankey.py:59 msgid "right" msgstr "右" @@ -140,8 +140,9 @@ msgid "Cannot export multiple PDF, choose only one." msgstr "无法导出多个PDF，只能选择一个。" #: survey/exporter/tex/survey2tex.py:192 -#, python-format -msgid "Error during PDF generation: %s" +#, fuzzy +#| msgid "Error during PDF generation: %s" +msgid "Error during PDF generation: {}" msgstr "PDF生成期间发生错误：%s" #: survey/exporter/tex/survey2tex.py:199 @@ -156,11 +157,11 @@ msgstr "问题" msgid "Response" msgstr "回答" -#: survey/models/answer.py:22 survey/models/response.py:25 +#: survey/models/answer.py:22 survey/models/response.py:24 msgid "Creation date" msgstr "创建日期" -#: survey/models/answer.py:23 survey/models/response.py:26 +#: survey/models/answer.py:23 survey/models/response.py:25 msgid "Update date" msgstr "更新日期" @@ -173,7 +174,7 @@ msgid "Name" msgstr "名字" #: survey/models/category.py:10 survey/models/question.py:77 -#: survey/models/response.py:27 +#: survey/models/response.py:26 msgid "Survey" msgstr "问卷" @@ -269,19 +270,19 @@ msgstr "问题" msgid "questions" msgstr "问题" -#: survey/models/response.py:28 +#: survey/models/response.py:27 msgid "User" msgstr "用户" -#: survey/models/response.py:29 +#: survey/models/response.py:28 msgid "Interview unique identifier" msgstr "问卷的唯一标识" -#: survey/models/response.py:32 +#: survey/models/response.py:31 msgid "Set of answers to surveys" msgstr "问卷的几组回答" -#: survey/models/response.py:33 +#: survey/models/response.py:32 msgid "Sets of answers to surveys" msgstr "问卷的几组回答" diff --git a/survey/management/commands/exportresult.py b/survey/management/commands/exportresult.py index 04c2b5aa..c47ad87c 100755 --- a/survey/management/commands/exportresult.py +++ b/survey/management/commands/exportresult.py @@ -12,7 +12,6 @@ class Command(SurveyCommand): - """ See the "help" var. """ diff --git a/survey/management/commands/generatetexconf.py b/survey/management/commands/generatetexconf.py index 601f886e..054d35ef 100755 --- a/survey/management/commands/generatetexconf.py +++ b/survey/management/commands/generatetexconf.py @@ -5,7 +5,6 @@ class Command(SurveyCommand): - """ See the "help" var. """ diff --git a/survey/models/question.py b/survey/models/question.py index f557197d..e9d6125c 100644 --- a/survey/models/question.py +++ b/survey/models/question.py @@ -280,7 +280,7 @@ def sorted_answers_cardinality( user_defined = isinstance(sort_answer, dict) valid = user_defined or sort_answer in possibles_values if not valid: - msg = "Unrecognized option '%s' for 'sort_answer': " % sort_answer + msg = f"Unrecognized option '{sort_answer}' for 'sort_answer': " msg += "use nothing, a dict (answer: rank)," for option in possibles_values: msg += f" '{option}', or" diff --git a/survey/models/response.py b/survey/models/response.py index 6d5c1425..2da0d37f 100644 --- a/survey/models/response.py +++ b/survey/models/response.py @@ -16,7 +16,6 @@ class Response(models.Model): - """ A Response object is a collection of questions and answers with a unique interview uuid. diff --git a/survey/tests/exporter/csv/test_survey2csv.py b/survey/tests/exporter/csv/test_survey2csv.py index 7c765b65..2624d579 100755 --- a/survey/tests/exporter/csv/test_survey2csv.py +++ b/survey/tests/exporter/csv/test_survey2csv.py @@ -5,7 +5,6 @@ class TestSurvey2Csv(TestManagement): - """Permit to check if export result is working as intended.""" def setUp(self): diff --git a/survey/tests/management/commands/test_exportresult.py b/survey/tests/management/commands/test_exportresult.py index c0a5360a..e1fa991f 100755 --- a/survey/tests/management/commands/test_exportresult.py +++ b/survey/tests/management/commands/test_exportresult.py @@ -10,7 +10,6 @@ class TestExportresult(TestManagement): - """Permit to check if export result is working as intended.""" def get_csv_path(self, survey_name): diff --git a/survey/tests/management/test_management.py b/survey/tests/management/test_management.py index a6fee9b2..7c634d9a 100755 --- a/survey/tests/management/test_management.py +++ b/survey/tests/management/test_management.py @@ -9,7 +9,6 @@ class TestManagement(BaseTest): - """Permit to check if export result is working as intended.""" def create_answers(self, username, a1, a2, a3): diff --git a/survey/tests/test_survey_auth_required.py b/survey/tests/test_survey_auth_required.py index 8a4c62c6..812ccadb 100755 --- a/survey/tests/test_survey_auth_required.py +++ b/survey/tests/test_survey_auth_required.py @@ -6,7 +6,6 @@ class TestSurveyAuthRequired(BaseTest): - """Permit to check if need_logged_user is working as intended.""" def assert_accessible(self, url): From 2c1def39a55bba202df0b943c7e23ad33c71a020 Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Mon, 28 Oct 2024 22:42:22 +0100 Subject: [PATCH 2/6] Drop python 3.8, use python 3.13 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1422294d..da896864 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.8, 3.9, "3.10", "3.11", "3.12"] + python-version: [3.9, "3.10", "3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v2 - name: Python ${{ matrix.python-version }} From 0a6de2d4a4fa3dd3de188b00d194c33dcff6c65b Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Mon, 28 Oct 2024 22:50:47 +0100 Subject: [PATCH 3/6] Cleanup travis, flake8 in tox.ini, pylintrc, requirements.txt --- .pylintrc | 0 .travis.yml | 38 -------------------------------------- requirements.txt | 0 tox.ini | 6 ------ 4 files changed, 44 deletions(-) delete mode 100644 .pylintrc delete mode 100644 .travis.yml delete mode 100644 requirements.txt diff --git a/.pylintrc b/.pylintrc deleted file mode 100644 index e69de29b..00000000 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 3d0964d6..00000000 --- a/.travis.yml +++ /dev/null @@ -1,38 +0,0 @@ -language: python -jobs: - fast_finish: true - include: - - name: "Python 3.7.4 on macOS" - os: osx - osx_image: xcode11.2 # Python 3.7.4 running on macOS 10.14.4 - language: shell # 'language: python' is an error on Travis CI macOS - before_install: - - brew install --cask mactex - - brew install gettext - - brew link gettext --force - - name: "Python 3.8.0 on Windows" - os: windows # Windows 10.0.17134 N/A Build 17134 - language: shell # 'language: python' is an error on Travis CI Windows - before_install: - - choco install python --version 3.8.0 - - choco install miktex.portable - - python -m pip install --upgrade pip - env: PATH=/c/Python38:/c/Python38/Scripts:$PATH - allow_failures: - - name: "Python 3.8.0 on Windows" - os: windows # Windows 10.0.17134 N/A Build 17134 - language: shell # 'language: python' is an error on Travis CI Windows - before_install: - - choco install python --version 3.8.0 - - choco install miktex.portable - - python -m pip install --upgrade pip - env: PATH=/c/Python38:/c/Python38/Scripts:$PATH - -install: - - pip3 install --editable ".[dev]" -script: - - python3 manage.py test -after_success: - - coverage run --source=survey --omit=survey/migrations/* ./manage.py test - - coverage html - - coveralls diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/tox.ini b/tox.ini index 0ca7a32f..25668caf 100644 --- a/tox.ini +++ b/tox.ini @@ -20,9 +20,3 @@ deps = pyyaml>=4.2b1 pySankeyBeta~=1.3.0 django-rosetta - -[testenv:flake8] -basepython = python3 -deps = flake8==6.0.0 -commands= - flake8 {toxinidir}/survey From 51ce9152212250fdc107181355693dcec17fd29e Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Mon, 28 Oct 2024 22:54:19 +0100 Subject: [PATCH 4/6] Use pytest during development --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index ad11f40b..f1089e63 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -57,6 +57,8 @@ optional-dependencies.dev = [ "pylint>=3.3.1", "pylint-django", "pysankeybeta~=1.3.0", + "pytest", + "pytest-django", "python-coveralls", ] optional-dependencies.sankey = [ From 752c3378c1bfc77c4a9225b1b38fed1412ebfc3f Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Mon, 28 Oct 2024 22:58:42 +0100 Subject: [PATCH 5/6] Fix the missing setuptools dependency in dev --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index f1089e63..0190bad7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,6 +60,7 @@ optional-dependencies.dev = [ "pytest", "pytest-django", "python-coveralls", + "setuptools", ] optional-dependencies.sankey = [ "pysankeybeta~=1.3.0", From be61bd54de9fe27419cbfdc87b567775e9a2df87 Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Mon, 28 Oct 2024 23:12:59 +0100 Subject: [PATCH 6/6] [pylint] Fix 'possibly-used-before-assignment' --- survey/management/survey_command.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/survey/management/survey_command.py b/survey/management/survey_command.py index b681e9cf..35642b77 100755 --- a/survey/management/survey_command.py +++ b/survey/management/survey_command.py @@ -28,16 +28,17 @@ def add_arguments(self, parser): def raise_value_error(error_type, value): """Raise a ValueError with a clean error message in python 2.7 and 3. :param string value: the attempted value.""" + valid_texts = [] + base = "--question-id {} / --question-text '{}'\n" if error_type in ["question-id", "question-text"]: - base = "--question-id {} / --question-text '{}'\n" - valids = [(q.pk, q.text) for q in Question.objects.all()] + valid_texts = [(q.pk, q.text) for q in Question.objects.all()] elif error_type in ["survey-name", "survey-id"]: base = "--survey-id {} / --survey-name '{}'\n" - valids = [(s.pk, s.name) for s in Survey.objects.all()] + valid_texts = [(s.pk, s.name) for s in Survey.objects.all()] msg = f"You tried to get --{error_type} '{value}' " - if valids: + if valid_texts: msg += "but is does not exists. Possibles values :\n" - for primary_key, name in valids: + for primary_key, name in valid_texts: msg += base.format(primary_key, name) msg = msg[:-1] # Remove last \n else: