From 8ee7d535ba74d099f5f0e804495cb1f64cc0cfa1 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 16 Jun 2016 15:54:19 +0200 Subject: [PATCH] generic message for max_per_day setting --- app/models/direct_message.rb | 2 +- config/locales/activerecord.en.yml | 2 +- config/locales/activerecord.es.yml | 2 +- spec/features/direct_messages_spec.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/direct_message.rb b/app/models/direct_message.rb index 14083f2c7..476194aea 100644 --- a/app/models/direct_message.rb +++ b/app/models/direct_message.rb @@ -15,7 +15,7 @@ class DirectMessage < ActiveRecord::Base max = Setting[:direct_message_max_per_day] if sender.direct_messages_sent.today.count >= max.to_i - errors.add(:title, I18n.t('activerecord.errors.models.direct_message.attributes.max_per_day.invalid', max: max)) + errors.add(:title, I18n.t('activerecord.errors.models.direct_message.attributes.max_per_day.invalid')) end end diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml index 9b48c1fc2..07791e53c 100644 --- a/config/locales/activerecord.en.yml +++ b/config/locales/activerecord.en.yml @@ -81,7 +81,7 @@ en: direct_message: attributes: max_per_day: - invalid: "You can only send a maximum of %{max} direct messages per day" + invalid: "You have reached the maximum number of private messages per day" proposal: attributes: tag_list: diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml index f14022255..d5b7f0005 100644 --- a/config/locales/activerecord.es.yml +++ b/config/locales/activerecord.es.yml @@ -81,7 +81,7 @@ es: direct_message: attributes: max_per_day: - invalid: "Sólo puedes enviar %{max} mensajes directos por día" + invalid: "Has llegado al número máximo de mensajes privados por día" proposal: attributes: tag_list: diff --git a/spec/features/direct_messages_spec.rb b/spec/features/direct_messages_spec.rb index 8ec949e9a..3c822de5c 100644 --- a/spec/features/direct_messages_spec.rb +++ b/spec/features/direct_messages_spec.rb @@ -113,7 +113,7 @@ feature 'Direct messages' do fill_in 'direct_message_body', with: "How are you doing?" click_button "Send message" - expect(page).to have_content "You can only send a maximum of 3 direct messages per day" + expect(page).to have_content "You have reached the maximum number of private messages per day" expect(page).to_not have_content "You message has been sent successfully." end