Skip to content
Snippets Groups Projects
Commit cac6613d authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

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

Prepare release 2.0rc1

See merge request !51
parents decf4577 206c3dd6
No related branches found
No related tags found
Loading
Pipeline #18843 passed
...@@ -6,6 +6,17 @@ All notable changes to this project will be documented in this file. ...@@ -6,6 +6,17 @@ 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.0rc1`_ - 2021-06-23
----------------------
Fixed
~~~~~
* Preference section verbose names were displayed in server language and not
user language (fixed by using gettext_lazy).
* Fix distribution name discovery for AlekSIS about page
`2.0b1`_ - 2021-06-01 `2.0b1`_ - 2021-06-01
--------------------- ---------------------
......
...@@ -5,6 +5,7 @@ from aleksis.core.util.apps import AppConfig ...@@ -5,6 +5,7 @@ from aleksis.core.util.apps import AppConfig
class CSVImportConfig(AppConfig): class CSVImportConfig(AppConfig):
name = "aleksis.apps.csv_import" name = "aleksis.apps.csv_import"
dist_name = "AlekSIS-App-CSVImport"
verbose_name = "AlekSIS — CSV import" verbose_name = "AlekSIS — CSV import"
urls = { urls = {
......
from django.utils.translation import gettext as _ from django.utils.translation import gettext_lazy as _
import pycountry import pycountry
from dynamic_preferences.preferences import Section from dynamic_preferences.preferences import Section
......
This diff is collapsed.
[tool.poetry] [tool.poetry]
name = "AlekSIS-App-CSVImport" name = "AlekSIS-App-CSVImport"
version = "2.0b1" version = "2.0rc1"
packages = [ packages = [
{ include = "aleksis" } { include = "aleksis" }
] ]
...@@ -30,7 +30,7 @@ pandas = "^1.0.0" ...@@ -30,7 +30,7 @@ pandas = "^1.0.0"
phonenumbers = "^8.10" phonenumbers = "^8.10"
dateparser = "^1.0.0" dateparser = "^1.0.0"
pycountry = "^20.7.3" pycountry = "^20.7.3"
aleksis-core = "^2.0b0" aleksis-core = "^2.0rc"
[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