Changeset 3122 in josm for trunk

Timestamp:

2010-03-12T12:00:43+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #4673: I18n: motd in russian not displayed

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/GettingStarted.java (modified) (2 diffs)
• io/CacheCustomContent.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/GettingStarted.java

@@ -7 +7 @@
 import java.awt.BorderLayout;
 import java.awt.EventQueue;
+import java.io.UnsupportedEncodingException;
 
 import javax.swing.JEditorPane;
@@ -68 +69 @@
             Main.pref.putInteger("cache.motd.html.version", myVersion);
             Main.pref.put("cache.motd.html.lang", myLang);
-
-            return motd.getBytes();
+            try {
+                return motd.getBytes("utf-8");
+            } catch(UnsupportedEncodingException e){
+                e.printStackTrace();
+                return new byte[0];
+            }
         }
 

trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java

@@ -8 +8 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.util.Date;
 
@@ -117 +118 @@
     public String updateForceString() {
         updateForce();
-        return new String(data);
+        try {
+            return new String(data,"utf-8");
+        } catch(UnsupportedEncodingException e){
+            e.printStackTrace();
+            return "";
+        }
     }
 
@@ -136 +142 @@
      */
     public String getDataString() {
-        return new String(getData());
+        try {
+            return new String(getData(), "utf-8");
+        } catch(UnsupportedEncodingException e){
+            e.printStackTrace();
+            return "";
+        }
     }