pvollenweider 2005/06/09 12:43:33 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/java/org/jahia/bin JahiaConfigurationWizard.java
Log:
Ooops... Remove GBK specific code again
Revision Changes Path
1.55.2.6 +12 -16
jahia/src/java/org/jahia/bin/JahiaConfigurationWizard.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/bin/JahiaConfigurationWizard.java.diff?r1=1.55.2.5&r2=1.55.2.6&f=h
Index: JahiaConfigurationWizard.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/bin/Attic/JahiaConfigurationWizard.java,v
retrieving revision 1.55.2.5
retrieving revision 1.55.2.6
diff -u -r1.55.2.5 -r1.55.2.6
--- JahiaConfigurationWizard.java 9 Jun 2005 10:27:42 -0000 1.55.2.5
+++ JahiaConfigurationWizard.java 9 Jun 2005 10:43:32 -0000 1.55.2.6
@@ -1,4 +1,4 @@
-// $Id: JahiaConfigurationWizard.java,v 1.55.2.5 2005/06/09 10:27:42
pvollenweider Exp $
+// $Id: JahiaConfigurationWizard.java,v 1.55.2.6 2005/06/09 10:43:32
pvollenweider Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -336,22 +336,18 @@
// set browser response content type
String contentTypeStr = "text/html;charset=";
- if (defaultLocale.toString().substring(0,2).equals("zh")) {
- contentTypeStr = contentTypeStr + "GBK";
- } else {
- String acceptCharset = request.getHeader("accept-charset");
- boolean acceptsUTF8 = false;
- if (acceptCharset != null) {
- if (acceptCharset.toLowerCase().indexOf("utf-8") != -1) {
- acceptsUTF8 = true;
- }
- }
- if (acceptsUTF8) {
- contentTypeStr = contentTypeStr + "UTF-8";
- } else {
- contentTypeStr = contentTypeStr + "ISO8859-1";
+ String acceptCharset = request.getHeader("accept-charset");
+ boolean acceptsUTF8 = false;
+ if (acceptCharset != null) {
+ if (acceptCharset.toLowerCase().indexOf("utf-8") != -1) {
+ acceptsUTF8 = true;
}
}
+ if (acceptsUTF8) {
+ contentTypeStr = contentTypeStr + "UTF-8";
+ } else {
+ contentTypeStr = contentTypeStr + "ISO8859-1";
+ }
request.setAttribute("content-type", contentTypeStr);
// redirect!
@@ -2286,4 +2282,4 @@
}
-// end JahiaConfigurationWizard
+// end JahiaConfigurationWizard
\ No newline at end of file
