<!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>[6363] sites/trunk/buddypress.org/public_html/wp-content/themes/bbpress-org: bbPress.org: Properly i18n homepage strings and general cleanup.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/6363">6363</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/6363","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-01-12 03:23:31 +0000 (Fri, 12 Jan 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>bbPress.org: Properly i18n homepage strings and general cleanup.
Props SergeyBiryukov, ramiy, dd32.
Fixes <a href="http://meta.trac.wordpress.org/ticket/1285">#1285</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkbuddypressorgpublic_htmlwpcontentthemesbbpressorgheaderfrontphp">sites/trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/header-front.php</a></li>
<li><a href="#sitestrunkbuddypressorgpublic_htmlwpcontentthemesbbpressorgpagepluginsphp">sites/trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/page-plugins.php</a></li>
<li><a href="#sitestrunkbuddypressorgpublic_htmlwpcontentthemesbbpressorgsidebarphp">sites/trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/sidebar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkbuddypressorgpublic_htmlwpcontentthemesbbpressorgheaderfrontphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/header-front.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/header-front.php 2018-01-11 23:51:02 UTC (rev 6362)
+++ sites/trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/header-front.php 2018-01-12 03:23:31 UTC (rev 6363)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,10 +1,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_front_page() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="headline"><div id="headline-inner">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2 class="graphic home"><?php bloginfo( 'description' ); ?></h2>
- <p>bbPress is forum software with a twist from the creators of WordPress. Easily setup discussion forums inside your WordPress.org powered site.</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2 class="graphic home"><?php _e( 'Forums, made the WordPress way', 'bbporg' ); ?></h2>
+ <p><?php _e( 'bbPress is forum software with a twist from the creators of WordPress. Easily setup discussion forums inside your WordPress.org powered site.', 'bbporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="//bbpress.org/download/" id="big-demo-button" class="button">Download bbPress →</a>
- <img src="<?php echo get_stylesheet_directory_uri(); ?>/images/screenshots.png?v=6" srcset="<?php echo get_stylesheet_directory_uri(); ?>/images/screenshots.png?v=6 1x, <?php echo get_stylesheet_directory_uri(); ?>/images/screenshots-2x.png?v=6 2x" alt="Screenshots">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="//bbpress.org/download/" id="big-demo-button" class="button"><?php _e( 'Download bbPress →', 'bbporg' ); ?></a>
+ <img src="<?php echo get_stylesheet_directory_uri(); ?>/images/screenshots.png?v=6" srcset="<?php echo get_stylesheet_directory_uri(); ?>/images/screenshots.png?v=6 1x, <?php echo get_stylesheet_directory_uri(); ?>/images/screenshots-2x.png?v=6 2x" alt="">
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <hr class="hidden" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,19 +12,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="showcase"><div id="showcase-inner">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="feature">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php _e( 'Simple Setup', 'bbporg' ); ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><a href="//bbpress.org/about/simple/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_forums.gif" alt="" width="78" height="58"></a>Easy to setup.<br /> Easy to moderate.<br /> Fast, and clean.</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <a href="//bbpress.org/about/simple/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_forums.gif" alt="<?php esc_attr_e( 'Simple Setup', 'bbporg' ); ?>" width="78" height="58"></a>
+ <?php _e( 'Easy to setup.<br /> Easy to moderate.<br /> Fast, and clean.', 'bbporg' ); ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="feature">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php _e( 'Fully Integrated', 'bbporg' ); ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><a href="//bbpress.org/about/integration/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_integration.gif" alt="" width="78" height="58"></a>One central account.<br /> One unified admin area.<br /> One click install.</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <a href="//bbpress.org/about/integration/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_integration.gif" alt="<?php esc_attr_e( 'Fully Integrated', 'bbporg' ); ?>" width="78" height="58"></a>
+ <?php _e( 'One central account.<br /> One unified admin area.<br /> One click install.', 'bbporg' ); ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="feature" style="margin:0;">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php _e( 'Single Installation', 'bbporg' ); ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><a href="//bbpress.org/about/installation/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_installation.gif" alt="" width="78" height="58"></a>Simple step-by-step installation walks you through your options.</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <a href="//bbpress.org/about/installation/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_installation.gif" alt="<?php esc_attr_e( 'Single Installation', 'bbporg' ); ?>" width="78" height="58"></a>
+ <?php _e( 'Simple step-by-step installation walks you through your options.', 'bbporg' ); ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="feature">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php _e( 'Multisite Forums', 'bbporg' ); ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><a href="//bbpress.org/about/multisite/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_blogs.gif" alt="" width="78" height="58"></a>Divide your site into sections. Allow your users to create content.</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <a href="//bbpress.org/about/multisite/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/feature_blogs.gif" alt="<?php esc_attr_e( 'Multisite Forums', 'bbporg' ); ?>" width="78" height="58"></a>
+ <?php _e( 'Divide your site into sections. Allow your users to create content.', 'bbporg' ); ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <hr class="hidden" />
</span></span></pre></div>
<a id="sitestrunkbuddypressorgpublic_htmlwpcontentthemesbbpressorgpagepluginsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/page-plugins.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/page-plugins.php 2018-01-11 23:51:02 UTC (rev 6362)
+++ sites/trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/page-plugins.php 2018-01-12 03:23:31 UTC (rev 6363)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php get_header(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php while ( have_posts() ) : the_post(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <h3 id="post-<?php the_ID(); ?>"><?php the_title(); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="bbp-pagination">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="bbp-pagination-count">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( 'Viewing %1$s to %2$s (%3$s)', number_format_i18n( $from_num ), number_format_i18n( $to_num ), number_format_i18n( $plugins->info['results'] ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: 1: starting number of plugins, 2: ending number, 3: total number */
+ printf( __( 'Viewing %1$s to %2$s (%3$s)', 'bbporg' ),
+ number_format_i18n( $from_num ),
+ number_format_i18n( $to_num ),
+ number_format_i18n( $plugins->info['results'] )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,25 +42,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- foreach ( (array) $plugins->plugins as $plugin ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php foreach ( (array) $plugins->plugins as $plugin ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $plugin_author_id = 0;
-
- if ( !empty( $plugin->contributors ) ) {
- $plugin_author = get_user_by( 'login', key( $plugin->contributors ) );
- $plugin_author_id = $plugin_author->ID;
- }
- ?>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <div class="single-plugin">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3 class="plugin-title"><a href="<?php echo esc_url( 'https://wordpress.org/extend/plugins/' . $plugin->slug ); ?>/" title="Plugin Information"><?php echo esc_html( $plugin->name ); ?></a></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3 class="plugin-title"><a href="<?php echo esc_url( 'https://wordpress.org/plugins/' . $plugin->slug ); ?>/"><?php echo esc_html( $plugin->name ); ?></a></h3>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="plugin-meta">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( !empty( $plugin->version ) ) : ?><div>Version: <?php echo esc_html( $plugin->version ); ?></div><?php if ( !empty( $plugin->requires ) ) : ?><?php endif; ?><?php endif; ?>
- <?php if ( !empty( $plugin->requires ) ) : ?><div>Requires: <?php echo esc_html( $plugin->requires ); ?></div><?php if ( !empty( $plugin->tested ) ) : ?><?php endif; ?><?php endif; ?>
- <?php if ( !empty( $plugin->tested ) ) : ?><div>Compatible up to: <?php echo esc_html( $plugin->tested ); ?></div><?php endif; ?>
- <div>Rating: <?php echo $plugin->rating_html; // raw html - do not escape ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! empty( $plugin->version ) ) : ?>
+ <div><?php printf( __( 'Version: %s', 'bbporg' ), esc_html( $plugin->version ) ); ?></div>
+ <?php endif; ?>
+ <?php if ( ! empty( $plugin->requires ) ) : ?>
+ <div><?php printf( __( 'Requires: %s', 'bbporg' ), esc_html( $plugin->requires ) ); ?></div>
+ <?php endif; ?>
+ <?php if ( ! empty( $plugin->tested ) ) : ?>
+ <div><?php printf( __( 'Compatible up to: %s', 'bbporg' ), esc_html( $plugin->tested ) ); ?></div>
+ <?php endif; ?>
+ <div><?php printf( __( 'Rating: %s', 'bbporg' ), $plugin->rating_html ); // raw html - do not escape ?></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="plugin-description" style="font-size: 12px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +71,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="bbp-pagination">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="bbp-pagination-count">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( 'Viewing %1$s to %2$s (%3$s)', number_format_i18n( $from_num ), number_format_i18n( $to_num ), number_format_i18n( $plugins->info['results'] ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: 1: starting number of plugins, 2: ending number, 3: total number */
+ printf( __( 'Viewing %1$s to %2$s (%3$s)', 'bbporg' ),
+ number_format_i18n( $from_num ),
+ number_format_i18n( $to_num ),
+ number_format_i18n( $plugins->info['results'] )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,6 +89,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endwhile; endif;?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php endwhile; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <hr class="hidden" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php get_sidebar(); get_footer(); ?>
</span></span></pre></div>
<a id="sitestrunkbuddypressorgpublic_htmlwpcontentthemesbbpressorgsidebarphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/sidebar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/sidebar.php 2018-01-11 23:51:02 UTC (rev 6362)
+++ sites/trunk/buddypress.org/public_html/wp-content/themes/bbpress-org/sidebar.php 2018-01-12 03:23:31 UTC (rev 6363)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bbp_is_single_forum() || bb_base_topic_search_query( false ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><?php _e( 'Forum Info', 'bbporg'); ?></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><?php _e( 'Forum Info', 'bbporg' ); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul class="forum-info">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bb_base_single_forum_description(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,17 +15,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bb_base_topic_search_form(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><?php _e( 'Forum Feeds', 'bbporg'); ?></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><?php _e( 'Forum Feeds', 'bbporg' ); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li><a class="feed" href="<?php bbp_forum_permalink(); ?>feed/" title="Forum Posts">Recent Posts</a></li>
- <li><a class="feed" href="<?php bbp_forum_permalink(); ?>feed/?type=topic" title="Forum Topics">Recent Topics</a></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li><a class="feed" href="<?php bbp_forum_permalink(); ?>feed/"><?php _e( 'Recent Posts', 'bbporg' ); ?></a></li>
+ <li><a class="feed" href="<?php bbp_forum_permalink(); ?>feed/?type=topic"><?php _e( 'Recent Topics', 'bbporg' ); ?></a></li>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( bbp_is_single_topic() || bbp_is_topic_edit() || bbp_is_reply_edit() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><?php _e( 'Topic Info', 'bbporg'); ?></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><?php _e( 'Topic Info', 'bbporg' ); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul class="topic-info">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bb_base_single_topic_description(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bbp_topic_tag_list( 0, array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'before' => '<h3>Topic Tags</h3><ul class="topic-tags"><li>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'before' => '<h3>' . __( 'Topic Tags', 'bbporg' ) . '</h3><ul class="topic-tags"><li>',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'after' => '</li></ul>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sep' => '</li><li>',
</span><span class="cx" style="display: block; padding: 0 10px"> ) ); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bbp_topic_admin_links( array (
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => bbp_get_topic_id(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'before' => '<h3>Topic Admin</h3><ul class="topic-admin-links"><li>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'before' => '<h3>' . __( 'Topic Admin', 'bbporg' ) . '</h3><ul class="topic-admin-links"><li>',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'after' => '</li></ul>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sep' => '</li><li>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'links' => array()
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,18 +58,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><?php _e( 'Forums', 'bbporg'); ?></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><?php _e( 'Forums', 'bbporg' ); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php echo do_shortcode( '[bbp-forum-index]' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <hr class="hidden" />
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><?php _e( 'Views', 'bbporg'); ?></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><?php _e( 'Views', 'bbporg' ); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( bbp_get_views() as $view => $args ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li><a class="bbp-view-title" href="<?php bbp_view_url( $view ); ?>" title="<?php bbp_view_title( $view ); ?>"><?php bbp_view_title( $view ); ?></a></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li><a class="bbp-view-title" href="<?php bbp_view_url( $view ); ?>"><?php bbp_view_title( $view ); ?></a></li>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,15 +77,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><?php _e( 'Feeds', 'bbporg'); ?></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><?php _e( 'Feeds', 'bbporg' ); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li><a class="feed" href="<?php bbp_forums_url(); ?>feed/" title="All Recent Posts">All Recent Posts</a></li>
- <li><a class="feed" href="<?php bbp_topics_url(); ?>feed/" title="All Recent Topics">All Recent Topics</a></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li><a class="feed" href="<?php bbp_forums_url(); ?>feed/"><?php _e( 'All Recent Posts', 'bbporg' ); ?></a></li>
+ <li><a class="feed" href="<?php bbp_topics_url(); ?>feed/"><?php _e( 'All Recent Topics', 'bbporg' ); ?></a></li>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><?php _e( 'Tags', 'bbporg'); ?></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><?php _e( 'Tags', 'bbporg' ); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php echo do_shortcode( '[bbp-topic-tags]' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,9 +94,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( is_front_page() || is_404() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="feature">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><?php _e('bbPress Complete', 'bbporg'); ?></h3>
- <p><a href="https://www.packtpub.com/web-development/bbpress-complete" title="bbPress Complete"><img width="225" alt="" src="<?php echo get_stylesheet_directory_uri(); ?>/images/bbpress-packt.jpg"/></a></p>
- <p class="book-description">A step-by-step guide to creating, managing, and growing a community around your WordPress website.</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><?php _e( 'bbPress Complete', 'bbporg' ); ?></h3>
+ <p><a href="https://www.packtpub.com/web-development/bbpress-complete"><img width="225" alt="<?php esc_attr_e( 'bbPress Complete', 'bbporg' ); ?>" src="<?php echo get_stylesheet_directory_uri(); ?>/images/bbpress-packt.jpg"/></a></p>
+ <p class="book-description"><?php _e( 'A step-by-step guide to creating, managing, and growing a community around your WordPress website.', 'bbporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( is_page( array( 'plugins', 116247 ) ) ) : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,23 +104,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bb_base_plugin_search_form(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><?php _e( 'Legacy', 'bbporg'); ?></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><?php _e( 'Legacy', 'bbporg' ); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li><a href="<?php echo get_permalink( 116247 ); ?>" title="Legacy Plugins">Plugins for bbPress 1.1</a></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li><a href="<?php echo get_permalink( 116247 ); ?>"><?php _e( 'Plugins for bbPress 1.1', 'bbporg' ); ?></a></li>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( ( ! is_page( 'login' ) && ! is_page( 'register' ) && ! is_page( 'lost-password' ) ) || is_home() || is_singular( 'post' ) || is_archive() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><?php _e( 'Categories', 'bbporg'); ?></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><?php _e( 'Categories', 'bbporg' ); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_list_categories( array( 'title_li' => false ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><?php _e( 'Tags', 'bbporg'); ?></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><?php _e( 'Tags', 'bbporg' ); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php wp_tag_cloud(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>