From 0a652ba6b8d5fedb244e5b28fa6939cec8abc162 Mon Sep 17 00:00:00 2001
From: lingdocs <71590811+lingdocs@users.noreply.github.com>
Date: Mon, 13 Jun 2022 13:37:10 -0400
Subject: [PATCH] add person info to NP block display

---
 package.json                    |  2 +-
 src/components/blocks/Block.tsx |  9 ++++++++-
 src/lib/misc-helpers.ts         | 21 +++++++++++++--------
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 73d57e2..ad6eec7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lingdocs/pashto-inflector",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "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/blocks/Block.tsx b/src/components/blocks/Block.tsx
index 7bc0a6b..577e09f 100644
--- a/src/components/blocks/Block.tsx
+++ b/src/components/blocks/Block.tsx
@@ -3,6 +3,7 @@ import classNames from "classnames";
 import {
     getEnglishFromRendered,
 } from "../../lib/phrase-building/np-tools";
+import { getEnglishPersonInfo } from "../../library";
 
 function Block({ opts, block }: {
     opts: T.TextOptions,
@@ -219,7 +220,13 @@ export function NPBlock({ opts, children, inside, english }: {
             <Adjectives opts={opts}>{np.selection.adjectives}</Adjectives>
             <div> {np.selection.ps[0].f}</div>
         </div>
-        <div className={inside ? "small" : ""}>NP</div>
+        <div className={inside ? "small" : ""}>
+            NP
+            {!inside ? <>
+                {` `}
+                <span className="text-muted small">({getEnglishPersonInfo(np.selection.person, "short")})</span>
+            </> : <></>}
+        </div>
         <EnglishBelow>{english}</EnglishBelow>
     </div>
 }
diff --git a/src/lib/misc-helpers.ts b/src/lib/misc-helpers.ts
index 8ddc093..8b4623e 100644
--- a/src/lib/misc-helpers.ts
+++ b/src/lib/misc-helpers.ts
@@ -147,15 +147,20 @@ export function personIsPlural(person: T.Person): boolean {
     return person > 5;
 }
 
-export function getEnglishPersonInfo(person: T.Person): string {
-    const p = [0,1,6,7].includes(person)
-        ? "1st pers"
+export function getEnglishPersonInfo(person: T.Person, version?: "short" | "long"): string {
+    const p = ([0,1,6,7].includes(person)
+        ? "1st"
         : [2,3,8,9].includes(person)
-        ? "2nd pers"
-        : "3rd pers";
-    const a = personIsPlural(person) ? "plur" : "sing";
-    const g = personGender(person);
-    return `${p}. ${a}. ${g}.`;
+        ? "2nd"
+        : "3rd") + (version !== "short" ? " pers." : "");
+    const number = personIsPlural(person) ? "plur" : "sing";
+    const n = version === "short"
+        ? (number === "plur" ? "pl" : "sn") : number;
+    const gender = personGender(person);
+    const g = version === "short"
+        ? (gender === "masc" ? "m" : "f")
+        : gender;
+    return `${p} ${n}. ${g}.`;
 }
 
 export function randomNumber(minInclusive: number, maxExclusive: number): number {