Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Atomic: update eligibility warning messages #17469

Merged
merged 5 commits into from
Sep 6, 2017
Merged

Atomic: update eligibility warning messages #17469

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b3918b
update eligibility warning messages
rralian Aug 23, 2017
1ffdd27
remove locale from support page url
rralian Aug 23, 2017
b07bb3d
couple wording tweaks
rralian Aug 31, 2017
d9d0fc2
AT: link directly to support section step
gwwar Sep 6, 2017
665e9c0
AT fix typo
gwwar Sep 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions client/blocks/eligibility-warnings/hold-list.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,24 +51,28 @@ function getHoldMessages( siteSlug, translate ) {
supportUrl: 'https://support.wordpress.com/domains/',
},
NO_WPCOM_NAMESERVERS: {
title: translate( 'No WordPress.com name servers' ),
description: translate( 'Use WordPress.com name servers on your custom domain to resolve.' ),
supportUrl: 'https://support.wordpress.com/domain-helper/',
title: translate( 'Domain not using WordPress.com name servers' ),
description: translate( 'Your domain must use WordPress.com name servers to support custom code. ' +
'Ask your domain provider to update your DNS settings.' ),
supportUrl: 'https://en.support.wordpress.com/domains/map-existing-domain/' +
'#2-ask-your-domain-provider-to-update-your-dns-settings',
},
NOT_RESOLVING_TO_WPCOM: {
title: translate( 'Primary domain not pointing to WordPress.com servers' ),
description: translate( 'Point your primary domain to WordPress.com servers to resolve.' ),
supportUrl: 'https://support.wordpress.com/domain-helper/',
title: translate( 'Domain not pointing to WordPress.com servers' ),
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🆗 This change is safe, we'll keep the existing 17 translations.

description: translate( 'We cannot manage your site because your domain does not point to WordPress.com servers. ' +
'Follow the instructions to reset your domain\'s A records to resolve this.' ),
supportUrl: 'https://support.wordpress.com/move-domain/setting-custom-a-records/',
},
NO_SSL_CERTIFICATE: {
title: translate( "Primary domain doesn't have a valid SSL certificate" ),
title: translate( 'Security certificate required' ),
description: translate(
'Please try again in a few minutes: you will be able to proceed once we finish setting up your security settings.'
'We are setting up a security certificate for you domain now. Please try again in a few minutes.'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for you domain

should be "for your domain"

),
},
EMAIL_UNVERIFIED: {
title: translate( 'Unconfirmed email' ),
description: translate(
'You must have verified your email address with WordPress.com to install custom code. ' +
'Please check your email to confirm your address.'
),
},
Expand Down
2 changes: 1 addition & 1 deletion client/blocks/eligibility-warnings/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export const EligibilityWarnings = ( {
<Card className="eligibility-warnings__confirm-box">
<div className="eligibility-warnings__confirm-text">
{ ! isEligible && translate(
'You must resolve the errors above before proceeding. '
'The errors above must be resolved before proceeding. '
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😞 17 existing translations will be lost with this change.

) }
{ isEligible && warnings.length > 0 && translate(
'If you proceed you will no longer be able to use these features. '
Expand Down