Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-05 08:59:27 +08:00
Code Packages Activity Actions 11

UX: Display translated group name for automatic groups.

Browse source
This commit is contained in:
Guo Xiang Tan 2017-05-05 14:34:47 +08:00
parent 441e0059af
commit 2b21e5ea7e
7 changed files with 56 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/group.rb
View file

@ -114,8 +114,8 @@ class Group < ActiveRecord::Base
incoming_email.split("|").each do |email|
escaped = Rack::Utils.escape_html(email)
self.errors.add(:base, I18n.t('groups.errors.invalid_incoming_email', email: escaped))
if !Email.is_valid?(email)
self.errors.add(:base, I18n.t('groups.errors.invalid_incoming_email', email: escaped))
elsif group = Group.where.not(id: self.id).find_by_email(email)
self.errors.add(:base, I18n.t('groups.errors.email_already_used_in_group', email: escaped, group_name: Rack::Utils.escape_html(group.name)))
elsif category = Category.find_by_email(email)