Commit c032ad6d authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'ebaque-fix-billing-header' into 'master'

Fix header on group billing page [RUN AS-IF-FOSS] [RUN ALL RSPEC]

See merge request gitlab-org/gitlab!58252
parents 57011e29 964c231a
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
%h4 %h4
- if namespace_for_user - if namespace_for_user
= s_("BillingPlans|@%{user_name} you are currently using the %{plan_name} plan.").html_safe % { user_name: current_user.username, plan_name: plan.code.titleize } = s_("BillingPlans|@%{user_name} you are currently using the %{plan_name}.").html_safe % { user_name: current_user.username, plan_name: plan.name }
- else - else
= s_("BillingPlans|%{group_name} is currently using the %{plan_name}.").html_safe % { group_name: namespace.full_name, plan_name: plan.name } = s_("BillingPlans|%{group_name} is currently using the %{plan_name}.").html_safe % { group_name: namespace.full_name, plan_name: plan.name }
......
---
title: Fix header on group billing page
merge_request: 58252
author:
type: fixed
...@@ -104,7 +104,7 @@ RSpec.describe 'Billing plan pages', :feature, :js do ...@@ -104,7 +104,7 @@ RSpec.describe 'Billing plan pages', :feature, :js do
it 'displays header' do it 'displays header' do
page.within('.billing-plan-header') do page.within('.billing-plan-header') do
expect(page).to have_content("#{user.username} you are currently using the #{plan.name.titleize} plan.") expect(page).to have_content("#{user.username} you are currently using the #{plan.name.titleize} Plan.")
expect(page).to have_css('.billing-plan-logo img') expect(page).to have_css('.billing-plan-logo img')
end end
......
...@@ -4768,7 +4768,7 @@ msgstr "" ...@@ -4768,7 +4768,7 @@ msgstr ""
msgid "BillingPlans|%{group_name} is currently using the %{plan_name}." msgid "BillingPlans|%{group_name} is currently using the %{plan_name}."
msgstr "" msgstr ""
msgid "BillingPlans|@%{user_name} you are currently using the %{plan_name} plan." msgid "BillingPlans|@%{user_name} you are currently using the %{plan_name}."
msgstr "" msgstr ""
msgid "BillingPlans|Congratulations, your free trial is activated." msgid "BillingPlans|Congratulations, your free trial is activated."
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment