From 00368aff6086f0b87faf89c5a6778907c8a59e72 Mon Sep 17 00:00:00 2001 From: Vokhmin Alexey V Date: Tue, 26 Nov 2013 22:08:30 +0400 Subject: [PATCH] #328: fixed I18n --- app/mailers/user_mailer.rb | 4 ++-- config/locales/models/activity_feed.en.yml | 2 +- config/locales/models/activity_feed.ru.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 6256b810a..6fb0844e1 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -86,7 +86,7 @@ class UserMailer < ActionMailer::Base set_locale user mail( :to => user.email, - :subject => I18n.t('notifications.subjects.new_commit', :project_name => "#{options[:project_owner]}/#{options[:project_name]}") + :subject => I18n.t('notifications.subjects.new_commit', :project_name => "#{options['project_owner']}/#{options['project_name']}") ) do |format| format.html { render 'git_delete_branch_notification', :locals => options } end @@ -96,7 +96,7 @@ class UserMailer < ActionMailer::Base set_locale user mail( :to => user.email, - :subject => I18n.t('notifications.subjects.new_commit', :project_name => "#{options[:project_owner]}/#{options[:project_name]}") + :subject => I18n.t('notifications.subjects.new_commit', :project_name => "#{options['project_owner']}/#{options['project_name']}") ) do |format| format.html { render 'git_new_push_notification', :locals => options } end diff --git a/config/locales/models/activity_feed.en.yml b/config/locales/models/activity_feed.en.yml index 3ac0dea78..662bfed3d 100644 --- a/config/locales/models/activity_feed.en.yml +++ b/config/locales/models/activity_feed.en.yml @@ -12,7 +12,7 @@ en: notifications: subjects: - new_commit: "[%{ project_name }] Update of project" + new_commit: "[%{project_name}] Update of project" new_comment_notification: New comment to your task new_commit_comment_notification: New comment to commit new_issue_notification: New task added to project diff --git a/config/locales/models/activity_feed.ru.yml b/config/locales/models/activity_feed.ru.yml index 75b2b2679..182f60a31 100644 --- a/config/locales/models/activity_feed.ru.yml +++ b/config/locales/models/activity_feed.ru.yml @@ -12,7 +12,7 @@ ru: notifications: subjects: - new_commit: "[%{ project_name }] Обновление проекта" + new_commit: "[%{project_name}] Обновление проекта" new_comment_notification: Новый комментарий к Вашей задаче new_commit_comment_notification: Новый комментарий к коммиту new_issue_notification: Новая задача добавлена к проекту