Merge branch 'master' of git://github.com/diaspora/diaspora

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

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

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')

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

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')
 

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'

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

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: