Skip to content
Snippets Groups Projects
Commit 329fbbb9 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch 'prepare-release-2.0' into 'release/2.0'

Prepare release 2.0

See merge request !94
parents 22faa748 5d026d64
No related branches found
No related tags found
1 merge request!94Prepare release 2.0
Pipeline #38547 passed
...@@ -6,6 +6,14 @@ All notable changes to this project will be documented in this file. ...@@ -6,6 +6,14 @@ All notable changes to this project will be documented in this file.
The format is based on `Keep a Changelog`_, The format is based on `Keep a Changelog`_,
and this project adheres to `Semantic Versioning`_. and this project adheres to `Semantic Versioning`_.
`2.0`_ - 2021-10-30
-------------------
Changed
~~~~~~~
* German translations were updated.
`2.0rc3`_ - 2021-08-17 `2.0rc3`_ - 2021-08-17
---------------------- ----------------------
...@@ -85,3 +93,4 @@ Added ...@@ -85,3 +93,4 @@ Added
.. _2.0rc1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Hjelp/-/tags/2.0rc1 .. _2.0rc1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Hjelp/-/tags/2.0rc1
.. _2.0rc2: https://edugit.org/AlekSIS/Official/AlekSIS-App-Hjelp/-/tags/2.0rc2 .. _2.0rc2: https://edugit.org/AlekSIS/Official/AlekSIS-App-Hjelp/-/tags/2.0rc2
.. _2.0rc3: https://edugit.org/AlekSIS/Official/AlekSIS-App-Hjelp/-/tags/2.0rc3 .. _2.0rc3: https://edugit.org/AlekSIS/Official/AlekSIS-App-Hjelp/-/tags/2.0rc3
.. _2.0: https://edugit.org/AlekSIS/Official/AlekSIS-App-Hjelp/-/tags/2.0
...@@ -8,8 +8,8 @@ msgstr "" ...@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-20 21:06+0200\n" "POT-Creation-Date: 2021-05-20 21:06+0200\n"
"PO-Revision-Date: 2021-05-24 20:07+0000\n" "PO-Revision-Date: 2021-06-16 11:59+0000\n"
"Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n" "Last-Translator: Frank Poetzsch-Heffter <p-h@katharineum.de>\n"
"Language-Team: German <https://translate.edugit.org/projects/aleksis/" "Language-Team: German <https://translate.edugit.org/projects/aleksis/"
"aleksis-app-hjelp/de/>\n" "aleksis-app-hjelp/de/>\n"
"Language: de_DE\n" "Language: de_DE\n"
...@@ -61,7 +61,7 @@ msgstr "Bitte beschreiben Sie das Problem detaillierter." ...@@ -61,7 +61,7 @@ msgstr "Bitte beschreiben Sie das Problem detaillierter."
#: aleksis/apps/hjelp/forms.py:78 #: aleksis/apps/hjelp/forms.py:78
msgid "Design of the user interface" msgid "Design of the user interface"
msgstr "Design der Nutzeroberfläche" msgstr "Design der Benutzeroberfläche"
#: aleksis/apps/hjelp/forms.py:85 #: aleksis/apps/hjelp/forms.py:85
msgid "Speed" msgid "Speed"
...@@ -419,7 +419,8 @@ msgid "" ...@@ -419,7 +419,8 @@ msgid ""
" " " "
msgstr "" msgstr ""
"\n" "\n"
" Der Nutzer %(username)s (vollständiger Name: %(full_name)s, E-Mail: <%(email)s>) hat die folgende Frage gestellt:\n" " Der Benutzer %(username)s (vollständiger Name: %(full_name)s, E-Mail: "
"<%(email)s>) hat die folgende Frage gestellt:\n"
" " " "
#: aleksis/apps/hjelp/templates/templated_email/faq.email:21 #: aleksis/apps/hjelp/templates/templated_email/faq.email:21
...@@ -460,7 +461,8 @@ msgid "" ...@@ -460,7 +461,8 @@ msgid ""
" " " "
msgstr "" msgstr ""
"\n" "\n"
" Der Nutzer %(username)s (vollständiger Name: %(full_name)s, E-Mail: <%(email)s<) hat folgendes Feedback gegeben:\n" " Der Benutzer %(username)s (vollständiger Name: %(full_name)s, E-Mail: "
"<%(email)s<) hat folgendes Feedback gegeben:\n"
"\n" "\n"
"Designbewertung: %(design_rating)s von 5 Sternen\n" "Designbewertung: %(design_rating)s von 5 Sternen\n"
"Geschwindigkeitsbewertung: %(performance_rating)s von 5 Sternen\n" "Geschwindigkeitsbewertung: %(performance_rating)s von 5 Sternen\n"
......
This diff is collapsed.
[tool.poetry] [tool.poetry]
name = "AlekSIS-App-Hjelp" name = "AlekSIS-App-Hjelp"
version = "2.0rc3" version = "2.0"
packages = [ packages = [
{ include = "aleksis" } { include = "aleksis" }
] ]
...@@ -16,7 +16,7 @@ repository = "https://edugit.org/AlekSIS/official/AlekSIS-App-Hjelp" ...@@ -16,7 +16,7 @@ repository = "https://edugit.org/AlekSIS/official/AlekSIS-App-Hjelp"
documentation = "https://aleksis.org/AlekSIS/docs/html/" documentation = "https://aleksis.org/AlekSIS/docs/html/"
keywords = ["SIS", "education", "school", "support", "feedback"] keywords = ["SIS", "education", "school", "support", "feedback"]
classifiers = [ classifiers = [
"Development Status :: 4 - Beta", "Development Status :: 5 - Production/Stable",
"Environment :: Web Environment", "Environment :: Web Environment",
"Framework :: Django :: 3.0", "Framework :: Django :: 3.0",
"Intended Audience :: Education", "Intended Audience :: Education",
...@@ -31,7 +31,7 @@ secondary = true ...@@ -31,7 +31,7 @@ secondary = true
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "^3.9" python = "^3.9"
aleksis-core = "^2.0rc" aleksis-core = "^2.0"
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]
aleksis-builddeps = "*" aleksis-builddeps = "*"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment