GGLinnk/foris-js
1
0
Fork 0
mirror of https://gitlab.nic.cz/turris/reforis/foris-js.git synced 2024-07-02 20:30:27 +00:00
Code Issues Releases Activity

Merge branch 'dev' into 'master'

Browse Source 
Release v4.5.1.

See merge request turris/reforis/foris-js!110
This commit is contained in:
Bogdan Bodnar 2020-05-07 16:47:30 +02:00
commit 2786f856f7
5 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "foris",
"version": "4.5.0",
"version": "4.5.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "foris",
"version": "4.5.0",
"version": "4.5.1",
"description": "Set of components and utils for Foris and its plugins.",
"author": "CZ.NIC, z.s.p.o.",
"repository": {

5
src/common/WiFiSettings/WiFiForm.js
View File

@ -36,7 +36,7 @@ WiFiForm.defaultProps = {
};
export default function WiFiForm({
formData, formErrors, setFormValue, hasGuestNetwork, ...props
formData, formErrors, setFormValue, hasGuestNetwork, disabled,
}) {
return formData.devices.map((device) => (
<DeviceForm
@ -45,8 +45,7 @@ export default function WiFiForm({
formErrors={(formErrors || [])[device.id]}
setFormValue={setFormValue}
hasGuestNetwork={hasGuestNetwork}
{...props}
disabled={disabled}
/>
));
}

1
src/form/components/ForisForm.js
View File

@ -149,6 +149,7 @@ export function ForisForm({
const childrenWithFormProps = React.Children.map(
children,
(child) => React.cloneElement(child, {
initialData: formState.initialData,
formData: formState.data,
formErrors: formState.errors,
setFormValue: onFormChangeHandler,

66
translations/forisjs.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2020-02-20 17:28+0100\n"
"POT-Creation-Date: 2020-05-07 16:12+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,34 +17,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.8.0\n"
#: src/validations.js:13
msgid "This is not a valid IPv4 address."
msgstr ""
#: src/validations.js:14
msgid "This is not a valid IPv6 address."
msgstr ""
#: src/validations.js:15
msgid "This is not a valid IPv6 prefix."
msgstr ""
#: src/validations.js:16
msgid "This is not a valid domain name."
msgstr ""
#: src/validations.js:17
msgid "This is not a valid DUID."
msgstr ""
#: src/validations.js:18
msgid "This is not a valid MAC address."
msgstr ""
#: src/validations.js:19
msgid "Doesn't contain a list of emails separated by commas."
msgstr ""
#: src/api/utils.js:58
msgid "The session is expired. Please log in again."
msgstr ""
@ -107,15 +79,15 @@ msgid ""
" "
msgstr ""
#: src/common/WiFiSettings/WiFiForm.js:82
#: src/common/WiFiSettings/WiFiForm.js:81
msgid "Wi-Fi ${deviceID + 1}"
msgstr ""
#: src/common/WiFiSettings/WiFiForm.js:84
#: src/common/WiFiSettings/WiFiForm.js:83
msgid "Enable"
msgstr ""
#: src/common/WiFiSettings/WiFiForm.js:215
#: src/common/WiFiSettings/WiFiForm.js:214
msgid "auto"
msgstr ""
@ -222,7 +194,7 @@ msgstr ""
msgid "Settings saved successfully"
msgstr ""
#: src/form/components/ForisForm.js:165
#: src/form/components/ForisForm.js:166
msgid "Changes you made may not be saved. Are you sure you want to leave?"
msgstr ""
@ -242,3 +214,31 @@ msgstr ""
msgid "An error occurred while fetching data."
msgstr ""
#: src/utils/validations.js:13
msgid "This is not a valid IPv4 address."
msgstr ""
#: src/utils/validations.js:14
msgid "This is not a valid IPv6 address."
msgstr ""
#: src/utils/validations.js:15
msgid "This is not a valid IPv6 prefix."
msgstr ""
#: src/utils/validations.js:16
msgid "This is not a valid domain name."
msgstr ""
#: src/utils/validations.js:17
msgid "This is not a valid DUID."
msgstr ""
#: src/utils/validations.js:18
msgid "This is not a valid MAC address."
msgstr ""
#: src/utils/validations.js:19
msgid "Doesn't contain a list of emails separated by commas."
msgstr ""