From 974961e8d9eeab23904c75fcc6c748fd30d0607b Mon Sep 17 00:00:00 2001 From: Nicholas Mayne Date: Sun, 10 Aug 2014 11:33:14 +0100 Subject: [PATCH] Adding fallback language --- .../TinyMce/Views/Body-Html.Editor.cshtml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml b/src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml index f9dccf730..45070e329 100644 --- a/src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml +++ b/src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml @@ -1,4 +1,5 @@ -@using Orchard.ContentManagement +@using System.Globalization +@using Orchard.ContentManagement @using Orchard.Environment.Descriptor.Models @using Orchard.FileSystems.VirtualPath @using Orchard.Localization @@ -9,10 +10,15 @@ // Default language for TinyMCE var language = "en"; - var customLanguage = Html.ContentCulture((IContent) Model.ContentItem).Replace('-', '_'); - if (!language.Equals(customLanguage, StringComparison.OrdinalIgnoreCase) && - virtualPathProvider.FileExists(string.Format(@"\modules\tinymce\scripts\langs\{0}.js", customLanguage))) { - language = customLanguage; + var currentCulture = WorkContext.CurrentCulture; + var customLanguage = currentCulture.Replace('-', '_'); + if (!language.Equals(customLanguage, StringComparison.OrdinalIgnoreCase)) { + var culture = CultureInfo.GetCultureInfo(currentCulture); + if (virtualPathProvider.FileExists(string.Format(@"\modules\tinymce\scripts\langs\{0}.js", customLanguage))) { + language = customLanguage; + } else if (virtualPathProvider.FileExists(string.Format(@"\modules\tinymce\scripts\langs\{0}.js", culture.TwoLetterISOLanguageName))) { + language = culture.TwoLetterISOLanguageName; + } } }