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 branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev

Browse Source
This commit is contained in:
MichaelDvP
2022-09-24 16:31:27 +02:00
parent b646331adc 30109a54ce
commit 0867d7fe0e
8 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
interface/package-lock.json generated
View File

@@ -15,8 +15,8 @@
"@mui/material": "^5.10.6",
"@table-library/react-table-library": "4.0.18",
"@types/lodash": "^4.14.185",
"@types/node": "^18.7.18",
"@types/react": "^18.0.20",
"@types/node": "^18.7.19",
"@types/react": "^18.0.21",
"@types/react-dom": "^18.0.6",
"@types/react-router-dom": "^5.3.3",
"async-validator": "^4.2.5",

4
interface/package.json
View File

@@ -11,8 +11,8 @@
"@mui/material": "^5.10.6",
"@table-library/react-table-library": "4.0.18",
"@types/lodash": "^4.14.185",
"@types/node": "^18.7.18",
"@types/react": "^18.0.20",
"@types/node": "^18.7.19",
"@types/react": "^18.0.21",
"@types/react-dom": "^18.0.6",
"@types/react-router-dom": "^5.3.3",
"async-validator": "^4.2.5",

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

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

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

@@ -27,7 +27,7 @@ const nl: BaseTranslation = {
ENTITIES: 'Entiteiten',
REFRESH: 'Ververs',
EXPORT: 'Export',
DEVICE_DETAILS: 'Device Details',
DEVICE_DETAILS: 'Device Gegevens',
BRAND: 'Merk',
ENTITY_NAME: 'Entiteit',
VALUE: 'Waarde',
@@ -108,7 +108,7 @@ const nl: BaseTranslation = {
ENABLE_TELNET: 'Activeer Telnet console',
ENABLE_ANALOG: 'Activeer analoge sensoren',
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)',
UNDERCLOCK_CPU: 'Underclock CPU snelheid',
ENABLE_SHOWER_TIMER: 'Activeer Douche Timer (tijdmeting)',
@@ -130,7 +130,7 @@ const nl: BaseTranslation = {
RESTART: 'Herstarten',
HOURS: 'uren',
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',
CUSTOMIZATIONS_RESTART: 'Alle custom profielen worden verwijderd. Herstarten...',
CUSTOMIZATIONS_FULL: 'Te veel entiteiten geselecteerd. Sla op in delen aub',
@@ -150,13 +150,11 @@ const nl: BaseTranslation = {
USER_CUSTOMIZATION: 'Custom Instellingen',
SUPPORT_INFORMATION: 'Support Informatie',
CLICK_HERE: 'Klik Hier',
HELP_INFORMATION_1: 'Visit the online wiki to get instructions on how to configure EMS-ESP',
HELP_INFORMATION_2: 'For live community chat join our Discord server',
HELP_INFORMATION_3: 'To request a feature or report a bug',
HELP_INFORMATION_4:
'remember to download and attach your system information for a faster response when reporting an issue',
HELP_INFORMATION_5:
"EMS-ESP is a free and open-source project. Please support its future development by giving it a star on Github!",
HELP_INFORMATION_1: 'Bezoek de online wiki om instructies te vinden om EMS-ESP te configureren',
HELP_INFORMATION_2: 'Voor de live community ga naar de Discord server',
HELP_INFORMATION_3: 'Om een nieuwe feature te vragen of een bug te rapporteren',
HELP_INFORMATION_4: 'zorg dat je ook je systeem details zijn toevoeged voor een sneller antwoord',
HELP_INFORMATION_5: 'EMS-ESP is een gratis en open source project. Steun ons met een Star op Github!',
SUPPORT_INFO: 'Support Info',
UPLOAD: 'Upload',
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?',
VERSION_CHECK: 'Versie Check',
THE_LATEST: 'De laatste',
VERSION_IS: 'version is',
VERSION_IS: 'versie is',
PLATFORM: 'Apparaat (Platform / SDK)',
UPTIME: 'Systeem Uptime',
CPU_FREQ: 'CPU Frequency',
@@ -228,8 +226,8 @@ const nl: BaseTranslation = {
MQTT_INT_SOLAR: 'Solar Modules',
MQTT_INT_MIXER: 'Mixer Modules',
DEFAULT: 'Default',
MQTT_CLEAN_SESSION: 'Set Clean Session',
MQTT_RETAIN_FLAG: 'Always set Retain flag',
MQTT_CLEAN_SESSION: 'Clean Session aan',
MQTT_RETAIN_FLAG: 'Retain flag aan',
INACTIVE: 'Inactief',
ACTIVE: 'Actief',
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 MenuBookIcon from '@mui/icons-material/MenuBookTwoTone';
import GitHubIcon from '@mui/icons-material/GitHub';
import StarIcon from '@mui/icons-material/Star';
import DownloadIcon from '@mui/icons-material/GetApp';
import EastIcon from '@mui/icons-material/East';
@@ -98,7 +97,7 @@ const HelpInformation: FC = () => {
{LL.CLICK_HERE()}
</Link>
<br />
<i>({LL.HELP_INFORMATION_4()}</i>&nbsp;
<i>({LL.HELP_INFORMATION_4()}</i>&nbsp;&nbsp;
<Button
startIcon={<DownloadIcon />}
size="small"
@@ -114,14 +113,13 @@ const HelpInformation: FC = () => {
</List>
<Box border={1} p={1} mt={4} color="orange">
<Typography align="center" variant="h6" color="orange">
{LL.HELP_INFORMATION_5()}
<Typography align="center" variant="subtitle1" color="orange">
<b>{LL.HELP_INFORMATION_5()}</b>
</Typography>
<Typography align="center">
<Link target="_blank" href="https://github.com/emsesp/EMS-ESP32" color="primary">
{'Github'}
{'github.com/emsesp/EMS-ESP32'}
</Link>
<StarIcon style={{ fontSize: 20, color: 'yellow', verticalAlign: 'middle' }} />
</Typography>
<Typography color="white" align="center">
@proddy @MichaelDvP

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

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

2
mock-api/package.json
View File

@@ -16,6 +16,6 @@
"express": "^4.18.1",
"express-sse": "^0.5.3",
"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
// General
MAKE_PSTR_LIST(on, F("on"), F("an"), F("naar"), F("på"))
MAKE_PSTR_LIST(off, F("off"), F("aus"), F("van"), F("av"))
MAKE_PSTR_LIST(ON, F("ON"), F("AN"), F("NAAR"), F("PÅ"))
MAKE_PSTR_LIST(OFF, F("OFF"), F("AUS"), F("VAN"), F("AV"))
MAKE_PSTR_LIST(on, F("on"), F("an"), F("aan"), F("på"))
MAKE_PSTR_LIST(off, F("off"), F("aus"), F("uit"), F("av"))
MAKE_PSTR_LIST(ON, F("ON"), F("AN"), F("AAN"), F("PÅ"))
MAKE_PSTR_LIST(OFF, F("OFF"), F("AUS"), F("UIT"), F("AV"))
// 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