Convert non-ASCII TimeZone

Where the name of the time-zone has Arabic or other digits
Fixes #381

Author: jodastephen

RELEASE-NOTES.txt

@@ -13,6 +13,11 @@ This is the same license as all of Apache, plus other open source projects such
 **  Please also check out our related projects   **
 ** http://www.joda.org/joda-time/related.html **
 
+Changes in 2.9.6
+----------------
+ - Support conversion of old TimeZone where name has digits other than ASCII [#381]
+
+
 Changes in 2.9.5
 ----------------
  - Add Norwegian period translations [#378]

src/main/java/org/joda/time/DateTimeZone.java

@@ -362,6 +362,12 @@ public static DateTimeZone forTimeZone(TimeZone zone) {
             convId = id;
             if (convId.startsWith("GMT+") || convId.startsWith("GMT-")) {
                 convId = convId.substring(3);
+                if (convId.length() > 2) {
+                    char firstDigit = convId.charAt(1);
+                    if (firstDigit > '9' && Character.isDigit(firstDigit)) {
+                        convId = convertToAsciiNumber(convId);
+                    }
+                }
                 int offset = parseOffset(convId);
                 if (offset == 0L) {
                     return DateTimeZone.UTC;
@@ -374,6 +380,18 @@ public static DateTimeZone forTimeZone(TimeZone zone) {
         throw new IllegalArgumentException("The datetime zone id '" + id + "' is not recognised");
     }
 
+    private static String convertToAsciiNumber(String convId) {
+        StringBuilder buf = new StringBuilder(convId);
+        for (int i = 0; i < buf.length(); i++) {
+            char ch = buf.charAt(i);
+            int digit = Character.digit(ch, 10);
+            if (digit >= 0) {
+                buf.setCharAt(i, (char) ('0' + digit));
+            }
+        }
+        return buf.toString();
+    }
+
     //-----------------------------------------------------------------------
     /**
      * Gets the zone using a fixed offset amount.

src/test/java/org/joda/time/TestDateTimeZone.java

@@ -394,6 +394,11 @@ public void testForTimeZone_TimeZone() {
 
         zone = DateTimeZone.forTimeZone(TimeZone.getTimeZone("EST"));
         assertEquals("America/New_York", zone.getID());
+        
+        TimeZone tz = TimeZone.getTimeZone("GMT-08:00");
+        tz.setID("GMT-\u0660\u0668:\u0660\u0660");
+        zone = DateTimeZone.forTimeZone(tz);
+        assertEquals("-08:00", zone.getID());
     }
 
     public void testFromTimeZoneInvalid() throws Exception {