From 8c6c58fd355696fac3ae1d698810bdf20190520d 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/alsijil/__init__.py | 4 ++--
aleksis/apps/alsijil/apps.py | 6 +++---
aleksis/apps/alsijil/forms.py | 4 ++--
aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po | 2 +-
.../apps/alsijil/locale/de_DE/LC_MESSAGES/django.po | 12 ++++++------
aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po | 2 +-
.../apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po | 2 +-
.../apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po | 2 +-
aleksis/apps/alsijil/menus.py | 2 +-
aleksis/apps/alsijil/migrations/0001_initial.py | 2 +-
.../migrations/0002_add_personal_note_filter.py | 6 +++---
aleksis/apps/alsijil/model_extensions.py | 10 +++++-----
aleksis/apps/alsijil/models.py | 2 +-
.../templates/alsijil/print/full_register.html | 2 +-
aleksis/apps/alsijil/views.py | 10 +++++-----
pyproject.toml | 8 ++++----
19 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ada772971..90c7b5782 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -60,6 +60,6 @@ Minor changes
* Use bootstrap buttons everywhere
-_`1.0a1`: https://edugit.org/Teckids/BiscuIT/BiscuIT-App-Alsijil/-/tags/1.0a1
-_`1.0a2`: https://edugit.org/Teckids/BiscuIT/BiscuIT-App-Alsijil/-/tags/1.0a2
-_`1.0a3`: https://edugit.org/Teckids/BiscuIT/BiscuIT-App-Alsijil/-/tags/1.0a3
+_`1.0a1`: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Alsijil/-/tags/1.0a1
+_`1.0a2`: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Alsijil/-/tags/1.0a2
+_`1.0a3`: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Alsijil/-/tags/1.0a3
diff --git a/MANIFEST.in b/MANIFEST.in
index 9b0e08ded..7596319c7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
include LICENCE
-recursive-include biscuit/apps/alsijil/static *
-recursive-include biscuit/apps/alsijil/templates *
-recursive-include biscuit/apps/alsijil/migrations *
+recursive-include aleksis/apps/alsijil/static *
+recursive-include aleksis/apps/alsijil/templates *
+recursive-include aleksis/apps/alsijil/migrations *
diff --git a/README.rst b/README.rst
index 5008cf747..e75b7cddc 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-AlekSIS School Information System (SIS) - App Alsijil (class register)
+AlekSIS (School Information System) - App Alsijil (class register)
======================================================================
AlekSIS
diff --git a/aleksis/apps/alsijil/__init__.py b/aleksis/apps/alsijil/__init__.py
index 13d090787..3f6bb77a1 100644
--- a/aleksis/apps/alsijil/__init__.py
+++ b/aleksis/apps/alsijil/__init__.py
@@ -1,8 +1,8 @@
import pkg_resources
try:
- __version__ = pkg_resources.get_distribution("BiscuIT-App-Alsijil").version
+ __version__ = pkg_resources.get_distribution("AlekSIS-App-Alsijil").version
except Exception:
__version__ = "unknown"
-default_app_config = "biscuit.apps.alsijil.apps.AlsijilConfig"
+default_app_config = "aleksis.apps.alsijil.apps.AlsijilConfig"
diff --git a/aleksis/apps/alsijil/apps.py b/aleksis/apps/alsijil/apps.py
index 8fb3b07a4..d14dc41c6 100644
--- a/aleksis/apps/alsijil/apps.py
+++ b/aleksis/apps/alsijil/apps.py
@@ -1,6 +1,6 @@
-from biscuit.core.util.apps import AppConfig
+from aleksis.core.util.apps import AppConfig
class AlsijilConfig(AppConfig):
- name = "biscuit.apps.alsijil"
- verbose_name = "BiscuIT - Alsijil (Class register)"
+ name = "aleksis.apps.alsijil"
+ verbose_name = "AlekSIS - Alsijil (Class register)"
diff --git a/aleksis/apps/alsijil/forms.py b/aleksis/apps/alsijil/forms.py
index 91fa15ac1..1a86b761e 100644
--- a/aleksis/apps/alsijil/forms.py
+++ b/aleksis/apps/alsijil/forms.py
@@ -6,8 +6,8 @@ from django.utils.translation import ugettext_lazy as _
from django_select2.forms import Select2Widget
-from biscuit.apps.chronos.models import Room
-from biscuit.core.models import Group, Person
+from aleksis.apps.chronos.models import Room
+from aleksis.core.models import Group, Person
from .models import LessonDocumentation, PersonalNote, PersonalNoteFilter
diff --git a/aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po b/aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po
index 543e5f964..84ed5cc49 100644
--- a/aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po
@@ -159,7 +159,7 @@ msgid ""
"\n"
" This printout is intended for archival purposes. The main copy "
"of\n"
-" the class register is stored in the BiscuIT School Information\n"
+" the class register is stored in the AlekSIS School Information\n"
" System.\n"
" "
msgstr ""
diff --git a/aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po b/aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po
index 19ca6df50..d7136c3a8 100644
--- a/aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po
@@ -10,8 +10,8 @@ msgstr ""
"POT-Creation-Date: 2019-11-24 22:45+0100\n"
"PO-Revision-Date: 2019-11-24 21:56+0000\n"
"Last-Translator: Tom Teichler <tom.teichler@teckids.org>\n"
-"Language-Team: German <https://translate.edugit.org/projects/biscuit-sis/"
-"biscuit-app-alsijil/de/>\n"
+"Language-Team: German <https://translate.edugit.org/projects/aleksis-sis/"
+"aleksis-app-alsijil/de/>\n"
"Language: de_DE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -159,14 +159,14 @@ msgid ""
"\n"
" This printout is intended for archival purposes. The main copy "
"of\n"
-" the class register is stored in the BiscuIT School Information\n"
+" the class register is stored in the AlekSIS School Information\n"
" System.\n"
" "
msgstr ""
"\n"
" Dieser Ausdruck ist für Archivierungszwecke gedacht. Die "
"Hauptkopie\n"
-" des Klassenbusches ist im BiscuIT-Schul-Informations-System "
+" des Klassenbusches ist im AlekSIS-Schul-Informations-System "
"gespeichert.\n"
" "
@@ -416,8 +416,8 @@ msgstr "Der Filter wurde gespeichert."
#~ msgid "Week"
#~ msgstr "Woche"
-#~ msgid "BiscuIT - Alsijil (Class register)"
-#~ msgstr "BiscuIT - Alsijil (Klassenbuch)"
+#~ msgid "AlekSIS - Alsijil (Class register)"
+#~ msgstr "AlekSIS - Alsijil (Klassenbuch)"
#~ msgid "No lesson found"
#~ msgstr "Keine Stunde gefunden"
diff --git a/aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po b/aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po
index c9c2d685f..0b6a67c46 100644
--- a/aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po
@@ -158,7 +158,7 @@ msgid ""
"\n"
" This printout is intended for archival purposes. The main copy "
"of\n"
-" the class register is stored in the BiscuIT School Information\n"
+" the class register is stored in the AlekSIS School Information\n"
" System.\n"
" "
msgstr ""
diff --git a/aleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po b/aleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po
index 7dae5527c..42aca62c1 100644
--- a/aleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po
@@ -157,7 +157,7 @@ msgid ""
"\n"
" This printout is intended for archival purposes. The main copy "
"of\n"
-" the class register is stored in the BiscuIT School Information\n"
+" the class register is stored in the AlekSIS School Information\n"
" System.\n"
" "
msgstr ""
diff --git a/aleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po b/aleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po
index 7dae5527c..42aca62c1 100644
--- a/aleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po
@@ -157,7 +157,7 @@ msgid ""
"\n"
" This printout is intended for archival purposes. The main copy "
"of\n"
-" the class register is stored in the BiscuIT School Information\n"
+" the class register is stored in the AlekSIS School Information\n"
" System.\n"
" "
msgstr ""
diff --git a/aleksis/apps/alsijil/menus.py b/aleksis/apps/alsijil/menus.py
index 4e6abca1c..5eb69b96d 100644
--- a/aleksis/apps/alsijil/menus.py
+++ b/aleksis/apps/alsijil/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/alsijil/migrations/0001_initial.py b/aleksis/apps/alsijil/migrations/0001_initial.py
index 5de48ef84..f7fb4a0c0 100644
--- a/aleksis/apps/alsijil/migrations/0001_initial.py
+++ b/aleksis/apps/alsijil/migrations/0001_initial.py
@@ -3,7 +3,7 @@
import django.db.models.deletion
from django.db import migrations, models
-import biscuit.core.util.core_helpers
+import aleksis.core.util.core_helpers
class Migration(migrations.Migration):
diff --git a/aleksis/apps/alsijil/migrations/0002_add_personal_note_filter.py b/aleksis/apps/alsijil/migrations/0002_add_personal_note_filter.py
index dff35d692..c188380c0 100644
--- a/aleksis/apps/alsijil/migrations/0002_add_personal_note_filter.py
+++ b/aleksis/apps/alsijil/migrations/0002_add_personal_note_filter.py
@@ -3,8 +3,8 @@
import django.db.models.deletion
from django.db import migrations, models
-import biscuit.apps.alsijil.models
-import biscuit.core.util.core_helpers
+import aleksis.apps.alsijil.models
+import aleksis.core.util.core_helpers
class Migration(migrations.Migration):
@@ -31,7 +31,7 @@ class Migration(migrations.Migration):
"identifier",
models.CharField(
max_length=30,
- validators=[biscuit.apps.alsijil.models.isidentifier],
+ validators=[aleksis.apps.alsijil.models.isidentifier],
verbose_name="Identifier",
),
),
diff --git a/aleksis/apps/alsijil/model_extensions.py b/aleksis/apps/alsijil/model_extensions.py
index 521e5795e..41c7c0b88 100644
--- a/aleksis/apps/alsijil/model_extensions.py
+++ b/aleksis/apps/alsijil/model_extensions.py
@@ -2,9 +2,9 @@ from datetime import date
from django.db.models import Exists, F, OuterRef
-from biscuit.apps.chronos.models import LessonPeriod
-from biscuit.apps.chronos.util import CalendarWeek
-from biscuit.core.models import Group, Person
+from aleksis.apps.chronos.models import LessonPeriod
+from aleksis.apps.chronos.util import CalendarWeek
+from aleksis.core.models import Group, Person
from .models import PersonalNote
@@ -24,7 +24,7 @@ def mark_absent(
This function creates `PersonalNote` objects for every `LessonPeriod` the person
participates in on the selected day and marks them as absent/excused.
- ..note:: Only available when BiscuIT-App-Alsijil is installed.
+ ..note:: Only available when AlekSIS-App-Alsijil is installed.
:Date: 2019-11-10
:Authors:
@@ -62,7 +62,7 @@ def get_personal_notes(self, wanted_week: CalendarWeek):
Returns all linked `PersonalNote` objects, filtered by the given weeek,
creating those objects that haven't been created yet.
- ..note:: Only available when BiscuIT-App-Alsijil is installed.
+ ..note:: Only available when AlekSIS-App-Alsijil is installed.
:Date: 2019-11-09
:Authors:
diff --git a/aleksis/apps/alsijil/models.py b/aleksis/apps/alsijil/models.py
index 6f5d91f26..67833dc66 100644
--- a/aleksis/apps/alsijil/models.py
+++ b/aleksis/apps/alsijil/models.py
@@ -1,7 +1,7 @@
from django.db import models
from django.utils.translation import ugettext_lazy as _
-from biscuit.core.mixins import CRUDMixin
+from aleksis.core.mixins import CRUDMixin
def isidentifier(value: str) -> bool:
diff --git a/aleksis/apps/alsijil/templates/alsijil/print/full_register.html b/aleksis/apps/alsijil/templates/alsijil/print/full_register.html
index 5f132763e..b5f24badd 100644
--- a/aleksis/apps/alsijil/templates/alsijil/print/full_register.html
+++ b/aleksis/apps/alsijil/templates/alsijil/print/full_register.html
@@ -35,7 +35,7 @@
<p>
{% blocktrans %}
This printout is intended for archival purposes. The main copy of
- the class register is stored in the BiscuIT School Information
+ the class register is stored in the AlekSIS School Information
System.
{% endblocktrans %}
</p>
diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py
index 391116903..ea54bc236 100644
--- a/aleksis/apps/alsijil/views.py
+++ b/aleksis/apps/alsijil/views.py
@@ -11,11 +11,11 @@ from django.utils.translation import ugettext as _
from django_tables2 import RequestConfig
-from biscuit.apps.chronos.models import LessonPeriod
-from biscuit.apps.chronos.util import CalendarWeek
-from biscuit.core.decorators import admin_required
-from biscuit.core.models import Group, Person, School
-from biscuit.core.util import messages
+from aleksis.apps.chronos.models import LessonPeriod
+from aleksis.apps.chronos.util import CalendarWeek
+from aleksis.core.decorators import admin_required
+from aleksis.core.models import Group, Person, School
+from aleksis.core.util import messages
from .forms import (
LessonDocumentationForm,
diff --git a/pyproject.toml b/pyproject.toml
index a515f1830..ca49c0db4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,16 +1,16 @@
[tool.poetry]
-name = "BiscuIT-App-Alsijil"
+name = "AlekSIS-App-Alsijil"
version = "1.0a4dev0"
packages = [
{ include = "aleksis" }
]
readme = "README.rst"
-description = "AlekSIS School Information System (SIS) - App Alsijil (Class register)"
+description = "AlekSIS (School Information System) - App Alsijil (Class register)"
authors = ["Dominik George <dominik.george@teckids.org>", "mirabilos <thorsten.glaser@teckids.org>", "Tom Teichler <tom.teichler@teckids.org>"]
license = "EUPL-1.2"
homepage = "https://aleksis.edugit.io/"
-repository = "https://edugit.org/BiscuIT/BiscuIT-App-Alsijil"
+repository = "https://edugit.org/AlekSIS/AlekSIS-App-Alsijil"
documentation = "https://aleksis.edugit.io/AlekSIS/docs/html/"
classifiers = [
"Environment :: Web Environment",
@@ -21,7 +21,7 @@ classifiers = [
[tool.poetry.dependencies]
python = "^3.7"
AlekSIS = { path = "../../.." }
-BiscuIT-App-Chronos = { path = "../BiscuIT-App-Chronos" }
+AlekSIS-App-Chronos = { path = "../AlekSIS-App-Chronos" }
[build-system]
requires = ["poetry>=0.12"]
--
GitLab