Merge "Fix unnecessary capitalized messages"
This commit is contained in:
commit
536a857469
|
@ -76,14 +76,14 @@ class UpdateEndpointGroup(forms.SelfHandlingForm):
|
||||||
}
|
}
|
||||||
endpointgroup = api_vpn.endpointgroup_update(
|
endpointgroup = api_vpn.endpointgroup_update(
|
||||||
request, self.initial['endpoint_group_id'], **data)
|
request, self.initial['endpoint_group_id'], **data)
|
||||||
msg = (_('Endpoint Group %s was successfully updated.')
|
msg = (_('Endpoint group %s was successfully updated.')
|
||||||
% context['name'])
|
% context['name'])
|
||||||
messages.success(request, msg)
|
messages.success(request, msg)
|
||||||
return endpointgroup
|
return endpointgroup
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.info('Failed to update Endpint Group %(id)s: %(exc)s',
|
LOG.info('Failed to update endpint group %(id)s: %(exc)s',
|
||||||
{'id': self.initial['endpoint_group_id'], 'exc': e})
|
{'id': self.initial['endpoint_group_id'], 'exc': e})
|
||||||
msg = _('Failed to update Endpint Group %s') % context['name']
|
msg = _('Failed to update endpint group %s') % context['name']
|
||||||
redirect = reverse(self.failure_url)
|
redirect = reverse(self.failure_url)
|
||||||
exceptions.handle(request, msg, redirect=redirect)
|
exceptions.handle(request, msg, redirect=redirect)
|
||||||
|
|
||||||
|
|
|
@ -123,8 +123,8 @@ class DeleteEndpointGroupLink(policy.PolicyTargetMixin, tables.DeleteAction):
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def action_past(count):
|
def action_past(count):
|
||||||
return ungettext_lazy(
|
return ungettext_lazy(
|
||||||
u"Scheduled deletion of Endpoint Group",
|
u"Scheduled deletion of endpoint group",
|
||||||
u"Scheduled deletion of Endpoint Groups",
|
u"Scheduled deletion of endpoint groups",
|
||||||
count
|
count
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -133,7 +133,7 @@ class DeleteEndpointGroupLink(policy.PolicyTargetMixin, tables.DeleteAction):
|
||||||
api_vpn.endpointgroup_delete(request, obj_id)
|
api_vpn.endpointgroup_delete(request, obj_id)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
exceptions.handle(
|
exceptions.handle(
|
||||||
request, _('Unable to delete Endpoint Group. %s') % e)
|
request, _('Unable to delete endpoint group. %s') % e)
|
||||||
|
|
||||||
|
|
||||||
class DeleteIKEPolicyLink(policy.PolicyTargetMixin, tables.DeleteAction):
|
class DeleteIKEPolicyLink(policy.PolicyTargetMixin, tables.DeleteAction):
|
||||||
|
|
|
@ -305,7 +305,7 @@ class UpdateEndpointGroupView(horizon_forms.ModalFormView):
|
||||||
return api_vpn.endpointgroup_get(self.request, endpoint_group_id)
|
return api_vpn.endpointgroup_get(self.request, endpoint_group_id)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
redirect = self.success_url
|
redirect = self.success_url
|
||||||
msg = _('Unable to retrieve Endpoint Group details. %s') % e
|
msg = _('Unable to retrieve endpoint group details. %s') % e
|
||||||
exceptions.handle(self.request, msg, redirect=redirect)
|
exceptions.handle(self.request, msg, redirect=redirect)
|
||||||
|
|
||||||
def get_initial(self):
|
def get_initial(self):
|
||||||
|
|
|
@ -197,8 +197,8 @@ class AddEndpointGroup(workflows.Workflow):
|
||||||
slug = "addendpointgroup"
|
slug = "addendpointgroup"
|
||||||
name = _("Add Endpoint Group")
|
name = _("Add Endpoint Group")
|
||||||
finalize_button_name = _("Add")
|
finalize_button_name = _("Add")
|
||||||
success_message = _('Added Endpoint Group "%s".')
|
success_message = _('Added endpoint group "%s".')
|
||||||
failure_message = _('Unable to add Endpoint Group "%s".')
|
failure_message = _('Unable to add endpoint group "%s".')
|
||||||
success_url = "horizon:project:vpn:index"
|
success_url = "horizon:project:vpn:index"
|
||||||
default_steps = (AddEndpointGroupStep,)
|
default_steps = (AddEndpointGroupStep,)
|
||||||
|
|
||||||
|
@ -431,7 +431,7 @@ class AddIPsecSiteConnectionAction(workflows.Action):
|
||||||
label=_("VPN service associated with this connection"))
|
label=_("VPN service associated with this connection"))
|
||||||
local_ep_group_id = forms.ThemableChoiceField(
|
local_ep_group_id = forms.ThemableChoiceField(
|
||||||
required=False,
|
required=False,
|
||||||
label=_("Endpoint Group for local subnet(s)"),
|
label=_("Endpoint group for local subnet(s)"),
|
||||||
help_text=_("Local subnets which the new IPsec connection is "
|
help_text=_("Local subnets which the new IPsec connection is "
|
||||||
"connected to. Required if no subnet is specified "
|
"connected to. Required if no subnet is specified "
|
||||||
"in a VPN service selected."))
|
"in a VPN service selected."))
|
||||||
|
@ -449,7 +449,7 @@ class AddIPsecSiteConnectionAction(workflows.Action):
|
||||||
"Can be IPv4/IPv6 address, e-mail, key ID, or FQDN"),)
|
"Can be IPv4/IPv6 address, e-mail, key ID, or FQDN"),)
|
||||||
peer_ep_group_id = forms.ThemableChoiceField(
|
peer_ep_group_id = forms.ThemableChoiceField(
|
||||||
required=False,
|
required=False,
|
||||||
label=_("Endpoint Group for remote peer CIDR(s)"),
|
label=_("Endpoint group for remote peer CIDR(s)"),
|
||||||
help_text=_("Remote peer CIDR(s) connected to the new IPsec "
|
help_text=_("Remote peer CIDR(s) connected to the new IPsec "
|
||||||
"connection."))
|
"connection."))
|
||||||
peer_cidrs = forms.MultiIPField(
|
peer_cidrs = forms.MultiIPField(
|
||||||
|
|
Loading…
Reference in New Issue