From 9e653ad3700f435edc6852e4d8cfb114bcd26063 Mon Sep 17 00:00:00 2001
From: tms <tmslft@gmail.com>
Date: Sat, 9 Feb 2013 23:44:03 -0500
Subject: [PATCH] Show "You" to same-user on activity stream items
---
.../discourse/helpers/application_helpers.js.coffee | 7 ++++++-
.../discourse/templates/user/stream.js.handlebars | 2 +-
config/locales/en.yml | 1 +
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/app/assets/javascripts/discourse/helpers/application_helpers.js.coffee b/app/assets/javascripts/discourse/helpers/application_helpers.js.coffee
index 340285fcc..3fa058a0a 100644
--- a/app/assets/javascripts/discourse/helpers/application_helpers.js.coffee
+++ b/app/assets/javascripts/discourse/helpers/application_helpers.js.coffee
@@ -125,4 +125,9 @@ Handlebars.registerHelper 'date', (property, options) ->
new Handlebars.SafeString("<span class='date' title='#{fullReadable}'>#{displayDate}</span>")
-
+Handlebars.registerHelper 'personalizedName', (property, options) ->
+ name = Ember.Handlebars.get(this, property, options);
+ username = Ember.Handlebars.get(this, options.hash.usernamePath, options) if options.hash.usernamePath
+
+ return name unless username == Discourse.get('currentUser.username')
+ return Em.String.i18n('you')
diff --git a/app/assets/javascripts/discourse/templates/user/stream.js.handlebars b/app/assets/javascripts/discourse/templates/user/stream.js.handlebars
index 36deec71e..2b944292f 100644
--- a/app/assets/javascripts/discourse/templates/user/stream.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/stream.js.handlebars
@@ -5,7 +5,7 @@
<a href="/users/{{unbound username}}" class='avatar-link'><div class='avatar-wrapper'>{{avatar this imageSize="large" extraClasses="actor" avatarTemplatePath="avatar_template"}}</div></a>
<span class='time'>{{date path="created_at" leaveAgo="true"}}</span>
<a class="title" href="{{unbound postUrl}}">{{unbound title}}</a><br>
- <a class='name' href="/users/{{unbound username}}">{{unbound name}}</a>
+ <a class='name' href="/users/{{unbound username}}">{{personalizedName name usernamePath="username"}}</a>
<span class='type'>{{unbound description}}</span>
<a class="post-number" href="{{unbound postUrl}}">#{{unbound post_number}}</a>
</div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 372c3ca2e..51510682d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -435,6 +435,7 @@ en:
show_more: "show more"
links: Links
faq: "FAQ"
+ you: "You"
suggested_topics:
title: "Suggested Topics"