Merge pull request #5762 from HSLdevcom/misc-fixes-april

Miscellaneous minor fixes

Author: vesameskanen

app/component/LangSelect.js

@@ -1,11 +1,14 @@
-import PropTypes from 'prop-types';
 import React from 'react';
-import { matchShape, routerShape } from 'found';
+import PropTypes from 'prop-types';
+import { matchShape } from 'found';
 import { useIntl } from 'react-intl';
-import connectToStores from 'fluxible-addons-react/connectToStores';
-import { configShape } from '../util/shapes';
+import { useConfigContext } from '../configurations/ConfigContext';
+
+const Language = ({ lang }, { match }) => {
+  const { language } = useConfigContext();
+  const intl = useIntl();
+  const highlight = lang === language;
 
-const language = (lang, highlight, match, intl) => {
   const aria = highlight
     ? intl.formatMessage(
         { id: 'search-current-suggestion' },
@@ -25,36 +28,18 @@ const language = (lang, highlight, match, intl) => {
   );
 };
 
-const LangSelect = ({ currentLanguage }, { config, match }) => {
-  const intl = useIntl();
+Language.contextTypes = { match: matchShape.isRequired };
+Language.propTypes = { lang: PropTypes.string.isRequired };
+
+const LanguageSelect = ({}, { match }) => { // eslint-disable-line
+  const { availableLanguages } = useConfigContext();
   return (
     <div key="lang-select" id="lang-select">
-      {config.availableLanguages.map(lang =>
-        language(lang, lang === currentLanguage, match, intl),
-      )}
+      {availableLanguages.map(lang => (
+        <Language key={lang} lang={lang} />
+      ))}
     </div>
   );
 };
 
-LangSelect.displayName = 'LangSelect';
-
-LangSelect.propTypes = {
-  currentLanguage: PropTypes.string.isRequired,
-};
-
-LangSelect.contextTypes = {
-  executeAction: PropTypes.func.isRequired,
-  config: configShape.isRequired,
-  router: routerShape.isRequired,
-  match: matchShape.isRequired,
-};
-
-const connected = connectToStores(
-  LangSelect,
-  ['PreferencesStore'],
-  context => ({
-    currentLanguage: context.getStore('PreferencesStore').getLanguage(),
-  }),
-);
-
-export { connected as default, LangSelect as Component };
+export default LanguageSelect;

app/configurations/config.default.js

@@ -213,19 +213,8 @@ export default {
   // if you enable car suggestions but the linear distance between all points is less than this, then a car route will
   // not be computed
   suggestCarMinDistance: 2000,
-  availableLanguages: [
-    'fi',
-    'sv',
-    'en',
-    'fr',
-    'nb',
-    'de',
-    'da',
-    'es',
-    'ro',
-    'pl',
-  ],
-  defaultLanguage: 'en',
+  availableLanguages: ['fi', 'sv', 'en'],
+  defaultLanguage: 'fi',
   timeZone: 'Europe/Helsinki',
   allowLogin: false,
   allowFavouritesFromLocalstorage: true,

app/configurations/config.hsl.js

@@ -91,11 +91,9 @@ export default {
 
   title: 'Reittiopas',
 
-  availableLanguages: ['fi', 'sv', 'en'],
   availableTickets: {
     Sipoo: true,
   },
-  defaultLanguage: 'fi',
   passLanguageToRootLink: true,
 
   favicon: './app/configurations/images/hsl/hsl-favicon.png',

app/configurations/config.kela.js

@@ -93,9 +93,6 @@ export default {
     countrySelection: [],
   },
 
-  availableLanguages: ['fi', 'sv', 'en'],
-  defaultLanguage: 'fi',
-
   socialMedia: {
     title: APP_TITLE,
     description: APP_DESCRIPTION,

app/configurations/config.matka.js

@@ -33,9 +33,6 @@ export default {
     countrySelection: ['estonia'],
   },
 
-  availableLanguages: ['fi', 'sv', 'en'],
-  defaultLanguage: 'fi',
-
   socialMedia: {
     title: APP_TITLE,
     description: APP_DESCRIPTION,

app/configurations/config.waltti.js

@@ -56,9 +56,6 @@ export default {
     description: APP_DESCRIPTION,
   },
 
-  availableLanguages: ['fi', 'sv', 'en'],
-  defaultLanguage: 'fi',
-
   vehicles: true,
   showVehiclesOnStopPage: true,
   showVehiclesOnItineraryPage: true,

app/translations/en.js

@@ -525,6 +525,7 @@ export default {
       'Please note that you need to use the app of the operator in question in order to use and pay for the taxis or scooters.',
     'payment-info-taxi':
       'Please note that you need to use the app of the operator in question in order to use and pay for the taxis.',
+    'personal-itineraries': 'Personal itineraries',
     personalisation: 'Personalisation',
     'personalisation-beta':
       'Personalization is still in the testing phase, meaning we are trying out the service. We would love to hear about your experience. The survey will open in a new tab.',

app/translations/fi.js

@@ -513,6 +513,7 @@ export default {
       'Huomaathan, että potkulautojen ja taksin käyttö ja maksaminen tapahtuu toimijoiden omilla sovelluksilla.',
     'payment-info-taxi':
       'Huomaathan, että taksien ja kyytipalveluiden käyttö ja maksaminen tapahtuu toimijoiden omilla sovelluksilla.',
+    'personal-itineraries': 'Yksilölliset reittiehdotukset',
     personalisation: 'Personointi',
     'personalisation-beta':
       'Personointi on vielä testausvaiheessa, eli kokeilemme palvelua. Haluaisimme kuulla kokemuksestasi. Kysely avautuu uuteen välilehteen.',

app/translations/sv.js

@@ -519,6 +519,7 @@ export default {
       'Vänligen observera att användning och betalning av elsparkcyklar och taxi görs via operatörernas egna appar.',
     'payment-info-taxi':
       'Vänligen observera att användning och betalning av taxi görs via operatörernas egna appar.',
+    'personal-itineraries': 'Individuella ruttförslag',
     personalisation: 'Personalisering',
     'personalisation-beta':
       'Personaliseringen är fortfarande i testfasen, vilket innebär att vi testar tjänsten. Vi vill gärna höra om din upplevelse. Undersökningen öppnas i en ny flik.',

digitransit-component/packages/digitransit-component-autosuggest-panel/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitransit-component/digitransit-component-autosuggest-panel",
-  "version": "8.3.0",
+  "version": "8.3.1",
   "description": "digitransit-component autosuggest-panel module",
   "main": "index.js",
   "files": [
@@ -28,7 +28,7 @@
   "author": "Digitransit Authors",
   "license": "(AGPL-3.0 OR EUPL-1.2)",
   "peerDependencies": {
-    "@digitransit-component/digitransit-component-autosuggest": "^7.1.5",
+    "@digitransit-component/digitransit-component-autosuggest": "^7.1.6",
     "@digitransit-component/digitransit-component-icon": "^2.0.1",
     "@hsl-fi/sass": "1.0.0",
     "classnames": "2.5.1",