From 3cfda07fb2b7e4d4bc37d7588eb305fd002fc671 Mon Sep 17 00:00:00 2001
From: mirabilos <thorsten.glaser@teckids.org>
Date: Fri, 3 Jan 2020 18:00:18 +0100
Subject: [PATCH] =?UTF-8?q?Finish=20renaming=20BiscuIT-ng=20to=20AlekSIS?=
=?UTF-8?q?=20in=20this=20=C3=A4pp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.rst | 6 +++---
MANIFEST.in | 6 +++---
README.rst | 2 +-
aleksis/apps/chronos/__init__.py | 4 ++--
aleksis/apps/chronos/apps.py | 6 +++---
aleksis/apps/chronos/forms.py | 2 +-
aleksis/apps/chronos/locale/de_DE/LC_MESSAGES/django.po | 8 ++++----
aleksis/apps/chronos/menus.py | 2 +-
aleksis/apps/chronos/migrations/0001_initial.py | 6 +++---
aleksis/apps/chronos/model_extensions.py | 8 ++++----
aleksis/apps/chronos/models.py | 4 ++--
aleksis/apps/chronos/views.py | 4 ++--
pyproject.toml | 6 +++---
13 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1f23bff2..4bab2f51 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -45,6 +45,6 @@ Minor changes
* Use bootstrap buttons everywhere
-_`1.0a1`: https://edugit.org/Teckids/BiscuIT/BiscuIT-App-Chronos/-/tags/1.0a1
-_`1.0a2`: https://edugit.org/Teckids/BiscuIT/BiscuIT-App-Chronos/-/tags/1.0a2
-_`1.0a3`: https://edugit.org/Teckids/BiscuIT/BiscuIT-App-Chronos/-/tags/1.0a3
+_`1.0a1`: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Chronos/-/tags/1.0a1
+_`1.0a2`: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Chronos/-/tags/1.0a2
+_`1.0a3`: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Chronos/-/tags/1.0a3
diff --git a/MANIFEST.in b/MANIFEST.in
index 327c3c42..5c119664 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
include LICENCE
-recursive-include biscuit/apps/chronos/static *
-recursive-include biscuit/apps/chronos/templates *
-recursive-include biscuit/apps/chronos/migrations *
+recursive-include aleksis/apps/chronos/static *
+recursive-include aleksis/apps/chronos/templates *
+recursive-include aleksis/apps/chronos/migrations *
diff --git a/README.rst b/README.rst
index 013f1b6a..0720cdab 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-AlekSIS School Information System (SIS) - App Chronos (digital timetables)
+AlekSIS (School Information System) - App Chronos (digital timetables)
======================================================================
AlekSIS
diff --git a/aleksis/apps/chronos/__init__.py b/aleksis/apps/chronos/__init__.py
index 59161f0c..bed63d68 100644
--- a/aleksis/apps/chronos/__init__.py
+++ b/aleksis/apps/chronos/__init__.py
@@ -1,8 +1,8 @@
import pkg_resources
try:
- __version__ = pkg_resources.get_distribution("BiscuIT-App-Chronos").version
+ __version__ = pkg_resources.get_distribution("AlekSIS-App-Chronos").version
except Exception:
__version__ = "unknown"
-default_app_config = "biscuit.apps.chronos.apps.ChronosConfig"
+default_app_config = "aleksis.apps.chronos.apps.ChronosConfig"
diff --git a/aleksis/apps/chronos/apps.py b/aleksis/apps/chronos/apps.py
index 939cc6dd..add7a58e 100644
--- a/aleksis/apps/chronos/apps.py
+++ b/aleksis/apps/chronos/apps.py
@@ -1,6 +1,6 @@
-from biscuit.core.util.apps import AppConfig
+from aleksis.core.util.apps import AppConfig
class ChronosConfig(AppConfig):
- name = "biscuit.apps.chronos"
- verbose_name = "BiscuIT - Chronos (Timetables)"
+ name = "aleksis.apps.chronos"
+ verbose_name = "AlekSIS - Chronos (Timetables)"
diff --git a/aleksis/apps/chronos/forms.py b/aleksis/apps/chronos/forms.py
index 12d72175..871ec7dc 100644
--- a/aleksis/apps/chronos/forms.py
+++ b/aleksis/apps/chronos/forms.py
@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
from django_select2.forms import ModelSelect2MultipleWidget, Select2Widget
-from biscuit.core.models import Group, Person
+from aleksis.core.models import Group, Person
from .models import LessonPeriod, LessonSubstitution, Room, Subject
diff --git a/aleksis/apps/chronos/locale/de_DE/LC_MESSAGES/django.po b/aleksis/apps/chronos/locale/de_DE/LC_MESSAGES/django.po
index c049a294..841671ec 100644
--- a/aleksis/apps/chronos/locale/de_DE/LC_MESSAGES/django.po
+++ b/aleksis/apps/chronos/locale/de_DE/LC_MESSAGES/django.po
@@ -10,8 +10,8 @@ msgstr ""
"POT-Creation-Date: 2019-11-23 10:05+0100\n"
"PO-Revision-Date: 2019-11-23 11:07+0000\n"
"Last-Translator: Tom Teichler <tom.teichler@teckids.org>\n"
-"Language-Team: German <https://translate.edugit.org/projects/biscuit-sis/"
-"biscuit-app-chronos/de/>\n"
+"Language-Team: German <https://translate.edugit.org/projects/aleksis-sis/"
+"aleksis-app-chronos/de/>\n"
"Language: de_DE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -198,5 +198,5 @@ msgstr "Die Vertretung wurde gespeichert."
msgid "The substitution has been deleted."
msgstr "Die Vertretung wurde gelöscht."
-#~ msgid "BiscuIT - Chronos (Timetables)"
-#~ msgstr "BiscuIT - Chronos (Stundenpläne)"
+#~ msgid "AlekSIS - Chronos (Timetables)"
+#~ msgstr "AlekSIS - Chronos (Stundenpläne)"
diff --git a/aleksis/apps/chronos/menus.py b/aleksis/apps/chronos/menus.py
index 38db3e98..0b92d8fb 100644
--- a/aleksis/apps/chronos/menus.py
+++ b/aleksis/apps/chronos/menus.py
@@ -8,7 +8,7 @@ MENUS = {
"root": True,
"validators": [
"menu_generator.validators.is_authenticated",
- "biscuit.core.util.core_helpers.has_person",
+ "aleksis.core.util.core_helpers.has_person",
],
"submenu": [
{
diff --git a/aleksis/apps/chronos/migrations/0001_initial.py b/aleksis/apps/chronos/migrations/0001_initial.py
index 6ee00a6c..1ef08a22 100644
--- a/aleksis/apps/chronos/migrations/0001_initial.py
+++ b/aleksis/apps/chronos/migrations/0001_initial.py
@@ -4,8 +4,8 @@ import django.core.validators
import django.db.models.deletion
from django.db import migrations, models
-import biscuit.apps.chronos.util
-import biscuit.core.util.core_helpers
+import aleksis.apps.chronos.util
+import aleksis.core.util.core_helpers
class Migration(migrations.Migration):
@@ -229,7 +229,7 @@ class Migration(migrations.Migration):
(
"week",
models.IntegerField(
- default=biscuit.apps.chronos.util.CalendarWeek.current_week,
+ default=aleksis.apps.chronos.util.CalendarWeek.current_week,
verbose_name="Week",
),
),
diff --git a/aleksis/apps/chronos/model_extensions.py b/aleksis/apps/chronos/model_extensions.py
index 32055e65..1d93db9a 100644
--- a/aleksis/apps/chronos/model_extensions.py
+++ b/aleksis/apps/chronos/model_extensions.py
@@ -1,4 +1,4 @@
-from biscuit.core.models import Person
+from aleksis.core.models import Person
from .models import Lesson, LessonPeriod
@@ -8,7 +8,7 @@ def lessons_as_participant(self):
""" Return a `QuerySet` containing all `Lesson`s this person
participates in (as student).
- .. note:: Only available when BiscuIT-App-Chronos is installed.
+ .. note:: Only available when AlekSIS-App-Chronos is installed.
:Date: 2019-11-07
:Authors:
@@ -23,7 +23,7 @@ def lesson_periods_as_participant(self):
""" Return a `QuerySet` containing all `LessonPeriod`s this person
participates in (as student).
- .. note:: Only available when BiscuIT-App-Chronos is installed.
+ .. note:: Only available when AlekSIS-App-Chronos is installed.
:Date: 2019-11-07
:Authors:
@@ -38,7 +38,7 @@ def lesson_periods_as_teacher(self):
""" Return a `QuerySet` containing all `Lesson`s this person
gives (as teacher).
- .. note:: Only available when BiscuIT-App-Chronos is installed.
+ .. note:: Only available when AlekSIS-App-Chronos is installed.
:Date: 2019-11-07
:Authors:
diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py
index 5a2d7d18..c80de907 100644
--- a/aleksis/apps/chronos/models.py
+++ b/aleksis/apps/chronos/models.py
@@ -10,8 +10,8 @@ from django.db.models import Q
from django.http.request import QueryDict
from django.utils.translation import ugettext_lazy as _
-from biscuit.core.mixins import ExtensibleModel
-from biscuit.core.models import Group, Person
+from aleksis.core.mixins import ExtensibleModel
+from aleksis.core.models import Group, Person
from .util import CalendarWeek, week_weekday_from_date
diff --git a/aleksis/apps/chronos/views.py b/aleksis/apps/chronos/views.py
index 95b9fa26..966dc0b8 100644
--- a/aleksis/apps/chronos/views.py
+++ b/aleksis/apps/chronos/views.py
@@ -11,8 +11,8 @@ from django.utils.translation import ugettext as _
from django_tables2 import RequestConfig
-from biscuit.core.decorators import admin_required
-from biscuit.core.util import messages
+from aleksis.core.decorators import admin_required
+from aleksis.core.util import messages
from .forms import LessonSubstitutionForm, SelectForm
from .models import LessonPeriod, LessonSubstitution, TimePeriod
diff --git a/pyproject.toml b/pyproject.toml
index 5a0e6ce3..c2f1bfe0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,16 +1,16 @@
[tool.poetry]
-name = "BiscuIT-App-Chronos"
+name = "AlekSIS-App-Chronos"
version = "1.0a4dev0"
packages = [
{ include = "aleksis" }
]
readme = "README.rst"
-description = "AlekSIS School Information System (SIS) - App Chronos (Time tables)"
+description = "AlekSIS (School Information System) - App Chronos (Time tables)"
authors = ["Dominik George <dominik.george@teckids.org>", "Julian Leucker <leuckeju@katharineum.de>", "Frank Poetzsch-Heffter <p-h@katharineum.de>", "Tom Teichler <tom.teichler@teckids.org>", "Jonathan Weth <wethjo@katharineum.de>", "Hangzhi Yu <yuha@katharineum.de>"]
license = "EUPL-1.2"
homepage = "https://aleksis.edugit.io/"
-repository = "https://edugit.org/BiscuIT/BiscuIT-App-Chronos"
+repository = "https://edugit.org/AlekSIS/AlekSIS-App-Chronos"
documentation = "https://aleksis.edugit.io/AlekSIS/docs/html/"
classifiers = [
"Environment :: Web Environment",
--
GitLab