[Fmsystem-commits] [7224] cross app translation

[Sigurd Nes]

Revision: 7224
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7224
Author:   sigurdne
Date:     2011-04-15 11:48:27 +0000 (Fri, 15 Apr 2011)
Log Message:
-----------
cross app translation

Modified Paths:
--------------
    trunk/frontend/inc/class.uihelpdesk.inc.php
    trunk/phpgwapi/inc/class.translation.inc.php
    trunk/property/inc/class.botts.inc.php

Modified: trunk/frontend/inc/class.uihelpdesk.inc.php
===================================================================
--- trunk/frontend/inc/class.uihelpdesk.inc.php 2011-04-15 11:03:32 UTC (rev 
7223)
+++ trunk/frontend/inc/class.uihelpdesk.inc.php 2011-04-15 11:48:27 UTC (rev 
7224)
@@ -179,7 +179,7 @@
 
                                $status['O'] = array
                                (
-                                       'status'                        => 
isset($this->bo->config->config_data['tts_lang_open']) && 
$this->bo->config->config_data['tts_lang_open'] ? 
$this->bo->config->config_data['tts_lang_open'] : lang('Open'),
+                                       'status'                        => 
isset($bo->config->config_data['tts_lang_open']) && 
$bo->config->config_data['tts_lang_open'] ? 
$bo->config->config_data['tts_lang_open'] : lang('Open'),
                                );
 
                                $custom_status  = $bo->get_custom_status();
@@ -395,7 +395,8 @@
 
                public function view()
                {
-                       $bo     = CreateObject('property.botts',true);
+                       $GLOBALS['phpgw']->translation->add_app('property');
+                       $bo     = CreateObject('property.botts');
                        $ticketid = phpgw::get_var('id');
                        $ticket = $bo->read_single($ticketid);
 

Modified: trunk/phpgwapi/inc/class.translation.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.translation.inc.php        2011-04-15 11:03:32 UTC 
(rev 7223)
+++ trunk/phpgwapi/inc/class.translation.inc.php        2011-04-15 11:48:27 UTC 
(rev 7224)
@@ -287,7 +287,7 @@
                        $GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
                        while ( $GLOBALS['phpgw']->db->next_record() )
                        {
-                               
$this->lang[$app][strtolower(trim(substr($GLOBALS['phpgw']->db->f('message_id', 
true), 0, self::MAX_MESSAGE_ID_LENGTH)))] = $GLOBALS['phpgw']->db->f('content', 
true);
+                               
$this->lang[$GLOBALS['phpgw_info']['flags']['currentapp']][strtolower(trim(substr($GLOBALS['phpgw']->db->f('message_id',
 true), 0, self::MAX_MESSAGE_ID_LENGTH)))] = 
$GLOBALS['phpgw']->db->f('content', true);
                        }
                }
 

Modified: trunk/property/inc/class.botts.inc.php
===================================================================
--- trunk/property/inc/class.botts.inc.php      2011-04-15 11:03:32 UTC (rev 
7223)
+++ trunk/property/inc/class.botts.inc.php      2011-04-15 11:48:27 UTC (rev 
7224)
@@ -248,7 +248,7 @@
                        $status_text = array(
                                'R' => lang('Re-opened'),
                                'X' => lang('Closed'),
-                               'O' => lang('Opened'),
+                               'O' => 
isset($this->config->config_data['tts_lang_open']) && 
$this->config->config_data['tts_lang_open'] ? 
$this->config->config_data['tts_lang_open'] : lang('Open'),
                                'A' => lang('Re-assigned'),
                                'G' => lang('Re-assigned group'),
                                'P' => lang('Priority changed'),
@@ -528,7 +528,7 @@
                        }
 
                        $status_text = $this->get_status_text();
-
+_debug_array($status_text);
                        $ticket['status_name'] = 
$status_text[$ticket['status']];
                        
$ticket['user_lid']=$GLOBALS['phpgw']->accounts->id2name($ticket['user_id']);
                        
$ticket['category_name']=ucfirst($this->get_category_name($ticket['cat_id']));