phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: sitemgr/inc class.Categories_BO.inc.php,1.4.2.2,


From: Patrick Walsh <address@hidden>
Subject: [Phpgroupware-cvs] CVS: sitemgr/inc class.Categories_BO.inc.php,1.4.2.2,1.4.2.3 class.Categories_SO.inc.php,1.10.2.2,1.10.2.3 class.Common_UI.inc.php,1.6.2.5,1.6.2.6 class.ManageTranslations_UI.inc.php,1.1.2.1,1.1.2.2 class.Pages_BO.inc.php,1.2.2.2,1.2.2.3 class.Pages_SO.inc.php,1.8.2.1,1.8.2.2
Date: Mon, 25 Nov 2002 18:22:44 -0500

Update of /cvsroot/phpgroupware/sitemgr/inc
In directory subversions:/tmp/cvs-serv7378/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.Categories_BO.inc.php class.Categories_SO.inc.php 
        class.Common_UI.inc.php class.ManageTranslations_UI.inc.php 
        class.Pages_BO.inc.php class.Pages_SO.inc.php 
Log Message:
Bug fixes for translation stuff 


Index: class.Categories_BO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Categories_BO.inc.php,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** class.Categories_BO.inc.php 22 Nov 2002 06:01:53 -0000      1.4.2.2
--- class.Categories_BO.inc.php 25 Nov 2002 23:22:40 -0000      1.4.2.3
***************
*** 288,291 ****
--- 288,301 ----
                        }
                }
+ 
+               function removealllang($lang)
+               {
+                       $this->so->removealllang($lang);
+               }
+ 
+               function migratealllang($oldlang,$newlang)
+               {
+                       $this->so->migratealllang($oldlang,$newlang);
+               }
        }
  ?>

Index: class.Categories_SO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Categories_SO.inc.php,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -C2 -r1.10.2.2 -r1.10.2.3
*** class.Categories_SO.inc.php 22 Nov 2002 06:01:53 -0000      1.10.2.2
--- class.Categories_SO.inc.php 25 Nov 2002 23:22:40 -0000      1.10.2.3
***************
*** 177,180 ****
--- 177,192 ----
                        }
                }
+ 
+               function removealllang($lang)
+               {
+                       $sql = "DELETE FROM phpgw_sitemgr_categories_lang WHERE 
lang='$lang'";
+                       $this->db->query($sql, __LINE__,__FILE__);
+               }
+ 
+               function migratealllang($oldlang,$newlang)
+               {
+                       $sql = "UPDATE phpgw_sitemgr_categories_lang SET 
lang='$newlang' WHERE lang='$oldlang'";
+                       $this->db->query($sql, __LINE__,__FILE__);
+               }
        }
  ?>

Index: class.Common_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Common_UI.inc.php,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -C2 -r1.6.2.5 -r1.6.2.6
*** class.Common_UI.inc.php     22 Nov 2002 21:37:35 -0000      1.6.2.5
--- class.Common_UI.inc.php     25 Nov 2002 23:22:40 -0000      1.6.2.6
***************
*** 12,16 ****
        class Common_UI
        {
!               var $t, $acl, $theme, $prefs_so, $pages_bo;
                var $public_functions = array
                (
--- 12,16 ----
        class Common_UI
        {
!               var $t, $acl, $theme, $prefs_so, $pages_bo, $cat_bo;
                var $public_functions = array
                (
***************
*** 25,28 ****
--- 25,29 ----
                        $this->prefs_so = 
CreateObject('sitemgr.sitePreference_SO', True);
                        $this->pages_bo = CreateObject('sitemgr.Pages_BO');
+                       $this->cat_bo = CreateObject('sitemgr.Categories_BO');
                }
  
***************
*** 41,44 ****
--- 42,131 ----
                        if ($this->acl->is_admin())
                        {
+                               if ($_POST['btnlangchange'])
+                               {
+                                       echo '<p>';
+                                       while (list($oldlang,$newlang) = 
each($_POST['change']))
+                                       {
+                                               if ($newlang == "delete")
+                                               {
+                                                       echo '<b>' . 
lang('Deleting all data for %1',$this->getlangname($oldlang)) . '</b><br>';
+                                                       
$this->pages_bo->removealllang($oldlang);
+                                                       
$this->cat_bo->removealllang($oldlang);
+                                               }
+                                               else
+                                               {
+                                                       echo '<b>' . 
lang('Migrating data for %1 to %2',
+                                                                       
$this->getlangname($oldlang),
+                                                                       
$this->getlangname($newlang)) . 
+                                                         '</b><br>';
+                                                       
$this->pages_bo->migratealllang($oldlang,$newlang);
+                                                       
$this->cat_bo->migratealllang($oldlang,$newlang);
+                                               }
+                                       }
+                                       echo '</p>';
+                               }
+ 
+                               if ($_POST['btnSave'])
+                               {
+                                       $preferences = array(
+                                               
'sitemgr-site-url','sitemgr-site-dir','home-page-id','login-domain',
+                                               
'anonymous-user','anonymous-passwd','interface','themesel','sitelanguages');
+ 
+                                       $oldsitelanguages = 
$this->prefs_so->getPreference('sitelanguages');
+                                       if ($oldsitelanguages && 
($oldsitelanguages != $_POST['sitelanguages']))
+                                       {
+                                               $oldsitelanguages = 
explode(',',$oldsitelanguages);
+                                               $newsitelanguages = 
explode(',',$_POST['sitelanguages']);
+                                               $replacedlang = 
array_diff($oldsitelanguages,$newsitelanguages);
+                                               $addedlang = 
array_diff($newsitelanguages,$oldsitelanguages);
+                                               if ($replacedlang)
+                                               {
+                                                       echo lang('You removed 
one ore more languages from your site languages.') . '<br>' .
+                                                         lang('What do you 
want to do with existing translations of categories and pages for this 
language?') . '<br>';
+                                                       if ($addedlang)
+                                                       {
+                                                               echo lang('You 
can either migrate them to a new language or delete them') . '<br>';
+                                                       }
+                                                       else
+                                                       {
+                                                               echo lang('Do 
you want to delete them?'). '<br>';
+                                                       }
+                                                       echo '<form action="' . 
+                                                         
$GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Common_UI.DisplayPrefs')
 .
+                                                         '" 
method="post"><table>';
+                                                       foreach ($replacedlang 
as $oldlang)
+                                                       {
+                                                               $oldlangname = 
$this->getlangname($oldlang);
+                                                               echo "<tr><td>" 
. $oldlangname . "</td>";
+                                                               if ($addedlang)
+                                                               {
+                                                                       foreach 
($addedlang as $newlang)
+                                                                       {
+                                                                               
echo '<td><input type="radio" name="change[' . $oldlang . 
+                                                                               
  ']" value="' . $newlang . '"> Migrate to ' . 
+                                                                               
  $this->getlangname($newlang) . "</td>";
+                                                                       }
+                                                               }
+                                                               echo 
'<td><input type="radio" name="change[' . $oldlang . ']" value="delete"> 
delete</td></tr>';
+                                                       }
+                                                       echo '<tr><td><input 
type="submit" name="btnlangchange" value="' . 
+                                                         lang('Submit') . 
'"></td></tr></table></form>';
+                                               }
+                                       }
+ 
+                                       $oldsitelanguages = $oldsitelanguages ? 
explode(',',$oldsitelanguages) : array("en");
+                                       foreach ($oldsitelanguages as $lang)
+                                       {
+                                               
array_push($preferences,'sitemgr-site-name-' . $lang);
+                                       }
+ 
+                                       foreach ($preferences as $name)
+                                       {
+                                               
$this->prefs_so->setPreference($name,$_POST[$name]);
+                                       }
+                                       echo '<p><b>' . lang('Changes Saved.') 
. '</b></p>';
+                                       unset($preferences);
+                               }
+                               
                                $sitelanguages = 
explode(',',$this->prefs_so->getPreference('sitelanguages'));
                                $sitelanguages = $sitelanguages ? 
$sitelanguages : array("en");
***************
*** 99,112 ****
                                        'default'=>'en'
                                );
!                               if ($_POST['btnSave'])
!                               {
!                                       reset($preferences);
!                                       while (list($name,$details) = 
each($preferences))
!                                       {
!                                               
$this->prefs_so->setPreference($name,$_POST[$name]);
!                                       }
!                                       echo '<p><b>' . lang('Changes Saved.') 
. '</b></p>';
!                               }
!                               
                                
$this->t->set_file('sitemgr_prefs','sitemgr_preferences.tpl');
                                
$this->t->set_var('formaction',$GLOBALS['phpgw']->link(
--- 186,190 ----
                                        'default'=>'en'
                                );
! 
                                
$this->t->set_file('sitemgr_prefs','sitemgr_preferences.tpl');
                                
$this->t->set_var('formaction',$GLOBALS['phpgw']->link(

Index: class.ManageTranslations_UI.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/sitemgr/inc/Attic/class.ManageTranslations_UI.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** class.ManageTranslations_UI.inc.php 22 Nov 2002 06:01:53 -0000      1.1.2.1
--- class.ManageTranslations_UI.inc.php 25 Nov 2002 23:22:40 -0000      1.1.2.2
***************
*** 294,297 ****
--- 294,298 ----
                         $this->t->set_var('savelang', $select);
  
+                        $trans = array('{' => '&#123;', '}' => '&#125;');
                         $this->t->set_var(Array('pageid' => $page_id,
                                                 'lang_pagename' => lang('Page 
Name'),
***************
*** 304,309 ****
                                                 'savepagesubtitle' => 
$savelangdata->subtitle,
                                                 'lang_pagecontent' => 
lang('Page Content'),
!                                                'showpagecontent' => 
$GLOBALS['phpgw']->strip_html($showlangdata->content),
!                                                'savepagecontent' => 
$savelangdata->content,
                                                 'lang_reset' => lang('Reset'),
                                                 'lang_save' => lang('Save')));
--- 305,310 ----
                                                 'savepagesubtitle' => 
$savelangdata->subtitle,
                                                 'lang_pagecontent' => 
lang('Page Content'),
!                                                'showpagecontent' => 
strtr($GLOBALS['phpgw']->strip_html($showlangdata->content),$trans),
!                                                'savepagecontent' => 
strtr($savelangdata->content,$trans),
                                                 'lang_reset' => lang('Reset'),
                                                 'lang_save' => lang('Save')));

Index: class.Pages_BO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Pages_BO.inc.php,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -r1.2.2.2 -r1.2.2.3
*** class.Pages_BO.inc.php      22 Nov 2002 06:01:53 -0000      1.2.2.2
--- class.Pages_BO.inc.php      25 Nov 2002 23:22:40 -0000      1.2.2.3
***************
*** 136,139 ****
--- 136,149 ----
                    $this->pageso->savePageLang($page_Info,$lang);
                  }
+ 
+               function removealllang($lang)
+               {
+                       $this->pageso->removealllang($lang);
+               }
+ 
+               function migratealllang($oldlang,$newlang)
+               {
+                       $this->pageso->migratealllang($oldlang,$newlang);
+               }
        }
  ?>

Index: class.Pages_SO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Pages_SO.inc.php,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -r1.8.2.1 -r1.8.2.2
*** class.Pages_SO.inc.php      22 Nov 2002 06:01:53 -0000      1.8.2.1
--- class.Pages_SO.inc.php      25 Nov 2002 23:22:40 -0000      1.8.2.2
***************
*** 217,220 ****
--- 217,232 ----
                      }
                  }
+ 
+               function removealllang($lang)
+               {
+                       $sql = "DELETE FROM phpgw_sitemgr_pages_lang WHERE 
lang='$lang'";
+                       $this->db->query($sql, __LINE__,__FILE__);
+               }
+ 
+               function migratealllang($oldlang,$newlang)
+               {
+                       $sql = "UPDATE phpgw_sitemgr_pages_lang SET 
lang='$newlang' WHERE lang='$oldlang'";
+                       $this->db->query($sql, __LINE__,__FILE__);
+               }
        }
  ?>





reply via email to

[Prev in Thread] Current Thread [Next in Thread]