Skip to content
代码片段 群组 项目
提交 823a9a40 编辑于 作者: Etienne Baqué's avatar Etienne Baqué 提交者: James Lopez
浏览文件

Removed more occurrences of Gold

Occurrences to be replaced with Ultimate
上级 f433772f
No related branches found
No related tags found
无相关合并请求
显示
30 个添加31 个删除
......@@ -28,7 +28,7 @@
- if current_user_menu?(:start_trial)
%li
%a.trial-link{ href: trials_link_url }
= s_("CurrentUser|Start a Gold trial")
= s_("CurrentUser|Start an Ultimate trial")
= emoji_icon('rocket')
- if current_user_menu?(:settings)
%li
......
......@@ -40,7 +40,7 @@ def create
def create_learn_gitlab_project
title, filename = if helpers.in_trial_onboarding_flow?
[s_('Learn GitLab - Gold trial'), 'learn_gitlab_gold_trial.tar.gz']
[s_('Learn GitLab - Ultimate trial'), 'learn_gitlab_gold_trial.tar.gz']
else
[s_('Learn GitLab'), 'learn_gitlab.tar.gz']
end
......
......@@ -31,7 +31,7 @@ def trial_selection_intro_text
elsif any_trial_group_namespaces?
s_('Trials|You can apply your trial to a new group or an existing group.')
else
s_('Trials|Create a new group to start your GitLab Gold trial.')
s_('Trials|Create a new group to start your GitLab Ultimate trial.')
end
end
......
- faq_link = link_to s_("BillingPlans|frequently asked questions"), "https://about.gitlab.com/gitlab-com/#faq"
- pricing_page_link = link_to s_("BillingPlans|Pricing page"), "https://about.gitlab.com/pricing"
- if namespace.eligible_for_trial?
= 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 }
- elsif namespace.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 }
- elsif namespace.trial_expired? && namespace.free_plan?
......
.row
.form-group.col-sm-12
= label_tag :trial_toggle, s_('Trial|GitLab Gold trial (optional)'), for: :trial_toggle, class: 'col-form-label'
= label_tag :trial_toggle, s_('Trial|GitLab Ultimate trial (optional)'), for: :trial_toggle, class: 'col-form-label'
%p= html_escape(('Try all GitLab features for free for 30 days.%{br_tag}No credit card required.')) % { br_tag: '<br/>'.html_safe }
.js-trial-toggle{ data: { active: params[:trial] == 'true' } }
%p.gl-text-gray-500.gl-mt-3= s_('Trial|We will activate your trial on your group after you complete this step. After 30 days, you can:')
%ul.gl-pl-5
%li.gl-text-gray-500= s_('Trial|Upgrade to Gold to keep using GitLab with advanced features.')
%li.gl-text-gray-500= s_('Trial|Upgrade to Ultimate to keep using GitLab with advanced features.')
%li.gl-text-gray-500= s_('Trial|Continue using the basic features of GitLab for free.')
.js-trial-form.hidden
.row
......
- page_title _('Start a Free Gold Trial')
- page_title _('Start a Free Ultimate Trial')
- add_page_specific_style 'page_bundles/signup'
- content_for :page_specific_javascripts do
= render "layouts/google_tag_manager_head"
= render "layouts/google_tag_manager_body"
%h2.center.pt-6.pb-4.gl-mb-0
= _('Start a Free Gold Trial')
= _('Start a Free Ultimate Trial')
.signup-page
= render 'devise/shared/signup_box',
......
......@@ -2,7 +2,7 @@
- if params[:glm_source] == 'gitlab.com'
= link_to s_('Trials|Go back to GitLab'), dashboard_projects_path, class: 'block center py-2'
.label
= s_("Trials|You can always resume this process by selecting your avatar and choosing 'Start a Gold trial'")
= s_("Trials|You can always resume this process by selecting your avatar and choosing 'Start an Ultimate trial'")
- else
- trial_text = experiment_enabled?(:trimmed_skip_trial_copy) ? s_('Trials|Skip Trial') : s_('Trials|Skip Trial (Continue with Free Account)')
= link_to trial_text, dashboard_projects_path, class: 'block center py-2'
......
- page_title _('Start your Free Gold Trial')
- page_title _('Start your Free Ultimate Trial')
- glm_params = { glm_source: params[:glm_source], glm_content: params[:glm_content] }
%h3.center.pt-6
= _('Start your Free Gold Trial')
= _("Start your Free Ultimate Trial")
%p.center
= _('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.')
= render 'errors'
......
- page_title _('Start a Free Gold Trial')
- page_title _('Start a Free Ultimate Trial')
- content_for :page_specific_javascripts do
= render "layouts/google_tag_manager_head"
= render "layouts/google_tag_manager_body"
......
......@@ -84,10 +84,10 @@
{ learn_gitlab_project_id: project.id, namespace_id: project.namespace_id, project_id: first_project.id }
end
it 'creates a new project, a "Learn GitLab - Gold trial" project, does not set a cookie' do
expect { subject }.to change { namespace.projects.pluck(:name) }.from([]).to(['New project', s_('Learn GitLab - Gold trial')])
it 'creates a new project, a "Learn GitLab - Ultimate trial" project, does not set a cookie' do
expect { subject }.to change { namespace.projects.pluck(:name) }.from([]).to(['New project', s_('Learn GitLab - Ultimate trial')])
expect(subject).to have_gitlab_http_status(:redirect)
expect(namespace.projects.find_by_name(s_('Learn GitLab - Gold trial'))).to be_import_finished
expect(namespace.projects.find_by_name(s_('Learn GitLab - Ultimate trial'))).to be_import_finished
expect(cookies[:onboarding_issues_settings]).to be_nil
end
......
......@@ -6,5 +6,5 @@
let(:user) { create(:user) }
let(:page_path) { activity_dashboard_path }
it_behaves_like 'dashboard gold trial callout'
it_behaves_like 'dashboard ultimate trial callout'
end
......@@ -6,5 +6,5 @@
let(:user) { create(:user) }
let(:page_path) { dashboard_groups_path }
it_behaves_like 'dashboard gold trial callout'
it_behaves_like 'dashboard ultimate trial callout'
end
......@@ -6,5 +6,5 @@
let(:user) { create(:user) }
let(:page_path) { issues_dashboard_path }
it_behaves_like 'dashboard gold trial callout'
it_behaves_like 'dashboard ultimate trial callout'
end
......@@ -6,5 +6,5 @@
let(:user) { create(:user) }
let(:page_path) { merge_requests_dashboard_path }
it_behaves_like 'dashboard gold trial callout'
it_behaves_like 'dashboard ultimate trial callout'
end
......@@ -6,5 +6,5 @@
let(:user) { create(:user) }
let(:page_path) { dashboard_projects_path }
it_behaves_like 'dashboard gold trial callout'
it_behaves_like 'dashboard ultimate trial callout'
end
......@@ -6,5 +6,5 @@
let_it_be(:user) { create(:user) }
let(:page_path) { dashboard_todos_path }
it_behaves_like 'dashboard gold trial callout'
it_behaves_like 'dashboard ultimate trial callout'
end
......@@ -18,7 +18,7 @@
choose 'Just me'
click_on 'Continue'
expect(page).to have_content('GitLab Gold trial (optional)')
expect(page).to have_content('GitLab Ultimate trial (optional)')
end
it 'shows the expected behavior with no trial chosen' do
......
......@@ -47,7 +47,7 @@
click_button 'Continue'
expect(current_path).to eq(new_trial_path)
expect(page).to have_content('Start your Free Gold Trial')
expect(page).to have_content('Start your Free Ultimate Trial')
end
end
......
......@@ -9,7 +9,7 @@ Array [
]
`;
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 [
Object {
"maxSeatsUsed": 104,
......@@ -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`] = `
Array [
Object {
"seatsInUse": 1,
......
......@@ -51,10 +51,10 @@ describe('EE billings subscription module mutations', () => {
state.tables[key].rows.map(({ columns }) => getColumnValues(columns));
describe.each`
desc | subscription | tableKey
${'with Gold subscription'} | ${mockDataSubscription.gold} | ${TABLE_TYPE_DEFAULT}
${'with Free plan'} | ${mockDataSubscription.free} | ${TABLE_TYPE_FREE}
${'with Gold trial'} | ${mockDataSubscription.trial} | ${TABLE_TYPE_TRIAL}
desc | subscription | tableKey
${'with Ultimate subscription'} | ${mockDataSubscription.gold} | ${TABLE_TYPE_DEFAULT}
${'with Free plan'} | ${mockDataSubscription.free} | ${TABLE_TYPE_FREE}
${'with Ultimate trial'} | ${mockDataSubscription.trial} | ${TABLE_TYPE_TRIAL}
`('$desc', ({ subscription, tableKey }) => {
beforeEach(() => {
state.isLoadingSubscription = true;
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册