Merge branch 'main' into blackfoot-setup

cypress/integration/cwdeng/basics.spec.js

@@ -7,13 +7,13 @@ describe("The Woods Cree site", function () {
   });
 
   it("can search for a word", function () {
-    cy.visitSearch(`makes pottery`, urls.cwdeng).searchResultsContain(
-      "asiskīwithākanihkīw"
+    cy.visitSearch(`makes snowshoes`, urls.cwdeng).searchResultsContain(
+      "asāmīhkīw"
     );
   });
 
   it("can display a paradigm", function () {
-    cy.visit(`${urls.cwdeng}/word/asiskīwithākanihkīw`);
-    cy.get(".paradigm-cell").contains("kitasiskīwithākanihkānaw");
+    cy.visit(`${urls.cwdeng}/word/asâmîhkîw`);
+    cy.get(".paradigm-cell").contains("kitasāmīhkānānaw");
   });
 });

src/CreeDictionary/CreeDictionary/templates/CreeDictionary/components/citations.html

@@ -53,6 +53,8 @@
           Experimental automatically inflected form of AECD definition
         {%  elif source == "Lacombe" %}
             Lacombe, Albert O.M.I. 1874. <span class="source-title">Dictionnaire de la langue des Cris.</span> Montréal, QC: C. O. Beauchemin et Valois.
+        {% elif source == "CCCD" %}
+            Charles, C., Goulet, K., McKenzie, M. <span class="source-title">Colin Charles Cree Dictionary.</span> Lac La Ronge Indian Band, 2021. 
         {% else %}
           UNKNOWN SOURCE ID: {{ source }}. If you're reading this, please
           contact us using the link in the footer, near the bottom of the

src/CreeDictionary/tests/API_tests/model_test.py

@@ -262,7 +262,9 @@ def test_lemma_ranking_most_frequent_word():
     # the English sleep should many Cree words. But nipâw should show first because
     # it undoubtedly has the highest frequency
     results = search(query="sees").presentation_results()
-    assert results[0].wordform.text == "wâpahtam"
+    top_3_texts = set([result.wordform.text for result in results[0:3]])
+    assert "wâpahtam" in top_3_texts
+    assert "wâpamêw" in top_3_texts
 
 
 @pytest.mark.django_db

src/blaeng/resources/layouts/VAI/basic.tsv

@@ -1,4 +1,4 @@
-	| Pos
+	| Ind
 _ 1Sg	${lemma}+VAI+Ind+1Sg
 _ 2Sg	${lemma}+VAI+Ind+2Sg
 _ 3Sg	${lemma}+VAI+Ind+3Sg
@@ -9,21 +9,17 @@ _ 3Pl	${lemma}+VAI+Ind+3Pl
 _ 4Sg	${lemma}+VAI+Ind+4Sg
 _ 4Pl	${lemma}+VAI+Ind+4Pl
 
-	| Neg
-_ 1Sg	Neg+${lemma}+VAI+Ind+1Sg
-_ 2Sg	Neg+${lemma}+VAI+Ind+2Sg
-_ 3Sg	Neg+${lemma}+VAI+Ind+3Sg
-_ 1Pl	Neg+${lemma}+VAI+Ind+1Pl
-_ 21Pl	Neg+${lemma}+VAI+Ind+21Pl
-_ 2Pl	Neg+${lemma}+VAI+Ind+2Pl
-_ 3Pl	Neg+${lemma}+VAI+Ind+3Pl
-_ 4Sg	Neg+${lemma}+VAI+Ind+4Sg
-_ 4Pl	Neg+${lemma}+VAI+Ind+4Pl
+	| Cnj
+_ 1Sg	${lemma}+VAI+Cnj+1Sg
+_ 2Sg	${lemma}+VAI+Cnj+2Sg
+_ 3Sg	${lemma}+VAI+Cnj+3Sg
+_ 1Pl	${lemma}+VAI+Cnj+1Pl
+_ 21Pl	${lemma}+VAI+Cnj+21Pl
+_ 2Pl	${lemma}+VAI+Cnj+2Pl
+_ 3Pl	${lemma}+VAI+Cnj+3Pl
+_ 4Sg	${lemma}+VAI+Cnj+4Sg
+_ 4Pl	${lemma}+VAI+Cnj+4Pl
 
 # Imp	
-	| Pos
-_ 2Sg	${lemma}+VAI+Imp+Sg
-_ 2Pl	${lemma}+VAI+Imp+Pl
-	| Neg
-_ 2Sg	Neg+${lemma}+VAI+Imp+Sg
-_ 2Pl	Neg+${lemma}+VAI+Imp+Pl
+_ 2Sg	${lemma}+VAI+Imp+2Sg
+_ 2Pl	${lemma}+VAI+Imp+2Pl

src/blaeng/resources/layouts/VII/basic.tsv

@@ -2,6 +2,6 @@
 _ 0Sg _ Prs	${lemma}+VII+Ind+0Sg
 _ 0Pl _ Prs	${lemma}+VII+Ind+0Pl
 
-	| Neg
-_ 0Sg	Neg+${lemma}+VII+Ind+0Sg
-_ 0Pl	Neg+${lemma}+VII+Ind+0Pl
+	| Cnj
+_ 0Sg _ Prs	${lemma}+VII+Cnj+0Sg
+_ 0Pl _ Prs	${lemma}+VII+Cnj+0Pl

src/blaeng/resources/layouts/VTA/basic.tsv

@@ -1,7 +1,4 @@
-
-# Ind
-
-	| Pos
+	| Ind
 _ 1Sg _ 2SgO	${lemma}+VTA+Ind+1Sg+2SgO
 _ 1Sg _ 3SgO	${lemma}+VTA+Ind+1Sg+3SgO
 _ 2Sg _ 1SgO	${lemma}+VTA+Ind+2Sg+1SgO
@@ -13,22 +10,18 @@ _ 3Sg _ 4PlO	${lemma}+VTA+Ind+3Sg+4PlO
 _ 4Sg _ 3SgO	${lemma}+VTA+Ind+4Sg+3SgO
 _ 4Pl _ 3SgO	${lemma}+VTA+Ind+4Pl+3SgO
 
-	| Neg
-_ 1Sg _ 2SgO	Neg+${lemma}+VTA+Ind+1Sg+2SgO
-_ 1Sg _ 3SgO	Neg+${lemma}+VTA+Ind+1Sg+3SgO
-_ 2Sg _ 1SgO	Neg+${lemma}+VTA+Ind+2Sg+1SgO
-_ 2Sg _ 3SgO	Neg+${lemma}+VTA+Ind+2Sg+3SgO
-_ 3Sg _ 1SgO	Neg+${lemma}+VTA+Ind+3Sg+1SgO
-_ 3Sg _ 2SgO	Neg+${lemma}+VTA+Ind+3Sg+2SgO
-_ 3Sg _ 4SgO	Neg+${lemma}+VTA+Ind+3Sg+4SgO
-_ 3Sg _ 4PlO	Neg+${lemma}+VTA+Ind+3Sg+4PlO
-_ 4Sg _ 3SgO	Neg+${lemma}+VTA+Ind+4Sg+3SgO
-_ 4Pl _ 3SgO	Neg+${lemma}+VTA+Ind+4Pl+3SgO
+	| Cnj
+_ 1Sg _ 2SgO	${lemma}+VTA+Cnj+1Sg+2SgO
+_ 1Sg _ 3SgO	${lemma}+VTA+Cnj+1Sg+3SgO
+_ 2Sg _ 1SgO	${lemma}+VTA+Cnj+2Sg+1SgO
+_ 2Sg _ 3SgO	${lemma}+VTA+Cnj+2Sg+3SgO
+_ 3Sg _ 1SgO	${lemma}+VTA+Cnj+3Sg+1SgO
+_ 3Sg _ 2SgO	${lemma}+VTA+Cnj+3Sg+2SgO
+_ 3Sg _ 4SgO	${lemma}+VTA+Cnj+3Sg+4SgO
+_ 3Sg _ 4PlO	${lemma}+VTA+Cnj+3Sg+4PlO
+_ 4Sg _ 3SgO	${lemma}+VTA+Cnj+4Sg+3SgO
+_ 4Pl _ 3SgO	${lemma}+VTA+Cnj+4Pl+3SgO
 
 # Imp	
-	| Pos
 _ 2Sg _ 1SgO	${lemma}+VTA+Imp+2Sg+1SgO
 _ 2Sg _ 3SgO	${lemma}+VTA+Imp+2Sg+3SgO
-	| Neg
-_ 2Sg _ 1SgO	Neg+${lemma}+VTA+Imp+2Sg+1SgO
-_ 2Sg _ 3SgO	Neg+${lemma}+VTA+Imp+2Sg+3SgO

src/blaeng/resources/layouts/VTI/basic.tsv

@@ -1,30 +1,25 @@
-# Ind
-| Pos
-_ 1Sg _ 0SgO	${lemma}+VTI+Ind+1Sg+0SgO
-_ 2Sg _ 0SgO	${lemma}+VTI+Ind+2Sg+0SgO
-_ 3Sg _ 0SgO	${lemma}+VTI+Ind+3Sg+0SgO
-_ 1Pl _ 0SgO	${lemma}+VTI+Ind+1Pl+0SgO
-_ 21Pl _ 0SgO	${lemma}+VTI+Ind+21Pl+0SgO
-_ 2Pl _ 0SgO	${lemma}+VTI+Ind+2Pl+0SgO
-_ 3Pl _ 0PlO	${lemma}+VTI+Ind+3Pl+0PlO
-_ 4Sg _ 0SgO	${lemma}+VTI+Ind+4Sg+0SgO
-_ 4Pl _ 0PlO	${lemma}+VTI+Ind+4Pl+0PlO
+	| Ind
+_ 1Sg	${lemma}+VTI+Ind+1Sg+0SgO
+_ 2Sg	${lemma}+VTI+Ind+2Sg+0SgO
+_ 3Sg	${lemma}+VTI+Ind+3Sg+0SgO
+_ 1Pl	${lemma}+VTI+Ind+1Pl+0SgO
+_ 21Pl	${lemma}+VTI+Ind+21Pl+0SgO
+_ 2Pl	${lemma}+VTI+Ind+2Pl+0SgO
+_ 3Pl	${lemma}+VTI+Ind+3Pl+0SgO
+_ 4Sg	${lemma}+VTI+Ind+4Sg+0SgO
+_ 4Sg	${lemma}+VTI+Ind+4Pl+0SgO
 
-	| Neg
-_ 1Sg _ 0SgO	Neg+${lemma}+VTI+Ind+1Sg+0SgO
-_ 2Sg _ 0SgO	Neg+${lemma}+VTI+Ind+2Sg+0SgO
-_ 3Sg _ 0SgO	Neg+${lemma}+VTI+Ind+3Sg+0SgO
-_ 1Pl _ 0SgO	Neg+${lemma}+VTI+Ind+1Pl+0SgO
-_ 21Pl _ 0SgO	Neg+${lemma}+VTI+Ind+21Pl+0SgO
-_ 2Pl _ 0SgO	Neg+${lemma}+VTI+Ind+2Pl+0SgO
-_ 3Pl _ 0SgO	Neg+${lemma}+VTI+Ind+3Pl+0PlO
-_ 4Sg _ 0SgO	Neg+${lemma}+VTI+Ind+4Sg+0SgO
-_ 4Pl _ 0SgO	Neg+${lemma}+VTI+Ind+4Pl+0PlO
+	| Cnj
+_ 1Sg	${lemma}+VTI+Cnj+1Sg+0SgO
+_ 2Sg	${lemma}+VTI+Cnj+2Sg+0SgO
+_ 3Sg	${lemma}+VTI+Cnj+3Sg+0SgO
+_ 1Pl	${lemma}+VTI+Cnj+1Pl+0SgO
+_ 21Pl	${lemma}+VTI+Cnj+21Pl+0SgO
+_ 2Pl	${lemma}+VTI+Cnj+2Pl+0SgO
+_ 3Pl	${lemma}+VTI+Cnj+3Pl+0SgO
+_ 4Sg	${lemma}+VTI+Cnj+4Sg+0SgO
+_ 4Pl	${lemma}+VTI+Cnj+4Pl+0SgO
 
 # Imp	
-	| Pos
-_ 2Sg _ 0SgO	${lemma}+VTI+Imp+Sg+0SgO
-_ 2Pl _ 0SgO	${lemma}+VTI+Imp+Pl+0SgO
-	| Neg
-_ 2Sg _ 0SgO	Neg+${lemma}+VTI+Imp+Sg+0SgO
-_ 2Pl _ 0SgO	Neg+${lemma}+VTI+Imp+Pl+0SgO
+_ 2Sg	${lemma}+VTI+Imp+2Sg+0SgO
+_ 2Pl	${lemma}+VTI+Imp+2Pl+0SgO

src/cwdeng/resources/dictionary/cwdeng_test_db.importjson

@@ -13,6 +13,10 @@
       {
         "definition": "star",
         "sources": ["CW"]
+      },
+      {
+        "definition": "star - first word in CW.",
+        "sources": ["TEST"]
       }
     ],
     "slug": "acâhkos"
@@ -118,6 +122,23 @@
     ],
     "slug": "asawāpamīw"
   },
+  {
+    "head": "asâmîhkîw",
+    "linguistInfo": {
+      "inflectional_category": "VAI-1",
+      "pos": "V",
+      "stem": "asâmîhkî-",
+      "wordclass": "VAI"
+    },
+    "paradigm": "VAI",
+    "senses": [
+      {
+        "definition": "he/she makes snowshoes",
+        "sources": ["CCCD"]
+      }
+    ],
+    "slug": "asâmîhkîw"
+  },
   {
     "analysis": [[], "asikan", ["+N", "+A", "+Sg"]],
     "head": "asikan",