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

Fix for issue 5090: Changing error message wording and providing more information to user when status message is too long.

Browse source
This commit is contained in:
khall 2014-08-24 13:28:57 -07:00
parent e0c836c03d
commit a9fd16db3e
4 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -200,10 +200,10 @@ app.views.Publisher = Backbone.View.extend({
// standalone means single-shot posting (until further notice) // standalone means single-shot posting (until further notice)
if( self.standalone ) self.setEnabled(false); if( self.standalone ) self.setEnabled(false);
}, },
error: function() { error: function(model, resp, options) {
if( app.publisher ) app.publisher.trigger('publisher:error'); if( app.publisher ) app.publisher.trigger('publisher:error');
self.setInputEnabled(true); self.setInputEnabled(true);
Diaspora.page.flashMessages.render({ 'success':false, 'notice':Diaspora.I18n.t('failed_to_post_message') }); Diaspora.page.flashMessages.render({ 'success':false, 'notice':resp.responseText });
self.setButtonsEnabled(true); self.setButtonsEnabled(true);
self.setInputEnabled(true); self.setInputEnabled(true);
} }

2
app/controllers/status_messages_controller.rb
View file

@ -95,7 +95,7 @@ class StatusMessagesController < ApplicationController
respond_to do |format| respond_to do |format|
format.html { redirect_to :back } format.html { redirect_to :back }
format.mobile { redirect_to stream_path } format.mobile { redirect_to stream_path }
format.json { render :nothing => true, :status => 403 } format.json { render :text => @status_message.errors.messages[:text].join('. '), :status => 403 }
end end
end end
end end

2
app/models/status_message.rb
View file

@ -10,7 +10,7 @@ class StatusMessage < Post
acts_as_taggable_on :tags acts_as_taggable_on :tags
extract_tags_from :raw_message extract_tags_from :raw_message
validates_length_of :text, :maximum => 65535, :message => I18n.t('status_messages.too_long', :count => 65535) validates_length_of :text, :maximum => 65535, :message => proc {|p, v| I18n.t('status_messages.too_long', :count => 65535, :current_length => v[:value].length)}
# don't allow creation of empty status messages # don't allow creation of empty status messages
validate :presence_of_content, on: :create, if: proc { |sm| sm.author.local? } validate :presence_of_content, on: :create, if: proc { |sm| sm.author.local? }

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

@ -1159,10 +1159,7 @@ en:
no_message_to_display: "No message to display." no_message_to_display: "No message to display."
destroy: destroy:
failure: "Failed to delete post" failure: "Failed to delete post"
too_long: too_long: "Please make your status message fewer than %{count} characters. Right now it is %{current_length} characters"
zero: "please make your status messages less than %{count} characters"
one: "please make your status messages less than %{count} characters"
other: "please make your status messages less than %{count} characters"
stream_helper: stream_helper:
show_comments: show_comments: