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

Adjust language notice for non admins #8333

Merged
merged 2 commits into from
Nov 27, 2017

Conversation

abotteram
Copy link
Contributor

Summary

This PR can be summarized in the following changelog entry:

  • The language notice in the content analysis can be changed for non-admin users that cannot change the language.

Relevant technical choices:

Test instructions

This PR can be tested by following these steps:

Needs a release of yoast-components with Yoast/yoast-components#389 merged.

Fixes Yoast/yoast-components#384

};

Results.defaultProps = {
language: "",
changeLanguageLink: "#",
canChangeLanguage: false,
Copy link
Contributor

Choose a reason for hiding this comment

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

question about changeLanguageLink not sure # is a proper default value now

Copy link
Contributor

Choose a reason for hiding this comment

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

Merging for now. @xyfi Please address this when you're back.

@@ -55,7 +55,7 @@ function configureStore() {
function wrapInTopLevelComponents( Component, store ) {
return (
<IntlProvider
locale={ localizedData.intl.locale }
locale={ localizedData.intl.locale.substr( 0, 2 ).toLowerCase() }
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure about the need of this change (not arguing, I just don't know the reason)

Copy link
Contributor

Choose a reason for hiding this comment

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

Merging for now. @xyfi Please address this when you're back.

@afercia
Copy link
Contributor

afercia commented Nov 24, 2017

CR done 👍
Just two minor questions.

@IreneStr
Copy link
Contributor

Acceptance done 👍

@IreneStr IreneStr merged commit 3f125f7 into trunk Nov 27, 2017
@IreneStr IreneStr added this to the 5.9 milestone Nov 27, 2017
@andizer andizer deleted the stories/384-adjust-language-notice-for-non-admins branch November 27, 2017 10:44
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.

3 participants