diff --git a/config/locales/de.yml b/config/locales/de.yml index 1d5160be..83ab1b97 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -70,7 +70,7 @@ de: group_id: Gruppe private: Privat recipient_tokens: Empfänger_innen - sent_to_all: An alle Mitglieder schicken + send_to_all: An alle Mitglieder schicken subject: Betreff order: closed_by: Abgerechnet von diff --git a/config/locales/en.yml b/config/locales/en.yml index 8cb8ca8d..ef93fe22 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -70,7 +70,7 @@ en: group_id: Group private: Private recipient_tokens: Recipients - sent_to_all: Send to all members + send_to_all: Send to all members subject: Subject order: boxfill: Fill boxes after diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 6eb89785..5b18cb95 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -70,7 +70,7 @@ fr: group_id: Cellule ou équipe private: Privé recipient_tokens: Destinataires - sent_to_all: Envoyer à tous les membres + send_to_all: Envoyer à tous les membres subject: Sujet order: closed_by: Décompté par diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 5ce39c3f..da9cfa0b 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -70,7 +70,7 @@ nl: group_id: Groep private: Privé recipient_tokens: Geadresseerden - sent_to_all: Aan alle leden sturen + send_to_all: Aan alle leden sturen subject: Onderwerp order: closed_by: Afgerekend door diff --git a/plugins/messages/app/models/message.rb b/plugins/messages/app/models/message.rb index bfe00589..e61528fd 100644 --- a/plugins/messages/app/models/message.rb +++ b/plugins/messages/app/models/message.rb @@ -6,7 +6,7 @@ class Message < ActiveRecord::Base belongs_to :reply_to_message, :class_name => "Message", :foreign_key => "reply_to" serialize :recipients_ids, Array - attr_accessor :sent_to_all, :recipient_tokens + attr_accessor :send_to_all, :recipient_tokens scope :pending, -> { where(:email_state => 0) } scope :sent, -> { where(:email_state => 1) } @@ -35,7 +35,7 @@ class Message < ActiveRecord::Base def clean_up_recipient_ids add_recipients Group.find(group_id).users unless group_id.blank? self.recipients_ids = recipients_ids.uniq.reject { |id| id.blank? } unless recipients_ids.nil? - self.recipients_ids = User.all.collect(&:id) if sent_to_all == "1" + self.recipients_ids = User.all.collect(&:id) if send_to_all == "1" end def add_recipients(users) diff --git a/plugins/messages/app/views/messages/new.haml b/plugins/messages/app/views/messages/new.haml index 40a2d67b..b50f18fd 100644 --- a/plugins/messages/app/views/messages/new.haml +++ b/plugins/messages/app/views/messages/new.haml @@ -10,7 +10,7 @@ theme: 'facebook' }); - $('#message_sent_to_all').on('change', function() { + $('#message_send_to_all').on('change', function() { if ($(this).is(':checked')) { $('#recipients').slideUp(); } else { @@ -18,7 +18,7 @@ } }); // make sure state is correct when loading - $('#recipients').toggle(!$('#message_sent_to_all').is(':checked')); + $('#recipients').toggle(!$('#message_send_to_all').is(':checked')); }); - title t('.title') @@ -30,7 +30,7 @@ %p= t('.reply_to', link: link_to(t('.message'), message_path(@message.reply_to))).html_safe - if FoodsoftConfig[:mailing_list].blank? - = f.input :sent_to_all, :as => :boolean + = f.input :send_to_all, :as => :boolean - else %b= t('.list.desc', list: mail_to(FoodsoftConfig[:mailing_list])).html_safe %br/ diff --git a/plugins/messages/config/locales/en.yml b/plugins/messages/config/locales/en.yml index d7deed05..a660e426 100644 --- a/plugins/messages/config/locales/en.yml +++ b/plugins/messages/config/locales/en.yml @@ -6,7 +6,7 @@ en: group_id: Group private: Private recipient_tokens: Recipients - sent_to_all: Send to all members + send_to_all: Send to all members subject: Subject messagegroup: description: Description