Commit d493cb8f authored by Vitaly Slobodin's avatar Vitaly Slobodin Committed by Douglas Barbosa Alexandre

Do not split customer support link sentence

parent 8a47c3bd
- current_plan = subscription_plan_info(@plans_data, @group.actual_plan_name)
- page_title "Billing"
- current_plan = subscription_plan_info(@plans_data, @group.actual_plan_name)
- support_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: EE::CUSTOMER_SUPPORT_URL }
- support_link_end = '</a>'.html_safe
- if @top_most_group
- top_most_group_plan = subscription_plan_info(@plans_data, @top_most_group.actual_plan_name)
......@@ -11,6 +13,4 @@
- if @group.actual_plan
.center
- support_link = link_to s_("BillingPlans|Contact Support"), EE::CUSTOMER_SUPPORT_URL
= s_("BillingPlans|If you would like to downgrade your plan please %{support_link}.").html_safe % { support_link: support_link }
= s_('BillingPlans|If you would like to downgrade your plan please contact %{support_link_start}Customer Support%{support_link_end}.').html_safe % { support_link_start: support_link_start, support_link_end: support_link_end }
- current_plan = subscription_plan_info(plans_data, namespace.actual_plan_name)
- support_link = link_to s_("BillingPlans|Contact Support"), EE::CUSTOMER_SUPPORT_URL
- current_plan = subscription_plan_info(plans_data, namespace.actual_plan_name)
- support_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: EE::CUSTOMER_SUPPORT_URL }
- support_link_end = '</a>'.html_safe
- if current_plan
= render 'shared/billings/billing_plan_header', namespace: namespace, plan: current_plan
- if namespace.upgradable?
.gl-p-4.center
= link_to s_("BillingPlan|Upgrade plan"), plan_upgrade_url(namespace, current_plan), class: "btn btn-success"
= link_to s_('BillingPlan|Upgrade plan'), plan_upgrade_url(namespace, current_plan), class: 'btn btn-success'
- else
.billing-plans
......@@ -15,4 +16,4 @@
- if namespace.actual_plan
.center
= s_("BillingPlans|If you would like to downgrade your plan please %{support_link}.").html_safe % { support_link: support_link }
= s_('BillingPlans|If you would like to downgrade your plan please contact %{support_link_start}Customer Support%{support_link_end}.').html_safe % { support_link_start: support_link_start, support_link_end: support_link_end }
......@@ -100,7 +100,7 @@ describe 'Billing plan pages', :feature do
page.within('.content') do
expect(page).to have_link('Upgrade plan', href: external_upgrade_url(namespace, bronze_plan))
expect(page).to have_content('downgrade your plan')
expect(page).to have_link('Contact Support', href: EE::CUSTOMER_SUPPORT_URL)
expect(page).to have_link('contact support', href: EE::CUSTOMER_SUPPORT_URL)
end
end
end
......@@ -126,7 +126,7 @@ describe 'Billing plan pages', :feature do
page.within('.content') do
expect(page).not_to have_link('Upgrade plan')
expect(page).to have_content('downgrade your plan')
expect(page).to have_link('Contact Support', href: EE::CUSTOMER_SUPPORT_URL)
expect(page).to have_link('contact support', href: EE::CUSTOMER_SUPPORT_URL)
end
end
end
......
......@@ -2224,16 +2224,13 @@ msgstr ""
msgid "BillingPlans|%{group_name} is currently using the %{plan_link} plan."
msgstr ""
msgid "BillingPlans|Contact Support"
msgstr ""
msgid "BillingPlans|Current plan"
msgstr ""
msgid "BillingPlans|Downgrade"
msgstr ""
msgid "BillingPlans|If you would like to downgrade your plan please %{support_link}."
msgid "BillingPlans|If you would like to downgrade your plan please contact %{support_link_start}Customer Support%{support_link_end}."
msgstr ""
msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}, or start a free 30-day trial of GitLab.com Gold."
......
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