<!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>[4206] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums: Forums Theme: Show Slack username and/or WordPress.org username (linked to profiles.wordpress.org) in user profiles.</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/4206">4206</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/4206","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-10-10 19:46:37 +0000 (Mon, 10 Oct 2016)</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'>Forums Theme: Show Slack username and/or WordPress.org username (linked to profiles.wordpress.org) in user profiles.
Also adds missing translator comments for all the placeholders in the same block.
Props SergeyBiryukov.
Fixes <a href="http://meta.trac.wordpress.org/ticket/2068">#2068</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpressuserprofilephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/user-profile.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpressuserprofilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/user-profile.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/user-profile.php 2016-10-10 18:36:21 UTC (rev 4205)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/user-profile.php 2016-10-10 19:46:37 UTC (rev 4206)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,19 +20,64 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( current_user_can( 'moderate' ) ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="bbp-user-email"><?php printf( esc_html__( 'Email: %s', 'wporg-forums' ), bbp_get_displayed_user_field( 'user_email' ) ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <p class="bbp-user-email"><?php
+ /* translators: %s: user's email address */
+ printf( esc_html__( 'Email: %s', 'wporg-forums' ), bbp_get_displayed_user_field( 'user_email' ) );
+ ?></p>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="bbp-user-wporg-profile"><?php
+ $user_nicename = bbp_get_displayed_user_field( 'user_nicename' );
+ $slack_username = wporg_support_get_slack_username();
+
+ if ( $slack_username && $slack_username != $user_nicename ) {
+ /* translators: 1: user's WordPress.org profile link, 2: user's Slack username, 3: make.wordpress.org/chat URL */
+ printf( __( '%1$s on WordPress.org, %2$s on <a href="%3$s">Slack</a>', 'wporg-forums' ),
+ wporg_support_get_wporg_profile_link(),
+ '@' . $slack_username,
+ 'https://make.wordpress.org/chat/'
+ );
+ } elseif( $slack_username ) {
+ /* translators: 1: WordPress.org and Slack username, 2: URL for information about Slack */
+ printf( __( '%1$s on WordPress.org and <a href="%2$s">Slack</a>', 'wporg-forums' ),
+ wporg_support_get_wporg_profile_link(),
+ 'https://make.wordpress.org/chat/'
+ );
+ } else {
+ /* translators: %s: user's WordPress.org profile link */
+ printf( esc_html__( '%s on WordPress.org', 'wporg-forums' ),
+ wporg_support_get_wporg_profile_link()
+ );
+ }
+ ?></p>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $custom_title = get_user_option( 'title', bbp_get_displayed_user_id() ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="bbp-user-custom-title"><?php printf( esc_html__( 'Title: %s', 'wporg-forums' ), esc_html( $custom_title ) ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="bbp-user-custom-title"><?php
+ /* translators: %s: user's custom title */
+ printf( esc_html__( 'Title: %s', 'wporg-forums' ), esc_html( $custom_title ) );
+ ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="bbp-user-forum-role"><?php printf( esc_html__( 'Forum Role: %s', 'wporg-forums' ), bbp_get_user_display_role() ); ?></p>
- <p class="bbp-user-member-since"><?php printf( esc_html__( 'Member Since: %s', 'wporg-forums' ), wporg_support_get_user_registered_date() ); ?></p>
- <p class="bbp-user-topic-count"><?php printf( esc_html__( 'Topics Started: %s', 'wporg-forums' ), bbp_get_user_topic_count_raw() ); ?></p>
- <p class="bbp-user-reply-count"><?php printf( esc_html__( 'Replies Created: %s', 'wporg-forums' ), bbp_get_user_reply_count_raw() ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="bbp-user-forum-role"><?php
+ /* translators: %s: user's forum role */
+ printf( esc_html__( 'Forum Role: %s', 'wporg-forums' ), bbp_get_user_display_role() );
+ ?></p>
+ <p class="bbp-user-member-since"><?php
+ /* translators: %s: user's registration date */
+ printf( esc_html__( 'Member Since: %s', 'wporg-forums' ), wporg_support_get_user_registered_date() );
+ ?></p>
+ <p class="bbp-user-topic-count"><?php
+ /* translators: %s: number of user's topics */
+ printf( esc_html__( 'Topics Started: %s', 'wporg-forums' ), bbp_get_user_topic_count_raw() );
+ ?></p>
+ <p class="bbp-user-reply-count"><?php
+ /* translators: %s: number of user's replies */
+ printf( esc_html__( 'Replies Created: %s', 'wporg-forums' ), bbp_get_user_reply_count_raw() );
+ ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #bbp-author-topics-started -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/functions.php 2016-10-10 18:36:21 UTC (rev 4205)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/functions.php 2016-10-10 19:46:37 UTC (rev 4206)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,7 +173,45 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // add_filter( 'bbp_pre_get_user_profile_url', 'wporg_support_profile_url' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get user's WordPress.org profile link.
+ *
+ * @param int $user_id
+ * @return string
+ */
+function wporg_support_get_wporg_profile_link( $user_id = 0 ) {
+ $user_nicename = bbp_get_user_nicename( $user_id );
+
+ return sprintf( '<a href="%s">@%s</a>',
+ esc_url( 'https://profiles.wordpress.org/' . $user_nicename ),
+ $user_nicename
+ );
+}
+
+/**
+ * Get user's Slack username.
+ *
+ * @param int $user_id
+ * @return string The user's Slack username (without '@') if user has one.
+ */
+function wporg_support_get_slack_username( $user_id = 0 ) {
+ global $wpdb;
+
+ $user_id = bbp_get_user_id( $user_id );
+ $slack_username = '';
+
+ $data = $wpdb->get_var( $wpdb->prepare( "SELECT profiledata FROM slack_users WHERE user_id = %d", $user_id ) );
+ if ( $data && ( $data = json_decode( $data, true ) ) ) {
+ $slack_username = $data['name'];
+ }
+
+ return $slack_username;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Get user's registration date.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param int $user_id
+ * @return string
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_support_get_user_registered_date( $user_id = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( bbp_get_user_id( $user_id ) );
</span></span></pre>
</div>
</div>
</body>
</html>