Changeset 1070 for trunk/jabberit_messenger/java_source/src/nu/fw/jeti/util

Timestamp:

07/02/09 13:38:44 (15 years ago)

Author:

alexandrecorreia

Message:

Ticket #474 - Arquivos modificados para a tradução do Applet.

Location:

trunk/jabberit_messenger/java_source/src/nu/fw/jeti/util

Files:

• I18N.java (modified) (6 diffs)
• Preferences.java (modified) (3 diffs)

trunk/jabberit_messenger/java_source/src/nu/fw/jeti/util/I18N.java

@@ -1 @@
-/*
+/**
  * @Author(s) - Alexndre Correia
- *
- * This class is a wrapper for easier i18n of Jeti. 
- * It uses the standard i18n mechanisms given by Java. 
- * 
  * Created on - 30/06/2009
  */
@@ -10 +6 @@
 package nu.fw.jeti.util;
 
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
 import java.util.*;
 
@@ -21 +19 @@
         private static HashMap messagesLangPlugins;
         
+        private static String getEncoding()
+        {
+                CharsetDecoder decoder = Charset.defaultCharset().newDecoder();
+        String charsetType = decoder.charset().toString();
+        
+        return charsetType;
+        }
+
         public static String getText(String type, String messageID)
         {
@@ -39 +45 @@
                 //remove &
                 int i = translation.indexOf("&");
-                if (i > -1)
-                {
+                
+                if ( i > -1 )
                         translation = translation.substring(0, i) + translation.substring(i + 1, translation.length());
-                }
 
                 return translation;
@@ -58 +63 @@
                 if( translation == null )
                 {
-                        int dotPos = messageID.lastIndexOf('.');
+                        translation = (String)messagesLangPlugins.get(messageID);
                         
-                        if ( dotPos > 0 )
-                                messageID = messageID.substring(dotPos+1);
-                        
-                        return messageID.replace('_',' ');                      
+                        if( translation == null )
+                        {
+                                int dotPos = messageID.lastIndexOf('.');
+                                
+                                if ( dotPos > 0 )
+                                        messageID = messageID.substring(dotPos+1);
+                                
+                                return messageID.replace('_',' ');
+                        }
                 }
 
-                return translation; 
+                // Encoding UTF-8/ISO-8859-1            
+                try
+                {
+
+                        translation = new String(translation.getBytes("UTF-8"), "UTF-8");
+
+                }catch(Exception e){}
+
+                return translation;
         }
 
@@ -169 +187 @@
                 Locale myLocale   = null;
 
-                if( myLanguage != "" )
+                if( !myLanguage.equals("") && !myCountry.equals("") )
                         myLocale = new Locale(myLanguage, myCountry);
                 else
                         myLocale = new Locale("en", "US");
-
-                System.out.println("Valor de myLocale : " + myLocale);
                 
                 I18N.loadLanguages(myLocale);

trunk/jabberit_messenger/java_source/src/nu/fw/jeti/util/Preferences.java

@@ -104 +104 @@
         {
                 /**
-                 * @author(s) : Alexandre Correia - alexandrecorreia@celepar.pr.gov.br
-                 * @brief : Adicionado as traduções para os items do menu ( presença )
+                 * @Author(s) : Alexandre Correia - alexandrecorreia@celepar.pr.gov.br
+                 * @description : Adicionado as traducoes para os items do menu ( presenca )
                  */
                 
                 List tempList = new ArrayList(10);
-                        tempList.add("Disponível");
-                        tempList.add("Livre p/ Chat");
+                        tempList.add(I18N.gettext("initMessages.Available"));
+                        tempList.add(I18N.gettext("initMessages.Free_for_Chat"));
                         mapMessages.put("chat", tempList);
                         mapMessages.put("available", tempList);
                         tempList = new ArrayList(10);
-                        tempList.add("Em reunião");
-                        tempList.add("Ocupado");
-                        tempList.add("Trabalhando");
+                        tempList.add(I18N.gettext("initMessages.In_a_meeting"));
+                        tempList.add(I18N.gettext("initMessages.Busy"));
+                        tempList.add(I18N.gettext("initMessages.Working"));
                         mapMessages.put("dnd", tempList);
                         tempList = new ArrayList(10);
-                        tempList.add("No telefone");
-                        tempList.add("Volto Logo");
+                        tempList.add(I18N.gettext("initMessages.On_the_phone"));
+                        tempList.add(I18N.gettext("initMessages.Be_right_back"));
                         mapMessages.put("away", tempList);
                         tempList = new ArrayList(10);
-                        tempList.add("Férias");
-                        tempList.add("Em casa");
-                        tempList.add("Ausente");
+                        tempList.add(I18N.gettext("initMessages.On_vacation"));
+                        tempList.add(I18N.gettext("initMessages.Gone_home"));
+                        tempList.add(I18N.gettext("initMessages.Extend_Away"));
                         mapMessages.put("xa", tempList);
                 
@@ -145 +145 @@
         {
                 mapMessages.putAll(jetiExtension.getMessages());
-                //removed save message version check because it gives problems when
-                //the server has removed the messages so there is no version
-//              if(jetiExtension.getXmlVersion()==null)
-//              {//on extension not found set save to true to try to overwrite
-//                      save = true;
-//              }
-//              else 
-//              {
-//                      try
-//                      {
-//                              //save if loaded xml version <= own xmlversion (backwards compatible)
-//                              save = (Integer.parseInt(jetiExtension.getXmlVersion().substring(1)) <= Integer.parseInt(JetiPrivateExtension.XML_VERSION.substring(1)));
-//                      }
-//                      catch (Exception e)
-//                      {
-//                      } //exception not saven
-//              }
         }
 
@@ -172 +155 @@
         {
                 mapMessages.put(convertPresenceKey(key), value);
-                //if(save)backend.savePreferences(map,mapMessages);
         }