[pLog-svn] r780 - in plog/trunk: class/action/admin templates/admin

oscar at devel.plogworld.net oscar at devel.plogworld.net
Thu Jan 20 16:56:08 GMT 2005


Author: oscar
Date: 2005-01-20 16:56:08 +0000 (Thu, 20 Jan 2005)
New Revision: 780

Modified:
   plog/trunk/class/action/admin/adminaddarticlecategoryaction.class.php
   plog/trunk/class/action/admin/adminaddlinkaction.class.php
   plog/trunk/class/action/admin/adminaddpostaction.class.php
   plog/trunk/class/action/admin/admindeletearticlecategoryaction.class.php
   plog/trunk/class/action/admin/admindeletelinkaction.class.php
   plog/trunk/class/action/admin/admindeletepostaction.class.php
   plog/trunk/class/action/admin/admindeletereferreraction.class.php
   plog/trunk/class/action/admin/admindeletetrackbackaction.class.php
   plog/trunk/class/action/admin/adminpoststatsaction.class.php
   plog/trunk/class/action/admin/adminupdatearticlecategoryaction.class.php
   plog/trunk/templates/admin/editarticlecategories.template
   plog/trunk/templates/admin/editarticlecategory.template
   plog/trunk/templates/admin/editlinks.template
   plog/trunk/templates/admin/editpost.template
   plog/trunk/templates/admin/editposts.template
   plog/trunk/templates/admin/newlink.template
   plog/trunk/templates/admin/newpost.template
   plog/trunk/templates/admin/newpostcategory.template
   plog/trunk/templates/admin/siteblogs.template
   plog/trunk/templates/admin/siteusers.template
Log:
several fixes and changes to the code, now that I am going through everything creating the locale... I will commit the locale once done.

Modified: plog/trunk/class/action/admin/adminaddarticlecategoryaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddarticlecategoryaction.class.php	2005-01-20 16:06:26 UTC (rev 779)
+++ plog/trunk/class/action/admin/adminaddarticlecategoryaction.class.php	2005-01-20 16:56:08 UTC (rev 780)
@@ -83,16 +83,17 @@
 				
 				// clear the cache if everything went fine
 				CacheControl::resetBlogCache( $this->_blogInfo->getId());														
+				
+				$this->setCommonData();				
             }
             else {
 				// if there was an error, we should say so... as well as not changing the view since
 				// we're going back to the original view where we can add the category
 				$this->_view->setError( true );
 				$this->_view->setErrorMessage( $this->_locale->tr("error_adding_article_category" ));
+				$this->setCommonData( true );
             }
 
-            $this->setCommonData();
-
             // better to return true if everything fine
             return true;
         }

Modified: plog/trunk/class/action/admin/adminaddlinkaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddlinkaction.class.php	2005-01-20 16:06:26 UTC (rev 779)
+++ plog/trunk/class/action/admin/adminaddlinkaction.class.php	2005-01-20 16:56:08 UTC (rev 780)
@@ -76,7 +76,7 @@
 			$this->notifyEvent( EVENT_POST_LINK_ADD, Array( "link" => &$link ));			
 
             $this->_view = new AdminLinksListView( $this->_blogInfo );
-            $this->_view->setSuccessMessage( $this->_locale->tr("link_added_ok"));
+            $this->_view->setSuccessMessage( $this->_locale->pr("link_added_ok", $myLink->getName()));
             $this->setCommonData();
 			
 			// clear the cache

Modified: plog/trunk/class/action/admin/adminaddpostaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddpostaction.class.php	2005-01-20 16:06:26 UTC (rev 779)
+++ plog/trunk/class/action/admin/adminaddpostaction.class.php	2005-01-20 16:56:08 UTC (rev 780)
@@ -123,7 +123,7 @@
 			
                 $this->_view = new AdminPostsListView( $this->_blogInfo );
             	//$article->setId( $artId );
-                $message = $this->_locale->tr("post_added");
+                $message = $this->_locale->tr("post_added_ok");
                 
                 // train the filter
                 BayesianFilterCore::trainWithArticle( $article );
@@ -132,12 +132,12 @@
             	if( $this->_sendNotification ) {
                 	$artNotifications = new ArticleNotifications();
 	            	$artNotifications->addNotification( $artId, $this->_blogInfo->getId(), $this->_userInfo->getId());
-                    $message .= " ".$this->_locale->tr("you_will_be_notified");
+                    $message .= " ".$this->_locale->tr("send_notifications_ok");
         	    }
 
                 // we only have to send trackback pings if the article was published
                 // otherwise there is no need to...
-		$article->setId( $artId );
+				$article->setId( $artId );
                 if( $article->getStatus() == POST_STATUS_PUBLISHED) {
                 	// get the output from the xmlrpc pings but only if the user decided to do so!
 					if( $this->_sendPings ) {

Modified: plog/trunk/class/action/admin/admindeletearticlecategoryaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletearticlecategoryaction.class.php	2005-01-20 16:06:26 UTC (rev 779)
+++ plog/trunk/class/action/admin/admindeletearticlecategoryaction.class.php	2005-01-20 16:56:08 UTC (rev 780)
@@ -80,13 +80,11 @@
 								
 							// fire the pre-event
 							$this->notifyEvent( EVENT_POST_CATEGORY_DELETE, Array( "category" => &$category ));
-							// and clear the cache to avoid outdated information
-							CacheControl::resetBlogCache( $this->_blogInfo->getId());
 						}
 					}
 				}
 				else {
-					$errorMessage .= $this->_locale->tr("error_incorrect_category_id");
+					$errorMessage .= $this->_locale->pr("error_deleting_category2", $categoryId)."<br/>";
 				}
         	}
 			
@@ -94,8 +92,11 @@
 			$this->_view = new AdminArticleCategoriesListView( $this->_blogInfo );
 			if( $errorMessage != "" ) 
 				$this->_view->setErrorMessage( $errorMessage );
-			if( $successMessage != "" )
+			if( $successMessage != "" ) {
+				// and clear the cache to avoid outdated information
+				CacheControl::resetBlogCache( $this->_blogInfo->getId());			
 				$this->_view->setSuccessMessage( $successMessage );
+			}
 				
 			$this->setCommonData();
 			

Modified: plog/trunk/class/action/admin/admindeletelinkaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletelinkaction.class.php	2005-01-20 16:06:26 UTC (rev 779)
+++ plog/trunk/class/action/admin/admindeletelinkaction.class.php	2005-01-20 16:56:08 UTC (rev 780)
@@ -67,17 +67,23 @@
 
             $errorMessage = "";
 			$successMessage = "";
+			$numOk = 0;
             foreach( $this->_linkIds as $linkId ) {
             	// load the link
                 $link = $links->getMyLink( $linkId, $this->_blogInfo->getId());
 				if( $link ) {
 					if( !$links->deleteMyLink( $linkId, $this->_blogInfo->getId()))
 						$errorMessage .= $this->_locale->pr("error_removing_link", $link->getName())."<br/>";
-					else
-						$successMessage .= $this->_locale->pr("link_deleted_ok", $link->getName())."<br/>";
+					else {
+						$numOk++;
+						if( $numOk > 1 )
+							$successMessage = $this->_locale->pr("links_deleted_ok", $numOk );
+						else
+							$successMessage = $this->_locale->pr("link_deleted_ok", $link->getName());
+					}
 				}
 				else {
-					$errorMessage .= $this->_locale->pr("error_removing_link", $linkId)."<br/>";
+					$errorMessage .= $this->_locale->pr("error_removing_link2", $linkId)."<br/>";
 				}
             }
 

Modified: plog/trunk/class/action/admin/admindeletepostaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletepostaction.class.php	2005-01-20 16:06:26 UTC (rev 779)
+++ plog/trunk/class/action/admin/admindeletepostaction.class.php	2005-01-20 16:56:08 UTC (rev 780)
@@ -71,20 +71,20 @@
 						$result = $articles->deleteArticle( $postId, $this->_userInfo->getId(), $this->_blogInfo->getId(), false );
 					
 					if( !$result ) {
-						$errorMessage .= $this->_locale->pr("error_deleting_post", $post->getTopic(), $postId )."<br/>";
+						$errorMessage .= $this->_locale->pr("error_deleting_article", $post->getTopic())."<br/>";
 					}
 					else {
 						$totalOk++;
 						if( $totalOk < 2 ) 
-							$successMessage .= $this->_locale->pr("post_deleted_ok", $postId, $post->getTopic())."<br/>";
+							$successMessage .= $this->_locale->pr("article_deleted_ok", $post->getTopic())."<br/>";
 						else
-							$successMessage = $this->_locale->pr("posts_deleted_ok", $totalOk );
+							$successMessage = $this->_locale->pr("articles_deleted_ok", $totalOk );
 						// fire the post event
 						$this->notifyEvent( EVENT_POST_POST_DELETE, Array( "article" => &$post ));					
 					}
 				}
 				else {
-					$errorMessage .= $this->_locale->pr( "error_deleting_post", " ", $postId )."<br/>";
+					$errorMessage .= $this->_locale->pr( "error_deleting_article2", $postId )."<br/>";
 				}
             }
 			

Modified: plog/trunk/class/action/admin/admindeletereferreraction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletereferreraction.class.php	2005-01-20 16:06:26 UTC (rev 779)
+++ plog/trunk/class/action/admin/admindeletereferreraction.class.php	2005-01-20 16:56:08 UTC (rev 780)
@@ -38,7 +38,7 @@
 			else
 				$this->registerFieldValidator( "referrerIds", new ArrayValidator());
 			$view = new AdminReferrersView( $this->_blogInfo );
-			$view->setErrorMessage( $this->_locale->tr("error_no_referrers_selected" ));
+			$view->setErrorMessage( $this->_locale->tr("error_no_items_selected" ));
 			$this->setValidationErrorView( $view );
         }
 		
@@ -69,25 +69,30 @@
 			$totalOk = 0;
 			
             foreach( $this->_referrerIds as $referrerId ) {
-            	// fetch the trackback
+            	// fetch the referrer
 				$referrer = $referrers->getBlogReferer( $referrerId, $this->_blogInfo->getId());
 				
 				// fire the pre-event
 				$this->notifyEvent( EVEN_PRE_REFERRER_DELETE, Array( "referrer" => &$referrer ));
 				
-            	if( !$referrers->deleteBlogReferer( $referrerId, $this->_blogInfo->getId()))
-                    $errorMessage .= $this->_locale->tr("error_deleting_referrer")." \"".$referrer->getUrl()."\"<br/>";
-                else {
-					$totalOk++;
-					if( $totalOk < 2 )
-						$successMessage = $this->_locale->pr("referrer_deleted_ok", $referrer->getUrl());
-					else
-						$successMessage = $this->_locale->pr("referrers_deleted_ok", $totalOk );
-					// fire the post-event
-					$this->notifyEvent( EVENT_POST_REFERRER_DELETE, Array( "referrer" => &$referrer ));
-					
-					$clearCache = true;
-				}				
+				if( !$referrer ) {
+					$errorMessage .= $this->_locale->pr("error_deleting_referrer2", $referrerId )."<br/>";
+				}
+				else {
+					if( !$referrers->deleteBlogReferer( $referrerId, $this->_blogInfo->getId()))
+						$errorMessage .= $this->_locale->pr("error_deleting_referrer", $referrer->getUrl())."<br/>";
+					else {
+						$totalOk++;
+						if( $totalOk < 2 )
+							$successMessage = $this->_locale->pr("referrer_deleted_ok", $referrer->getUrl());
+						else
+							$successMessage = $this->_locale->pr("referrers_deleted_ok", $totalOk );
+						// fire the post-event
+						$this->notifyEvent( EVENT_POST_REFERRER_DELETE, Array( "referrer" => &$referrer ));
+						
+						$clearCache = true;
+					}
+				}			
             }
 			
 			if( $clearCache ) {

Modified: plog/trunk/class/action/admin/admindeletetrackbackaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletetrackbackaction.class.php	2005-01-20 16:06:26 UTC (rev 779)
+++ plog/trunk/class/action/admin/admindeletetrackbackaction.class.php	2005-01-20 16:56:08 UTC (rev 780)
@@ -40,7 +40,7 @@
 			else 
 				$this->registerFieldValidator( "trackbackIds", new ArrayValidator()); 
 			$view = new AdminPostsListView( $this->_blogInfo );
-			$view->setErrorMessage( $this->_locale->tr("error_deleting_trackback"));
+			$view->setErrorMessage( $this->_locale->tr("error_deleting_trackbacks"));
 			$this->setValidationErrorView( $view );
         }
 
@@ -90,14 +90,14 @@
 				$trackback = $trackbacks->getArticleTrackback( $trackbackId, $this->_articleId );
 				
 				if( !$trackback ) {
-					$errorMessage .= $this->_locale->tr("error_deleting_trackback")."<br/>";				
+					$errorMessage .= $this->_locale->pr("error_deleting_trackback2", $trackbackId)."<br/>";				
 				}
 				else {
 					// fire the pre-event
 					$this->notifyEvent( EVENT_PRE_TRACKBACK_DELETE, Array( "trackback" => &$trackback ));
 					
 					if( !$trackbacks->deletePostTrackback( $trackbackId, $this->_articleId ))
-						$errorMessage .= $this->_locale->tr("error_deleting_trackback")." \"".$trackback->getExcerpt()."\"<br/>";
+						$errorMessage .= $this->_locale->pr("error_deleting_trackback", $trackback->getExcerpt())."<br/>";
 					else {
 						$totalOk++;
 						if( $totalOk < 2 ) 

Modified: plog/trunk/class/action/admin/adminpoststatsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminpoststatsaction.class.php	2005-01-20 16:06:26 UTC (rev 779)
+++ plog/trunk/class/action/admin/adminpoststatsaction.class.php	2005-01-20 16:56:08 UTC (rev 780)
@@ -29,7 +29,7 @@
 			// data validatdion
 			$this->registerFieldValidator( "postId", new IntegerValidator());
 			$view = new AdminPostsListView( $this->_blogInfo );
-			$view->setErrorMessage( $this->_locale->tr("error_incorrect_post_id"));
+			$view->setErrorMessage( $this->_locale->tr("error_incorrect_article_id"));
 			$this->setValidationErrorView( $view );
         }
 
@@ -60,7 +60,7 @@
             $posts = new Articles();
             $post  = $posts->getBlogArticle( $this->_postId, $this->_blogInfo->getId());
             if( !$post ) {
-            	$this->_view = new AdminPostListView( $this->_blogInfo );
+            	$this->_view = new AdminPostsListView( $this->_blogInfo );
                 $this->_view->setErrorMessage( $this->_locale->tr("error_fetching_post"));
                 $this->setCommonData();
                 return false;

Modified: plog/trunk/class/action/admin/adminupdatearticlecategoryaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminupdatearticlecategoryaction.class.php	2005-01-20 16:06:26 UTC (rev 779)
+++ plog/trunk/class/action/admin/adminupdatearticlecategoryaction.class.php	2005-01-20 16:56:08 UTC (rev 780)
@@ -41,7 +41,7 @@
 			$this->registerFieldValidator( "categoryDescription", new StringValidator());
 			$this->registerFieldValidator( "categoryInMainPage", new EmptyValidator());
 			$errorView = new AdminTemplatedView( $this->_blogInfo, "editarticlecategory" );
-			$errorView->setErrorMessage( $this->_locale->tr("error_updating_category" ));
+			$errorView->setErrorMessage( $this->_locale->tr("error_updating_article_category" ));
 			$this->setValidationErrorView( $errorView );
         }
 
@@ -82,11 +82,11 @@
 			$this->_view = new AdminArticleCategoriesListView( $this->_blogInfo );			
 			
             if( !$categories->updateCategory( $category )) {
-                $this->_view->setErrorMessage( $this->_locale->tr("error_updating_category"));
+                $this->_view->setErrorMessage( $this->_locale->tr("error_updating_article_category"));
             }
 			else {
 				// if everything fine, load the list of categories
-				$this->_view->setSuccessMessage( $this->_locale->tr("category_updated_ok"));
+				$this->_view->setSuccessMessage( $this->_locale->pr("article_category_updated_ok", $category->getName()));
 				
 				// fire the post-event
 				$this->notifyEvent( EVENT_POST_CATEGORY_UPDATE, Array( "category" => &$category ));			

Modified: plog/trunk/templates/admin/editarticlecategories.template
===================================================================
--- plog/trunk/templates/admin/editarticlecategories.template	2005-01-20 16:06:26 UTC (rev 779)
+++ plog/trunk/templates/admin/editarticlecategories.template	2005-01-20 16:56:08 UTC (rev 780)
@@ -50,7 +50,7 @@
  <div id="list_action_bar">
   {include file="$admintemplatepath/adminpager.template" style=list}
   <input type="hidden" name="op" value="deleteArticleCategories"/>
-  <input type="submit" name="Delete selected" value="{$locale->tr("delete_selected")}"/>
+  <input type="submit" name="Delete selected" value="{$locale->tr("delete")}"/>
  </div>
  </form>
 

Modified: plog/trunk/templates/admin/editarticlecategory.template
===================================================================
--- plog/trunk/templates/admin/editarticlecategory.template	2005-01-20 16:06:26 UTC (rev 779)
+++ plog/trunk/templates/admin/editarticlecategory.template	2005-01-20 16:56:08 UTC (rev 780)
@@ -12,7 +12,7 @@
     <span class="required">*</span>
     <div class="formHelp">{$locale->tr("category_name_help")}</div>
     <input type="text" id="categoryName" name="categoryName" value="{$categoryName|escape:"html"}"/>
-    {include file="$admintemplatepath/validate.template" field=categoryName message=$locale->tr("error_empty_category_name")}
+    {include file="$admintemplatepath/validate.template" field=categoryName message=$locale->tr("error_empty_name")}
    </div>
 
    <div class="field">
@@ -20,7 +20,7 @@
     <span class="required">*</span>
     <div class="formHelp">{$locale->tr("category_description_help")}</div>
     <textarea name="categoryDescription" id="categoryDescription" cols="60" rows="5">{$categoryDescription}</textarea>
-    {include file="$admintemplatepath/validate.template" field=categoryDescription message=$locale->tr("error_empty_category_description")}
+    {include file="$admintemplatepath/validate.template" field=categoryDescription message=$locale->tr("error_empty_description")}
   </div>
 
    <div class="field">

Modified: plog/trunk/templates/admin/editlinks.template
===================================================================
--- plog/trunk/templates/admin/editlinks.template	2005-01-20 16:06:26 UTC (rev 779)
+++ plog/trunk/templates/admin/editlinks.template	2005-01-20 16:56:08 UTC (rev 780)
@@ -4,7 +4,7 @@
             <div id="list_nav_select">
 <form id="viewLinks" action="admin.php" method="post">
  <fieldset>
-  <legend>{$locale->tr("show_links_by")}</legend>
+  <legend>{$locale->tr("show_by")}</legend>
    <div class="list_nav_option">
     <label for="showCategory">{$locale->tr("category")}</label>
 	<br />

Modified: plog/trunk/templates/admin/editpost.template
===================================================================
--- plog/trunk/templates/admin/editpost.template	2005-01-20 16:06:26 UTC (rev 779)
+++ plog/trunk/templates/admin/editpost.template	2005-01-20 16:56:08 UTC (rev 780)
@@ -20,7 +20,7 @@
  </script>
   <form name="newPost" id="editPost" action="admin.php" method="post">
    <fieldset class="inputField">
-   <legend>{$locale->tr("newPost")}</legend>
+   <legend>{$locale->tr("editPost")}</legend>
    <div style="float:left; width: 73%; border-right: 1px solid #DEDEDE;">  
      {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_updating_post")}    
 	 
@@ -73,7 +73,7 @@
        <div class="field">
    	     <label for="postDateTime">{$locale->tr("date")}</label>
 		 <span class="required">*</span>
-		 <div class="formHelp">{$locale->tr("date_help")}</div>
+		 <div class="formHelp">{$locale->tr("post_date_help")}</div>
 		 <input name="postDateTime" id="postDateTime" class="dateTime" readonly="true" type="text" size="16" value="{$postDay}/{$postMonth}/{$postYear} {$postHour}:{$postMinutes}" style="margin-bottom: 4px;">
         <a href="javascript:NewCal('postDateTime','ddmmyyyy',true,24);"><img src="imgs/cal.jpg" alt="{$locale->tr("pick_date")}" style="border:0px;width: 16px; height: 14px; padding: 0;" /></a>	     
 	   </div>

Modified: plog/trunk/templates/admin/editposts.template
===================================================================
--- plog/trunk/templates/admin/editposts.template	2005-01-20 16:06:26 UTC (rev 779)
+++ plog/trunk/templates/admin/editposts.template	2005-01-20 16:56:08 UTC (rev 780)
@@ -4,7 +4,7 @@
             <div id="list_nav_select">
                 <form id="showBy" action="admin.php" method="post">
                 <fieldset>
-                <legend>{$locale->tr("show_posts_by")}</legend>
+                <legend>{$locale->tr("show_by")}</legend>
 
                     <div class="list_nav_option">
                     <label for="showCategory">{$locale->tr("category")}</label>

Modified: plog/trunk/templates/admin/newlink.template
===================================================================
--- plog/trunk/templates/admin/newlink.template	2005-01-20 16:06:26 UTC (rev 779)
+++ plog/trunk/templates/admin/newlink.template	2005-01-20 16:56:08 UTC (rev 780)
@@ -12,7 +12,7 @@
             <span class="required">*</span>
             <div class="formHelp">{$locale->tr("link_name_help")}</div>
             <input type="text" name="linkName" id="linkName" value="{$linkName}" />
-			{include file="$admintemplatepath/validate.template" field=linkName message=$locale->tr("error_invalid_link_name")}
+			{include file="$admintemplatepath/validate.template" field=linkName message=$locale->tr("error_empty_name")}
         </div>
 
         <div class="field">
@@ -31,9 +31,9 @@
         </div>
 		
         <div class="field">
-            <label for="linkRssFeed">{$locale->tr("rss_feed")}</label>
+            <label for="linkRssFeed">{$locale->tr("feed")}</label>
             <span class="required"></span>
-            <div class="formHelp">{$locale->tr("link_rss_feed_help")}</div>
+            <div class="formHelp">{$locale->tr("link_feed_help")}</div>
             <input type="text" name="linkRssFeed" id="linkRssFeed" value="{$linkRssFeed}" />
 			{include file="$admintemplatepath/validate.template" field=linkRssFeed message=$locale->tr("error_invalid_url")}			
         </div>		

Modified: plog/trunk/templates/admin/newpost.template
===================================================================
--- plog/trunk/templates/admin/newpost.template	2005-01-20 16:06:26 UTC (rev 779)
+++ plog/trunk/templates/admin/newpost.template	2005-01-20 16:56:08 UTC (rev 780)
@@ -95,10 +95,10 @@
        <div class="field">
    	     <label for="postDateTime">{$locale->tr("date")}</label>
 		 <span class="required">*</span>
-		 <div class="formHelp">{$locale->tr("date_help")}</div>
+		 <div class="formHelp">{$locale->tr("post_date_help")}</div>
 	     <input name="postDateTime" id="postDateTime" class="dateTime" readonly="true" type="text" size="16" value="{$postDateTime}" style="margin-bottom: 4px;">
 	     <a href="javascript:NewCal('postDateTime','ddmmyyyy',true,24);">
-		   <img src="imgs/cal.jpg" alt="{$locale->tr("pick_date")}" style="border:0px;width: 16px; height: 14px; padding: 0;" />
+		   <img src="imgs/cal.jpg" alt="{$locale->tr("date")}" style="border:0px;width: 16px; height: 14px; padding: 0;" />
 		 </a>
 	   </div>
 	   

Modified: plog/trunk/templates/admin/newpostcategory.template
===================================================================
--- plog/trunk/templates/admin/newpostcategory.template	2005-01-20 16:06:26 UTC (rev 779)
+++ plog/trunk/templates/admin/newpostcategory.template	2005-01-20 16:56:08 UTC (rev 780)
@@ -7,23 +7,23 @@
    {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_adding_article_category")}   
    
    <div class="field">
-    <label for="categoryName">{$locale->tr("category_name")}</label>
+    <label for="categoryName">{$locale->tr("name")}</label>
     <span class="required">*</span>
     <div class="formHelp">{$locale->tr("category_name_help")}</div>
     <input type="text" value="{$categoryName}" id="categoryName" name="categoryName" />
-    {include file="$admintemplatepath/validate.template" field=categoryName message=$locale->tr("error_empty_category_name")}
+    {include file="$admintemplatepath/validate.template" field=categoryName message=$locale->tr("error_empty_name")}
    </div>
    
    <div class="field">
     <label for="categoryDescription">{$locale->tr("description")}</label>
     <span class="required">*</span>
     <div class="formHelp">{$locale->tr("category_description_help")}</div>	
-    <br/><textarea name="categoryDescription" cols="60" id="categoryDescription" rows="5">{$categoryDescription}</textarea>
-    {include file="$admintemplatepath/validate.template" field=categoryDescription message=$locale->tr("error_empty_category_description")}  
+    <textarea name="categoryDescription" cols="60" id="categoryDescription" rows="5">{$categoryDescription}</textarea>
+    {include file="$admintemplatepath/validate.template" field=categoryDescription message=$locale->tr("error_empty_description")}  
    </div>
    
    <div class="field">
-    <label for="categoryInMainPage">{$locale->tr("show_category_in_main_page")}</label>
+    <label for="categoryInMainPage">{$locale->tr("show_in_main_page")}</label>
     <span class="required"></span>
     <div class="formHelp">
       <input class="checkbox" type="checkbox" value="1" name="categoryInMainPage" id="categoryInMainPage" {if $categoryInMainPage}checked="checked"{/if}/>	

Modified: plog/trunk/templates/admin/siteblogs.template
===================================================================
--- plog/trunk/templates/admin/siteblogs.template	2005-01-20 16:06:26 UTC (rev 779)
+++ plog/trunk/templates/admin/siteblogs.template	2005-01-20 16:56:08 UTC (rev 780)
@@ -5,7 +5,7 @@
             
 <form id="viewBlogs" action="admin.php" method="post">
  <fieldset>
-  <legend>{$locale->tr("show_blogs_by")}</legend>
+  <legend>{$locale->tr("show_by")}</legend>
    <div class="list_nav_option">
     <label for="status">{$locale->tr("status")}</label>
 	<br />

Modified: plog/trunk/templates/admin/siteusers.template
===================================================================
--- plog/trunk/templates/admin/siteusers.template	2005-01-20 16:06:26 UTC (rev 779)
+++ plog/trunk/templates/admin/siteusers.template	2005-01-20 16:56:08 UTC (rev 780)
@@ -5,7 +5,7 @@
             
 <form id="viewUsers" action="admin.php" method="post">
  <fieldset>
-  <legend>{$locale->tr("show_users_by")}</legend>
+  <legend>{$locale->tr("show_by")}</legend>
    <div class="list_nav_option">
     <label for="status">{$locale->tr("status")}</label>
 	<br />




More information about the pLog-svn mailing list