github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 06:04:11 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix non localized said: in quotes

Browse Source
This commit is contained in:
Sam 2013-07-16 17:22:54 +10:00
parent 943f88fb88
commit ff7d9cac38
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/bbcode.js
View File

@ -254,7 +254,7 @@ Discourse.BBCode = {
// Arguments for formatting // Arguments for formatting
args = { args = {
username: username, username: I18n.t('user.said',{username: username}),
params: params, params: params,
quote: content, quote: content,
avatarImg: opts.lookupAvatar ? opts.lookupAvatar(username) : void 0 avatarImg: opts.lookupAvatar ? opts.lookupAvatar(username) : void 0

1
app/assets/javascripts/discourse/templates/quote.js.shbrs
View File

@ -3,7 +3,6 @@
<div class='quote-controls'></div> <div class='quote-controls'></div>
{{{avatarImg}}} {{{avatarImg}}}
{{username}} {{username}}
said:
</div> </div>
<blockquote>{{{quote}}}</blockquote> <blockquote>{{{quote}}}</blockquote>
</aside> </aside>

1
config/locales/client.en.yml
View File

@ -168,6 +168,7 @@ en:
"13": "Inbox" "13": "Inbox"
user: user:
said: "{{username}} said:"
profile: Profile profile: Profile
mute: Mute mute: Mute
edit: Edit Preferences edit: Edit Preferences

2
lib/assets/quote_email.js.shbrs
View File

@ -1,6 +1,6 @@
<table cellspacing="0" cellpadding="0" style="border: 1px solid #eee; -webkit-border-radius: 10px;"> <table cellspacing="0" cellpadding="0" style="border: 1px solid #eee; -webkit-border-radius: 10px;">
<tr> <tr>
<th style="text-align:left; background-color: #eee; padding: 5px">{{{avatarImg}}} {{username}} said:</th> <th style="text-align:left; background-color: #eee; padding: 5px">{{{avatarImg}}} {{username}}</th>
</tr> </tr>
<tr> <tr>
<td style="padding: 10px; background-color: #f9f9f9">{{{quote}}}</td> <td style="padding: 10px; background-color: #f9f9f9">{{{quote}}}</td>