[eGroupWare-svn] r56120 - in /trunk/etemplate: inc/ lang/ templates/default/
[email protected] Wed, 11 May 2016 12:43:23 -0000
| Newsgroups | gmane.comp.web.egroupware.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: ralfbecker
Date: Wed May 11 14:43:23 2016
New Revision: 56120
URL: http://svn.stylite.de/viewvc/egroupware?rev=56120&view=rev
Log:
move translationtools to (old) etemplate package
Added:
trunk/etemplate/inc/class.bolangfile.inc.php
- copied, changed from r56115, trunk/developer_tools/inc/class.bolangfile.inc.php
trunk/etemplate/inc/class.uilangfile.inc.php
- copied, changed from r56115, trunk/developer_tools/inc/class.uilangfile.inc.php
trunk/etemplate/lang/ (props changed)
- copied from r56115, trunk/developer_tools/lang/
trunk/etemplate/templates/default/addphrase.tpl
- copied unchanged from r56115, trunk/developer_tools/templates/default/addphrase.tpl
trunk/etemplate/templates/default/applications.tpl
- copied unchanged from r56115, trunk/developer_tools/templates/default/applications.tpl
trunk/etemplate/templates/default/langfile.tpl
- copied unchanged from r56115, trunk/developer_tools/templates/default/langfile.tpl
trunk/etemplate/templates/default/langmissing.tpl
- copied unchanged from r56115, trunk/developer_tools/templates/default/langmissing.tpl
Modified:
trunk/etemplate/inc/class.solangfile.inc.php
trunk/etemplate/inc/hook_sidebox_menu.inc.php
Copied: trunk/etemplate/inc/class.bolangfile.inc.php (from r56115, trunk/developer_tools/inc/class.bolangfile.inc.php)
URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/inc/class.bolangfile.inc.php?p2=trunk/etemplate/inc/class.bolangfile.inc.php&p1=trunk/developer_tools/inc/class.bolangfile.inc.php&r1=56115&r2=56120&rev=56120&view=diff
==============================================================================
--- trunk/developer_tools/inc/class.bolangfile.inc.php (original)
+++ trunk/etemplate/inc/class.bolangfile.inc.php Wed May 11 14:43:23 2016
@@ -6,7 +6,8 @@
* @author Miles Lott <milos(at)groupwhere.org>
* @author Ralf Becker <RalfBecker(at)outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @package translationtools
+ * @package etemplate
+ * @subpackage translationtools
* @version $Id$
*/
Modified: trunk/etemplate/inc/class.solangfile.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/inc/class.solangfile.inc.php?rev=56120&r1=56119&r2=56120&view=diff
==============================================================================
--- trunk/etemplate/inc/class.solangfile.inc.php (original)
+++ trunk/etemplate/inc/class.solangfile.inc.php Wed May 11 14:43:23 2016
@@ -6,7 +6,8 @@
* @author Miles Lott <milos(at)groupwhere.org>
* @author Ralf Becker <RalfBecker(at)outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @package translationtools
+ * @package etemplate
+ * @subpackage translationtools
* @version $Id$
*/
Copied: trunk/etemplate/inc/class.uilangfile.inc.php (from r56115, trunk/developer_tools/inc/class.uilangfile.inc.php)
URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/inc/class.uilangfile.inc.php?p2=trunk/etemplate/inc/class.uilangfile.inc.php&p1=trunk/developer_tools/inc/class.uilangfile.inc.php&r1=56115&r2=56120&rev=56120&view=diff
==============================================================================
--- trunk/developer_tools/inc/class.uilangfile.inc.php (original)
+++ trunk/etemplate/inc/class.uilangfile.inc.php Wed May 11 14:43:23 2016
@@ -6,7 +6,8 @@
* @author Miles Lott <milos(at)groupwhere.org>
* @author Ralf Becker <RalfBecker(at)outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @package translationtools
+ * @package etemplate
+ * @subpackage translationtools
* @version $Id$
*/
@@ -45,8 +46,8 @@
{
$this->template = $GLOBALS['egw']->template;
$this->template->egroupware_hack = False; // else the phrases got translated
- $this->bo =& CreateObject('developer_tools.bolangfile');
- $this->nextmatchs =& CreateObject('phpgwapi.nextmatchs');
+ $this->bo = new bolangfile();
+ $this->nextmatchs = new nextmatchs();
translation::add_app('developer_tools');
translation::add_app('common');
egw_framework::csp_script_src_attrs('unsafe-inline');
@@ -81,7 +82,7 @@
if (!$_POST['more'])
{
$GLOBALS['egw']->redirect_link('/index.php',array(
- 'menuaction' => 'developer_tools.uilangfile.edit',
+ 'menuaction' => 'etemplate.uilangfile.edit',
'app_name' => $app_name,
'sourcelang' => $sourcelang,
'targetlang' => $targetlang
@@ -94,7 +95,7 @@
common::egw_header();
echo parse_navbar();
- $this->template->set_var('form_action',$GLOBALS['egw']->link('/index.php','menuaction=developer_tools.uilangfile.addphrase'));
+ $this->template->set_var('form_action',$GLOBALS['egw']->link('/index.php','menuaction=etemplate.uilangfile.addphrase'));
$this->template->set_var('sourcelang',$sourcelang);
$this->template->set_var('targetlang',$targetlang);
$this->template->set_var('app_name',$app_name);
@@ -130,7 +131,7 @@
// we have to redirect here, as solangfile defines function sidebox_menu, which clashes with the iDots func.
//
$GLOBALS['egw']->redirect_link('/index.php',array(
- 'menuaction' => 'developer_tools.uilangfile.missingphrase2',
+ 'menuaction' => 'etemplate.uilangfile.missingphrase2',
'app_name' => $app_name,
'sourcelang' => $sourcelang,
'targetlang' => $targetlang
@@ -188,7 +189,7 @@
$this->bo->save_sessiondata();
$GLOBALS['egw']->redirect_link('/index.php',array(
- 'menuaction' => 'developer_tools.uilangfile.edit',
+ 'menuaction' => 'etemplate.uilangfile.edit',
'app_name' => $app_name,
'sourcelang' => $sourcelang,
'targetlang' => $targetlang
@@ -202,7 +203,7 @@
$this->template->set_var('lang_update',lang('Add'));
$this->template->set_var('lang_view',lang('Cancel'));
- $this->template->set_var('action_url',$GLOBALS['egw']->link('/index.php','menuaction=developer_tools.uilangfile.missingphrase2'));
+ $this->template->set_var('action_url',$GLOBALS['egw']->link('/index.php','menuaction=etemplate.uilangfile.missingphrase2'));
$this->template->set_var('sourcelang',$sourcelang);
$this->template->set_var('targetlang',$targetlang);
$this->template->set_var('app_name',$app_name);
@@ -216,7 +217,7 @@
$this->template->set_var('view_link',
$GLOBALS['egw']->link(
'/index.php',
- 'menuaction=developer_tools.uilangfile.edit&app_name='.$app_name.'&sourcelang=' . $sourcelang . '&targetlang=' . $targetlang
+ 'menuaction=etemplate.uilangfile.edit&app_name='.$app_name.'&sourcelang=' . $sourcelang . '&targetlang=' . $targetlang
)
);
$this->template->pfp('out','postheader');
@@ -240,7 +241,7 @@
{
if ($_POST['cancel'])
{
- $GLOBALS['egw']->redirect_link('/index.php','menuaction=developer_tools.uilangfile.index');
+ $GLOBALS['egw']->redirect_link('/index.php','menuaction=etemplate.uilangfile.index');
}
$app_name = get_var('app_name',array('POST','GET'));
$sourcelang = get_var('sourcelang',array('POST','GET'));
@@ -250,7 +251,7 @@
if($_POST['addphrase'] || $_POST['missingphrase'])
{
$GLOBALS['egw']->redirect_link('/index.php',array(
- 'menuaction' => 'developer_tools.uilangfile.'.($_POST['addphrase']?'addphrase':'missingphrase'),
+ 'menuaction' => 'etemplate.uilangfile.'.($_POST['addphrase']?'addphrase':'missingphrase'),
'app_name' => $app_name,
'sourcelang' => $sourcelang,
'targetlang' => $targetlang
@@ -281,7 +282,7 @@
$this->template->set_block('langfile','detail_long','detail_long');
$this->template->set_block('langfile','footer','footer');
- $this->template->set_var('action_url',$GLOBALS['egw']->link('/index.php','menuaction=developer_tools.uilangfile.edit'));
+ $this->template->set_var('action_url',$GLOBALS['egw']->link('/index.php','menuaction=etemplate.uilangfile.edit'));
$this->template->set_var('lang_remove',lang('Remove'));
$this->template->set_var('lang_application',lang('Application'));
$this->template->set_var('lang_source',lang('Source Language'));
@@ -581,14 +582,14 @@
$limit = $total;
}
- $this->template->set_var('sort_title',$this->nextmatchs->show_sort_order($sort,'title','title','/index.php',lang('Title'),'&menuaction=developer_tools.uilangfile.index'));
+ $this->template->set_var('sort_title',$this->nextmatchs->show_sort_order($sort,'title','title','/index.php',lang('Title'),'&menuaction=etemplate.uilangfile.index'));
$this->template->set_var('lang_showing',$this->nextmatchs->show_hits($total,$start));
- $this->template->set_var('left',$this->nextmatchs->left('/index.php',$start,$total,'&menuaction=developer_tools.uilangfile.index'));
- $this->template->set_var('right',$this->nextmatchs->right('/index.php',$start,$total,'&menuaction=developer_tools.uilangfile.index'));
+ $this->template->set_var('left',$this->nextmatchs->left('/index.php',$start,$total,'&menuaction=etemplate.uilangfile.index'));
+ $this->template->set_var('right',$this->nextmatchs->right('/index.php',$start,$total,'&menuaction=etemplate.uilangfile.index'));
$this->template->set_var('lang_edit',lang('Edit'));
//$this->template->set_var('lang_translate',lang('Translate'));
- $this->template->set_var('new_action',$GLOBALS['egw']->link('/index.php','menuaction=developer_tools.uilangfile.create'));
+ $this->template->set_var('new_action',$GLOBALS['egw']->link('/index.php','menuaction=etemplate.uilangfile.create'));
$this->template->set_var('create_new',lang('Create New Language File'));
$i = 0;
@@ -600,8 +601,8 @@
$this->template->set_var('name',$data['title']);
- $this->template->set_var('edit','<a href="' . $GLOBALS['egw']->link('/index.php','menuaction=developer_tools.uilangfile.edit&app_name=' . urlencode($data['name'])) . '"> ' . lang('Edit') . ' </a>');
- // $this->template->set_var('translate','<a href="' . $GLOBALS['egw']->link('/index.php','menuaction=developer_tools.uilangfile.translate&app_name=' . urlencode($app['name'])) . '"> ' . lang('Translate') . ' </a>');
+ $this->template->set_var('edit','<a href="' . $GLOBALS['egw']->link('/index.php','menuaction=etemplate.uilangfile.edit&app_name=' . urlencode($data['name'])) . '"> ' . lang('Edit') . ' </a>');
+ // $this->template->set_var('translate','<a href="' . $GLOBALS['egw']->link('/index.php','menuaction=etemplate.uilangfile.translate&app_name=' . urlencode($app['name'])) . '"> ' . lang('Translate') . ' </a>');
$this->template->set_var('status',$status);
Modified: trunk/etemplate/inc/hook_sidebox_menu.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/inc/hook_sidebox_menu.inc.php?rev=56120&r1=56119&r2=56120&view=diff
==============================================================================
--- trunk/etemplate/inc/hook_sidebox_menu.inc.php (original)
+++ trunk/etemplate/inc/hook_sidebox_menu.inc.php Wed May 11 14:43:23 2016
@@ -18,7 +18,7 @@
{
$file += array(
'_NewLine_', // give a newline
- 'developer_tools' => $GLOBALS['egw']->link('/index.php','menuaction=developer_tools.uilangfile.index'),
+ 'developer_tools' => $GLOBALS['egw']->link('/index.php','menuaction=etemplate.uilangfile.index'),
);
}
if($GLOBALS['egw_info']['flags']['currentapp'] == 'etemplate')
Propchange: trunk/etemplate/lang/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 11 14:43:23 2016
@@ -1,0 +1,37 @@
+egw_bg.lang.old
+egw_ca.lang.old
+egw_cs.lang.old
+egw_da.lang.old
+egw_de.lang.old
+egw_el.lang.old
+egw_es-es.lang.old
+egw_et.lang.old
+egw_eu.lang.old
+egw_fa.lang.old
+egw_fi.lang.old
+egw_fr.lang.old
+egw_hi.lang.old
+egw_hr.lang.old
+egw_hu.lang.old
+egw_id.lang.old
+egw_it.lang.old
+egw_iw.lang.old
+egw_ja.lang.old
+egw_ko.lang.old
+egw_lo.lang.old
+egw_lt.lang.old
+egw_lv.lang.old
+egw_nl.lang.old
+egw_no.lang.old
+egw_pl.lang.old
+egw_pt-br.lang.old
+egw_pt.lang.old
+egw_ru.lang.old
+egw_sk.lang.old
+egw_sl.lang.old
+egw_sv.lang.old
+egw_tr.lang.old
+egw_uk.lang.old
+egw_vi.lang.old
+egw_zh-tw.lang.old
+egw_zh.lang.old
------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j