a/badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added DHCP form strings to translations

Browse Source
This commit is contained in:
Ildar Kamalov 2018-12-17 14:24:54 +03:00 committed by Eugene Bujak
parent 52b81a27fb
commit 9fa85a5c48
2 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/src/__locales/en.json
View File

@ -139,5 +139,15 @@
"dhcp_not_found": "No active DHCP servers found on the network. It is safe to enable the built-in DHCP server.",
"dhcp_leases": "DHCP leases",
"dhcp_leases_not_found": "No DHCP leases found",
"dhcp_config_saved": "Saved DHCP server config"
"dhcp_config_saved": "Saved DHCP server config",
"form_error_required": "Required field",
"form_error_ip_format": "Invalid IPv4 format",
"form_error_positive": "Must be greater than 0",
"dhcp_form_gateway_input": "Gateway IP",
"dhcp_form_subnet_input": "Subnet mask",
"dhcp_form_range_title": "Range of IP addresses",
"dhcp_form_range_start": "Range start",
"dhcp_form_range_end": "Range end",
"dhcp_form_lease_title": "DHCP lease time (in seconds)",
"dhcp_form_lease_input": "Lease duration"
}

39
client/src/components/Settings/Dhcp/Form.js
View File

@ -1,25 +1,28 @@
import React, { Fragment } from 'react';
import PropTypes from 'prop-types';
import { Field, reduxForm } from 'redux-form';
import { withNamespaces, Trans } from 'react-i18next';
import flow from 'lodash/flow';
import { R_IPV4 } from '../../../helpers/constants';
const required = (value) => {
if (value || value === 0) {
return false;
}
return 'Required field';
return <Trans>form_error_required</Trans>;
};
const ipv4 = (value) => {
if (value && !new RegExp(R_IPV4).test(value)) {
return 'Invalid IPv4 format';
return <Trans>form_error_ip_format</Trans>;
}
return false;
};
const isPositive = (value) => {
if ((value || value === 0) && (value <= 0)) {
return 'Must be greater than 0';
return <Trans>form_error_positive</Trans>;
}
return false;
};
@ -43,7 +46,7 @@ const renderField = ({
const Form = (props) => {
const {
handleSubmit, pristine, submitting, enabled,
handleSubmit, pristine, submitting, enabled, t,
} = props;
return (
@ -51,25 +54,25 @@ const Form = (props) => {
<div className="row">
<div className="col-lg-6">
<div className="form__group form__group--dhcp">
<label>Gateway IP</label>
<label>{t('dhcp_form_gateway_input')}</label>
<Field
name="gateway_ip"
component={renderField}
type="text"
className="form-control"
placeholder="Gateway IP"
placeholder={t('dhcp_form_gateway_input')}
validate={[ipv4, required]}
disabled={!enabled}
/>
</div>
<div className="form__group form__group--dhcp">
<label>Subnet mask</label>
<label>{t('dhcp_form_subnet_input')}</label>
<Field
name="subnet_mask"
component={renderField}
type="text"
className="form-control"
placeholder="Subnet mask"
placeholder={t('dhcp_form_subnet_input')}
validate={[ipv4, required]}
disabled={!enabled}
/>
@ -79,7 +82,7 @@ const Form = (props) => {
<div className="form__group form__group--dhcp">
<div className="row">
<div className="col-12">
<label>Range of IP addresses</label>
<label>{t('dhcp_form_range_title')}</label>
</div>
<div className="col">
<Field
@ -87,7 +90,7 @@ const Form = (props) => {
component={renderField}
type="text"
className="form-control"
placeholder="Range start"
placeholder={t('dhcp_form_range_start')}
validate={[ipv4, required]}
disabled={!enabled}
/>
@ -98,7 +101,7 @@ const Form = (props) => {
component={renderField}
type="text"
className="form-control"
placeholder="Range end"
placeholder={t('dhcp_form_range_end')}
validate={[ipv4, required]}
disabled={!enabled}
/>
@ -106,13 +109,13 @@ const Form = (props) => {
</div>
</div>
<div className="form__group form__group--dhcp">
<label>DHCP lease time (in seconds)</label>
<label>{t('dhcp_form_lease_title')}</label>
<Field
name="lease_duration"
component={renderField}
type="number"
className="form-control"
placeholder="Lease duration"
placeholder={t('dhcp_form_lease_input')}
validate={[required, isPositive]}
disabled={!enabled}
normalize={toNumber}
@ -126,7 +129,7 @@ const Form = (props) => {
className="btn btn-success btn-standart"
disabled={pristine || submitting || !enabled}
>
Save config
{t('save_config')}
</button>
</form>
);
@ -137,8 +140,10 @@ Form.propTypes = {
pristine: PropTypes.bool,
submitting: PropTypes.bool,
enabled: PropTypes.bool,
t: PropTypes.func,
};
export default reduxForm({
form: 'dhcpForm',
})(Form);
export default flow([
withNamespaces(),
reduxForm({ form: 'dhcpForm' }),
])(Form);