andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #639 from proddy/dev

Browse Source 
fix missing NL translations
This commit is contained in:
Proddy
2022-09-24 16:09:05 +02:00
committed by GitHub
parent 12638275fa e85ca7dcd3
commit 30109a54ce
8 changed files with 70 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
interface/package-lock.json generated
View File

@@ -15,8 +15,8 @@
"@mui/material": "^5.10.6", "@mui/material": "^5.10.6",
"@table-library/react-table-library": "4.0.18", "@table-library/react-table-library": "4.0.18",
"@types/lodash": "^4.14.185", "@types/lodash": "^4.14.185",
"@types/node": "^18.7.18", "@types/node": "^18.7.19",
"@types/react": "^18.0.20", "@types/react": "^18.0.21",
"@types/react-dom": "^18.0.6", "@types/react-dom": "^18.0.6",
"@types/react-router-dom": "^5.3.3", "@types/react-router-dom": "^5.3.3",
"async-validator": "^4.2.5", "async-validator": "^4.2.5",
@@ -31,7 +31,7 @@
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-dropzone": "^14.2.2", "react-dropzone": "^14.2.2",
"react-icons": "^4.4.0", "react-icons": "^4.4.0",
"react-router-dom": "^6.4.0", "react-router-dom": "^6.4.1",
"react-scripts": "5.0.1", "react-scripts": "5.0.1",
"sockette": "^2.0.6", "sockette": "^2.0.6",
"typesafe-i18n": "^5.13.0", "typesafe-i18n": "^5.13.0",
@@ -3231,8 +3231,9 @@
} }
}, },
"node_modules/@remix-run/router": { "node_modules/@remix-run/router": {
"version": "1.0.0", "version": "1.0.1",
"license": "MIT", "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.0.1.tgz",
"integrity": "sha512-eBV5rvW4dRFOU1eajN7FmYxjAIVz/mRHgUE9En9mBn6m3mulK3WTR5C3iQhL9MZ14rWAq+xOlEaCkDiW0/heOg==",
"engines": { "engines": {
"node": ">=14" "node": ">=14"
} }
@@ -3736,8 +3737,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "18.7.18", "version": "18.7.19",
"license": "MIT" "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.19.tgz",
"integrity": "sha512-Sq1itGUKUX1ap7GgZlrzdBydjbsJL/NSQt/4wkAxUJ7/OS5c2WkoN6WSpWc2Yc5wtKMZOUA0VCs/j2XJadN3HA=="
}, },
"node_modules/@types/parse-json": { "node_modules/@types/parse-json": {
"version": "4.0.0", "version": "4.0.0",
@@ -3764,8 +3766,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/@types/react": { "node_modules/@types/react": {
"version": "18.0.20", "version": "18.0.21",
"license": "MIT", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.21.tgz",
"integrity": "sha512-7QUCOxvFgnD5Jk8ZKlUAhVcRj7GuJRjnjjiY/IUBWKgOlnvDvTMLD4RTF7NPyVmbRhNrbomZiOepg7M/2Kj1mA==",
"dependencies": { "dependencies": {
"@types/prop-types": "*", "@types/prop-types": "*",
"@types/scheduler": "*", "@types/scheduler": "*",
@@ -13316,10 +13319,11 @@
} }
}, },
"node_modules/react-router": { "node_modules/react-router": {
"version": "6.4.0", "version": "6.4.1",
"license": "MIT", "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.4.1.tgz",
"integrity": "sha512-OJASKp5AykDWFewgWUim1vlLr7yfD4vO/h+bSgcP/ix8Md+LMHuAjovA74MQfsfhQJGGN1nHRhwS5qQQbbBt3A==",
"dependencies": { "dependencies": {
"@remix-run/router": "1.0.0" "@remix-run/router": "1.0.1"
}, },
"engines": { "engines": {
"node": ">=14" "node": ">=14"
@@ -13329,10 +13333,12 @@
} }
}, },
"node_modules/react-router-dom": { "node_modules/react-router-dom": {
"version": "6.4.0", "version": "6.4.1",
"license": "MIT", "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.4.1.tgz",
"integrity": "sha512-MY7NJCrGNVJtGp8ODMOBHu20UaIkmwD2V3YsAOUQoCXFk7Ppdwf55RdcGyrSj+ycSL9Uiwrb3gTLYSnzcRoXww==",
"dependencies": { "dependencies": {
"react-router": "6.4.0" "@remix-run/router": "1.0.1",
"react-router": "6.4.1"
}, },
"engines": { "engines": {
"node": ">=14" "node": ">=14"
@@ -17826,7 +17832,9 @@
"integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==" "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="
}, },
"@remix-run/router": { "@remix-run/router": {
"version": "1.0.0" "version": "1.0.1",
"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.0.1.tgz",
"integrity": "sha512-eBV5rvW4dRFOU1eajN7FmYxjAIVz/mRHgUE9En9mBn6m3mulK3WTR5C3iQhL9MZ14rWAq+xOlEaCkDiW0/heOg=="
}, },
"@rollup/plugin-babel": { "@rollup/plugin-babel": {
"version": "5.3.1", "version": "5.3.1",
@@ -18132,7 +18140,9 @@
"version": "3.0.1" "version": "3.0.1"
}, },
"@types/node": { "@types/node": {
"version": "18.7.18" "version": "18.7.19",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.19.tgz",
"integrity": "sha512-Sq1itGUKUX1ap7GgZlrzdBydjbsJL/NSQt/4wkAxUJ7/OS5c2WkoN6WSpWc2Yc5wtKMZOUA0VCs/j2XJadN3HA=="
}, },
"@types/parse-json": { "@types/parse-json": {
"version": "4.0.0" "version": "4.0.0"
@@ -18153,7 +18163,9 @@
"version": "1.2.4" "version": "1.2.4"
}, },
"@types/react": { "@types/react": {
"version": "18.0.20", "version": "18.0.21",
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.21.tgz",
"integrity": "sha512-7QUCOxvFgnD5Jk8ZKlUAhVcRj7GuJRjnjjiY/IUBWKgOlnvDvTMLD4RTF7NPyVmbRhNrbomZiOepg7M/2Kj1mA==",
"requires": { "requires": {
"@types/prop-types": "*", "@types/prop-types": "*",
"@types/scheduler": "*", "@types/scheduler": "*",
@@ -23733,15 +23745,20 @@
"version": "0.11.0" "version": "0.11.0"
}, },
"react-router": { "react-router": {
"version": "6.4.0", "version": "6.4.1",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.4.1.tgz",
"integrity": "sha512-OJASKp5AykDWFewgWUim1vlLr7yfD4vO/h+bSgcP/ix8Md+LMHuAjovA74MQfsfhQJGGN1nHRhwS5qQQbbBt3A==",
"requires": { "requires": {
"@remix-run/router": "1.0.0" "@remix-run/router": "1.0.1"
} }
}, },
"react-router-dom": { "react-router-dom": {
"version": "6.4.0", "version": "6.4.1",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.4.1.tgz",
"integrity": "sha512-MY7NJCrGNVJtGp8ODMOBHu20UaIkmwD2V3YsAOUQoCXFk7Ppdwf55RdcGyrSj+ycSL9Uiwrb3gTLYSnzcRoXww==",
"requires": { "requires": {
"react-router": "6.4.0" "@remix-run/router": "1.0.1",
"react-router": "6.4.1"
} }
}, },
"react-scripts": { "react-scripts": {

6
interface/package.json
View File

@@ -11,8 +11,8 @@
"@mui/material": "^5.10.6", "@mui/material": "^5.10.6",
"@table-library/react-table-library": "4.0.18", "@table-library/react-table-library": "4.0.18",
"@types/lodash": "^4.14.185", "@types/lodash": "^4.14.185",
"@types/node": "^18.7.18", "@types/node": "^18.7.19",
"@types/react": "^18.0.20", "@types/react": "^18.0.21",
"@types/react-dom": "^18.0.6", "@types/react-dom": "^18.0.6",
"@types/react-router-dom": "^5.3.3", "@types/react-router-dom": "^5.3.3",
"async-validator": "^4.2.5", "async-validator": "^4.2.5",
@@ -27,7 +27,7 @@
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-dropzone": "^14.2.2", "react-dropzone": "^14.2.2",
"react-icons": "^4.4.0", "react-icons": "^4.4.0",
"react-router-dom": "^6.4.0", "react-router-dom": "^6.4.1",
"react-scripts": "5.0.1", "react-scripts": "5.0.1",
"sockette": "^2.0.6", "sockette": "^2.0.6",
"typesafe-i18n": "^5.13.0", "typesafe-i18n": "^5.13.0",

2
interface/src/framework/system/SystemStatusForm.tsx
View File

@@ -95,7 +95,7 @@ const SystemStatusForm: FC = () => {
const renderRestartDialog = () => ( const renderRestartDialog = () => (
<Dialog open={confirmRestart} onClose={() => setConfirmRestart(false)}> <Dialog open={confirmRestart} onClose={() => setConfirmRestart(false)}>
<DialogTitle>Restart</DialogTitle> <DialogTitle>{LL.RESTART()}</DialogTitle>
<DialogContent dividers>{LL.RESTART_CONFIRM()}</DialogContent> <DialogContent dividers>{LL.RESTART_CONFIRM()}</DialogContent>
<DialogActions> <DialogActions>
<Button <Button

24
interface/src/i18n/nl/index.ts
View File

@@ -27,7 +27,7 @@ const nl: BaseTranslation = {
ENTITIES: 'Entiteiten', ENTITIES: 'Entiteiten',
REFRESH: 'Ververs', REFRESH: 'Ververs',
EXPORT: 'Export', EXPORT: 'Export',
DEVICE_DETAILS: 'Device Details', DEVICE_DETAILS: 'Device Gegevens',
BRAND: 'Merk', BRAND: 'Merk',
ENTITY_NAME: 'Entiteit', ENTITY_NAME: 'Entiteit',
VALUE: 'Waarde', VALUE: 'Waarde',
@@ -108,7 +108,7 @@ const nl: BaseTranslation = {
ENABLE_TELNET: 'Activeer Telnet console', ENABLE_TELNET: 'Activeer Telnet console',
ENABLE_ANALOG: 'Activeer analoge sensoren', ENABLE_ANALOG: 'Activeer analoge sensoren',
CONVERT_FAHRENHEIT: 'Converteer temperatuurwaarden naar Fahrenheit', CONVERT_FAHRENHEIT: 'Converteer temperatuurwaarden naar Fahrenheit',
BYPASS_TOKEN: 'Bypass Access Token authorization on API calls', BYPASS_TOKEN: 'API Access Token authenticatie uitschakelen',
READONLY: 'Activeer read-only modus (blokkeert alle outgaande EMS Tx schrijf commandos)', READONLY: 'Activeer read-only modus (blokkeert alle outgaande EMS Tx schrijf commandos)',
UNDERCLOCK_CPU: 'Underclock CPU snelheid', UNDERCLOCK_CPU: 'Underclock CPU snelheid',
ENABLE_SHOWER_TIMER: 'Activeer Douche Timer (tijdmeting)', ENABLE_SHOWER_TIMER: 'Activeer Douche Timer (tijdmeting)',
@@ -130,7 +130,7 @@ const nl: BaseTranslation = {
RESTART: 'Herstarten', RESTART: 'Herstarten',
HOURS: 'uren', HOURS: 'uren',
RESTART_TEXT: 'EMS-ESP dient opnieuw gestart te worden om de wijzingen toe te passen', RESTART_TEXT: 'EMS-ESP dient opnieuw gestart te worden om de wijzingen toe te passen',
RESTART_CONFIRM: 'Are you sure you want to restart EMS-ESP?', RESTART_CONFIRM: 'Weet je zeker dat je EMS-ESP wilt herstarten?',
COMMAND: 'Commando', COMMAND: 'Commando',
CUSTOMIZATIONS_RESTART: 'Alle custom profielen worden verwijderd. Herstarten...', CUSTOMIZATIONS_RESTART: 'Alle custom profielen worden verwijderd. Herstarten...',
CUSTOMIZATIONS_FULL: 'Te veel entiteiten geselecteerd. Sla op in delen aub', CUSTOMIZATIONS_FULL: 'Te veel entiteiten geselecteerd. Sla op in delen aub',
@@ -150,13 +150,11 @@ const nl: BaseTranslation = {
USER_CUSTOMIZATION: 'Custom Instellingen', USER_CUSTOMIZATION: 'Custom Instellingen',
SUPPORT_INFORMATION: 'Support Informatie', SUPPORT_INFORMATION: 'Support Informatie',
CLICK_HERE: 'Klik Hier', CLICK_HERE: 'Klik Hier',
HELP_INFORMATION_1: 'Visit the online wiki to get instructions on how to configure EMS-ESP', HELP_INFORMATION_1: 'Bezoek de online wiki om instructies te vinden om EMS-ESP te configureren',
HELP_INFORMATION_2: 'For live community chat join our Discord server', HELP_INFORMATION_2: 'Voor de live community ga naar de Discord server',
HELP_INFORMATION_3: 'To request a feature or report a bug', HELP_INFORMATION_3: 'Om een nieuwe feature te vragen of een bug te rapporteren',
HELP_INFORMATION_4: HELP_INFORMATION_4: 'zorg dat je ook je systeem details zijn toevoeged voor een sneller antwoord',
'remember to download and attach your system information for a faster response when reporting an issue', HELP_INFORMATION_5: 'EMS-ESP is een gratis en open source project. Steun ons met een Star op Github!',
HELP_INFORMATION_5:
"EMS-ESP is a free and open-source project. Please support its future development by giving it a star on Github!",
SUPPORT_INFO: 'Support Info', SUPPORT_INFO: 'Support Info',
UPLOAD: 'Upload', UPLOAD: 'Upload',
DOWNLOAD: 'Download', DOWNLOAD: 'Download',
@@ -176,7 +174,7 @@ const nl: BaseTranslation = {
SYSTEM_FACTORY_TEXT_DIALOG: 'Weet je zeker dat je een reset naar fabrieksinstellingen uit wilt voeren?', SYSTEM_FACTORY_TEXT_DIALOG: 'Weet je zeker dat je een reset naar fabrieksinstellingen uit wilt voeren?',
VERSION_CHECK: 'Versie Check', VERSION_CHECK: 'Versie Check',
THE_LATEST: 'De laatste', THE_LATEST: 'De laatste',
VERSION_IS: 'version is', VERSION_IS: 'versie is',
PLATFORM: 'Apparaat (Platform / SDK)', PLATFORM: 'Apparaat (Platform / SDK)',
UPTIME: 'Systeem Uptime', UPTIME: 'Systeem Uptime',
CPU_FREQ: 'CPU Frequency', CPU_FREQ: 'CPU Frequency',
@@ -227,8 +225,8 @@ const nl: BaseTranslation = {
MQTT_INT_SOLAR: 'Solar Modules', MQTT_INT_SOLAR: 'Solar Modules',
MQTT_INT_MIXER: 'Mixer Modules', MQTT_INT_MIXER: 'Mixer Modules',
DEFAULT: 'Default', DEFAULT: 'Default',
MQTT_CLEAN_SESSION: 'Set Clean Session', MQTT_CLEAN_SESSION: 'Clean Session aan',
MQTT_RETAIN_FLAG: 'Always set Retain flag', MQTT_RETAIN_FLAG: 'Retain flag aan',
INACTIVE: 'Inactief', INACTIVE: 'Inactief',
ACTIVE: 'Actief', ACTIVE: 'Actief',
UNKNOWN: 'Onbekend', UNKNOWN: 'Onbekend',

10
interface/src/project/HelpInformation.tsx
View File

@@ -9,7 +9,6 @@ import { useSnackbar } from 'notistack';
import CommentIcon from '@mui/icons-material/CommentTwoTone'; import CommentIcon from '@mui/icons-material/CommentTwoTone';
import MenuBookIcon from '@mui/icons-material/MenuBookTwoTone'; import MenuBookIcon from '@mui/icons-material/MenuBookTwoTone';
import GitHubIcon from '@mui/icons-material/GitHub'; import GitHubIcon from '@mui/icons-material/GitHub';
import StarIcon from '@mui/icons-material/Star';
import DownloadIcon from '@mui/icons-material/GetApp'; import DownloadIcon from '@mui/icons-material/GetApp';
import EastIcon from '@mui/icons-material/East'; import EastIcon from '@mui/icons-material/East';
@@ -98,7 +97,7 @@ const HelpInformation: FC = () => {
{LL.CLICK_HERE()} {LL.CLICK_HERE()}
</Link> </Link>
<br /> <br />
<i>({LL.HELP_INFORMATION_4()}</i>&nbsp; <i>({LL.HELP_INFORMATION_4()}</i>&nbsp;&nbsp;
<Button <Button
startIcon={<DownloadIcon />} startIcon={<DownloadIcon />}
size="small" size="small"
@@ -114,14 +113,13 @@ const HelpInformation: FC = () => {
</List> </List>
<Box border={1} p={1} mt={4} color="orange"> <Box border={1} p={1} mt={4} color="orange">
<Typography align="center" variant="h6" color="orange"> <Typography align="center" variant="subtitle1" color="orange">
{LL.HELP_INFORMATION_5()} <b>{LL.HELP_INFORMATION_5()}</b>
</Typography> </Typography>
<Typography align="center"> <Typography align="center">
<Link target="_blank" href="https://github.com/emsesp/EMS-ESP32" color="primary"> <Link target="_blank" href="https://github.com/emsesp/EMS-ESP32" color="primary">
{'Github'} {'github.com/emsesp/EMS-ESP32'}
</Link> </Link>
<StarIcon style={{ fontSize: 20, color: 'yellow', verticalAlign: 'middle' }} />
</Typography> </Typography>
<Typography color="white" align="center"> <Typography color="white" align="center">
@proddy @MichaelDvP @proddy @MichaelDvP

14
mock-api/package-lock.json generated
View File

@@ -14,7 +14,7 @@
"express": "^4.18.1", "express": "^4.18.1",
"express-sse": "^0.5.3", "express-sse": "^0.5.3",
"nodemon": "^2.0.20", "nodemon": "^2.0.20",
"ws": "^8.8.1" "ws": "^8.9.0"
} }
}, },
"node_modules/@msgpack/msgpack": { "node_modules/@msgpack/msgpack": {
@@ -1015,9 +1015,9 @@
} }
}, },
"node_modules/ws": { "node_modules/ws": {
"version": "8.8.1", "version": "8.9.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-8.9.0.tgz",
"integrity": "sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==", "integrity": "sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==",
"engines": { "engines": {
"node": ">=10.0.0" "node": ">=10.0.0"
}, },
@@ -1765,9 +1765,9 @@
"integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==" "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
}, },
"ws": { "ws": {
"version": "8.8.1", "version": "8.9.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-8.9.0.tgz",
"integrity": "sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==", "integrity": "sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==",
"requires": {} "requires": {}
} }
} }

2
mock-api/package.json
View File

@@ -16,6 +16,6 @@
"express": "^4.18.1", "express": "^4.18.1",
"express-sse": "^0.5.3", "express-sse": "^0.5.3",
"nodemon": "^2.0.20", "nodemon": "^2.0.20",
"ws": "^8.8.1" "ws": "^8.9.0"
} }
} }

8
src/locale_translations.h
View File

@@ -30,10 +30,10 @@
// if there is no translation, it will default to en // if there is no translation, it will default to en
// General // General
MAKE_PSTR_LIST(on, F("on"), F("an"), F("naar"), F("på")) MAKE_PSTR_LIST(on, F("on"), F("an"), F("aan"), F("på"))
MAKE_PSTR_LIST(off, F("off"), F("aus"), F("van"), F("av")) MAKE_PSTR_LIST(off, F("off"), F("aus"), F("uit"), F("av"))
MAKE_PSTR_LIST(ON, F("ON"), F("AN"), F("NAAR"), F("PÅ")) MAKE_PSTR_LIST(ON, F("ON"), F("AN"), F("AAN"), F("PÅ"))
MAKE_PSTR_LIST(OFF, F("OFF"), F("AUS"), F("VAN"), F("AV")) MAKE_PSTR_LIST(OFF, F("OFF"), F("AUS"), F("UIT"), F("AV"))
// Unit Of Measurement mapping - maps to DeviceValueUOM_s in emsdevice.cpp // Unit Of Measurement mapping - maps to DeviceValueUOM_s in emsdevice.cpp
// uom - also used with HA see https://github.com/home-assistant/core/blob/d7ac4bd65379e11461c7ce0893d3533d8d8b8cbf/homeassistant/const.py#L384 // uom - also used with HA see https://github.com/home-assistant/core/blob/d7ac4bd65379e11461c7ce0893d3533d8d8b8cbf/homeassistant/const.py#L384