<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][5553] trunk/bp-activity/bp-activity-admin.php: Tweak activity admin status strings.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/5553">5553</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-12-14 20:16:29 +0000 (Wed, 14 Dec 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tweak activity admin status strings. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3822">#3822</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityadminphp">trunk/bp-activity/bp-activity-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-admin.php (5552 => 5553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-admin.php 2011-12-14 20:09:45 UTC (rev 5552)
+++ trunk/bp-activity/bp-activity-admin.php 2011-12-14 20:16:29 UTC (rev 5553)
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx"> if ( $deleted )
</span><span class="cx"> $redirect_to = add_query_arg( 'deleted', $deleted, $redirect_to );
</span><span class="cx">
</span><del>- // If an error occured, pass back the activity ID that failed
</del><ins>+ // If an error occurred, pass back the activity ID that failed
</ins><span class="cx"> if ( ! empty( $errors ) )
</span><span class="cx"> $redirect_to = add_query_arg( 'error', implode ( ',', array_map( 'absint', $errors ) ), $redirect_to );
</span><span class="cx">
</span><span class="lines">@@ -478,7 +478,7 @@
</span><span class="cx"> // Call actions for plugins to do something before we redirect
</span><span class="cx"> do_action_ref_array( 'bp_activity_admin_edit_after', array( &$activity, $error ) );
</span><span class="cx">
</span><del>- // If an error occured, pass back the activity ID that failed
</del><ins>+ // If an error occurred, pass back the activity ID that failed
</ins><span class="cx"> if ( $error )
</span><span class="cx"> $redirect_to = add_query_arg( 'error', (int) $error, $redirect_to );
</span><span class="cx"> else
</span><span class="lines">@@ -770,15 +770,24 @@
</span><span class="cx">
</span><span class="cx"> $errors = array_map( 'absint', explode( ',', $errors ) );
</span><span class="cx">
</span><ins>+ // Make sure we don't get any empty values in $errors
+ for ( $i = 0, $errors_count = count( $errors ); $i < $errors_count; $i++ ) {
+ if ( 0 === $errors[$i] )
+ unset( $errors[$i] );
+ }
+
+ // Reindex array
+ $errors = array_values( $errors );
+
</ins><span class="cx"> if ( $deleted > 0 )
</span><del>- $messages[] = sprintf( _n( '%s activity was permanently deleted.', '%s activities were permanently deleted.', $deleted, 'buddypress' ), number_format_i18n( $deleted ) );
</del><ins>+ $messages[] = sprintf( _n( '%s activity has been permanently deleted.', '%s activity items have been permanently deleted.', $deleted, 'buddypress' ), number_format_i18n( $deleted ) );
</ins><span class="cx">
</span><span class="cx"> if ( ! empty( $errors ) ) {
</span><span class="cx"> if ( 1 == count( $errors ) ) {
</span><del>- $error_msg = __( 'An error occurred when updating activity ID #%s.', 'buddypress' );
</del><ins>+ $messages[] = sprintf( __( 'An error occurred when trying to update activity ID #%s.', 'buddypress' ), number_format_i18n( $errors[0] ) );
</ins><span class="cx">
</span><span class="cx"> } else {
</span><del>- $error_msg = __( 'Errors occurred when updating activity IDs:', 'buddypress' );
</del><ins>+ $error_msg = __( 'Errors occurred when trying to update these activity items:', 'buddypress' );
</ins><span class="cx"> $error_msg .= '<ul class="activity-errors">';
</span><span class="cx">
</span><span class="cx"> // Display each error as a list item
</span><span class="lines">@@ -793,10 +802,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $spammed > 0 )
</span><del>- $messages[] = sprintf( _n( '%s activity has been marked as spam.', '%s activities have been marked as spam.', $spammed, 'buddypress' ), number_format_i18n( $spammed ) );
</del><ins>+ $messages[] = sprintf( _n( '%s activity has been successfully spammed.', '%s activity items have been successfully spammed.', $spammed, 'buddypress' ), number_format_i18n( $spammed ) );
</ins><span class="cx">
</span><span class="cx"> if ( $unspammed > 0 )
</span><del>- $messages[] = sprintf( _n( '%s activity has been restored from the spam.', '%s activities have been restored from the spam.', $unspammed, 'buddypress' ), number_format_i18n( $unspammed ) );
</del><ins>+ $messages[] = sprintf( _n( '%s activity has been successfully unspammed.', '%s activity items have been successfully unspammed.', $unspammed, 'buddypress' ), number_format_i18n( $unspammed ) );
</ins><span class="cx">
</span><span class="cx"> if ( $updated > 0 )
</span><span class="cx"> $messages[] = __( 'The activity has been updated succesfully.', 'buddypress' );
</span><span class="lines">@@ -825,7 +834,7 @@
</span><span class="cx">
</span><span class="cx"> <?php // If the user has just made a change to an activity item, display the status messages ?>
</span><span class="cx"> <?php if ( !empty( $messages ) ) : ?>
</span><del>- <div id="moderated" class="<?php echo ( ! empty( $_REQUEST['errors'] ) ) ? 'error' : 'updated'; ?>"><p><?php echo implode( "<br/>\n", $messages ); ?></p></div>
</del><ins>+ <div id="moderated" class="<?php echo ( ! empty( $_REQUEST['error'] ) ) ? 'error' : 'updated'; ?>"><p><?php echo implode( "<br/>\n", $messages ); ?></p></div>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php // Display each activity on its own row ?>
</span></span></pre>
</div>
</div>
</body>
</html>