From ded5ecc5feae967f91abd36551eba985e0c8bd9b Mon Sep 17 00:00:00 2001
From: MrTimscampi <julien.machiels@protonmail.com>
Date: Sat, 10 Jul 2021 11:45:40 +0200
Subject: [PATCH 1/2] Improve people pages and metadata editor

---
 .../metadataEditor/metadataEditor.js          |  5 +++-
 .../metadataEditor.template.html              |  2 +-
 src/controllers/itemDetails/index.js          | 23 +++++++++++++++----
 src/strings/en-us.json                        |  3 +++
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/components/metadataEditor/metadataEditor.js b/src/components/metadataEditor/metadataEditor.js
index 49c8eb886f..8129354c6b 100644
--- a/src/components/metadataEditor/metadataEditor.js
+++ b/src/components/metadataEditor/metadataEditor.js
@@ -520,7 +520,7 @@ import template from './metadataEditor.template.html';
             hideElement('#fldPath', context);
         }
 
-        if (item.Type === 'Series' || item.Type === 'Movie' || item.Type === 'Trailer') {
+        if (item.Type === 'Series' || item.Type === 'Movie' || item.Type === 'Trailer' || item.Type === 'Person') {
             showElement('#fldOriginalName', context);
         } else {
             hideElement('#fldOriginalName', context);
@@ -638,6 +638,9 @@ import template from './metadataEditor.template.html';
 
         if (item.Type === 'Person') {
             //todo
+            context.querySelector('#txtName').label(globalize.translate('LabelName'));
+            context.querySelector('#txtSortName').label(globalize.translate('LabelSortName'));
+            context.querySelector('#txtOriginalName').label(globalize.translate('LabelOriginalName'));
             context.querySelector('#txtProductionYear').label(globalize.translate('LabelBirthYear'));
             context.querySelector('#txtPremiereDate').label(globalize.translate('LabelBirthDate'));
             context.querySelector('#txtEndDate').label(globalize.translate('LabelDeathDate'));
diff --git a/src/components/metadataEditor/metadataEditor.template.html b/src/components/metadataEditor/metadataEditor.template.html
index f080ecacdb..0f9c4516f7 100644
--- a/src/components/metadataEditor/metadataEditor.template.html
+++ b/src/components/metadataEditor/metadataEditor.template.html
@@ -252,7 +252,7 @@
             <br />
             <div class="formDialogFooter">
                 <button is="emby-button" type="button" class="raised button-cancel block btnCancel formDialogFooterItem">
-                    <span>${Cancel}</span>
+                    <span>${ButtonCancel}</span>
                 </button>
                 <button is="emby-button" type="submit" class="raised button-submit block btnSave formDialogFooterItem">
                     <span>${SaveChanges}</span>
diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index 76a4f124d5..cfd20435b1 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -1,3 +1,4 @@
+import { intervalToDuration } from 'date-fns';
 import { appHost } from '../../components/apphost';
 import loading from '../../components/loading/loading';
 import { appRouter } from '../../components/appRouter';
@@ -674,10 +675,16 @@ function reloadFromItem(instance, page, params, item, user) {
 
     if (item.Type == 'Person' && item.PremiereDate) {
         try {
-            const birthday = datetime.parseISO8601Date(item.PremiereDate, true).toDateString();
+            const birthday = datetime.parseISO8601Date(item.PremiereDate, true);
+            const durationSinceBorn = intervalToDuration({ start: birthday, end: Date.now() });
             itemBirthday.classList.remove('hide');
-            itemBirthday.innerHTML = globalize.translate('BirthDateValue', birthday);
+            if (item.EndDate) {
+                itemBirthday.innerHTML = globalize.translate('BirthDateValue', birthday.toLocaleDateString());
+            } else {
+                itemBirthday.innerHTML = `${globalize.translate('BirthDateValue', birthday.toLocaleDateString())} ${globalize.translate('AgeValue', durationSinceBorn.years)}`;
+            }
         } catch (err) {
+            console.error(err);
             itemBirthday.classList.add('hide');
         }
     } else {
@@ -688,10 +695,18 @@ function reloadFromItem(instance, page, params, item, user) {
 
     if (item.Type == 'Person' && item.EndDate) {
         try {
-            const deathday = datetime.parseISO8601Date(item.EndDate, true).toDateString();
+            const deathday = datetime.parseISO8601Date(item.EndDate, true);
             itemDeathDate.classList.remove('hide');
-            itemDeathDate.innerHTML = globalize.translate('DeathDateValue', deathday);
+            if (item.PremiereDate) {
+                const birthday = datetime.parseISO8601Date(item.PremiereDate, true);
+                const durationSinceBorn = intervalToDuration({ start: birthday, end: deathday });
+
+                itemDeathDate.innerHTML = `${globalize.translate('DeathDateValue', deathday.toLocaleDateString())} ${globalize.translate('AgeValue', durationSinceBorn.years)}`;
+            } else {
+                itemDeathDate.innerHTML = globalize.translate('DeathDateValue', deathday.toLocaleDateString());
+            }
         } catch (err) {
+            console.error(err);
             itemDeathDate.classList.add('hide');
         }
     } else {
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 9e4132e586..f3aa7fbc05 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -8,6 +8,7 @@
     "AddToCollection": "Add to collection",
     "AddToPlaylist": "Add to playlist",
     "AddToPlayQueue": "Add to play queue",
+    "AgeValue": "({0} years old)",
     "AirDate": "Air date",
     "Aired": "Aired",
     "Album": "Album",
@@ -745,6 +746,7 @@
     "LabelOptionalNetworkPath": "Shared network folder:",
     "LabelOptionalNetworkPathHelp": "If this folder is shared on your network, supplying the network share path can allow clients on other devices to access media files directly. For example, {0} or {1}.",
     "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelOriginalName": "Original name:",
     "LabelOriginalTitle": "Original title:",
     "LabelOverview": "Overview:",
     "LabelParentalRating": "Parental rating:",
@@ -828,6 +830,7 @@
     "LabelSonyAggregationFlags": "Sony aggregation flags:",
     "LabelSonyAggregationFlagsHelp": "Determines the content of the aggregationFlags element in the urn:schemas-sonycom:av namespace.",
     "LabelSortBy": "Sort by:",
+    "LabelSortName": "Sort name:",
     "LabelSortOrder": "Sort order:",
     "LabelSortTitle": "Sort title:",
     "LabelSource": "Source:",

From 6301e675238b935ace4a9e7728752d352a035974 Mon Sep 17 00:00:00 2001
From: Bill Thornton <billt2006@gmail.com>
Date: Tue, 7 Sep 2021 12:19:48 -0400
Subject: [PATCH 2/2] Remove empty todo

---
 src/components/metadataEditor/metadataEditor.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/metadataEditor/metadataEditor.js b/src/components/metadataEditor/metadataEditor.js
index 8129354c6b..530b760c88 100644
--- a/src/components/metadataEditor/metadataEditor.js
+++ b/src/components/metadataEditor/metadataEditor.js
@@ -637,7 +637,6 @@ import template from './metadataEditor.template.html';
         }
 
         if (item.Type === 'Person') {
-            //todo
             context.querySelector('#txtName').label(globalize.translate('LabelName'));
             context.querySelector('#txtSortName').label(globalize.translate('LabelSortName'));
             context.querySelector('#txtOriginalName').label(globalize.translate('LabelOriginalName'));