diff options
| author | Benjamin Neff <benjamin@coding4coffee.ch> | 2022-07-11 05:24:01 +0300 |
|---|---|---|
| committer | Benjamin Neff <benjamin@coding4coffee.ch> | 2022-07-16 05:22:51 +0300 |
| commit | a9ae84f3a6b269247c68c172548b186bb643bf60 (patch) | |
| tree | 086d0a3196f01eb1fb5ea50ffd6fe7d5737dc91b /config | |
| parent | 6cea355636b7fd8a4d1570807f77762eaccb23e0 (diff) | |
Remove markerb dependency
markerb is dead and isn't compatible with rails 6 anymore. Removing it
means adding separate templates for text and html, this sadly means some
code duplication, but also luckily the templates aren't that
complicated, so the duplication is also very minimal.
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/markerb.rb | 3 | ||||
| -rw-r--r-- | config/locales/diaspora/en.yml | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/config/initializers/markerb.rb b/config/initializers/markerb.rb deleted file mode 100644 index a39d0cbee..000000000 --- a/config/initializers/markerb.rb +++ /dev/null @@ -1,3 +0,0 @@ -# frozen_string_literal: true - -Rails.application.config.markerb.renderer = Diaspora::Markdownify::Email diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index c9ffd03b3..9d36edbf3 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -724,7 +724,7 @@ en: started_sharing: subject: "%{name} started sharing with you on diaspora*" sharing: "has started sharing with you!" - view_profile: "View %{name}’s profile" + view_profile: "View %{name}’s profile >" comment_on_post: limited_subject: "There's a new comment on one of your posts" reply: "Reply or view %{name}’s post >" @@ -749,7 +749,7 @@ en: contacts_birthday: subject: "%{name} has their birthday today" birthday: "%{name} has their birthday today. Wish them 'Happy Birthday'!" - view_profile: "View %{name}’s profile" + view_profile: "View %{name}’s profile >" confirm_email: subject: "Please activate your new email address %{unconfirmed_email}" click_link: "To activate your new email address %{unconfirmed_email}, please follow this link:" |