=html_escape(s_("BillingPlans|Learn more about each plan by reading our %{faq_link}, or start a free 30-day trial of GitLab.com Gold."))%{faq_link: faq_link.html_safe}
=html_escape(s_("BillingPlans|Learn more about each plan by reading our %{faq_link}, or start a free 30-day trial of GitLab.com Ultimate."))%{faq_link: faq_link.html_safe}
-elsifnamespace.trial_active?
-elsifnamespace.trial_active?
=html_escape(s_("BillingPlans|Your GitLab.com %{plan} trial will %{strong_open}expire after %{expiration_date}%{strong_close}. You can retain access to the %{plan} features by upgrading below."))%{plan: namespace.gitlab_subscription&.plan_title,expiration_date: namespace.trial_ends_on,strong_open: '<strong>'.html_safe,strong_close: '</strong>'.html_safe}
=html_escape(s_("BillingPlans|Your GitLab.com %{plan} trial will %{strong_open}expire after %{expiration_date}%{strong_close}. You can retain access to the %{plan} features by upgrading below."))%{plan: namespace.gitlab_subscription&.plan_title,expiration_date: namespace.trial_ends_on,strong_open: '<strong>'.html_safe,strong_close: '</strong>'.html_safe}
=_('Your Gitlab Gold trial will last 30 days after which point you can keep your free Gitlab account forever. We just need some additional information to activate your trial.')
=_('Your Gitlab Ultimate trial will last 30 days after which point you can keep your free Gitlab account forever. We just need some additional information to activate your trial.')
exports[`EE billings subscription module mutations RECEIVE_SUBSCRIPTION_SUCCESS with Gold subscription it updates table default with subscription plan 1`] = `
exports[`EE billings subscription module mutations RECEIVE_SUBSCRIPTION_SUCCESS with Ultimate subscription it updates table default with subscription plan 1`] = `
Array [
Array [
Object {
Object {
"maxSeatsUsed": 104,
"maxSeatsUsed": 104,
...
@@ -26,7 +26,7 @@ Array [
...
@@ -26,7 +26,7 @@ Array [
]
]
`;
`;
exports[`EE billings subscription module mutations RECEIVE_SUBSCRIPTION_SUCCESS with Gold trial it updates table trial with subscription plan 1`] = `
exports[`EE billings subscription module mutations RECEIVE_SUBSCRIPTION_SUCCESS with Ultimate trial it updates table trial with subscription plan 1`] = `
@@ -25,13 +25,13 @@ RSpec.describe 'shared/billings/_trial_status.html.haml' do
...
@@ -25,13 +25,13 @@ RSpec.describe 'shared/billings/_trial_status.html.haml' do
let(:trial_ends_on){Date.tomorrow}
let(:trial_ends_on){Date.tomorrow}
let(:trial){true}
let(:trial){true}
context'with a gold trial'do
context'with a ultimate trial'do
let(:plan){create(:gold_plan,title: 'Gold')}
let(:plan){create(:gold_plan,title: 'Ultimate')}
it'displays expiry date and Gold'do
it'displays expiry date and Ultimate'do
render'shared/billings/trial_status',namespace: group
render'shared/billings/trial_status',namespace: group
expect(rendered).tohave_content("Your GitLab.com Gold trial will expire after #{trial_ends_on}. You can retain access to the Gold features by upgrading below.")
expect(rendered).tohave_content("Your GitLab.com Ultimate trial will expire after #{trial_ends_on}. You can retain access to the Ultimate features by upgrading below.")
end
end
end
end
...
@@ -65,7 +65,7 @@ RSpec.describe 'shared/billings/_trial_status.html.haml' do
...
@@ -65,7 +65,7 @@ RSpec.describe 'shared/billings/_trial_status.html.haml' do
it'offers a trial'do
it'offers a trial'do
render'shared/billings/trial_status',namespace: group
render'shared/billings/trial_status',namespace: group
expect(rendered).tohave_content("start a free 30-day trial of GitLab.com Gold")
expect(rendered).tohave_content("start a free 30-day trial of GitLab.com Ultimate")
msgid "Trials|Create a new group to start your GitLab Gold trial."
msgid "Trials|Create a new group to start your GitLab Ultimate trial."
msgstr ""
msgstr ""
msgid "Trials|Go back to GitLab"
msgid "Trials|Go back to GitLab"
...
@@ -30089,7 +30089,7 @@ msgstr ""
...
@@ -30089,7 +30089,7 @@ msgstr ""
msgid "Trials|Skip Trial (Continue with Free Account)"
msgid "Trials|Skip Trial (Continue with Free Account)"
msgstr ""
msgstr ""
msgid "Trials|You can always resume this process by selecting your avatar and choosing 'Start a Gold trial'"
msgid "Trials|You can always resume this process by selecting your avatar and choosing 'Start an Ultimate trial'"
msgstr ""
msgstr ""
msgid "Trials|You can apply your trial to a new group or an existing group."
msgid "Trials|You can apply your trial to a new group or an existing group."
...
@@ -30116,7 +30116,7 @@ msgstr ""
...
@@ -30116,7 +30116,7 @@ msgstr ""
msgid "Trial|Dismiss"
msgid "Trial|Dismiss"
msgstr ""
msgstr ""
msgid "Trial|GitLab Gold trial (optional)"
msgid "Trial|GitLab Ultimate trial (optional)"
msgstr ""
msgstr ""
msgid "Trial|How many employees will use Gitlab?"
msgid "Trial|How many employees will use Gitlab?"
...
@@ -30131,7 +30131,7 @@ msgstr ""
...
@@ -30131,7 +30131,7 @@ msgstr ""
msgid "Trial|Telephone number"
msgid "Trial|Telephone number"
msgstr ""
msgstr ""
msgid "Trial|Upgrade to Gold to keep using GitLab with advanced features."
msgid "Trial|Upgrade to Ultimate to keep using GitLab with advanced features."
msgstr ""
msgstr ""
msgid "Trial|We will activate your trial on your group after you complete this step. After 30 days, you can:"
msgid "Trial|We will activate your trial on your group after you complete this step. After 30 days, you can:"
...
@@ -32900,7 +32900,7 @@ msgstr ""
...
@@ -32900,7 +32900,7 @@ msgstr ""
msgid "Your GitLab group"
msgid "Your GitLab group"
msgstr ""
msgstr ""
msgid "Your Gitlab Gold trial will last 30 days after which point you can keep your free Gitlab account forever. We just need some additional information to activate your trial."
msgid "Your Gitlab Ultimate trial will last 30 days after which point you can keep your free Gitlab account forever. We just need some additional information to activate your trial."