encoding fixes

diff --git a/source/Mir.java b/source/Mir.java
index 2e4d0e6..ea6a9f3 100755 (executable)
--- a/source/Mir.java
+++ b/source/Mir.java
@@ -81,7 +81,7 @@ import mircoders.servlet.*;
  * Mir.java - main servlet, that dispatches to servletmodules\r
  *\r
  * @author $Author: zapata $\r
- * @version $Id: Mir.java,v 1.42 2003/04/09 02:06:06 zapata Exp $\r
+ * @version $Id: Mir.java,v 1.43 2003/04/12 15:29:43 zapata Exp $\r
  *\r
  */\r
 public class Mir extends AbstractServlet {\r
@@ -190,9 +190,12 @@ public class Mir extends AbstractServlet {
     //FIXME: this seems kind of hackish and only here because we can have\r
     // default other than the one that the browser is set to.\r
     Locale locale = new Locale(getDefaultLanguage(aRequest), "");\r
-    MessageResources messageResources =\r
-      MessageResources.getMessageResources("bundles.admin");\r
-    String htmlcharset = messageResources.getMessage(locale, "htmlcharset");\r
+    String htmlcharset = "UTF-8";\r
+    try {\r
+      htmlcharset = MirPropertiesConfiguration.instance().getString("Mir.DefaultHTMLCharset");\r
+    }\r
+    catch (Throwable t) {\r
+    }\r
 \r
     aResponse.setContentType("text/html; charset=" + htmlcharset);\r
 \r

diff --git a/source/default.properties b/source/default.properties
index 38bdddf..6e172d7 100755 (executable)
--- a/source/default.properties
+++ b/source/default.properties
@@ -270,6 +270,12 @@ Adaptor.PostgreSQL.Driver=org.postgresql.Driver
 # also used for the HTML charset meta tag.
 Mir.DefaultEncoding=UTF8
 
+# this encoding is used for the HTML charset meta tag.
+# it must be the html charset equivalent of the Java encoding above
+# don't change this unless...
+Mir.DefaultHTMLCharset=UTF-8
+
+
 
 
 #