Lior Vernia has uploaded a new change for review. Change subject: webadmin: Rephrase messages to fit label operations ......................................................................
webadmin: Rephrase messages to fit label operations Since same errors are used for bonding and for labelling, rephrased the messages to fit both. Change-Id: I249b8eebaa1dcec35e4c50c30a8e3f440b952188 Bug-Url: https://bugzilla.redhat.com/1115109 Signed-off-by: Lior Vernia <lver...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java 3 files changed, 5 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/31518/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java index 042de84..0c65fc0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java @@ -420,7 +420,7 @@ @Override public String getVerb(NetworkItemModel<?> op1) { - return ConstantsManager.getInstance().getConstants().nullOperationBondUnmanaged(); + return ConstantsManager.getInstance().getConstants().nullOperationUnmanagedNetwork(); } @Override @@ -456,7 +456,7 @@ @Override public String getVerb(NetworkItemModel<?> op1) { - return ConstantsManager.getInstance().getConstants().nullOperationBondOutOfSync(); + return ConstantsManager.getInstance().getConstants().nullOperationOutOfSyncNetwork(); } @Override diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java index 9fa4e03..46126da 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java @@ -1827,17 +1827,11 @@ @DefaultStringValue("The following LUNs are already part of Storage Domains:") String lunsAlreadyPartOfSD(); - @DefaultStringValue("Invalid operation with unmanaged network: unmanaged network can only be removed") + @DefaultStringValue("Invalid operation, an unmanaged network can only be detached.") String nullOperationUnmanagedNetwork(); - @DefaultStringValue("Cannot perform bond operation with an unmanaged network.") - String nullOperationBondUnmanaged(); - - @DefaultStringValue("Invalid operation with unsync network: unsync network can only be detached") + @DefaultStringValue("Invalid operation, an out-of-sync network can only be detached.") String nullOperationOutOfSyncNetwork(); - - @DefaultStringValue("Cannot perform bond operation with an out-of-sync network.") - String nullOperationBondOutOfSync(); @DefaultStringValue("Cannot have more than one non-VLAN network on one interface.") String nullOperationTooManyNonVlans(); diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java index 55b5d7e..47ddcc9 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java @@ -201,7 +201,7 @@ @DefaultMessage("Remove {0} from Bond") String removeFromBond(String name); - @DefaultMessage("You could detach {0} first.") + @DefaultMessage("This might work without network {0}.") String suggestDetachNetwork(String networkName); @DefaultMessage("Label {0} cannot be assigned to this interface, it is already assigned to interface {1}.") -- To view, visit http://gerrit.ovirt.org/31518 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I249b8eebaa1dcec35e4c50c30a8e3f440b952188 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Lior Vernia <lver...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
