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

Locale generalization so JS_LOCALE of de_DE results in use of de #1176

Merged
merged 2 commits into from
Aug 1, 2016

Conversation

AFaust
Copy link
Contributor

@AFaust AFaust commented Aug 1, 2016

Recreation of #1168

The languages supported by TinyMCE editor are maintained as two-letter country codes while the JS_LOCALE will typically be the combination of country and language code, i.e. de_DE. The current locale matching in the TinyMCE editor does not detect / select an available, generalized locale and essentially always falls back to English.
This PR adds locale generalization checks during in the locale match code of the TinyMCE editor.

}
config.language = locale;

config.language = locale || bestGeneralizedLocale || 'en';
Copy link

Choose a reason for hiding this comment

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

We have JSHint on our build servers to use double rather than single quotes (the build aggressively fails on JSHint errors!). I'm flagging this up for future reference more than anything else as I'm happy to merge myself and then fix the build failure. But if it's simple enough for you to push a quick update then I'd be very grateful.

@draperd
Copy link

draperd commented Aug 1, 2016

Thanks for recreating this PR...I've made one minor comment on our preferred JSHint configuration, but otherwise I'm happy to merge this having tested it out locally.

@draperd draperd merged commit 13b07ba into Alfresco:develop Aug 1, 2016
@draperd
Copy link

draperd commented Aug 1, 2016

Thanks for making that update so quickly - I've now merged the request. It will be in the 1.0.79 release which will either be later this week or early next week.

@AFaust AFaust deleted the TinyMCE-localeGeneralization branch August 1, 2016 15:19
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