Unverified Commit 3d83fbdb authored by flaburgan's avatar flaburgan Committed by Benjamin Neff
Browse files

Link to the pod in the emails footer 

closes #7814
parent 10841b60

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
* Add unique index to poll participations on `poll_id` and `author_id` [#7798](https://github.com/diaspora/diaspora/pull/7798)

* Add 'completed at' date to account migrations [#7805](https://github.com/diaspora/diaspora/pull/7805)

* Handle duplicates for TagFollowing on account merging [#7807](https://github.com/diaspora/diaspora/pull/7807)

* Add link to the pod in the email footer [#7814](https://github.com/diaspora/diaspora/pull/7814)



## Bug fixes

* Fix compatibility with newer glibc versions [#7828](https://github.com/diaspora/diaspora/pull/7828)

app/views/layouts/notifier.html.haml

+1 −1
Original line number Diff line number Diff line
@@ -10,6 +10,6 @@ 
      != yield



%div{style: "font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; color: #999; padding-top: 10px; margin-top: 10px; border-top: 1px solid #ddd"}

  != t("notifier.email_sent_by_diaspora", pod_name: pod_name)

  != t("notifier.email_sent_by_diaspora", pod_name: link_to(pod_name, AppConfig.pod_uri.site))

  != link_to t("notifier.click_here"), edit_user_url

  != t("notifier.to_change_your_notification_settings") + "."

app/views/layouts/notifier.text.haml

+2 −2
Original line number Diff line number Diff line 
!= yield

!= t('notifier.email_sent_by_diaspora', :pod_name => pod_name) 

!= t('notifier.to_change_your_notification_settings')

!= t("notifier.email_sent_by_diaspora", pod_name: pod_name)

!= t("notifier.to_change_your_notification_settings")

!= edit_user_url