[ jEdit-commits ] SF.net SVN: jedit:[22145] jEdit/branches/5.0.x

[<kp...@us...>]

Revision: 22145
          http://jedit.svn.sourceforge.net/jedit/?rev=22145&view=rev
Author:   kpouer
Date:     2012-09-03 14:46:14 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
merged rev 21800 to plugin language resource files that were not read using UTF-8 #3534917

Revision Links:
--------------
    http://jedit.svn.sourceforge.net/jedit/?rev=21800&view=rev

Modified Paths:
--------------
    jEdit/branches/5.0.x/org/gjt/sp/jedit/PluginJAR.java

Property Changed:
----------------
    jEdit/branches/5.0.x/


Property changes on: jEdit/branches/5.0.x
___________________________________________________________________
Modified: svn:mergeinfo
   - /jEdit/branches/docking_framework:13128-13258
/jEdit/trunk:21791-21792,21801,21816,21880,21917,21933,21965-21966,21974,21981,21998-22000,22055,22077,22108
   + /jEdit/branches/docking_framework:13128-13258
/jEdit/trunk:21791-21792,21800-21801,21816,21880,21917,21933,21965-21966,21974,21981,21998-22000,22055,22077,22108

Modified: jEdit/branches/5.0.x/org/gjt/sp/jedit/PluginJAR.java
===================================================================
--- jEdit/branches/5.0.x/org/gjt/sp/jedit/PluginJAR.java	2012-09-03 11:27:24 UTC (rev 22144)
+++ jEdit/branches/5.0.x/org/gjt/sp/jedit/PluginJAR.java	2012-09-03 14:46:14 UTC (rev 22145)
@@ -34,6 +34,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.Reader;
 import java.lang.reflect.Modifier;
 import java.net.URL;
 import java.util.Collection;
@@ -59,6 +60,7 @@
 import org.gjt.sp.jedit.buffer.FoldHandler;
 import org.gjt.sp.jedit.gui.DockableWindowFactory;
 import org.gjt.sp.jedit.gui.DockableWindowManager;
+import org.gjt.sp.jedit.io.CharsetEncoding;
 import org.gjt.sp.jedit.msg.PluginUpdate;
 import org.gjt.sp.jedit.msg.PropertiesChanged;
 import org.gjt.sp.util.Log;
@@ -1362,7 +1364,9 @@
 					try
 					{
 						in = classLoader.getResourceAsStream(name);
-						props.load(in);
+						CharsetEncoding utf8 = new CharsetEncoding("UTF-8");
+						Reader utf8in = utf8.getTextReader(in);
+						props.load(utf8in);
 						localizationProperties.put(languageName, props);
 					}
 					finally

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.