diff options
| author | cmrd Senya <35317-cmrd-senya@users.noreply.gitlab.gnome.org> | 2022-07-17 13:06:53 +0300 |
|---|---|---|
| committer | cmrd Senya <35317-cmrd-senya@users.noreply.gitlab.gnome.org> | 2022-07-17 13:07:09 +0300 |
| commit | 3c3b988603feb43a47aafbdb68f6a68643b8ba1d (patch) | |
| tree | d3598650ec862db7ea3f2236f6b18f776cc4d9c0 /config | |
| parent | 551841e0ad4dcb4fcc174aeeb02dd4c1455fdab6 (diff) | |
| parent | d0af34c0790e13eef187813d12f35ffe6f11b373 (diff) | |
Merge branch 'develop' into use-yarn-for-assets
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 60048ae5d..f79db200e 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -741,7 +741,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 >" @@ -766,7 +766,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:" |