Martin Mucha has uploaded a new change for review.
Change subject: core,userportal,webadmin: missing translations
......................................................................
core,userportal,webadmin: missing translations
Change-Id: Icd0d874f69144fe647ffe9b32bd6fe8f6864e317
Signed-off-by: Martin Mucha <mmu...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksValidator.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/HostInterfaceValidator.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M
frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
6 files changed, 20 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/35980/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksValidator.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksValidator.java
index 4833eff..bd80c0a 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksValidator.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksValidator.java
@@ -258,7 +258,7 @@
//slave has network assigned and there isn't request for
unassigning it;
//so this probably check, that nic is part of newly crated
bond, and any previously attached network has to be unattached.
if (slave.getNetworkName() != null &&
!nicUsedByRemovedNetwork(slave)) {
-
addViolation(VdcBllMessages.NETWORK_INTERFACE_ATTACHED_TO_NETWORK_CANNOT_BE_SLAVE,
slave.getName());//TODO MM: missing translation
+
addViolation(VdcBllMessages.NETWORK_INTERFACE_ATTACHED_TO_NETWORK_CANNOT_BE_SLAVE,
slave.getName());
passed = false;
continue;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/HostInterfaceValidator.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/HostInterfaceValidator.java
index 422aca0..2311782 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/HostInterfaceValidator.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/HostInterfaceValidator.java
@@ -81,7 +81,7 @@
}
public ValidationResult validSlave() {
- return
ValidationResult.failWith(VdcBllMessages.NETWORK_INTERFACE_BOND_OR_VLAN_CANNOT_BE_SLAVE)//TODO
MM: missing translation.
+ return
ValidationResult.failWith(VdcBllMessages.NETWORK_INTERFACE_BOND_OR_VLAN_CANNOT_BE_SLAVE)
.when(NetworkUtils.isVlan(iface) || isBond());
}
diff --git
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
index 85383a1..ae78b70 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
@@ -506,6 +506,9 @@
-Bond consist of at least two network interfaces(NICs).
NETWORK_DEFAULT_UPDATE_NAME_INVALID=Network '${NetworkName}' is mandatory, it
cannot be modified.
NETWORK_INTERFACE_ALREADY_IN_BOND=Network Interface already belongs to the
bond.
+NETWORK_INTERFACE_ATTACHED_TO_NETWORK_CANNOT_BE_SLAVE=Network Interface cannot
become slave, there's network attached to it.
+NETWORK_INTERFACE_BOND_OR_VLAN_CANNOT_BE_SLAVE=Neither bond nor vlan can be
slave.
+BOND_USED_BY_NETWORK_ATTACHMENTS=Cannot remove bond, because it's used by
Network Attachments.
NETWORK_INVALID_BOND_NAME=Bond name must be formatted as <bondYYY>.
NETWORK_INTERFACE_NOT_EXISTS=Network name doesn't exist.
ERROR_CANNOT_ATTACH_MORE_THAN_ONE_ISO_DOMAIN=Cannot attach more than one ISO
Storage Domain to the same Data Center. If you want to use a newly created
Domain, detach the existing attached Domain and attach the new one.
diff --git
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
index bc5f628..26b3901 100644
---
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
+++
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
@@ -1396,6 +1396,15 @@
@DefaultStringValue("Network Interface already belongs to the bond.")
String NETWORK_INTERFACE_ALREADY_IN_BOND();
+ @DefaultStringValue("Network Interface cannot become slave, there's
network attached to it.")
+ String NETWORK_INTERFACE_ATTACHED_TO_NETWORK_CANNOT_BE_SLAVE();
+
+ @DefaultStringValue("Neither bond nor vlan can be slave.")
+ String NETWORK_INTERFACE_BOND_OR_VLAN_CANNOT_BE_SLAVE();
+
+ @DefaultStringValue("Cannot remove bond, because it's used by Network
Attachments.")
+ String BOND_USED_BY_NETWORK_ATTACHMENTS();
+
@DefaultStringValue("Bond name must be formatted as <bondYYY>.")
String NETWORK_INVALID_BOND_NAME();
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index 1706555..436d917 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -464,6 +464,9 @@
-Bond consist of at least two network interfaces(NICs).
NETWORK_DEFAULT_UPDATE_NAME_INVALID=Network '${NetworkName}' is mandatory, it
cannot be modified.
NETWORK_INTERFACE_ALREADY_IN_BOND=Network Interface already belongs to the
bond.
+NETWORK_INTERFACE_ATTACHED_TO_NETWORK_CANNOT_BE_SLAVE=Network Interface cannot
become slave, there's network attached to it.
+NETWORK_INTERFACE_BOND_OR_VLAN_CANNOT_BE_SLAVE=Neither bond nor vlan can be
slave.
+BOND_USED_BY_NETWORK_ATTACHMENTS=Cannot remove bond, because it's used by
Network Attachments.
NETWORK_INVALID_BOND_NAME=Bond name must be formatted as <bondYYY>.
NETWORK_INTERFACE_NOT_EXISTS=Network name doesn't exist.
ERROR_CANNOT_ATTACH_MORE_THAN_ONE_ISO_DOMAIN=Cannot attach more than one ISO
Storage Domain to the same Data Center. If you want to use a newly created
Domain, detach the existing attached Domain and attach the new one.
diff --git
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index f95019c..b11548c 100644
---
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -511,6 +511,9 @@
-Bond consist of at least two network interfaces(NICs).
NETWORK_DEFAULT_UPDATE_NAME_INVALID=Network '${NetworkName}' is mandatory, it
cannot be modified.
NETWORK_INTERFACE_ALREADY_IN_BOND=Network Interface already belongs to the
bond.
+NETWORK_INTERFACE_ATTACHED_TO_NETWORK_CANNOT_BE_SLAVE=Network Interface cannot
become slave, there's network attached to it.
+NETWORK_INTERFACE_BOND_OR_VLAN_CANNOT_BE_SLAVE=Neither bond nor vlan can be
slave.
+BOND_USED_BY_NETWORK_ATTACHMENTS=Cannot remove bond, because it's used by
Network Attachments.
NETWORK_INVALID_BOND_NAME=Bond name must be formatted as <bondYYY>.
NETWORK_INTERFACE_NOT_EXISTS=Network name doesn't exist.
ERROR_CANNOT_ATTACH_MORE_THAN_ONE_ISO_DOMAIN=Cannot attach more than one ISO
Storage Domain to the same Data Center. If you want to use a newly created
Domain, detach the existing attached Domain and attach the new one.
--
To view, visit http://gerrit.ovirt.org/35980
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd0d874f69144fe647ffe9b32bd6fe8f6864e317
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Martin Mucha <mmu...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
