From 5c599c335fa2ade0e04d6605f930ffdcf37d0d08 Mon Sep 17 00:00:00 2001
From: lingdocs <71590811+lingdocs@users.noreply.github.com>
Date: Sat, 25 Jun 2022 12:26:07 -0500
Subject: [PATCH] oops

---
 package.json                                 |  2 +-
 src/components/np-picker/NPPronounPicker.tsx |  6 +++---
 src/lib/phrase-building/render-sandwich.ts   | 17 +++++++----------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 855a141..d61aeba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lingdocs/pashto-inflector",
-  "version": "3.0.9",
+  "version": "3.1.0",
   "author": "lingdocs.com",
   "description": "A Pashto inflection and verb conjugation engine, inculding React components for displaying Pashto text, inflections, and conjugations",
   "homepage": "https://verbs.lingdocs.com",
diff --git a/src/components/np-picker/NPPronounPicker.tsx b/src/components/np-picker/NPPronounPicker.tsx
index 4ea31e2..309f12a 100644
--- a/src/components/np-picker/NPPronounPicker.tsx
+++ b/src/components/np-picker/NPPronounPicker.tsx
@@ -20,15 +20,15 @@ const labels = (role: "subject" | "object" | "ergative" | "possesor") => ({
     // ],
     e: role === "object" ? [
         ["me", "us"],
-        ["you", "y'all"],
+        ["you", "you (pl.)"],
         [{ masc: "him/it", fem: "her/it"}, "them"],
     ] : role === "possesor" ? [
         ["my", "our"],
-        ["your", "y'all's"],
+        ["your", "your (pl.)"],
         [{ masc: "his/its", fem: "her/its"}, "their"],
     ] : [
         ["I", "We"],
-        ["You", "Y'all"],
+        ["You", "You (pl.)"],
         [{ masc: "He/It", fem: "She/It"}, "They"],
     ],
     p: role === "subject" ? {
diff --git a/src/lib/phrase-building/render-sandwich.ts b/src/lib/phrase-building/render-sandwich.ts
index c2f2703..9e65b28 100644
--- a/src/lib/phrase-building/render-sandwich.ts
+++ b/src/lib/phrase-building/render-sandwich.ts
@@ -8,18 +8,15 @@ export function renderSandwich(s: T.SandwichSelection<T.Sandwich>): T.Rendered<T
         : (s.inside.selection.type === "noun" && isPattern5Entry(s.inside.selection.entry) && isAnimNounEntry(s.inside.selection.entry))
         ? false
         : true;
-    const inside = renderNPSelection(
-        s.inside,
-        true,
-        inflectInside,
-        "subject",
-        "none",
-    );
-    const e = `${s.e} ${inside.selection.e}`;
     return {
         ...s,
-        e,
-        inside,
+        inside: renderNPSelection(
+            s.inside,
+            true,
+            inflectInside,
+            "subject",
+            "none",
+        ),
     };
 }