diff --git a/app/views/people/_profile_sidebar.html.haml b/app/views/people/_profile_sidebar.html.haml index bcefdf66895e6e4316b3fdc9f9cc97c426bc8559..d22ac25c708658453da3fab6010e9e26efc0a819 100644 --- a/app/views/people/_profile_sidebar.html.haml +++ b/app/views/people/_profile_sidebar.html.haml @@ -9,7 +9,7 @@ $(this).closest('li').fadeOut(200); }); $('.delete').bind('ajax:failure', function() { - alert("#{h(t('.cannot_remove', :name => person.name))}"); + alert("#{t('status_message.destroy.failure')}"); }); }); diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 1c5a359a71b0c2fed36fe98cfd832e50569895cd..096f1a502e172bab41df5011d7cc7a85d643bf11 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -348,6 +348,8 @@ en: permalink: "permalink" helper: no_message_to_display: "No message to display." + destroy: + failure: "Failed to delete post" people: person: pending_request: "pending request" diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml index 0c31185ca0835038302a0f6a6441146fc2f23e8d..91adf6f7a0d947018587cc4d939e00ee887b4cce 100644 --- a/config/locales/javascript/javascript.en.yml +++ b/config/locales/javascript/javascript.en.yml @@ -21,3 +21,7 @@ en: watch: "Watch this video on {{provider}}" unknown: "Unknown video type" search_for: "Search for {{name}}" + shared: + contact_list: + cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)" + diff --git a/public/javascripts/contact-list.js b/public/javascripts/contact-list.js index 315c4cd3112d6dfd4eaa1008794498fc8f12e7f7..b01c821d457fca742e918d8a1d1437ab45e6fbf4 100644 --- a/public/javascripts/contact-list.js +++ b/public/javascripts/contact-list.js @@ -46,10 +46,11 @@ $(document).ready(function() { }); $('.added').live('ajax:failure', function(data, html, xhr) { - Diaspora.widgets.alert.alert("#{t('.cannot_remove')}"); + alert(Diaspora.widgets.i18n.t('shared.contact_list.cannot_remove')); $(this).fadeTo(200,1); }); + $('.add').live('ajax:loading', function() { $(this).fadeTo(200,0.4); });