Merge pull request #428 from BloomBooks/BL9514_FirstLastUploaded

Tweak messages for first and last uploaded dates (BL-9514)

Author: JohnThomson

src/components/BookDetail/MetadataGroup.tsx

@@ -18,6 +18,13 @@ import { BookDetailInfoWidget } from "./BookDetailInfoWidget";
 export const LeftMetadata: React.FunctionComponent<{
     book: Book;
 }> = observer((props) => {
+    const originalUploadDateAsString = props.book.uploadDate!.toLocaleDateString();
+    const lastUploadDateAsString = props.book.lastUploadedDate
+        ? props.book.lastUploadedDate!.toLocaleDateString()
+        : undefined;
+    const displayLastUploadDate =
+        originalUploadDateAsString !== lastUploadDateAsString;
+
     return (
         <div
             css={css`
@@ -48,26 +55,39 @@ export const LeftMetadata: React.FunctionComponent<{
                 />{" "}
                 <LicenseLink book={props.book} />
             </div>
-            <div>
-                <FormattedMessage
-                    id="book.metadata.uploadedBy"
-                    defaultMessage="Uploaded {date} by {email}"
-                    values={{
-                        date: props.book.uploadDate!.toLocaleDateString(),
-                        email: obfuscateEmail(props.book.uploader),
-                    }}
-                />
-            </div>
-            {props.book.lastUploadedDate && (
+            {!displayLastUploadDate ? (
                 <div>
                     <FormattedMessage
-                        id="book.metadata.lastUploaded"
-                        defaultMessage="Last uploaded on {date}"
+                        id="book.metadata.uploadedBy"
+                        defaultMessage="Uploaded {date} by {email}"
                         values={{
-                            date: props.book.lastUploadedDate!.toLocaleDateString(),
+                            date: originalUploadDateAsString,
+                            email: obfuscateEmail(props.book.uploader),
                         }}
                     />
                 </div>
+            ) : (
+                <>
+                    <div>
+                        <FormattedMessage
+                            id="book.metadata.firstUploadedBy"
+                            defaultMessage="First uploaded {date} by {email}"
+                            values={{
+                                date: originalUploadDateAsString,
+                                email: obfuscateEmail(props.book.uploader),
+                            }}
+                        />
+                    </div>
+                    <div>
+                        <FormattedMessage
+                            id="book.metadata.updatedOn"
+                            defaultMessage="Updated on {date}"
+                            values={{
+                                date: lastUploadDateAsString,
+                            }}
+                        />
+                    </div>
+                </>
             )}
             {props.book.importedBookSourceUrl &&
                 props.book.importedBookSourceUrl.length > 0 && (

src/localization/Code Strings.json

@@ -242,9 +242,13 @@
         "description": "",
         "message": "Uploaded {date} by {email}"
     },
-    "book.metadata.lastUploaded": {
+    "book.metadata.firstUploadedBy": {
         "description": "",
-        "message": "Last uploaded on {date}"
+        "message": "First uploaded {date} by {email}"
+    },
+    "book.metadata.updatedOn": {
+        "description": "",
+        "message": "Updated on {date}"
     },
     "book.metadata.features": {
         "description": "",