[pLog-svn] r806 - in plog/trunk: class/action/admin locale
templates/admin
oscar at devel.plogworld.net
oscar at devel.plogworld.net
Sun Jan 23 20:36:24 GMT 2005
Author: oscar
Date: 2005-01-23 20:36:24 +0000 (Sun, 23 Jan 2005)
New Revision: 806
Modified:
plog/trunk/class/action/admin/admindeleteblogaction.class.php
plog/trunk/class/action/admin/adminupdatepostaction.class.php
plog/trunk/locale/locale_en_UK.php
plog/trunk/templates/admin/siteblogs.template
Log:
more screens translated
Modified: plog/trunk/class/action/admin/admindeleteblogaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeleteblogaction.class.php 2005-01-23 17:50:47 UTC (rev 805)
+++ plog/trunk/class/action/admin/admindeleteblogaction.class.php 2005-01-23 20:36:24 UTC (rev 806)
@@ -64,26 +64,30 @@
foreach( $this->_blogIds as $blogId ) {
// get some info about the blog before deleting it
$blogInfo = $blogs->getBlogInfo( $blogId );
- $this->notifyEvent( EVENT_PRE_BLOG_DELETE, Array( "blog" => &$blogInfo ));
- // make sure we're not deleting the default one!
- if( $defaultBlogId == $blogId ) {
- $errorMessage .= $this->_locale->pr("error_blog_is_default_blog", $blogInfo->getBlog())."<br />";
- }
- else {
- if( $blogs->disableBlog( $blogId )) {
- if( $totalOk < 2 )
- $successMessage = $this->_locale->pr("blog_deleted_ok", $blogInfo->getBlog());
- else
- $successMessage = $this->_locale->pr( "blogs_deleted_ok", $totalOk );
-
- $totalOk++;
-
- $this->notifyEvent( EVENT_POST_BLOG_DELETE, Array( "blog" => &$blogInfo ));
+ if( !$blogInfo ) {
+ $errorMessage .= $this->_locale->pr("error_deleting_blog2", $blogId)."<br/>";
+ }
+ else {
+ $this->notifyEvent( EVENT_PRE_BLOG_DELETE, Array( "blog" => &$blogInfo ));
+ // make sure we're not deleting the default one!
+ if( $defaultBlogId == $blogId ) {
+ $errorMessage .= $this->_locale->pr("error_blog_is_default_blog", $blogInfo->getBlog())."<br />";
}
- else
- $errorMessage .= $this->_locale->pr("error_deleting_blog", $blogInfo->getBlog())."<br/>";
- }
- }
+ else {
+ if( $blogs->disableBlog( $blogId )) {
+ $totalOk++;
+ if( $totalOk < 2 )
+ $successMessage = $this->_locale->pr("blog_deleted_ok", $blogInfo->getBlog());
+ else
+ $successMessage = $this->_locale->pr( "blogs_deleted_ok", $totalOk );
+
+ $this->notifyEvent( EVENT_POST_BLOG_DELETE, Array( "blog" => &$blogInfo ));
+ }
+ else
+ $errorMessage .= $this->_locale->pr("error_deleting_blog", $blogInfo->getBlog())."<br/>";
+ }
+ }
+ }
$this->_view = new AdminSiteBlogsListView( $this->_blogInfo );
if( $errorMessage != "" ) $this->_view->setErrorMessage( $errorMessage );
Modified: plog/trunk/class/action/admin/adminupdatepostaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminupdatepostaction.class.php 2005-01-23 17:50:47 UTC (rev 805)
+++ plog/trunk/class/action/admin/adminupdatepostaction.class.php 2005-01-23 20:36:24 UTC (rev 806)
@@ -72,7 +72,7 @@
// there must be something wrong if we can't fetch the post that we are trying to update...
if( !$post ) {
$this->_view = new AdminPostsListView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_getting_post_to_update"));
+ $this->_view->setErrorMessage( $this->_locale->tr("error_fetching_post"));
$this->setCommonData();
return false;
@@ -106,7 +106,7 @@
// and finally save the post to the database
if( !$articles->updateArticle( $post )) {
$this->_view = new AdminPostsListView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_post_in_database"));
+ $this->_view->setErrorMessage( $this->_locale->tr("error_updating_post"));
$this->setCommonData();
return false;
@@ -119,7 +119,7 @@
// create the definitive view
$this->_view = new AdminPostsListView( $this->_blogInfo );
// show a message saying that the post was updated
- $message = $this->_locale->tr("post_successfully_updated");
+ $message = $this->_locale->tr("post_updated_ok");
// check if there was a previous notification
$notifications = new ArticleNotifications();
@@ -129,7 +129,7 @@
if( !$artNotification ) {
// if there wasn't one and now we want it, we have to add it
$notifications->addNotification( $this->_postId, $this->_blogInfo->getId(), $this->_userInfo->getId());
- $message .= " ".$this->_locale->tr("you_will_be_notified");
+ $message .= " ".$this->_locale->tr("notification_added");
}
}
else {
Modified: plog/trunk/locale/locale_en_UK.php
===================================================================
--- plog/trunk/locale/locale_en_UK.php 2005-01-23 17:50:47 UTC (rev 805)
+++ plog/trunk/locale/locale_en_UK.php 2005-01-23 20:36:24 UTC (rev 806)
@@ -183,7 +183,7 @@
$messages["editSiteUsers"] = "Site Users";
$messages["Blogs"] = "Manage Blogs";
$messages["createBlog"] = "Create Blog";
-$messages["editSiteBlogs"] = "Site Blogs";
+$messages["editSiteBlogs"] = "Blogs";
$messages["Locales"] = "Manage Locales";
$messages["newLocale"] = "New Locale";
$messages["siteLocales"] = "Site Locales";
@@ -597,6 +597,24 @@
$messages["site_admin_help"] = "Whether this user has administrator privileges and is allowed to see the 'Administration' area and perform administrative tasks";
$messages["user_updated_ok"] = "User \"%s\" updated successfully";
+// site blogs
+$messages["blog_status_all"] = "All";
+$messages["blog_status_active"] = "Active";
+$messages["blog_status_disabled"] = "Disabled";
+$messages["blog_status_unconfirmed"] = "Unconfirmed";
+$messages["owner"] = "Owner";
+$messages["quota"] = "Quota";
+$messages["bytes"] = "bytes";
+$messages["error_no_blogs_selected"] = "No blogs were selected to disable";
+$messages["error_blog_is_default_blog"] = "Blog \"%s\" cannot be deleted because it is set as the default blog";
+$messages["blog_deleted_ok"] = "Blog \"%s\" disabled successfully";
+$messages["blogs_deleted_ok"] = "%s blogs deleted successfully";
+$messages["error_deleting_blog"] = "There was an error disabling blog \"%s\"";
+$messages["error_deleting_blog2"] = "There was an error disabling blog with identifier \"%s\"";
+
+// edit blog
+
+
// global settings
$messages["help_comments_enabled"] = "Enable comments by default in all new blogs";
?>
\ No newline at end of file
Modified: plog/trunk/templates/admin/siteblogs.template
===================================================================
--- plog/trunk/templates/admin/siteblogs.template 2005-01-23 17:50:47 UTC (rev 805)
+++ plog/trunk/templates/admin/siteblogs.template 2005-01-23 20:36:24 UTC (rev 806)
@@ -34,8 +34,8 @@
<thead>
<tr>
<th style="width:10px;"><input class="checkbox" type="checkbox" class="check" name="all" id="all" value="1" onclick="toggleAllChecks('editBlogs');" /></th>
- <th style="width:390px;">{$locale->tr("blog_title")}</th>
- <th style="width:115px;">{$locale->tr("blog_owner")}</th>
+ <th style="width:390px;">{$locale->tr("blog")}</th>
+ <th style="width:115px;">{$locale->tr("owner")}</th>
<th style="width:60px;">{$locale->tr("status")}</th>
<th style="width:100px;">{$locale->tr("quota")}</th>
<th style="width:95px;">{$locale->tr("actions")}</th>
More information about the pLog-svn
mailing list