fix(itinerary-details): wrong date time locale

stadtnavi · Dec 12, 2024 · 8a13cfa · 8a13cfa
1 parent 29a5e7e
commit 8a13cfa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/app/component/Duration.js b/app/component/Duration.js
@@ -2,21 +2,21 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import cx from 'classnames';
 
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, intlShape } from 'react-intl';
 import Icon from './Icon';
 import { durationToString } from '../util/timeUtils';
 
-function Duration(props) {
+function Duration(props, { intl }) {
   const timeOptions = {
     hour: 'numeric',
     minute: 'numeric',
     hour12: false,
   };
   const duration = durationToString(props.duration * 1000);
-  const startTime = new Intl.DateTimeFormat('en-US', timeOptions).format(
+  const startTime = new Intl.DateTimeFormat(intl.locale, timeOptions).format(
     new Date(props.startTime),
   );
-  const endTime = new Intl.DateTimeFormat('en-US', timeOptions).format(
+  const endTime = new Intl.DateTimeFormat(intl.locale, timeOptions).format(
     new Date(props.endTime),
   );
   const futureText = props.futureText
@@ -74,4 +74,8 @@ Duration.defaultTypes = {
   multiRow: false,
 };
 
+Duration.contextTypes = {
+  intl: intlShape,
+};
+
 export default Duration;
diff --git a/app/component/ItineraryDetails.js b/app/component/ItineraryDetails.js
@@ -145,7 +145,7 @@ class ItineraryDetails extends React.Component {
         id: 'tomorrow',
       });
     }
-    return getFormattedTimeDate(startTime, 'dd D.M.');
+    return getFormattedTimeDate(startTime, 'dd D.M.', this.context.intl.locale);
   };
 
   setExtraProps = itinerary => {

diff --git a/app/util/timeUtils.js b/app/util/timeUtils.js
@@ -122,8 +122,8 @@ export function isToday(startTime, refTime) {
 /**
  * Returns formatted date / time
  */
-export function getFormattedTimeDate(startTime, pattern) {
-  return moment(startTime).format(pattern);
+export function getFormattedTimeDate(startTime, pattern, locale) {
+  return moment(startTime).locale(locale).format(pattern);
 }
 
 /**