- {deviceOptions && (
-
{deviceOptions && (
-
-
- )}
+
+
-
- }
- value={props.box.title}
- onChange={this.updateBoxTitle}
- />
-
+
)}
+
+
+ {selectedDeviceFeaturesOptions && (
+
+
+
+
+
+
+
+ )}
-
-
-
+ {props.box.chart_type !== 'timeline' && (
+
+
+
+
+ )}
diff --git a/front/src/components/boxs/chart/style.css b/front/src/components/boxs/chart/style.css
index 7070bacbf7..5a161f0ffb 100644
--- a/front/src/components/boxs/chart/style.css
+++ b/front/src/components/boxs/chart/style.css
@@ -133,4 +133,4 @@
padding-left: 1.5rem;
padding-right: 1.5rem;
text-align: justify;
-}
+}
\ No newline at end of file
diff --git a/front/src/components/boxs/chart/yAxisFormatter.js b/front/src/components/boxs/chart/yAxisFormatter.js
new file mode 100644
index 0000000000..3787d65614
--- /dev/null
+++ b/front/src/components/boxs/chart/yAxisFormatter.js
@@ -0,0 +1,23 @@
+const yAxisFormatter = value => {
+ if (Number.isNaN(value)) {
+ return value;
+ }
+ // Handle zero as a special case
+ if (value === 0) {
+ return '0';
+ }
+
+ // Round to 4 significant digits
+ const significantDigits = 4;
+ const roundedValue = parseFloat(value.toPrecision(significantDigits));
+
+ // For very small or very large numbers, use scientific notation
+ if (Math.abs(roundedValue) < 0.001 || Math.abs(roundedValue) >= 1e9) {
+ return roundedValue.toExponential(2); // Scientific notation with 2 decimals
+ }
+
+ // For normal values, format with up to 2 decimal places
+ return value.toFixed(2);
+};
+
+export { yAxisFormatter };
diff --git a/front/src/components/boxs/device-in-room/DeviceCard.jsx b/front/src/components/boxs/device-in-room/DeviceCard.jsx
index cec313b3c8..4c3a4d5de4 100644
--- a/front/src/components/boxs/device-in-room/DeviceCard.jsx
+++ b/front/src/components/boxs/device-in-room/DeviceCard.jsx
@@ -1,5 +1,5 @@
-import cx from 'classnames';
import DeviceRow from './DeviceRow';
+import style from './style.css';
import { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } from '../../../../../server/utils/constants';
const hasSwitchFeature = (features, featureSelectors) => {
@@ -21,52 +21,63 @@ const DeviceCard = ({ children, ...props }) => {
const hasBinaryLightDeviceFeature = hasSwitchFeature(deviceFeatures, featureSelectors) !== undefined;
+ // Create placeholder rows based on the number of expected features
+ const placeholderRows = Array(featureSelectors.length).fill(0);
+
return (
-
-
- {boxTitle}
- {hasBinaryLightDeviceFeature && ( - - )} -
+ {boxTitle && (
+
+
+
+
+ {props.rowName}
+
+
+
+
+ );
+};
+
+export default PilotWireModeDeviceFeature;
diff --git a/front/src/components/boxs/device-in-room/device-features/PushDeviceFeature.jsx b/front/src/components/boxs/device-in-room/device-features/PushDeviceFeature.jsx
new file mode 100644
index 0000000000..30791fba6d
--- /dev/null
+++ b/front/src/components/boxs/device-in-room/device-features/PushDeviceFeature.jsx
@@ -0,0 +1,44 @@
+import { Component } from 'preact';
+import cx from 'classnames';
+import { Text } from 'preact-i18n';
+import style from './style.css';
+
+class PushDeviceComponent extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ loading: false
+ };
+ }
+ push = async () => {
+ await this.setState({ loading: true });
+ this.props.updateValue(this.props.deviceFeature, 1);
+ setTimeout(() => {
+ this.setState({ loading: false });
+ }, 350);
+ };
+
+ render(props, { loading }) {
+ return (
+
+
+
+
+ {props.rowName}
+
+
+
+
+ );
+ }
+}
+
+export default PushDeviceComponent;
diff --git a/front/src/components/boxs/device-in-room/device-features/style.css b/front/src/components/boxs/device-in-room/device-features/style.css
index b71eaf53e1..e2135f162e 100644
--- a/front/src/components/boxs/device-in-room/device-features/style.css
+++ b/front/src/components/boxs/device-in-room/device-features/style.css
@@ -47,3 +47,9 @@ input[type='range'][class~='light-temperature']::-ms-fill-lower {
display: none;
}
}
+
+.btnLoading {
+ &::after {
+ border: 2px solid #5eba00;
+ }
+}
diff --git a/front/src/components/boxs/device-in-room/style.css b/front/src/components/boxs/device-in-room/style.css
index d9711f3251..773769b2d5 100644
--- a/front/src/components/boxs/device-in-room/style.css
+++ b/front/src/components/boxs/device-in-room/style.css
@@ -1,12 +1,14 @@
-.deviceListDragAndDrop {
- cursor: 'pointer';
- userselect: 'none';
+.loadingSkeleton {
+ height: 1.2em;
+ background: #eee;
+ background: linear-gradient(110deg, #ececec 8%, #f5f5f5 18%, #ececec 33%);
+ border-radius: 5px;
+ background-size: 200% 100%;
+ animation: 1.5s shine linear infinite;
}
-.deviceListDragAndDropDragging {
- opacity: 0.5;
-}
-
-.deviceListDragAndDropActive {
- background-color: #ecf0f1;
+@keyframes shine {
+ to {
+ background-position-x: -200%;
+ }
}
diff --git a/front/src/components/boxs/music/MusicBox.jsx b/front/src/components/boxs/music/MusicBox.jsx
index 94173e67fa..035026682c 100644
--- a/front/src/components/boxs/music/MusicBox.jsx
+++ b/front/src/components/boxs/music/MusicBox.jsx
@@ -86,12 +86,23 @@ class MusicComponent extends Component {
}
};
+ handleWebsocketConnected = ({ connected }) => {
+ // When the websocket is disconnected, we refresh the data when the websocket is reconnected
+ if (!connected) {
+ this.wasDisconnected = true;
+ } else if (this.wasDisconnected) {
+ this.getDevice();
+ this.wasDisconnected = false;
+ }
+ };
+
componentDidMount() {
this.getDevice();
this.props.session.dispatcher.addListener(
WEBSOCKET_MESSAGE_TYPES.DEVICE.NEW_STATE,
this.updateDeviceStateWebsocket
);
+ this.props.session.dispatcher.addListener('websocket.connected', this.handleWebsocketConnected);
}
componentWillUnmount() {
@@ -99,6 +110,7 @@ class MusicComponent extends Component {
WEBSOCKET_MESSAGE_TYPES.DEVICE.NEW_STATE,
this.updateDeviceStateWebsocket
);
+ this.props.session.dispatcher.removeListener('websocket.connected', this.handleWebsocketConnected);
}
render(props, { isPlaying, musicDevice, previousFeature, nextFeature, volumeFeature }) {
diff --git a/front/src/components/boxs/room-humidity/EditRoomHumidityBox.jsx b/front/src/components/boxs/room-humidity/EditRoomHumidityBox.jsx
index b22fdf1203..a133d7aa1e 100644
--- a/front/src/components/boxs/room-humidity/EditRoomHumidityBox.jsx
+++ b/front/src/components/boxs/room-humidity/EditRoomHumidityBox.jsx
@@ -11,7 +11,7 @@ const updateBoxRoom = (updateBoxRoomFunc, x, y) => room => {
updateBoxRoomFunc(x, y, room.selector);
};
-const EditRoomHumidityBox = ({ children, ...props }) => (
+const EditRoomHumidityBox = ({ children, unit, ...props }) => (
-
+
+ )}
+ {boxTitle}
+ {hasBinaryLightDeviceFeature && ( + + )} +
-
diff --git a/front/src/components/boxs/device-in-room/DeviceRow.jsx b/front/src/components/boxs/device-in-room/DeviceRow.jsx
index d4e3f32b1c..5f3f0dd3f6 100644
--- a/front/src/components/boxs/device-in-room/DeviceRow.jsx
+++ b/front/src/components/boxs/device-in-room/DeviceRow.jsx
@@ -12,7 +12,9 @@ import NumberDeviceFeature from './device-features/NumberDeviceFeature';
import CoverDeviceFeature from './device-features/CoverDeviceFeature';
import ThermostatDeviceFeature from './device-features/ThermostatDeviceFeature';
import AirConditioningModeDeviceFeature from './device-features/AirConditioningModeDeviceFeature';
+import PilotWireModeDeviceFeature from './device-features/PilotWireModeDeviceFeature';
import LMHVolumeDeviceFeature from './device-features/LMHVolumeDeviceFeature';
+import PushDeviceFeature from './device-features/PushDeviceFeature';
const ROW_TYPE_BY_FEATURE_TYPE = {
[DEVICE_FEATURE_TYPES.LIGHT.BINARY]: BinaryDeviceFeature,
@@ -29,9 +31,11 @@ const ROW_TYPE_BY_FEATURE_TYPE = {
[DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE]: ThermostatDeviceFeature,
[DEVICE_FEATURE_TYPES.AIR_CONDITIONING.MODE]: AirConditioningModeDeviceFeature,
[DEVICE_FEATURE_TYPES.AIR_CONDITIONING.TARGET_TEMPERATURE]: ThermostatDeviceFeature,
+ [DEVICE_FEATURE_TYPES.HEATER.PILOT_WIRE_MODE]: PilotWireModeDeviceFeature,
[DEVICE_FEATURE_TYPES.SIREN.LMH_VOLUME]: LMHVolumeDeviceFeature,
[DEVICE_FEATURE_TYPES.SIREN.MELODY]: NumberDeviceFeature,
- [DEVICE_FEATURE_TYPES.DURATION.DECIMAL]: MultiLevelDeviceFeature
+ [DEVICE_FEATURE_TYPES.DURATION.DECIMAL]: MultiLevelDeviceFeature,
+ [DEVICE_FEATURE_TYPES.BUTTON.PUSH]: PushDeviceFeature
};
const DeviceRow = ({ children, ...props }) => {
diff --git a/front/src/components/boxs/device-in-room/DevicesBox.jsx b/front/src/components/boxs/device-in-room/DevicesBox.jsx
index 28bcd56a5a..c86b05c7f2 100644
--- a/front/src/components/boxs/device-in-room/DevicesBox.jsx
+++ b/front/src/components/boxs/device-in-room/DevicesBox.jsx
@@ -44,8 +44,19 @@ class DevicesComponent extends Component {
deviceFeatures: [],
status: RequestStatus.Getting
};
+ this.wasDisconnected = false;
}
+ handleWebsocketConnected = ({ connected }) => {
+ // When the websocket is disconnected, we refresh the data when the websocket is reconnected
+ if (!connected) {
+ this.wasDisconnected = true;
+ } else if (this.wasDisconnected) {
+ this.refreshData();
+ this.wasDisconnected = false;
+ }
+ };
+
refreshData = () => {
this.getDeviceFeatures();
};
@@ -180,6 +191,7 @@ class DevicesComponent extends Component {
WEBSOCKET_MESSAGE_TYPES.DEVICE.NEW_STRING_STATE,
this.updateDeviceTextWebsocket
);
+ this.props.session.dispatcher.addListener('websocket.connected', this.handleWebsocketConnected);
}
componentDidUpdate(previousProps) {
@@ -198,11 +210,12 @@ class DevicesComponent extends Component {
WEBSOCKET_MESSAGE_TYPES.DEVICE.NEW_STRING_STATE,
this.updateDeviceTextWebsocket
);
+ this.props.session.dispatcher.removeListener('websocket.connected', this.handleWebsocketConnected);
}
render(props, { deviceFeatures, status }) {
const boxTitle = props.box.name;
- const loading = status === RequestStatus.Getting && !status;
+ const loading = status === RequestStatus.Getting;
const roomLightStatus = this.getLightStatus();
return (
diff --git a/front/src/components/boxs/device-in-room/EditDevices.jsx b/front/src/components/boxs/device-in-room/EditDevices.jsx
index 76784fcbb2..57e0a17da2 100644
--- a/front/src/components/boxs/device-in-room/EditDevices.jsx
+++ b/front/src/components/boxs/device-in-room/EditDevices.jsx
@@ -5,7 +5,7 @@ import Select from 'react-select';
import update from 'immutability-helper';
import BaseEditBox from '../baseEditBox';
import { getDeviceFeatureName } from '../../../utils/device';
-import { DeviceListWithDragAndDrop } from './DeviceListWithDragAndDrop';
+import { DeviceListWithDragAndDrop } from '../../drag-and-drop/DeviceListWithDragAndDrop';
import withIntlAsProp from '../../../utils/withIntlAsProp';
import SUPPORTED_FEATURE_TYPES from './SupportedFeatureTypes';
@@ -24,7 +24,7 @@ class EditDevices extends Component {
refreshDeviceFeaturesNames = () => {
const newDeviceFeatureNames = this.state.selectedDeviceFeaturesOptions.map(o => {
- return o.new_label !== undefined ? o.new_label : o.label;
+ return o.new_label !== undefined && o.new_label !== '' ? o.new_label : o.label;
});
const newDeviceFeature = this.state.selectedDeviceFeaturesOptions.map(o => {
return o.value;
@@ -62,7 +62,10 @@ class EditDevices extends Component {
}
});
await this.setState(newState);
- this.refreshDeviceFeaturesNames();
+
+ if (name !== '') {
+ this.refreshDeviceFeaturesNames();
+ }
};
getSelectedDeviceFeaturesAndOptions = devices => {
diff --git a/front/src/components/boxs/device-in-room/SupportedFeatureTypes.jsx b/front/src/components/boxs/device-in-room/SupportedFeatureTypes.jsx
index a4e8516a8b..5cb8f82ba4 100644
--- a/front/src/components/boxs/device-in-room/SupportedFeatureTypes.jsx
+++ b/front/src/components/boxs/device-in-room/SupportedFeatureTypes.jsx
@@ -13,9 +13,11 @@ const SUPPORTED_FEATURE_TYPES = [
DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE,
DEVICE_FEATURE_TYPES.AIR_CONDITIONING.MODE,
DEVICE_FEATURE_TYPES.AIR_CONDITIONING.TARGET_TEMPERATURE,
+ DEVICE_FEATURE_TYPES.HEATER.PILOT_WIRE_MODE,
DEVICE_FEATURE_TYPES.SIREN.LMH_VOLUME,
DEVICE_FEATURE_TYPES.SIREN.MELODY,
- DEVICE_FEATURE_TYPES.DURATION.DECIMAL
+ DEVICE_FEATURE_TYPES.DURATION.DECIMAL,
+ DEVICE_FEATURE_TYPES.BUTTON.PUSH
];
export default SUPPORTED_FEATURE_TYPES;
diff --git a/front/src/components/boxs/device-in-room/device-features/PilotWireModeDeviceFeature.jsx b/front/src/components/boxs/device-in-room/device-features/PilotWireModeDeviceFeature.jsx
new file mode 100644
index 0000000000..71bdb51f71
--- /dev/null
+++ b/front/src/components/boxs/device-in-room/device-features/PilotWireModeDeviceFeature.jsx
@@ -0,0 +1,52 @@
+import get from 'get-value';
+import { Text } from 'preact-i18n';
+
+import { DeviceFeatureCategoriesIcon } from '../../../../utils/consts';
+import { PILOT_WIRE_MODE } from '../../../../../../server/utils/constants';
+
+const PilotWireModeDeviceFeature = ({ children, ...props }) => {
+ const { deviceFeature } = props;
+ const { category, type } = deviceFeature;
+
+ function updateValue(e) {
+ props.updateValueWithDebounce(deviceFeature, e.currentTarget.value);
+ }
+
+ return (
+
-
-
-
- {deviceFeatures.map((deviceFeature, deviceFeatureIndex) => (
-
-
+
+
+
+ {loading
+ ? placeholderRows.map((_, index) => (
+
| + + | ++ + | +
+
+
+
+
+
+
-
+
(
thumbClassName="humidity-slider-thumb"
trackClassName="humidity-slider-track"
defaultValue={[props.humidityMin, props.humidityMax]}
- renderThumb={(props, state) =>
-
{state.valueNow}%
}
+ renderThumb={(props, state) => (
+
+
+ )}
+ // renderThumb={(props, state) =>
+
+ {state.valueNow}%
}
pearling
- minDistance={10}
+ minDistance={1}
+ max={100}
+ min={0}
onAfterChange={props.updateBoxValue}
value={[props.humidityMin, props.humidityMax]}
disabled={!(props.box.humidity_use_custom_value || false)}
diff --git a/front/src/components/boxs/room-humidity/RoomHumidity.jsx b/front/src/components/boxs/room-humidity/RoomHumidity.jsx
index 1acdab102a..43d8e0f243 100644
--- a/front/src/components/boxs/room-humidity/RoomHumidity.jsx
+++ b/front/src/components/boxs/room-humidity/RoomHumidity.jsx
@@ -56,6 +56,16 @@ class RoomHumidityBoxComponent extends Component {
this.props.getHumidityInRoom(this.props.box, this.props.x, this.props.y);
};
+ handleWebsocketConnected = ({ connected }) => {
+ // When the websocket is disconnected, we refresh the data when the websocket is reconnected
+ if (!connected) {
+ this.wasDisconnected = true;
+ } else if (this.wasDisconnected) {
+ this.refreshData();
+ this.wasDisconnected = false;
+ }
+ };
+
updateRoomHumidity = payload => {
this.props.deviceFeatureWebsocketEvent(this.props.box, this.props.x, this.props.y, payload);
};
@@ -63,6 +73,7 @@ class RoomHumidityBoxComponent extends Component {
componentDidMount() {
this.refreshData();
this.props.session.dispatcher.addListener(WEBSOCKET_MESSAGE_TYPES.DEVICE.NEW_STATE, this.updateRoomHumidity);
+ this.props.session.dispatcher.addListener('websocket.connected', this.handleWebsocketConnected);
}
componentDidUpdate(previousProps) {
@@ -74,6 +85,7 @@ class RoomHumidityBoxComponent extends Component {
componentWillUnmount() {
this.props.session.dispatcher.removeListener(WEBSOCKET_MESSAGE_TYPES.DEVICE.NEW_STATE, this.updateRoomHumidity);
+ this.props.session.dispatcher.removeListener('websocket.connected', this.handleWebsocketConnected);
}
render(props, {}) {
diff --git a/front/src/components/boxs/room-temperature/EditRoomTemperatureBox.jsx b/front/src/components/boxs/room-temperature/EditRoomTemperatureBox.jsx
index d118121bf5..7de6a7ffb2 100644
--- a/front/src/components/boxs/room-temperature/EditRoomTemperatureBox.jsx
+++ b/front/src/components/boxs/room-temperature/EditRoomTemperatureBox.jsx
@@ -24,7 +24,7 @@ const EditRoomTemperatureBox = ({ children, unit, ...props }) => (
updateRoomSelection={updateBoxRoom(props.updateBoxRoom, props.x, props.y)}
/>
+
-
+
(
trackClassName="temperature-slider-track"
defaultValue={[props.temperatureMin, props.temperatureMax]}
renderThumb={(props, state) => (
-
-
+
)}
pearling
- minDistance={10}
+ minDistance={1}
max={unit === DEVICE_FEATURE_UNITS.CELSIUS ? 50 : 122}
min={unit === DEVICE_FEATURE_UNITS.CELSIUS ? -20 : -4}
onAfterChange={props.updateBoxValue}
diff --git a/front/src/components/boxs/room-temperature/RoomTemperature.jsx b/front/src/components/boxs/room-temperature/RoomTemperature.jsx
index 1f8ee1c82d..c380241d34 100644
--- a/front/src/components/boxs/room-temperature/RoomTemperature.jsx
+++ b/front/src/components/boxs/room-temperature/RoomTemperature.jsx
@@ -63,6 +63,16 @@ class RoomTemperatureBoxComponent extends Component {
this.props.getTemperatureInRoom(this.props.box, this.props.x, this.props.y);
};
+ handleWebsocketConnected = ({ connected }) => {
+ // When the websocket is disconnected, we refresh the data when the websocket is reconnected
+ if (!connected) {
+ this.wasDisconnected = true;
+ } else if (this.wasDisconnected) {
+ this.refreshData();
+ this.wasDisconnected = false;
+ }
+ };
+
updateRoomTemperature = payload => {
this.props.deviceFeatureWebsocketEvent(this.props.box, this.props.x, this.props.y, payload);
};
@@ -70,6 +80,7 @@ class RoomTemperatureBoxComponent extends Component {
componentDidMount() {
this.refreshData();
this.props.session.dispatcher.addListener(WEBSOCKET_MESSAGE_TYPES.DEVICE.NEW_STATE, this.updateRoomTemperature);
+ this.props.session.dispatcher.addListener('websocket.connected', this.handleWebsocketConnected);
}
componentDidUpdate(previousProps) {
@@ -81,6 +92,7 @@ class RoomTemperatureBoxComponent extends Component {
componentWillUnmount() {
this.props.session.dispatcher.removeListener(WEBSOCKET_MESSAGE_TYPES.DEVICE.NEW_STATE, this.updateRoomTemperature);
+ this.props.session.dispatcher.removeListener('websocket.connected', this.handleWebsocketConnected);
}
render(props, {}) {
diff --git a/front/src/components/boxs/scene/SceneBox.jsx b/front/src/components/boxs/scene/SceneBox.jsx
index b0956e78ff..f8e4c58e22 100644
--- a/front/src/components/boxs/scene/SceneBox.jsx
+++ b/front/src/components/boxs/scene/SceneBox.jsx
@@ -42,10 +42,11 @@ class SceneBoxComponent extends Component {
return (
+
-
-
-
+ {boxTitle && (
+ {boxTitle}
-
+
+ )}
{boxTitle}
+ {
+ // When the websocket is disconnected, we refresh the data when the websocket is reconnected
+ if (!connected) {
+ this.wasDisconnected = true;
+ } else if (this.wasDisconnected) {
+ this.getUsersWithPresence();
+ this.wasDisconnected = false;
+ }
+ };
refreshRelativeTime = () => {
if (this.state.usersWithPresence && this.state.usersWithPresence.length > 0) {
const usersWithPresence = this.state.usersWithPresence.map(user => {
@@ -159,6 +168,7 @@ class UserPresenceComponent extends Component {
}, 60 * 1000);
this.props.session.dispatcher.addListener(WEBSOCKET_MESSAGE_TYPES.USER_PRESENCE.BACK_HOME, this.userChanged);
this.props.session.dispatcher.addListener(WEBSOCKET_MESSAGE_TYPES.USER_PRESENCE.LEFT_HOME, this.userChanged);
+ this.props.session.dispatcher.addListener('websocket.connected', this.handleWebsocketConnected);
}
componentDidUpdate(previousProps) {
@@ -172,6 +182,7 @@ class UserPresenceComponent extends Component {
clearInterval(this.interval);
this.props.session.dispatcher.removeListener(WEBSOCKET_MESSAGE_TYPES.USER_PRESENCE.BACK_HOME, this.userChanged);
this.props.session.dispatcher.removeListener(WEBSOCKET_MESSAGE_TYPES.USER_PRESENCE.LEFT_HOME, this.userChanged);
+ this.props.session.dispatcher.removeListener('websocket.connected', this.handleWebsocketConnected);
}
render(props, { usersWithPresence, dashboardUserPresenceGetUsersStatus }) {
diff --git a/front/src/components/device/SelectPilotWireMode.jsx b/front/src/components/device/SelectPilotWireMode.jsx
new file mode 100644
index 0000000000..3a3d8ecf3a
--- /dev/null
+++ b/front/src/components/device/SelectPilotWireMode.jsx
@@ -0,0 +1,62 @@
+import { Component } from 'preact';
+import { Text } from 'preact-i18n';
+import Select from 'react-select';
+import get from 'get-value';
+
+import { PILOT_WIRE_MODE } from '../../../../server/utils/constants';
+import withIntlAsProp from '../../utils/withIntlAsProp';
+
+class SelectPilotWireMode extends Component {
+ handleValueChange = ({ value }) => {
+ this.props.updateValue(value);
+ };
+
+ getOptions = () => {
+ const deviceFeatureOptions = Object.keys(PILOT_WIRE_MODE).map(key => {
+ const value = PILOT_WIRE_MODE[key];
+ return {
+ label: get(this.props.intl.dictionary, `deviceFeatureValue.category.heater.pilot-wire-mode.${value}`, {
+ default: value
+ }),
+ value
+ };
+ });
+
+ this.setState({ deviceFeatureOptions });
+ };
+
+ getSelectedOption = () => {
+ const value = this.props.value;
+
+ if (value !== undefined) {
+ return {
+ label: get(this.props.intl.dictionary, `deviceFeatureValue.category.heater.pilot-wire-mode.${value}`, {
+ default: value
+ }),
+ value
+ };
+ } else {
+ return;
+ }
+ };
+
+ componentDidMount() {
+ this.getOptions();
+ }
+
+ render(props, { deviceFeatureOptions }) {
+ const selectedOption = this.getSelectedOption();
+ return (
+ }
+ />
+ );
+ }
+}
+
+export default withIntlAsProp(SelectPilotWireMode);
diff --git a/front/src/components/documentation/DeviceConfigurationLink.jsx b/front/src/components/documentation/DeviceConfigurationLink.jsx
index 3a2fa72331..1844891d56 100644
--- a/front/src/components/documentation/DeviceConfigurationLink.jsx
+++ b/front/src/components/documentation/DeviceConfigurationLink.jsx
@@ -2,11 +2,18 @@ import cx from 'classnames';
const documentationURL = 'https://gladysassistant.com';
+const LANGUAGES_IN_DOCUMENTATION = ['en', 'fr'];
+
+const DEFAULT_LANGUAGE = 'en';
+
+const getLanguage = userLanguage =>
+ LANGUAGES_IN_DOCUMENTATION.includes(userLanguage) ? userLanguage : DEFAULT_LANGUAGE;
+
const DeviceConfigurationLink = ({ children, configurationKey, documentKey, user, linkClass }) => (
{
updateDeviceFeatureName(index, e.target.value);
+ setIsEmpty(e.target.value === '');
};
+ const emptyFieldAutogenerated = isEmpty && selectedDeviceFeature.new_label !== '';
return (
@@ -55,16 +58,15 @@ const DeviceRow = ({ selectedDeviceFeature, moveDevice, index, removeDevice, upd
-
+
diff --git a/front/src/components/drag-and-drop/style.css b/front/src/components/drag-and-drop/style.css
index ef4c64bc2b..abcb9ce1a4 100644
--- a/front/src/components/drag-and-drop/style.css
+++ b/front/src/components/drag-and-drop/style.css
@@ -17,3 +17,33 @@
height: 20%;
width: 100%;
}
+
+.deviceListDragAndDrop {
+ cursor: 'pointer';
+ user-select: 'none';
+}
+
+.deviceListDragAndDropDragging {
+ opacity: 0.5;
+}
+
+.deviceListDragAndDropActive {
+ background-color: #ecf0f1;
+}
+
+.deviceListDragAndDropEmpty {
+ border: 1px solid #e90a0a;
+}
+
+.deviceListDragAndDropEmptyAutoGenerated {
+ border: 1px dashed #e90a0a;
+}
+
+.deviceListDragAndDropEmpty:focus {
+ border: 1px solid #e90a0a;
+ box-shadow: 0 0 5px #e90a0a;
+}
+
+.deviceListRemoveButton {
+ z-index: 0;
+}
\ No newline at end of file
diff --git a/front/src/components/gateway/GatewayLoginForm.jsx b/front/src/components/gateway/GatewayLoginForm.jsx
index 35cd03ad63..c0d853113e 100644
--- a/front/src/components/gateway/GatewayLoginForm.jsx
+++ b/front/src/components/gateway/GatewayLoginForm.jsx
@@ -22,6 +22,16 @@ const GatewayLoginForm = ({ children, ...props }) => (
)}
+ {props.gatewayLoginStatus === LoginStatus.UnknownError && (
+ <>
+
+
+
+ {props.gatewayLoginError}
+
+
+ )}
{props.gatewayLoginStatus === RequestStatus.UserNotAcceptedLocally && (
-
-
-
-
-
- 
}
- />
-
-
-
}
- />
-
-
-
-
-
- {props.user.firstname}
-
- {props.user.role === USER_ROLE.ADMIN &&
-
-
+
-
+
-
+
+
+
+ }
+ />
+
+
+
-
-
-
}
+ />
+
+
+
+
+
+
+
+
+ {props.user.firstname}
+
+ {props.user.role === USER_ROLE.ADMIN &&
-
-
Wenn du uns bei der Entwicklung dieser Integration helfen möchtest, schließe dich unserer Community an!", - "noDevices": "Noch keine Z-Wave-Geräte hinzugefügt.", - "scanButton": "Scannen", - "nameLabel": "Name", - "roomLabel": "Zimmer", - "featuresLabel": "Funktionen", - "saveButton": "Speichern", - "deleteButton": "Löschen", - "editButton": "Bearbeiten", - "mostRecentValueAt": "Zuletzt erhalten um {{mostRecentValueAt}}.", - "noValueReceived": "Kein Wert erhalten." - } - }, "openWeather": { "title": "OpenWeather-API", "documentation": "OpenWeather-Dokumentation", @@ -1119,6 +1122,41 @@ "conflictError": "Das aktuelle Gerät ist bereits in Gladys vorhanden." } }, + "airplay": { + "title": "Airplay", + "description": "Steuern Sie Airplay-Geräte in Ihrem lokalen Netzwerk", + "deviceTab": "Geräte", + "discoverTab": "Airplay Entdeckung", + "setupTab": "Einrichtung", + "documentation": "Airplay Dokumentation", + "discoverDeviceDescr": "Airplay-Geräte automatisch scannen", + "nameLabel": "Gerätename", + "namePlaceholder": "Geben Sie den Namen Ihres Geräts ein", + "hostLabel": "IP-Adresse", + "roomLabel": "Zimmer", + "saveButton": "Speichern", + "alreadyCreatedButton": "Bereits erstellt", + "deleteButton": "Löschen", + "device": { + "title": "Airplay-Geräte in Gladys", + "editButton": "Bearbeiten", + "noDeviceFound": "Kein Airplay-Gerät gefunden.", + "featuresLabel": "Funktionen" + }, + "discover": { + "title": "Geräte in Ihrem lokalen Netzwerk erkannt", + "description": "Airplay-Geräte werden automatisch erkannt.", + "error": "Fehler beim Entdecken der Airplay-Geräte. Ist Ihr Airplay-Lautsprecher eingeschaltet und im lokalen Netzwerk erreichbar?", + "noDeviceFound": "Keine Airplay-Geräte gefunden.", + "errorWhileScanning": "Beim Scannen ist ein Fehler aufgetreten.", + "scan": "Scannen" + }, + "error": { + "defaultError": "Beim Speichern des Geräts ist ein Fehler aufgetreten.", + "defaultDeletionError": "Beim Löschen des Geräts ist ein Fehler aufgetreten.", + "conflictError": "Das aktuelle Gerät ist bereits in Gladys vorhanden." + } + }, "zwavejs-ui": { "title": "ZWave JS UI", "description": "Steuern Sie Ihre Geräte in Z-Wave JS UI", @@ -1136,7 +1174,7 @@ "saveButton": "Speichern", "alreadyCreatedButton": "Bereits erstellt", "deleteButton": "Löschen", - "alphaWarning": "Diese Integration ist eine Alpha-Version und unterstützt derzeit nur ein Gerät: den Türöffnungssensor von Fibaro. Wir sind dankbar für jede Unterstützung bei der Integration weiterer Geräte!", + "alphaWarning": "Diese Integration unterstützt eine begrenzte Anzahl von Z-Wave-Geräten. Wenn Sie nicht unterstützte Geräte haben, zögern Sie nicht, diese einzureichen, damit sie hinzugefügt werden können!", "device": { "title": "Z-Wave JS UI Geräte in Gladys", "editButton": "Bearbeiten", @@ -1260,6 +1298,13 @@ "notFound": "Angefordertes Gerät nicht gefunden.", "backToList": "Zurück zur Geräteliste", "saveError": "Fehler beim Sichern oder Löschen des Geräts", + "validationError": "Validierungsfehler: Das Gerät ist nicht korrekt ausgefüllt.", + "validationErrors": { + "name": "Das Feld \"Name\" ist erforderlich", + "min": "Das Minimalfeld ist erforderlich und muss eine ganze Zahl sein", + "max": "Das Maximalfeld ist erforderlich und muss eine ganze Zahl sein", + "external_id": "Das externe ID-Feld ist erforderlich und muss über alle Geräte hinweg eindeutig sein" + }, "saveConflictError": "Konflikt: Sind alle externen IDs wirklich eindeutig?", "mostRecentValueAt": "Zuletzt empfangener Wert {{mostRecentValueAt}}.", "noValueReceived": "Kein Wert empfangen." @@ -1454,13 +1499,15 @@ }, "lanManager": { "title": "LAN-Manager", - "description": "Verwalte deine Geräte über dein lokales Netzwerk.", + "description": "Anwesenheitserkennung über Netzwerkscan", "deviceTab": "Meine Geräte", "discoverTab": "Geräte in der Nähe", "setupTab": "Anwesenheitsscanner", "documentation": "LAN-Manager-Dokumentation", "device": { - "title": "Meine Geräte", + "title": "Geräte zur Integration hinzugefügt", + "explanation": "Diese Integration ermöglicht es Ihnen, die Anwesenheit von Benutzern durch einen Netzwerkscan zu erkennen.", + "iosWarning": "Achtung, diese Integration funktioniert nicht mit iOS-Geräten.", "search": "Geräte suchen", "noDevices": "Du hast noch keine LAN-Geräte hinzugefügt.", "manufacturerLabel": "Hersteller", @@ -1730,6 +1777,28 @@ "rateLimit": "Da die ChatGPT-API nicht kostenlos ist, ist diese Integration auf 1000 Anfragen pro Monat begrenzt.", "notOnGladysPlus": "Da die ChatGPT-API nicht kostenlos ist, ist diese Integration nur für Gladys-Plus-Benutzer verfügbar.", "subscribeToGladysPlus": "Klicke hier, um Gladys Plus zu abonnieren." + }, + "callmebot": { + "title": "CallMeBot", + "description": "Senden Sie Nachrichten über WhatsApp und Signal.", + "setupTab": "Einrichtung", + "documentation": "Dokumentation", + "setup": { + "title": "CallMeBot konfigurieren", + "description": "Um CallMeBot zu nutzen, benötigen Sie einen API-Schlüssel. Folgen Sie diesen Schritten:
1. Besuchen Sie die CallMeBot-Website
2. Wählen Sie Ihre bevorzugte Messaging-Plattform (WhatsApp, Signal)
3. Folgen Sie den Anweisungen, um Ihren API-Schlüssel zu erhalten
4. Geben Sie unten Ihren API-Schlüssel ein
⚠️ Hinweis: Dieser Dienst ist nur unidirektional (Gladys kann Nachrichten senden, aber keine empfangen) und unterstützt keine Bildübertragung.", + "apiKeyLabel": "API-Schlüssel", + "apiKeyPlaceholder": "Geben Sie Ihren CallMeBot API-Schlüssel ein", + "apiKeyHelp": "Ihr API-Schlüssel wird zur Authentifizierung beim CallMeBot-Service verwendet", + "messagingServiceLabel": "Messaging-Dienst", + "messagingServiceHelp": "Wählen Sie den Messaging-Dienst, den Sie mit CallMeBot verwenden möchten", + "phoneNumberLabel": "Telefonnummer", + "phoneNumberPlaceholder": "Geben Sie Ihre Telefonnummer ein", + "phoneNumberHelp": "Ihre Telefonnummer im internationalen Format (z.B. +49123456789)", + "phoneNumberHelpSignal": "Für Signal wird dies eine von CallMeBot bereitgestellte UUID sein (z.B. 123e4567-e89b-12d3-a456-426614174000)", + "saveButton": "Speichern", + "saved": "Konfiguration gespeichert!", + "error": "Fehler beim Speichern der Konfiguration" + } } }, "editScene": { @@ -1752,12 +1821,14 @@ "addTriggerButton": "Auslöser hinzufügen", "selectTriggerLabel": "Wähle einen Auslösertyp aus", "newAction": "Neue Aktion", + "newCondition": "Neue Bedingung", "selectActionType": "Wähle einen Aktionstyp aus", + "selectConditionType": "Wähle eine Bedingungstyp aus", "addActionButton": "Aktion hinzufügen", "noTriggersYet": "Du hast noch keine Auslöser hinzugefügt. Eine Szene muss nicht zwingend einen Auslöser haben.", "noActionsYet": "Du hast noch keine Aktionen hinzugefügt. Klicke auf \"+\", um eine Aktion zu dieser Szene hinzuzufügen.", "triggersDescription": "Auslöser sind unabhängig voneinander. Wenn du mehrere Auslöser festgelegt hast, reicht es, wenn einer ausgelöst wird, um die Szene auszuführen.", - "actionsDescription": "Alle Aktionen in diesem Block werden parallel ausgeführt. Um eine Abfolge von Aktionen zu erstellen, füge Aktionen zum nächsten Block hinzu.", + "actionsDescription": "Alle Aktionen in diesem Block werden parallel ausgeführt. Um eine Abfolge von Aktionen zu erstellen, füge Aktionen zum næchsten Block hinzu.", "addNewTriggerButton": "Auslöser hinzufügen", "saveSceneError": "Beim Sichern deiner Szene ist ein Fehler aufgetreten. Bitte überprüfe, ob alle Aktionen/Auslöser ausgefüllt und korrekt sind.", "actionsCard": { @@ -1782,6 +1853,19 @@ "textPlaceholder": "Nachrichtentext", "explanationText": "Um eine Variable in den Text einzufügen, gib \"{{\" ein. Um einen Variablenwert festzulegen, musst du zuerst das Feld \"Gerätewert abrufen\" verwenden." }, + "askAi": { + "description": "Diese Aktion sendet eine Nachricht an die KI (ChatGPT) über Gladys Plus und antwortet Ihnen mit einer Nachricht. Wenn Sie ein Kamerabild anhängen, kann die KI sehen, was auf dem Bild ist, und sogar entsprechend handeln.", + "userLabel": "Gladys wird antworten an", + "cameraLabel": "Ein Kamerabild anhängen (optional)", + "textLabel": "Meine Frage an die KI", + "textPlaceholder": "Nachrichtentext", + "explanationText": "Um eine Variable einzufügen, geben Sie '{{' ein. Achten Sie darauf, dass Sie zuvor eine Variable in einer Aktion 'Letzten Zustand abrufen' definiert haben, die vor diesem Nachrichtenblock platziert wurde." + }, + "smsSend": { + "textLabel": "Nachricht", + "explanationText": "Um eine Variable in den Text einzufügen, gib \"{{\" ein. Um einen Variablenwert festzulegen, musst du zuerst das Feld \"Gerätewert abrufen\" verwenden.", + "messagePlaceholder": "Meine Message" + }, "turnOnLights": { "label": "Wähle die Lichter aus, die eingeschaltet werden sollen" }, @@ -1838,6 +1922,23 @@ "orButton": "+ ODER", "explanationText": "Anstelle eines festen Werts kannst du hier eine Berechnung auf Basis einer Szenenvariable eingeben. Um eine Variable in den Text einzufügen, gib \"{{\" ein. Um einen Variablenwert festzulegen, musst du zuerst das Feld \"Gerätewert abrufen\" verwenden." }, + "conditionIfThenElse": { + "conditions": "Bedingungen", + "conditionDescription": "Wenn alle Bedingungen erfüllt sind, werden die Aktionen im \"Dann\"-Block ausgeführt. Wenn nicht, werden die Aktionen im \"Sonst\"-Block ausgeführt.", + "noCondition": "Es wurde noch keine Bedingung hinzugefügt. Klicken Sie auf die '+'-Schaltfläche, um diesem Block eine Bedingung hinzuzufügen", + "addCondition": "Bedingung hinzufügen", + "if": "Wenn", + "then": "Dann", + "else": "Sonst", + "shortIf": "W", + "shortThen": "D", + "shortElse": "S", + "actionCount": { + "zero": "Keine Aktionen", + "one": "1 Aktion", + "other": "{{count}} Aktionen" + } + }, "checkTime": { "description": "Die Szene wird nur fortgesetzt, wenn die aktuelle Uhrzeit außerhalb der ausgewählten Tage liegt. Wenn ein Feld leer gelassen wird, wird es nicht berücksichtigt.", "beforeLabel": "Vor", @@ -1938,10 +2039,18 @@ "variablesExplanation": "Um eine Variable im Text einzufügen, gib \"{{\" ein. Um einen Variablenwert festzulegen, musst du vor diesem Feld das das Feld \"Gerätewert abrufen\" verwenden.", "messagePlaceholder": "Meine Message" }, + "zigbee2mqttMessage": { + "topic": "Topic", + "topicPlaceholder": "/gladys/mein-topic", + "messageLabel": "Message", + "variablesExplanation": "Um eine Variable im Text einzufügen, gib \"{{\" ein. Um einen Variablenwert festzulegen, musst du vor diesem Feld das das Feld \"Gerätewert abrufen\" verwenden.", + "messagePlaceholder": "Meine Message" + }, "playNotification": { "description": "Diese Aktion lässt Gladys auf dem ausgewählten Lautsprecher sprechen.", "needGladysPlus": "Erfordert Gladys Plus, da die Text-to-Speech-APIs kostenpflichtig sind.", "deviceLabel": "Lautsprecher", + "volumeLabel": "Volumen", "textLabel": "Nachricht zum Sprechen auf dem Lautsprecher", "variablesExplanation": "Um eine Variable einzufügen, gib \"{{\" ein. Hinweis: Du musst vor diesem Block eine Variable in einer \"Letzten Zustand abrufen\"-Aktion definiert haben." } @@ -1958,6 +2067,9 @@ "send": "Nachricht senden", "send-camera": "Kameraaufnahme senden" }, + "sms": { + "send": "SMS senden" + }, "delay": "Warten", "light": { "turn-on": "Licht einschalten", @@ -1979,7 +2091,8 @@ }, "condition": { "only-continue-if": "Nur fortsetzen, wenn", - "check-time": "Zeitbedingung" + "check-time": "Zeitbedingung", + "if-then-else": "Bedingung: \"Wenn...dann...sonst...\"" }, "user": { "set-seen-at-home": "Benutzer zu Hause gesehen", @@ -2006,8 +2119,14 @@ "mqtt": { "send": "MQTT-Message senden" }, + "zigbee2mqtt": { + "send": "Zigbee2mqtt-Message senden" + }, "music": { "play-notification": "Auf einem Lautsprecher sprechen" + }, + "ai": { + "ask": "Frage die KI" } }, "variables": { @@ -2034,8 +2153,8 @@ "sunset": "Jeder Sonnenuntergang" }, "user": { - "back-home": "Benutzer hat das Zuhause verlassen", - "left-home": "Benutzer ist zurück zu Hause" + "back-home": "Benutzer ist zurück zu Hause", + "left-home": "Benutzer hat das Zuhause verlassen" }, "house": { "empty": "Das Zuhause ist leer", @@ -2075,7 +2194,8 @@ "on": "Ein", "off": "Aus", "deviceSeen": "Wenn das Gerät erkannt wird", - "onlyExecuteAtThreshold": "Nur ausführen, wenn der Schwellenwert überschritten wird (und nicht bei jedem vom Gerät gesendeten Wert)" + "onlyExecuteAtThreshold": "Nur ausführen, wenn der Schwellenwert überschritten wird (und nicht bei jedem vom Gerät gesendeten Wert)", + "activateOrDeactivateForDuration": "Szene ausführen, nachdem die Bedingung für die Dauer gültig war:" }, "scheduledTrigger": { "typeLabel": "Typ", @@ -2317,7 +2437,8 @@ "wrongEmailError": "This is not a valid email", "networkError": "Network Error: We didn't succeed in contacting your Gladys instance. Are you connected to the network? Is your Gladys instance running?", "unknownError": "An unknown error occured. Please try again or contact Gladys community.", - "success": "Success! You should see a reset password link in Gladys logs.", + "success": "Success! I sent you a reset password link by Telegram or Nextcloud Talk. If you haven't configured these services, the reset password link will be in Gladys logs.", + "howToAccessLogs": "To access Gladys logs, go to the command line and type `docker logs gladys --tail=1000` to display the last 1000 lines.", "userNotFound": "There is no account linked to this email.", "rateLimitError": "You have tried this form too many time. Please retry in 30 minutes or restart your Gladys instance now.", "invalidEmail": "We are unable to verify your email address.", @@ -2388,7 +2509,11 @@ "upToDate": "Gladys ist auf dem neuesten Stand", "newUpgradeAvailable": "Softwareupdate verfügbar", "newUpgradeAvailableText": "Gladys wird sich automatisch aktualisieren, wenn du Gladys mit dem offiziellen Gladys-Raspberry-Pi-OS-Image installiert hast. Wenn du Gladys manuell installiert hast, achte darauf, dass Watchtower ausgeführt wird.", - "download": "Herunterladen", + "notConnectedToDocker": "Gladys ist nicht mit Docker verbunden. Um Docker aus Gladys heraus zugänglich zu machen, musst du Gladys mit dem richtigen Volume `-v /var/run/docker.sock:/var/run/docker.sock` starten.", + "updateNow": "Jetzt aktualisieren", + "upgradeInProgress": "Aktualisierung läuft …", + "upgradeLogs": "Messages von Watchtower", + "websocketNotConnected": "WebSocket-Verbindung verloren... Gladys ist wahrscheinlich neu gestartet. Du kannst diese Seite neu laden, um zu prüfen, ob Gladys wieder online ist.", "notAvailable": "Nicht verfügbar bei benutzerdefinierter Installation.", "containers": "Container", "containerName": "Name", @@ -2406,10 +2531,11 @@ "numberOfHoursBeforeStateIsOutdated": "Zeit bis zum Ablauf eines Zustands", "numberOfHoursBeforeStateIsOutdatedDescription": "Diese Verzögerung entspricht der Anzahl der Stunden, bevor der Zustand eines Sensors als \"abgelaufen\" betrachtet und daher nicht mehr auf dem Dashboard angezeigt wird.", "hours": "Stunden", - "vacuumDatabaseTitle": "Datenbankreinigung", - "vacuumDatabaseDescription": "Auf Wunsch wird Gladys eine Datenbankreinigung starten, um Platz freizugeben. Dies löscht keine Daten, sondern entfernt nur physisch alte, als gelöscht markierte Daten. Sei vorsichtig, denn diese Aufgabe kann einige Zeit in Anspruch nehmen und während dieser Zeit wird Gladys nicht verfügbar sein.", + "vacuumDatabaseTitle": "SQLite-Datenbankreinigung", + "vacuumDatabaseDescription": "Wenn du auf diese Schaltfläche klickst, beginnt Gladys mit der Bereinigung der SQLite-Datenbank, um Speicherplatz freizugeben. Dabei werden keine Daten gelöscht, es werden nur physisch alte, bereits gelöschte Daten entfernt. Während der Bereinigung ist Gladys nicht verfügbar.", "vacuumDatabaseButton": "Datenbankreinigung starten", "vacuumDatabaseStarted": "Die Datenbankreinigung wurde gestartet. Gladys wird erst wieder verfügbar sein, wenn dieser Vorgang abgeschlossen ist.", + "vacuumDatabaseFinished": "Die Datenbankreinigung wurde abgeschlossen. Gladys ist wieder verfügbar. Zeit für die Reinigung: {{duration}}.", "containerState": { "created": "Erstellt", "restarting": "Startet neu", @@ -2469,7 +2595,8 @@ "duplicateSceneButton": "Duplizieren", "invalidName": "Name ist erforderlich", "invalidIcon": "Symbol ist erforderlich", - "sceneAlreadyExist": "Eine Szene mit diesem Namen existiert bereits." + "sceneAlreadyExist": "Eine Szene mit diesem Namen existiert bereits.", + "nameAfterCopy": "Kopie von {{name}}" }, "scene": { "title": "Szenen", @@ -2748,6 +2875,16 @@ "heating": "Heizen" } }, + "heater": { + "pilot-wire-mode": { + "comfort": "Komfort", + "eco": "Öko", + "off": "Aus", + "frost-protection": "Frostschutz", + "comfort_-1": "Komfort -1°C", + "comfort_-2": "Komfort -2°C" + } + }, "siren": { "lmh_volume": { "low": "Niedrig", @@ -2819,7 +2956,38 @@ "48": "Langer Druck", "49": "Kurzes Loslassen", "50": "Langes Loslassen", - "51": "Doppeltes Drücken" + "51": "Doppeltes Drücken", + "52": "Umschalten", + "53": "Umschalten Gehalten", + "54": "Helligkeit Auf-Taste gedrückt", + "55": "Helligkeit Auf-Taste gehalten", + "56": "Helligkeit Auf-Taste Loslassen", + "57": "Helligkeit Ab-Taste gedrückt", + "58": "Helligkeit Ab-Taste gehalten", + "59": "Helligkeit Ab-Taste Loslassen", + "60": "Gedrückt", + "61": "Einfach Links", + "62": "Einfach Rechts", + "63": "Einfach Beide", + "64": "Doppelt Links", + "65": "Doppelt Rechts", + "66": "Doppelt Beide", + "67": "Dreifach Links", + "68": "Dreifach Rechts", + "69": "Dreifach Beide", + "70": "Halten Links", + "71": "Halten Rechts", + "72": "Halten Beide" + } + }, + "heater": { + "pilot-wire-mode": { + "0": "Aus", + "1": "Frostschutz", + "2": "Öko", + "3": "Komfort -1°C", + "4": "Komfort -2°C", + "5": "Komfort" } }, "opening-sensor": { @@ -2857,6 +3025,13 @@ "one": "Ja" } }, + "input": { + "binary": { + "other": "Kein Wert empfangen", + "zero": "Aus", + "one": "An" + } + }, "risk": { "integer": { "no-risk": "Kein Risiko", @@ -2906,6 +3081,10 @@ "shortCategoryName": "Anwesenheitssensor", "push": "Anwesenheit" }, + "rain-sensor": { + "shortCategoryName": "Regensensor", + "binary": "Regenerkennung Ja/Nein" + }, "light-sensor": { "shortCategoryName": "Helligkeitssensor", "integer": "Helligkeit (ganze Zahl)", @@ -2968,7 +3147,8 @@ }, "button": { "shortCategoryName": "Schaltfläche", - "click": "Schaltfläche (Klick)" + "click": "Schaltfläche (Klick)", + "push": "Druckknopf" }, "pressure-sensor": { "shortCategoryName": "Drucksensor", @@ -3022,6 +3202,10 @@ "mode": "Modus", "target-temperature": "Temperatur" }, + "heater": { + "shortCategoryName": "Heizung", + "pilot-wire-mode": "Modus" + }, "tamper": { "shortCategoryName": "Manipulation", "binary": "Manipulation (ja/nein)" @@ -3068,6 +3252,67 @@ "index": "Index", "daily-consumption": "Tagesverbrauch" }, + "teleinformation": { + "shortCategoryName": "Teleinformation", + "binary": "Schalter", + "east": "Gesamt abgegebene Wirkleistung (EAST)", + "eait": "Gesamt eingespeiste Wirkleistung (EAIT)", + "easf01": "Gesamt abgegebene Wirkleistung vom Anbieter (EASF01)", + "easf02": "Gesamt abgegebene Wirkleistung vom Anbieter (EASF02)", + "easf03": "Gesamt abgegebene Wirkleistung vom Anbieter (EASF03)", + "easf04": "Gesamt abgegebene Wirkleistung vom Anbieter (EASF04)", + "easf05": "Gesamt abgegebene Wirkleistung vom Anbieter (EASF05)", + "easf06": "Gesamt abgegebene Wirkleistung vom Anbieter (EASF06)", + "easf07": "Gesamt abgegebene Wirkleistung vom Anbieter (EASF07)", + "easf08": "Gesamt abgegebene Wirkleistung vom Anbieter (EASF08)", + "easf09": "Gesamt abgegebene Wirkleistung vom Anbieter (EASF09)", + "easf10": "Gesamt abgegebene Wirkleistung vom Anbieter (EASF10)", + "pref": "Referenz-Scheinleistung (PREF)", + "pcoup": "Scheinleistungsschwelle (PCOUP)", + "vtic": "Protokollversion (VTIC)", + "ccasn": "Aktueller Punkt der entnommenen Lastkurve (CCASN)", + "ccasn_1": "Vorheriger Punkt der entnommenen Lastkurve (CCASN-1)", + "umoy1": "Durchschnittliche Effektivspannung (UMOY1)", + "umoy2": "Durchschnittliche Effektivspannung (UMOY2)", + "umoy3": "Durchschnittliche Effektivspannung (UMOY3)", + "erq1": "Gesamt Blindleistung Q1 (ERQ1)", + "erq2": "Gesamt Blindleistung Q2 (ERQ2)", + "erq3": "Gesamt Blindleistung Q3 (ERQ3)", + "erq4": "Gesamt Blindleistung Q4 (ERQ4)", + "irms1": "Effektivstrom (IRMS1)", + "irms2": "Effektivstrom (IRMS2)", + "irms3": "Effektivstrom (IRMS3)", + "urms1": "Effektivspannung (URMS1)", + "urms2": "Effektivspannung (URMS2)", + "urms3": "Effektivspannung (URMS3)", + "easd01": "Entnommene Wirkenergie des Verteilers (EASD01)", + "easd02": "Entnommene Wirkenergie des Verteilers (EASD02)", + "easd03": "Entnommene Wirkenergie des Verteilers (EASD03)", + "easd04": "Entnommene Wirkenergie des Verteilers (EASD04)", + "ntarf": "Tarif-Indexnummer (NTARF)", + "ccain": "Punkt n der entnommenen Lastkurve (CCAIN)", + "ccain_1": "Punkt n-1 der entnommenen Lastkurve (CCAIN-1)", + "sinsti": "Momentan eingespeiste Scheinleistung (SINSTI)", + "smaxin": "Max. eingespeiste Scheinleistung n (SMAXIN)", + "smaxin_1": "Max. eingespeiste Scheinleistung n-1 (SMAXIN-1)", + "smaxn": "Max. abgegebene Scheinleistung (SMAXN)", + "smaxn2": "Max. abgegebene Scheinleistung (SMAXN2)", + "smaxn3": "Max. abgegebene Scheinleistung (SMAXN3)", + "sinsts": "Momentane abgegebene Scheinleistung (SINSTS)", + "sinsts2": "Momentane abgegebene Scheinleistung (SINSTS2)", + "sinsts3": "Momentane abgegebene Scheinleistung (SINSTS3)", + "smaxn_1": "Max. entnommene Scheinleistung n-1 (SMAXN-1)", + "smaxn2_1": "Max. entnommene Scheinleistung n-1 (SMAXN2-1)", + "smaxn3_1": "Max. entnommene Scheinleistung n-1 (SMAXN3-1)", + "hhphc": "HPHC-Programm (HHPHC)", + "imax": "Spitzenstrom (IMAX)", + "adps": "Warnung bei Überschreitung der Vertragsleistung (ADPS)", + "imax2": "Spitzenstrom (IMAX2)", + "imax3": "Spitzenstrom (IMAX3)", + "adir1": "Überstromwarnung (ADIR1)", + "adir2": "Überstromwarnung (ADIR2)", + "adir3": "Überstromwarnung (ADIR3)" + }, "volume-sensor": { "shortCategoryName": "Lautstärke-Sensor", "decimal": "Lautstärke (dezimal)", @@ -3084,7 +3329,8 @@ }, "precipitation-sensor": { "shortCategoryName": "Niederschlagssensor", - "decimal": "Niederschlag" + "decimal": "Niederschlag", + "integer": "Intensität (mV)" }, "uv-sensor": { "shortCategoryName": "UV-Sensor", @@ -3159,6 +3405,10 @@ "shortCategoryName": "Risiko", "integer": "Risikostufe" }, + "input": { + "shortCategoryName": "Eingang", + "binary": "Status des Eingangs" + }, "unknown": { "shortCategoryName": "Unbekannt", "unknown": "Unbekannt" diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json index 7d95f7e246..a3711adad9 100644 --- a/front/src/config/i18n/en.json +++ b/front/src/config/i18n/en.json @@ -247,6 +247,8 @@ "private": "private", "public": "public" }, + "editDashboardAddColumnButton": "Add a column on dashboard", + "editDashboardBoxNotEmpty": "You cannot delete this column as it contains widgets.", "editDashboardMyDashboards": "My dashboards", "editDashboardExplanation": "Each dashboard has 3 columns, which you can fill in according to your preferences. Click on the + button to add a new widget. You can move this widget by grabbing it and moving it around.", "reorderDashboardButton": "Re-order dashboards", @@ -261,7 +263,7 @@ "humidity-in-room": "Humidity in room", "user-presence": "User presence", "camera": "Camera", - "devices-in-room": "Devices in room", + "devices-in-room": "Devices in room (Deprecated)", "devices": "Devices", "chart": "Chart", "ecowatt": "Ecowatt (France)", @@ -296,11 +298,12 @@ "deviceTitle": "{{name}} - {{type}}", "addButton": "+", "substractButton": "-", - "motionDetected": "Motion detected" + "motionDetected": "Motion detected", + "pushButton": "Push" }, "devices": { "editDeviceFeaturesLabel": "Select the devices you want to display:", - "editNameLabel": "Widget name", + "editNameLabel": "Widget Name (optional)", "editNamePlaceholder": "Enter the name of the widget", "addADeviceLabel": "Add a device:" }, @@ -345,6 +348,7 @@ "chart": { "defaultInterval": "Default interval", "lastHour": "Last hour", + "lastTwelveHours": "Last 12 hours", "lastDay": "Last 24 hours", "lastSevenDays": "Last 7 days", "lastThirtyDays": "Last 30 days", @@ -352,6 +356,8 @@ "lastYear": "Last year", "noValue": "No values recorded on this interval.", "noValueWarning": "Warning: if you just configured this device, it may take some time before you see something here as Gladys needs some time to collect enough data. For interval superior to 24h, it may take up to 24h before you see something here.", + "noChartType": "No chart type selected", + "noChartTypeWarning": "If you just configured this device, please go back to the box edit page and select a chart type.", "editNameLabel": "Enter the name of this box", "editDeviceFeaturesLabel": "Select the device you want to display here", "editRoomLabel": "Select the room you want to display here", @@ -359,16 +365,22 @@ "chartType": "Select the type of chart to display", "chartColor": "Select the color of chart", "dataColor": "Select color for {{featureLabel}}", + "timelineColor": "Select color for position", "line": "Line", "area": "Area", "bar": "Bar", + "timeline": "Binary", "stepline": "Step Line", "displayAxes": "Display axes?", "displayVariation": "Display variation?", "yes": "Yes", "no": "No", "preview": "Preview", - "showPreviewButton": "Show preview" + "showPreviewButton": "Show preview", + "on": "On", + "off": "Off", + "start_date": "Start date: ", + "end_date": "End date: " }, "ecowatt": { "title": "Ecowatt France", @@ -403,7 +415,7 @@ "no": "No" }, "scene": { - "editNameLabel": "Enter the name of this box", + "editNameLabel": "Widget Name (optional)", "editNamePlaceholder": "Name displayed on the dashboard", "editSceneLabel": "Select the scene you want to display here." }, @@ -478,6 +490,17 @@ "configurationSuccess": "Successfully saved configuration.", "buttonSave": "Save" }, + "free-mobile": { + "title": "Free Mobile", + "description": "Send SMS from Gladys using Free Mobile.", + "documentation": "Free Mobile Documentation", + "introduction": "This plugin allows you to send SMS to your Free cell phone via the notification service provided by Free. Enter your customer ID and the identification key below, which you can find on the FreeMobile website.", + "username": "Free Mobile Customer ID", + "key": "Identification key for the service", + "configurationError": "We could not save this configuration.", + "configurationSuccess": "Account configuration saved successfully.", + "saveButton": "Save" + }, "philipsHue": { "title": "Philips Hue", "description": "Control Philips Hue Lights and plugs with the official hub", @@ -946,26 +969,6 @@ "documentation": "OwnTracks documentation", "longDescription": "OwnTracks is an open-source app running on iOS and Android that let you send your geolocation to a server. You can use OwnTracks to trigger scenes based on your geolocation. To configure OwnTracks with Gladys, follow this tutorial in our documentation." }, - "zwave": { - "title": "Open-Zwave [OLD]", - "description": "This integration is deprecated, we are migrating to zwave-js-ui.", - "documentation": "Open-Zwave documentation", - "device": { - "title": "Legacy Open-Zwave Devices", - "convertToMqtt": "Convert to MQTT device", - "oldIntegrationWarning": "This integration was based on Open-Zwave and is now DEPRECATED. We are migrating to Zwave-js-ui, but in the meantime we recommend that you use Node-RED + Zwave-js-ui + Gladys.
If you want to help us develop this integration, join-us on the forum!", - "noDevices": "No Z-Wave devices added yet.", - "scanButton": "Scan", - "nameLabel": "Name", - "roomLabel": "Room", - "featuresLabel": "Features", - "saveButton": "Save", - "deleteButton": "Delete", - "editButton": "Edit", - "mostRecentValueAt": "Last value received {{mostRecentValueAt}}.", - "noValueReceived": "No value received." - } - }, "openWeather": { "title": "OpenWeather API", "documentation": "OpenWeather documentation", @@ -1119,6 +1122,41 @@ "conflictError": "The current device is already in Gladys." } }, + "airplay": { + "title": "Airplay", + "description": "Contrôler les appareils Airplay sur votre réseau local", + "deviceTab": "Devices", + "discoverTab": "Airplay Discovery", + "setupTab": "Setup", + "documentation": "Airplay Documentation", + "discoverDeviceDescr": "Automatically scan for Airplay devices", + "nameLabel": "Device Name", + "namePlaceholder": "Enter your device name", + "hostLabel": "IP Address", + "roomLabel": "Room", + "saveButton": "Save", + "alreadyCreatedButton": "Already Created", + "deleteButton": "Delete", + "device": { + "title": "Airplay Devices in Gladys", + "editButton": "Edit", + "noDeviceFound": "No Airplay device found.", + "featuresLabel": "Features" + }, + "discover": { + "title": "Devices detected on your local network", + "description": "Airplay devices are automatically discovered.", + "error": "Error discovering Airplay devices. Is your Airplay speaker powered on and accessible on the local network?", + "noDeviceFound": "No Airplay devices have been discovered.", + "errorWhileScanning": "An error occurred while scanning.", + "scan": "Scan" + }, + "error": { + "defaultError": "An error occurred while saving the device.", + "defaultDeletionError": "An error occurred while deleting the device.", + "conflictError": "The current device is already in Gladys." + } + }, "zwavejs-ui": { "title": "ZWave JS UI", "description": "Control your devices in Z-Wave JS UI", @@ -1136,7 +1174,7 @@ "saveButton": "Save", "alreadyCreatedButton": "Already Created", "deleteButton": "Delete", - "alphaWarning": "This integration is in alpha and currently only supports few devices. We welcome any assistance to integrate other devices!", + "alphaWarning": "This integration handles a limited number of Z-Wave devices. If you have unsupported devices, don't hesitate to submit them so they can be added!", "device": { "title": "Z-Wave JS UI Devices in Gladys", "editButton": "Edit", @@ -1260,6 +1298,13 @@ "notFound": "Requested device not found.", "backToList": "Back to device list", "saveError": "Error saving or deleting device", + "validationError": "Validation error : The device is not correctly filled.", + "validationErrors": { + "name": "The name field is required", + "min": "The minimum field is required and must be an integer", + "max": "The maximum field is required and must be an integer", + "external_id": "The external ID field is required and must be unique across all devices" + }, "saveConflictError": "Conflict: Are you sure all external IDs are unique?", "mostRecentValueAt": "Last value received {{mostRecentValueAt}}.", "noValueReceived": "No value received." @@ -1454,13 +1499,15 @@ }, "lanManager": { "title": "LAN Manager", - "description": "Manage you device through you local network.", + "description": "Presence detection via network scan", "deviceTab": "Devices", "discoverTab": "LAN Discover", "setupTab": "Presence scanner", "documentation": "Lan Manager documentation", "device": { - "title": "LAN Devices", + "title": "Devices added to the integration", + "explanation": "This integration allows you to detect user presence by scanning the network.", + "iosWarning": "Warning, this integration does not work with iOS devices.", "search": "Search devices", "noDevices": "No LAN devices added yet.", "manufacturerLabel": "Manufacturer", @@ -1730,6 +1777,28 @@ "rateLimit": "As ChatGPT API is not free, this integration is limited to 1000 requests per month.", "notOnGladysPlus": "As ChatGPT API is not free, this integration is only available to Gladys Plus users.", "subscribeToGladysPlus": "Click here to subscribe to Gladys Plus." + }, + "callmebot": { + "title": "CallMeBot", + "description": "Send messages through WhatsApp and Signal.", + "setupTab": "Setup", + "documentation": "Documentation", + "setup": { + "title": "Configure CallMeBot", + "description": "To use CallMeBot, you need to get an API key. Follow these steps:
1. Go to CallMeBot website
2. Choose your preferred messaging platform (WhatsApp, Signal)
3. Follow the instructions to get your API key
4. Enter your API key below
⚠️ Note: This service is one-way only (Gladys can send messages but cannot receive any) and does not support sending images.", + "apiKeyLabel": "API Key", + "apiKeyPlaceholder": "Enter your CallMeBot API key", + "apiKeyHelp": "Your API key is used to authenticate with CallMeBot service", + "messagingServiceLabel": "Messaging Service", + "messagingServiceHelp": "Select the messaging service you want to use with CallMeBot", + "phoneNumberLabel": "Phone Number", + "phoneNumberPlaceholder": "Enter your phone number", + "phoneNumberHelp": "Your phone number in international format (e.g. +1234567890)", + "phoneNumberHelpSignal": "For Signal, this will be a UUID provided by CallMeBot (e.g. 123e4567-e89b-12d3-a456-426614174000)", + "saveButton": "Save", + "saved": "Configuration saved!", + "error": "Error while saving configuration" + } } }, "editScene": { @@ -1752,7 +1821,9 @@ "addTriggerButton": "Add trigger", "selectTriggerLabel": "Select a trigger type", "newAction": "New action", + "newCondition": "New condition", "selectActionType": "Select an action type", + "selectConditionType": "Select a condition type", "addActionButton": "Add action", "noTriggersYet": "No trigger added yet. It's not mandatory to have a trigger in a scene.", "noActionsYet": "No actions added yet. Click on the + button to add an action to this scene.", @@ -1782,6 +1853,19 @@ "textPlaceholder": "Message text", "explanationText": "To inject a variable in the text, press '{{'. To set a variable value, you need to use the 'Get device value' box before this one." }, + "askAi": { + "description": "This action will send a message to the AI (ChatGPT) via Gladys Plus and will reply to you with a message. If you attach a camera image, the AI will be able to see what is on the image and even take action accordingly.", + "userLabel": "Gladys will respond to", + "cameraLabel": "Attach a camera image (optional)", + "textLabel": "My question for the AI", + "textPlaceholder": "Message text", + "explanationText": "To insert a variable, type '{{'. Be careful, you must have defined a variable beforehand in a 'Retrieve the last state' action placed before this message block." + }, + "smsSend": { + "textLabel": "Message", + "explanationText": "To inject a variable in the text, press '{{'. To set a variable value, you need to use the 'Get device value' box before this one.", + "messagePlaceholder": "My message" + }, "turnOnLights": { "label": "Select the lights you want to turn on" }, @@ -1838,6 +1922,23 @@ "orButton": "+ OR", "explanationText": "Instead of a fixed value, you can enter here a calculation based on a scene variable. To inject a variable in the text, press '{{'. To set a variable value, you need to use the 'Get device value' box before this one." }, + "conditionIfThenElse": { + "conditions": "Conditions", + "conditionDescription": "If all conditions are met, the actions in the \"Then\" block will be executed. If not, the \"Else\" block will be executed.", + "noCondition": "No condition has been added yet. Click the '+' button to add a condition to this block", + "addCondition": "Add condition", + "if": "If", + "then": "Then", + "else": "Else", + "shortIf": "I", + "shortThen": "T", + "shortElse": "E", + "actionCount": { + "zero": "No action", + "one": "1 action", + "other": "{{count}} actions" + } + }, "checkTime": { "description": "The scene will continue only if current time is between the selected limits, in the selected days. If a field is left empty, it'll not be taken into account.", "beforeLabel": "Before", @@ -1938,10 +2039,18 @@ "variablesExplanation": "To inject a variable in the text, press '{{ '. To set a variable value, you need to use the 'Get device value' box before this one.", "messagePlaceholder": "My message" }, + "zigbee2mqttMessage": { + "topic": "Topic", + "topicPlaceholder": "/gladys/my-topic", + "messageLabel": "Message", + "variablesExplanation": "To inject a variable in the text, press '{{ '. To set a variable value, you need to use the 'Get device value' box before this one.", + "messagePlaceholder": "My message" + }, "playNotification": { "description": "This action will make Gladys speak on the selected speaker.", "needGladysPlus": "Requires Gladys Plus as Text-To-Speech APIs are paid.", "deviceLabel": "Speaker", + "volumeLabel": "Volume", "textLabel": "Message to speak on the speaker", "variablesExplanation": "To inject a variable, type '{{ '. Note: You must have defined a variable beforehand in a 'Retrieve Last State' action placed before this message block." } @@ -1958,6 +2067,9 @@ "send": "Send Message", "send-camera": "Send a camera image" }, + "sms": { + "send": "Send SMS" + }, "delay": "Wait", "light": { "turn-on": "Turn On the Lights", @@ -1978,8 +2090,9 @@ "stop": "Stop service" }, "condition": { - "only-continue-if": "Only continue if", - "check-time": "Time condition" + "only-continue-if": "Condition on variables", + "check-time": "Time condition", + "if-then-else": "Condition: If...then...else..." }, "user": { "set-seen-at-home": "User seen at home", @@ -2006,8 +2119,14 @@ "mqtt": { "send": "Send MQTT Message" }, + "zigbee2mqtt": { + "send": "Send Zigbee2mqtt Message" + }, "music": { "play-notification": "Talk on a speaker" + }, + "ai": { + "ask": "Ask AI" } }, "variables": { @@ -2034,8 +2153,8 @@ "sunset": "Every sunset" }, "user": { - "back-home": "User left home", - "left-home": "User back at home" + "back-home": "User back at home", + "left-home": "User left home" }, "house": { "empty": "House is empty", @@ -2075,7 +2194,8 @@ "on": "On", "off": "Off", "deviceSeen": "If the device is detected", - "onlyExecuteAtThreshold": "Execute only when threshold is passed (and not at every value sent by the device)" + "onlyExecuteAtThreshold": "Execute only when threshold is passed (and not at every value sent by the device)", + "activateOrDeactivateForDuration": "Run the scene after the condition has been valid for:" }, "scheduledTrigger": { "typeLabel": "Type", @@ -2317,7 +2437,8 @@ "wrongEmailError": "This is not a valid email", "networkError": "Network Error: We didn't succeed in contacting your Gladys instance. Are you connected to the network? Is your Gladys instance running?", "unknownError": "An unknown error occured. Please try again or contact Gladys community.", - "success": "Success! You should see a reset password link in Gladys logs.", + "success": "Success! I sent you a reset password link by Telegram or Nextcloud Talk. If you haven't configured these services, the reset password link will be in Gladys logs.", + "howToAccessLogs": "To access Gladys logs, go to the command line and type `docker logs gladys --tail=1000` to display the last 1000 lines.", "userNotFound": "There is no account linked to this email.", "rateLimitError": "You have tried this form too many time. Please retry in 30 minutes or restart your Gladys instance now.", "invalidEmail": "We are unable to verify your email address.", @@ -2387,8 +2508,12 @@ "operations": "Operations", "upToDate": "Gladys is up to date", "newUpgradeAvailable": "New upgrade available", - "newUpgradeAvailableText": "Gladys will update itself automatically if you installed Gladys with the official Gladys Raspberry Pi OS image. If you installed Gladys manually, make sure you have watchtower running.", - "download": "Download", + "newUpgradeAvailableText": "Gladys will update automatically if you use Watchtower. If you want to update manually, click the button below. This will launch a Watchtower container that will update all containers present on this machine.", + "notConnectedToDocker": "Gladys is not connected to Docker. To access Docker from Gladys, you need to start Gladys with the correct volume `-v /var/run/docker.sock:/var/run/docker.sock`.", + "updateNow": "Update now", + "upgradeInProgress": "Upgrade in progress...", + "upgradeLogs": "Watchtower messages", + "websocketNotConnected": "WebSocket connection lost... Gladys is probably restarting. You can refresh this page to check if Gladys is back online.", "notAvailable": "Not available on custom install.", "containers": "Containers", "containerName": "Name", @@ -2406,10 +2531,11 @@ "numberOfHoursBeforeStateIsOutdated": "Time to expiry of a state", "numberOfHoursBeforeStateIsOutdatedDescription": "This delay corresponds to the number of hours before a sensor status is considered \"expired\" and therefore no longer displayed on the dashboard.", "hours": "hours", - "vacuumDatabaseTitle": "Database cleaning", - "vacuumDatabaseDescription": "By clicking on this button, Gladys will start cleaning the database to free up space. This does not delete any data, it just physically remove old deleted data. Be careful, this task can take some time to run, and during that time Gladys will not be available.", + "vacuumDatabaseTitle": "SQLite Database cleaning", + "vacuumDatabaseDescription": "By clicking on this button, Gladys will start cleaning the SQLite database to free up space. This does not delete any data, it just physically remove old deleted data. During the cleaning, Gladys will not be available.", "vacuumDatabaseButton": "Start database cleaning", "vacuumDatabaseStarted": "Database cleaning has started... Gladys will not be available until this job finishes.", + "vacuumDatabaseFinished": "Database cleaning has finished. Gladys is back online. Cleaning time: {{duration}}.", "containerState": { "created": "Created", "restarting": "Restarting", @@ -2469,7 +2595,8 @@ "duplicateSceneButton": "Duplicate", "invalidName": "Name is required", "invalidIcon": "Icon is required", - "sceneAlreadyExist": "A scene with that name already exist." + "sceneAlreadyExist": "A scene with that name already exist.", + "nameAfterCopy": "Copy of {{name}}" }, "scene": { "title": "Scenes", @@ -2748,6 +2875,16 @@ "heating": "Heat" } }, + "heater": { + "pilot-wire-mode": { + "comfort": "Comfort", + "eco": "Eco", + "off": "Off", + "frost-protection": "Frost Protection", + "comfort_-1": "Comfort -1°C", + "comfort_-2": "Comfort -2°C" + } + }, "siren": { "lmh_volume": { "low": "Low", @@ -2819,7 +2956,38 @@ "48": "Long press", "49": "Short release", "50": "Long release", - "51": "Double press" + "51": "Double press", + "52": "Toggle", + "53": "Toggle Hold", + "54": "Brightness Up Click", + "55": "Brightness Up Hold", + "56": "Brightness Up Release", + "57": "Brightness Down Click", + "58": "Brightness Down Hold", + "59": "Brightness Down Release", + "60": "Pressed", + "61": "Simple Left", + "62": "Simple Right", + "63": "Simple Both", + "64": "Double Left", + "65": "Double Right", + "66": "Double Both", + "67": "Triple Left", + "68": "Triple Right", + "69": "Triple Both", + "70": "Hold Left", + "71": "Hold Right", + "72": "Hold Both" + } + }, + "heater": { + "pilot-wire-mode": { + "0": "Off", + "1": "Frost Protection", + "2": "Eco", + "3": "Comfort -1°C", + "4": "Comfort -2°C", + "5": "Comfort" } }, "opening-sensor": { @@ -2857,6 +3025,13 @@ "one": "Yes" } }, + "input": { + "binary": { + "other": "No value received", + "zero": "Off", + "one": "On" + } + }, "risk": { "integer": { "no-risk": "No Risk", @@ -2906,6 +3081,10 @@ "shortCategoryName": "Presence sensor", "push": "Presence" }, + "rain-sensor": { + "shortCategoryName": "Rain sensor", + "binary": "Rain detection Yes/No" + }, "light-sensor": { "shortCategoryName": "Luminosity sensor", "integer": "Luminosity (integer)", @@ -2968,7 +3147,8 @@ }, "button": { "shortCategoryName": "Button", - "click": "Button (click)" + "click": "Button (click)", + "push": "Push button" }, "pressure-sensor": { "shortCategoryName": "Pressure sensor", @@ -3022,6 +3202,10 @@ "mode": "Mode", "target-temperature": "Temperature" }, + "heater": { + "shortCategoryName": "Heating", + "pilot-wire-mode": "Mode" + }, "tamper": { "shortCategoryName": "Tamper", "binary": "Tamper (yes/no)" @@ -3068,6 +3252,67 @@ "index": "Index", "daily-consumption": "Daily Consumption" }, + "teleinformation": { + "shortCategoryName": "Teleinformation", + "binary": "Switch", + "east": "Total active power delivered (EAST)", + "eait": "Total active power injected (EAIT)", + "easf01": "Total provider active power delivered (EASF01)", + "easf02": "Total provider active power delivered (EASF02)", + "easf03": "Total provider active power delivered (EASF03)", + "easf04": "Total provider active power delivered (EASF04)", + "easf05": "Total provider active power delivered (EASF05)", + "easf06": "Total provider active power delivered (EASF06)", + "easf07": "Total provider active power delivered (EASF07)", + "easf08": "Total provider active power delivered (EASF08)", + "easf09": "Total provider active power delivered (EASF09)", + "easf10": "Total provider active power delivered (EASF10)", + "pref": "Apparent power of reference (PREF)", + "pcoup": "Apparent power threshold (PCOUP)", + "vtic": "Protocol version (VTIC)", + "ccasn": "Current point of the active load curve drawn (CCASN)", + "ccasn_1": "Previous point of the active load curve drawn (CCASN-1)", + "umoy1": "Average RMS voltage (UMOY1)", + "umoy2": "Average RMS voltage (UMOY2)", + "umoy3": "Average RMS voltage (UMOY3)", + "erq1": "Total reactive power Q1 (ERQ1)", + "erq2": "Total reactive power Q2 (ERQ2)", + "erq3": "Total reactive power Q3 (ERQ3)", + "erq4": "Total reactive power Q4 (ERQ4)", + "irms1": "RMS current (IRMS1)", + "irms2": "RMS current (IRMS2)", + "irms3": "RMS current (IRMS3)", + "urms1": "RMS voltage (URMS1)", + "urms2": "RMS voltage (URMS2)", + "urms3": "RMS voltage (URMS3)", + "easd01": "Active energy withdrawn Distributor (EASD01)", + "easd02": "Active energy withdrawn Distributor (EASD02)", + "easd03": "Active energy withdrawn Distributor (EASD03)", + "easd04": "Active energy withdrawn Distributor (EASD04)", + "ntarf": "Tarif index number (NTARF)", + "ccain": "Point n of the withdrawn active load curve (CCAIN)", + "ccain_1": "Point n-1 of the withdrawn active load curve (CCAIN-1)", + "sinsti": "Instantaneous apparent power injected (SINSTI)", + "smaxin": "Apparent power max. injected n (SMAXIN)", + "smaxin_1": "Apparent power max. injected n-1 (SMAXIN-1)", + "smaxn": "Apparent power delivered peak (SMAXN)", + "smaxn2": "Apparent power delivered peak (SMAXN2)", + "smaxn3": "Apparent power delivered peak (SMAXN3)", + "sinsts": "Immediate apparent power delivered (SINSTS)", + "sinsts2": "Immediate apparent power delivered (SINSTS2)", + "sinsts3": "Immediate apparent power delivered (SINSTS3)", + "smaxn_1": "Apparent power max. draw-off n-1 (SMAXN-1)", + "smaxn2_1": "Apparent power max. draw-off n-1 (SMAXN2-1)", + "smaxn3_1": "Apparent power max. draw-off n-1 (SMAXN3-1)", + "hhphc": "HPHC Program (HHPHC)", + "imax": "RMS current peak (IMAX)", + "adps": "Subscribed Power Exceeded Warning (ADPS)", + "imax2": "RMS current peak (IMAX2)", + "imax3": "RMS current peak (IMAX3)", + "adir1": "Overcurrent alert (ADIR1)", + "adir2": "Overcurrent alert (ADIR2)", + "adir3": "Overcurrent alert (ADIR3)" + }, "volume-sensor": { "shortCategoryName": "Volume sensor", "decimal": "Volume (decimal)", @@ -3084,7 +3329,8 @@ }, "precipitation-sensor": { "shortCategoryName": "Precipitation sensor", - "decimal": "Precipitation" + "decimal": "Precipitation", + "integer": "Intensity (mV)" }, "uv-sensor": { "shortCategoryName": "UV Sensor", @@ -3159,6 +3405,10 @@ "shortCategoryName": "Risk", "integer": "Risk Level" }, + "input": { + "shortCategoryName": "Input", + "binary": "State of input" + }, "unknown": { "shortCategoryName": "Unknown", "unknown": "Unknown" diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json index fc5ea8c150..dd80800f01 100644 --- a/front/src/config/i18n/fr.json +++ b/front/src/config/i18n/fr.json @@ -247,6 +247,8 @@ "private": "privé", "public": "public" }, + "editDashboardAddColumnButton": "Ajouter une colonne au tableau de bord", + "editDashboardBoxNotEmpty": "Vous ne pouvez pas supprimer cette colonne car elle contient des widgets.", "editDashboardMyDashboards": "Mes tableaux de bords", "editDashboardExplanation": "Chaque tableau de bord comporte 3 colonnes, que vous pouvez remplir selon vos préférences. Cliquez sur le bouton + pour ajouter un nouveau widget. Vous pouvez déplacer ce widget en l'attrapant et en le déplaçant.", "reorderDashboardButton": "Re-ordonner", @@ -261,7 +263,7 @@ "humidity-in-room": "Humidité de la pièce", "user-presence": "Utilisateurs présents", "camera": "Caméra", - "devices-in-room": "Appareils de la pièce", + "devices-in-room": "Appareils de la pièce (Déprécié)", "devices": "Appareils", "chart": "Graphique", "ecowatt": "Ecowatt ( France )", @@ -296,11 +298,12 @@ "deviceTitle": "{{name}} - {{type}}", "addButton": "+", "substractButton": "-", - "motionDetected": "Mouvement détecté" + "motionDetected": "Mouvement détecté", + "pushButton": "Appuyer" }, "devices": { "editDeviceFeaturesLabel": "Vous pouvez modifier le nom affiché ici :", - "editNameLabel": "Nom du widget", + "editNameLabel": "Nom du widget (optionnel)", "editNamePlaceholder": "Entrez le nom du widget", "addADeviceLabel": "Ajouter un appareil :" }, @@ -345,6 +348,7 @@ "chart": { "defaultInterval": "Intervalle par défaut", "lastHour": "Dernière heure", + "lastTwelveHours": "Dernières 12h", "lastDay": "Dernières 24h", "lastSevenDays": "Derniers 7 jours", "lastThirtyDays": "Derniers 30 jours", @@ -352,6 +356,8 @@ "lastYear": "Dernière année", "noValue": "Pas de valeurs sur cet intervalle.", "noValueWarning": "Attention, si vous venez de configurer cet appareil, les données peuvent mettre un certain temps avant d'être agrégées. Pour les intervalles supérieurs à 24h, cela prend jusqu'à 24h le temps que Gladys collecte assez de données.", + "noChartType": "Aucun type de graphique sélectionné", + "noChartTypeWarning": "Si vous venez de configurer cet appareil, veuillez retourner sur la page d'édition de la box et sélectionner un type de graphique.", "editNameLabel": "Entrez le nom de cette box", "editNamePlaceholder": "Nom affiché sur le tableau de bord", "editDeviceFeaturesLabel": "Sélectionnez les appareils que vous voulez afficher", @@ -359,16 +365,22 @@ "chartType": "Sélectionner le type de graphique", "chartColor": "Sélectionner la couleur du graphique", "dataColor": "Sélectionner la couleur pour {{featureLabel}}", + "timelineColor": "Sélectionner la couleur pour la position ", "line": "Ligne", "area": "Aire", "bar": "Histogramme", + "timeline": "Binaire", "stepline": "Ligne droite", "displayAxes": "Afficher les axes ?", "displayVariation": "Afficher la variation ?", "yes": "Oui", "no": "Non", "preview": "Prévisualisation", - "showPreviewButton": "Afficher une prévisualisation" + "showPreviewButton": "Afficher une prévisualisation", + "on": "On", + "off": "Off", + "start_date": "Début le : ", + "end_date": "Fin le : " }, "ecowatt": { "title": "Ecowatt France", @@ -403,7 +415,7 @@ "no": "Non" }, "scene": { - "editNameLabel": "Entrez le nom de cette box", + "editNameLabel": "Nom du widget (optionnel)", "editNamePlaceholder": "Nom affiché sur le tableau de bord", "editSceneLabel": "Sélectionnez la scène que vous souhaitez afficher ici." }, @@ -569,7 +581,7 @@ "title": "Scanner de présence", "noConfigLabel": "La configuration n'est pas chargée, merci de réessayer.", "errorLabel": "Une erreur est survenue lors du chargement de la configuration.", - "presenceScannerDescription": "Le scanner de présence effectue un scan Bluetooth à interval régulier. Dès qu’un appareil est détecté, l'appareil est marqué comme \"présent\" dans Gladys. Dans les scènes, vous avez la possibilité de créer un déclencheur qui écoute sur cet état. Ainsi, vous pouvez facilement faire une scène qui vous met comme présent à la maison dès qu'un appareil bluetooth est détecté.", + "presenceScannerDescription": "Le scanner de présence effectue un scan Bluetooth à interval régulier. Dès qu'un appareil est détecté, l'appareil est marqué comme \"présent\" dans Gladys. Dans les scènes, vous avez la possibilité de créer un déclencheur qui écoute sur cet état. Ainsi, vous pouvez facilement faire une scène qui vous met comme présent à la maison dès qu'un appareil bluetooth est détecté.", "presenceScannerStatusLabel": "Activer ou désactiver l'analyse de présence d'appareils", "presenceScannerFrequencyLabel": "Fréquence de scan bluetooth", "presenceScannerFrequencyUnit": "minutes", @@ -606,6 +618,17 @@ "configurationSuccess": "Sauvegarde de la configuration du compte terminée.", "buttonSave": "Sauvegarder" }, + "free-mobile": { + "title": "Free Mobile", + "description": "Envoyer des sms depuis Gladys grâce à Free Mobile.", + "documentation": "Documentation Free Mobile", + "introduction": "Ce plugin vous permet d'envoyer des sms à votre portable Free via le service de notification proposé par Free. Entrez votre identifiant client et la clé d'identification ci-dessous que vous retrouverez sur le site FreeMobile.", + "username": "Identifiant client Free Mobile", + "key": "Clé d'identification au service", + "configurationError": "Nous n'avons pas pu sauvegarder cette configuration.", + "configurationSuccess": "Sauvegarde de la configuration du compte terminée.", + "saveButton": "Sauvegarder" + }, "philipsHue": { "title": "Philips Hue", "description": "Contrôler les lumières Philips Hue.", @@ -740,7 +763,7 @@ "clientIdPlaceholder": "client ID de My Apps dans Netatmo Connect", "clientSecretLabel": "Secret client", "clientSecretPlaceholder": "client secret de My Apps dans Netatmo Connect", - "connectionInfoLabel": "Lorsque vous modifiez ces informations, un nouveau jeton est requis. La déconnexion effacera également votre jeton d’accès. Une nouvelle demande de connexion sera donc faite à l'API Netatmo lorsque vous cliquerez sur ces boutons.", + "connectionInfoLabel": "Lorsque vous modifiez ces informations, un nouveau jeton est requis. La déconnexion effacera également votre jeton d'accès. Une nouvelle demande de connexion sera donc faite à l'API Netatmo lorsque vous cliquerez sur ces boutons.", "energyApiLabel": "Activer l'API \"Energy\" (récupérer les appareils Plug, Thermostat et Vannes Netatmo)", "weatherApiLabel": "Activer l'API \"Weather\" (récupérer les appareils de la station météo Netatmo)", "saveLabel": "Sauvegarder et connecter", @@ -1074,26 +1097,6 @@ "documentation": "Documentation OwnTracks", "longDescription": "OwnTracks est une application open-source disponible sur iOS et Android qui vous permet d'envoyer votre position GPS à un serveur distant. Il est possible d'utiliser OwnTracks avec Gladys pour déclencher des scènes selon votre position. Pour configurer OwnTracks, vous pouvez suivre ce tutoriel dans notre documentation." }, - "zwave": { - "title": "Open-Zwave [OLD]", - "description": "En fin de vie, il n'est plus possible de l'utiliser.", - "documentation": "Documentation Open-Zwave", - "device": { - "title": "Anciens appareils Open-Zwave", - "convertToMqtt": "Convertir en appareil MQTT", - "oldIntegrationWarning": "Cette intégration était basée sur Open-Zwave, une librairie qui n'est plus maintenue. Cette intégration est en fin de vie. Nous travaillons sur une nouvelle intégration basée sur Zwave-js-ui, mais en attendant il faut s'armer de patience, et utiliser Zwave-js-ui + Node-RED + Gladys.
Nous sommes à la recherche de testeurs/développeurs pour la nouvelle intégration sur ce sujet sur le forum :)", - "noDevices": "Aucun appareil Z-Wave n'a encore été ajouté.", - "scanButton": "Rechercher", - "nameLabel": "Nom", - "roomLabel": "Pièce", - "featuresLabel": "Fonctionnalités", - "saveButton": "Sauvegarder", - "deleteButton": "Supprimer", - "editButton": "Éditer", - "mostRecentValueAt": "Dernière valeur reçue {{mostRecentValueAt}}.", - "noValueReceived": "Aucune valeur reçue." - } - }, "openWeather": { "title": "API OpenWeather", "documentation": "Documentation OpenWeather", @@ -1247,6 +1250,41 @@ "conflictError": "L'appareil actuel est déjà dans Gladys." } }, + "airplay": { + "title": "Airplay", + "description": "Contrôler les appareils Airplay sur votre réseau local", + "deviceTab": "Appareils", + "discoverTab": "Découverte Airplay", + "setupTab": "Configuration", + "documentation": "Documentation Airplay", + "discoverDeviceDescr": "Scanner automatiquement les appareils Airplay", + "nameLabel": "Nom de l'appareil", + "namePlaceholder": "Entrez le nom de votre appareil", + "hostLabel": "Adresse IP", + "roomLabel": "Pièce", + "saveButton": "Sauvegarder", + "alreadyCreatedButton": "Déjà créé", + "deleteButton": "Supprimer", + "device": { + "title": "Appareils Airplay dans Gladys", + "editButton": "Éditer", + "noDeviceFound": "Aucun appareil Airplay trouvé.", + "featuresLabel": "Fonctionnalités" + }, + "discover": { + "title": "Appareils détectés sur votre réseau local", + "description": "Les appareils Airplay sont automatiquement découverts.", + "error": "Erreur de découverte des appareils Airplay. Est-ce que votre enceinte Airplay est sous tension et accessible sur le réseau local ?", + "noDeviceFound": "Aucun appareil Airplay n'a été découvert.", + "errorWhileScanning": "Une erreur est survenue lors du scan.", + "scan": "Scanner" + }, + "error": { + "defaultError": "Une erreur s'est produite lors de l'enregistrement de l'appareil.", + "defaultDeletionError": "Une erreur s'est produite lors de la suppression de l'appareil.", + "conflictError": "L'appareil actuel est déjà dans Gladys." + } + }, "zwavejs-ui": { "title": "ZWave JS UI", "description": "Contrôler vos appareils dans Z-Wave JS UI", @@ -1264,7 +1302,7 @@ "saveButton": "Sauvegarder", "alreadyCreatedButton": "Déjà créé", "deleteButton": "Supprimer", - "alphaWarning": "Cette intégration est une alpha et ne gère pour l'instant qu'un nombre limité d'appareils. Nous sommes preneur de toute aide pour intégrer d'autres appareils !", + "alphaWarning": "Cette intégration gère un nombre limité d'appareils Z-Wave, si tu as des appareils non-gérés, n'hésite pas à nous le soumettre pour qu'il soit ajouté !", "device": { "title": "Appareils Z-Wave JS UI dans Gladys", "editButton": "Editer", @@ -1388,6 +1426,13 @@ "notFound": "Appareil introuvable.", "backToList": "Retour à la liste des appareils", "saveError": "Erreur lors de l'enregistrement ou de la suppression de l'appareil", + "validationError": "Erreur de validation : L'appareil n'a pas été correctement rempli.", + "validationErrors": { + "name": "Le champ \"Nom\" est obligatoire", + "min": "Le champ \"Valeur minimum\" est obligatoire et doit être une valeur entière", + "max": "Le champ \"Valeur maximum\" est obligatoire et doit être une valeur entière", + "external_id": "Le champ \"ID Externe\" est obligatoire et doit être unique à travers tous les appareils" + }, "saveConflictError": "Conflit : êtes-vous sûr que tous les IDs externes sont uniques ?", "mostRecentValueAt": "Dernière valeur reçue {{mostRecentValueAt}}.", "noValueReceived": "Aucune valeur reçue." @@ -1614,13 +1659,15 @@ }, "lanManager": { "title": "LAN Manager", - "description": "Gérez les appareils sur votre réseau local.", + "description": "Détection de présence via scan réseau", "deviceTab": "Appareils", "discoverTab": "Découverte LAN", "setupTab": "Scanner de présence", "documentation": "Documentation LAN Manager", "device": { - "title": "Appareils LAN", + "title": "Appareils ajoutés à l'intégration", + "explanation": "Cette intégration vous permet de détecter la présence des utilisateurs en scannant le réseau.", + "iosWarning": "Attention, cette intégration ne fonctionne pas avec les appareils iOS.", "search": "Chercher un appareil", "noDevices": "Aucun appareil LAN n'a encore été ajouté.", "manufacturerLabel": "Constructeur", @@ -1642,7 +1689,7 @@ "title": "Scanner de présence", "errorLabel": "Une erreur est survenue lors du chargement de la configuration.", "noConfigLabel": "La configuration n'est pas chargée, merci de réessayer.", - "presenceScannerDescription": "Le scanner de présence effectue un scan sur le réseau à interval régulier. Dès qu’un appareil est détecté, l'appareil est marqué comme \"présent\" dans Gladys. Dans les scènes, vous avez la possibilité de créer un déclencheur qui écoute sur cet état. Ainsi, vous pouvez facilement faire une scène qui vous met comme présent à la maison dès qu'un appareil est détecté sur le réseau.", + "presenceScannerDescription": "Le scanner de présence effectue un scan sur le réseau à interval régulier. Dès qu'un appareil est détecté, l'appareil est marqué comme \"présent\" dans Gladys. Dans les scènes, vous avez la possibilité de créer un déclencheur qui écoute sur cet état. Ainsi, vous pouvez facilement faire une scène qui vous met comme présent à la maison dès qu'un appareil est détecté sur le réseau.", "presenceScannerStatusLabel": "Activer ou désactiver l'analyse de présence d'appareils", "presenceScannerFrequencyLabel": "Fréquence de scan", "presenceScannerFrequencyUnit": "minutes", @@ -1730,6 +1777,28 @@ "rateLimit": "L'API ChatGPT étant payante, cette intégration est actuellement limitée à 1 000 requêtes par mois et par compte.", "notOnGladysPlus": "L'API ChatGPT étant payante, cette intégration est proposée via Gladys Plus uniquement.", "subscribeToGladysPlus": "Cliquez-ici pour souscrire à Gladys Plus." + }, + "callmebot": { + "title": "CallMeBot", + "description": "Envoyez des messages via WhatsApp et Signal.", + "setupTab": "Configuration", + "documentation": "Documentation", + "setup": { + "title": "Configurer CallMeBot", + "description": "Pour utiliser CallMeBot, vous devez obtenir une clé API. Suivez ces étapes :
1. Allez sur le site web de CallMeBot
2. Choisissez votre plateforme de messagerie préférée (WhatsApp, Signal)
3. Suivez les instructions pour obtenir votre clé API
4. Entrez votre clé API ci-dessous
⚠️ Note : Ce service est unidirectionnel (Gladys peut envoyer des messages mais ne peut pas en recevoir) et ne supporte pas l'envoi d'images.", + "apiKeyLabel": "Clé API", + "apiKeyPlaceholder": "Entrez votre clé API CallMeBot", + "apiKeyHelp": "Votre clé API est utilisée pour s'authentifier auprès du service CallMeBot", + "messagingServiceLabel": "Service de messagerie", + "messagingServiceHelp": "Choisissez le service de messagerie que vous souhaitez utiliser avec CallMeBot", + "phoneNumberLabel": "Numéro de téléphone", + "phoneNumberPlaceholder": "Entrez votre numéro de téléphone", + "phoneNumberHelp": "Votre numéro de téléphone au format international (ex: +33612345678)", + "phoneNumberHelpSignal": "Pour Signal, ce sera un UUID fourni par CallMeBot (ex: 123e4567-e89b-12d3-a456-426614174000)", + "saveButton": "Sauvegarder la configuration", + "saved": "Configuration sauvegardée !", + "error": "Erreur lors de la sauvegarde de la configuration" + } } }, "editScene": { @@ -1752,7 +1821,9 @@ "addTriggerButton": "Ajouter déclencheur", "selectTriggerLabel": "Sélectionnez un type de déclencheur", "newAction": "Nouvelle action", + "newCondition": "Nouvelle condition", "selectActionType": "Sélectionnez un type d'action", + "selectConditionType": "Sélectionner un type de condition", "addActionButton": "Nouvelle action", "noTriggersYet": "Aucun déclencheur n'a encore été ajouté. Il n'est pas obligatoire d'avoir un déclencheur dans une scène.", "noActionsYet": "Aucune action n'a encore été ajoutée. Cliquez sur le bouton + pour ajouter une action à cette scène.", @@ -1782,6 +1853,19 @@ "textPlaceholder": "Texte du message", "explanationText": "Pour injecter une variable, tapez '{{'. Attention, vous devez avoir défini une variable auparavant dans une action 'Récupérer le dernier état' placé avant ce bloc message." }, + "askAi": { + "description": "Cette action enverra un message à l'IA (ChatGPT) via Gladys Plus et vous répondra par message. Si vous joignez une image de caméra, l'IA pourra voir ce qu'il y a sur l'image et même faire une action en conséquence.", + "userLabel": "Gladys répondra à", + "cameraLabel": "Joindre une image de caméra (optionnel)", + "textLabel": "Ma question pour l'IA", + "textPlaceholder": "Texte du message", + "explanationText": "Pour injecter une variable, tapez '{{'. Attention, vous devez avoir défini une variable auparavant dans une action 'Récupérer le dernier état' placé avant ce bloc message." + }, + "smsSend": { + "textLabel": "Message", + "explanationText": "Pour injecter une variable, tapez '{{'. Attention, vous devez avoir défini une variable auparavant dans une action 'Récupérer le dernier état' placé avant ce bloc message.", + "messagePlaceholder": "Mon message" + }, "turnOnLights": { "label": "Sélectionnez les lumières que vous souhaitez allumer" }, @@ -1838,6 +1922,23 @@ "orButton": "+ OU", "explanationText": "Dans le champs valeur, entrez soit une valeur brute soit un calcul basé sur une variable de scène. Pour injecter une variable, tapez '{{'. Attention, vous devez avoir défini une variable auparavant dans une action 'Récupérer le dernier état' placé avant ce bloc condition." }, + "conditionIfThenElse": { + "conditions": "Conditions", + "conditionDescription": "Si toutes les conditions sont réalisées, les actions du bloc \"Alors...\" seront exécutées. Sinon, les actions du bloc \"Sinon...\" seront exécutées.", + "noCondition": "Aucune condition ajoutée. Cliquez sur le bouton '+' pour ajouter une condition à ce bloc", + "addCondition": "Ajouter une condition", + "if": "Si", + "then": "Alors", + "else": "Sinon", + "shortIf": "S", + "shortThen": "A", + "shortElse": "S", + "actionCount": { + "zero": "Aucune action", + "one": "1 action", + "other": "{{count}} actions" + } + }, "checkTime": { "description": "La scène continuera si l'heure actuelle est comprise entre les bornes spécifiées, aux jours spécifiés. Si une condition est vide, elle ne sera pas prise en compte.", "beforeLabel": "Avant", @@ -1938,10 +2039,18 @@ "variablesExplanation": "Pour injecter une variable, tapez '{{ '. Attention, vous devez avoir défini une variable auparavant dans une action 'Récupérer le dernier état' placé avant ce bloc message.", "messagePlaceholder": "Mon message" }, + "zigbee2mqttMessage": { + "topic": "Topic", + "topicPlaceholder": "/gladys/my-topic", + "messageLabel": "Message", + "variablesExplanation": "Pour injecter une variable, tapez '{{ '. Attention, vous devez avoir défini une variable auparavant dans une action 'Récupérer le dernier état' placé avant ce bloc message.", + "messagePlaceholder": "Mon message" + }, "playNotification": { "description": "Cette action fera parler Gladys sur l'enceinte sélectionnée.", "needGladysPlus": "Nécessite Gladys Plus car les API de \"Text To Speech\" sont payantes.", "deviceLabel": "Enceinte", + "volumeLabel": "Volume", "textLabel": "Message à dire sur l'enceinte", "variablesExplanation": "Pour injecter une variable, tapez '{{ '. Attention, vous devez avoir défini une variable auparavant dans une action 'Récupérer le dernier état' placé avant ce bloc message." } @@ -1958,6 +2067,9 @@ "send": "Envoyer un message", "send-camera": "Envoyer une image de caméra" }, + "sms": { + "send": "Envoyer un sms" + }, "delay": "Attendre", "light": { "turn-on": "Allumer les lumières", @@ -1978,8 +2090,9 @@ "stop": "Arrêter le service" }, "condition": { - "only-continue-if": "Continuer seulement si", - "check-time": "Condition temporelle" + "only-continue-if": "Condition sur variables", + "check-time": "Condition temporelle", + "if-then-else": "Condition \"Si... Alors... Sinon...\"" }, "user": { "set-seen-at-home": "Utilisateur vu à la maison", @@ -2006,8 +2119,14 @@ "mqtt": { "send": "Envoyer un message MQTT" }, + "zigbee2mqtt": { + "send": "Envoyer un message Zigbee2mqtt" + }, "music": { "play-notification": "Parler sur une enceinte" + }, + "ai": { + "ask": "Demander à l'IA" } }, "variables": { @@ -2075,7 +2194,8 @@ "on": "On", "off": "Off", "deviceSeen": "Si l'appareil est détecté", - "onlyExecuteAtThreshold": "Exécuter seulement lorsque le seuil est passé ( et non pas à chaque valeur envoyée )" + "onlyExecuteAtThreshold": "Exécuter seulement lorsque le seuil est passé ( et non pas à chaque valeur envoyée )", + "activateOrDeactivateForDuration": "Exécuter la scène après que la condition ait été valide pendant : " }, "scheduledTrigger": { "typeLabel": "Type", @@ -2317,7 +2437,8 @@ "wrongEmailError": "Ce n'est pas un e-mail valide", "networkError": "Erreur réseau : nous n'avons pas réussi à contacter votre instance Gladys. Êtes-vous connecté au réseau ? Votre instance Gladys est-elle en cours d'exécution ?", "unknownError": "Une erreur inconnue s'est produite. Veuillez réessayer ou poster un message sur Gladys community.", - "success": "Succès ! Vous devriez voir un lien de réinitialisation de mot de passe dans les logs de Gladys.", + "success": "Succès ! Je vous ai envoyé un lien de réinitialisation de mot de passe par Telegram ou Nextcloud Talk. Si vous n'avez pas configuré ces services, le lien de réinitialisation sera dans les logs de Gladys.", + "howToAccessLogs": "Pour accéder aux logs de Gladys, rendez-vous en ligne de commande et tapez `docker logs gladys --tail=1000` pour afficher les 1000 dernières lignes.", "userNotFound": "Aucun compte n'est lié à cet e-mail.", "rateLimitError": "Vous avez essayé ce formulaire trop de fois. Veuillez réessayer dans 30 minutes ou redémarrer votre instance Gladys maintenant.", "invalidEmail": "Nous n'avons pas pu vérifier votre adresse e-mail.", @@ -2387,8 +2508,12 @@ "operations": "Opérations", "upToDate": "Gladys est à jour", "newUpgradeAvailable": "Mise à jour disponible", - "newUpgradeAvailableText": "Gladys se mettra à jour automatiquement si vous utilisez l'image Raspberry Pi OS Gladys officielle. Pour une installation manuellle, vous devez avoir configuré Watchtower pour que Gladys Assistant se mette à jour.", - "download": "Télécharger", + "newUpgradeAvailableText": "Gladys se mettra à jour automatiquement si vous utilisez Watchtower. Si vous voulez mettre à jour manuellement, cliquez sur le bouton ci-dessous. Cela lancera un container Watchtower qui mettra à jour tous les containers présents sur cette machine.", + "notConnectedToDocker": "Gladys n'est pas connectée à Docker. Pour avoir accès à Docker depuis Gladys, il faut lancer Gladys avec le bon volume `-v /var/run/docker.sock:/var/run/docker.sock`.", + "updateNow": "Mettre à jour maintenant", + "upgradeInProgress": "Mise à jour en cours...", + "upgradeLogs": "Messages de Watchtower", + "websocketNotConnected": "Connexion Websocket perdue... Gladys est probablement en cours de redémarrage. Vous pouvez rafraichir cette page pour vérifier si Gladys est de nouveau accessible.", "notAvailable": "Indisponible sur l'installation personnalisée.", "containers": "Conteneurs", "containerName": "Nom", @@ -2406,10 +2531,11 @@ "numberOfHoursBeforeStateIsOutdated": "Délai avant expiration d'un état", "numberOfHoursBeforeStateIsOutdatedDescription": "Ce délai correspond au nombre d'heures avant qu'un état de capteur soit considéré comme \"périmé\" et ainsi plus affiché sur le tableau de bord.", "hours": "heures", - "vacuumDatabaseTitle": "Nettoyer la base de données", - "vacuumDatabaseDescription": "En cliquant sur ce bouton, Gladys lancera un nettoyage de la base de données, ce qui libère de l'espace disque. Cette tâche ne supprime pas de données, elle réarrange juste la donnée existante sur le disque et vide des vieilles lignes qui ne sont plus utilisées. Attention, cette opération peut prendre un certain temps sur les grosses bases de données, et pendant ce temps Gladys sera indisponible. Ne lancez pas cette commande si vous avez besoin de Gladys dans la prochaine heure.", + "vacuumDatabaseTitle": "Nettoyer la base de données SQLite", + "vacuumDatabaseDescription": "En cliquant sur ce bouton, Gladys lancera un nettoyage de la base de données SQLite, ce qui libère de l'espace disque. Cette tâche ne supprime pas de données, elle réarrange juste la donnée existante sur le disque et vide des vieilles lignes qui ne sont plus utilisées. Pendant le nettoyage, Gladys sera indisponible.", "vacuumDatabaseButton": "Lancer le nettoyage", "vacuumDatabaseStarted": "Le nettoyage a commencé... Gladys sera indisponible jusqu'à la fin du nettoyage.", + "vacuumDatabaseFinished": "Le nettoyage a terminé. Gladys est de nouveau disponible. Temps de nettoyage : {{duration}}.", "containerState": { "created": "Créé", "restarting": "Redémarrage", @@ -2469,7 +2595,8 @@ "duplicateSceneButton": "Dupliquer", "invalidName": "Le nom est requis", "invalidIcon": "L'icône est requise", - "sceneAlreadyExist": "Une scène avec le même nom existe déjà." + "sceneAlreadyExist": "Une scène avec le même nom existe déjà.", + "nameAfterCopy": "Copie de {{name}}" }, "scene": { "title": "Scènes", @@ -2521,7 +2648,7 @@ "emailLabel": "Adresse e-mail", "emailPlaceholder": "Entrez votre e-mail", "passwordLabel": "Mot de passe", - "forgotPasswordLabel": "J’ai oublié mon mot de passe", + "forgotPasswordLabel": "J'ai oublié mon mot de passe", "passwordPlaceholder": "Entrez votre mot de passe", "loginButtonText": "Connexion", "wrongCredentials": "E-mail / mot de passe incorrect.", @@ -2748,6 +2875,16 @@ "heating": "Chauffage" } }, + "heater": { + "pilot-wire-mode": { + "comfort": "Confort", + "eco": "Eco", + "off": "Off", + "frost-protection": "Hors Gel", + "comfort_-1": "Confort -1°C", + "comfort_-2": "Confort -2°C" + } + }, "siren": { "lmh_volume": { "low": "Faible", @@ -2819,7 +2956,38 @@ "48": "Pression longue", "49": "Relâchement court", "50": "Relâchement long", - "51": "Pression double" + "51": "Pression double", + "52": "Bouton Bascule", + "53": "Bouton Bascule maintenu", + "54": "Luminosité Plus Clic", + "55": "Luminosité Plus Maintenu", + "56": "Luminosité Plus Relâchée", + "57": "Luminosité Moins Clic", + "58": "Luminosité Moins Maintenu", + "59": "Luminosité Moins Relâchée", + "60": "Pressé", + "61": "Simple Gauche", + "62": "Simple Droit", + "63": "Simple sur les deux", + "64": "Double Gauche", + "65": "Double Droit", + "66": "Double sur les deux", + "67": "Triple Gauche", + "68": "Triple Droit", + "69": "Triple sur les deux", + "70": "Maintenu Gauche", + "71": "Maintenu Droit", + "72": "Maintenu sur les deux" + } + }, + "heater": { + "pilot-wire-mode": { + "0": "Off", + "1": "Hors Gel", + "2": "Eco", + "3": "Confort -1°C", + "4": "Confort -2°C", + "5": "Confort" } }, "opening-sensor": { @@ -2857,6 +3025,13 @@ "one": "Oui" } }, + "input": { + "binary": { + "other": "Aucune valeur reçue", + "zero": "Off", + "one": "On" + } + }, "risk": { "integer": { "no-risk": "Pas de risque", @@ -2906,6 +3081,10 @@ "shortCategoryName": "Détecteur de présence", "push": "Présence" }, + "rain-sensor": { + "shortCategoryName": "Détecteur de pluie", + "binary": "Détection pluie Oui/Non" + }, "light-sensor": { "shortCategoryName": "Capteur de luminosité", "integer": "Luminosité entière", @@ -2968,7 +3147,8 @@ }, "button": { "shortCategoryName": "Bouton", - "click": "Clic bouton" + "click": "Clic bouton", + "push": "Bouton poussoir" }, "pressure-sensor": { "shortCategoryName": "Capteur de pression", @@ -3022,6 +3202,10 @@ "mode": "Mode", "target-temperature": "Température" }, + "heater": { + "shortCategoryName": "Chauffage", + "pilot-wire-mode": "Mode" + }, "tamper": { "shortCategoryName": "Détecteur de sabotage", "binary": "Détection sabotage (Oui/Non)" @@ -3068,6 +3252,67 @@ "index": "Index", "daily-consumption": "Consommation journalière" }, + "teleinformation": { + "shortCategoryName": "Téléinformation", + "binary": "Relais", + "east": "Energie active soutirée totale (EAST)", + "eait": "Energie active injectée totale (EAIT)", + "easf01": "Energie active soutirée fournisseur (EASF01)", + "easf02": "Energie active soutirée fournisseur (EASF02)", + "easf03": "Energie active soutirée fournisseur (EASF03)", + "easf04": "Energie active soutirée fournisseur (EASF04)", + "easf05": "Energie active soutirée fournisseur (EASF05)", + "easf06": "Energie active soutirée fournisseur (EASF06)", + "easf07": "Energie active soutirée fournisseur (EASF07)", + "easf08": "Energie active soutirée fournisseur (EASF08)", + "easf09": "Energie active soutirée fournisseur (EASF09)", + "easf10": "Energie active soutirée fournisseur (EASF10)", + "pref": "Puissance apparente référence (PREF)", + "pcoup": "Puissance apparente coupure (PCOUP)", + "vtic": "Version du protocole (VTIC)", + "ccasn": "Position de la courbe charge active (CCASN)", + "ccasn_1": "Position de la courbe charge active (CCASN-1)", + "umoy1": "Tension moyenne (UMOY1)", + "umoy2": "Tension moyenne (UMOY2)", + "umoy3": "Tension moyenne (UMOY3)", + "erq1": "Energie réactive Q1 totale (ERQ1)", + "erq2": "Energie réactive Q2 totale (ERQ2)", + "erq3": "Energie réactive Q3 totale (ERQ3)", + "erq4": "Energie réactive Q4 totale (ERQ4)", + "irms1": "Courant efficace (IRMS1)", + "irms2": "Courant efficace (IRMS2)", + "irms3": "Courant efficace (IRMS3)", + "urms1": "Tension efficace (URMS1)", + "urms2": "Tension efficace (URMS2)", + "urms3": "Tension efficace (URMS3)", + "easd01": "Energie active soutirée distributeur (EASD01)", + "easd02": "Energie active soutirée distributeur (EASD02)", + "easd03": "Energie active soutirée distributeur (EASD03)", + "easd04": "Energie active soutirée distributeur (EASD04)", + "ntarf": "Numéro d'indice tarifaire (NTARF)", + "ccain": "Point n de la courbe de charge active injectée (CCAIN)", + "ccain_1": "Point n-1 de la courbe de charge active injectée (CCAIN-1)", + "sinsti": "Puissance apparente instantanée injectée (SINSTI)", + "smaxin": "Puissance apparente max. injectée n (SMAXIN)", + "smaxin_1": "Puissance apparente max. injectée n-1 (SMAXIN-1)", + "smaxn": "Puissance apparente max. soutirée (SMAXN)", + "smaxn2": "Puissance apparente max. soutirée (SMAXN2)", + "smaxn3": "Puissance apparente max. soutirée (SMAXN3)", + "sinsts": "Puissance apparente instantanée soutirée (SINSTS)", + "sinsts2": "Puissance apparente instantanée soutirée (SINSTS2)", + "sinsts3": "Puissance apparente instantanée soutirée (SINSTS3)", + "smaxn_1": "Puissance apparente max. soutirée n-1 (SMAXN-1)", + "smaxn2_1": "Puissance apparente max. soutirée n-1 (SMAXN2-1)", + "smaxn3_1": "Puissance apparente max. soutirée n-1 (SMAXN3-1)", + "hhphc": "Programme HPHC (HHPHC)", + "imax": "Intensité maximale (IMAX)", + "adps": "Alerte dépassement puissance souscrite (ADPS)", + "imax2": "Intensité maximale (IMAX2)", + "imax3": "Intensité maximale (IMAX3)", + "adir1": "Alerte de surcourant (ADIR1)", + "adir2": "Alerte de surcourant (ADIR2)", + "adir3": "Alerte de surcourant (ADIR3)" + }, "volume-sensor": { "shortCategoryName": "Capteur de volume", "decimal": "Volume (décimale)", @@ -3084,7 +3329,8 @@ }, "precipitation-sensor": { "shortCategoryName": "Capteur de précipitations", - "decimal": "Précipitation" + "decimal": "Précipitation", + "integer": "Intensité (mV)" }, "uv-sensor": { "shortCategoryName": "Capteur d'UV", @@ -3159,6 +3405,10 @@ "shortCategoryName": "Risque", "integer": "Niveau de risque" }, + "input": { + "shortCategoryName": "Entrée", + "binary": "Etat de l'entrée" + }, "unknown": { "shortCategoryName": "Inconnu", "unknown": "Inconnu" diff --git a/front/src/config/integrations/communications.json b/front/src/config/integrations/communications.json index ea2b3cd5af..60439b621b 100644 --- a/front/src/config/integrations/communications.json +++ b/front/src/config/integrations/communications.json @@ -22,5 +22,14 @@ { "key": "openai", "img": "/assets/integrations/cover/openai.jpg" + }, + { + "key": "free-mobile", + "link": "free-mobile", + "img": "/assets/integrations/cover/free-mobile.jpg" + }, + { + "key": "callmebot", + "img": "/assets/integrations/cover/callmebot.jpg" } ] diff --git a/front/src/config/integrations/devices.json b/front/src/config/integrations/devices.json index 945a3b34f0..16fb313d8b 100644 --- a/front/src/config/integrations/devices.json +++ b/front/src/config/integrations/devices.json @@ -1,8 +1,4 @@ [ - { - "key": "zwave", - "img": "/assets/integrations/cover/zwave.jpg" - }, { "key": "rtspCamera", "link": "rtsp-camera", @@ -93,5 +89,10 @@ "key": "google-cast", "link": "google-cast", "img": "/assets/integrations/cover/google-cast.jpg" + }, + { + "key": "airplay", + "link": "airplay", + "img": "/assets/integrations/cover/airplay.jpg" } ] diff --git a/front/src/routes/calendar/index.js b/front/src/routes/calendar/index.js index 24c49b660c..ec497a2c2d 100644 --- a/front/src/routes/calendar/index.js +++ b/front/src/routes/calendar/index.js @@ -14,21 +14,14 @@ const localizer = dayjsLocalizer(dayjs); class Map extends Component { onRangeChange = range => { let from, to; - if (Array.isArray(range)) { - from = dayjs(range[0]) - .subtract(7, 'day') - .toDate(); + from = dayjs(range[0]).toDate(); to = dayjs(range[range.length - 1]) - .add(7, 'day') + .add(1, 'day') .toDate(); } else { - from = dayjs(range.start) - .subtract(7, 'day') - .toDate(); - to = dayjs(range.end) - .add(7, 'day') - .toDate(); + from = dayjs(range.start).toDate(); + to = dayjs(range.end).toDate(); } this.props.getEventsInRange(from, to); }; @@ -41,17 +34,48 @@ class Map extends Component { } }; + onViewChange = newView => { + localStorage.setItem('calendar_last_view', newView); + }; + componentWillMount() { dayjs.locale(this.props.user.language); - const from = dayjs() + let from = dayjs() .startOf('week') - .subtract(7, 'day') + .subtract(1, 'day') .toDate(); - const to = dayjs() + let to = dayjs() .endOf('week') - .add(7, 'day') + .add(1, 'day') .toDate(); + + switch (localStorage.getItem('calendar_last_view')) { + case 'month': + from = dayjs() + .startOf('month') + .subtract(7, 'day') + .toDate(); + to = dayjs() + .endOf('month') + .add(7, 'day') + .toDate(); + break; + case 'day': + from = dayjs() + .subtract(1, 'day') + .toDate(); + to = dayjs() + .add(1, 'day') + .toDate(); + break; + case 'agenda': + from = dayjs().toDate(); + to = dayjs() + .add(1, 'month') + .toDate(); + break; + } this.props.getEventsInRange(from, to); } @@ -79,7 +103,8 @@ class Map extends Component { }} popup onRangeChange={this.onRangeChange} - defaultView="week" + defaultView={localStorage.getItem('calendar_last_view') || 'week'} + onView={this.onViewChange} culture={props.user.language} messages={this.props.intl.dictionary.calendar} scrollToTime={dayjs() diff --git a/front/src/routes/dashboard/BoxColumns.jsx b/front/src/routes/dashboard/BoxColumns.jsx index d14de80371..18bfbcc74c 100644 --- a/front/src/routes/dashboard/BoxColumns.jsx +++ b/front/src/routes/dashboard/BoxColumns.jsx @@ -2,23 +2,28 @@ import Box from './Box'; import cx from 'classnames'; import style from './style.css'; -const BoxColumns = ({ children, ...props }) => ( -
-
-
- );
-};
+ );
+ }
+}
export default Header;
diff --git a/front/src/components/router/ScrollToTopLink.jsx b/front/src/components/router/ScrollToTopLink.jsx
new file mode 100644
index 0000000000..0b2f99d75c
--- /dev/null
+++ b/front/src/components/router/ScrollToTopLink.jsx
@@ -0,0 +1,23 @@
+import { Link } from 'preact-router/match';
+
+// By default, Preact-router is not scrolling to the top when clicking on a link.
+// This component is used to scroll to the top when clicking on a link.
+// See : https://github.com/preactjs/preact-router/issues/319
+const ScrollToTopLink = ({ children, ...props }) => {
+ const handleClick = e => {
+ // Call the original onClick if it exists
+ if (props.onClick) {
+ props.onClick(e);
+ }
+ // Scroll to top
+ window.scrollTo(0, 0);
+ };
+
+ return (
+
+ {children}
+
+ );
+};
+
+export default ScrollToTopLink;
diff --git a/front/src/components/scene/TextWithVariablesInjected.jsx b/front/src/components/scene/TextWithVariablesInjected.jsx
index a3d7289070..bd70e25dcc 100644
--- a/front/src/components/scene/TextWithVariablesInjected.jsx
+++ b/front/src/components/scene/TextWithVariablesInjected.jsx
@@ -3,6 +3,9 @@ import Tagify from '@yaireo/tagify';
import '@yaireo/tagify/dist/tagify.css';
import get from 'get-value';
+import withIntlAsProp from '../../utils/withIntlAsProp';
+import { isVariableAvailableAtThisPath, convertPathToText } from '../../routes/scene/edit-scene/sceneUtils';
+
const OPENING_VARIABLE = '{{';
const CLOSING_VARIABLE = '}}';
@@ -34,34 +37,35 @@ class TextWithVariablesInjected extends Component {
this.parseText(text);
});
};
+
refreshVariables = async nextProps => {
const variableWhileList = [];
let variablesKey = '';
let variableReady = null;
- // Action variables
- nextProps.actionsGroupsBefore.forEach((actionGroup, groupIndex) => {
- actionGroup.forEach((action, index) => {
- if (nextProps.variables[groupIndex][index]) {
- nextProps.variables[groupIndex][index].forEach(option => {
- if (option.ready && variableReady === null) {
- variableReady = true;
- }
- if (!option.ready) {
- variableReady = false;
- }
- // we create a "variablesKey" string to quickly compare the variables displayed
- // instead of having to loop through 2 arrays. It's quicker :)
- variablesKey += `${groupIndex}.${index}.${option.name}.${option.label}.${option.ready}`;
- variableWhileList.push({
- id: `${groupIndex}.${index}.${option.name}`,
- text: `${groupIndex + 1}. ${index + 1}. ${option.label}`,
- title: `${groupIndex + 1}. ${index + 1}. ${option.label}`,
- value: `${groupIndex}.${index}.${option.name}`
- });
+
+ Object.keys(nextProps.variables).forEach(variablePath => {
+ // If the variable is defined before the current path, we can use it
+ if (isVariableAvailableAtThisPath(variablePath, nextProps.path)) {
+ nextProps.variables[variablePath].forEach(option => {
+ if (option.ready && variableReady === null) {
+ variableReady = true;
+ }
+ if (!option.ready) {
+ variableReady = false;
+ }
+ // we create a "variablesKey" string to quickly compare the variables displayed
+ // instead of having to loop through 2 arrays. It's quicker :)
+ variablesKey += `${variablePath}.${option.name}.${option.label}.${option.ready}`;
+ variableWhileList.push({
+ id: `${variablePath}.${option.name}`,
+ text: `${convertPathToText(variablePath, nextProps.intl.dictionary)} ${option.label}`,
+ title: `${convertPathToText(variablePath, nextProps.intl.dictionary)} ${option.label}`,
+ value: `${variablePath}.${option.name}`
});
- }
- });
+ });
+ }
});
+
// Triggers variables
nextProps.triggersVariables.forEach((triggerVariables, index) => {
triggerVariables.forEach(triggerVariable => {
@@ -151,4 +155,4 @@ class TextWithVariablesInjected extends Component {
}
}
-export default TextWithVariablesInjected;
+export default withIntlAsProp(TextWithVariablesInjected);
diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index f84890ac03..1dd04751a0 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -247,6 +247,8 @@
"private": "privat",
"public": "öffentlich"
},
+ "editDashboardAddColumnButton": "Eine Spalte zum Dashboard hinzufügen",
+ "editDashboardBoxNotEmpty": "Sie können diese Spalte nicht löschen, da sie Widgets enthält.",
"editDashboardMyDashboards": "Meine Dashboards",
"editDashboardExplanation": "Jedes Dashboard hat 3 Spalten, die du nach Belieben füllen kannst. Klicke auf \"+\", um ein neues Widget hinzuzufügen. Du kannst dieses Widget bewegen, indem du es greifst und verschiebst.",
"reorderDashboardButton": "Dashboards neu anordnen",
@@ -261,7 +263,7 @@
"humidity-in-room": "Luftfeuchtigkeit im Raum",
"user-presence": "Anwesenheit von Benutzern",
"camera": "Kamera",
- "devices-in-room": "Geräte im Raum",
+ "devices-in-room": "Geräte im Raum (Veraltet)",
"devices": "Geräte",
"chart": "Diagramm",
"ecowatt": "Ecowatt (Frankreich)",
@@ -296,11 +298,12 @@
"deviceTitle": "{{name}} - {{type}}",
"addButton": "+",
"substractButton": "-",
- "motionDetected": "Bewegung erkannt"
+ "motionDetected": "Bewegung erkannt",
+ "pushButton": "Schieben"
},
"devices": {
"editDeviceFeaturesLabel": "Wähle die Geräte aus, die du anzeigen möchtest:",
- "editNameLabel": "Widget-Name",
+ "editNameLabel": "Widget-Name (optional)",
"editNamePlaceholder": "Gib den Namen des Widgets ein",
"addADeviceLabel": "Füge ein Gerät hinzu:"
},
@@ -345,6 +348,7 @@
"chart": {
"defaultInterval": "Standardintervall",
"lastHour": "Letzte Stunde",
+ "lastTwelveHours": "Letzte 12 Stunden",
"lastDay": "Letzte 24 Stunden",
"lastSevenDays": "Letzte 7 Tage",
"lastThirtyDays": "Letzte 30 Tage",
@@ -352,6 +356,8 @@
"lastYear": "Letztes Jahr",
"noValue": "Keine Werte in diesem Intervall aufgezeichnet.",
"noValueWarning": "Warnung: Wenn du dieses Gerät gerade konfiguriert hast, kann es einige Zeit dauern, bis hier etwas angezeigt wird: Gladys benötigt etwas Zeit, um genügend Daten zu sammeln. Bei Intervallen über 24 Stunden kann es bis zu 24 Stunden dauern, bis hier etwas angezeigt wird.",
+ "noChartType": "Kein Diagrammtyp ausgewählt",
+ "noChartTypeWarning": "Wenn du dieses Gerät gerade konfiguriert hast, bitte gehe zurück zur Seite der Box-Bearbeitung und wähle einen Diagrammtyp aus.",
"editNameLabel": "Gib den Namen dieser Box ein",
"editDeviceFeaturesLabel": "Wähle das Gerät aus, das hier angezeigt werden soll",
"editRoomLabel": "Wähle den Raum aus, der hier angezeigt werden soll",
@@ -359,16 +365,22 @@
"chartType": "Wähle den Diagrammtyp aus, der angezeigt werden soll",
"chartColor": "Wählen Sie die Farbe des Diagramms aus",
"dataColor": "Wählen Sie die Farbe für {{featureLabel}}",
+ "timelineColor": "Farbe für Position auswählen",
"line": "Linie",
"area": "Fläche",
"bar": "Balken",
+ "timeline": "Binär",
"stepline": "Schrittleitung",
"displayAxes": "Achsen anzeigen?",
"displayVariation": "Variation anzeigen?",
"yes": "Ja",
"no": "Nein",
"preview": "Vorschau",
- "showPreviewButton": "Vorschau anzeigen"
+ "showPreviewButton": "Vorschau anzeigen",
+ "on": "An",
+ "off": "Aus",
+ "start_date": "Startdatum: ",
+ "end_date": "Enddatum: "
},
"ecowatt": {
"title": "Ecowatt France",
@@ -403,7 +415,7 @@
"no": "Nein"
},
"scene": {
- "editNameLabel": "Gib den Namen dieser Box ein",
+ "editNameLabel": "Widget-Name (optional)",
"editNamePlaceholder": "Name auf dem Dashboard angezeigt",
"editSceneLabel": "Wähle die Szene aus, die hier angezeigt werden soll."
},
@@ -478,6 +490,17 @@
"configurationSuccess": "Konfiguration erfolgreich gesichert.",
"buttonSave": "Sichern"
},
+ "free-mobile": {
+ "title": "Free Mobile",
+ "description": "SMS von Gladys über Free Mobile senden.",
+ "documentation": "Free Mobile Dokumentation",
+ "introduction": "Dieses Plugin ermöglicht es Ihnen, SMS an Ihr Free-Handy über den Benachrichtigungsdienst von Free zu senden. Geben Sie Ihre Kundennummer und den Identifizierungsschlüssel unten ein, den Sie auf der FreeMobile-Website finden.",
+ "username": "Free Mobile Kundennummer",
+ "key": "Identifizierungsschlüssel für den Dienst",
+ "configurationError": "Wir konnten diese Konfiguration nicht speichern.",
+ "configurationSuccess": "Die Kontokonfiguration wurde erfolgreich gespeichert.",
+ "saveButton": "Sichern"
+ },
"philipsHue": {
"title": "Philips Hue",
"description": "Steuere Philips-Hue-Lichter und -Steckdosen mit der offiziellen Bridge.",
@@ -946,26 +969,6 @@
"documentation": "OwnTracks-Dokumentation",
"longDescription": "OwnTracks ist eine Open-Source-App für iOS und Android, die es dir ermöglicht, deinen Geolokalisierung an einen Server zu senden. Du kannst OwnTracks verwenden, um Szenen basierend auf deinen Standort auszulösen. Um OwnTracks mit Gladys zu konfigurieren, folge dem Tutorial in unserer Dokumentation."
},
- "zwave": {
- "title": "Open-Zwave [ALT]",
- "description": "Diese Integration ist veraltet; wir migrieren zu zwave-js-ui.",
- "documentation": "Open-Zwave-Dokumentation",
- "device": {
- "title": "Legacy Open-Zwave-Geräte",
- "convertToMqtt": "In MQTT-Gerät konvertieren",
- "oldIntegrationWarning": "Diese Integration basierte auf Open-Zwave und ist jetzt VERALTET. Wir migrieren zu Zwave-js-ui, aber in der Zwischenzeit empfehlen wir dir, Node-RED + Zwave-js-ui + Gladys zu verwenden.
-
- Wenn du uns bei der Entwicklung dieser Integration helfen möchtest, schließe dich unserer Community an!", - "noDevices": "Noch keine Z-Wave-Geräte hinzugefügt.", - "scanButton": "Scannen", - "nameLabel": "Name", - "roomLabel": "Zimmer", - "featuresLabel": "Funktionen", - "saveButton": "Speichern", - "deleteButton": "Löschen", - "editButton": "Bearbeiten", - "mostRecentValueAt": "Zuletzt erhalten um {{mostRecentValueAt}}.", - "noValueReceived": "Kein Wert erhalten." - } - }, "openWeather": { "title": "OpenWeather-API", "documentation": "OpenWeather-Dokumentation", @@ -1119,6 +1122,41 @@ "conflictError": "Das aktuelle Gerät ist bereits in Gladys vorhanden." } }, + "airplay": { + "title": "Airplay", + "description": "Steuern Sie Airplay-Geräte in Ihrem lokalen Netzwerk", + "deviceTab": "Geräte", + "discoverTab": "Airplay Entdeckung", + "setupTab": "Einrichtung", + "documentation": "Airplay Dokumentation", + "discoverDeviceDescr": "Airplay-Geräte automatisch scannen", + "nameLabel": "Gerätename", + "namePlaceholder": "Geben Sie den Namen Ihres Geräts ein", + "hostLabel": "IP-Adresse", + "roomLabel": "Zimmer", + "saveButton": "Speichern", + "alreadyCreatedButton": "Bereits erstellt", + "deleteButton": "Löschen", + "device": { + "title": "Airplay-Geräte in Gladys", + "editButton": "Bearbeiten", + "noDeviceFound": "Kein Airplay-Gerät gefunden.", + "featuresLabel": "Funktionen" + }, + "discover": { + "title": "Geräte in Ihrem lokalen Netzwerk erkannt", + "description": "Airplay-Geräte werden automatisch erkannt.", + "error": "Fehler beim Entdecken der Airplay-Geräte. Ist Ihr Airplay-Lautsprecher eingeschaltet und im lokalen Netzwerk erreichbar?", + "noDeviceFound": "Keine Airplay-Geräte gefunden.", + "errorWhileScanning": "Beim Scannen ist ein Fehler aufgetreten.", + "scan": "Scannen" + }, + "error": { + "defaultError": "Beim Speichern des Geräts ist ein Fehler aufgetreten.", + "defaultDeletionError": "Beim Löschen des Geräts ist ein Fehler aufgetreten.", + "conflictError": "Das aktuelle Gerät ist bereits in Gladys vorhanden." + } + }, "zwavejs-ui": { "title": "ZWave JS UI", "description": "Steuern Sie Ihre Geräte in Z-Wave JS UI", @@ -1136,7 +1174,7 @@ "saveButton": "Speichern", "alreadyCreatedButton": "Bereits erstellt", "deleteButton": "Löschen", - "alphaWarning": "Diese Integration ist eine Alpha-Version und unterstützt derzeit nur ein Gerät: den Türöffnungssensor von Fibaro. Wir sind dankbar für jede Unterstützung bei der Integration weiterer Geräte!", + "alphaWarning": "Diese Integration unterstützt eine begrenzte Anzahl von Z-Wave-Geräten. Wenn Sie nicht unterstützte Geräte haben, zögern Sie nicht, diese einzureichen, damit sie hinzugefügt werden können!", "device": { "title": "Z-Wave JS UI Geräte in Gladys", "editButton": "Bearbeiten", @@ -1260,6 +1298,13 @@ "notFound": "Angefordertes Gerät nicht gefunden.", "backToList": "Zurück zur Geräteliste", "saveError": "Fehler beim Sichern oder Löschen des Geräts", + "validationError": "Validierungsfehler: Das Gerät ist nicht korrekt ausgefüllt.", + "validationErrors": { + "name": "Das Feld \"Name\" ist erforderlich", + "min": "Das Minimalfeld ist erforderlich und muss eine ganze Zahl sein", + "max": "Das Maximalfeld ist erforderlich und muss eine ganze Zahl sein", + "external_id": "Das externe ID-Feld ist erforderlich und muss über alle Geräte hinweg eindeutig sein" + }, "saveConflictError": "Konflikt: Sind alle externen IDs wirklich eindeutig?", "mostRecentValueAt": "Zuletzt empfangener Wert {{mostRecentValueAt}}.", "noValueReceived": "Kein Wert empfangen." @@ -1454,13 +1499,15 @@ }, "lanManager": { "title": "LAN-Manager", - "description": "Verwalte deine Geräte über dein lokales Netzwerk.", + "description": "Anwesenheitserkennung über Netzwerkscan", "deviceTab": "Meine Geräte", "discoverTab": "Geräte in der Nähe", "setupTab": "Anwesenheitsscanner", "documentation": "LAN-Manager-Dokumentation", "device": { - "title": "Meine Geräte", + "title": "Geräte zur Integration hinzugefügt", + "explanation": "Diese Integration ermöglicht es Ihnen, die Anwesenheit von Benutzern durch einen Netzwerkscan zu erkennen.", + "iosWarning": "Achtung, diese Integration funktioniert nicht mit iOS-Geräten.", "search": "Geräte suchen", "noDevices": "Du hast noch keine LAN-Geräte hinzugefügt.", "manufacturerLabel": "Hersteller", @@ -1730,6 +1777,28 @@ "rateLimit": "Da die ChatGPT-API nicht kostenlos ist, ist diese Integration auf 1000 Anfragen pro Monat begrenzt.", "notOnGladysPlus": "Da die ChatGPT-API nicht kostenlos ist, ist diese Integration nur für Gladys-Plus-Benutzer verfügbar.", "subscribeToGladysPlus": "Klicke hier, um Gladys Plus zu abonnieren." + }, + "callmebot": { + "title": "CallMeBot", + "description": "Senden Sie Nachrichten über WhatsApp und Signal.", + "setupTab": "Einrichtung", + "documentation": "Dokumentation", + "setup": { + "title": "CallMeBot konfigurieren", + "description": "Um CallMeBot zu nutzen, benötigen Sie einen API-Schlüssel. Folgen Sie diesen Schritten:
1. Besuchen Sie die CallMeBot-Website
2. Wählen Sie Ihre bevorzugte Messaging-Plattform (WhatsApp, Signal)
3. Folgen Sie den Anweisungen, um Ihren API-Schlüssel zu erhalten
4. Geben Sie unten Ihren API-Schlüssel ein
⚠️ Hinweis: Dieser Dienst ist nur unidirektional (Gladys kann Nachrichten senden, aber keine empfangen) und unterstützt keine Bildübertragung.", + "apiKeyLabel": "API-Schlüssel", + "apiKeyPlaceholder": "Geben Sie Ihren CallMeBot API-Schlüssel ein", + "apiKeyHelp": "Ihr API-Schlüssel wird zur Authentifizierung beim CallMeBot-Service verwendet", + "messagingServiceLabel": "Messaging-Dienst", + "messagingServiceHelp": "Wählen Sie den Messaging-Dienst, den Sie mit CallMeBot verwenden möchten", + "phoneNumberLabel": "Telefonnummer", + "phoneNumberPlaceholder": "Geben Sie Ihre Telefonnummer ein", + "phoneNumberHelp": "Ihre Telefonnummer im internationalen Format (z.B. +49123456789)", + "phoneNumberHelpSignal": "Für Signal wird dies eine von CallMeBot bereitgestellte UUID sein (z.B. 123e4567-e89b-12d3-a456-426614174000)", + "saveButton": "Speichern", + "saved": "Konfiguration gespeichert!", + "error": "Fehler beim Speichern der Konfiguration" + } } }, "editScene": { @@ -1752,12 +1821,14 @@ "addTriggerButton": "Auslöser hinzufügen", "selectTriggerLabel": "Wähle einen Auslösertyp aus", "newAction": "Neue Aktion", + "newCondition": "Neue Bedingung", "selectActionType": "Wähle einen Aktionstyp aus", + "selectConditionType": "Wähle eine Bedingungstyp aus", "addActionButton": "Aktion hinzufügen", "noTriggersYet": "Du hast noch keine Auslöser hinzugefügt. Eine Szene muss nicht zwingend einen Auslöser haben.", "noActionsYet": "Du hast noch keine Aktionen hinzugefügt. Klicke auf \"+\", um eine Aktion zu dieser Szene hinzuzufügen.", "triggersDescription": "Auslöser sind unabhängig voneinander. Wenn du mehrere Auslöser festgelegt hast, reicht es, wenn einer ausgelöst wird, um die Szene auszuführen.", - "actionsDescription": "Alle Aktionen in diesem Block werden parallel ausgeführt. Um eine Abfolge von Aktionen zu erstellen, füge Aktionen zum nächsten Block hinzu.", + "actionsDescription": "Alle Aktionen in diesem Block werden parallel ausgeführt. Um eine Abfolge von Aktionen zu erstellen, füge Aktionen zum næchsten Block hinzu.", "addNewTriggerButton": "Auslöser hinzufügen", "saveSceneError": "Beim Sichern deiner Szene ist ein Fehler aufgetreten. Bitte überprüfe, ob alle Aktionen/Auslöser ausgefüllt und korrekt sind.", "actionsCard": { @@ -1782,6 +1853,19 @@ "textPlaceholder": "Nachrichtentext", "explanationText": "Um eine Variable in den Text einzufügen, gib \"{{\" ein. Um einen Variablenwert festzulegen, musst du zuerst das Feld \"Gerätewert abrufen\" verwenden." }, + "askAi": { + "description": "Diese Aktion sendet eine Nachricht an die KI (ChatGPT) über Gladys Plus und antwortet Ihnen mit einer Nachricht. Wenn Sie ein Kamerabild anhängen, kann die KI sehen, was auf dem Bild ist, und sogar entsprechend handeln.", + "userLabel": "Gladys wird antworten an", + "cameraLabel": "Ein Kamerabild anhängen (optional)", + "textLabel": "Meine Frage an die KI", + "textPlaceholder": "Nachrichtentext", + "explanationText": "Um eine Variable einzufügen, geben Sie '{{' ein. Achten Sie darauf, dass Sie zuvor eine Variable in einer Aktion 'Letzten Zustand abrufen' definiert haben, die vor diesem Nachrichtenblock platziert wurde." + }, + "smsSend": { + "textLabel": "Nachricht", + "explanationText": "Um eine Variable in den Text einzufügen, gib \"{{\" ein. Um einen Variablenwert festzulegen, musst du zuerst das Feld \"Gerätewert abrufen\" verwenden.", + "messagePlaceholder": "Meine Message" + }, "turnOnLights": { "label": "Wähle die Lichter aus, die eingeschaltet werden sollen" }, @@ -1838,6 +1922,23 @@ "orButton": "+ ODER", "explanationText": "Anstelle eines festen Werts kannst du hier eine Berechnung auf Basis einer Szenenvariable eingeben. Um eine Variable in den Text einzufügen, gib \"{{\" ein. Um einen Variablenwert festzulegen, musst du zuerst das Feld \"Gerätewert abrufen\" verwenden." }, + "conditionIfThenElse": { + "conditions": "Bedingungen", + "conditionDescription": "Wenn alle Bedingungen erfüllt sind, werden die Aktionen im \"Dann\"-Block ausgeführt. Wenn nicht, werden die Aktionen im \"Sonst\"-Block ausgeführt.", + "noCondition": "Es wurde noch keine Bedingung hinzugefügt. Klicken Sie auf die '+'-Schaltfläche, um diesem Block eine Bedingung hinzuzufügen", + "addCondition": "Bedingung hinzufügen", + "if": "Wenn", + "then": "Dann", + "else": "Sonst", + "shortIf": "W", + "shortThen": "D", + "shortElse": "S", + "actionCount": { + "zero": "Keine Aktionen", + "one": "1 Aktion", + "other": "{{count}} Aktionen" + } + }, "checkTime": { "description": "Die Szene wird nur fortgesetzt, wenn die aktuelle Uhrzeit außerhalb der ausgewählten Tage liegt. Wenn ein Feld leer gelassen wird, wird es nicht berücksichtigt.", "beforeLabel": "Vor", @@ -1938,10 +2039,18 @@ "variablesExplanation": "Um eine Variable im Text einzufügen, gib \"{{\" ein. Um einen Variablenwert festzulegen, musst du vor diesem Feld das das Feld \"Gerätewert abrufen\" verwenden.", "messagePlaceholder": "Meine Message" }, + "zigbee2mqttMessage": { + "topic": "Topic", + "topicPlaceholder": "/gladys/mein-topic", + "messageLabel": "Message", + "variablesExplanation": "Um eine Variable im Text einzufügen, gib \"{{\" ein. Um einen Variablenwert festzulegen, musst du vor diesem Feld das das Feld \"Gerätewert abrufen\" verwenden.", + "messagePlaceholder": "Meine Message" + }, "playNotification": { "description": "Diese Aktion lässt Gladys auf dem ausgewählten Lautsprecher sprechen.", "needGladysPlus": "Erfordert Gladys Plus, da die Text-to-Speech-APIs kostenpflichtig sind.", "deviceLabel": "Lautsprecher", + "volumeLabel": "Volumen", "textLabel": "Nachricht zum Sprechen auf dem Lautsprecher", "variablesExplanation": "Um eine Variable einzufügen, gib \"{{\" ein. Hinweis: Du musst vor diesem Block eine Variable in einer \"Letzten Zustand abrufen\"-Aktion definiert haben." } @@ -1958,6 +2067,9 @@ "send": "Nachricht senden", "send-camera": "Kameraaufnahme senden" }, + "sms": { + "send": "SMS senden" + }, "delay": "Warten", "light": { "turn-on": "Licht einschalten", @@ -1979,7 +2091,8 @@ }, "condition": { "only-continue-if": "Nur fortsetzen, wenn", - "check-time": "Zeitbedingung" + "check-time": "Zeitbedingung", + "if-then-else": "Bedingung: \"Wenn...dann...sonst...\"" }, "user": { "set-seen-at-home": "Benutzer zu Hause gesehen", @@ -2006,8 +2119,14 @@ "mqtt": { "send": "MQTT-Message senden" }, + "zigbee2mqtt": { + "send": "Zigbee2mqtt-Message senden" + }, "music": { "play-notification": "Auf einem Lautsprecher sprechen" + }, + "ai": { + "ask": "Frage die KI" } }, "variables": { @@ -2034,8 +2153,8 @@ "sunset": "Jeder Sonnenuntergang" }, "user": { - "back-home": "Benutzer hat das Zuhause verlassen", - "left-home": "Benutzer ist zurück zu Hause" + "back-home": "Benutzer ist zurück zu Hause", + "left-home": "Benutzer hat das Zuhause verlassen" }, "house": { "empty": "Das Zuhause ist leer", @@ -2075,7 +2194,8 @@ "on": "Ein", "off": "Aus", "deviceSeen": "Wenn das Gerät erkannt wird", - "onlyExecuteAtThreshold": "Nur ausführen, wenn der Schwellenwert überschritten wird (und nicht bei jedem vom Gerät gesendeten Wert)" + "onlyExecuteAtThreshold": "Nur ausführen, wenn der Schwellenwert überschritten wird (und nicht bei jedem vom Gerät gesendeten Wert)", + "activateOrDeactivateForDuration": "Szene ausführen, nachdem die Bedingung für die Dauer gültig war:" }, "scheduledTrigger": { "typeLabel": "Typ", @@ -2317,7 +2437,8 @@ "wrongEmailError": "This is not a valid email", "networkError": "Network Error: We didn't succeed in contacting your Gladys instance. Are you connected to the network? Is your Gladys instance running?", "unknownError": "An unknown error occured. Please try again or contact Gladys community.", - "success": "Success! You should see a reset password link in Gladys logs.", + "success": "Success! I sent you a reset password link by Telegram or Nextcloud Talk. If you haven't configured these services, the reset password link will be in Gladys logs.", + "howToAccessLogs": "To access Gladys logs, go to the command line and type `docker logs gladys --tail=1000` to display the last 1000 lines.", "userNotFound": "There is no account linked to this email.", "rateLimitError": "You have tried this form too many time. Please retry in 30 minutes or restart your Gladys instance now.", "invalidEmail": "We are unable to verify your email address.", @@ -2388,7 +2509,11 @@ "upToDate": "Gladys ist auf dem neuesten Stand", "newUpgradeAvailable": "Softwareupdate verfügbar", "newUpgradeAvailableText": "Gladys wird sich automatisch aktualisieren, wenn du Gladys mit dem offiziellen Gladys-Raspberry-Pi-OS-Image installiert hast. Wenn du Gladys manuell installiert hast, achte darauf, dass Watchtower ausgeführt wird.", - "download": "Herunterladen", + "notConnectedToDocker": "Gladys ist nicht mit Docker verbunden. Um Docker aus Gladys heraus zugänglich zu machen, musst du Gladys mit dem richtigen Volume `-v /var/run/docker.sock:/var/run/docker.sock` starten.", + "updateNow": "Jetzt aktualisieren", + "upgradeInProgress": "Aktualisierung läuft …", + "upgradeLogs": "Messages von Watchtower", + "websocketNotConnected": "WebSocket-Verbindung verloren... Gladys ist wahrscheinlich neu gestartet. Du kannst diese Seite neu laden, um zu prüfen, ob Gladys wieder online ist.", "notAvailable": "Nicht verfügbar bei benutzerdefinierter Installation.", "containers": "Container", "containerName": "Name", @@ -2406,10 +2531,11 @@ "numberOfHoursBeforeStateIsOutdated": "Zeit bis zum Ablauf eines Zustands", "numberOfHoursBeforeStateIsOutdatedDescription": "Diese Verzögerung entspricht der Anzahl der Stunden, bevor der Zustand eines Sensors als \"abgelaufen\" betrachtet und daher nicht mehr auf dem Dashboard angezeigt wird.", "hours": "Stunden", - "vacuumDatabaseTitle": "Datenbankreinigung", - "vacuumDatabaseDescription": "Auf Wunsch wird Gladys eine Datenbankreinigung starten, um Platz freizugeben. Dies löscht keine Daten, sondern entfernt nur physisch alte, als gelöscht markierte Daten. Sei vorsichtig, denn diese Aufgabe kann einige Zeit in Anspruch nehmen und während dieser Zeit wird Gladys nicht verfügbar sein.", + "vacuumDatabaseTitle": "SQLite-Datenbankreinigung", + "vacuumDatabaseDescription": "Wenn du auf diese Schaltfläche klickst, beginnt Gladys mit der Bereinigung der SQLite-Datenbank, um Speicherplatz freizugeben. Dabei werden keine Daten gelöscht, es werden nur physisch alte, bereits gelöschte Daten entfernt. Während der Bereinigung ist Gladys nicht verfügbar.", "vacuumDatabaseButton": "Datenbankreinigung starten", "vacuumDatabaseStarted": "Die Datenbankreinigung wurde gestartet. Gladys wird erst wieder verfügbar sein, wenn dieser Vorgang abgeschlossen ist.", + "vacuumDatabaseFinished": "Die Datenbankreinigung wurde abgeschlossen. Gladys ist wieder verfügbar. Zeit für die Reinigung: {{duration}}.", "containerState": { "created": "Erstellt", "restarting": "Startet neu", @@ -2469,7 +2595,8 @@ "duplicateSceneButton": "Duplizieren", "invalidName": "Name ist erforderlich", "invalidIcon": "Symbol ist erforderlich", - "sceneAlreadyExist": "Eine Szene mit diesem Namen existiert bereits." + "sceneAlreadyExist": "Eine Szene mit diesem Namen existiert bereits.", + "nameAfterCopy": "Kopie von {{name}}" }, "scene": { "title": "Szenen", @@ -2748,6 +2875,16 @@ "heating": "Heizen" } }, + "heater": { + "pilot-wire-mode": { + "comfort": "Komfort", + "eco": "Öko", + "off": "Aus", + "frost-protection": "Frostschutz", + "comfort_-1": "Komfort -1°C", + "comfort_-2": "Komfort -2°C" + } + }, "siren": { "lmh_volume": { "low": "Niedrig", @@ -2819,7 +2956,38 @@ "48": "Langer Druck", "49": "Kurzes Loslassen", "50": "Langes Loslassen", - "51": "Doppeltes Drücken" + "51": "Doppeltes Drücken", + "52": "Umschalten", + "53": "Umschalten Gehalten", + "54": "Helligkeit Auf-Taste gedrückt", + "55": "Helligkeit Auf-Taste gehalten", + "56": "Helligkeit Auf-Taste Loslassen", + "57": "Helligkeit Ab-Taste gedrückt", + "58": "Helligkeit Ab-Taste gehalten", + "59": "Helligkeit Ab-Taste Loslassen", + "60": "Gedrückt", + "61": "Einfach Links", + "62": "Einfach Rechts", + "63": "Einfach Beide", + "64": "Doppelt Links", + "65": "Doppelt Rechts", + "66": "Doppelt Beide", + "67": "Dreifach Links", + "68": "Dreifach Rechts", + "69": "Dreifach Beide", + "70": "Halten Links", + "71": "Halten Rechts", + "72": "Halten Beide" + } + }, + "heater": { + "pilot-wire-mode": { + "0": "Aus", + "1": "Frostschutz", + "2": "Öko", + "3": "Komfort -1°C", + "4": "Komfort -2°C", + "5": "Komfort" } }, "opening-sensor": { @@ -2857,6 +3025,13 @@ "one": "Ja" } }, + "input": { + "binary": { + "other": "Kein Wert empfangen", + "zero": "Aus", + "one": "An" + } + }, "risk": { "integer": { "no-risk": "Kein Risiko", @@ -2906,6 +3081,10 @@ "shortCategoryName": "Anwesenheitssensor", "push": "Anwesenheit" }, + "rain-sensor": { + "shortCategoryName": "Regensensor", + "binary": "Regenerkennung Ja/Nein" + }, "light-sensor": { "shortCategoryName": "Helligkeitssensor", "integer": "Helligkeit (ganze Zahl)", @@ -2968,7 +3147,8 @@ }, "button": { "shortCategoryName": "Schaltfläche", - "click": "Schaltfläche (Klick)" + "click": "Schaltfläche (Klick)", + "push": "Druckknopf" }, "pressure-sensor": { "shortCategoryName": "Drucksensor", @@ -3022,6 +3202,10 @@ "mode": "Modus", "target-temperature": "Temperatur" }, + "heater": { + "shortCategoryName": "Heizung", + "pilot-wire-mode": "Modus" + }, "tamper": { "shortCategoryName": "Manipulation", "binary": "Manipulation (ja/nein)" @@ -3068,6 +3252,67 @@ "index": "Index", "daily-consumption": "Tagesverbrauch" }, + "teleinformation": { + "shortCategoryName": "Teleinformation", + "binary": "Schalter", + "east": "Gesamt abgegebene Wirkleistung (EAST)", + "eait": "Gesamt eingespeiste Wirkleistung (EAIT)", + "easf01": "Gesamt abgegebene Wirkleistung vom Anbieter (EASF01)", + "easf02": "Gesamt abgegebene Wirkleistung vom Anbieter (EASF02)", + "easf03": "Gesamt abgegebene Wirkleistung vom Anbieter (EASF03)", + "easf04": "Gesamt abgegebene Wirkleistung vom Anbieter (EASF04)", + "easf05": "Gesamt abgegebene Wirkleistung vom Anbieter (EASF05)", + "easf06": "Gesamt abgegebene Wirkleistung vom Anbieter (EASF06)", + "easf07": "Gesamt abgegebene Wirkleistung vom Anbieter (EASF07)", + "easf08": "Gesamt abgegebene Wirkleistung vom Anbieter (EASF08)", + "easf09": "Gesamt abgegebene Wirkleistung vom Anbieter (EASF09)", + "easf10": "Gesamt abgegebene Wirkleistung vom Anbieter (EASF10)", + "pref": "Referenz-Scheinleistung (PREF)", + "pcoup": "Scheinleistungsschwelle (PCOUP)", + "vtic": "Protokollversion (VTIC)", + "ccasn": "Aktueller Punkt der entnommenen Lastkurve (CCASN)", + "ccasn_1": "Vorheriger Punkt der entnommenen Lastkurve (CCASN-1)", + "umoy1": "Durchschnittliche Effektivspannung (UMOY1)", + "umoy2": "Durchschnittliche Effektivspannung (UMOY2)", + "umoy3": "Durchschnittliche Effektivspannung (UMOY3)", + "erq1": "Gesamt Blindleistung Q1 (ERQ1)", + "erq2": "Gesamt Blindleistung Q2 (ERQ2)", + "erq3": "Gesamt Blindleistung Q3 (ERQ3)", + "erq4": "Gesamt Blindleistung Q4 (ERQ4)", + "irms1": "Effektivstrom (IRMS1)", + "irms2": "Effektivstrom (IRMS2)", + "irms3": "Effektivstrom (IRMS3)", + "urms1": "Effektivspannung (URMS1)", + "urms2": "Effektivspannung (URMS2)", + "urms3": "Effektivspannung (URMS3)", + "easd01": "Entnommene Wirkenergie des Verteilers (EASD01)", + "easd02": "Entnommene Wirkenergie des Verteilers (EASD02)", + "easd03": "Entnommene Wirkenergie des Verteilers (EASD03)", + "easd04": "Entnommene Wirkenergie des Verteilers (EASD04)", + "ntarf": "Tarif-Indexnummer (NTARF)", + "ccain": "Punkt n der entnommenen Lastkurve (CCAIN)", + "ccain_1": "Punkt n-1 der entnommenen Lastkurve (CCAIN-1)", + "sinsti": "Momentan eingespeiste Scheinleistung (SINSTI)", + "smaxin": "Max. eingespeiste Scheinleistung n (SMAXIN)", + "smaxin_1": "Max. eingespeiste Scheinleistung n-1 (SMAXIN-1)", + "smaxn": "Max. abgegebene Scheinleistung (SMAXN)", + "smaxn2": "Max. abgegebene Scheinleistung (SMAXN2)", + "smaxn3": "Max. abgegebene Scheinleistung (SMAXN3)", + "sinsts": "Momentane abgegebene Scheinleistung (SINSTS)", + "sinsts2": "Momentane abgegebene Scheinleistung (SINSTS2)", + "sinsts3": "Momentane abgegebene Scheinleistung (SINSTS3)", + "smaxn_1": "Max. entnommene Scheinleistung n-1 (SMAXN-1)", + "smaxn2_1": "Max. entnommene Scheinleistung n-1 (SMAXN2-1)", + "smaxn3_1": "Max. entnommene Scheinleistung n-1 (SMAXN3-1)", + "hhphc": "HPHC-Programm (HHPHC)", + "imax": "Spitzenstrom (IMAX)", + "adps": "Warnung bei Überschreitung der Vertragsleistung (ADPS)", + "imax2": "Spitzenstrom (IMAX2)", + "imax3": "Spitzenstrom (IMAX3)", + "adir1": "Überstromwarnung (ADIR1)", + "adir2": "Überstromwarnung (ADIR2)", + "adir3": "Überstromwarnung (ADIR3)" + }, "volume-sensor": { "shortCategoryName": "Lautstärke-Sensor", "decimal": "Lautstärke (dezimal)", @@ -3084,7 +3329,8 @@ }, "precipitation-sensor": { "shortCategoryName": "Niederschlagssensor", - "decimal": "Niederschlag" + "decimal": "Niederschlag", + "integer": "Intensität (mV)" }, "uv-sensor": { "shortCategoryName": "UV-Sensor", @@ -3159,6 +3405,10 @@ "shortCategoryName": "Risiko", "integer": "Risikostufe" }, + "input": { + "shortCategoryName": "Eingang", + "binary": "Status des Eingangs" + }, "unknown": { "shortCategoryName": "Unbekannt", "unknown": "Unbekannt" diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json index 7d95f7e246..a3711adad9 100644 --- a/front/src/config/i18n/en.json +++ b/front/src/config/i18n/en.json @@ -247,6 +247,8 @@ "private": "private", "public": "public" }, + "editDashboardAddColumnButton": "Add a column on dashboard", + "editDashboardBoxNotEmpty": "You cannot delete this column as it contains widgets.", "editDashboardMyDashboards": "My dashboards", "editDashboardExplanation": "Each dashboard has 3 columns, which you can fill in according to your preferences. Click on the + button to add a new widget. You can move this widget by grabbing it and moving it around.", "reorderDashboardButton": "Re-order dashboards", @@ -261,7 +263,7 @@ "humidity-in-room": "Humidity in room", "user-presence": "User presence", "camera": "Camera", - "devices-in-room": "Devices in room", + "devices-in-room": "Devices in room (Deprecated)", "devices": "Devices", "chart": "Chart", "ecowatt": "Ecowatt (France)", @@ -296,11 +298,12 @@ "deviceTitle": "{{name}} - {{type}}", "addButton": "+", "substractButton": "-", - "motionDetected": "Motion detected" + "motionDetected": "Motion detected", + "pushButton": "Push" }, "devices": { "editDeviceFeaturesLabel": "Select the devices you want to display:", - "editNameLabel": "Widget name", + "editNameLabel": "Widget Name (optional)", "editNamePlaceholder": "Enter the name of the widget", "addADeviceLabel": "Add a device:" }, @@ -345,6 +348,7 @@ "chart": { "defaultInterval": "Default interval", "lastHour": "Last hour", + "lastTwelveHours": "Last 12 hours", "lastDay": "Last 24 hours", "lastSevenDays": "Last 7 days", "lastThirtyDays": "Last 30 days", @@ -352,6 +356,8 @@ "lastYear": "Last year", "noValue": "No values recorded on this interval.", "noValueWarning": "Warning: if you just configured this device, it may take some time before you see something here as Gladys needs some time to collect enough data. For interval superior to 24h, it may take up to 24h before you see something here.", + "noChartType": "No chart type selected", + "noChartTypeWarning": "If you just configured this device, please go back to the box edit page and select a chart type.", "editNameLabel": "Enter the name of this box", "editDeviceFeaturesLabel": "Select the device you want to display here", "editRoomLabel": "Select the room you want to display here", @@ -359,16 +365,22 @@ "chartType": "Select the type of chart to display", "chartColor": "Select the color of chart", "dataColor": "Select color for {{featureLabel}}", + "timelineColor": "Select color for position", "line": "Line", "area": "Area", "bar": "Bar", + "timeline": "Binary", "stepline": "Step Line", "displayAxes": "Display axes?", "displayVariation": "Display variation?", "yes": "Yes", "no": "No", "preview": "Preview", - "showPreviewButton": "Show preview" + "showPreviewButton": "Show preview", + "on": "On", + "off": "Off", + "start_date": "Start date: ", + "end_date": "End date: " }, "ecowatt": { "title": "Ecowatt France", @@ -403,7 +415,7 @@ "no": "No" }, "scene": { - "editNameLabel": "Enter the name of this box", + "editNameLabel": "Widget Name (optional)", "editNamePlaceholder": "Name displayed on the dashboard", "editSceneLabel": "Select the scene you want to display here." }, @@ -478,6 +490,17 @@ "configurationSuccess": "Successfully saved configuration.", "buttonSave": "Save" }, + "free-mobile": { + "title": "Free Mobile", + "description": "Send SMS from Gladys using Free Mobile.", + "documentation": "Free Mobile Documentation", + "introduction": "This plugin allows you to send SMS to your Free cell phone via the notification service provided by Free. Enter your customer ID and the identification key below, which you can find on the FreeMobile website.", + "username": "Free Mobile Customer ID", + "key": "Identification key for the service", + "configurationError": "We could not save this configuration.", + "configurationSuccess": "Account configuration saved successfully.", + "saveButton": "Save" + }, "philipsHue": { "title": "Philips Hue", "description": "Control Philips Hue Lights and plugs with the official hub", @@ -946,26 +969,6 @@ "documentation": "OwnTracks documentation", "longDescription": "OwnTracks is an open-source app running on iOS and Android that let you send your geolocation to a server. You can use OwnTracks to trigger scenes based on your geolocation. To configure OwnTracks with Gladys, follow this tutorial in our documentation." }, - "zwave": { - "title": "Open-Zwave [OLD]", - "description": "This integration is deprecated, we are migrating to zwave-js-ui.", - "documentation": "Open-Zwave documentation", - "device": { - "title": "Legacy Open-Zwave Devices", - "convertToMqtt": "Convert to MQTT device", - "oldIntegrationWarning": "This integration was based on Open-Zwave and is now DEPRECATED. We are migrating to Zwave-js-ui, but in the meantime we recommend that you use Node-RED + Zwave-js-ui + Gladys.
If you want to help us develop this integration, join-us on the forum!", - "noDevices": "No Z-Wave devices added yet.", - "scanButton": "Scan", - "nameLabel": "Name", - "roomLabel": "Room", - "featuresLabel": "Features", - "saveButton": "Save", - "deleteButton": "Delete", - "editButton": "Edit", - "mostRecentValueAt": "Last value received {{mostRecentValueAt}}.", - "noValueReceived": "No value received." - } - }, "openWeather": { "title": "OpenWeather API", "documentation": "OpenWeather documentation", @@ -1119,6 +1122,41 @@ "conflictError": "The current device is already in Gladys." } }, + "airplay": { + "title": "Airplay", + "description": "Contrôler les appareils Airplay sur votre réseau local", + "deviceTab": "Devices", + "discoverTab": "Airplay Discovery", + "setupTab": "Setup", + "documentation": "Airplay Documentation", + "discoverDeviceDescr": "Automatically scan for Airplay devices", + "nameLabel": "Device Name", + "namePlaceholder": "Enter your device name", + "hostLabel": "IP Address", + "roomLabel": "Room", + "saveButton": "Save", + "alreadyCreatedButton": "Already Created", + "deleteButton": "Delete", + "device": { + "title": "Airplay Devices in Gladys", + "editButton": "Edit", + "noDeviceFound": "No Airplay device found.", + "featuresLabel": "Features" + }, + "discover": { + "title": "Devices detected on your local network", + "description": "Airplay devices are automatically discovered.", + "error": "Error discovering Airplay devices. Is your Airplay speaker powered on and accessible on the local network?", + "noDeviceFound": "No Airplay devices have been discovered.", + "errorWhileScanning": "An error occurred while scanning.", + "scan": "Scan" + }, + "error": { + "defaultError": "An error occurred while saving the device.", + "defaultDeletionError": "An error occurred while deleting the device.", + "conflictError": "The current device is already in Gladys." + } + }, "zwavejs-ui": { "title": "ZWave JS UI", "description": "Control your devices in Z-Wave JS UI", @@ -1136,7 +1174,7 @@ "saveButton": "Save", "alreadyCreatedButton": "Already Created", "deleteButton": "Delete", - "alphaWarning": "This integration is in alpha and currently only supports few devices. We welcome any assistance to integrate other devices!", + "alphaWarning": "This integration handles a limited number of Z-Wave devices. If you have unsupported devices, don't hesitate to submit them so they can be added!", "device": { "title": "Z-Wave JS UI Devices in Gladys", "editButton": "Edit", @@ -1260,6 +1298,13 @@ "notFound": "Requested device not found.", "backToList": "Back to device list", "saveError": "Error saving or deleting device", + "validationError": "Validation error : The device is not correctly filled.", + "validationErrors": { + "name": "The name field is required", + "min": "The minimum field is required and must be an integer", + "max": "The maximum field is required and must be an integer", + "external_id": "The external ID field is required and must be unique across all devices" + }, "saveConflictError": "Conflict: Are you sure all external IDs are unique?", "mostRecentValueAt": "Last value received {{mostRecentValueAt}}.", "noValueReceived": "No value received." @@ -1454,13 +1499,15 @@ }, "lanManager": { "title": "LAN Manager", - "description": "Manage you device through you local network.", + "description": "Presence detection via network scan", "deviceTab": "Devices", "discoverTab": "LAN Discover", "setupTab": "Presence scanner", "documentation": "Lan Manager documentation", "device": { - "title": "LAN Devices", + "title": "Devices added to the integration", + "explanation": "This integration allows you to detect user presence by scanning the network.", + "iosWarning": "Warning, this integration does not work with iOS devices.", "search": "Search devices", "noDevices": "No LAN devices added yet.", "manufacturerLabel": "Manufacturer", @@ -1730,6 +1777,28 @@ "rateLimit": "As ChatGPT API is not free, this integration is limited to 1000 requests per month.", "notOnGladysPlus": "As ChatGPT API is not free, this integration is only available to Gladys Plus users.", "subscribeToGladysPlus": "Click here to subscribe to Gladys Plus." + }, + "callmebot": { + "title": "CallMeBot", + "description": "Send messages through WhatsApp and Signal.", + "setupTab": "Setup", + "documentation": "Documentation", + "setup": { + "title": "Configure CallMeBot", + "description": "To use CallMeBot, you need to get an API key. Follow these steps:
1. Go to CallMeBot website
2. Choose your preferred messaging platform (WhatsApp, Signal)
3. Follow the instructions to get your API key
4. Enter your API key below
⚠️ Note: This service is one-way only (Gladys can send messages but cannot receive any) and does not support sending images.", + "apiKeyLabel": "API Key", + "apiKeyPlaceholder": "Enter your CallMeBot API key", + "apiKeyHelp": "Your API key is used to authenticate with CallMeBot service", + "messagingServiceLabel": "Messaging Service", + "messagingServiceHelp": "Select the messaging service you want to use with CallMeBot", + "phoneNumberLabel": "Phone Number", + "phoneNumberPlaceholder": "Enter your phone number", + "phoneNumberHelp": "Your phone number in international format (e.g. +1234567890)", + "phoneNumberHelpSignal": "For Signal, this will be a UUID provided by CallMeBot (e.g. 123e4567-e89b-12d3-a456-426614174000)", + "saveButton": "Save", + "saved": "Configuration saved!", + "error": "Error while saving configuration" + } } }, "editScene": { @@ -1752,7 +1821,9 @@ "addTriggerButton": "Add trigger", "selectTriggerLabel": "Select a trigger type", "newAction": "New action", + "newCondition": "New condition", "selectActionType": "Select an action type", + "selectConditionType": "Select a condition type", "addActionButton": "Add action", "noTriggersYet": "No trigger added yet. It's not mandatory to have a trigger in a scene.", "noActionsYet": "No actions added yet. Click on the + button to add an action to this scene.", @@ -1782,6 +1853,19 @@ "textPlaceholder": "Message text", "explanationText": "To inject a variable in the text, press '{{'. To set a variable value, you need to use the 'Get device value' box before this one." }, + "askAi": { + "description": "This action will send a message to the AI (ChatGPT) via Gladys Plus and will reply to you with a message. If you attach a camera image, the AI will be able to see what is on the image and even take action accordingly.", + "userLabel": "Gladys will respond to", + "cameraLabel": "Attach a camera image (optional)", + "textLabel": "My question for the AI", + "textPlaceholder": "Message text", + "explanationText": "To insert a variable, type '{{'. Be careful, you must have defined a variable beforehand in a 'Retrieve the last state' action placed before this message block." + }, + "smsSend": { + "textLabel": "Message", + "explanationText": "To inject a variable in the text, press '{{'. To set a variable value, you need to use the 'Get device value' box before this one.", + "messagePlaceholder": "My message" + }, "turnOnLights": { "label": "Select the lights you want to turn on" }, @@ -1838,6 +1922,23 @@ "orButton": "+ OR", "explanationText": "Instead of a fixed value, you can enter here a calculation based on a scene variable. To inject a variable in the text, press '{{'. To set a variable value, you need to use the 'Get device value' box before this one." }, + "conditionIfThenElse": { + "conditions": "Conditions", + "conditionDescription": "If all conditions are met, the actions in the \"Then\" block will be executed. If not, the \"Else\" block will be executed.", + "noCondition": "No condition has been added yet. Click the '+' button to add a condition to this block", + "addCondition": "Add condition", + "if": "If", + "then": "Then", + "else": "Else", + "shortIf": "I", + "shortThen": "T", + "shortElse": "E", + "actionCount": { + "zero": "No action", + "one": "1 action", + "other": "{{count}} actions" + } + }, "checkTime": { "description": "The scene will continue only if current time is between the selected limits, in the selected days. If a field is left empty, it'll not be taken into account.", "beforeLabel": "Before", @@ -1938,10 +2039,18 @@ "variablesExplanation": "To inject a variable in the text, press '{{ '. To set a variable value, you need to use the 'Get device value' box before this one.", "messagePlaceholder": "My message" }, + "zigbee2mqttMessage": { + "topic": "Topic", + "topicPlaceholder": "/gladys/my-topic", + "messageLabel": "Message", + "variablesExplanation": "To inject a variable in the text, press '{{ '. To set a variable value, you need to use the 'Get device value' box before this one.", + "messagePlaceholder": "My message" + }, "playNotification": { "description": "This action will make Gladys speak on the selected speaker.", "needGladysPlus": "Requires Gladys Plus as Text-To-Speech APIs are paid.", "deviceLabel": "Speaker", + "volumeLabel": "Volume", "textLabel": "Message to speak on the speaker", "variablesExplanation": "To inject a variable, type '{{ '. Note: You must have defined a variable beforehand in a 'Retrieve Last State' action placed before this message block." } @@ -1958,6 +2067,9 @@ "send": "Send Message", "send-camera": "Send a camera image" }, + "sms": { + "send": "Send SMS" + }, "delay": "Wait", "light": { "turn-on": "Turn On the Lights", @@ -1978,8 +2090,9 @@ "stop": "Stop service" }, "condition": { - "only-continue-if": "Only continue if", - "check-time": "Time condition" + "only-continue-if": "Condition on variables", + "check-time": "Time condition", + "if-then-else": "Condition: If...then...else..." }, "user": { "set-seen-at-home": "User seen at home", @@ -2006,8 +2119,14 @@ "mqtt": { "send": "Send MQTT Message" }, + "zigbee2mqtt": { + "send": "Send Zigbee2mqtt Message" + }, "music": { "play-notification": "Talk on a speaker" + }, + "ai": { + "ask": "Ask AI" } }, "variables": { @@ -2034,8 +2153,8 @@ "sunset": "Every sunset" }, "user": { - "back-home": "User left home", - "left-home": "User back at home" + "back-home": "User back at home", + "left-home": "User left home" }, "house": { "empty": "House is empty", @@ -2075,7 +2194,8 @@ "on": "On", "off": "Off", "deviceSeen": "If the device is detected", - "onlyExecuteAtThreshold": "Execute only when threshold is passed (and not at every value sent by the device)" + "onlyExecuteAtThreshold": "Execute only when threshold is passed (and not at every value sent by the device)", + "activateOrDeactivateForDuration": "Run the scene after the condition has been valid for:" }, "scheduledTrigger": { "typeLabel": "Type", @@ -2317,7 +2437,8 @@ "wrongEmailError": "This is not a valid email", "networkError": "Network Error: We didn't succeed in contacting your Gladys instance. Are you connected to the network? Is your Gladys instance running?", "unknownError": "An unknown error occured. Please try again or contact Gladys community.", - "success": "Success! You should see a reset password link in Gladys logs.", + "success": "Success! I sent you a reset password link by Telegram or Nextcloud Talk. If you haven't configured these services, the reset password link will be in Gladys logs.", + "howToAccessLogs": "To access Gladys logs, go to the command line and type `docker logs gladys --tail=1000` to display the last 1000 lines.", "userNotFound": "There is no account linked to this email.", "rateLimitError": "You have tried this form too many time. Please retry in 30 minutes or restart your Gladys instance now.", "invalidEmail": "We are unable to verify your email address.", @@ -2387,8 +2508,12 @@ "operations": "Operations", "upToDate": "Gladys is up to date", "newUpgradeAvailable": "New upgrade available", - "newUpgradeAvailableText": "Gladys will update itself automatically if you installed Gladys with the official Gladys Raspberry Pi OS image. If you installed Gladys manually, make sure you have watchtower running.", - "download": "Download", + "newUpgradeAvailableText": "Gladys will update automatically if you use Watchtower. If you want to update manually, click the button below. This will launch a Watchtower container that will update all containers present on this machine.", + "notConnectedToDocker": "Gladys is not connected to Docker. To access Docker from Gladys, you need to start Gladys with the correct volume `-v /var/run/docker.sock:/var/run/docker.sock`.", + "updateNow": "Update now", + "upgradeInProgress": "Upgrade in progress...", + "upgradeLogs": "Watchtower messages", + "websocketNotConnected": "WebSocket connection lost... Gladys is probably restarting. You can refresh this page to check if Gladys is back online.", "notAvailable": "Not available on custom install.", "containers": "Containers", "containerName": "Name", @@ -2406,10 +2531,11 @@ "numberOfHoursBeforeStateIsOutdated": "Time to expiry of a state", "numberOfHoursBeforeStateIsOutdatedDescription": "This delay corresponds to the number of hours before a sensor status is considered \"expired\" and therefore no longer displayed on the dashboard.", "hours": "hours", - "vacuumDatabaseTitle": "Database cleaning", - "vacuumDatabaseDescription": "By clicking on this button, Gladys will start cleaning the database to free up space. This does not delete any data, it just physically remove old deleted data. Be careful, this task can take some time to run, and during that time Gladys will not be available.", + "vacuumDatabaseTitle": "SQLite Database cleaning", + "vacuumDatabaseDescription": "By clicking on this button, Gladys will start cleaning the SQLite database to free up space. This does not delete any data, it just physically remove old deleted data. During the cleaning, Gladys will not be available.", "vacuumDatabaseButton": "Start database cleaning", "vacuumDatabaseStarted": "Database cleaning has started... Gladys will not be available until this job finishes.", + "vacuumDatabaseFinished": "Database cleaning has finished. Gladys is back online. Cleaning time: {{duration}}.", "containerState": { "created": "Created", "restarting": "Restarting", @@ -2469,7 +2595,8 @@ "duplicateSceneButton": "Duplicate", "invalidName": "Name is required", "invalidIcon": "Icon is required", - "sceneAlreadyExist": "A scene with that name already exist." + "sceneAlreadyExist": "A scene with that name already exist.", + "nameAfterCopy": "Copy of {{name}}" }, "scene": { "title": "Scenes", @@ -2748,6 +2875,16 @@ "heating": "Heat" } }, + "heater": { + "pilot-wire-mode": { + "comfort": "Comfort", + "eco": "Eco", + "off": "Off", + "frost-protection": "Frost Protection", + "comfort_-1": "Comfort -1°C", + "comfort_-2": "Comfort -2°C" + } + }, "siren": { "lmh_volume": { "low": "Low", @@ -2819,7 +2956,38 @@ "48": "Long press", "49": "Short release", "50": "Long release", - "51": "Double press" + "51": "Double press", + "52": "Toggle", + "53": "Toggle Hold", + "54": "Brightness Up Click", + "55": "Brightness Up Hold", + "56": "Brightness Up Release", + "57": "Brightness Down Click", + "58": "Brightness Down Hold", + "59": "Brightness Down Release", + "60": "Pressed", + "61": "Simple Left", + "62": "Simple Right", + "63": "Simple Both", + "64": "Double Left", + "65": "Double Right", + "66": "Double Both", + "67": "Triple Left", + "68": "Triple Right", + "69": "Triple Both", + "70": "Hold Left", + "71": "Hold Right", + "72": "Hold Both" + } + }, + "heater": { + "pilot-wire-mode": { + "0": "Off", + "1": "Frost Protection", + "2": "Eco", + "3": "Comfort -1°C", + "4": "Comfort -2°C", + "5": "Comfort" } }, "opening-sensor": { @@ -2857,6 +3025,13 @@ "one": "Yes" } }, + "input": { + "binary": { + "other": "No value received", + "zero": "Off", + "one": "On" + } + }, "risk": { "integer": { "no-risk": "No Risk", @@ -2906,6 +3081,10 @@ "shortCategoryName": "Presence sensor", "push": "Presence" }, + "rain-sensor": { + "shortCategoryName": "Rain sensor", + "binary": "Rain detection Yes/No" + }, "light-sensor": { "shortCategoryName": "Luminosity sensor", "integer": "Luminosity (integer)", @@ -2968,7 +3147,8 @@ }, "button": { "shortCategoryName": "Button", - "click": "Button (click)" + "click": "Button (click)", + "push": "Push button" }, "pressure-sensor": { "shortCategoryName": "Pressure sensor", @@ -3022,6 +3202,10 @@ "mode": "Mode", "target-temperature": "Temperature" }, + "heater": { + "shortCategoryName": "Heating", + "pilot-wire-mode": "Mode" + }, "tamper": { "shortCategoryName": "Tamper", "binary": "Tamper (yes/no)" @@ -3068,6 +3252,67 @@ "index": "Index", "daily-consumption": "Daily Consumption" }, + "teleinformation": { + "shortCategoryName": "Teleinformation", + "binary": "Switch", + "east": "Total active power delivered (EAST)", + "eait": "Total active power injected (EAIT)", + "easf01": "Total provider active power delivered (EASF01)", + "easf02": "Total provider active power delivered (EASF02)", + "easf03": "Total provider active power delivered (EASF03)", + "easf04": "Total provider active power delivered (EASF04)", + "easf05": "Total provider active power delivered (EASF05)", + "easf06": "Total provider active power delivered (EASF06)", + "easf07": "Total provider active power delivered (EASF07)", + "easf08": "Total provider active power delivered (EASF08)", + "easf09": "Total provider active power delivered (EASF09)", + "easf10": "Total provider active power delivered (EASF10)", + "pref": "Apparent power of reference (PREF)", + "pcoup": "Apparent power threshold (PCOUP)", + "vtic": "Protocol version (VTIC)", + "ccasn": "Current point of the active load curve drawn (CCASN)", + "ccasn_1": "Previous point of the active load curve drawn (CCASN-1)", + "umoy1": "Average RMS voltage (UMOY1)", + "umoy2": "Average RMS voltage (UMOY2)", + "umoy3": "Average RMS voltage (UMOY3)", + "erq1": "Total reactive power Q1 (ERQ1)", + "erq2": "Total reactive power Q2 (ERQ2)", + "erq3": "Total reactive power Q3 (ERQ3)", + "erq4": "Total reactive power Q4 (ERQ4)", + "irms1": "RMS current (IRMS1)", + "irms2": "RMS current (IRMS2)", + "irms3": "RMS current (IRMS3)", + "urms1": "RMS voltage (URMS1)", + "urms2": "RMS voltage (URMS2)", + "urms3": "RMS voltage (URMS3)", + "easd01": "Active energy withdrawn Distributor (EASD01)", + "easd02": "Active energy withdrawn Distributor (EASD02)", + "easd03": "Active energy withdrawn Distributor (EASD03)", + "easd04": "Active energy withdrawn Distributor (EASD04)", + "ntarf": "Tarif index number (NTARF)", + "ccain": "Point n of the withdrawn active load curve (CCAIN)", + "ccain_1": "Point n-1 of the withdrawn active load curve (CCAIN-1)", + "sinsti": "Instantaneous apparent power injected (SINSTI)", + "smaxin": "Apparent power max. injected n (SMAXIN)", + "smaxin_1": "Apparent power max. injected n-1 (SMAXIN-1)", + "smaxn": "Apparent power delivered peak (SMAXN)", + "smaxn2": "Apparent power delivered peak (SMAXN2)", + "smaxn3": "Apparent power delivered peak (SMAXN3)", + "sinsts": "Immediate apparent power delivered (SINSTS)", + "sinsts2": "Immediate apparent power delivered (SINSTS2)", + "sinsts3": "Immediate apparent power delivered (SINSTS3)", + "smaxn_1": "Apparent power max. draw-off n-1 (SMAXN-1)", + "smaxn2_1": "Apparent power max. draw-off n-1 (SMAXN2-1)", + "smaxn3_1": "Apparent power max. draw-off n-1 (SMAXN3-1)", + "hhphc": "HPHC Program (HHPHC)", + "imax": "RMS current peak (IMAX)", + "adps": "Subscribed Power Exceeded Warning (ADPS)", + "imax2": "RMS current peak (IMAX2)", + "imax3": "RMS current peak (IMAX3)", + "adir1": "Overcurrent alert (ADIR1)", + "adir2": "Overcurrent alert (ADIR2)", + "adir3": "Overcurrent alert (ADIR3)" + }, "volume-sensor": { "shortCategoryName": "Volume sensor", "decimal": "Volume (decimal)", @@ -3084,7 +3329,8 @@ }, "precipitation-sensor": { "shortCategoryName": "Precipitation sensor", - "decimal": "Precipitation" + "decimal": "Precipitation", + "integer": "Intensity (mV)" }, "uv-sensor": { "shortCategoryName": "UV Sensor", @@ -3159,6 +3405,10 @@ "shortCategoryName": "Risk", "integer": "Risk Level" }, + "input": { + "shortCategoryName": "Input", + "binary": "State of input" + }, "unknown": { "shortCategoryName": "Unknown", "unknown": "Unknown" diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json index fc5ea8c150..dd80800f01 100644 --- a/front/src/config/i18n/fr.json +++ b/front/src/config/i18n/fr.json @@ -247,6 +247,8 @@ "private": "privé", "public": "public" }, + "editDashboardAddColumnButton": "Ajouter une colonne au tableau de bord", + "editDashboardBoxNotEmpty": "Vous ne pouvez pas supprimer cette colonne car elle contient des widgets.", "editDashboardMyDashboards": "Mes tableaux de bords", "editDashboardExplanation": "Chaque tableau de bord comporte 3 colonnes, que vous pouvez remplir selon vos préférences. Cliquez sur le bouton + pour ajouter un nouveau widget. Vous pouvez déplacer ce widget en l'attrapant et en le déplaçant.", "reorderDashboardButton": "Re-ordonner", @@ -261,7 +263,7 @@ "humidity-in-room": "Humidité de la pièce", "user-presence": "Utilisateurs présents", "camera": "Caméra", - "devices-in-room": "Appareils de la pièce", + "devices-in-room": "Appareils de la pièce (Déprécié)", "devices": "Appareils", "chart": "Graphique", "ecowatt": "Ecowatt ( France )", @@ -296,11 +298,12 @@ "deviceTitle": "{{name}} - {{type}}", "addButton": "+", "substractButton": "-", - "motionDetected": "Mouvement détecté" + "motionDetected": "Mouvement détecté", + "pushButton": "Appuyer" }, "devices": { "editDeviceFeaturesLabel": "Vous pouvez modifier le nom affiché ici :", - "editNameLabel": "Nom du widget", + "editNameLabel": "Nom du widget (optionnel)", "editNamePlaceholder": "Entrez le nom du widget", "addADeviceLabel": "Ajouter un appareil :" }, @@ -345,6 +348,7 @@ "chart": { "defaultInterval": "Intervalle par défaut", "lastHour": "Dernière heure", + "lastTwelveHours": "Dernières 12h", "lastDay": "Dernières 24h", "lastSevenDays": "Derniers 7 jours", "lastThirtyDays": "Derniers 30 jours", @@ -352,6 +356,8 @@ "lastYear": "Dernière année", "noValue": "Pas de valeurs sur cet intervalle.", "noValueWarning": "Attention, si vous venez de configurer cet appareil, les données peuvent mettre un certain temps avant d'être agrégées. Pour les intervalles supérieurs à 24h, cela prend jusqu'à 24h le temps que Gladys collecte assez de données.", + "noChartType": "Aucun type de graphique sélectionné", + "noChartTypeWarning": "Si vous venez de configurer cet appareil, veuillez retourner sur la page d'édition de la box et sélectionner un type de graphique.", "editNameLabel": "Entrez le nom de cette box", "editNamePlaceholder": "Nom affiché sur le tableau de bord", "editDeviceFeaturesLabel": "Sélectionnez les appareils que vous voulez afficher", @@ -359,16 +365,22 @@ "chartType": "Sélectionner le type de graphique", "chartColor": "Sélectionner la couleur du graphique", "dataColor": "Sélectionner la couleur pour {{featureLabel}}", + "timelineColor": "Sélectionner la couleur pour la position ", "line": "Ligne", "area": "Aire", "bar": "Histogramme", + "timeline": "Binaire", "stepline": "Ligne droite", "displayAxes": "Afficher les axes ?", "displayVariation": "Afficher la variation ?", "yes": "Oui", "no": "Non", "preview": "Prévisualisation", - "showPreviewButton": "Afficher une prévisualisation" + "showPreviewButton": "Afficher une prévisualisation", + "on": "On", + "off": "Off", + "start_date": "Début le : ", + "end_date": "Fin le : " }, "ecowatt": { "title": "Ecowatt France", @@ -403,7 +415,7 @@ "no": "Non" }, "scene": { - "editNameLabel": "Entrez le nom de cette box", + "editNameLabel": "Nom du widget (optionnel)", "editNamePlaceholder": "Nom affiché sur le tableau de bord", "editSceneLabel": "Sélectionnez la scène que vous souhaitez afficher ici." }, @@ -569,7 +581,7 @@ "title": "Scanner de présence", "noConfigLabel": "La configuration n'est pas chargée, merci de réessayer.", "errorLabel": "Une erreur est survenue lors du chargement de la configuration.", - "presenceScannerDescription": "Le scanner de présence effectue un scan Bluetooth à interval régulier. Dès qu’un appareil est détecté, l'appareil est marqué comme \"présent\" dans Gladys. Dans les scènes, vous avez la possibilité de créer un déclencheur qui écoute sur cet état. Ainsi, vous pouvez facilement faire une scène qui vous met comme présent à la maison dès qu'un appareil bluetooth est détecté.", + "presenceScannerDescription": "Le scanner de présence effectue un scan Bluetooth à interval régulier. Dès qu'un appareil est détecté, l'appareil est marqué comme \"présent\" dans Gladys. Dans les scènes, vous avez la possibilité de créer un déclencheur qui écoute sur cet état. Ainsi, vous pouvez facilement faire une scène qui vous met comme présent à la maison dès qu'un appareil bluetooth est détecté.", "presenceScannerStatusLabel": "Activer ou désactiver l'analyse de présence d'appareils", "presenceScannerFrequencyLabel": "Fréquence de scan bluetooth", "presenceScannerFrequencyUnit": "minutes", @@ -606,6 +618,17 @@ "configurationSuccess": "Sauvegarde de la configuration du compte terminée.", "buttonSave": "Sauvegarder" }, + "free-mobile": { + "title": "Free Mobile", + "description": "Envoyer des sms depuis Gladys grâce à Free Mobile.", + "documentation": "Documentation Free Mobile", + "introduction": "Ce plugin vous permet d'envoyer des sms à votre portable Free via le service de notification proposé par Free. Entrez votre identifiant client et la clé d'identification ci-dessous que vous retrouverez sur le site FreeMobile.", + "username": "Identifiant client Free Mobile", + "key": "Clé d'identification au service", + "configurationError": "Nous n'avons pas pu sauvegarder cette configuration.", + "configurationSuccess": "Sauvegarde de la configuration du compte terminée.", + "saveButton": "Sauvegarder" + }, "philipsHue": { "title": "Philips Hue", "description": "Contrôler les lumières Philips Hue.", @@ -740,7 +763,7 @@ "clientIdPlaceholder": "client ID de My Apps dans Netatmo Connect", "clientSecretLabel": "Secret client", "clientSecretPlaceholder": "client secret de My Apps dans Netatmo Connect", - "connectionInfoLabel": "Lorsque vous modifiez ces informations, un nouveau jeton est requis. La déconnexion effacera également votre jeton d’accès. Une nouvelle demande de connexion sera donc faite à l'API Netatmo lorsque vous cliquerez sur ces boutons.", + "connectionInfoLabel": "Lorsque vous modifiez ces informations, un nouveau jeton est requis. La déconnexion effacera également votre jeton d'accès. Une nouvelle demande de connexion sera donc faite à l'API Netatmo lorsque vous cliquerez sur ces boutons.", "energyApiLabel": "Activer l'API \"Energy\" (récupérer les appareils Plug, Thermostat et Vannes Netatmo)", "weatherApiLabel": "Activer l'API \"Weather\" (récupérer les appareils de la station météo Netatmo)", "saveLabel": "Sauvegarder et connecter", @@ -1074,26 +1097,6 @@ "documentation": "Documentation OwnTracks", "longDescription": "OwnTracks est une application open-source disponible sur iOS et Android qui vous permet d'envoyer votre position GPS à un serveur distant. Il est possible d'utiliser OwnTracks avec Gladys pour déclencher des scènes selon votre position. Pour configurer OwnTracks, vous pouvez suivre ce tutoriel dans notre documentation." }, - "zwave": { - "title": "Open-Zwave [OLD]", - "description": "En fin de vie, il n'est plus possible de l'utiliser.", - "documentation": "Documentation Open-Zwave", - "device": { - "title": "Anciens appareils Open-Zwave", - "convertToMqtt": "Convertir en appareil MQTT", - "oldIntegrationWarning": "Cette intégration était basée sur Open-Zwave, une librairie qui n'est plus maintenue. Cette intégration est en fin de vie. Nous travaillons sur une nouvelle intégration basée sur Zwave-js-ui, mais en attendant il faut s'armer de patience, et utiliser Zwave-js-ui + Node-RED + Gladys.
Nous sommes à la recherche de testeurs/développeurs pour la nouvelle intégration sur ce sujet sur le forum :)", - "noDevices": "Aucun appareil Z-Wave n'a encore été ajouté.", - "scanButton": "Rechercher", - "nameLabel": "Nom", - "roomLabel": "Pièce", - "featuresLabel": "Fonctionnalités", - "saveButton": "Sauvegarder", - "deleteButton": "Supprimer", - "editButton": "Éditer", - "mostRecentValueAt": "Dernière valeur reçue {{mostRecentValueAt}}.", - "noValueReceived": "Aucune valeur reçue." - } - }, "openWeather": { "title": "API OpenWeather", "documentation": "Documentation OpenWeather", @@ -1247,6 +1250,41 @@ "conflictError": "L'appareil actuel est déjà dans Gladys." } }, + "airplay": { + "title": "Airplay", + "description": "Contrôler les appareils Airplay sur votre réseau local", + "deviceTab": "Appareils", + "discoverTab": "Découverte Airplay", + "setupTab": "Configuration", + "documentation": "Documentation Airplay", + "discoverDeviceDescr": "Scanner automatiquement les appareils Airplay", + "nameLabel": "Nom de l'appareil", + "namePlaceholder": "Entrez le nom de votre appareil", + "hostLabel": "Adresse IP", + "roomLabel": "Pièce", + "saveButton": "Sauvegarder", + "alreadyCreatedButton": "Déjà créé", + "deleteButton": "Supprimer", + "device": { + "title": "Appareils Airplay dans Gladys", + "editButton": "Éditer", + "noDeviceFound": "Aucun appareil Airplay trouvé.", + "featuresLabel": "Fonctionnalités" + }, + "discover": { + "title": "Appareils détectés sur votre réseau local", + "description": "Les appareils Airplay sont automatiquement découverts.", + "error": "Erreur de découverte des appareils Airplay. Est-ce que votre enceinte Airplay est sous tension et accessible sur le réseau local ?", + "noDeviceFound": "Aucun appareil Airplay n'a été découvert.", + "errorWhileScanning": "Une erreur est survenue lors du scan.", + "scan": "Scanner" + }, + "error": { + "defaultError": "Une erreur s'est produite lors de l'enregistrement de l'appareil.", + "defaultDeletionError": "Une erreur s'est produite lors de la suppression de l'appareil.", + "conflictError": "L'appareil actuel est déjà dans Gladys." + } + }, "zwavejs-ui": { "title": "ZWave JS UI", "description": "Contrôler vos appareils dans Z-Wave JS UI", @@ -1264,7 +1302,7 @@ "saveButton": "Sauvegarder", "alreadyCreatedButton": "Déjà créé", "deleteButton": "Supprimer", - "alphaWarning": "Cette intégration est une alpha et ne gère pour l'instant qu'un nombre limité d'appareils. Nous sommes preneur de toute aide pour intégrer d'autres appareils !", + "alphaWarning": "Cette intégration gère un nombre limité d'appareils Z-Wave, si tu as des appareils non-gérés, n'hésite pas à nous le soumettre pour qu'il soit ajouté !", "device": { "title": "Appareils Z-Wave JS UI dans Gladys", "editButton": "Editer", @@ -1388,6 +1426,13 @@ "notFound": "Appareil introuvable.", "backToList": "Retour à la liste des appareils", "saveError": "Erreur lors de l'enregistrement ou de la suppression de l'appareil", + "validationError": "Erreur de validation : L'appareil n'a pas été correctement rempli.", + "validationErrors": { + "name": "Le champ \"Nom\" est obligatoire", + "min": "Le champ \"Valeur minimum\" est obligatoire et doit être une valeur entière", + "max": "Le champ \"Valeur maximum\" est obligatoire et doit être une valeur entière", + "external_id": "Le champ \"ID Externe\" est obligatoire et doit être unique à travers tous les appareils" + }, "saveConflictError": "Conflit : êtes-vous sûr que tous les IDs externes sont uniques ?", "mostRecentValueAt": "Dernière valeur reçue {{mostRecentValueAt}}.", "noValueReceived": "Aucune valeur reçue." @@ -1614,13 +1659,15 @@ }, "lanManager": { "title": "LAN Manager", - "description": "Gérez les appareils sur votre réseau local.", + "description": "Détection de présence via scan réseau", "deviceTab": "Appareils", "discoverTab": "Découverte LAN", "setupTab": "Scanner de présence", "documentation": "Documentation LAN Manager", "device": { - "title": "Appareils LAN", + "title": "Appareils ajoutés à l'intégration", + "explanation": "Cette intégration vous permet de détecter la présence des utilisateurs en scannant le réseau.", + "iosWarning": "Attention, cette intégration ne fonctionne pas avec les appareils iOS.", "search": "Chercher un appareil", "noDevices": "Aucun appareil LAN n'a encore été ajouté.", "manufacturerLabel": "Constructeur", @@ -1642,7 +1689,7 @@ "title": "Scanner de présence", "errorLabel": "Une erreur est survenue lors du chargement de la configuration.", "noConfigLabel": "La configuration n'est pas chargée, merci de réessayer.", - "presenceScannerDescription": "Le scanner de présence effectue un scan sur le réseau à interval régulier. Dès qu’un appareil est détecté, l'appareil est marqué comme \"présent\" dans Gladys. Dans les scènes, vous avez la possibilité de créer un déclencheur qui écoute sur cet état. Ainsi, vous pouvez facilement faire une scène qui vous met comme présent à la maison dès qu'un appareil est détecté sur le réseau.", + "presenceScannerDescription": "Le scanner de présence effectue un scan sur le réseau à interval régulier. Dès qu'un appareil est détecté, l'appareil est marqué comme \"présent\" dans Gladys. Dans les scènes, vous avez la possibilité de créer un déclencheur qui écoute sur cet état. Ainsi, vous pouvez facilement faire une scène qui vous met comme présent à la maison dès qu'un appareil est détecté sur le réseau.", "presenceScannerStatusLabel": "Activer ou désactiver l'analyse de présence d'appareils", "presenceScannerFrequencyLabel": "Fréquence de scan", "presenceScannerFrequencyUnit": "minutes", @@ -1730,6 +1777,28 @@ "rateLimit": "L'API ChatGPT étant payante, cette intégration est actuellement limitée à 1 000 requêtes par mois et par compte.", "notOnGladysPlus": "L'API ChatGPT étant payante, cette intégration est proposée via Gladys Plus uniquement.", "subscribeToGladysPlus": "Cliquez-ici pour souscrire à Gladys Plus." + }, + "callmebot": { + "title": "CallMeBot", + "description": "Envoyez des messages via WhatsApp et Signal.", + "setupTab": "Configuration", + "documentation": "Documentation", + "setup": { + "title": "Configurer CallMeBot", + "description": "Pour utiliser CallMeBot, vous devez obtenir une clé API. Suivez ces étapes :
1. Allez sur le site web de CallMeBot
2. Choisissez votre plateforme de messagerie préférée (WhatsApp, Signal)
3. Suivez les instructions pour obtenir votre clé API
4. Entrez votre clé API ci-dessous
⚠️ Note : Ce service est unidirectionnel (Gladys peut envoyer des messages mais ne peut pas en recevoir) et ne supporte pas l'envoi d'images.", + "apiKeyLabel": "Clé API", + "apiKeyPlaceholder": "Entrez votre clé API CallMeBot", + "apiKeyHelp": "Votre clé API est utilisée pour s'authentifier auprès du service CallMeBot", + "messagingServiceLabel": "Service de messagerie", + "messagingServiceHelp": "Choisissez le service de messagerie que vous souhaitez utiliser avec CallMeBot", + "phoneNumberLabel": "Numéro de téléphone", + "phoneNumberPlaceholder": "Entrez votre numéro de téléphone", + "phoneNumberHelp": "Votre numéro de téléphone au format international (ex: +33612345678)", + "phoneNumberHelpSignal": "Pour Signal, ce sera un UUID fourni par CallMeBot (ex: 123e4567-e89b-12d3-a456-426614174000)", + "saveButton": "Sauvegarder la configuration", + "saved": "Configuration sauvegardée !", + "error": "Erreur lors de la sauvegarde de la configuration" + } } }, "editScene": { @@ -1752,7 +1821,9 @@ "addTriggerButton": "Ajouter déclencheur", "selectTriggerLabel": "Sélectionnez un type de déclencheur", "newAction": "Nouvelle action", + "newCondition": "Nouvelle condition", "selectActionType": "Sélectionnez un type d'action", + "selectConditionType": "Sélectionner un type de condition", "addActionButton": "Nouvelle action", "noTriggersYet": "Aucun déclencheur n'a encore été ajouté. Il n'est pas obligatoire d'avoir un déclencheur dans une scène.", "noActionsYet": "Aucune action n'a encore été ajoutée. Cliquez sur le bouton + pour ajouter une action à cette scène.", @@ -1782,6 +1853,19 @@ "textPlaceholder": "Texte du message", "explanationText": "Pour injecter une variable, tapez '{{'. Attention, vous devez avoir défini une variable auparavant dans une action 'Récupérer le dernier état' placé avant ce bloc message." }, + "askAi": { + "description": "Cette action enverra un message à l'IA (ChatGPT) via Gladys Plus et vous répondra par message. Si vous joignez une image de caméra, l'IA pourra voir ce qu'il y a sur l'image et même faire une action en conséquence.", + "userLabel": "Gladys répondra à", + "cameraLabel": "Joindre une image de caméra (optionnel)", + "textLabel": "Ma question pour l'IA", + "textPlaceholder": "Texte du message", + "explanationText": "Pour injecter une variable, tapez '{{'. Attention, vous devez avoir défini une variable auparavant dans une action 'Récupérer le dernier état' placé avant ce bloc message." + }, + "smsSend": { + "textLabel": "Message", + "explanationText": "Pour injecter une variable, tapez '{{'. Attention, vous devez avoir défini une variable auparavant dans une action 'Récupérer le dernier état' placé avant ce bloc message.", + "messagePlaceholder": "Mon message" + }, "turnOnLights": { "label": "Sélectionnez les lumières que vous souhaitez allumer" }, @@ -1838,6 +1922,23 @@ "orButton": "+ OU", "explanationText": "Dans le champs valeur, entrez soit une valeur brute soit un calcul basé sur une variable de scène. Pour injecter une variable, tapez '{{'. Attention, vous devez avoir défini une variable auparavant dans une action 'Récupérer le dernier état' placé avant ce bloc condition." }, + "conditionIfThenElse": { + "conditions": "Conditions", + "conditionDescription": "Si toutes les conditions sont réalisées, les actions du bloc \"Alors...\" seront exécutées. Sinon, les actions du bloc \"Sinon...\" seront exécutées.", + "noCondition": "Aucune condition ajoutée. Cliquez sur le bouton '+' pour ajouter une condition à ce bloc", + "addCondition": "Ajouter une condition", + "if": "Si", + "then": "Alors", + "else": "Sinon", + "shortIf": "S", + "shortThen": "A", + "shortElse": "S", + "actionCount": { + "zero": "Aucune action", + "one": "1 action", + "other": "{{count}} actions" + } + }, "checkTime": { "description": "La scène continuera si l'heure actuelle est comprise entre les bornes spécifiées, aux jours spécifiés. Si une condition est vide, elle ne sera pas prise en compte.", "beforeLabel": "Avant", @@ -1938,10 +2039,18 @@ "variablesExplanation": "Pour injecter une variable, tapez '{{ '. Attention, vous devez avoir défini une variable auparavant dans une action 'Récupérer le dernier état' placé avant ce bloc message.", "messagePlaceholder": "Mon message" }, + "zigbee2mqttMessage": { + "topic": "Topic", + "topicPlaceholder": "/gladys/my-topic", + "messageLabel": "Message", + "variablesExplanation": "Pour injecter une variable, tapez '{{ '. Attention, vous devez avoir défini une variable auparavant dans une action 'Récupérer le dernier état' placé avant ce bloc message.", + "messagePlaceholder": "Mon message" + }, "playNotification": { "description": "Cette action fera parler Gladys sur l'enceinte sélectionnée.", "needGladysPlus": "Nécessite Gladys Plus car les API de \"Text To Speech\" sont payantes.", "deviceLabel": "Enceinte", + "volumeLabel": "Volume", "textLabel": "Message à dire sur l'enceinte", "variablesExplanation": "Pour injecter une variable, tapez '{{ '. Attention, vous devez avoir défini une variable auparavant dans une action 'Récupérer le dernier état' placé avant ce bloc message." } @@ -1958,6 +2067,9 @@ "send": "Envoyer un message", "send-camera": "Envoyer une image de caméra" }, + "sms": { + "send": "Envoyer un sms" + }, "delay": "Attendre", "light": { "turn-on": "Allumer les lumières", @@ -1978,8 +2090,9 @@ "stop": "Arrêter le service" }, "condition": { - "only-continue-if": "Continuer seulement si", - "check-time": "Condition temporelle" + "only-continue-if": "Condition sur variables", + "check-time": "Condition temporelle", + "if-then-else": "Condition \"Si... Alors... Sinon...\"" }, "user": { "set-seen-at-home": "Utilisateur vu à la maison", @@ -2006,8 +2119,14 @@ "mqtt": { "send": "Envoyer un message MQTT" }, + "zigbee2mqtt": { + "send": "Envoyer un message Zigbee2mqtt" + }, "music": { "play-notification": "Parler sur une enceinte" + }, + "ai": { + "ask": "Demander à l'IA" } }, "variables": { @@ -2075,7 +2194,8 @@ "on": "On", "off": "Off", "deviceSeen": "Si l'appareil est détecté", - "onlyExecuteAtThreshold": "Exécuter seulement lorsque le seuil est passé ( et non pas à chaque valeur envoyée )" + "onlyExecuteAtThreshold": "Exécuter seulement lorsque le seuil est passé ( et non pas à chaque valeur envoyée )", + "activateOrDeactivateForDuration": "Exécuter la scène après que la condition ait été valide pendant : " }, "scheduledTrigger": { "typeLabel": "Type", @@ -2317,7 +2437,8 @@ "wrongEmailError": "Ce n'est pas un e-mail valide", "networkError": "Erreur réseau : nous n'avons pas réussi à contacter votre instance Gladys. Êtes-vous connecté au réseau ? Votre instance Gladys est-elle en cours d'exécution ?", "unknownError": "Une erreur inconnue s'est produite. Veuillez réessayer ou poster un message sur Gladys community.", - "success": "Succès ! Vous devriez voir un lien de réinitialisation de mot de passe dans les logs de Gladys.", + "success": "Succès ! Je vous ai envoyé un lien de réinitialisation de mot de passe par Telegram ou Nextcloud Talk. Si vous n'avez pas configuré ces services, le lien de réinitialisation sera dans les logs de Gladys.", + "howToAccessLogs": "Pour accéder aux logs de Gladys, rendez-vous en ligne de commande et tapez `docker logs gladys --tail=1000` pour afficher les 1000 dernières lignes.", "userNotFound": "Aucun compte n'est lié à cet e-mail.", "rateLimitError": "Vous avez essayé ce formulaire trop de fois. Veuillez réessayer dans 30 minutes ou redémarrer votre instance Gladys maintenant.", "invalidEmail": "Nous n'avons pas pu vérifier votre adresse e-mail.", @@ -2387,8 +2508,12 @@ "operations": "Opérations", "upToDate": "Gladys est à jour", "newUpgradeAvailable": "Mise à jour disponible", - "newUpgradeAvailableText": "Gladys se mettra à jour automatiquement si vous utilisez l'image Raspberry Pi OS Gladys officielle. Pour une installation manuellle, vous devez avoir configuré Watchtower pour que Gladys Assistant se mette à jour.", - "download": "Télécharger", + "newUpgradeAvailableText": "Gladys se mettra à jour automatiquement si vous utilisez Watchtower. Si vous voulez mettre à jour manuellement, cliquez sur le bouton ci-dessous. Cela lancera un container Watchtower qui mettra à jour tous les containers présents sur cette machine.", + "notConnectedToDocker": "Gladys n'est pas connectée à Docker. Pour avoir accès à Docker depuis Gladys, il faut lancer Gladys avec le bon volume `-v /var/run/docker.sock:/var/run/docker.sock`.", + "updateNow": "Mettre à jour maintenant", + "upgradeInProgress": "Mise à jour en cours...", + "upgradeLogs": "Messages de Watchtower", + "websocketNotConnected": "Connexion Websocket perdue... Gladys est probablement en cours de redémarrage. Vous pouvez rafraichir cette page pour vérifier si Gladys est de nouveau accessible.", "notAvailable": "Indisponible sur l'installation personnalisée.", "containers": "Conteneurs", "containerName": "Nom", @@ -2406,10 +2531,11 @@ "numberOfHoursBeforeStateIsOutdated": "Délai avant expiration d'un état", "numberOfHoursBeforeStateIsOutdatedDescription": "Ce délai correspond au nombre d'heures avant qu'un état de capteur soit considéré comme \"périmé\" et ainsi plus affiché sur le tableau de bord.", "hours": "heures", - "vacuumDatabaseTitle": "Nettoyer la base de données", - "vacuumDatabaseDescription": "En cliquant sur ce bouton, Gladys lancera un nettoyage de la base de données, ce qui libère de l'espace disque. Cette tâche ne supprime pas de données, elle réarrange juste la donnée existante sur le disque et vide des vieilles lignes qui ne sont plus utilisées. Attention, cette opération peut prendre un certain temps sur les grosses bases de données, et pendant ce temps Gladys sera indisponible. Ne lancez pas cette commande si vous avez besoin de Gladys dans la prochaine heure.", + "vacuumDatabaseTitle": "Nettoyer la base de données SQLite", + "vacuumDatabaseDescription": "En cliquant sur ce bouton, Gladys lancera un nettoyage de la base de données SQLite, ce qui libère de l'espace disque. Cette tâche ne supprime pas de données, elle réarrange juste la donnée existante sur le disque et vide des vieilles lignes qui ne sont plus utilisées. Pendant le nettoyage, Gladys sera indisponible.", "vacuumDatabaseButton": "Lancer le nettoyage", "vacuumDatabaseStarted": "Le nettoyage a commencé... Gladys sera indisponible jusqu'à la fin du nettoyage.", + "vacuumDatabaseFinished": "Le nettoyage a terminé. Gladys est de nouveau disponible. Temps de nettoyage : {{duration}}.", "containerState": { "created": "Créé", "restarting": "Redémarrage", @@ -2469,7 +2595,8 @@ "duplicateSceneButton": "Dupliquer", "invalidName": "Le nom est requis", "invalidIcon": "L'icône est requise", - "sceneAlreadyExist": "Une scène avec le même nom existe déjà." + "sceneAlreadyExist": "Une scène avec le même nom existe déjà.", + "nameAfterCopy": "Copie de {{name}}" }, "scene": { "title": "Scènes", @@ -2521,7 +2648,7 @@ "emailLabel": "Adresse e-mail", "emailPlaceholder": "Entrez votre e-mail", "passwordLabel": "Mot de passe", - "forgotPasswordLabel": "J’ai oublié mon mot de passe", + "forgotPasswordLabel": "J'ai oublié mon mot de passe", "passwordPlaceholder": "Entrez votre mot de passe", "loginButtonText": "Connexion", "wrongCredentials": "E-mail / mot de passe incorrect.", @@ -2748,6 +2875,16 @@ "heating": "Chauffage" } }, + "heater": { + "pilot-wire-mode": { + "comfort": "Confort", + "eco": "Eco", + "off": "Off", + "frost-protection": "Hors Gel", + "comfort_-1": "Confort -1°C", + "comfort_-2": "Confort -2°C" + } + }, "siren": { "lmh_volume": { "low": "Faible", @@ -2819,7 +2956,38 @@ "48": "Pression longue", "49": "Relâchement court", "50": "Relâchement long", - "51": "Pression double" + "51": "Pression double", + "52": "Bouton Bascule", + "53": "Bouton Bascule maintenu", + "54": "Luminosité Plus Clic", + "55": "Luminosité Plus Maintenu", + "56": "Luminosité Plus Relâchée", + "57": "Luminosité Moins Clic", + "58": "Luminosité Moins Maintenu", + "59": "Luminosité Moins Relâchée", + "60": "Pressé", + "61": "Simple Gauche", + "62": "Simple Droit", + "63": "Simple sur les deux", + "64": "Double Gauche", + "65": "Double Droit", + "66": "Double sur les deux", + "67": "Triple Gauche", + "68": "Triple Droit", + "69": "Triple sur les deux", + "70": "Maintenu Gauche", + "71": "Maintenu Droit", + "72": "Maintenu sur les deux" + } + }, + "heater": { + "pilot-wire-mode": { + "0": "Off", + "1": "Hors Gel", + "2": "Eco", + "3": "Confort -1°C", + "4": "Confort -2°C", + "5": "Confort" } }, "opening-sensor": { @@ -2857,6 +3025,13 @@ "one": "Oui" } }, + "input": { + "binary": { + "other": "Aucune valeur reçue", + "zero": "Off", + "one": "On" + } + }, "risk": { "integer": { "no-risk": "Pas de risque", @@ -2906,6 +3081,10 @@ "shortCategoryName": "Détecteur de présence", "push": "Présence" }, + "rain-sensor": { + "shortCategoryName": "Détecteur de pluie", + "binary": "Détection pluie Oui/Non" + }, "light-sensor": { "shortCategoryName": "Capteur de luminosité", "integer": "Luminosité entière", @@ -2968,7 +3147,8 @@ }, "button": { "shortCategoryName": "Bouton", - "click": "Clic bouton" + "click": "Clic bouton", + "push": "Bouton poussoir" }, "pressure-sensor": { "shortCategoryName": "Capteur de pression", @@ -3022,6 +3202,10 @@ "mode": "Mode", "target-temperature": "Température" }, + "heater": { + "shortCategoryName": "Chauffage", + "pilot-wire-mode": "Mode" + }, "tamper": { "shortCategoryName": "Détecteur de sabotage", "binary": "Détection sabotage (Oui/Non)" @@ -3068,6 +3252,67 @@ "index": "Index", "daily-consumption": "Consommation journalière" }, + "teleinformation": { + "shortCategoryName": "Téléinformation", + "binary": "Relais", + "east": "Energie active soutirée totale (EAST)", + "eait": "Energie active injectée totale (EAIT)", + "easf01": "Energie active soutirée fournisseur (EASF01)", + "easf02": "Energie active soutirée fournisseur (EASF02)", + "easf03": "Energie active soutirée fournisseur (EASF03)", + "easf04": "Energie active soutirée fournisseur (EASF04)", + "easf05": "Energie active soutirée fournisseur (EASF05)", + "easf06": "Energie active soutirée fournisseur (EASF06)", + "easf07": "Energie active soutirée fournisseur (EASF07)", + "easf08": "Energie active soutirée fournisseur (EASF08)", + "easf09": "Energie active soutirée fournisseur (EASF09)", + "easf10": "Energie active soutirée fournisseur (EASF10)", + "pref": "Puissance apparente référence (PREF)", + "pcoup": "Puissance apparente coupure (PCOUP)", + "vtic": "Version du protocole (VTIC)", + "ccasn": "Position de la courbe charge active (CCASN)", + "ccasn_1": "Position de la courbe charge active (CCASN-1)", + "umoy1": "Tension moyenne (UMOY1)", + "umoy2": "Tension moyenne (UMOY2)", + "umoy3": "Tension moyenne (UMOY3)", + "erq1": "Energie réactive Q1 totale (ERQ1)", + "erq2": "Energie réactive Q2 totale (ERQ2)", + "erq3": "Energie réactive Q3 totale (ERQ3)", + "erq4": "Energie réactive Q4 totale (ERQ4)", + "irms1": "Courant efficace (IRMS1)", + "irms2": "Courant efficace (IRMS2)", + "irms3": "Courant efficace (IRMS3)", + "urms1": "Tension efficace (URMS1)", + "urms2": "Tension efficace (URMS2)", + "urms3": "Tension efficace (URMS3)", + "easd01": "Energie active soutirée distributeur (EASD01)", + "easd02": "Energie active soutirée distributeur (EASD02)", + "easd03": "Energie active soutirée distributeur (EASD03)", + "easd04": "Energie active soutirée distributeur (EASD04)", + "ntarf": "Numéro d'indice tarifaire (NTARF)", + "ccain": "Point n de la courbe de charge active injectée (CCAIN)", + "ccain_1": "Point n-1 de la courbe de charge active injectée (CCAIN-1)", + "sinsti": "Puissance apparente instantanée injectée (SINSTI)", + "smaxin": "Puissance apparente max. injectée n (SMAXIN)", + "smaxin_1": "Puissance apparente max. injectée n-1 (SMAXIN-1)", + "smaxn": "Puissance apparente max. soutirée (SMAXN)", + "smaxn2": "Puissance apparente max. soutirée (SMAXN2)", + "smaxn3": "Puissance apparente max. soutirée (SMAXN3)", + "sinsts": "Puissance apparente instantanée soutirée (SINSTS)", + "sinsts2": "Puissance apparente instantanée soutirée (SINSTS2)", + "sinsts3": "Puissance apparente instantanée soutirée (SINSTS3)", + "smaxn_1": "Puissance apparente max. soutirée n-1 (SMAXN-1)", + "smaxn2_1": "Puissance apparente max. soutirée n-1 (SMAXN2-1)", + "smaxn3_1": "Puissance apparente max. soutirée n-1 (SMAXN3-1)", + "hhphc": "Programme HPHC (HHPHC)", + "imax": "Intensité maximale (IMAX)", + "adps": "Alerte dépassement puissance souscrite (ADPS)", + "imax2": "Intensité maximale (IMAX2)", + "imax3": "Intensité maximale (IMAX3)", + "adir1": "Alerte de surcourant (ADIR1)", + "adir2": "Alerte de surcourant (ADIR2)", + "adir3": "Alerte de surcourant (ADIR3)" + }, "volume-sensor": { "shortCategoryName": "Capteur de volume", "decimal": "Volume (décimale)", @@ -3084,7 +3329,8 @@ }, "precipitation-sensor": { "shortCategoryName": "Capteur de précipitations", - "decimal": "Précipitation" + "decimal": "Précipitation", + "integer": "Intensité (mV)" }, "uv-sensor": { "shortCategoryName": "Capteur d'UV", @@ -3159,6 +3405,10 @@ "shortCategoryName": "Risque", "integer": "Niveau de risque" }, + "input": { + "shortCategoryName": "Entrée", + "binary": "Etat de l'entrée" + }, "unknown": { "shortCategoryName": "Inconnu", "unknown": "Inconnu" diff --git a/front/src/config/integrations/communications.json b/front/src/config/integrations/communications.json index ea2b3cd5af..60439b621b 100644 --- a/front/src/config/integrations/communications.json +++ b/front/src/config/integrations/communications.json @@ -22,5 +22,14 @@ { "key": "openai", "img": "/assets/integrations/cover/openai.jpg" + }, + { + "key": "free-mobile", + "link": "free-mobile", + "img": "/assets/integrations/cover/free-mobile.jpg" + }, + { + "key": "callmebot", + "img": "/assets/integrations/cover/callmebot.jpg" } ] diff --git a/front/src/config/integrations/devices.json b/front/src/config/integrations/devices.json index 945a3b34f0..16fb313d8b 100644 --- a/front/src/config/integrations/devices.json +++ b/front/src/config/integrations/devices.json @@ -1,8 +1,4 @@ [ - { - "key": "zwave", - "img": "/assets/integrations/cover/zwave.jpg" - }, { "key": "rtspCamera", "link": "rtsp-camera", @@ -93,5 +89,10 @@ "key": "google-cast", "link": "google-cast", "img": "/assets/integrations/cover/google-cast.jpg" + }, + { + "key": "airplay", + "link": "airplay", + "img": "/assets/integrations/cover/airplay.jpg" } ] diff --git a/front/src/routes/calendar/index.js b/front/src/routes/calendar/index.js index 24c49b660c..ec497a2c2d 100644 --- a/front/src/routes/calendar/index.js +++ b/front/src/routes/calendar/index.js @@ -14,21 +14,14 @@ const localizer = dayjsLocalizer(dayjs); class Map extends Component { onRangeChange = range => { let from, to; - if (Array.isArray(range)) { - from = dayjs(range[0]) - .subtract(7, 'day') - .toDate(); + from = dayjs(range[0]).toDate(); to = dayjs(range[range.length - 1]) - .add(7, 'day') + .add(1, 'day') .toDate(); } else { - from = dayjs(range.start) - .subtract(7, 'day') - .toDate(); - to = dayjs(range.end) - .add(7, 'day') - .toDate(); + from = dayjs(range.start).toDate(); + to = dayjs(range.end).toDate(); } this.props.getEventsInRange(from, to); }; @@ -41,17 +34,48 @@ class Map extends Component { } }; + onViewChange = newView => { + localStorage.setItem('calendar_last_view', newView); + }; + componentWillMount() { dayjs.locale(this.props.user.language); - const from = dayjs() + let from = dayjs() .startOf('week') - .subtract(7, 'day') + .subtract(1, 'day') .toDate(); - const to = dayjs() + let to = dayjs() .endOf('week') - .add(7, 'day') + .add(1, 'day') .toDate(); + + switch (localStorage.getItem('calendar_last_view')) { + case 'month': + from = dayjs() + .startOf('month') + .subtract(7, 'day') + .toDate(); + to = dayjs() + .endOf('month') + .add(7, 'day') + .toDate(); + break; + case 'day': + from = dayjs() + .subtract(1, 'day') + .toDate(); + to = dayjs() + .add(1, 'day') + .toDate(); + break; + case 'agenda': + from = dayjs().toDate(); + to = dayjs() + .add(1, 'month') + .toDate(); + break; + } this.props.getEventsInRange(from, to); } @@ -79,7 +103,8 @@ class Map extends Component { }} popup onRangeChange={this.onRangeChange} - defaultView="week" + defaultView={localStorage.getItem('calendar_last_view') || 'week'} + onView={this.onViewChange} culture={props.user.language} messages={this.props.intl.dictionary.calendar} scrollToTime={dayjs() diff --git a/front/src/routes/dashboard/BoxColumns.jsx b/front/src/routes/dashboard/BoxColumns.jsx index d14de80371..18bfbcc74c 100644 --- a/front/src/routes/dashboard/BoxColumns.jsx +++ b/front/src/routes/dashboard/BoxColumns.jsx @@ -2,23 +2,28 @@ import Box from './Box'; import cx from 'classnames'; import style from './style.css'; -const BoxColumns = ({ children, ...props }) => ( -
- {props.homeDashboard &&
- props.homeDashboard.boxes.map((column, x) => (
-
-);
+const BoxColumns = ({ children, ...props }) => {
+ const boxesLength = props.homeDashboard.boxes.length;
+ const columnClass = `col-lg-${12 / boxesLength}`;
+
+ return (
+
- {column.map((box, y) => (
-
- ))}
-
+ {props.homeDashboard &&
+ props.homeDashboard.boxes.map((column, x) => (
+
+ );
+};
export default BoxColumns;
diff --git a/front/src/routes/dashboard/edit-dashboard/EditBoxColumns.jsx b/front/src/routes/dashboard/edit-dashboard/EditBoxColumns.jsx
index 84a5318fce..5ad9e00ce3 100644
--- a/front/src/routes/dashboard/edit-dashboard/EditBoxColumns.jsx
+++ b/front/src/routes/dashboard/edit-dashboard/EditBoxColumns.jsx
@@ -8,10 +8,15 @@ import EditBox from './EditBox';
import EmptyColumnDropZone from './EmptyColumnDropZone';
import BottomDropZone from './BottomDropZone';
import AutoScrollMobile from '../../../components/drag-and-drop/AutoScrollMobile';
-import style from '../style.css';
+import style from './style.css';
+import stylePrimary from '../style.css';
import { DASHBOARD_VISIBILITY_LIST } from '../../../../../server/utils/constants';
const DASHBOARD_EDIT_BOX_TYPE = 'DASHBOARD_EDIT_BOX';
+const maxBoxes = 3;
+const getBoxesLength = props => {
+ return props.homeDashboard.boxes.length;
+};
const EditBoxColumns = ({ children, ...props }) => (
+ {column.map((box, y) => (
+
+ ))}
+
@@ -89,7 +94,7 @@ const EditBoxColumns = ({ children, ...props }) => (
+
{props.isMobileReordering &&
+
+
+
{props.homeDashboard &&
props.homeDashboard.boxes &&
props.homeDashboard.boxes.map((column, x) => (
diff --git a/front/src/routes/dashboard/edit-dashboard/index.js b/front/src/routes/dashboard/edit-dashboard/index.js
index cb5c7ee007..c0027de978 100644
--- a/front/src/routes/dashboard/edit-dashboard/index.js
+++ b/front/src/routes/dashboard/edit-dashboard/index.js
@@ -101,7 +101,7 @@ class EditDashboard extends Component {
}
}
});
- await this.setState(newState);
+ await this.setState({ ...newState, boxNotEmptyError: false });
};
addBox = x => {
@@ -127,7 +127,7 @@ class EditDashboard extends Component {
}
}
});
- await this.setState(newState);
+ await this.setState({ ...newState, boxNotEmptyError: false });
};
updateCurrentDashboardName = e => {
@@ -153,18 +153,20 @@ class EditDashboard extends Component {
};
updateBoxConfig = (x, y, data) => {
- const newState = update(this.state, {
- currentDashboard: {
- boxes: {
- [x]: {
- [y]: {
- $merge: data
+ this.setState(prevState => {
+ const newState = update(prevState, {
+ currentDashboard: {
+ boxes: {
+ [x]: {
+ [y]: {
+ $merge: data
+ }
}
}
}
- }
+ });
+ return { ...newState, boxNotEmptyError: false };
});
- this.setState(newState);
};
updateNewSelectedBox = (x, y, type) => {
@@ -252,6 +254,36 @@ class EditDashboard extends Component {
}
};
+ addColumn = () => {
+ const newState = update(this.state, {
+ currentDashboard: {
+ boxes: {
+ $push: [[]]
+ }
+ }
+ });
+ this.setState({ ...newState, boxNotEmptyError: false });
+ };
+
+ deleteCurrentColumn = async x => {
+ const { boxes } = this.state.currentDashboard;
+ if (boxes[x].length === 0) {
+ const newState = update(this.state, {
+ currentDashboard: {
+ boxes: {
+ $splice: [[x, 1]]
+ }
+ }
+ });
+ await this.setState({ ...newState, boxNotEmptyError: false });
+ } else {
+ this.setState({
+ boxNotEmptyError: true,
+ columnBoxNotEmptyError: x
+ });
+ }
+ };
+
askDeleteCurrentDashboard = async () => {
await this.setState({
askDeleteDashboard: true
@@ -313,6 +345,8 @@ class EditDashboard extends Component {
dashboards: [],
newSelectedBoxType: {},
askDeleteDashboard: false,
+ boxNotEmptyError: false,
+ columnBoxNotEmptyError: null,
isMobileReordering: false
};
}
@@ -337,6 +371,8 @@ class EditDashboard extends Component {
dashboardAlreadyExistError,
unknownError,
askDeleteDashboard,
+ boxNotEmptyError,
+ columnBoxNotEmptyError,
savingNewDashboardList,
isMobileReordering
}
@@ -373,6 +409,10 @@ class EditDashboard extends Component {
savingNewDashboardList={savingNewDashboardList}
toggleMobileReorder={this.toggleMobileReorder}
isMobileReordering={isMobileReordering}
+ addColumn={this.addColumn}
+ deleteCurrentColumn={this.deleteCurrentColumn}
+ boxNotEmptyError={boxNotEmptyError}
+ columnBoxNotEmptyError={columnBoxNotEmptyError}
/>
);
}
diff --git a/front/src/routes/dashboard/edit-dashboard/style.css b/front/src/routes/dashboard/edit-dashboard/style.css
index 3bc04814c7..13d9f9eb2c 100644
--- a/front/src/routes/dashboard/edit-dashboard/style.css
+++ b/front/src/routes/dashboard/edit-dashboard/style.css
@@ -1,3 +1,39 @@
+.columnsCard {
+ display: flex;
+ flex-wrap: nowrap;
+ width: 100%;
+ padding-right: 0;
+}
+
+.column {
+ flex-grow: 1;
+ flex-basis: 0;
+ padding: 0 8px;
+ box-sizing: border-box;
+ min-width: 0px;
+}
+
+.columnBoxHeader {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ min-height: 48px;
+ height: auto;
+}
+
+.btnLinkDelete {
+ text-decoration: none;
+ border: none;
+ padding: 0;
+ cursor: pointer;
+ color: #343a40;
+ background-color: transparent;
+}
+
+.btnAddColumn {
+ padding: 0;
+}
+
.dropZone {
height: 100%;
min-height: 10rem;
@@ -27,9 +63,72 @@
margin-bottom: 1.5rem;
}
-@media (max-width: 992px) {
+@media (min-width: 1280px) {
+ .columnAddButton {
+ position: relative;
+ flex: 0 0 46px;
+ max-width: 46px;
+ padding-left: 8px;
+ display: flex;
+ align-items: center;
+ }
+
+ .btnAddColumn {
+ width: 31px;
+ }
+
+ .btnAddColumn[data-title]:hover:after {
+ content: attr(data-title);
+ position: absolute;
+ top: 100%;
+ left: 100%;
+ transform: translateX(-100%) translateY(5px);
+ white-space: normal;
+ color: #467fcf;
+ background-color: #fff;
+ padding: 2px 4px;
+ border: 1px solid #467fcf;
+ border-radius: 4px;
+ font-size: 12px;
+ z-index: 1000;
+ width: 150px;
+ }
+}
+
+@media (max-width: 1280px) {
.bottomDropZone {
min-height: 5rem;
height: 5rem;
}
-}
+
+ .columnsCard {
+ flex-wrap: wrap;
+ width: 100%;
+ }
+
+ .column {
+ flex-grow: 1;
+ flex-basis: 100%;
+ padding: 0 0px;
+ }
+
+ .columnBoxHeader {
+ padding-top: 1.5rem;
+ margin-bottom: 2px;
+ flex-wrap: wrap;
+ justify-content: center;
+ border-top: 1px dashed #bdbdbd;
+ min-height: 0px;
+ }
+
+ .columnAddButton {
+ width: 100%;
+ flex: none;
+ }
+
+ .displayTextMobile {
+ display: inline !important;
+ margin-left: 0.5rem;
+ text-wrap: wrap;
+ }
+}
\ No newline at end of file
diff --git a/front/src/routes/dashboard/index.js b/front/src/routes/dashboard/index.js
index 1982df66c5..d85cc427a7 100644
--- a/front/src/routes/dashboard/index.js
+++ b/front/src/routes/dashboard/index.js
@@ -136,10 +136,12 @@ class Dashboard extends Component {
};
isBrowserFullScreenCompatible = () => {
+ // eslint-disable-next-line compat/compat
return document.fullscreenEnabled || document.webkitFullscreenEnabled;
};
isFullScreen = () => {
+ // eslint-disable-next-line compat/compat
return document.fullscreenElement || document.webkitFullscreenElement || document.mozFullScreenElement;
};
diff --git a/front/src/routes/forgot-password/ForgotPasswordPage.jsx b/front/src/routes/forgot-password/ForgotPasswordPage.jsx
index df49a3bd2b..df2db43318 100644
--- a/front/src/routes/forgot-password/ForgotPasswordPage.jsx
+++ b/front/src/routes/forgot-password/ForgotPasswordPage.jsx
@@ -32,6 +32,9 @@ const ForgotPasswordPage = ({ children, ...props }) => (
{props.forgotPasswordStatus === RequestStatus.Success && (
-
-
-
- {column.length > 0 && (
-
diff --git a/front/src/routes/dashboard/edit-dashboard/EditDashboard.jsx b/front/src/routes/dashboard/edit-dashboard/EditDashboard.jsx
index af6dae9665..49645d0d03 100644
--- a/front/src/routes/dashboard/edit-dashboard/EditDashboard.jsx
+++ b/front/src/routes/dashboard/edit-dashboard/EditDashboard.jsx
@@ -66,6 +66,10 @@ const EditDashboard = ({ children, ...props }) => (
savingNewDashboardList={props.savingNewDashboardList}
isMobileReordering={props.isMobileReordering}
toggleMobileReorder={props.toggleMobileReorder}
+ deleteCurrentColumn={props.deleteCurrentColumn}
+ addColumn={props.addColumn}
+ boxNotEmptyError={props.boxNotEmptyError}
+ columnBoxNotEmptyError={props.columnBoxNotEmptyError}
/>
)}
-
-
- {column.length > 0 && (
-
- {column.map((box, y) => (
-
+
+
+
+ {props.boxNotEmptyError && props.columnBoxNotEmptyError === x && (
+
+
+
+
)}
+
+ {column.length > 0 && (
+
))}
+ {getBoxesLength(props) < maxBoxes && (
+
+ {column.map((box, y) => (
+
+ )}
- {column.length === 0 &&
-
+ {props.isMobileReordering &&
+
+
+
+
+
+
+
+ )}
+
+
-
+
![]()
{
alt={
-
+
-
+
+
+);
+
+export default connect('user', {})(DevicePage);
diff --git a/front/src/routes/integration/all/airplay/device-page/style.css b/front/src/routes/integration/all/airplay/device-page/style.css
new file mode 100644
index 0000000000..4804f6a3b0
--- /dev/null
+++ b/front/src/routes/integration/all/airplay/device-page/style.css
@@ -0,0 +1,7 @@
+.emptyStateDivBox {
+ margin-top: 35px;
+}
+
+.tuyaListBody {
+ min-height: 200px
+}
diff --git a/front/src/routes/integration/all/airplay/discover-page/DiscoverTab.jsx b/front/src/routes/integration/all/airplay/discover-page/DiscoverTab.jsx
new file mode 100644
index 0000000000..ec2109a558
--- /dev/null
+++ b/front/src/routes/integration/all/airplay/discover-page/DiscoverTab.jsx
@@ -0,0 +1,84 @@
+import { Text } from 'preact-i18n';
+import cx from 'classnames';
+
+import EmptyState from './EmptyState';
+import style from './style.css';
+import AirplayDeviceBox from '../AirplayDeviceBox';
+import { connect } from 'unistore/preact';
+import { Component } from 'preact';
+
+class DiscoverTab extends Component {
+ getDiscoveredDevices = async () => {
+ this.setState({
+ loading: true
+ });
+ try {
+ const discoveredDevices = await this.props.httpClient.get('/api/v1/service/airplay/discover');
+ const existingAirplayDevices = await this.props.httpClient.get('/api/v1/service/airplay/device', {});
+ discoveredDevices.forEach(discoveredDevice => {
+ const existingDevice = existingAirplayDevices.find(d => d.external_id === discoveredDevice.external_id);
+ if (existingDevice) {
+ discoveredDevice.alreadyExist = true;
+ }
+ });
+ this.setState({
+ discoveredDevices,
+ loading: false,
+ errorLoading: false
+ });
+ } catch (e) {
+ this.setState({
+ loading: false,
+ errorLoading: true
+ });
+ }
+ };
+ async componentWillMount() {
+ this.getDiscoveredDevices();
+ }
+
+ render(props, { loading, errorLoading, discoveredDevices }) {
+ return (
+
+
+);
+
+export default connect('user', {})(AirplayDiscoverPage);
diff --git a/front/src/routes/integration/all/airplay/discover-page/style.css b/front/src/routes/integration/all/airplay/discover-page/style.css
new file mode 100644
index 0000000000..ba050f4eb5
--- /dev/null
+++ b/front/src/routes/integration/all/airplay/discover-page/style.css
@@ -0,0 +1,7 @@
+.emptyStateDivBox {
+ margin-top: 89px;
+}
+
+.airplayListBody {
+ min-height: 200px;
+}
diff --git a/front/src/routes/integration/all/zwave/ZwavePage.js b/front/src/routes/integration/all/callmebot/CallMeBot.jsx
similarity index 58%
rename from front/src/routes/integration/all/zwave/ZwavePage.js
rename to front/src/routes/integration/all/callmebot/CallMeBot.jsx
index 5b2cafa559..2c2faf2f3d 100644
--- a/front/src/routes/integration/all/zwave/ZwavePage.js
+++ b/front/src/routes/integration/all/callmebot/CallMeBot.jsx
@@ -1,7 +1,8 @@
import { Text } from 'preact-i18n';
+import { Link } from 'preact-router/match';
import DeviceConfigurationLink from '../../../../components/documentation/DeviceConfigurationLink';
-const DashboardSettings = ({ children, user }) => (
+const CallMeBotPage = ({ children, user }) => (
-
+
+
+ );
+ }
+}
+
+export default connect('httpClient', {})(AirplayDeviceBox);
diff --git a/front/src/routes/integration/all/airplay/AirplayPage.jsx b/front/src/routes/integration/all/airplay/AirplayPage.jsx
new file mode 100644
index 0000000000..53c38fed18
--- /dev/null
+++ b/front/src/routes/integration/all/airplay/AirplayPage.jsx
@@ -0,0 +1,62 @@
+import { Text } from 'preact-i18n';
+import { Link } from 'preact-router/match';
+import DeviceConfigurationLink from '../../../../components/documentation/DeviceConfigurationLink';
+
+const AirplayPage = ({ children, user }) => (
+
+
+ {device.name}
+
+
+
+
+
+
+ {errorMessage && (
+
+
+
+ )}
+ {tooMuchStatesError && (
+
+
+ )}
+
+
+
+ }
+ disabled={!editable || !validModel}
+ />
+
+
+
+ {housesWithRooms && (
+
+
+
+
+ )}
+
+
+ {device.alreadyExist && (
+
+ )}
+
+ {!device.alreadyExist && (
+
+ )}
+
+ {deleteButton && (
+
+ )}
+
+
+
+);
+
+export default AirplayPage;
diff --git a/front/src/routes/integration/all/airplay/device-page/DeviceTab.jsx b/front/src/routes/integration/all/airplay/device-page/DeviceTab.jsx
new file mode 100644
index 0000000000..4774d73c0a
--- /dev/null
+++ b/front/src/routes/integration/all/airplay/device-page/DeviceTab.jsx
@@ -0,0 +1,133 @@
+import { Text, Localizer } from 'preact-i18n';
+import cx from 'classnames';
+
+import EmptyState from './EmptyState';
+import { RequestStatus } from '../../../../../utils/consts';
+import style from './style.css';
+import CardFilter from '../../../../../components/layout/CardFilter';
+import AirplayDeviceBox from '../AirplayDeviceBox';
+import debounce from 'debounce';
+import { Component } from 'preact';
+import { connect } from 'unistore/preact';
+
+class DeviceTab extends Component {
+ constructor(props) {
+ super(props);
+ this.debouncedSearch = debounce(this.search, 200).bind(this);
+ }
+
+ componentWillMount() {
+ this.getAirplayDevices();
+ this.getHouses();
+ }
+
+ getAirplayDevices = async () => {
+ this.setState({
+ getAirplayStatus: RequestStatus.Getting
+ });
+ try {
+ const options = {
+ order_dir: this.state.orderDir || 'asc'
+ };
+ if (this.state.search && this.state.search.length) {
+ options.search = this.state.search;
+ }
+
+ const airplayDevices = await this.props.httpClient.get('/api/v1/service/airplay/device', options);
+ this.setState({
+ airplayDevices,
+ getAirplayStatus: RequestStatus.Success
+ });
+ } catch (e) {
+ this.setState({
+ getAirplayStatus: e.message
+ });
+ }
+ };
+
+ async getHouses() {
+ this.setState({
+ housesGetStatus: RequestStatus.Getting
+ });
+ try {
+ const params = {
+ expand: 'rooms'
+ };
+ const housesWithRooms = await this.props.httpClient.get(`/api/v1/house`, params);
+ this.setState({
+ housesWithRooms,
+ housesGetStatus: RequestStatus.Success
+ });
+ } catch (e) {
+ this.setState({
+ housesGetStatus: RequestStatus.Error
+ });
+ }
+ }
+
+ async search(e) {
+ await this.setState({
+ search: e.target.value
+ });
+ this.getAirplayDevices();
+ }
+
+ changeOrderDir = async e => {
+ await this.setState({
+ orderDir: e.target.value
+ });
+ this.getAirplayDevices();
+ };
+
+ render({}, { orderDir, search, getAirplayStatus, airplayDevices, housesWithRooms }) {
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {children}
+
+
+ );
+ }
+}
+
+export default connect('httpClient', {})(DeviceTab);
diff --git a/front/src/routes/integration/all/airplay/device-page/EmptyState.jsx b/front/src/routes/integration/all/airplay/device-page/EmptyState.jsx
new file mode 100644
index 0000000000..64e372435c
--- /dev/null
+++ b/front/src/routes/integration/all/airplay/device-page/EmptyState.jsx
@@ -0,0 +1,23 @@
+import { Text } from 'preact-i18n';
+import { Link } from 'preact-router/match';
+import cx from 'classnames';
+import style from './style.css';
+
+const EmptyState = () => (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {airplayDevices &&
+ airplayDevices.length > 0 &&
+ airplayDevices.map((device, index) => (
+
+
+
+);
+
+export default EmptyState;
diff --git a/front/src/routes/integration/all/airplay/device-page/index.js b/front/src/routes/integration/all/airplay/device-page/index.js
new file mode 100644
index 0000000000..a1c6bd95e9
--- /dev/null
+++ b/front/src/routes/integration/all/airplay/device-page/index.js
@@ -0,0 +1,11 @@
+import { connect } from 'unistore/preact';
+import DeviceTab from './DeviceTab';
+import AirplayPage from '../AirplayPage';
+
+const DevicePage = props => (
+
+
+
+
+
+
+ );
+ }
+}
+
+export default connect('httpClient', {})(DiscoverTab);
diff --git a/front/src/routes/integration/all/airplay/discover-page/EmptyState.jsx b/front/src/routes/integration/all/airplay/discover-page/EmptyState.jsx
new file mode 100644
index 0000000000..3093a09798
--- /dev/null
+++ b/front/src/routes/integration/all/airplay/discover-page/EmptyState.jsx
@@ -0,0 +1,13 @@
+import { MarkupText } from 'preact-i18n';
+import cx from 'classnames';
+import style from './style.css';
+
+const EmptyState = ({}) => (
+
+
+
+
+
+
+
+
+
+
+
+
+ {errorLoading && (
+
+
+ )}
+
+
+
+
+
+
+ {discoveredDevices &&
+ discoveredDevices.map((device, index) => (
+
+
+
+);
+
+export default EmptyState;
diff --git a/front/src/routes/integration/all/airplay/discover-page/index.js b/front/src/routes/integration/all/airplay/discover-page/index.js
new file mode 100644
index 0000000000..63a19a32c3
--- /dev/null
+++ b/front/src/routes/integration/all/airplay/discover-page/index.js
@@ -0,0 +1,11 @@
+import { connect } from 'unistore/preact';
+import DiscoverTab from './DiscoverTab';
+import AirplayPage from '../AirplayPage';
+
+const AirplayDiscoverPage = props => (
+
+
+
@@ -9,20 +10,31 @@ const DashboardSettings = ({ children, user }) => (
-
@@ -36,4 +48,4 @@ const DashboardSettings = ({ children, user }) => (
);
-export default DashboardSettings;
+export default CallMeBotPage;
diff --git a/front/src/routes/integration/all/callmebot/setup-page/SetupTab.jsx b/front/src/routes/integration/all/callmebot/setup-page/SetupTab.jsx
new file mode 100644
index 0000000000..1ed06b391c
--- /dev/null
+++ b/front/src/routes/integration/all/callmebot/setup-page/SetupTab.jsx
@@ -0,0 +1,196 @@
+import { Text, Localizer, MarkupText } from 'preact-i18n';
+import { Component } from 'preact';
+import { connect } from 'unistore/preact';
+import { RequestStatus } from '../../../../../utils/consts';
+import cx from 'classnames';
+
+class SetupTab extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ apiKey: '',
+ messagingService: 'whatsapp',
+ phoneNumber: '',
+ getSettingsStatus: RequestStatus.Getting,
+ saveStatus: null
+ };
+ }
+
+ componentWillMount() {
+ this.getConfiguration();
+ }
+
+ async getConfiguration() {
+ this.setState({
+ getSettingsStatus: RequestStatus.Getting
+ });
+
+ try {
+ const [{ value: apiKey }, { value: messagingService }, { value: phoneNumber }] = await Promise.all([
+ this.props.httpClient.get('/api/v1/service/callmebot/variable/CALLMEBOT_API_KEY', {
+ userRelated: true
+ }),
+ this.props.httpClient.get('/api/v1/service/callmebot/variable/CALLMEBOT_MESSAGING_SERVICE', {
+ userRelated: true
+ }),
+ this.props.httpClient.get('/api/v1/service/callmebot/variable/CALLMEBOT_PHONE_NUMBER', {
+ userRelated: true
+ })
+ ]);
+
+ this.setState({
+ apiKey: apiKey || '',
+ messagingService: messagingService || 'whatsapp',
+ phoneNumber: phoneNumber || '',
+ getSettingsStatus: RequestStatus.Success
+ });
+ } catch (e) {
+ console.error(e);
+ this.setState({
+ getSettingsStatus: RequestStatus.Error
+ });
+ }
+ }
+
+ async saveConfiguration() {
+ this.setState({
+ saveStatus: RequestStatus.Getting
+ });
+
+ try {
+ await Promise.all([
+ this.props.httpClient.post('/api/v1/service/callmebot/variable/CALLMEBOT_API_KEY', {
+ value: this.state.apiKey,
+ userRelated: true
+ }),
+ this.props.httpClient.post('/api/v1/service/callmebot/variable/CALLMEBOT_MESSAGING_SERVICE', {
+ value: this.state.messagingService,
+ userRelated: true
+ }),
+ this.props.httpClient.post('/api/v1/service/callmebot/variable/CALLMEBOT_PHONE_NUMBER', {
+ value: this.state.phoneNumber,
+ userRelated: true
+ })
+ ]);
+
+ this.setState({
+ saveStatus: RequestStatus.Success
+ });
+
+ // Reset status after 2 seconds
+ setTimeout(() => {
+ this.setState({
+ saveStatus: null
+ });
+ }, 2000);
+ } catch (e) {
+ console.error(e);
+ this.setState({
+ saveStatus: RequestStatus.Error
+ });
+ }
+ }
+
+ render(props, { apiKey, messagingService, phoneNumber, getSettingsStatus, saveStatus }) {
+ return (
+
+
+);
+
+export default connect('user,httpClient')(CallMeBotSetupPage);
diff --git a/front/src/routes/integration/all/free-mobile/FreeMobile.jsx b/front/src/routes/integration/all/free-mobile/FreeMobile.jsx
new file mode 100644
index 0000000000..ec2d83193b
--- /dev/null
+++ b/front/src/routes/integration/all/free-mobile/FreeMobile.jsx
@@ -0,0 +1,112 @@
+import { Text, MarkupText, Localizer } from 'preact-i18n';
+import cx from 'classnames';
+import { RequestStatus } from '../../../../utils/consts';
+import DeviceConfigurationLink from '../../../../components/documentation/DeviceConfigurationLink';
+
+const FreeMobilePage = ({ children, ...props }) => (
+
-
+
+
+
+
+
-
+
+ );
+ }
+}
+
+export default connect('httpClient')(SetupTab);
diff --git a/front/src/routes/integration/all/callmebot/setup-page/index.js b/front/src/routes/integration/all/callmebot/setup-page/index.js
new file mode 100644
index 0000000000..9e8e37f3dd
--- /dev/null
+++ b/front/src/routes/integration/all/callmebot/setup-page/index.js
@@ -0,0 +1,11 @@
+import { connect } from 'unistore/preact';
+import CallMeBotPage from '../CallMeBot';
+import SetupTab from './SetupTab';
+
+const CallMeBotSetupPage = props => (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+ value={phoneNumber}
+ onChange={e => this.setState({ phoneNumber: e.target.value })}
+ disabled={getSettingsStatus === RequestStatus.Getting}
+ />
+
+
+
+
+ {messagingService === 'signal' ? (
+
+
+
+
+ }
+ value={apiKey}
+ onChange={e => this.setState({ apiKey: e.target.value })}
+ disabled={getSettingsStatus === RequestStatus.Getting}
+ />
+
+
+
+
+
+
+
+ {saveStatus === RequestStatus.Success && (
+
+
+
+
+
+);
+
+export default FreeMobilePage;
diff --git a/front/src/routes/integration/all/free-mobile/actions.js b/front/src/routes/integration/all/free-mobile/actions.js
new file mode 100644
index 0000000000..1f5e40ed81
--- /dev/null
+++ b/front/src/routes/integration/all/free-mobile/actions.js
@@ -0,0 +1,68 @@
+import { RequestStatus } from '../../../../utils/consts';
+
+const actions = store => ({
+ updateFreeMobileUsername(state, e) {
+ store.setState({
+ freeMobileUsername: e.target.value
+ });
+ },
+
+ updateFreeMobileAccessToken(state, e) {
+ store.setState({
+ freeMobileAccessToken: e.target.value
+ });
+ },
+
+ async getFreeMobileSettings(state) {
+ store.setState({
+ freeMobileGetSettingsStatus: RequestStatus.Getting
+ });
+ try {
+ const username = await state.httpClient.get('/api/v1/service/free-mobile/variable/FREE_MOBILE_USERNAME');
+ store.setState({
+ freeMobileUsername: username.value
+ });
+
+ const accessToken = await state.httpClient.get('/api/v1/service/free-mobile/variable/FREE_MOBILE_ACCESS_TOKEN');
+ store.setState({
+ freeMobileAccessToken: accessToken.value,
+ freeMobileGetSettingsStatus: RequestStatus.Success
+ });
+ } catch (e) {
+ store.setState({
+ freeMobileGetSettingsStatus: RequestStatus.Error
+ });
+ }
+ },
+
+ async saveFreeMobileSettings(state, e) {
+ e.preventDefault();
+ store.setState({
+ freeMobileSaveSettingsStatus: RequestStatus.Getting
+ });
+ try {
+ store.setState({
+ freeMobileUsername: state.freeMobileUsername.trim(),
+ freeMobileAccessToken: state.freeMobileAccessToken.trim()
+ });
+ await state.httpClient.post('/api/v1/service/free-mobile/variable/FREE_MOBILE_USERNAME', {
+ value: state.freeMobileUsername.trim()
+ });
+ await state.httpClient.post('/api/v1/service/free-mobile/variable/FREE_MOBILE_ACCESS_TOKEN', {
+ value: state.freeMobileAccessToken.trim()
+ });
+
+ // start service
+ await state.httpClient.post('/api/v1/service/free-mobile/start');
+ store.setState({
+ freeMobileSaveSettingsStatus: RequestStatus.Success
+ });
+ } catch (e) {
+ store.setState({
+ freeMobileSaveSettingsStatus: RequestStatus.Error
+ });
+ }
+ }
+});
+
+export default actions;
diff --git a/front/src/routes/integration/all/free-mobile/index.js b/front/src/routes/integration/all/free-mobile/index.js
new file mode 100644
index 0000000000..0c48b2cebe
--- /dev/null
+++ b/front/src/routes/integration/all/free-mobile/index.js
@@ -0,0 +1,23 @@
+import { Component } from 'preact';
+import { connect } from 'unistore/preact';
+import actions from './actions';
+import FreeMobilePage from './FreeMobile';
+import { RequestStatus } from '../../../../utils/consts';
+
+class FreeMobileIntegration extends Component {
+ componentWillMount() {
+ this.props.getFreeMobileSettings();
+ }
+
+ render(props, {}) {
+ const loading =
+ props.freeMobileGetSettingsStatus === RequestStatus.Getting ||
+ props.freeMobileSaveSettingsStatus === RequestStatus.Getting;
+ return
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )}
+ {props.freeMobileSaveSettingsStatus === RequestStatus.Success && (
+
+
+ )}
+
+
+
-
- );
- }
-}
-
-export default connect(
- 'session,user,zwaveDevices,houses,getZwaveDevicesStatus,getZwaveDeviceOrderDir,zwaveDeviceSearch',
- actions
-)(ZwaveNodePage);
diff --git a/front/src/routes/integration/all/zwave/node-page/style.css b/front/src/routes/integration/all/zwave/node-page/style.css
deleted file mode 100644
index 1b4343b7c4..0000000000
--- a/front/src/routes/integration/all/zwave/node-page/style.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.emptyDiv {
- min-height: 200px;
-}
diff --git a/front/src/routes/login-gateway/index.js b/front/src/routes/login-gateway/index.js
index d52b262c86..026b22f28d 100644
--- a/front/src/routes/login-gateway/index.js
+++ b/front/src/routes/login-gateway/index.js
@@ -13,4 +13,4 @@ class Login extends Component {
}
}
-export default connect('gatewayLoginStep2,gatewayLoginStatus', actions)(Login);
+export default connect('gatewayLoginStep2,gatewayLoginStatus,gatewayLoginError', actions)(Login);
diff --git a/front/src/routes/scene/SceneCard.jsx b/front/src/routes/scene/SceneCard.jsx
index b4fd0fb058..8dce97a4db 100644
--- a/front/src/routes/scene/SceneCard.jsx
+++ b/front/src/routes/scene/SceneCard.jsx
@@ -24,7 +24,52 @@ class SceneCard extends Component {
await this.setState({ saving: false });
};
- render(props, { saving }) {
+ getMobileView = (props, { saving }) => {
+ return (
+
+
+ +
+ +
(
)}
+ {props.saveStatus === RequestStatus.ValidationError && (
+
+
+ )}
{props.saveStatus === RequestStatus.ConflictError && (
+ {props.erroredAttributes.map(attribute => (
+ <>
+
+ -
-
- );
- }
-}
-
-export default ZWaveDeviceBox;
diff --git a/front/src/routes/integration/all/zwave/node-page/NodeTab.jsx b/front/src/routes/integration/all/zwave/node-page/NodeTab.jsx
deleted file mode 100644
index 4ecab08dec..0000000000
--- a/front/src/routes/integration/all/zwave/node-page/NodeTab.jsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import { Text, Localizer, MarkupText } from 'preact-i18n';
-import cx from 'classnames';
-
-import { RequestStatus } from '../../../../../utils/consts';
-import Device from './Device';
-import style from './style.css';
-import CardFilter from '../../../../../components/layout/CardFilter';
-
-const NodeTab = ({ children, ...props }) => (
-
-
-
- {props.device.name}
- {batteryLevel && (
-
- )}
-
-
-
-
-
-
-
- {tooMuchStatesError && (
-
-
-
- )}
-
-
-
- }
- />
-
-
-
-
-
-
-
-
-
-
- {mostRecentValueAt ? (
-
-
-
-
-
-
-);
-
-export default NodeTab;
diff --git a/front/src/routes/integration/all/zwave/node-page/actions.js b/front/src/routes/integration/all/zwave/node-page/actions.js
deleted file mode 100644
index 8eb164ac29..0000000000
--- a/front/src/routes/integration/all/zwave/node-page/actions.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import { RequestStatus } from '../../../../../utils/consts';
-import update from 'immutability-helper';
-import createActionsHouse from '../../../../../actions/house';
-import debounce from 'debounce';
-
-function createActions(store) {
- const houseActions = createActionsHouse(store);
- const actions = {
- async getZWaveDevices(state) {
- store.setState({
- getZwaveDevicesStatus: RequestStatus.Getting
- });
- try {
- const options = {
- order_dir: state.getZwaveDeviceOrderDir || 'asc'
- };
- if (state.zwaveDeviceSearch && state.zwaveDeviceSearch.length) {
- options.search = state.zwaveDeviceSearch;
- }
- const zwaveDevices = await state.httpClient.get('/api/v1/service/zwave/device', options);
- store.setState({
- zwaveDevices,
- getZwaveDevicesStatus: RequestStatus.Success
- });
- } catch (e) {
- store.setState({
- getZwaveDevicesStatus: RequestStatus.Error
- });
- }
- },
- async saveDevice(state, device) {
- await state.httpClient.post('/api/v1/device', device);
- },
- updateDeviceProperty(state, index, property, value) {
- const newState = update(state, {
- zwaveDevices: {
- [index]: {
- [property]: {
- $set: value
- }
- }
- }
- });
- store.setState(newState);
- },
- async deleteDevice(state, device, index) {
- await state.httpClient.delete(`/api/v1/device/${device.selector}`);
- const newState = update(state, {
- zwaveDevices: {
- $splice: [[index, 1]]
- }
- });
- store.setState(newState);
- },
- async convertToMqtt(state, deviceIndex) {
- const mqttService = await state.httpClient.get('/api/v1/service/mqtt');
- const newState = update(state, {
- zwaveDevices: {
- [deviceIndex]: {
- service_id: {
- $set: mqttService.id
- }
- }
- }
- });
- await store.setState(newState);
- const newDevice = store.getState().zwaveDevices[deviceIndex];
- await this.saveDevice(newDevice);
- await actions.getZWaveDevices(store.getState());
- },
- async search(state, e) {
- store.setState({
- zwaveDeviceSearch: e.target.value
- });
- await actions.getZWaveDevices(store.getState());
- },
- async changeOrderDir(state, e) {
- store.setState({
- getZwaveDeviceOrderDir: e.target.value
- });
- await actions.getZWaveDevices(store.getState());
- }
- };
- actions.debouncedSearch = debounce(actions.search, 200);
- return Object.assign({}, houseActions, actions);
-}
-
-export default createActions;
diff --git a/front/src/routes/integration/all/zwave/node-page/index.js b/front/src/routes/integration/all/zwave/node-page/index.js
deleted file mode 100644
index 2c8495b36f..0000000000
--- a/front/src/routes/integration/all/zwave/node-page/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Component } from 'preact';
-import { connect } from 'unistore/preact';
-import actions from './actions';
-import ZwavePage from '../ZwavePage';
-import NodeTab from './NodeTab';
-
-class ZwaveNodePage extends Component {
- componentWillMount() {
- this.props.getZWaveDevices();
- this.props.getHouses();
- }
-
- render(props, {}) {
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {props.zwaveDevices && props.zwaveDevices.length === 0 && (
-
-
- )}
- {props.getZwaveDevicesStatus === RequestStatus.Getting && }
-
- {props.zwaveDevices &&
- props.zwaveDevices.map((zwaveDevice, index) => (
-
-
+
+
+ );
+ };
+
+ getDesktopView = (props, { saving }) => {
return (
);
+ };
+
+ render(props, state) {
+ if (props.showMobileView) {
+ return this.getMobileView(props, state);
+ }
+ return this.getDesktopView(props, state);
}
}
diff --git a/front/src/routes/scene/SceneCards.jsx b/front/src/routes/scene/SceneCards.jsx
index 03889755fe..1a56f0bdc0 100644
--- a/front/src/routes/scene/SceneCards.jsx
+++ b/front/src/routes/scene/SceneCards.jsx
@@ -1,11 +1,22 @@
import SceneCard from './SceneCard';
const SceneCards = ({ children, ...props }) => (
-
- {props.scenes.map((scene, index) => (
-
+ <>
+
+ {/* Only visible on small screens */}
+ {props.scenes.map((scene, index) => (
+
+
+
+
);
export default SceneCards;
diff --git a/front/src/routes/scene/ScenePage.jsx b/front/src/routes/scene/ScenePage.jsx
index 33be006a1f..98daa613ed 100644
--- a/front/src/routes/scene/ScenePage.jsx
+++ b/front/src/routes/scene/ScenePage.jsx
@@ -13,7 +13,7 @@ const ScenePage = ({ children, ...props }) => (
+ {/* Only visible on bigger screens */}
+ {props.scenes.map((scene, index) => (
+
+
-
+
@@ -22,8 +22,8 @@ const ScenePage = ({ children, ...props }) => (
-
+
{props.scenes &&
-