Orthography refactoring

src/CreeDictionary/CreeDictionary/templatetags/creedictionary_extras.py

@@ -16,7 +16,7 @@
 )
 from morphodict.relabelling import read_labels
 from morphodict.utils import url_for_query
-from CreeDictionary.morphodict.templatetags.morphodict_orth import orth_tag
+from morphodict.orthography.templatetags.morphodict_orth import orth_tag
 from morphodict.lexicon.models import Wordform
 
 register = template.Library()

src/CreeDictionary/CreeDictionary/templatetags/relabelling.py

@@ -9,7 +9,7 @@
 from django.template import Context
 
 from morphodict.relabelling import read_labels
-from CreeDictionary.morphodict.templatetags.morphodict_orth import orth_tag
+from morphodict.orthography.templatetags.morphodict_orth import orth_tag
 from morphodict.utils.types import FSTTag
 from crkeng.app.preferences import DisplayMode
 

src/crkeng/app/integration_tests/test_relabel_with_orthography.py

@@ -4,7 +4,7 @@
 
 from CreeDictionary.CreeDictionary.orthography import to_macrons, to_syllabics
 from morphodict.paradigm.panes import RowLabel
-from CreeDictionary.morphodict.orthography import ORTHOGRAPHY
+from morphodict.orthography import ORTHOGRAPHY
 from pytest_django.asserts import assertInHTML
 from crkeng.app.preferences import DisplayMode
 

src/morphodict/orthography/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class OrthographyConfig(AppConfig):
+    name = "morphodict.orthography"

src/morphodict/orthography/templatetags/morphodict_orth.py

@@ -2,7 +2,7 @@
 from django.conf import settings
 from django.utils.html import format_html
 
-from ..orthography import ORTHOGRAPHY
+from morphodict.orthography import ORTHOGRAPHY
 
 register = template.Library()
 

src/morphodict/orthography/urls.py

@@ -2,7 +2,7 @@
 
 from . import views
 
-app_name = "morphodict"
+app_name = "morphodict.orthography"
 urlpatterns = [
     path(
         "change-orthography",

src/morphodict/orthography/views.py

@@ -6,7 +6,7 @@
 from django.http import HttpResponse
 from django.views import View
 
-from .orthography import ORTHOGRAPHY
+from morphodict.orthography import ORTHOGRAPHY
 
 
 class ChangeOrthography(View):

src/morphodict/site/settings.py

@@ -80,7 +80,7 @@
     "morphodict.cvd",
     "morphodict.search_quality",
     "morphodict.phrase_translate",
-    "CreeDictionary.morphodict.apps.MorphodictConfig",
+    "morphodict.orthography",
     # This comes last so that other apps can override templates
     "django.contrib.admin",
 ]
@@ -98,7 +98,7 @@
     "morphodict.site.securemiddleware.set_secure_headers",
 ]
 
-ROOT_URLCONF = "CreeDictionary.CreeDictionary.urls"
+ROOT_URLCONF = "morphodict.urls"
 
 TEMPLATES = [
     {

src/CreeDictionary/morphodict/tests/test_morphodict_init.py → src/morphodict/tests/test_morphodict_init.py

@@ -12,5 +12,5 @@ def test_default_config_exists():
     """
     A really trivial "test case": just checking that the app can be instantiated.
     """
-    app = AppConfig.create("CreeDictionary.morphodict.apps.MorphodictConfig")
-    assert "morphodict" in app.name
+    app = AppConfig.create("morphodict.orthography.apps.OrthographyConfig")
+    assert "orthography" in app.name

src/morphodict/tests/test_orth_cookie.py

@@ -7,7 +7,7 @@
 import pytest
 from django.urls import reverse
 
-from CreeDictionary.morphodict.orthography import ORTHOGRAPHY
+from morphodict.orthography import ORTHOGRAPHY
 
 
 @pytest.mark.parametrize(
@@ -62,4 +62,4 @@ def test_no_orthography(client, change_orth_url):
 
 @pytest.fixture
 def change_orth_url():
-    return reverse("morphodict:change-orthography")
+    return reverse("morphodict.orthography:change-orthography")

src/morphodict/tests/test_orth_templatetags.py

@@ -2,7 +2,7 @@
 # -*- coding: UTF-8 -*-
 
 import pytest
-from CreeDictionary.morphodict.templatetags.morphodict_orth import orth
+from morphodict.orthography.templatetags.morphodict_orth import orth
 
 
 def test_orth_requires_two_arguments():

src/morphodict/tests/test_usage_of_morphodict.py

@@ -3,7 +3,7 @@
 """
 
 import pytest
-from CreeDictionary.morphodict.orthography import ORTHOGRAPHY
+from morphodict.orthography import ORTHOGRAPHY
 
 
 def test_morphodict_orthography():

src/morphodict/urls.py

@@ -51,7 +51,7 @@
     ############################## Other applications ##############################
     path("admin/", admin.site.urls),
     path("search-quality/", include("morphodict.search_quality.urls")),
-    path("", include("CreeDictionary.morphodict.urls")),
+    path("", include("morphodict.orthography.urls")),
     path("", include("morphodict.api.urls")),
     path(
         "sitemap.xml",