[pLog-svn] r796 - in plog/trunk: class/action/admin locale
templates/admin
oscar at devel.plogworld.net
oscar at devel.plogworld.net
Sun Jan 23 13:58:31 GMT 2005
Author: oscar
Date: 2005-01-23 13:58:31 +0000 (Sun, 23 Jan 2005)
New Revision: 796
Modified:
plog/trunk/class/action/admin/admindeleteblogtemplateaction.class.php
plog/trunk/class/action/admin/admindeleteusersaction.class.php
plog/trunk/class/action/admin/adminupdateuserprofileaction.class.php
plog/trunk/class/action/admin/adminuserprofileaction.class.php
plog/trunk/locale/locale_en_UK.php
plog/trunk/templates/admin/createuser.template
plog/trunk/templates/admin/siteusers.template
plog/trunk/templates/admin/userprofile.template
Log:
a few more changes, improvements and updates to the locale
Modified: plog/trunk/class/action/admin/admindeleteblogtemplateaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeleteblogtemplateaction.class.php 2005-01-23 13:30:56 UTC (rev 795)
+++ plog/trunk/class/action/admin/admindeleteblogtemplateaction.class.php 2005-01-23 13:58:31 UTC (rev 796)
@@ -68,11 +68,11 @@
if( !$ts->removeTemplate( $templateId, $this->_blogInfo->getId() ))
$errorMessage .= $this->_locale->pr("error_removing_template", $templateId )."<br/>";
else {
+ $totalOk++;
if( $totalOk < 2 )
$successMessage = $this->_locale->pr("template_removed_ok", $templateId);
else
$successMessage = $this->_locale->pr("templates_removed_ok", $totalOk );
- $totalOk++;
}
}
}
Modified: plog/trunk/class/action/admin/admindeleteusersaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeleteusersaction.class.php 2005-01-23 13:30:56 UTC (rev 795)
+++ plog/trunk/class/action/admin/admindeleteusersaction.class.php 2005-01-23 13:58:31 UTC (rev 796)
@@ -35,13 +35,6 @@
$this->setValidationErrorView( $view );
}
- function validate()
- {
- // array with the ids of the users we want to remove
-
- return true;
- }
-
function perform()
{
if( $this->_op == "deleteUser" ) {
@@ -49,8 +42,9 @@
$this->_userIds = Array();
$this->_userIds[] = $userId;
}
- else
+ else {
$this->_userIds = $this->_request->getValue( "userIds" );
+ }
$this->_disableUsers();
}
@@ -70,20 +64,19 @@
// get some info about the user
$userInfo = $users->getUserInfoFromId( $userId );
if( !$userInfo ) {
- $errorMessage .= $this->_locale->pr("error_could_not_find_user", $userId )."<br/>";
+ $errorMessage .= $this->_locale->pr("error_invalid_user2", $userId )."<br/>";
}
else {
$this->notifyEvent( EVENT_PRE_USER_DELETE, Array( "user" => &$userInfo ));
if( !$users->disableUser( $userId ))
$errorMessage .= $this->_locale->pr("error_deleting_user", $userInfo->getUsername())."<br/>";
else {
+ $totalOk++;
if( $totalOk < 2 )
$successMessage = $this->_locale->pr( "user_deleted_ok", $userInfo->getUsername());
else
$successMessage = $this->_locale->pr( "users_deleted_ok", $totalOk );
- $totalOk++;
-
// notify of the post delete event
$this->notifyEvent( EVENT_POST_USER_DELETE, Array( "user" => &$userInfo ));
}
Modified: plog/trunk/class/action/admin/adminupdateuserprofileaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminupdateuserprofileaction.class.php 2005-01-23 13:30:56 UTC (rev 795)
+++ plog/trunk/class/action/admin/adminupdateuserprofileaction.class.php 2005-01-23 13:58:31 UTC (rev 796)
@@ -43,7 +43,7 @@
$this->registerFieldValidator( "userPassword", new PasswordValidator(), true );
$this->registerFieldValidator( "userStatus", new IntegerValidator());
$view = new AdminEditSiteUserView( $this->_blogInfo );
- $view->setErrorMessage( $this->_locale->tr("error_updating_user_settings"));
+ $view->setErrorMessage( $this->_locale->tr("error_updating_user"));
$this->setValidationErrorView( $view );
}
@@ -67,7 +67,7 @@
// if no info could be fetched, shown an error and quit
if( !$user ) {
$this->_view = new AdminSiteUsersListView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_fetching_user_information") );
+ $this->_view->setErrorMessage( $this->_locale->tr("error_invalid_user") );
$this->setCommonData();
return false;
}
@@ -87,7 +87,7 @@
// and now update them
if( !$users->updateUser( $user )) {
$this->_view = new AdminSiteUsersListView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_user_settings") );
+ $this->_view->setErrorMessage( $this->_locale->tr("error_updating_user") );
$this->setCommonData();
return false;
}
@@ -96,7 +96,7 @@
$this->notifyEvent( EVENT_POST_USER_UPDATE, Array( "user" => &$user ));
$this->_view = new AdminSiteUsersListView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->pr("user_settings_updated_ok", $user->getUsername()));
+ $this->_view->setSuccessMessage( $this->_locale->pr("user_updated_ok", $user->getUsername()));
$this->setCommonData();
return true;
Modified: plog/trunk/class/action/admin/adminuserprofileaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminuserprofileaction.class.php 2005-01-23 13:30:56 UTC (rev 795)
+++ plog/trunk/class/action/admin/adminuserprofileaction.class.php 2005-01-23 13:58:31 UTC (rev 796)
@@ -26,7 +26,7 @@
// data validation
$this->registerFieldValidator( "userId", new IntegerValidator());
$view = new AdminSiteUsersListView( $this->_blogInfo );
- $view->setErrorMessage( $this->_locale->tr("error_user_id_incorrect" ));
+ $view->setErrorMessage( $this->_locale->tr("error_invalid_user" ));
$this->setValidationErrorView( $view );
}
@@ -40,7 +40,7 @@
// if no info could be fetched, shown an error and quit
if( !$user ) {
$this->_view = new AdminSiteUsersListView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_fetching_user_information"));
+ $this->_view->setErrorMessage( $this->_locale->tr("error_invalid_user"));
$this->setCommonData();
return false;
}
Modified: plog/trunk/locale/locale_en_UK.php
===================================================================
--- plog/trunk/locale/locale_en_UK.php 2005-01-23 13:30:56 UTC (rev 795)
+++ plog/trunk/locale/locale_en_UK.php 2005-01-23 13:58:31 UTC (rev 796)
@@ -512,9 +512,9 @@
$messages["blog_settings_updated_ok"] = "Blog settings updated successfully";
// user settings
-$messages["username_help"] = "Your public username. It cannot be changed";
+$messages["username_help"] = "Public username. It cannot be changed";
$messages["full_name"] = "Full name";
-$messages["full_name_help"] = "Your complete full name";
+$messages["full_name_help"] = "Complete full name";
$messages["password_help"] = "Type and confirm a new password, or leave empty for no change";
$messages["confirm_password"] = "Confirm password";
$messages["email"] = "Email";
@@ -547,17 +547,52 @@
$messages["notification_text"] = "Notification Text";
$messages["notification_text_help"] = "Text that will be included in the notification message";
$messages["error_adding_user"] = "There was an error granting access to the user. Please check the data and try again";
-$messages["error_invalid_user"] = "The user is not correct";
$messages["error_empty_text"] = "You must provide some text";
$messages["error_adding_user"] = "There was an error adding the user. Please check the data and try again";
$messages["error_invalid_user"] = "The user \"%s\" is not valid or does not exist";
$messages["user_added_to_blog_ok"] = "User \"%s\" has been given access to this blog successfully";
// blog templates
-$messages["error_no_templates_selected"] = "No templaes were selected to delete";
+$messages["error_no_templates_selected"] = "There were no templates selected";
+$messages["error_template_is_current"] = "Template \"%s\" cannot be deleted because it is the current one";
+$messages["error_removing_template"] = "There was an error deleted template \"%s\"";
+$messages["template_removed_ok"] = "Template \"%s\" deleted successfully";
+$messages["templates_removed_ok"] = "%s templates deleted successfully";
// new blog template
+$messages["template_installed_ok"] = "Template \"%s\" added succesfully";
+$messages["error_installing_template"] = "There was an error installing template \"%s\"";
+$messages["error_missing_base_files"] = "Some of the template files are missing";
+$messages["error_add_template_disabled"] = "New templates cannot be added because this feature has been disabled in this site";
+$messages["error_must_upload_file"] = "There was no template package uploaded";
+$messages["error_uploads_disabled"] = "Uploads have been disabled in this site";
+// site users
+$messages["user_status_active"] = "Active";
+$messages["user_status_disabled"] = "Disabled";
+$messages["user_status_all"] = "All";
+$messages["user_status_unconfirmed"] = "Unconfirmed";
+$messages["error_invalid_user2"] = "User with identifier \"%s\" does not exist";
+$messages["error_deleting_user"] = "There was an error disabling user \"%s\"";
+$messages["user_deleted_ok"] = "User \"%s\" disabled successfully";
+$messages["users_deleted_ok"] = "%s users disabled successfully";
+
+// create user
+$messages["user_added_ok"] = "User \"%s\" added successfully";
+$messages["error_incorrect_username"] = "The username is not correct or it is already in use";
+$messages["user_status_help"] = "Current status for this user";
+$messages["user_blog_help"] = "Blog to which this user will be initially assigned";
+$messages["none"] = "None";
+
+// edit user
+$messages["error_invalid_user"] = "The user identifier is not correct or the user does not exist";
+$messages["error_updating_user"] = "There was an error updating the user settings. Please check the data and try again";
+$messages["blogs"] = "Blogs";
+$messages["user_blogs_helps"] = "Blogs which this user currently owns or where this user has access";
+$messages["site_admin"] = "Administrator";
+$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";
+
// 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/createuser.template
===================================================================
--- plog/trunk/templates/admin/createuser.template 2005-01-23 13:30:56 UTC (rev 795)
+++ plog/trunk/templates/admin/createuser.template 2005-01-23 13:58:31 UTC (rev 796)
@@ -23,12 +23,12 @@
<span class="required">*</span>
<div class="formHelp">{$locale->tr("password_help")}</div>
<input type="password" name="userPassword" value="{$userPassword}" id="userPassword" />
- {include file="$admintemplatepath/validate.template" field=userPassword message=$locale->tr("error_password_incorrect")}
+ {include file="$admintemplatepath/validate.template" field=userPassword message=$locale->tr("error_invalid_password")}
</div>
<div class="field">
- <label for="userEmail">{$locale->tr("email_address")}</label>
+ <label for="userEmail">{$locale->tr("email")}</label>
<span class="required">*</span>
- <div class="formHelp">{$locale->tr("email_address_help")}</div>
+ <div class="formHelp">{$locale->tr("email_help")}</div>
<input type="text" name="userEmail" value="{$userEmail}" id="userEmail" />
{include file="$admintemplatepath/validate.template" field=userEmail message=$locale->tr("error_incorrect_email_address")}
</div>
@@ -43,9 +43,9 @@
</select>
</div>
<div class="field">
- <label for="userBlog">{$locale->tr("assigned_to_blog")}</label>
+ <label for="userBlog">{$locale->tr("blog")}</label>
<span class="required"></span>
- <div class="formHelp">{$locale->tr("assigned_to_blog_help")}</div>
+ <div class="formHelp">{$locale->tr("user_blog_help")}</div>
<select name="userBlog" id="userBlog">
<option value="0">({$locale->tr("none")})</option>
{foreach from=$siteblogs item=blog}
Modified: plog/trunk/templates/admin/siteusers.template
===================================================================
--- plog/trunk/templates/admin/siteusers.template 2005-01-23 13:30:56 UTC (rev 795)
+++ plog/trunk/templates/admin/siteusers.template 2005-01-23 13:58:31 UTC (rev 796)
@@ -42,7 +42,7 @@
<th style="width:25px;">UID</a></th>
<th style="width:135px;">{$locale->tr("username")}</th>
<th style="width:305px;">{$locale->tr("full_name")}</th>
- <th style="width:175px;">{$locale->tr("email_address")}</th>
+ <th style="width:175px;">{$locale->tr("email")}</th>
<th style="width:50px;">{$locale->tr("status")}</th>
<th style="width:90px;">{$locale->tr("actions")}</th>
</tr>
Modified: plog/trunk/templates/admin/userprofile.template
===================================================================
--- plog/trunk/templates/admin/userprofile.template 2005-01-23 13:30:56 UTC (rev 795)
+++ plog/trunk/templates/admin/userprofile.template 2005-01-23 13:58:31 UTC (rev 796)
@@ -22,7 +22,7 @@
<label for="userPassword">{$locale->tr("password")}</label>
<span class="required">*</span>
<div class="formHelp">{$locale->tr("password_help")}</div>
- <input type="password" name="userPassword" id="userPassword" value="{$userPassword}"/><i>{$locale->tr("empty_no_change")}</i>
+ <input type="password" name="userPassword" id="userPassword" value="{$userPassword}"/>
{include file="$admintemplatepath/validate.template" field=userPassword message=$locale->tr("error_password_incorrect")}
</div>
<div class="field">
@@ -52,10 +52,10 @@
</div>
<div class="field">
<label for="userIsSiteAdmin">{$locale->tr("site_admin")}</label>
- <span class="required">{$locale->tr("site_admin_help")}</span>
+ <span class="required"></span>
<div class="formHelp">
<input class="checkbox" type="checkbox" value="1" id="userIsSiteAdmin" name="userIsSiteAdmin" {if $userIsSiteAdmin} checked="checked" {/if}/>
- {$locale->tr("has_administrator_privileges")}
+ {$locale->tr("site_admin_help")}
</div>
</div>
<input type="hidden" name="userPictureId" value="{$edituser->getPictureId()}" />
More information about the pLog-svn
mailing list