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

[oscar at devel.plogworld.net]

Author: oscar
Date: 2005-02-16 19:29:37 +0000 (Wed, 16 Feb 2005)
New Revision: 1110

Modified:
   plog/trunk/class/action/admin/adminsendtrackbacksaction.class.php
   plog/trunk/locale/locale_en_UK.php
   plog/trunk/templates/admin/sendtrackbacks.template
Log:
fixed an issue regarding sending trackbacks pings, added some missing locale strings, fixed a crash bug and fixed the layout of the page a bit.


Modified: plog/trunk/class/action/admin/adminsendtrackbacksaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminsendtrackbacksaction.class.php	2005-02-16 13:11:48 UTC (rev 1109)
+++ plog/trunk/class/action/admin/adminsendtrackbacksaction.class.php	2005-02-16 19:29:37 UTC (rev 1110)
@@ -64,7 +64,7 @@
                     array_push( $trackbackLinks, $result["url"] );
                 }
                 else if( $result["status"] == TRACKBACK_SUCCESS ) {
-                	if( $message == "" ) $message = $this->_locale->tr("trackbacks_received_ok")."<br/><br/>";
+                	if( $message == "" ) $message = $this->_locale->tr("trackbacks_sent_ok")."<br/><br/>";
                     $message .= "<a href=\"".$result["url"]."\">".$result["url"]."</a><br/>";
                 }
                 else if( $result["status"] == TRACKBACK_UNAVAILABLE ) {
@@ -76,17 +76,14 @@
             if( $errors ) {
             	if( $message != "" )
                 	$message .= "<br/>";
-            	$message .= $this->_locale->tr("trackbacks_problems_sending");
-                $this->_view = new AdminSendTrackbacksView( $this->_blogInfo );
-                $this->_view->setValue( "message", $message );
+            	$message .= $this->_locale->tr("error_sending_trackbacks");
+         	$this->_view = new AdminTemplatedView( $this->_blogInfo, "sendtrackbacks" );
+                $this->_view->setErrorMessage( $message );
                 $this->_view->setValue( "post", $post);
                 $this->_view->setValue( "postlinks", $trackbackLinks );
                 $this->setCommonData();
             }
             else {
-            	if( $message != "" )
-                	$message .= "<br/>";
-            	$message .= $this->_locale->tr("trackbacks_received_all_hosts");
                 $this->_view = new AdminPostsListView( $this->_blogInfo );
                 $this->_view->setSuccessMessage( $message );
                 $this->setCommonData();

Modified: plog/trunk/locale/locale_en_UK.php
===================================================================
--- plog/trunk/locale/locale_en_UK.php	2005-02-16 13:11:48 UTC (rev 1109)
+++ plog/trunk/locale/locale_en_UK.php	2005-02-16 19:29:37 UTC (rev 1110)
@@ -248,6 +248,13 @@
 $messages['post_added_ok'] = 'Post added successfully.';
 $messages['send_notifications_ok'] = 'A notification will be sent every time there is a new comment or trackback.';
 
+// send trackbacks
+$messages['error_sending_trackbacks'] = 'There was an error sending the following trackbacks';
+$messages['send_trackbacks_help'] = 'Please select those URLs where you would like to send the trackback ping. Please make sure that the sites support trackback.';
+$messages['send_trackbacks'] = 'Send trackbacks';
+$messages['ping_selected'] = 'Ping selected';
+$messages['trackbacks_sent_ok'] = 'Trackbacks successfully sent to the selected URLs';
+
 // posts page
 $messages['show_by'] = 'Show By';
 $messages['category'] = 'Category';

Modified: plog/trunk/templates/admin/sendtrackbacks.template
===================================================================
--- plog/trunk/templates/admin/sendtrackbacks.template	2005-02-16 13:11:48 UTC (rev 1109)
+++ plog/trunk/templates/admin/sendtrackbacks.template	2005-02-16 19:29:37 UTC (rev 1110)
@@ -1,8 +1,8 @@
 {include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=newPost title=$locale->tr("send_trackback_pings")}
+{include file="$admintemplatepath/navigation.template" showOpt=newPost title=$locale->tr("send_trackbacks")}
 <form name="pingThese" method="post" action="admin.php">
  <fieldset class="inputField">
-  <legend>{$locale->tr("send_trackback_pings")}</legend>
+  <legend>{$locale->tr("send_trackbacks")}</legend>
   {include file="$admintemplatepath/successmessage.template"}
   {include file="$admintemplatepath/errormessage.template"} 
   <label for="postLink">{$locale->tr("send_trackbacks")}</label>