From 8f50f99ab7ae780a82ff08d50599289f12f99e0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felipe=20Ba=C3=B1ados=20Schwerter?= Date: Thu, 27 Jun 2024 16:17:52 +0000 Subject: [PATCH 1/4] Corrected docker entry for dev --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 0d69b7981..d767e61fd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -67,5 +67,5 @@ src/CreeDictionary/res/CW_aggregate_morpheme_log_freqs.txt filter=lfs diff=lfs merge=lfs -text src/CreeDictionary/res/crk_glossaries_aggregate_vocab.txt filter=lfs diff=lfs merge=lfs -text src/CreeDictionary/res/lemma_frequency.txt filter=lfs diff=lfs merge=lfs -text -src/docker/docker-compose.yml merge=ours +docker/docker-compose.yml merge=ours src/crkeng/site/settings.py merge=ours From 2c369685f434369b26eed936008607614c15a67b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felipe=20Ba=C3=B1ados=20Schwerter?= Date: Thu, 27 Jun 2024 16:18:12 +0000 Subject: [PATCH 2/4] whitespace to trigger divergence with dev --- docker/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 8e365ce5b..ad2e2cff6 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,6 +1,6 @@ -# WARNING: This file is autogenerated by make-yaml. Changes here -# will be overwritten. Edit the corresponding .template file -# instead. +# WARNING: This file is autogenerated by make-yaml. Changes here +# will be overwritten. Edit the corresponding .template file +# instead. version: "3" From 510e4241c79fdb65d5993f848b86070da7d2fa82 Mon Sep 17 00:00:00 2001 From: aarppe Date: Thu, 27 Jun 2024 21:08:15 -0600 Subject: [PATCH 3/4] Revised crk2eng tag conversion for unspecified actor (X -> XPl) --- src/CreeDictionary/phrase_translate/crk_tag_map.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CreeDictionary/phrase_translate/crk_tag_map.py b/src/CreeDictionary/phrase_translate/crk_tag_map.py index 94b642eed..7884e4d74 100644 --- a/src/CreeDictionary/phrase_translate/crk_tag_map.py +++ b/src/CreeDictionary/phrase_translate/crk_tag_map.py @@ -25,7 +25,7 @@ ("+Px12Pl", COPY_TAG_NAME, 3), # Maybe needs to be recoded with 12 -> 21 ("+Px3Pl", COPY_TAG_NAME, 3), ("+Px4Sg/Pl", COPY_TAG_NAME, 3), - ("+PxX", COPY_TAG_NAME, 3), + ("+PxX", "PxXPl+", 3), ) # Normally having a preverb tag excludes a wordform from auto-translation; this @@ -66,7 +66,7 @@ ("+3Pl", COPY_TAG_NAME, 2), ("+4Sg/Pl", COPY_TAG_NAME, 2), ("+5Sg/Pl", COPY_TAG_NAME, 2), - ("+X", COPY_TAG_NAME, 2), + ("+X", "+XPl", 2), # Person - Object ("+1SgO", COPY_TAG_NAME, 3), ("+2SgO", COPY_TAG_NAME, 3), @@ -79,5 +79,5 @@ ("+4Sg", COPY_TAG_NAME, 3), ("+4Sg/PlO", COPY_TAG_NAME, 3), ("+5Sg/PlO", COPY_TAG_NAME, 3), - ("+XO", COPY_TAG_NAME, 3), + ("+XO", "+XPlO", 3), ) From dfad418acde7fb9311891f624e8539a652fa65ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felipe=20Ba=C3=B1ados=20Schwerter?= Date: Fri, 28 Jun 2024 16:06:01 +0000 Subject: [PATCH 4/4] Changes to address #1178 --- src/CreeDictionary/phrase_translate/crk_tag_map.py | 4 ++-- src/morphodict/lexicon/importer/test_importer.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CreeDictionary/phrase_translate/crk_tag_map.py b/src/CreeDictionary/phrase_translate/crk_tag_map.py index 7884e4d74..4fd57e7f1 100644 --- a/src/CreeDictionary/phrase_translate/crk_tag_map.py +++ b/src/CreeDictionary/phrase_translate/crk_tag_map.py @@ -66,7 +66,7 @@ ("+3Pl", COPY_TAG_NAME, 2), ("+4Sg/Pl", COPY_TAG_NAME, 2), ("+5Sg/Pl", COPY_TAG_NAME, 2), - ("+X", "+XPl", 2), + ("+X", "XPl+", 2), # Person - Object ("+1SgO", COPY_TAG_NAME, 3), ("+2SgO", COPY_TAG_NAME, 3), @@ -79,5 +79,5 @@ ("+4Sg", COPY_TAG_NAME, 3), ("+4Sg/PlO", COPY_TAG_NAME, 3), ("+5Sg/PlO", COPY_TAG_NAME, 3), - ("+XO", "+XPlO", 3), + ("+XO", "XPlO+", 3), ) diff --git a/src/morphodict/lexicon/importer/test_importer.py b/src/morphodict/lexicon/importer/test_importer.py index 037baade9..646c7d3f2 100644 --- a/src/morphodict/lexicon/importer/test_importer.py +++ b/src/morphodict/lexicon/importer/test_importer.py @@ -525,7 +525,7 @@ def test_non_lemma_definition(db, translate_wordforms): expected_defns = [["it is a dance, a time of dancing", "CW"]] if translate_wordforms: - expected_defns.append(["someone dances", "🤖CW"]) + expected_defns.append(["people dance", "🤖CW"]) assert definitions_match(non_lemma.definitions.all(), expected_defns) assert {"time", "danc"}.issubset(