Changeset 4002 for branches/2.2/mobile

Timestamp:

04/13/11 11:23:00 (13 years ago)

Author:

thiagoaos

Message:

Ticket #1747 - Traduzido o nome das pastas padrões no mobile.

Location:

branches/2.2/mobile/inc

Files:

• class.bo_mobilemail.inc.php (added)
• class.ui_home.inc.php (modified) (4 diffs)
• class.ui_mobilemail.inc.php (modified) (7 diffs)

branches/2.2/mobile/inc/class.ui_home.inc.php

@@ -4 +4 @@
                 var $db;
                 var $bocalendar;
+                var $bo_mobilemail;
                 var $common;
                 var $template;
@@ -19 +20 @@
                         $this->db       = CreateObject('phpgwapi.db');
                         $this->bocalendar = CreateObject('calendar.bocalendar');
+                        $this->bo_mobilemail = CreateObject('mobile.bo_mobilemail');
                 }
                 
@@ -105 +107 @@
                         }
                 }
-
-                function get_translate_default_folder_name_from_id($folder_id) {
-                        $imap_delimiter = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter'];
-                        
-                        switch ($folder_id) {
-                                case 'INBOX':
-                                        return lang("Inbox");
-                                case 'INBOX'.$imap_delimiter.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']: 
-                                        return lang("Trash");
-                                case 'INBOX'.$imap_delimiter.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']: 
-                                        return lang("Drafts");
-                                case 'INBOX'.$imap_delimiter.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']: 
-                                        return lang("Spam");
-                                case 'INBOX'.$imap_delimiter.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']: 
-                                        return lang("Sent");
-                                default:
-                                        return "";
-                        }
-                }
                 
                 /**
@@ -136 +119 @@
                                 $this->template->set_var('folder_id', $index + $index_increment );
                                 
-                                $translated_folder_name = $this->get_translate_default_folder_name_from_id($folder["folder_id"]);
+                                $translated_folder_name = $this->bo_mobilemail->get_translate_default_folder_name_from_id($folder["folder_id"]);
                                 
                                 $this->template->set_var('folder_name', (($translated_folder_name == "") ? $folder["folder_name"] : $translated_folder_name) );

branches/2.2/mobile/inc/class.ui_mobilemail.inc.php

@@ -38 +38 @@
                         'index' => true
                 );
-
+        
+                var $bo_mobilemail;
                 var $template;
                 var $common;
@@ -57 +58 @@
                 function ui_mobilemail()
                 {
-                        $this-> load_session();                                         
+                        $this-> load_session();
                         $this->template = CreateObject('phpgwapi.Template', PHPGW_SERVER_ROOT . '/mobile/templates/'.$GLOBALS['phpgw_info']['server']['template_set']);
                         $this->common   = CreateObject('mobile.common_functions');
+                        $this->bo_mobilemail = CreateObject('mobile.bo_mobilemail');
                         
                         // Recupera atributos da classe gravados na sessão
@@ -363 +365 @@
                         //$this->template->fpf('out', 'mobilemail_t');
                         $GLOBALS['phpgw_info']['mobiletemplate']->set_content($this->template->fp('out', 'mobilemail_t'));
-
                 }
 
@@ -373 +374 @@
                 function old_print_folder_selection()
                 {
-
                         // Processa as options
                         $folder_items = '';
@@ -394 +394 @@
                                         $this->template->set_var('folder_id', $j['folder_id']);
                                         $this->template->set_var('folder_name', $j['folder_id']); // Mudar... provavelmente usar preg_replace
-                                                                                                                                 // para substituir cpf pelo nome do usuário.
-
+                                        // para substituir cpf pelo nome do usuário.
                                         if ($j['folder_unseen'] > 0)
-                                        {
                                                 $this->template->set_var('folder_unseen', ' - ('.$j['folder_unseen'].')');
-                                        }
 
                                         $folder_items .= $this->template->fp('mobile_t', 'folder_item');
                                 }
-
                         }
 
@@ -425 +421 @@
                                 
                         $p = $this->template;
-                        $p->set_file(
-                                Array(
-                                        'mail_t' => 'mobilemail.tpl',
-                                        'home_search_bar' => 'search_bar.tpl'
-                                )
-                        );
+                        $p->set_file( array( 'mail_t' => 'mobilemail.tpl', 'home_search_bar' => 'search_bar.tpl' ) );
 
                         $p->set_block('home_search_bar','search_bar');
@@ -438 +429 @@
                         $p->set_var("lang_new",strtoupper(lang("new")));
                         $p->set_var("folder_id",$this->folders[$this->current_folder]['folder_id']);
-                        $p->set_var("folder",$this->folders[$this->current_folder]['folder_name']);
+                        //translate name of the default folders
+                        $translated_folder_name = $this->bo_mobilemail->get_translate_default_folder_name_from_id($this->folders[$this->current_folder]["folder_id"]);
+                        $p->set_var("folder", (($translated_folder_name == "") ? $this->folders[$this->current_folder]["folder_name"] : $translated_folder_name) );
+                        
                         $p->set_var("selected_".$this->current_search_box_type,"selected");
                         $p->set_var("lang_back",lang("back"));