Merge pull request #4316 from aman-atg/aman-atg-fix-spanishTrans

Show time and date in the preferred locale
Expensify · Jul 30, 2021 · 2444fdd · 2444fdd
2 parents 5988631 + cffa51a
commit 2444fdd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/src/languages/en.js b/src/languages/en.js
@@ -58,6 +58,12 @@ export default {
         send: 'Send',
         notifications: 'Notifications',
         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
@@ -58,6 +58,12 @@ export default {
         send: 'Enviar',
         notifications: 'Notificaciones',
         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',

diff --git 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}`,
     });
 }