From d4a5c9d24f2e8de3dfb51c5b573318057c4fe463 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sat, 3 Jul 2021 11:53:27 +0200 Subject: [PATCH 1/8] Add configuration for readthedocs --- .readthedocs.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .readthedocs.yml diff --git a/.readthedocs.yml b/.readthedocs.yml new file mode 100644 index 0000000..6064a5f --- /dev/null +++ b/.readthedocs.yml @@ -0,0 +1,6 @@ +version: 2 +sphinx: + configuration: docs/source/conf.py + +python: + version: 3 From 3cc49d2c7f5a2aee3cc5204a123ee34fd30d1017 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sat, 3 Jul 2021 12:01:30 +0200 Subject: [PATCH 2/8] Add requirements to readthedocs configuration --- .readthedocs.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.readthedocs.yml b/.readthedocs.yml index 6064a5f..e24bf6f 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,6 +1,8 @@ version: 2 sphinx: configuration: docs/source/conf.py + install: + - requirements: requirements.txt python: version: 3 From 281a1717989870052d1646665bf88ee059c4e70b Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sat, 3 Jul 2021 12:09:04 +0200 Subject: [PATCH 3/8] Move rtd requirements to correct stanza --- .readthedocs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index e24bf6f..d29d49b 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,8 +1,8 @@ version: 2 sphinx: configuration: docs/source/conf.py - install: - - requirements: requirements.txt python: version: 3 + install: + - requirements: requirements.txt From b66e80a299722d16c7844aa8d315eac46e535b5d Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sat, 3 Jul 2021 12:14:04 +0200 Subject: [PATCH 4/8] Update MarkupSafe version --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index db22cd6..28a470e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ Flask==0.12.2 Jinja2==2.9.6 -MarkupSafe==1.0 +MarkupSafe==1.1.0 Werkzeug==0.12.2 itsdangerous==0.24 Babel==2.5.0 From 108da9dec2acb8b2df22af15e7c8678c958256d4 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sat, 3 Jul 2021 12:18:06 +0200 Subject: [PATCH 5/8] Add master_doc setting for readthedocs --- docs/source/conf.py | 55 ++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index f29c685..cdbe07a 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -22,41 +22,40 @@ import os # If your extensions are in another directory, add it here. If the directory # is relative to the documentation root, use os.path.abspath to make it # absolute, like shown here. -sys.path.append( - os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))) +sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", ".."))) # General configuration # --------------------- # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode'] +extensions = ["sphinx.ext.autodoc", "sphinx.ext.viewcode"] # Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] +templates_path = ["_templates"] # The encoding of source files. -#source_encoding = 'utf-8' +# source_encoding = 'utf-8' # General information about the project. -project = 'Debian Member Portfolio Service' -copyright = '2009-2021, Jan Dittberner' +project = "Debian Member Portfolio Service" +copyright = "2009-2021, Jan Dittberner" # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '0.7.0' +version = "0.7.0" # The full version, including alpha/beta/rc tags. release = version # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. -language = 'en' +language = "en" # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = "sphinx" # ----------------------- @@ -64,51 +63,55 @@ pygments_style = 'sphinx' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +html_static_path = ["_static"] # If false, no module index is generated. html_use_modindex = False # If false, no index is generated. -#html_use_index = True -html_theme = 'alabaster' +# html_use_index = True +html_theme = "alabaster" # Output file base name for HTML help builder. -htmlhelp_basename = 'DebianMemberPortfolioServicedoc' +htmlhelp_basename = "DebianMemberPortfolioServicedoc" # Options for LaTeX output # ------------------------ # The paper size ('letter' or 'a4'). -#latex_paper_size = 'letter' +# latex_paper_size = 'letter' # The font size ('10pt', '11pt' or '12pt'). -#latex_font_size = '10pt' +# latex_font_size = '10pt' # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, document class # [howto/manual]). latex_documents = [ - ('index', - 'DebianMemberPortfolioService.tex', - 'Debian Member Portfolio Service Documentation', - 'Jan Dittberner', - 'manual'), + ( + "index", + "DebianMemberPortfolioService.tex", + "Debian Member Portfolio Service Documentation", + "Jan Dittberner", + "manual", + ), ] # The name of an image file (relative to this directory) to place at the top of # the title page. -#latex_logo = None +# latex_logo = None # For "manual" documents, if this is true, then toplevel headings are parts, # not chapters. -#latex_use_parts = False +# latex_use_parts = False # Additional stuff for the LaTeX preamble. -#latex_preamble = '' +# latex_preamble = '' # Documents to append as an appendix to all manuals. -#latex_appendices = [] +# latex_appendices = [] # If false, no module index is generated. -#latex_use_modindex = True +# latex_use_modindex = True + +master_doc = "index" From 54eba0d3f980ac12e6e526db4cc94372d21079da Mon Sep 17 00:00:00 2001 From: Heimen Stoffels Date: Sat, 3 Jul 2021 09:47:35 +0000 Subject: [PATCH 6/8] Translated using Weblate (Dutch) Currently translated at 100.0% (82 of 82 strings) --- .../translations/nl/LC_MESSAGES/messages.po | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/debianmemberportfolio/translations/nl/LC_MESSAGES/messages.po b/debianmemberportfolio/translations/nl/LC_MESSAGES/messages.po index e387022..828158e 100644 --- a/debianmemberportfolio/translations/nl/LC_MESSAGES/messages.po +++ b/debianmemberportfolio/translations/nl/LC_MESSAGES/messages.po @@ -10,15 +10,16 @@ msgstr "" "Project-Id-Version: Debian Member Portfolio Service 0.3.1\n" "Report-Msgid-Bugs-To: jan@dittberner.info\n" "POT-Creation-Date: 2021-07-03 11:22+0200\n" -"PO-Revision-Date: 2021-07-03 11:15+0200\n" -"Last-Translator: Frans Spiesschaert \n" +"PO-Revision-Date: 2021-07-03 10:30+0000\n" +"Last-Translator: Heimen Stoffels \n" +"Language-Team: Dutch \n" "Language: nl\n" -"Language-Team: Dutch \n" -"Plural-Forms: nplurals=2; plural=n != 1\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.8-dev\n" "Generated-By: Babel 2.8.0\n" #: debianmemberportfolio/forms.py:64 @@ -56,13 +57,12 @@ msgid "" "/cgi-bin/bugreport.cgi?bug=430986\">#430986)" msgstr "" "ontvangen bugs\n" -"(let op: mede-beheerders staan niet op de lijst, zie\n" -"#430986" +"(let op: mede-beheerders staan niet op de lijst, zie #430986)" #: debianmemberportfolio/views.py:51 msgid "bugs reported" -msgstr "gerapporteerde bugs" +msgstr "gemelde bugs" #: debianmemberportfolio/views.py:52 msgid "user tags" @@ -98,7 +98,7 @@ msgstr "Kwaliteitsverzekering" #: debianmemberportfolio/views.py:64 msgid "maintainer dashboard" -msgstr "beheerdersinstrumentenbord" +msgstr "beheerpaneel" #: debianmemberportfolio/views.py:65 msgid "lintian reports" @@ -107,8 +107,8 @@ msgstr "lintian-rapporten" #: debianmemberportfolio/views.py:66 msgid "full lintian reports (i.e. including \"info\"-level messages)" msgstr "" -"volledige lintian-rapporten (d.w.z. inclusief berichten van niveau " -"\"info\")" +"volledige lintian-rapporten (d.w.z. inclusief berichten van het niveau " +"‘info’)" #: debianmemberportfolio/views.py:68 msgid "piuparts" @@ -116,7 +116,7 @@ msgstr "piuparts" #: debianmemberportfolio/views.py:69 msgid "Debian Janitor" -msgstr "" +msgstr "Debian-conciërge" #: debianmemberportfolio/views.py:72 msgid "Mailing Lists" @@ -216,7 +216,7 @@ msgstr "Bijdrage-informatie" #: debianmemberportfolio/views.py:102 msgid "Repology information" -msgstr "" +msgstr "Repology-informatie" #: debianmemberportfolio/views.py:105 msgid "Information reachable via ssh (for Debian Members)" @@ -231,8 +231,8 @@ msgid "" "MIA " "database information" msgstr "" -"MIA-database-informatie" +"MIA-databankinformatie" #: debianmemberportfolio/views.py:109 msgid "Group membership information" @@ -271,7 +271,7 @@ msgstr "Ontbrekende invoer: %s" #: debianmemberportfolio/templates/base.html:24 #: debianmemberportfolio/templates/base.html:31 msgid "Debian Member Portfolio Service" -msgstr "Portfoliodienst van Debian-leden" +msgstr "Portfolio met Debian-leden" #: debianmemberportfolio/templates/base.html:30 msgid "Debian Logo" @@ -329,7 +329,7 @@ msgstr "Voer uw persoonlijke informatie in" #: debianmemberportfolio/templates/showform.html:29 msgid "Debian Member Portfolio" -msgstr "Portfolio van een lid van Debian" +msgstr "Portfolio van een Debian-lid" #: debianmemberportfolio/templates/showform.html:31 msgid "Email address:" @@ -337,7 +337,7 @@ msgstr "E-mailadres:" #: debianmemberportfolio/templates/showform.html:40 msgid "Show all form fields" -msgstr "Alle velden van het formulier weergeven" +msgstr "Alle formuliervelden tonen" #: debianmemberportfolio/templates/showform.html:43 msgid "Name:" @@ -373,11 +373,11 @@ msgstr "Uitvoerformaat:" #: debianmemberportfolio/templates/showform.html:99 msgid "Build Debian Member Portfolio URLs" -msgstr "URL's bouwen voor het Debian-lid" +msgstr "URL's samenstellen voor het Debian-lid" #: debianmemberportfolio/templates/showurls.html:21 msgid "Your personal links" -msgstr "Uw persoonlijke links" +msgstr "Mijn persoonlijke links" #: debianmemberportfolio/templates/showurls.html:25 msgid "Debian Member Porfolio" @@ -393,9 +393,8 @@ msgstr "URL" #: debianmemberportfolio/templates/showurls.html:38 msgid "Error during URL creation:" -msgstr "Er is een fout opgetreden tijdens de URL-creatie:" +msgstr "Er is een fout opgetreden tijdens het samenstellen van de url:" #: debianmemberportfolio/templates/showurls.html:59 msgid "Restart" -msgstr "Herbeginnen" - +msgstr "Opnieuw beginnen" From c069129139839b79651c87e75689a99d677353f6 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sat, 3 Jul 2021 12:31:58 +0200 Subject: [PATCH 7/8] Update credits --- docs/source/credits.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/source/credits.rst b/docs/source/credits.rst index f63884c..25a9ea3 100644 --- a/docs/source/credits.rst +++ b/docs/source/credits.rst @@ -20,6 +20,7 @@ Translations * ButterflyOfFire (French, Portuguese (Brazil)) * Daniel Manzano (Portugues (Brazil)) * Frans Spiesschaert (Dutch) + * Heimen Stoffels (Dutch) * Izharul Haq (Indonesian) * Jan Dittberner (German, English) * Manuela Silva (Portugues (Portugal)) From fe2ba2a150c4dd3aac3d41ebf13ce416ca8a26e5 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sat, 3 Jul 2021 12:33:09 +0200 Subject: [PATCH 8/8] Bump version to 0.7.1 --- docs/source/conf.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index cdbe07a..c13de6d 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -46,7 +46,7 @@ copyright = "2009-2021, Jan Dittberner" # built documents. # # The short X.Y version. -version = "0.7.0" +version = "0.7.1" # The full version, including alpha/beta/rc tags. release = version diff --git a/setup.py b/setup.py index d47c728..217bb85 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ except ImportError: setup( name='debianmemberportfolio', - version='0.7.0', + version='0.7.1', description='service to create Debian Member Portfolio URLs', long_description="""This is a service implementation that returns a set of personalized URLs as outlined in https://wiki.debian.org/DDPortfolio. It