Fixed #3062 : Added support for Hebrew locale

svn changeset:8193/svn branch:6.0

1 files changed, 12 insertions, 1 deletions

diff --git a/src/com/vaadin/terminal/gwt/server/CommunicationManager.java b/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
index 9ad8f7725e..6c74f4d4db 100644
--- a/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
@@ -960,7 +960,18 @@ public class CommunicationManager implements Paintable.RepaintRequestListener,
             if (ampm_first > 0 && ampm_first < timeStart) {
                 timeStart = ampm_first;
             }
-            final String dateformat = df.substring(0, timeStart - 1);
+            // Hebrew locale has time before the date
+            final boolean timeFirst = timeStart == 0;
+            String dateformat;
+            if (timeFirst) {
+                int dateStart = df.indexOf(' ');
+                if (ampm_first > dateStart) {
+                    dateStart = df.indexOf(' ', ampm_first);
+                }
+                dateformat = df.substring(dateStart + 1);
+            } else {
+                dateformat = df.substring(0, timeStart - 1);
+            }
 
             outWriter.print("\"df\":\"" + dateformat.trim() + "\",");