From 5683de8090d91ae9cb8f602a6dec90dfb8dc4668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <mail@oliverguenther.de>
Date: Tue, 1 Mar 2022 13:45:04 +0100
Subject: [PATCH] [41311] Use app title where applicable instead of OpenProject

https://community.openproject.org/wp/41311
---
 app/views/account/_register.html.erb          | 2 +-
 app/views/user_mailer/user_signed_up.html.erb | 2 +-
 app/views/user_mailer/user_signed_up.text.erb | 2 +-
 config/locales/en.yml                         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/account/_register.html.erb b/app/views/account/_register.html.erb
index 3272d22294..6f4580d763 100644
--- a/app/views/account/_register.html.erb
+++ b/app/views/account/_register.html.erb
@@ -36,7 +36,7 @@ See COPYRIGHT and LICENSE files for more details.
     <div class="op-modal--header">
       <%= op_icon 'icon-context icon-user' %>
       <h1 class="op-modal--title">
-        <%= I18n.t('onboarding.welcome') %>
+        <%= I18n.t('onboarding.welcome', app_title: Setting.app_title) %>
       </h1>
       <button
         type="button"
diff --git a/app/views/user_mailer/user_signed_up.html.erb b/app/views/user_mailer/user_signed_up.html.erb
index e27079520f..011ed9c37a 100644
--- a/app/views/user_mailer/user_signed_up.html.erb
+++ b/app/views/user_mailer/user_signed_up.html.erb
@@ -31,7 +31,7 @@ See COPYRIGHT and LICENSE files for more details.
 
 <p><%= t(:mail_body_register_user, name: @user.name) %>
    <br />
-   <%= t(:mail_body_register) %>
+   <%= t(:mail_body_register, app_title: Setting.app_title) %>
    <br />
    <%= link_to @activation_url, @activation_url %>
 </p>
diff --git a/app/views/user_mailer/user_signed_up.text.erb b/app/views/user_mailer/user_signed_up.text.erb
index ac35f79a66..f9cb8c4835 100644
--- a/app/views/user_mailer/user_signed_up.text.erb
+++ b/app/views/user_mailer/user_signed_up.text.erb
@@ -28,7 +28,7 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 <%= t(:mail_body_register_user, name: @user.name) %>
 
-<%= t(:mail_body_register) %>
+<%= t(:mail_body_register, app_title: Setting.app_title) %>
 <%= @activation_url %>
 
 <%= strip_tags t(:mail_body_register_links_html,
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a63917aebe..49f04219c7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2062,7 +2062,7 @@ en:
   mail_body_backup_waiting_period: The new token will be enabled in %{hours} hours.
   mail_body_backup_token_warning: If this wasn't you, login to OpenProject immediately and reset it again.
   mail_body_lost_password: "To change your password, click on the following link:"
-  mail_body_register: "Welcome to OpenProject. Please activate your account by clicking on this link:"
+  mail_body_register: "Welcome to %{app_title}. Please activate your account by clicking on this link:"
   mail_body_register_header_title: "Project member invitation email"
   mail_body_register_user: "Dear %{name}, "
   mail_body_register_links_html: |
@@ -2217,7 +2217,7 @@ en:
     heading_getting_started: "Get an overview"
     text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject."
     text_show_again: "You can restart this video from the help menu"
-    welcome: "Welcome to OpenProject"
+    welcome: "Welcome to %{app_title}"
     select_language: "Please select your language"
 
   permission_add_work_package_notes: "Add notes"