Shahar Havivi has uploaded a new change for review. Change subject: webadmin: reformat remove disk messages ......................................................................
webadmin: reformat remove disk messages Change-Id: I20172c8e70659a6fa5f77dec738d1c9025daac70 Bug-Id: https://bugzilla.redhat.com/871222 Signed-off-by: Shahar Havivi <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java 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/view/popup/AbstractDiskRemoveConfirmationPopupView.java 3 files changed, 26 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/01/9101/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java index d768336..d1040a7 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java @@ -1,7 +1,6 @@ package org.ovirt.engine.ui.common; import com.google.gwt.i18n.client.Constants; -import com.google.gwt.i18n.client.Constants.DefaultStringValue; public interface CommonApplicationConstants extends Constants { @@ -20,6 +19,12 @@ @DefaultStringValue("<br/>") String lineBreak(); + @DefaultStringValue(" ") + String htmlTab(); + + @DefaultStringValue(" ") + String htmlSpace(); + @DefaultStringValue(", ") String commaBreak(); 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 c4cfef5..e774488 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 @@ -43,8 +43,17 @@ @DefaultMessage("Attached to {0} VM(s)") String diskAttachedToVMs(int numberOfVms); - @DefaultMessage("Note: {0} is {1}") - String diskNote(String diskAlias, String formattedNote); + @DefaultMessage("Note:") + String diskNote(); + + @DefaultMessage("{0} is:") + String diskIs(String diskAlias); + + @DefaultMessage("Shareable") + String shareable(); + + @DefaultMessage("Bootable") + String bootable(); @DefaultMessage("out of {0} VMs in pool") String outOfXVMsInPool(String numOfVms); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/AbstractDiskRemoveConfirmationPopupView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/AbstractDiskRemoveConfirmationPopupView.java index f8de1ce..4d5ac73 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/AbstractDiskRemoveConfirmationPopupView.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/AbstractDiskRemoveConfirmationPopupView.java @@ -49,8 +49,13 @@ } if (!notes.isEmpty()) { - String diskNote = messages.diskNote(disk.getDiskAlias(), getFormattedNote()); - addItemLabel(SafeHtmlUtils.fromSafeConstant("<b>" + diskNote + "</b>")); //$NON-NLS-1$ //$NON-NLS-2$ + String notes = messages.diskNote() + + constants.lineBreak() + + constants.htmlSpace() + + constants.htmlSpace() + + messages.diskIs(disk.getDiskAlias()) + + getFormattedNote(); + addItemLabel(SafeHtmlUtils.fromSafeConstant("<b>" + notes + "</b>")); //$NON-NLS-1$ //$NON-NLS-2$ } addItemLabel(SafeHtmlUtils.fromSafeConstant(constants.lineBreak())); @@ -61,14 +66,10 @@ for (int i = 0; i < notes.size(); i++) { String note = notes.get(i); + formattedNote += constants.lineBreak(); + formattedNote += constants.htmlTab(); formattedNote += note; - if (i == notes.size() - 2) { - formattedNote += constants.andBreak(); - } - else if (i < notes.size() - 2) { - formattedNote += constants.commaBreak(); - } } return formattedNote; -- To view, visit http://gerrit.ovirt.org/9101 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I20172c8e70659a6fa5f77dec738d1c9025daac70 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
