Changeset 254:985bc5677aa3

Timestamp:

09/02/09 10:40:45 (4 years ago)

Author:

tgambet

Branch:

default

convert_revision:

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

Message:

added language related messaged

Location:

src/org/w3c/unicorn/action

Files:

• IndexAction.java (modified) (2 diffs)
• ObserveAction.java (modified) (3 diffs)

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

@@ -25 +25 @@
         }
         
-        
         @Override
         protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
@@ -36 +35 @@
                 resp.setContentType("text/html; charset=UTF-8");
                 
+                ArrayList<Message> messages = new ArrayList<Message>();
+                
                 // Language negotiation
                 String langParameter = req.getParameter(Property.get("UNICORN_PARAMETER_PREFIX") + "lang");
-                if (langParameter == null || !Framework.getLanguageProperties().containsKey(langParameter))
+                if (langParameter == null || !Framework.getLanguageProperties().containsKey(langParameter)) {
                         langParameter = Language.negociate(req.getLocales());
+                        if (!langParameter.equals(req.getLocale().getLanguage())) {
+                                messages.add(new Message(Message.Level.INFO, "$message_unavailable_language (" + req.getLocale().getDisplayLanguage(req.getLocale()) + "). $message_translation", null));
+                        } else {
+                                String requested_parameter = req.getParameter(Property.get("UNICORN_PARAMETER_PREFIX") + "lang");
+                                if (requested_parameter != null && !Framework.getLanguageProperties().containsKey(requested_parameter)) 
+                                        messages.add(new Message(Message.Level.INFO, "$message_unavailable_requested_language. $message_translation", null));
+                        }
+                }
+                
+                if (!Language.isComplete(langParameter))
+                        messages.add(new Message(Message.Level.INFO, "$message_incomplete_language. $message_translation", null));
                 
                 velocityContext = new VelocityContext(Language.getContext(langParameter));
                 
-                ArrayList<Message> messages = new ArrayList<Message>();
                 
-                messages.add(new Message(Message.Level.WARNING, "un warning", null));
+                
+                /*messages.add(new Message(Message.Level.WARNING, "un warning", null));
                 messages.add(new Message(Message.Level.ERROR, "une error", null));
                 messages.add(new Message(Message.Level.INFO, "une info", null));
                 messages.add(new Message(Message.Level.WARNING, "un warning avec long message", "le long message\nle long message\nle long message\nle long message\nle long message\nle long message\n"));
                 messages.add(new Message(Message.Level.ERROR, "une error avec long message",  "le long message\nle long message\nle long message\nle long message\nle long message\nle long message\n"));
-                messages.add(new Message(Message.Level.INFO, "une info avec long message",  "le long message\nle long message\nle long message\nle long message\nle long message\nle long message\nle long message\n"));
+                messages.add(new Message(Message.Level.INFO, "une info avec long message",  "le long message\nle long message\nle long message\nle long message\nle long message\nle long message\nle long message\n"));*/
                 
-                if (!Language.isComplete(langParameter)) {
-                        Message mess = new Message(Message.Level.INFO, "incomplete language", null);
-                        messages.add(mess);
-                        //velocityContext.put("message", mess);
-                }
+                
                 
                 if (req.getAttribute("unicorn_message") != null)
-                        //velocityContext.put("message", req.getAttribute("unicorn_message"));
                         messages.add((Message) req.getAttribute("unicorn_message"));
                 

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

@@ -1 @@
-// $Id: ObserveAction.java,v 1.7 2009-09-01 16:07:29 tgambet Exp $
+// $Id: ObserveAction.java,v 1.8 2009-09-02 10:40:45 tgambet Exp $
 // Author: Jean-Guilhem Rouel
 // (c) COPYRIGHT MIT, ERCIM and Keio, 2006.
@@ -132 +132 @@
                 if (aUnicornCall.getTask() == null) {
                         aUnicornCall.setTask(Framework.mapOfTask.getDefaultTaskId());
-                        Message mess = new Message(Message.Level.WARNING, "No task specified! Unicorn used its default task: " + Framework.mapOfTask.get(Framework.mapOfTask.getDefaultTaskId()).getLongName("en"), null);
+                        Message mess = new Message(Message.Level.WARNING, "$message_no_task " + Framework.mapOfTask.get(Framework.mapOfTask.getDefaultTaskId()).getLongName(langParameter), null);
                         ArrayList<Message> messages = new ArrayList<Message>();
                         messages.add(mess);
@@ -255 +255 @@
                 }
 
+                if (aUnicornCall.getTask() == null) {
+                        aUnicornCall.setTask(Framework.mapOfTask.getDefaultTaskId());
+                        Message mess = new Message(Message.Level.WARNING, "$message_no_task " + Framework.mapOfTask.get(Framework.mapOfTask.getDefaultTaskId()).getLongName(langParameter), null);
+                        ArrayList<Message> messages = new ArrayList<Message>();
+                        messages.add(mess);
+                        mapOfStringObject.put("messages", messages);
+                }
+                
                 try {
                         aUnicornCall.doTask();