Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Use Primer to render links in #link_translate

Jan Sandbrink3b775335a004
diff --git a/app/views/user_mailer/activation_limit_reached.html.erb b/app/views/user_mailer/activation_limit_reached.html.erb
index 7fbd1f3c589..e506f0f5847 100644
--- a/app/views/user_mailer/activation_limit_reached.html.erb
+++ b/app/views/user_mailer/activation_limit_reached.html.erb
@@ -38,10 +38,10 @@ See COPYRIGHT and LICENSE files for more details.
<span><%= t("mail_user_activation_limit_reached.steps.label") %></span>
<ul>
<li>
- <%= link_translate("mail_user_activation_limit_reached.steps.a", links: { upgrade_url: OpenProject::Enterprise.upgrade_url }).html_safe %>
+ <%= link_translate("mail_user_activation_limit_reached.steps.a", links: { upgrade_url: OpenProject::Enterprise.upgrade_url }) %>
</li>
<li>
- <%= link_translate("mail_user_activation_limit_reached.steps.b", links: { users_url: users_url }).html_safe %>
+ <%= link_translate("mail_user_activation_limit_reached.steps.b", links: { users_url: users_url }) %>
</li>
</ul>
</p>
diff --git a/lib_static/redmine/i18n.rb b/lib_static/redmine/i18n.rb
index de535cf528f..f9c1d5ab734 100644
--- a/lib_static/redmine/i18n.rb
+++ b/lib_static/redmine/i18n.rb
@@ -117,7 +117,7 @@ module Redmine
result = translation.scan(link_regex).inject(translation) do |t, matches|
link, text, key = matches
href = String(links[key.to_sym])
- link_tag = content_tag(:a, text, href:, target:)
+ link_tag = render(Primer::Beta::Link.new(href:, target:)) { text }
t.sub(link, link_tag)
end
diff --git a/spec/lib/redmine/i18n_spec.rb b/spec/lib/redmine/i18n_spec.rb
index 7ac5b709218..9713399fb89 100644
--- a/spec/lib/redmine/i18n_spec.rb
+++ b/spec/lib/redmine/i18n_spec.rb
@@ -202,8 +202,8 @@ module OpenProject
translated = link_translate :translation_with_a_link, links: urls
expect(translated).to eq(
- "There is a <a href=\"http://openproject.com/foobar\">link</a> in this translation!" +
- " Maybe even <a href=\"/baz\">two</a>?"
+ 'There is a <a href="http://openproject.com/foobar" data-view-component="true" class="Link">link</a> in this' +
+ ' translation! Maybe even <a href="/baz" data-view-component="true" class="Link">two</a>?'
)
end
@@ -214,9 +214,10 @@ module OpenProject
translated = link_translate(:translation_with_a_link, links: urls, locale:)
expect(translated).to eq(
- "There is a <a href=\"http://openproject.com/foobar\">link</a> in this translation!" +
- " Maybe even <a href=\"/baz\">two</a>?"
+ 'There is a <a href="http://openproject.com/foobar" data-view-component="true" class="Link">link</a> in this' +
+ ' translation! Maybe even <a href="/baz" data-view-component="true" class="Link">two</a>?'
)
+ expect(I18n).to have_received(:t).with(anything, locale:)
end
end
end