Tomas Jelinek has uploaded a new change for review. Change subject: webadmin,userportal: added singular form of nics assignment message ......................................................................
webadmin,userportal: added singular form of nics assignment message If there is only one nic, the message should be in singular Change-Id: I312f8b9fb4808edf90492461b69541038af30393 Bug-Url: https://bugzilla.redhat.com/987858 Signed-off-by: Tomas Jelinek <tjeli...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/network/LogicalNetworksEditor.java 2 files changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/12/17312/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java index b81acb0..bf96cc2 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java @@ -105,6 +105,9 @@ @DefaultMessage("default: {0}") String defaultTimeZoneCaption(String currentDefault); - @DefaultMessage("VM has {0} Nics. Assign them to the Cluster''s Logical networks.") - String assignNicsToNetworks(int numOfNics); + @DefaultMessage("VM has {0} Nics. Assign them to the Cluster''s Logical network(s).") + String assignNicsToNetworksPlural(int numOfNics); + + @DefaultMessage("VM has 1 Nic. Assign it to the Cluster''s Logical network(s).") + String assignNicsToNetworksSingular(); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/network/LogicalNetworksEditor.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/network/LogicalNetworksEditor.java index 18d53e7..c2d297b 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/network/LogicalNetworksEditor.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/network/LogicalNetworksEditor.java @@ -78,9 +78,16 @@ contentPanel.add(networkEditor); } - if (values.size() > 0) { - headerLabel.setText(messages.assignNicsToNetworks(values.size())); + if (values.size() == 0) { + return; } + + if (values.size() == 1) { + headerLabel.setText(messages.assignNicsToNetworksSingular()); + } else { + headerLabel.setText(messages.assignNicsToNetworksPlural(values.size())); + } + } public void flush() { -- To view, visit http://gerrit.ovirt.org/17312 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I312f8b9fb4808edf90492461b69541038af30393 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
