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

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

Browse source
This commit is contained in:
Jordi Mallach 2011-03-30 18:18:45 +02:00
commit a3b2c60c3b
8 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/conversation_visibilities_controller.rb
View file

@ -11,7 +11,7 @@ class ConversationVisibilitiesController < ApplicationController
:conversation_id => params[:conversation_id]).first :conversation_id => params[:conversation_id]).first
if @vis if @vis
if @vis.destroy if @vis.destroy
flash[:notice] = "Conversation successfully removed" flash[:notice] = I18n.t('conversations.destroy.success')
end end
end end
redirect_to conversations_path redirect_to conversations_path

2
app/controllers/conversations_controller.rb
View file

@ -32,7 +32,7 @@ class ConversationsController < ApplicationController
if @conversation = Conversation.create(params[:conversation]) if @conversation = Conversation.create(params[:conversation])
Postzord::Dispatch.new(current_user, @conversation).post Postzord::Dispatch.new(current_user, @conversation).post
flash[:notice] = "Message sent" flash[:notice] = I18n.t('conversations.create.sent')
if params[:profile] if params[:profile]
redirect_to person_path(params[:profile]) redirect_to person_path(params[:profile])
else else

2
app/views/aspects/_aspect_listings.haml
View file

@ -2,8 +2,6 @@
-# licensed under the Affero General Public License version 3 or later. See -# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
= hidden_field_tag :contact_json, @selected_contacts.map{|contact| contact.person}.to_json
%h4 %h4
.right .right
= link_to t('contacts', :count => @contact_count), manage_aspects_path, :title => t('aspects.manage.manage_aspects') = link_to t('contacts', :count => @contact_count), manage_aspects_path, :title => t('aspects.manage.manage_aspects')

3
app/views/conversations/new.haml
View file

@ -4,7 +4,7 @@
:javascript :javascript
$(document).ready(function () { $(document).ready(function () {
var data = $.parseJSON( $('#contact_json').val() ), var data = $.parseJSON( '#{@all_contacts_and_ids.to_json}' ),
autocompleteInput = $("#contact_autocomplete"); autocompleteInput = $("#contact_autocomplete");
autocompleteInput.autoSuggest(data, { autocompleteInput.autoSuggest(data, {
@ -23,7 +23,6 @@
autocompleteInput.focus(); autocompleteInput.focus();
}); });
= hidden_field_tag :contact_json, @all_contacts_and_ids.to_json
#new_message_pane #new_message_pane
.span-12.last .span-12.last

5
app/views/profiles/_edit_public.html.haml
View file

@ -7,7 +7,7 @@
:javascript :javascript
$(document).ready(function () { $(document).ready(function () {
var data = $.parseJSON( $('#tags_json').val() ), var data = $.parseJSON( '#{@tags_array.to_json}' ),
autocompleteInput = $("#profile_tag_string"); autocompleteInput = $("#profile_tag_string");
@ -22,7 +22,7 @@
minChars: 2, minChars: 2,
keyDelay: 0, keyDelay: 0,
startText: "#{t('profiles.edit.your_tags_placeholder')}", startText: "#{t('profiles.edit.your_tags_placeholder')}",
emptyText: '#{t('no_results')}', emptyText: "#{t('no_results')}",
preFill: data preFill: data
}); });
@ -36,7 +36,6 @@
}); });
= hidden_field_tag :tags_json, @tags_array.to_json
%h3 %h3
= t('profiles.edit.your_public_profile') = t('profiles.edit.your_public_profile')

2
app/views/shared/_publisher.html.haml
View file

@ -20,6 +20,8 @@
.content_creation .content_creation
= form_for(StatusMessage.new, :remote => true, :html => {"data-type" => "json"}) do |status| = 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 = status.error_messages
#file-upload #file-upload
= image_tag 'icons/photos.png' = image_tag 'icons/photos.png'

1
app/views/status_messages/bookmarklet.html.haml
View file

@ -31,7 +31,6 @@
}); });
#new_status_message_pane #new_status_message_pane
= hidden_field_tag :contact_json, @selected_contacts.map{|contact| contact.person}.to_json
.span-15.last .span-15.last
#facebox_header #facebox_header
%h4 %h4

4
config/locales/diaspora/en.yml
View file

@ -200,6 +200,10 @@ en:
few: "%{count} new messages" few: "%{count} new messages"
many: "%{count} new messages" many: "%{count} new messages"
other: "%{count} new messages" other: "%{count} new messages"
create:
sent: "Message sent"
destroy:
success: "Conversation successfully removed"
date: date:
formats: formats: