Skip to content
This repository has been archived by the owner on Dec 8, 2022. It is now read-only.

Commit

Permalink
Merge pull request #172 from MonsantoCo/HOTFIX-translations
Browse files Browse the repository at this point in the history
Hotfix translations defaultProps
  • Loading branch information
stazrad authored Sep 16, 2020
2 parents b31a4bd + fb9a0d5 commit 6ce02a1
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ module.exports = {
],

devServer: {
port: 3000,
port: 2020,
clientLogLevel: 'none',
publicPath: path.resolve('/'),
contentBase: path.resolve(__dirname, '../', 'build')
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bayer/ol-kit",
"version": "0.18.0",
"version": "0.17.4",
"license": "BSD",
"description": "Mapping components & utils built with openlayers + react",
"keywords": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'

import { connectToMap } from 'Map'
import { PopupActionItem } from 'Popup'

import en from 'locales/en'
import { copyWktToClipbard } from './utils'

/**
Expand All @@ -30,4 +30,8 @@ PopupActionCopyWkt.propTypes = {
}).isRequired
}

PopupActionCopyWkt.defaultProps = {
translations: en
}

export default connectToMap(PopupActionCopyWkt)
4 changes: 3 additions & 1 deletion src/Popup/PopupInsert/PopupDefaultInsert.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import olSelect from 'ol/interaction/select'
import { PopupActionCopyWkt } from 'Popup/PopupActions/PopupActionCopyWkt'

import { connectToMap } from 'Map'
import en from 'locales/en'
import { sanitizeProperties } from '../utils'
import PopupDefaultPage from './PopupDefaultPage'
import PopupPageLayout from './PopupPageLayout'
Expand Down Expand Up @@ -111,7 +112,8 @@ PopupDefaultInsert.defaultProps = {
features: [],
onClose: () => {},
onSelectFeature: () => {},
propertiesFilter: sanitizeProperties
propertiesFilter: sanitizeProperties,
translations: en
}

PopupDefaultInsert.propTypes = {
Expand Down
4 changes: 3 additions & 1 deletion src/Popup/PopupInsert/PopupDefaultPage/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { Component } from 'react'
import PropTypes from 'prop-types'

import { connectToMap } from 'Map'
import en from 'locales/en'
import CLOSE from 'images/close_icon.svg'
import LEFT_ARROW from 'images/left_arrow.svg'
import RIGHT_ARROW from 'images/right_arrow.svg'
Expand Down Expand Up @@ -135,7 +136,8 @@ PopupDefaultPage.defaultProps = {
children: [],
loading: false,
currentTab: 0,
attributes: {}
attributes: {},
translations: en
}

export default connectToMap(PopupDefaultPage)

0 comments on commit 6ce02a1

Please sign in to comment.