[Engine-patches] Change in ovirt-engine[master]: core: Error messages translation fix

[jniederm]

Jakub Niedermertl has uploaded a new change for review.

Change subject: core: Error messages translation fix
......................................................................

core: Error messages translation fix

Error message with variable reference at the beginning results in empty
string.
E.g. "${foo} bar"

Change-Id: Idad1f7ce2f48c8e05e0e4b4f7e34d559abd65cda
Signed-off-by: Jakub Niedermertl <jnied...@redhat.com>
---
M 
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ErrorTranslatorImpl.java
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/41937/1

diff --git 
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ErrorTranslatorImpl.java
 
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ErrorTranslatorImpl.java
index e023b79..e210e4d 100644
--- 
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ErrorTranslatorImpl.java
+++ 
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ErrorTranslatorImpl.java
@@ -168,7 +168,7 @@
         ArrayList<String> translatedErrors = new ArrayList<String>();
         HashMap<String, String> variables = new HashMap<String, String>();
         for (String currentMessage : translatedMessages) {
-            if (currentMessage.startsWith("$")) {
+            if (currentMessage.startsWith("$") && 
!startsWithVariableReference(currentMessage)) {
                 AddVariable(currentMessage, variables);
             } else {
                 translatedErrors.add(currentMessage);
@@ -184,6 +184,11 @@
         return returnValue;
     }
 
+    private static boolean startsWithVariableReference(String message) {
+        final String startsWithVariableRefereceRegex = "^\\$\\{\\S+\\} .*";
+        return message.matches(startsWithVariableRefereceRegex);
+    }
+
     private void AddVariable(String variable, HashMap<String, String> 
variables) {
         int firstSpace = variable.indexOf(' ');
         if (firstSpace != -1 && firstSpace < variable.length()) {


-- 
To view, visit https://gerrit.ovirt.org/41937
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idad1f7ce2f48c8e05e0e4b4f7e34d559abd65cda
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Jakub Niedermertl <jnied...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches