polish

app/controllers/account_controller.rb

@@ -564,7 +564,7 @@ class AccountController < ApplicationController
   def register_automatically(user, opts = {})
     if user_limit_reached?
       show_user_limit_activation_error!
-      send_activation_limit_notifcation_about user
+      send_activation_limit_notification_about user
 
       return redirect_back fallback_location: signin_path
     end

app/controllers/concerns/user_limits.rb

@@ -58,7 +58,7 @@ module Concerns::UserLimits
     end
   end
 
-  def send_activation_limit_notifcation_about(user)
+  def send_activation_limit_notification_about(user)
     User.active.admin.each do |admin|
       UserMailer.activation_limit_reached(user.mail, admin).deliver_later
     end

app/views/user_mailer/activation_limit_reached.html.erb

@@ -29,8 +29,8 @@ See doc/COPYRIGHT.rdoc for more details.
 
 <p>
     <% mail_link = "<a href=\"mailto:#{@email}\">#{@email}</a>" %>
-    <% host = Setting.protocol + "://" + Setting.host_name %>
-    <% host_link = "<a href=\"#{host}\">#{Setting.host_name}</a>" %>
+    <% host = OpenProject::Application.root_url %>
+    <% host_link = "<a href=\"#{host}\">#{Setting.app_title}</a>" %>
     <%= t("mail_user_activation_limit_reached.message", email: mail_link, host: host_link).html_safe %>
 </p>
 
@@ -38,12 +38,12 @@ See doc/COPYRIGHT.rdoc for more details.
     <span><%= t("mail_user_activation_limit_reached.steps.label") %></span>
     <ul>
         <li>
-            <%= t("mail_user_activation_limit_reached.steps.a") %>
-            <a href="<%= OpenProject::Enterprise.upgrade_url %>">here</a>
+            <% a = "<a href=\"<%= OpenProject::Enterprise.upgrade_url %>\">here</a>" %>
+            <%= t("mail_user_activation_limit_reached.steps.a", here: a).html_safe %>
         </li>
         <li>
-            <%= t("mail_user_activation_limit_reached.steps.b") %>
-            <a href="<%= users_url %>">here</a>
+            <% b = "<a href=\"<%= users_url %>\">here</a>" %>
+            <%= t("mail_user_activation_limit_reached.steps.b", here: b).html_safe %>
         </li>
     </ul>
 </p>

app/views/user_mailer/activation_limit_reached.text.erb

@@ -27,8 +27,8 @@ See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
 
-<%= t("mail_user_activation_limit_reached.message", email: @email, host: Setting.protocol + "://" + Setting.host_name) %>
+<%= t("mail_user_activation_limit_reached.message", email: @email, host: OpenProject::Application.root_url) %>
 
 <%= t("mail_user_activation_limit_reached.steps.label") %>
-  - <%= t("mail_user_activation_limit_reached.steps.a") %> (<%= OpenProject::Enterprise.upgrade_url %>)
-  - <%= t("mail_user_activation_limit_reached.steps.b") %> (<%= users_url %>)
+  - <%= t("mail_user_activation_limit_reached.steps.a", here: OpenProject::Enterprise.upgrade_url) %>
+  - <%= t("mail_user_activation_limit_reached.steps.b", here: users_url) %>

config/application.rb

@@ -166,5 +166,9 @@ module OpenProject
     config.active_job.queue_adapter = :delayed_job
 
     config.action_controller.asset_host = OpenProject::Configuration['rails_asset_host']
+
+    def self.root_url
+      Setting.protocol + "://" + Setting.host_name
+    end
   end
 end

config/locales/en.yml

@@ -1619,8 +1619,8 @@ en:
       The user cannot activate their account since the user limit has been reached.
     steps:
       label: "To allow the user to sign in you can either: "
-      a: "Upgrade your payment plan"
-      b: "Lock or delete an existing user"
+      a: "Upgrade your payment plan (%{here})"
+      b: "Lock or delete an existing user (%{here})"
 
   more_actions: "More functions"