Merge pull request #4866 from HSLdevcom/DT-5890-translations

Dt 5890 translations
HSLdevcom · Sep 25, 2023 · b8d6bb8 · b8d6bb8
2 parents 6ea65fb + a637d58
commit b8d6bb8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/app/component/ItineraryTab.js b/app/component/ItineraryTab.js
@@ -81,10 +81,12 @@ class ItineraryTab extends React.Component {
     isMobile: PropTypes.bool.isRequired,
     currentTime: PropTypes.number.isRequired,
     hideTitle: PropTypes.bool,
+    currentLanguage: PropTypes.string,
   };
 
   static defaultProps = {
     hideTitle: false,
+    currentLanguage: "fi"
   };
 
   static contextTypes = {
@@ -176,7 +178,7 @@ class ItineraryTab extends React.Component {
   };
 
   render() {
-    const { itinerary } = this.props;
+    const { itinerary, currentLanguage } = this.props;
     const { config } = this.context;
 
     if (!itinerary || !itinerary.legs[0]) {
@@ -315,14 +317,14 @@ class ItineraryTab extends React.Component {
                             values={{
                               callAgencyInfoUrl: get(
                                 config,
-                                'callAgencyInfo.callAgencyInfoLink',
+                                `callAgencyInfo.${currentLanguage}.callAgencyInfoLink`,
                               ),
                             }}
                           />
-                          <a href={config.callAgencyInfo.callAgencyInfoLink}>
+                          <a href={config.callAgencyInfo[currentLanguage].callAgencyInfoLink}>
                             <FormattedMessage
-                              id={config.callAgencyInfo.callAgencyInfoLinkText}
-                              defaultMessage={config.callAgencyInfo.callAgencyInfoLinkText}
+                              id={config.callAgencyInfo[currentLanguage].callAgencyInfoLinkText}
+                              defaultMessage={config.callAgencyInfo[currentLanguage].callAgencyInfoLinkText}
                             />
                           </a>
                         </div>
@@ -369,6 +371,7 @@ class ItineraryTab extends React.Component {
 const withRelay = createFragmentContainer(
   connectToStores(ItineraryTab, ['TimeStore'], context => ({
     currentTime: context.getStore('TimeStore').getCurrentTime().unix(),
+    currentLanguage: context.getStore('PreferencesStore').getLanguage(),
   })),
   {
     plan: graphql`

diff --git a/app/configurations/config.tampere.js b/app/configurations/config.tampere.js
@@ -81,8 +81,18 @@ export default configMerger(walttiConfig, {
   ticketLink: 'https://www.nysse.fi/liput-ja-hinnat.html',
 
   callAgencyInfo: {
-    callAgencyInfoLink: 'https://nysse.fi/nyssykka',
-    callAgencyInfoLinkText: 'nysse.fi/nyssykka',
+    fi: {
+      callAgencyInfoLink: 'https://nysse.fi/kutsuliikenne',
+      callAgencyInfoLinkText: 'https://nysse.fi/kutsuliikenne',
+    },
+    sv: {
+      callAgencyInfoLink: 'https://nysse.fi/kutsuliikenne',
+      callAgencyInfoLinkText: 'https://nysse.fi/kutsuliikenne',
+    },
+    en: {
+      callAgencyInfoLink: 'https://nysse.fi/drt',
+      callAgencyInfoLinkText: 'https://nysse.fi/drt',
+    },
   },
 
   // mapping fareId from OTP fare identifiers to human readable form

diff --git a/app/translations.js b/app/translations.js
@@ -1465,7 +1465,7 @@ const translations = {
     'separate-ticket-required-disclaimer':
       'This itinerary contains one or more legs for which {agencyName} does not sell tickets.',
     'separate-ticket-required-for-call-agency-disclaimer':
-      'Voit tarkistaa kutsuliikenteen maksutavat ja käytännöt ',
+      'The journey includes demand responsive transport service. Please check the payment methods and practices on ',
     'set-specific-settings': 'Set more specific settings',
     'set-stop-as-routes': "Set the stop as route's",
     settings: 'Settings',
@@ -2601,7 +2601,7 @@ const translations = {
     'separate-ticket-required-disclaimer':
       'Matka sisältää yhden tai useamman osuuden, jonka lippujen myynnistä {agencyName} ei vastaa.',
     'separate-ticket-required-for-call-agency-disclaimer':
-      'Voit tarkistaa kutsuliikenteen maksutavat ja käytännöt ',
+      'Matka sisältää kutsuliikennettä. Voit tarkistaa maksutavat ja käytännöt ',
     'set-specific-settings': 'Aseta tarkemmat asetukset',
     'set-stop-as-routes': 'Aseta pysäkki reitin',
     settings: 'Asetukset',
@@ -4521,7 +4521,7 @@ const translations = {
     'separate-ticket-required-disclaimer':
       'Resan består av en eller fleta etapper vilka kräver biljetter som inte säljs av {agencyName}.',
     'separate-ticket-required-for-call-agency-disclaimer':
-      'Voit tarkistaa kutsuliikenteen maksutavat ja käytännöt ',
+      'I resan ingår anropsbusstrafiken. Bekanta dig med betalningsmetoder och praxis på ',
     'set-specific-settings': 'Ställa avancerade inställningar',
     'set-stop-as-routes': 'Ställa hållplats som rutter',
     settings: 'Anpassa',