yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
starfighter83
2011-01-17 06:47:00 -01:00
parent a9dd0a7e65 d031e1da91
commit db10f1ed26
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/editorControls/tinyMCE3/TinyMCE.cs
View File

@@ -185,7 +185,11 @@ namespace umbraco.editorControls.tinyMCE3
}
// language
config.Add("language", User.GetCurrent().Language);
string userLang = User.GetCurrent().Language.Contains("-")
? User.GetCurrent().Language.Substring(0,
User.GetCurrent().Language.IndexOf("-"))
: User.GetCurrent().Language;
config.Add("language", userLang);
config.Add("content_css", cssFiles);
config.Add("theme_umbraco_styles", styles);

2
components/editorControls/umbraco.editorControls.csproj
View File

@@ -78,7 +78,7 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<OutputPath>..\..\umbraco\presentation\bin\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>