From 7f573d75a120f60e870927411375c20bfef97852 Mon Sep 17 00:00:00 2001
From: Alexandre Marinho <lyralemos@gmail.com>
Date: Fri, 15 Jun 2018 08:40:50 -0300
Subject: [PATCH] Fix for tinymce tests

---
 CHANGES.rst       | 3 +++
 mockup/js/i18n.js | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index f8d6fcfce..7626067d4 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -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)
 ------------------
diff --git a/mockup/js/i18n.js b/mockup/js/i18n.js
index bb2d338fc..fee3431c6 100644
--- a/mockup/js/i18n.js
+++ b/mockup/js/i18n.js
@@ -21,7 +21,7 @@ define([
     self.currentLanguage = $('html').attr('lang') || 'en-us';
 
     // 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();
     }