From 68719dafdce405a939799e8fd8be0ec103428fe3 Mon Sep 17 00:00:00 2001
From: Aman Ansari <amanansari.a2@gmail.com>
Date: Sun, 25 Jul 2021 22:53:11 +0530
Subject: [PATCH 1/2] use translate() to properly format date-time

---
 src/libs/DateUtils.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/libs/DateUtils.js b/src/libs/DateUtils.js
index 7b9e77d9c919..b2107c821310 100644
--- a/src/libs/DateUtils.js
+++ b/src/libs/DateUtils.js
@@ -7,6 +7,7 @@ import _ from 'underscore';
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../ONYXKEYS';
 import CONST from '../CONST';
+import {translate} from './translate';
 
 let timezone;
 Onyx.connect({
@@ -57,13 +58,18 @@ function timestampToDateTime(locale, timestamp, includeTimeZone = false) {
     const date = getLocalMomentFromTimestamp(locale, timestamp);
     const tz = includeTimeZone ? ' [UTC]Z' : '';
 
+    const todayAt = translate(locale, 'common.todayAt');
+    const tomorrowAt = translate(locale, 'common.tomorrowAt');
+    const yesterdayAt = translate(locale, 'common.yesterdayAt');
+    const at = translate(locale, 'common.conjunctionAt');
+
     return moment(date).calendar({
-        sameDay: `[Today at] LT${tz}`,
-        nextDay: `[Tomorrow at] LT${tz}`,
-        nextWeek: `MMM D [at] LT${tz}`,
-        lastDay: `[Yesterday at] LT${tz}`,
-        lastWeek: `MMM D [at] LT${tz}`,
-        sameElse: `MMM D, YYYY [at] LT${tz}`,
+        sameDay: `[${todayAt}] LT${tz}`,
+        nextDay: `[${tomorrowAt}] LT${tz}`,
+        lastDay: `[${yesterdayAt}] LT${tz}`,
+        nextWeek: `MMM D [${at}] LT${tz}`,
+        lastWeek: `MMM D [${at}] LT${tz}`,
+        sameElse: `MMM D, YYYY [${at}] LT${tz}`,
     });
 }
 

From 89ccc6f520257ba516cab649f31449172b7a4379 Mon Sep 17 00:00:00 2001
From: Aman Ansari <amanansari.a2@gmail.com>
Date: Sun, 25 Jul 2021 23:26:43 +0530
Subject: [PATCH 2/2] add & fix some locales

---
 src/languages/en.js |  5 +++++
 src/languages/es.js | 13 ++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index 0d38c1bcf102..9f5692ec20c8 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -60,6 +60,11 @@ export default {
         noResultsFound: 'No results found',
         timePrefix: 'It\'s',
         conjunctionFor: 'for',
+        todayAt: 'Today at',
+        tomorrowAt: 'Tomorrow at',
+        yesterdayAt: 'Yesterday at',
+        conjunctionAt: 'at',
+
     },
     attachmentPicker: {
         cameraPermissionRequired: 'Camera Permission Required',
diff --git a/src/languages/es.js b/src/languages/es.js
index 674258988066..cc44a44a96eb 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -21,6 +21,8 @@ export default {
         not: 'No',
         signIn: 'Conectarse',
         continue: 'Continuar',
+        firstName: 'Nombre',
+        lastName: 'Apellidos',
         phoneNumber: 'Número de teléfono',
         email: 'Email',
         and: 'y',
@@ -55,6 +57,11 @@ export default {
         noResultsFound: 'No se han encontrado resultados',
         timePrefix: 'Son las',
         conjunctionFor: 'para',
+        todayAt: 'Hoy a las',
+        tomorrowAt: 'Mañana a las',
+        yesterdayAt: 'Ayer a las',
+        conjunctionAt: 'a',
+
     },
     attachmentPicker: {
         cameraPermissionRequired: 'Se necesita permiso para usar la cámara',
@@ -105,9 +112,11 @@ export default {
         youAppearToBeOffline: 'Parece que estás desconectado.',
         roomIsArchived: 'Esta sala de chat ha sido eliminada',
     },
-    reportActionContextMenu: {
+    contextMenuItem: {
         copyToClipboard: 'Copiar al Portapapeles',
         copied: '¡Copiado!',
+    },
+    reportActionContextMenu: {
         copyLink: 'Copiar Enlace',
         markAsUnread: 'Marcar como no leído',
         editComment: 'Editar Commentario',
@@ -170,9 +179,7 @@ export default {
     profilePage: {
         profile: 'Perfil',
         tellUsAboutYourself: '¡Cuéntanos algo sobre tí, nos encantaría conocerte!',
-        firstName: 'Nombre',
         john: 'Juan',
-        lastName: 'Apellidos',
         doe: 'Nadie',
         preferredPronouns: 'Pronombres preferidos',
         selectYourPronouns: 'Selecciona tus pronombres',