Moti Asayag has uploaded a new change for review. Change subject: engine: Add plural form to Host, VM and Template ......................................................................
engine: Add plural form to Host, VM and Template Adds plural form to the mentioned entities so same message could serve them all by replacing the entity type. Change-Id: Ia5bf3aaf9752dae0355bd60642823eb511608167 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 5 files changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/10754/1 diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java index b9749d6..487494a 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java @@ -4,10 +4,13 @@ public enum VdcBllMessages { Unassigned, VAR__TYPE__HOST, + VAR__TYPE__HOSTS, VAR__TYPE__VM, + VAR__TYPE__VMS, VAR__TYPE__QUOTA, VAR__TYPE__VM__CLUSTER, VAR__TYPE__VM_TEMPLATE, + VAR__TYPE__VM_TEMPLATES, VAR__TYPE__SNAPSHOT, VAR__TYPE__DESKTOP_POOL, VAR__TYPE__VM_FROM_VM_POOL, diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties index 2af3c8a..5126099 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -203,12 +203,15 @@ ACTION_TYPE_FAILED_TEMPLATE_NOT_FOUND_ON_DESTINATION_DOMAIN=Cannot ${action} ${type}. The selected Storage Domain does not contain the VM Template. ACTION_TYPE_FAILED_NO_VDS_IN_POOL=Cannot ${action} ${type}. There is no active Host in the Data Center. VAR__TYPE__HOST=$type Host +VAR__TYPE__HOSTS=$entities hosts VAR__TYPE__NETWORK=$type Network VAR__TYPE__NETWORKS=$type Networks VAR__TYPE__VM=$type VM +VAR__TYPE__VMS=$entities VMs VAR__TYPE__QUOTA=$type Quota VAR__TYPE__COMPUTER_ACCOUNT=$type Computer Account VAR__TYPE__VM_TEMPLATE=$type Template +VAR__TYPE__VM_TEMPLATES=$entities templates VAR__TYPE__SNAPSHOT=$type Snapshot VAR__TYPE__DESKTOP_POOL=$type VM-Pool VAR__TYPE__VM_FROM_VM_POOL=$type VM from VM-Pool 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 b2e445e..edf702e 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 @@ -534,6 +534,9 @@ @DefaultStringValue("$type Host") String VAR__TYPE__HOST(); + @DefaultStringValue("$entities hosts") + String VAR__TYPE__HOSTS(); + @DefaultStringValue("$type Networks") String VAR__TYPE__NETWORKS(); @@ -543,6 +546,9 @@ @DefaultStringValue("$type VM") String VAR__TYPE__VM(); + @DefaultStringValue("$entities VMs") + String VAR__TYPE__VMS(); + @DefaultStringValue("$type Quota") String VAR__TYPE__QUOTA(); @@ -552,6 +558,9 @@ @DefaultStringValue("$type Template") String VAR__TYPE__VM_TEMPLATE(); + @DefaultStringValue("$entities templates") + String VAR__TYPE__VM_TEMPLATES(); + @DefaultStringValue("$type Snapshot") String VAR__TYPE__SNAPSHOT(); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index dca73e4..7963f4b 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -202,12 +202,15 @@ ACTION_TYPE_FAILED_TEMPLATE_NOT_FOUND_ON_DESTINATION_DOMAIN=Cannot ${action} ${type}. The selected Storage Domain does not contain the VM Template. ACTION_TYPE_FAILED_NO_VDS_IN_POOL=Cannot ${action} ${type}. There is no active Host in the Data Center. VAR__TYPE__HOST=$type Host +VAR__TYPE__HOSTS=$entities hosts VAR__TYPE__NETWORK=$type Network VAR__TYPE__NETWORKS=$type Networks VAR__TYPE__VM=$type VM +VAR__TYPE__VMS=$entities VMs VAR__TYPE__QUOTA=$type Quota VAR__TYPE__COMPUTER_ACCOUNT=$type Computer Account VAR__TYPE__VM_TEMPLATE=$type Template +VAR__TYPE__VM_TEMPLATES=$entities templates VAR__TYPE__SNAPSHOT=$type Snapshot VAR__TYPE__DESKTOP_POOL=$type VM-Pool VAR__TYPE__VM_FROM_VM_POOL=$type VM from VM-Pool 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 443cd99..3df02de 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 @@ -200,12 +200,15 @@ ACTION_TYPE_FAILED_TEMPLATE_NOT_FOUND_ON_DESTINATION_DOMAIN=Cannot ${action} ${type}. The selected Storage Domain does not contain the VM Template. ACTION_TYPE_FAILED_NO_VDS_IN_POOL=Cannot ${action} ${type}. There is no active Host in the Data Center. VAR__TYPE__HOST=$type Host +VAR__TYPE__HOSTS=$entities hosts VAR__TYPE__NETWORK=$type Network VAR__TYPE__NETWORKS=$type Networks VAR__TYPE__VM=$type VM +VAR__TYPE__VMS=$entities VMs VAR__TYPE__QUOTA=$type Quota VAR__TYPE__COMPUTER_ACCOUNT=$type Computer Account VAR__TYPE__VM_TEMPLATE=$type Template +VAR__TYPE__VM_TEMPLATES=$entities templates VAR__TYPE__SNAPSHOT=$type Snapshot VAR__TYPE__DESKTOP_POOL=$type VM-Pool VAR__TYPE__VM_FROM_VM_POOL=$type VM from VM-Pool -- To view, visit http://gerrit.ovirt.org/10754 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5bf3aaf9752dae0355bd60642823eb511608167 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
