Download as
Browse Code »

Commit 3b47e32ad2ff1cbd37c98dbc4ccda839d0fd2c4a

Authored by Antonio Terceiro
Committed by Joenio Costa
1 parent 553f852e
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

Make sure that invitation e-mails are translated 

(ActionItem1568)
Showing 2 changed files with 19 additions and 2 deletions   Show diff stats
app/models/environment.rb
  Diff comments   View file @3b47e32
@@ -183,8 +183,16 @@ class Environment < ActiveRecord::Base @@ -183,8 +183,16 @@ class Environment < ActiveRecord::Base
183 # See also #default_hostname 183 # See also #default_hostname
184 settings_items :force_www, :default => false 184 settings_items :force_www, :default => false
185 185
186 - settings_items :message_for_friend_invitation, :type => String, :default => InviteFriend.mail_template  
187 - settings_items :message_for_member_invitation, :type => String, :default => InviteMember.mail_template 186 + settings_items :message_for_friend_invitation, :type => String
  187 + def message_for_friend_invitation
  188 + settings[:message_for_member_invitation] || InviteFriend.mail_template
  189 + end
  190 +
  191 + settings_items :message_for_member_invitation, :type => String
  192 + def message_for_member_invitation
  193 + settings[:message_for_member_invitation] || InviteMember.mail_template
  194 + end
  195 +
188 settings_items :activation_blocked_text, :type => String 196 settings_items :activation_blocked_text, :type => String
189 settings_items :message_for_disabled_enterprise, :type => String 197 settings_items :message_for_disabled_enterprise, :type => String
190 settings_items :location, :type => String 198 settings_items :location, :type => String
test/unit/environment_test.rb
  Diff comments   View file @3b47e32
@@ -890,6 +890,15 @@ class EnvironmentTest < Test::Unit::TestCase @@ -890,6 +890,15 @@ class EnvironmentTest < Test::Unit::TestCase
890 assert_equal env.message_for_member_invitation, env.invitation_mail_template(community) 890 assert_equal env.message_for_member_invitation, env.invitation_mail_template(community)
891 end 891 end
892 892
  893 + should 'translate friend invitation message' do
  894 + InviteFriend.expects(:_).returns('').at_least_once
  895 + Environment.new.message_for_friend_invitation
  896 + end
  897 + should 'translate member invitation message' do
  898 + InviteMember.expects(:_).returns('').at_least_once
  899 + Environment.new.message_for_member_invitation
  900 + end
  901 +
893 should 'filter fields with white_list filter' do 902 should 'filter fields with white_list filter' do
894 environment = Environment.new 903 environment = Environment.new
895 environment.message_for_disabled_enterprise = "<h1> Disabled Enterprise </h1>" 904 environment.message_for_disabled_enterprise = "<h1> Disabled Enterprise </h1>"