[Fmsystem-commits] [7227] Merge 7223:7226 from trunk

[Sigurd Nes]

Revision: 7227
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7227
Author:   sigurdne
Date:     2011-04-15 11:51:34 +0000 (Fri, 15 Apr 2011)
Log Message:
-----------
Merge 7223:7226 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
    branches/Version-1_0-branch/frontend/js/yahoo/helpdesk.list.js
    branches/Version-1_0-branch/phpgwapi/inc/class.translation.inc.php
    branches/Version-1_0-branch/property/inc/class.botts.inc.php

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226

Modified: branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
===================================================================
--- branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php   
2011-04-15 11:50:32 UTC (rev 7226)
+++ branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php   
2011-04-15 11:51:34 UTC (rev 7227)
@@ -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: branches/Version-1_0-branch/frontend/js/yahoo/helpdesk.list.js
===================================================================
--- branches/Version-1_0-branch/frontend/js/yahoo/helpdesk.list.js      
2011-04-15 11:50:32 UTC (rev 7226)
+++ branches/Version-1_0-branch/frontend/js/yahoo/helpdesk.list.js      
2011-04-15 11:51:34 UTC (rev 7227)
@@ -79,7 +79,7 @@
                        var frame = document.createElement('iframe');
                        frame.src = sUrl;
                        frame.width = "100%";
-                       frame.height = "350";
+                       frame.height = "400";
                        o.setBody(frame);
                };
                lightbox.showEvent.subscribe(onDialogShow, lightbox);

Modified: branches/Version-1_0-branch/phpgwapi/inc/class.translation.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.translation.inc.php  
2011-04-15 11:50:32 UTC (rev 7226)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.translation.inc.php  
2011-04-15 11:51:34 UTC (rev 7227)
@@ -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: branches/Version-1_0-branch/property/inc/class.botts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.botts.inc.php        
2011-04-15 11:50:32 UTC (rev 7226)
+++ branches/Version-1_0-branch/property/inc/class.botts.inc.php        
2011-04-15 11:51:34 UTC (rev 7227)
@@ -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'),