Commits

Anonymous committed d7686e4

WW-1059: use the encoding from wework.properties

git-svn-id: http://svn.opensymphony.com/svn/webwork/trunk@1922573baa09-0c28-0410-bef9-dab3c582ae83

  • Participants
  • Parent commits ed97a71

Comments (0)

Files changed (2)

File src/java/com/opensymphony/webwork/components/Head.java

 package com.opensymphony.webwork.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork.ActionContext;
+import com.opensymphony.webwork.config.Configuration;
+import com.opensymphony.webwork.WebWorkConstants;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
                 }
             }
         }
+
+        addParameter("encoding", Configuration.get(WebWorkConstants.WEBWORK_I18N_ENCODING));
     }
 
     public String getCalendarcss() {

File src/java/template/ajax/head.ftl

     djConfig = {
         baseRelativePath: "<@ww.url includeParams='none' value='/webwork/dojo/'/>",
         isDebug: false,
-        bindEncoding: "utf-8",
+        bindEncoding: "${parameters.encoding}",
         debugAtAllCosts: true // not needed, but allows the Venkman debugger to work with the includes
     };
 </script>