Merge pull request #10241 from opf/feature/41311/improve-whitelisting-app-title

[41311] Use app title where applicable instead of OpenProject
pull/10257/head
ulferts 3 years ago committed by GitHub
commit 2dc556324e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      app/views/account/_register.html.erb
  2. 2
      app/views/user_mailer/user_signed_up.html.erb
  3. 2
      app/views/user_mailer/user_signed_up.text.erb
  4. 4
      config/locales/en.yml

@ -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"

@ -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>

@ -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,

@ -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"

Loading…
Cancel
Save