[pLog-CVS] plog_devel admincontrollermap.properties.php,1.30,1.31 adminupdateeditblogaction.class.php,1.2,1.3 adminupdateusersettingsaction.class.php,1.3,1.4 templateservice.class.php,1.12,1.13

[<phu...@us...>]

Update of /cvsroot/plog/plog_devel
In directory sc8-pr-cvs1:/tmp/cvs-serv27456

Modified Files:
	admincontrollermap.properties.php 
	adminupdateeditblogaction.class.php 
	adminupdateusersettingsaction.class.php 
	templateservice.class.php 
Log Message:
localization changes

Index: admincontrollermap.properties.php
===================================================================
RCS file: /cvsroot/plog/plog_devel/admincontrollermap.properties.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** admincontrollermap.properties.php	9 Oct 2003 11:11:21 -0000	1.30
--- admincontrollermap.properties.php	14 Oct 2003 18:16:55 -0000	1.31
***************
*** 133,137 ****
      $actions["updatePluginConfig"] = "AdminUpdatePluginConfigurationAction";
      // shows a list with all the locale files available
!     $actions["locales"] = "AdminSiteLocalesAction";
      // removes a locale from disk
      $actions["deleteLocales"] = "AdminDeleteLocalesAction";
--- 133,137 ----
      $actions["updatePluginConfig"] = "AdminUpdatePluginConfigurationAction";
      // shows a list with all the locale files available
!     $actions["siteLocales"] = "AdminSiteLocalesAction";
      // removes a locale from disk
      $actions["deleteLocales"] = "AdminDeleteLocalesAction";
***************
*** 141,145 ****
      $actions["addLocale"] = "AdminAddLocaleAction";
      // shows a list of the locales available
!     $actions["templates"] = "AdminEditTemplatesAction";
      // deletes templates
      $actions["deleteTemplates"] = "AdminDeleteTemplatesAction";
--- 141,145 ----
      $actions["addLocale"] = "AdminAddLocaleAction";
      // shows a list of the locales available
!     $actions["siteTemplates"] = "AdminEditTemplatesAction";
      // deletes templates
      $actions["deleteTemplates"] = "AdminDeleteTemplatesAction";

Index: adminupdateeditblogaction.class.php
===================================================================
RCS file: /cvsroot/plog/plog_devel/adminupdateeditblogaction.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** adminupdateeditblogaction.class.php	9 Oct 2003 20:44:34 -0000	1.2
--- adminupdateeditblogaction.class.php	14 Oct 2003 18:16:55 -0000	1.3
***************
*** 48,52 ****
              $this->_blogName  = $this->_request->getValue( "blogName" );
              $this->_blogShowMoreEnabled = $this->_request->getValue( "blogShowMoreEnabled" );
-             $this->_blogShowMoreThreshold = $this->_request->getValue( "blogShowMoreThreshold" );
              $this->_blogEnableHtmlarea = $this->_request->getValue( "blogEnableHtmlarea" );
              $this->_blogCommentsEnabled = $this->_request->getValue( "blogCommentsEnabled" );
--- 48,51 ----
***************
*** 99,111 ****
              }
  
-             $val6 = new IntegerValidator( $this->_blogShowMoreThreshold );
-             if( $this->_blogShowMoreEnabled == "on" && (!$val6->validate())) {
-             	$this->_view = new AdminErrorView( $this->_blogInfo );
-                 $this->_view->setValue( "message", $this->_locale->tr("error_incorrect_show_more_threshold"));
-                 $this->setCommonData();
- 
-                 return false;
-             }
- 
              // validate the blog identifier
              $val7 = new IntegerValidator( $this->_editBlogId );
--- 98,101 ----
***************
*** 182,187 ****
              else
              	$blogSettings->setValue( "comments_enabled", false );
- 
-             $blogSettings->setValue( "show_more_threshold", $this->_blogShowMoreThreshold );
  
              $blogInfo->setAbout( $this->_blogAbout );
--- 172,175 ----

Index: adminupdateusersettingsaction.class.php
===================================================================
RCS file: /cvsroot/plog/plog_devel/adminupdateusersettingsaction.class.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** adminupdateusersettingsaction.class.php	1 Sep 2003 14:54:41 -0000	1.3
--- adminupdateusersettingsaction.class.php	14 Oct 2003 18:16:55 -0000	1.4
***************
*** 97,101 ****
              // if everything fine, also say so...
              $this->_view = new AdminMessageView( $this->_blogInfo );
!             $this->_view->setMessage( $this->_locale->tr("user_settings_updated_ok")."<br/><br/><a href=\"admin.php?op=userSettings\">".$this->_locale->tr("back")."</a>");
              $this->setCommonData();
  
--- 97,101 ----
              // if everything fine, also say so...
              $this->_view = new AdminMessageView( $this->_blogInfo );
!             $this->_view->setMessage( $this->_locale->pr("user_settings_updated_ok", $this->_userInfo->getUsername())."<br/><br/><a href=\"admin.php?op=userSettings\">".$this->_locale->tr("back")."</a>");
              $this->setCommonData();
  

Index: templateservice.class.php
===================================================================
RCS file: /cvsroot/plog/plog_devel/templateservice.class.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** templateservice.class.php	13 Oct 2003 18:10:36 -0000	1.12
--- templateservice.class.php	14 Oct 2003 18:16:55 -0000	1.13
***************
*** 390,394 ****
              // get the array with the template names stored in the settings
              $blogTemplates = $blogSettings->getValue( "blog_templates" );
-             print_r($blogTemplates);
              if( empty($blogTemplates) || $blogTemplates == false )
              	return false;
--- 390,393 ----