Commit 7ccef053de944aef49b3d43cf4390e2287819ef7
Exists in
theme-brasil-digital-from-staging
and in
9 other branches
Merge branch 'stable' of gitlab.com:participa/noosfero into stable
Showing
3 changed files
with
4 additions
and
3 deletions
Show diff stats
app/models/person_notifier.rb
@@ -85,7 +85,7 @@ class PersonNotifier | @@ -85,7 +85,7 @@ class PersonNotifier | ||
85 | def content_summary(person, notifications, tasks) | 85 | def content_summary(person, notifications, tasks) |
86 | if person.environment | 86 | if person.environment |
87 | ActionMailer::Base.asset_host = person.environment.top_url | 87 | ActionMailer::Base.asset_host = person.environment.top_url |
88 | - ActionMailer::Base.default_url_options[:host] = person.environment.top_url.gsub(/^(https?:)?/, '') | 88 | + ActionMailer::Base.default_url_options[:host] = person.environment.default_hostname |
89 | end | 89 | end |
90 | 90 | ||
91 | @current_theme = 'default' | 91 | @current_theme = 'default' |
@@ -99,7 +99,7 @@ class PersonNotifier | @@ -99,7 +99,7 @@ class PersonNotifier | ||
99 | content_type: "text/html", | 99 | content_type: "text/html", |
100 | from: "#{@profile.environment.name} <#{@profile.environment.noreply_email}>", | 100 | from: "#{@profile.environment.name} <#{@profile.environment.noreply_email}>", |
101 | to: @profile.email, | 101 | to: @profile.email, |
102 | - subject: _("[%s] Network Activity") % [@profile.environment.name] | 102 | + subject: _("[%s] Notifications") % [@profile.environment.name] |
103 | ) | 103 | ) |
104 | end | 104 | end |
105 | end | 105 | end |
script/updatepo/data/pt.upo
@@ -87,3 +87,4 @@ msgid "Hidden &mdash; this group will be visible only by members"# msgstr "Ocult | @@ -87,3 +87,4 @@ msgid "Hidden &mdash; this group will be visible only by members"# msgstr "Ocult | ||
87 | msgid "%s's Notifications"# msgstr "Notificações de %s" | 87 | msgid "%s's Notifications"# msgstr "Notificações de %s" |
88 | msgid "Network Activity"# msgstr "Atividade da Rede" | 88 | msgid "Network Activity"# msgstr "Atividade da Rede" |
89 | msgid "Tasks"# msgstr "Tarefas" | 89 | msgid "Tasks"# msgstr "Tarefas" |
90 | +msgid "[%s] Notifications"# msgstr "[%s] Notificações" |
test/unit/person_notifier_test.rb
@@ -243,7 +243,7 @@ class PersonNotifierTest < ActiveSupport::TestCase | @@ -243,7 +243,7 @@ class PersonNotifierTest < ActiveSupport::TestCase | ||
243 | notify | 243 | notify |
244 | sent = ActionMailer::Base.deliveries.last | 244 | sent = ActionMailer::Base.deliveries.last |
245 | assert_match /src="\/\/www.gravatar.com\/avatar.*"/, sent.body.to_s | 245 | assert_match /src="\/\/www.gravatar.com\/avatar.*"/, sent.body.to_s |
246 | - assert_match /src="http:\/\/colivre.net\/images\/icons-app\/community-icon.png.*"/, sent.body.to_s | 246 | + assert_match /src="http:\/\/localhost\/images\/icons-app\/community-icon.png.*"/, sent.body.to_s |
247 | end | 247 | end |
248 | 248 | ||
249 | should 'list tasks in notification mail' do | 249 | should 'list tasks in notification mail' do |