diff --git a/app/controllers/conversation_visibilities_controller.rb b/app/controllers/conversation_visibilities_controller.rb index b136e38be..d48284db9 100644 --- a/app/controllers/conversation_visibilities_controller.rb +++ b/app/controllers/conversation_visibilities_controller.rb @@ -11,7 +11,7 @@ class ConversationVisibilitiesController < ApplicationController :conversation_id => params[:conversation_id]).first if @vis if @vis.destroy - flash[:notice] = "Conversation successfully removed" + flash[:notice] = I18n.t('conversations.destroy.success') end end redirect_to conversations_path diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb index 2a4008d23..d4106e123 100644 --- a/app/controllers/conversations_controller.rb +++ b/app/controllers/conversations_controller.rb @@ -32,7 +32,7 @@ class ConversationsController < ApplicationController if @conversation = Conversation.create(params[:conversation]) Postzord::Dispatch.new(current_user, @conversation).post - flash[:notice] = "Message sent" + flash[:notice] = I18n.t('conversations.create.sent') if params[:profile] redirect_to person_path(params[:profile]) else diff --git a/app/views/aspects/_aspect_listings.haml b/app/views/aspects/_aspect_listings.haml index 0ca141cbe..33d410d93 100644 --- a/app/views/aspects/_aspect_listings.haml +++ b/app/views/aspects/_aspect_listings.haml @@ -2,8 +2,6 @@ -# licensed under the Affero General Public License version 3 or later. See -# the COPYRIGHT file. -= hidden_field_tag :contact_json, @selected_contacts.map{|contact| contact.person}.to_json - %h4 .right = link_to t('contacts', :count => @contact_count), manage_aspects_path, :title => t('aspects.manage.manage_aspects') diff --git a/app/views/conversations/new.haml b/app/views/conversations/new.haml index 76e1ec122..1155a7c3d 100644 --- a/app/views/conversations/new.haml +++ b/app/views/conversations/new.haml @@ -4,7 +4,7 @@ :javascript $(document).ready(function () { - var data = $.parseJSON( $('#contact_json').val() ), + var data = $.parseJSON( '#{@all_contacts_and_ids.to_json}' ), autocompleteInput = $("#contact_autocomplete"); autocompleteInput.autoSuggest(data, { @@ -23,7 +23,6 @@ autocompleteInput.focus(); }); -= hidden_field_tag :contact_json, @all_contacts_and_ids.to_json #new_message_pane .span-12.last diff --git a/app/views/profiles/_edit_public.html.haml b/app/views/profiles/_edit_public.html.haml index 2967f4d61..53976c130 100644 --- a/app/views/profiles/_edit_public.html.haml +++ b/app/views/profiles/_edit_public.html.haml @@ -7,7 +7,7 @@ :javascript $(document).ready(function () { - var data = $.parseJSON( $('#tags_json').val() ), + var data = $.parseJSON( '#{@tags_array.to_json}' ), autocompleteInput = $("#profile_tag_string"); @@ -22,7 +22,7 @@ minChars: 2, keyDelay: 0, startText: "#{t('profiles.edit.your_tags_placeholder')}", - emptyText: '#{t('no_results')}', + emptyText: "#{t('no_results')}", preFill: data }); @@ -36,7 +36,6 @@ }); -= hidden_field_tag :tags_json, @tags_array.to_json %h3 = t('profiles.edit.your_public_profile') diff --git a/app/views/shared/_publisher.html.haml b/app/views/shared/_publisher.html.haml index 00b8e17f3..3bab72762 100644 --- a/app/views/shared/_publisher.html.haml +++ b/app/views/shared/_publisher.html.haml @@ -20,6 +20,8 @@ .content_creation = form_for(StatusMessage.new, :remote => true, :html => {"data-type" => "json"}) do |status| + - if @selected_contacts + = hidden_field_tag :contact_json, @selected_contacts.map{|contact| contact.person}.to_json = status.error_messages #file-upload = image_tag 'icons/photos.png' diff --git a/app/views/status_messages/bookmarklet.html.haml b/app/views/status_messages/bookmarklet.html.haml index 6df5ed922..e25248aa4 100644 --- a/app/views/status_messages/bookmarklet.html.haml +++ b/app/views/status_messages/bookmarklet.html.haml @@ -31,7 +31,6 @@ }); #new_status_message_pane - = hidden_field_tag :contact_json, @selected_contacts.map{|contact| contact.person}.to_json .span-15.last #facebox_header %h4 diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index a71bd0faa..cb9bf792c 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -200,6 +200,10 @@ en: few: "%{count} new messages" many: "%{count} new messages" other: "%{count} new messages" + create: + sent: "Message sent" + destroy: + success: "Conversation successfully removed" date: formats: