diff --git a/Changelog.md b/Changelog.md index 97074f75c..c5ae97cfe 100644 --- a/Changelog.md +++ b/Changelog.md @@ -16,6 +16,7 @@ * Allow points and dashes in the username [#8266](https://github.com/diaspora/diaspora/pull/8266) * Add support for footnotes in markdown [#8277](https://github.com/diaspora/diaspora/pull/8277) * Send `AccountMigration` if receiving message to a migrated account [#8288](https://github.com/diaspora/diaspora/pull/8288) +* Add podmin mail address to the footer [#8242](https://github.com/diaspora/diaspora/pull/8242) # 0.7.15.0 diff --git a/app/views/shared/_links.haml b/app/views/shared/_links.haml index 59725ac51..6dc53c6e2 100644 --- a/app/views/shared/_links.haml +++ b/app/views/shared/_links.haml @@ -7,3 +7,5 @@ %li= link_to t("layouts.application.switch_to_touch_optimized_mode"), toggle_mobile_path - if AppConfig.settings.terms.enable? %li= link_to t("_terms"), terms_path +- unless AppConfig.admins.podmin_email.nil? + %li= mail_to AppConfig.admins.podmin_email, t("_podmin_mail") diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index fa3aa016f..269efd87c 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -32,6 +32,7 @@ en: no_results: "No results found" _contacts: "Contacts" _terms: "Terms" + _podmin_mail: "Contact Podmin" _statistics: "Statistics" # For reference translation; the real ActiveRecord English transations are actually