Merge branch 'main' into dev

UAlbertaALTLab · Jul 4, 2024 · c5c2a76 · c5c2a76
2 parents c2d1e16 + 9720673
commit c5c2a76
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/src/CreeDictionary/res/fst/transcriptor-cw-eng-noun-entry2inflected-phrase-w-flags.fomabin b/src/CreeDictionary/res/fst/transcriptor-cw-eng-noun-entry2inflected-phrase-w-flags.fomabin
diff --git a/...ary/res/fst/transcriptor-cw-eng-verb-entry2inflected-phrase-w-flags-and-templates.fomabin b/...ary/res/fst/transcriptor-cw-eng-verb-entry2inflected-phrase-w-flags-and-templates.fomabin
diff --git a/src/CreeDictionary/res/fst/transcriptor-eng-phrase2crk-features.fomabin b/src/CreeDictionary/res/fst/transcriptor-eng-phrase2crk-features.fomabin
diff --git a/src/CreeDictionary/tests/test_fst_regressions.py b/src/CreeDictionary/tests/test_fst_regressions.py
@@ -16,7 +16,7 @@
             # See: https://github.com/UAlbertaALTLab/morphodict/issues/897
             "ê-pim-nêhiyawêyahk",
             RichAnalysis(
-                (("PV/e+", "PV/pimi+"), "nêhiyawêw", ("+V", "+AI", "+Cnj", "+12Pl"))
+                (("PV/e+", "PV/pimi+"), "nêhiýawêw", ("+V", "+AI", "+Cnj", "+12Pl"))
                 # PV/e+PV/pimi+nêhiýawêw+V+AI+Cnj+12Pl
                 # ê-pim-nêhiýawêyahk
             ),

diff --git a/src/morphodict/lexicon/importer/test_importer.py b/src/morphodict/lexicon/importer/test_importer.py
@@ -296,7 +296,7 @@ def test_entry_changed(db, translate_wordforms, incremental):
         incremental=incremental,
     )
 
-    lemma = Wordform.objects.get(slug="miyotêhêw")
+    lemma = Wordform.objects.get(slug="miýotêhêw")
     assert lemma.paradigm == "VAI"
     assert definitions_match(
         lemma.definitions.all(),
@@ -307,7 +307,7 @@ def test_entry_changed(db, translate_wordforms, incremental):
     )
 
     if translate_wordforms:
-        inflected_wf = Wordform.objects.get(text="kimiyotêhânâwâw")
+        inflected_wf = Wordform.objects.get(text="kimiýotêhânâwâw")
         assert inflected_wf.lemma == lemma
         assert definitions_match(
             inflected_wf.definitions.all(),
@@ -323,7 +323,7 @@ def test_entry_changed(db, translate_wordforms, incremental):
         incremental=incremental,
     )
 
-    lemma = Wordform.objects.get(slug="miyotêhêw")
+    lemma = Wordform.objects.get(slug="miýotêhêw")
     assert lemma.paradigm == "VTA"
     assert definitions_match(
         lemma.definitions.all(),
@@ -336,7 +336,7 @@ def test_entry_changed(db, translate_wordforms, incremental):
     )
 
     if translate_wordforms:
-        inflected_wf = Wordform.objects.get(text="kimiyotêhâwâwak")
+        inflected_wf = Wordform.objects.get(text="kimiýotêhâwâwak")
         assert inflected_wf.lemma == lemma
         assert definitions_match(
             inflected_wf.definitions.all(),
@@ -353,12 +353,12 @@ def test_running_without_translations_after_running_with_removes_stuff(db):
     import_test_file("paradigm-change-before.importjson", translate_wordforms=True)
 
     assert Wordform.objects.count() > 10
-    assert Wordform.objects.get(slug="miyotêhêw")
+    assert Wordform.objects.get(slug="miýotêhêw")
 
     import_test_file("paradigm-change-before.importjson", translate_wordforms=False)
 
     assert Wordform.objects.count() == 1
-    assert Wordform.objects.get(slug="miyotêhêw")
+    assert Wordform.objects.get(slug="miýotêhêw")
 
 
 @parametrize_incremental

diff --git a/src/morphodict/lexicon/importer/testdata/paradigm-change-after.importjson b/src/morphodict/lexicon/importer/testdata/paradigm-change-after.importjson
@@ -1,11 +1,11 @@
 [
   {
-    "analysis": [[], "miyotêhêw", ["+V", "+TA", "+Ind", "+3Sg", "+4Sg/PlO"]],
-    "head": "miyotêhêw",
+    "analysis": [[], "miýotêhêw", ["+V", "+TA", "+Ind", "+3Sg", "+4Sg/PlO"]],
+    "head": "miýotêhêw",
     "linguistInfo": {
       "inflectional_category": "VTA-1",
       "pos": "V",
-      "stem": "miyotêh-",
+      "stem": "miýotêh-",
       "wordclass": "VTA"
     },
     "paradigm": "VTA",
@@ -15,6 +15,6 @@
         "sources": ["CW"]
       }
     ],
-    "slug": "miyotêhêw"
+    "slug": "miýotêhêw"
   }
 ]
diff --git a/src/morphodict/lexicon/importer/testdata/paradigm-change-before.importjson b/src/morphodict/lexicon/importer/testdata/paradigm-change-before.importjson
@@ -1,11 +1,11 @@
 [
   {
-    "analysis": [[], "miyotêhêw", ["+V", "+AI", "+Ind", "+3Sg"]],
-    "head": "miyotêhêw",
+    "analysis": [[], "miýotêhêw", ["+V", "+AI", "+Ind", "+3Sg"]],
+    "head": "miýotêhêw",
     "linguistInfo": {
       "inflectional_category": "VAI-1",
       "pos": "V",
-      "stem": "miyotêhê-",
+      "stem": "miýotêhê-",
       "wordclass": "VAI"
     },
     "paradigm": "VAI",
@@ -19,6 +19,6 @@
         "sources": ["CW"]
       }
     ],
-    "slug": "miyotêhêw"
+    "slug": "miýotêhêw"
   }
 ]