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.

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

PI-1033 more under stable message to users #115

Merged
merged 5 commits into from
Mar 31, 2017
Merged

Conversation

thellimist
Copy link
Contributor

No description provided.

lang/en.js Outdated
@@ -230,7 +230,7 @@
"constants.plans.pro": "Pro plan",
"constants.plans.biz": "Business plan",
"constants.plans.ent": "Enterprise plan",
"errors.noActiveZoneSelected": "Please select a domain that is provisioned with Cloudflare.",
"errors.noActiveZoneSelected": "Please continue to {link} to set up this domain.",
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we update this to:

It looks like {domain} isn't provisioned with Cloudflare.  Please continue to {link} to provision this domain.

This should help us debug the WordPress issues where they have a subdomain or a folder.

Copy link
Contributor

Choose a reason for hiding this comment

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

And we need a conditional for cPanel which links them to the domains page since those domains are provisoned in app.

Copy link
Contributor

Choose a reason for hiding this comment

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

isDNSPageEnabled(config) link to the DNSPage instead of add site link

@@ -49,6 +51,10 @@ class WaitForSettings extends Component {
isPluginSettingsLoaded &&
isAnalyticsLoaded;

let link = (
<a href={CLOUDFLARE_ADD_SITE_PAGE} target="_blank">Cloudflare</a>
Copy link
Contributor

Choose a reason for hiding this comment

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

{ isDNSPageEnabled(config) ? DNS_PAGE : CLOUDFLARE_ADD_SITE_PAGE }

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ohh nice idea.

Copy link
Contributor Author

@thellimist thellimist Mar 31, 2017

Choose a reason for hiding this comment

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

Took longer than expected :/
40db1bd

<FormattedMessage id="errors.noActiveZoneSelected" />
<FormattedMessage
id="errors.noActiveZoneSelected"
values={{ link: link, domain: activeZone.name }}
Copy link
Contributor

@jwineman jwineman Mar 31, 2017

Choose a reason for hiding this comment

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

need to add domain here too.

EDIT: NVM Im very dumb

<FormattedMessage id="container.dnsManagementPage.title" />
</Link>
);
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I tried to do inline if case thing but prettier was complaining and couldn't figure out why. Then did this instead of ignore-prettier

@thellimist
Copy link
Contributor Author

Updated the text again per request from GG

@thellimist thellimist merged commit b962009 into master Mar 31, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants