Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Hjelp
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-App-Hjelp
Commits
329fbbb9
Commit
329fbbb9
authored
3 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Plain Diff
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
Branches containing commit
No related tags found
1 merge request
!94
Prepare release 2.0
Pipeline
#38547
passed
3 years ago
Stage: test
Stage: build
Stage: publish
Changes
4
Pipelines
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CHANGELOG.rst
+9
-0
9 additions, 0 deletions
CHANGELOG.rst
aleksis/apps/hjelp/locale/de_DE/LC_MESSAGES/django.po
+7
-5
7 additions, 5 deletions
aleksis/apps/hjelp/locale/de_DE/LC_MESSAGES/django.po
poetry.lock
+553
-548
553 additions, 548 deletions
poetry.lock
pyproject.toml
+3
-3
3 additions, 3 deletions
pyproject.toml
with
572 additions
and
556 deletions
CHANGELOG.rst
+
9
−
0
View file @
329fbbb9
...
@@ -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
This diff is collapsed.
Click to expand it.
aleksis/apps/hjelp/locale/de_DE/LC_MESSAGES/django.po
+
7
−
5
View file @
329fbbb9
...
@@ -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-0
5-24 20:07
+0000\n"
"PO-Revision-Date: 2021-0
6-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
N
utzeroberfläche"
msgstr "Design der
Ben
utzeroberflä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.
Click to expand it.
poetry.lock
+
553
−
548
View file @
329fbbb9
This diff is collapsed.
Click to expand it.
pyproject.toml
+
3
−
3
View file @
329fbbb9
[tool.poetry]
[tool.poetry]
name
=
"AlekSIS-App-Hjelp"
name
=
"AlekSIS-App-Hjelp"
version
=
"2.0
rc3
"
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.0
rc
"
aleksis-core
=
"^2.0"
[tool.poetry.dev-dependencies]
[tool.poetry.dev-dependencies]
aleksis-builddeps
=
"*"
aleksis-builddeps
=
"*"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment