[Fmsystem-commits] [16863] more on helpdesk

[sigurdne]

Revision: 16863
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16863
Author:   sigurdne
Date:     2017-06-12 15:14:54 -0400 (Mon, 12 Jun 2017)
Log Message:
-----------
more on helpdesk

Modified Paths:
--------------
    trunk/helpdesk/inc/class.uicustom.inc.php
    trunk/property/inc/class.uicustom.inc.php

Modified: trunk/helpdesk/inc/class.uicustom.inc.php
===================================================================
--- trunk/helpdesk/inc/class.uicustom.inc.php   2017-06-11 18:02:11 UTC (rev 
16862)
+++ trunk/helpdesk/inc/class.uicustom.inc.php   2017-06-12 19:14:54 UTC (rev 
16863)
@@ -24,7 +24,7 @@
         * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
         * @package property
         * @subpackage custom
-        * @version $Id: class.uicustom.inc.php 14987 2016-05-09 13:02:55Z 
sigurdne $
+        * @version $Id: class.uicustom.inc.php 15977 2016-11-09 13:56:30Z 
sigurdne $
         */
        /**
         * Description
@@ -34,9 +34,10 @@
 
        class helpdesk_uicustom extends property_uicustom
        {
-               function __construct()
+               public function __construct()
                {
+                       $GLOBALS['phpgw']->translation->add_app('property');
                        parent::__construct();
                        $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'helpdesk::report';
                }
-       }
\ No newline at end of file
+       }

Modified: trunk/property/inc/class.uicustom.inc.php
===================================================================
--- trunk/property/inc/class.uicustom.inc.php   2017-06-11 18:02:11 UTC (rev 
16862)
+++ trunk/property/inc/class.uicustom.inc.php   2017-06-12 19:14:54 UTC (rev 
16863)
@@ -94,6 +94,16 @@
                        $this->acl_edit = $this->acl->check('.custom', 
PHPGW_ACL_EDIT, $this->currentapp);
                        $this->acl_delete = $this->acl->check('.custom', 
PHPGW_ACL_DELETE, $this->currentapp);
                        $this->xsl_rootdir = PHPGW_SERVER_ROOT . 
"/property/templates/base";
+                       $this->config   = 
CreateObject('phpgwapi.config',$this->currentapp);
+                       $this->config->read();
+                       if (!empty($this->config->config_data['app_name']))
+                       {
+                               $this->lang_app_name = 
$this->config->config_data['app_name'];
+                       }
+                       else
+                       {
+                               $this->lang_app_name = lang($this->currentapp);
+                       }
                }
 
                function index()
@@ -117,7 +127,7 @@
                        $appname = lang('custom');
                        $function_msg = lang('list custom');
 
-                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
+                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
$this->lang_app_name . ' - ' . $appname . ': ' . $function_msg;
 
                        $data = array(
                                'datatable_name' => $appname,
@@ -490,7 +500,7 @@
                        $appname = lang('custom');
                        $function_msg = lang('delete custom');
 
-                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
+                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
$this->lang_app_name . ' - ' . $appname . ': ' . $function_msg;
                        $GLOBALS['phpgw']->xslttpl->set_var('phpgw', 
array('delete' => $data));
                }
 
@@ -505,7 +515,7 @@
 
                        $custom = $this->bo->read_single($custom_id);
 
-                       $appname = lang($this->currentapp);
+                       $appname = $this->lang_app_name;
                        $function_msg = $custom['name'];
 
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
$appname . ': ' . $function_msg;