unicorn commit: ~ can't rely on host header behind proxy, changed for UNICORN_URL

changeset:   1514:b2a98fb633d4
tag:         tip
user:        Thomas Gambet <tgambet@w3.org>
date:        Thu Sep 23 13:31:30 2010 -0400
files:       WebContent/WEB-INF/resources/templates/language.mail.vm src/org/w3c/unicorn/action/LanguageAction.java
description:
~ can't rely on host header behind proxy, changed for UNICORN_URL


diff -r 89240e224d66 -r b2a98fb633d4 WebContent/WEB-INF/resources/templates/language.mail.vm
--- a/WebContent/WEB-INF/resources/templates/language.mail.vm	Thu Sep 23 12:56:23 2010 -0400
+++ b/WebContent/WEB-INF/resources/templates/language.mail.vm	Thu Sep 23 13:31:30 2010 -0400
@@ -9,7 +9,7 @@
 New tasklist translation in $language#elseif ($tasklistChanged)
 Updated tasklist $language translation#end
 
-Submitter: $translator_name
+Submitter: $translator_name <$translator_mail>
 #if($translator_comments)
 Submitter comments:
 $translator_comments
diff -r 89240e224d66 -r b2a98fb633d4 src/org/w3c/unicorn/action/LanguageAction.java
--- a/src/org/w3c/unicorn/action/LanguageAction.java	Thu Sep 23 12:56:23 2010 -0400
+++ b/src/org/w3c/unicorn/action/LanguageAction.java	Thu Sep 23 13:31:30 2010 -0400
@@ -277,12 +277,12 @@
 			contextObjects.put("tasklistChangeLog", tasklistChangeLog);
 			contextObjects.put("interfaceChanged", interfaceChanged);
 			contextObjects.put("tasklistChanged", tasklistChanged);
-			contextObjects.put("host", req.getHeader("Host"));
+			contextObjects.put("host", Property.get("UNICORN_URL"));
 			
 			if (interfaceChanged) {
 				ByteArrayOutputStream baos = new ByteArrayOutputStream();
 				OutputStreamWriter osw = new OutputStreamWriter(baos, "UTF-8");
-				langProps.store(osw, "Submitted by " + req.getParameter("translator_name") + " <" + req.getParameter("translator_mail") + ">");
+				langProps.store(osw, "Submitted by " + req.getParameter("translator_name"));
 				osw.close();
 				baos.close();
 				contextObjects.put("interfaceProperties", baos.toString("UTF-8"));

Received on Thursday, 23 September 2010 17:31:43 UTC