Daniel Erez has uploaded a new change for review. Change subject: webadmin: no localization for command buttons strings ......................................................................
webadmin: no localization for command buttons strings As a result of Idd623481d0eb77bfbaa1e8b3eec8b445020711c8 Command buttons' text strings must reside in the model, i.e. localization through the view is being ignored. Fixed AbstractUiCommandButton by updating button's text according the the model only as a last resort (i.e. no localization is available). (modified GuidePopupView to maintain the behavior of the original bug fix: https://bugzilla.redhat.com/850439) Change-Id: I186b5f3a812d34a30209998933c0617e9e182be7 Bug-Url: https://bugzilla.redhat.com/850439 Signed-off-by: Daniel Erez <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractUiCommandButton.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/guide/GuidePopupView.java 2 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/9638/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractUiCommandButton.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractUiCommandButton.java index 9863e25..89933ee 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractUiCommandButton.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractUiCommandButton.java @@ -70,7 +70,10 @@ } getButtonWidget().setTitle(title); - if (command.getTitle() != null) { + if (command.getTitle() == null) { + getButtonWidget().setText(""); //$NON-NLS-1$ + } + else if (getButtonWidget().getText().equals("")) { //$NON-NLS-1$ getButtonWidget().setText(command.getTitle()); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/guide/GuidePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/guide/GuidePopupView.java index d762801..b2e8b8d 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/guide/GuidePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/guide/GuidePopupView.java @@ -142,6 +142,7 @@ compulsorySection.setVisible(false); optionalSection.setVisible(false); // Rename dialog button. + guideModel.getCommands().get(0).setTitle(null); guideModel.getCommands().get(0).setTitle(ConstantsManager.getInstance().getConstants().ok()); } else if (guideModel.getCompulsoryActions().isEmpty()) { infoLabel.setText(configurationCompleted); -- To view, visit http://gerrit.ovirt.org/9638 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I186b5f3a812d34a30209998933c0617e9e182be7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
