[Phpgroupware-cvs] CVS: sitemgr/inc class.Common_UI.inc.php,1.6.2.2,1.6.2.3 class.MainMenu_UI.inc.php,1.3.2.1,1.3.2.2 class.Pages_BO.inc.php,1.2,1.2.2.1

[Patrick Walsh <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.Common_UI.inc.php class.MainMenu_UI.inc.php 
        class.Pages_BO.inc.php 
Log Message:
Language updates


Index: class.Common_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Common_UI.inc.php,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -r1.6.2.2 -r1.6.2.3
*** class.Common_UI.inc.php     17 Oct 2002 04:17:14 -0000      1.6.2.2
--- class.Common_UI.inc.php     1 Nov 2002 06:27:31 -0000       1.6.2.3
***************
*** 78,81 ****
--- 78,85 ----
                                        'default'=>'NukeNews'
                                );
+                               $preferences['sitelanguages'] = array(
+                                       'title'=>'Lanugages the site user can 
choose from',
+                                       'note'=>'(This should be a 
comma-separated list of language-codes.)'
+                               );
                                if ($_POST['btnSave'])
                                {

Index: class.MainMenu_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.MainMenu_UI.inc.php,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** class.MainMenu_UI.inc.php   17 Oct 2002 04:17:14 -0000      1.3.2.1
--- class.MainMenu_UI.inc.php   1 Nov 2002 06:27:31 -0000       1.3.2.2
***************
*** 37,42 ****
                                                        'lang_check' => 
lang('check here after every upgrade'),
                                                        'lang_editheadfoot' => 
lang('Edit Site Header and Footer'),
!                                                       'lang_managecat' => 
lang('Manage Categories'),
!                                                       'lang_managepage' => 
lang('Manage Pages')));
                                $catbo = CreateObject('sitemgr.Categories_BO');
                                if ($catbo->needUpdateCategories())
--- 37,41 ----
                                                        'lang_check' => 
lang('check here after every upgrade'),
                                                        'lang_editheadfoot' => 
lang('Edit Site Header and Footer'),
!                                                       'lang_managecat' => 
lang('Manage Categories')));
                                $catbo = CreateObject('sitemgr.Categories_BO');
                                if ($catbo->needUpdateCategories())
***************
*** 62,65 ****
--- 61,66 ----
                                
'menuaction=sitemgr.contributor_ManagePage_UI._managePage')
                        );
+                       $this->t->set_var('lang_managepage', lang('Manage 
Pages'));
+                       
                        if ($this->acl->is_admin())
                        {

Index: class.Pages_BO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Pages_BO.inc.php,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** class.Pages_BO.inc.php      5 Sep 2002 09:06:03 -0000       1.2
--- class.Pages_BO.inc.php      1 Nov 2002 06:27:31 -0000       1.2.2.1
***************
*** 14,18 ****
                {
                        $pagelist = $this->pageso->getPageIDList();
!                       $retval[]=array('value'=>'','display'=>'[Show Site 
Index]');
                        foreach($pagelist as $page_id)
                        {
--- 14,18 ----
                {
                        $pagelist = $this->pageso->getPageIDList();
!                       $retval[]=array('value'=>'','display'=>'[' .lang('Show 
Site Index') . ']');
                        foreach($pagelist as $page_id)
                        {
***************
*** 69,76 ****
                                $page = CreateObject('sitemgr.Page_SO');
                                $page->name = 'Error';
!                               $page->title = 'Error accessing page';
                                $page->subtitle = '';
!                               $page->content = 'There was an error accessing 
the requested page.  
!                                       Either you do not have permission to 
view this page, or the page does not exist.';
                                return $page;
                        }
--- 69,75 ----
                                $page = CreateObject('sitemgr.Page_SO');
                                $page->name = 'Error';
!                               $page->title = lang('Error accessing page');
                                $page->subtitle = '';
!                               $page->content = lang('There was an error 
accessing the requested page. Either you do not have permission to view this 
page, or the page does not exist.');
                                return $page;
                        }
***************
*** 81,85 ****
                        if (!$this->acl->can_write_category($page_Info->cat_id))
                        {
!                               return 'You don\'t have permission to write to 
that category.';
                        }
                        $fixed_name = strtr($page_Info->name, 
'address@hidden&*()-_=+   /?><,.\\\'":;|`~{}[]','                               
');
--- 80,84 ----
                        if (!$this->acl->can_write_category($page_Info->cat_id))
                        {
!                               return lang("You don't have permission to write 
to that category.");
                        }
                        $fixed_name = strtr($page_Info->name, 
'address@hidden&*()-_=+   /?><,.\\\'":;|`~{}[]','                               
');
***************
*** 93,109 ****
                                        $page_Info->name = $fixed_name;
                                        $this->pageso->savePageInfo($page_Info);
!                                       return 'The Name field cannot contain 
punctuation or spaces (field modified).';
                                }
                                if ($this->pageso->savePageInfo($page_Info))
                                {
!                                       return 'The page was successfully 
saved.';
                                }
                                else
                                {
!                                       return 'There was an error writing to 
the database.';
                                }
                                $page_Info->name = $fixed_name;
                                $this->pageso->savePageInfo($page_Info);
!                               return 'The Name field cannot contain 
punctuation or spaces (field modified).';
                        }
                        if 
($this->pageso->pageExists($page_Info->name,$page_Info->id))
--- 92,108 ----
                                        $page_Info->name = $fixed_name;
                                        $this->pageso->savePageInfo($page_Info);
!                                       return lang('The Name field cannot 
contain punctuation or spaces (field modified).');
                                }
                                if ($this->pageso->savePageInfo($page_Info))
                                {
!                                       return lang('The page was successfully 
saved.');
                                }
                                else
                                {
!                                       return lang('There was an error writing 
to the database.');
                                }
                                $page_Info->name = $fixed_name;
                                $this->pageso->savePageInfo($page_Info);
!                               return lang('The Name field cannot contain 
punctuation or spaces (field modified).');
                        }
                        if 
($this->pageso->pageExists($page_Info->name,$page_Info->id))
***************
*** 111,115 ****
                                $page_Info->name .= '--FIX-DUPLICATE-NAME';
                                $this->pageso->savePageInfo($page_Info);
!                               return 'The page name must be unique.';
                        }
                        if ($this->pageso->savePageInfo($page_Info))
--- 110,114 ----
                                $page_Info->name .= '--FIX-DUPLICATE-NAME';
                                $this->pageso->savePageInfo($page_Info);
!                               return lang('The page name must be unique.');
                        }
                        if ($this->pageso->savePageInfo($page_Info))
***************
*** 119,123 ****
                        else
                        {
!                               return 'There was an error writing to the 
database.';
                        }
                }
--- 118,122 ----
                        else
                        {
!                               return lang('There was an error writing to the 
database.');
                        }
                }