consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes i18n calls

Browse Source
This commit is contained in:
Juanjo Bazán
2016-04-04 14:43:49 +02:00
parent b62aea431c
commit 1e35169694
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/mailers/mailer.rb
View File

@@ -7,7 +7,7 @@ class Mailer < ApplicationMailer
@comment = comment @comment = comment
@commentable = comment.commentable @commentable = comment.commentable
with_user(@commentable.author) do with_user(@commentable.author) do
mail(to: @commentable.author.email, subject: t('mailers.comment.subject', commentable: t("activerecord.models.#{@commentable.class.name.downcase}", count: 1).downcase)) if @commentable.present? && @commentable.author.present? mail(to: @commentable.author.email, subject: t('mailers.comment.subject', commentable: t("activerecord.models.#{@commentable.class.name.underscore}", count: 1).downcase)) if @commentable.present? && @commentable.author.present?
end end
end end

4
config/locales/activerecord.en.yml
View File

@@ -67,6 +67,8 @@ en:
organization: organization:
name: "Name of organisation" name: "Name of organisation"
responsible_name: "Person responsible for the group" responsible_name: "Person responsible for the group"
spending_proposal:
administrator_id: "Administrator"
errors: errors:
models: models:
debate: debate:
@@ -77,5 +79,3 @@ en:
attributes: attributes:
tag_list: tag_list:
less_than_or_equal_to: "tags must be less than or equal to %{count}" less_than_or_equal_to: "tags must be less than or equal to %{count}"
spending_proposal:
administrator_id: "Administrator"

2
spec/support/common_actions.rb
View File

@@ -63,7 +63,7 @@ module CommonActions
commentable_path = commentable.is_a?(Proposal) ? proposal_path(commentable) : debate_path(commentable) commentable_path = commentable.is_a?(Proposal) ? proposal_path(commentable) : debate_path(commentable)
visit commentable_path visit commentable_path
fill_in "comment-body-#{commentable.class.name.downcase}_#{commentable.id}", with: 'Have you thought about...?' fill_in "comment-body-#{commentable.class.name.underscore}_#{commentable.id}", with: 'Have you thought about...?'
click_button 'Publish comment' click_button 'Publish comment'
expect(page).to have_content 'Have you thought about...?' expect(page).to have_content 'Have you thought about...?'