[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: developer_tools/inc class.bolangfile.inc.php,1.8
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: developer_tools/inc class.bolangfile.inc.php,1.8.2.2.2.5,1.8.2.2.2.6 class.uilangfile.inc.php,1.10.2.1.2.6,1.10.2.1.2.7 |
|
Date: |
Mon, 09 Jun 2003 12:38:08 -0400 |
Update of /cvsroot/phpgroupware/developer_tools/inc
In directory subversions:/tmp/cvs-serv13994
Modified Files:
Tag: Version-0_9_16-branch
class.bolangfile.inc.php class.uilangfile.inc.php
Log Message:
fix for sidebox_menu
Index: class.bolangfile.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/developer_tools/inc/class.bolangfile.inc.php,v
retrieving revision 1.8.2.2.2.5
retrieving revision 1.8.2.2.2.6
diff -C2 -r1.8.2.2.2.5 -r1.8.2.2.2.6
*** class.bolangfile.inc.php 4 May 2003 16:40:52 -0000 1.8.2.2.2.5
--- class.bolangfile.inc.php 9 Jun 2003 16:38:06 -0000 1.8.2.2.2.6
***************
*** 36,41 ****
/* Sessions used to save state and not reread the langfile
between adding/deleting phrases */
! function save_sessiondata($source,$target)
{
if($this->debug) { echo '<br>Save:';
_debug_array($source); }
$GLOBALS['phpgw']->session->appsession('developer_source_lang','developer_tools',$source);
--- 36,49 ----
/* Sessions used to save state and not reread the langfile
between adding/deleting phrases */
! function
save_sessiondata($source='##unset##',$target='##unset##')
{
+ if ($source == '##unset##')
+ {
+ $source = &$this->source_langarray;
+ }
+ if ($target == '##unset##')
+ {
+ $target = &$this->target_langarray;
+ }
if($this->debug) { echo '<br>Save:';
_debug_array($source); }
$GLOBALS['phpgw']->session->appsession('developer_source_lang','developer_tools',$source);
***************
*** 47,50 ****
--- 55,59 ----
$GLOBALS['phpgw']->session->appsession('developer_loaded_apps','developer_tools',$this->loaded_apps);
$GLOBALS['phpgw']->session->appsession('developer_src_apps','developer_tools',$this->src_apps);
+
$GLOBALS['phpgw']->session->appsession('developer_missing_lang','developer_tools',$this->missing_langarray);
}
***************
*** 62,70 ****
$loaded_apps =
$GLOBALS['phpgw']->session->appsession('developer_loaded_apps','developer_tools');
$src_apps =
$GLOBALS['phpgw']->session->appsession('developer_src_apps','developer_tools');
!
$this->set_sessiondata($source,$target,$src_file,$tgt_file,$tgt_lang,$loaded_apps,$src_apps);
}
! function
set_sessiondata($source,$target,$src_file,$tgt_file,$tgt_lang,$loaded_apps,$src_apps)
{
$this->source_langarray = $source;
--- 71,80 ----
$loaded_apps =
$GLOBALS['phpgw']->session->appsession('developer_loaded_apps','developer_tools');
$src_apps =
$GLOBALS['phpgw']->session->appsession('developer_src_apps','developer_tools');
+ $missing =
$GLOBALS['phpgw']->session->appsession('developer_missing_lang','developer_tools');
!
$this->set_sessiondata($source,$target,$src_file,$tgt_file,$tgt_lang,$loaded_apps,$src_apps,$missing);
}
! function
set_sessiondata($source,$target,$src_file,$tgt_file,$tgt_lang,$loaded_apps,$src_apps,$missing)
{
$this->source_langarray = $source;
***************
*** 75,78 ****
--- 85,89 ----
$this->loaded_apps = $loaded_apps;
$this->src_apps = $src_apps;
+ $this->missing_langarray = $missing;
}
***************
*** 154,158 ****
{
reset ($this->missing_langarray);
! @ksort($this->missing_langarray);
}
return $this->missing_langarray;
--- 165,169 ----
{
reset ($this->missing_langarray);
! @ksort($this->missing_langarray);
}
return $this->missing_langarray;
Index: class.uilangfile.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/developer_tools/inc/class.uilangfile.inc.php,v
retrieving revision 1.10.2.1.2.6
retrieving revision 1.10.2.1.2.7
diff -C2 -r1.10.2.1.2.6 -r1.10.2.1.2.7
*** class.uilangfile.inc.php 19 Apr 2003 18:40:10 -0000 1.10.2.1.2.6
--- class.uilangfile.inc.php 9 Jun 2003 16:38:06 -0000 1.10.2.1.2.7
***************
*** 23,26 ****
--- 23,27 ----
'addphrase' => True,
'missingphrase'=> True,
+ 'missingphrase2'=> True,
'download' => True
);
***************
*** 36,40 ****
$GLOBALS['phpgw']->translation->add_app('developer_tools');
$GLOBALS['phpgw']->translation->add_app('common');
! $GLOBALS['phpgw']->translation->add_app('transy');
}
--- 37,41 ----
$GLOBALS['phpgw']->translation->add_app('developer_tools');
$GLOBALS['phpgw']->translation->add_app('common');
! //$GLOBALS['phpgw']->translation->add_app('transy');
}
***************
*** 76,80 ****
$this->bo->target_langarray =
$this->bo->source_langarray;
}
!
$this->bo->save_sessiondata($this->bo->source_langarray,$this->bo->target_langarray);
}
$GLOBALS['phpgw']->redirect_link('/index.php',array(
--- 77,81 ----
$this->bo->target_langarray =
$this->bo->source_langarray;
}
! $this->bo->save_sessiondata();
}
$GLOBALS['phpgw']->redirect_link('/index.php',array(
***************
*** 111,118 ****
function missingphrase()
{
! $app_name = $_POST['app_name'] ? $_POST['app_name']
: $_GET['app_name'];
$newlang = $_POST['newlang'];
- $sourcelang = $_POST['sourcelang'];
- $targetlang = $_POST['targetlang'];
$dlsource = $_POST['dlsource'];
$writesource = $_POST['writesource'];
--- 112,139 ----
function missingphrase()
{
! $app_name = get_var('app_name',array('POST','GET'));
! $sourcelang =
get_var('sourcelang',array('POST','GET'));
! $targetlang =
get_var('targetlang',array('POST','GET'));
!
! $this->bo->read_sessiondata();
! $this->bo->missing_app($app_name,$sourcelang);
! $this->bo->save_sessiondata();
!
! // we have to redirect here, as solangfile defines
function sidebox_menu, which clashes with the iDots func.
! //
! $GLOBALS['phpgw']->redirect_link('/index.php',array(
! 'menuaction' =>
'developer_tools.uilangfile.missingphrase2',
! 'app_name' => $app_name,
! 'sourcelang' => $sourcelang,
! 'targetlang' => $targetlang
! ));
! }
!
! function missingphrase2()
! {
! $app_name = get_var('app_name',array('POST','GET'));
! $sourcelang =
get_var('sourcelang',array('POST','GET'));
! $targetlang =
get_var('targetlang',array('POST','GET'));
$newlang = $_POST['newlang'];
$dlsource = $_POST['dlsource'];
$writesource = $_POST['writesource'];
***************
*** 138,142 ****
$targetlang = 'en';
}
! $missingarray =
$this->bo->missing_app($app_name,$sourcelang);
//echo "missingarray=<pre>"; print_r($missingarray);
echo "</pre>\n";
if ($update)
--- 159,163 ----
$targetlang = 'en';
}
! $missingarray = $this->bo->missing_langarray;
//echo "missingarray=<pre>"; print_r($missingarray);
echo "</pre>\n";
if ($update)
***************
*** 159,163 ****
if (!count($missingarray)) { // if no
phrases left, go direct back
!
$this->bo->save_sessiondata($this->bo->source_langarray,$this->bo->target_langarray);
$GLOBALS['phpgw']->redirect_link('/index.php',array(
'menuaction' =>
'developer_tools.uilangfile.edit',
--- 180,184 ----
if (!count($missingarray)) { // if no
phrases left, go direct back
! $this->bo->save_sessiondata();
$GLOBALS['phpgw']->redirect_link('/index.php',array(
'menuaction' =>
'developer_tools.uilangfile.edit',
***************
*** 176,180 ****
$this->template->set_var('lang_view',lang('Back'));
!
$this->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=developer_tools.uilangfile.missingphrase'));
$this->template->set_var('sourcelang',$sourcelang);
$this->template->set_var('targetlang',$targetlang);
--- 197,201 ----
$this->template->set_var('lang_view',lang('Back'));
!
$this->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=developer_tools.uilangfile.missingphrase2'));
$this->template->set_var('sourcelang',$sourcelang);
$this->template->set_var('targetlang',$targetlang);
***************
*** 208,212 ****
}
/* _debug_array($this->bo->loaded_apps); */
!
$this->bo->save_sessiondata($this->bo->source_langarray,$this->bo->target_langarray);
}
--- 229,233 ----
}
/* _debug_array($this->bo->loaded_apps); */
! $this->bo->save_sessiondata();
}
***************
*** 409,413 ****
if($deleteme)
{
!
$this->bo->save_sessiondata($this->bo->source_langarray,$this->bo->target_langarray);
}
unset($deleteme);
--- 430,434 ----
if($deleteme)
{
! $this->bo->save_sessiondata();
}
unset($deleteme);
***************
*** 474,478 ****
}
/* _debug_array($this->bo->loaded_apps); */
!
$this->bo->save_sessiondata($this->bo->source_langarray,$this->bo->target_langarray);
}
--- 495,499 ----
}
/* _debug_array($this->bo->loaded_apps); */
! $this->bo->save_sessiondata();
}
***************
*** 624,628 ****
function lang_option($app_name,$current,$name)
{
! $list = $this->bo->src_apps + array(
$app_name => $app_name,
'common' => 'common',
--- 645,649 ----
function lang_option($app_name,$current,$name)
{
! $list = (is_array($this->bo->src_apps) ?
$this->bo->src_apps : array()) + array(
$app_name => $app_name,
'common' => 'common',
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: developer_tools/inc class.bolangfile.inc.php,1.8.2.2.2.5,1.8.2.2.2.6 class.uilangfile.inc.php,1.10.2.1.2.6,1.10.2.1.2.7,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: projects/setup phpgw_en.lang,1.25.2.4.2.6,1.25.2.4.2.7 phpgw_fr.lang,1.1.2.6.2.4,1.1.2.6.2.5
- Next by Date:
[Phpgroupware-cvs] CVS: news_admin/setup phpgw_de.lang,1.1.2.1,1.1.2.2
- Previous by thread:
[Phpgroupware-cvs] CVS: projects/setup phpgw_en.lang,1.25.2.4.2.6,1.25.2.4.2.7 phpgw_fr.lang,1.1.2.6.2.4,1.1.2.6.2.5
- Next by thread:
[Phpgroupware-cvs] CVS: news_admin/setup phpgw_de.lang,1.1.2.1,1.1.2.2
- Index(es):