Sahina Bose has uploaded a new change for review.

Change subject: gluster: Added missing messages for gluster hooks
......................................................................

gluster: Added missing messages for gluster hooks

Added missing front-end messages for gluster hooks.

Change-Id: Ic73940937f7ca427bfdf96ff898922010c72199d
Bug-Url: https://bugzilla.redhat.com/971676
Bug-Url: https://bugzilla.redhat.com/971658
Signed-off-by: Sahina Bose <[email protected]>
---
M 
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M 
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
M 
frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
M 
frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
4 files changed, 20 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/15711/1

diff --git 
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
 
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
index d62869f..c6609d4 100644
--- 
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
+++ 
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
@@ -772,6 +772,12 @@
     @DefaultStringValue("$action refresh")
     String VAR__ACTION__REFRESH();
 
+    @DefaultStringValue("$action enable")
+    String VAR__ACTION__ENABLE();
+
+    @DefaultStringValue("$action disable")
+    String VAR__ACTION__DISABLE();
+
     @DefaultStringValue("$hostStatus Up")
     String VAR__HOST_STATUS__UP();
 
@@ -2307,4 +2313,7 @@
 
     @DefaultStringValue("Cannot ${action} ${type}. The server ${VdsName} is 
not UP.")
     String ACTION_TYPE_FAILED_SERVER_STATUS_NOT_UP();
+
+    @DefaultStringValue("One or more servers in the cluster is down.")
+    String CLUSTER_ALL_SERVERS_NOT_UP();
 }
diff --git 
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
 
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
index a9460b8..c836489 100644
--- 
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
+++ 
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
@@ -294,6 +294,12 @@
 
     String AuditLogType___GLUSTER_HOOK_REFRESH_FAILED();
 
+    String AuditLogType___GLUSTER_HOOK_CONFLICT_DETECTED();
+
+    String AuditLogType___GLUSTER_HOOK_DETECTED_NEW();
+
+    String AuditLogType___GLUSTER_HOOK_DETECTED_DELETE();
+
     String AuditLogType___GLUSTER_SERVICE_STARTED();
 
     String AuditLogType___GLUSTER_SERVICE_START_FAILED();
diff --git 
a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
 
b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
index 6dd181f..13d9264 100644
--- 
a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
+++ 
b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
@@ -143,6 +143,9 @@
 AuditLogType___GLUSTER_HOOK_REMOVE_FAILED=Failed to remove Gluster Hook from 
cluster
 AuditLogType___GLUSTER_HOOK_REFRESH=Gluster Hooks refreshed
 AuditLogType___GLUSTER_HOOK_REFRESH_FAILED=Failed to refresh Gluster Hooks
+AuditLogType___GLUSTER_HOOK_CONFLICT_DETECTED=Detected conflict in Gluster Hook
+AuditLogType___GLUSTER_HOOK_DETECTED_NEW=Detected new Gluster Hook
+AuditLogType___GLUSTER_HOOK_DETECTED_DELETE=Detected removal of Gluster Hook
 AuditLogType___GLUSTER_SERVICE_STARTED=Gluster Service started
 AuditLogType___GLUSTER_SERVICE_START_FAILED=Failed to start Gluster service
 AuditLogType___GLUSTER_SERVICE_STOPPED=Gluster Service stopped
@@ -150,6 +153,7 @@
 AuditLogType___GLUSTER_SERVICE_RESTARTED=Gluster Service re-started
 AuditLogType___GLUSTER_SERVICE_RESTART_FAILED=Failed to re-start Gluster 
Service
 
+
 VdcActionType___ActivateVds=Activate Host
 VdcActionType___RecoveryStoragePool=Reinitialize Data Center
 VdcActionType___UpdateVmInterface=Edit VM Interface properties
diff --git 
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
 
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index f480fc9..7cbf583 100644
--- 
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++ 
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -848,6 +848,7 @@
 ACTION_TYPE_FAILED_SERVER_SERVICE_NOT_FOUND=Cannot ${action} ${type}. Service 
not found.
 ACTION_TYPE_FAILED_SERVICE_ALREADY_RUNNING=Cannot ${action} ${type}. Service 
${service} is already running on server ${server}.
 ACTION_TYEPE_FAILED_SERVICE_ALREADY_STOPPED=Cannot ${action} ${type}. Service 
${service} already stopped on Server ${server}.
+CLUSTER_ALL_SERVERS_NOT_UP=One or more servers in the cluster is down
 
 # External Events Errors Messages
 VAR__TYPE__EXTERNAL_EVENT=$type External Event


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

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

Reply via email to