diff --git a/Changelog.md b/Changelog.md index ef7b69d16..5e24ef575 100644 --- a/Changelog.md +++ b/Changelog.md @@ -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) diff --git a/app/views/layouts/notifier.html.haml b/app/views/layouts/notifier.html.haml index 8e18a337a..74acfc8b1 100644 --- a/app/views/layouts/notifier.html.haml +++ b/app/views/layouts/notifier.html.haml @@ -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") + "." diff --git a/app/views/layouts/notifier.text.haml b/app/views/layouts/notifier.text.haml index edfbf60d0..e018e0311 100644 --- a/app/views/layouts/notifier.text.haml +++ b/app/views/layouts/notifier.text.haml @@ -1,4 +1,4 @@ != 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