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

Fix for tinymce tests #853

Closed
wants to merge 1 commit into from
Closed

Fix for tinymce tests #853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ Bug fixes:
- Fix for loading country specific language codes
[lyralemos]

- Fix for tinymce tests
[lyralemos]


2.7.2 (2018-04-08)
------------------
Expand Down
2 changes: 1 addition & 1 deletion mockup/js/i18n.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ define([
self.currentLanguage = $('html').attr('lang') || 'en-us';
Copy link
Member

Choose a reason for hiding this comment

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

I'd recommend using the non country specific fallback language "en" and remove the extra check below
@lyralemos @thet @agitator @frapell your thoughts?

Copy link
Member

Choose a reason for hiding this comment

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

Sounds good to me


// Fix for country specific languages
if (self.currentLanguage.split('-').length > 1) {
if (self.currentLanguage !== 'en-us' && self.currentLanguage.split('-').length > 1) {
self.currentLanguage = self.currentLanguage.split('-')[0] + '_' + self.currentLanguage.split('-')[1].toUpperCase();
}

Expand Down