nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3603 from movilla/translation_ignore_user_popup

Browse source 
traslation popup ignore user => /stream
This commit is contained in:
Jonne Haß 2012-09-22 13:47:34 -07:00
commit 0a1be1400d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/views/stream_post_views.js
View file

@ -61,7 +61,7 @@ app.views.StreamPost = app.views.Post.extend({
blockUser: function(evt){ blockUser: function(evt){
if(evt) { evt.preventDefault(); } if(evt) { evt.preventDefault(); }
if(!confirm("Ignore this user?")) { return } if(!confirm(Diaspora.I18n.t('ignore_user'))) { return }
var personId = this.model.get("author").id; var personId = this.model.get("author").id;
var block = new app.models.Block(); var block = new app.models.Block();
@ -107,4 +107,4 @@ app.views.StreamPost = app.views.Post.extend({
return this; return this;
} }
}) })

1
config/locales/javascript/javascript.en.yml
View file

@ -8,6 +8,7 @@ en:
confirm_dialog: "Are you sure?" confirm_dialog: "Are you sure?"
delete: "Delete" delete: "Delete"
ignore: "Ignore" ignore: "Ignore"
ignore_user: "Ignore this user?"
timeago: timeago:
prefixAgo: "" prefixAgo: ""
prefixFromNow: "" prefixFromNow: ""