Tomas Jelinek has uploaded a new change for review.

Change subject: engine,frontend: localize snapshot type on FE
......................................................................

engine,frontend: localize snapshot type on FE

The problem was that the "Activet VM before preview" and "Active VM" Strings
were hardcoded in the backend and written to the DB as a description. The
problem with this was that the strings were taken on the frontend "as is"
and were not localized.

This patch localizes this strings on FE but leaves tham on BE to provide them
to REST.

Change-Id: I26866fd4dd91d034e7ae5afee054080a4ab864a1
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1010122
Signed-off-by: Tomas Jelinek <[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/widget/uicommon/snapshot/SnapshotsViewColumns.java
2 files changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/20767/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 aa2c653..9f0abe3 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
@@ -1575,4 +1575,10 @@
 
     @DefaultStringValue("The fields under 'Start Running On' and 'Migration 
Options' aren't editable while the VM isn't down")
     String nonEditableMigrationFieldsWhileVmNotDownInfo();
+
+    @DefaultStringValue("Active VM")
+    String snapshotDescriptionActiveVm();
+
+    @DefaultStringValue("Active VM before the preview")
+    String snapshotDescriptionActiveVmBeforePreview();
 }
diff --git 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/snapshot/SnapshotsViewColumns.java
 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/snapshot/SnapshotsViewColumns.java
index 479c6fc..9127b52 100644
--- 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/snapshot/SnapshotsViewColumns.java
+++ 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/snapshot/SnapshotsViewColumns.java
@@ -65,6 +65,7 @@
                 description = 
templates.snapshotDescription("font-style:italic", descriptionStr); 
//$NON-NLS-1$
             }
             else if (snapshot.getType() == SnapshotType.ACTIVE || 
snapshot.getType() == SnapshotType.PREVIEW) {
+                descriptionStr = snapshot.getType() == SnapshotType.ACTIVE ? 
constants.snapshotDescriptionActiveVm() : 
constants.snapshotDescriptionActiveVmBeforePreview();
                 description = templates.snapshotDescription("color:gray", 
descriptionStr); //$NON-NLS-1$
             }
 


-- 
To view, visit http://gerrit.ovirt.org/20767
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26866fd4dd91d034e7ae5afee054080a4ab864a1
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Tomas Jelinek <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to