Changeset 721:f72b7bb18930

Timestamp:

10/09/09 11:11:37 (4 years ago)

Author:

tgambet

Branch:

default

convert_revision:

svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@722

Message:

updated

Files:

• src/org/w3c/unicorn/action/LanguageAction.java (modified) (9 diffs)

src/org/w3c/unicorn/action/LanguageAction.java

@@ +1 @@
+// $Id: LanguageAction.java,v 1.8 2009-10-09 11:11:37 tgambet Exp $
+// Author: Thomas Gambet
+// (c) COPYRIGHT MIT, ERCIM and Keio, 2009.
+// Please first read the full copyright statement in file COPYRIGHT.html
 package org.w3c.unicorn.action;
 
-import java.io.CharArrayWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.Writer;
-import java.net.URLDecoder;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CharsetEncoder;
 import java.util.ArrayList;
 import java.util.Hashtable;
@@ -28 +21 @@
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.velocity.VelocityContext;
 import org.w3c.unicorn.Framework;
 import org.w3c.unicorn.exceptions.UnicornException;
-import org.w3c.unicorn.output.AttachmentOutputFormater;
+import org.w3c.unicorn.output.FileOutputFormater;
 import org.w3c.unicorn.output.OutputFormater;
 import org.w3c.unicorn.output.SimpleOutputFormater;
@@ -49 +43 @@
         private static final long serialVersionUID = 1L;
         
+        private static Log logger = LogFactory.getLog(LanguageAction.class);
+        
         private static TreeMap<String, Properties> languageProperties;
         
@@ -96 +92 @@
                 else {
                         if (Framework.getLanguageProperties().containsKey(langParameter)) {
-                                messages.add(new Message(Message.INFO, "This translation lacks " + (defaultProperties.size() - languageProperties.get(langParameter).size()) + " properties. Help us to improve it."));
+                                if (langParameter.equals(Property.get("DEFAULT_LANGUAGE"))) {
+                                        messages.add(new Message(Message.INFO, "You cannot edit the default language"));
+                                        Templates.write("language.vm", velocityContext, writer);
+                                        writer.close(); return;
+                                } else {
+                                        int missings = defaultProperties.size() - languageProperties.get(langParameter).size();
+                                        
+                                        if (missings > 0)
+                                                messages.add(new Message(Message.INFO, "This translation lacks " + (defaultProperties.size() - languageProperties.get(langParameter).size()) + " properties. Help us to improve it."));
+                                        else 
+                                                messages.add(new Message(Message.INFO, "This translation is complete but you can help us to improve it if needed."));
+                                }
                                 velocityContext.put("prop", languageProperties.get(langParameter));
                         } else if (Language.isISOLanguageCode(langParameter)) {
@@ -135 +142 @@
                 req.setCharacterEncoding("UTF-8");
                 resp.setContentType("text/html; charset=UTF-8");
-            
-            //resp.getWriter().println(new String(req.getParameter("ja_universal_checker").getBytes("UTF-8"), "UTF-8"));
-            
-            /*File file = new File(Property.get("UPLOADED_FILES_REPOSITORY") + "/test.txt");
-            file.createNewFile();
-            FileOutputStream fileStream = new FileOutputStream(file);
-            OutputStreamWriter os = new OutputStreamWriter(fileStream, "UTF-8");
-            os.write(req.getParameter("ja_universal_checker"));
-            os.close();*/
                 
                 String languageParameter = req.getParameter("translation_language");
@@ -152 +150 @@
                         return;
                 } else {
-                        Properties langProps = languageProperties.get(languageParameter);
-                        if (langProps == null) {
+                        Properties langProps;
+                        if (languageProperties.get(languageParameter) == null) {
                                 langProps = createProperties(languageParameter);
+                                contextObjects.put("new_translation", true);
                                 if (langProps == null) {
                                         doGet(req, resp);
                                         return;
                                 }
-                        }
+                        } else
+                                langProps = (Properties) languageProperties.get(languageParameter).clone();
                         
                         StringBuilder changeLog = new StringBuilder();
-                        
                         for (Object obj : req.getParameterMap().keySet()) {
                                 String paramKey = (String) obj;
@@ -172 +171 @@
                                 
                                 if (!req.getParameter(paramKey).equals("") && !req.getParameter(paramKey).equals(langProps.getProperty(key))) {
-                                        changeLog.append(key + ":\n");
+                                        changeLog.append("\n" + key + ":\n");
                                         changeLog.append("\t + " + req.getParameter(paramKey) + "\n");
                                         if (langProps.getProperty(key) != null)
@@ -179 +178 @@
                                         langProps.put(key, req.getParameter(paramKey));
                                 }
-                                
-                                
-                        }
-                        
-                        
-                        
-                        //contextObjects.put("changeLog", changeLog);
-                        
-                        //Writer os = new CharArrayWriter();
-                
-                        
-                        //langProps.store(new OutputStreamWriter(new ByteArrayOutputStream(), "UTF-8"), "");
-                        
-                        //contextObjects.put("properties", os.toString());
+                        }
+                        
+                        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                        OutputStreamWriter osw = new OutputStreamWriter(baos, "UTF-8");
+                        langProps.store(osw, "Submitted by " + req.getParameter("translator_name") + " (" + req.getParameter("translator_mail") +")");
+                        osw.close();
+                        baos.close();
+                        contextObjects.put("properties", baos.toString("UTF-8"));
+                        contextObjects.put("changeLog", changeLog);
+                        contextObjects.put("translator_name", req.getParameter("translator_name"));
+                        contextObjects.put("translator_mail", req.getParameter("translator_mail"));
+                        contextObjects.put("translator_comments", req.getParameter("translator_comments"));
+                        contextObjects.put("language", Language.getLocale(languageParameter).getDisplayLanguage(Locale.ENGLISH));
                         
                         MessageList messages = new MessageList();
@@ -202 +200 @@
                         // From now on the response is committed, careful 
                         
-                        String[] recipients = {"thomas.gambet@orange.fr"};
+                        String[] recipients = {Property.getProps("mail.properties").getProperty("unicorn.mail.language.to"), 
+                                        req.getParameter("translator_mail")};
+                        String subject = "Unicorn - Translation in " + contextObjects.get("language") + " (submitted by " + req.getParameter("translator_name") + ")";
                         
                         OutputFormater mainOutputFormater = new SimpleOutputFormater("language.mail", Property.get("DEFAULT_LANGUAGE"), "text/plain");
-                        OutputFormater attachmentOutputFormater = new AttachmentOutputFormater("language.properties", Property.get("DEFAULT_LANGUAGE"), "text/plain", "test.txt");
+                        OutputFormater fileOutputFormater = new FileOutputFormater("language.properties", Property.get("DEFAULT_LANGUAGE"), "text/plain", languageParameter + ".properties");
                         
                         List<OutputFormater> outputFormaters = new ArrayList<OutputFormater>();
                         outputFormaters.add(mainOutputFormater);
-                        //outputFormaters.add(attachmentOutputFormater);
+                        outputFormaters.add(fileOutputFormater);
                         
                         Mail mailer = new Mail();
                         try {
-                                mailer.sendMail(recipients, "test subject", outputFormaters, contextObjects);
+                                mailer.sendMail(recipients, subject, outputFormaters, contextObjects);
                         } catch (UnicornException e) {
-                                // TODO Auto-generated catch block
-                                e.printStackTrace();
-                        }
-                        
-                        //checkParameters(req);
+                                logger.error(e.getMessage(), e);
+                        }
+                        
                 }