Merge pull request #2775 from Automattic/fix/tag-display-name-consist…

…ency Reader: use tag.display_name to display tag names
Automattic · Jan 26, 2016 · 40ea0bb · 40ea0bb
2 parents 4770e3f + 3faa58e
commit 40ea0bb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/client/reader/post-byline/index.jsx b/client/reader/post-byline/index.jsx
@@ -32,7 +32,7 @@ var PostByline = React.createClass( {
 
 	renderAuthorName: function() {
 		const post = this.props.post,
-			gravatar = ( <Gravatar user={post.author} size={ 24 } /> ),
+			gravatar = ( <Gravatar user={ post.author } size={ 24 } /> ),
 			authorName = ( <span className="byline__author-name">{ post.author.name }</span> );
 
 		if ( ! post.author.URL ) {
@@ -73,11 +73,11 @@ var PostByline = React.createClass( {
 					<a className="reader-post-byline__date-link"
 						onClick={ this.recordDateClick }
 						href={ post.URL }
-						target="_blank"><PostTime date={ post.date } />{ this.props.icon ? <Gridicon icon="external" size={ 14 } /> : null }</a>
+						target="_blank"><PostTime date={ post.date } />{ this.props.icon ? <Gridicon icon="external" nonStandardSize size={ 14 } /> : null }</a>
 				</li> : null }
 			{ primaryTag ?
 				<li className="reader-post-byline__tag">
-					<a href={ '/tag/' + primaryTag.slug } className="ignore-click" onClick={ this.recordTagClick }><Gridicon icon="tag" size={ 16 } /> { primaryTag.name }</a>
+					<a href={ '/tag/' + primaryTag.slug } className="ignore-click" onClick={ this.recordTagClick }><Gridicon icon="tag" nonStandardSize size={ 16 } /> { primaryTag.display_name }</a>
 				</li> : null }
 			</ul>
 		);

diff --git a/client/reader/sidebar/sidebar.jsx b/client/reader/sidebar/sidebar.jsx
@@ -233,7 +233,7 @@ module.exports = React.createClass( {
 			return (
 				<li className={ this.itemLinkClass( '/tag/' + tag.slug, { 'sidebar-dynamic-menu__tag': true } ) } key={ tag.ID } >
 					<a href={ tag.URL }>
-						{ tag.title || tag.slug }
+						{ tag.display_name || tag.slug }
 					</a>
 					{ tag.ID !== 'pending' ? <button className="sidebar-dynamic-menu__action" data-tag-slug={ tag.slug } onClick={ this.unfollowTag }>
 						<Gridicon icon="cross" size={ 24 } />

diff --git a/client/reader/tag-stream/index.jsx b/client/reader/tag-stream/index.jsx
@@ -50,7 +50,7 @@ var FeedStream = React.createClass( {
 			return this.translate( 'Loading Tag' );
 		}
 
-		return tag.title || tag.slug;
+		return tag.display_name || tag.slug;
 	},
 
 	isSubscribed: function() {