diff --git a/src/Umbraco.Tests/PluginManagerTests.cs b/src/Umbraco.Tests/PluginManagerTests.cs index 175271e64e..14a73b333a 100644 --- a/src/Umbraco.Tests/PluginManagerTests.cs +++ b/src/Umbraco.Tests/PluginManagerTests.cs @@ -337,28 +337,28 @@ namespace Umbraco.Tests Assert.AreEqual(3, types.Count()); } - /// - /// This demonstrates this issue: http://issues.umbraco.org/issue/U4-3505 - the TypeList was returning a list of assignable types - /// not explicit types which is sort of ideal but is confusing so we'll do it the less confusing way. - /// - [Test] - public void TypeList_Resolves_Explicit_Types() - { - var types = new HashSet(); + ///// + ///// This demonstrates this issue: http://issues.umbraco.org/issue/U4-3505 - the TypeList was returning a list of assignable types + ///// not explicit types which is sort of ideal but is confusing so we'll do it the less confusing way. + ///// + //[Test] + //public void TypeList_Resolves_Explicit_Types() + //{ + // var types = new HashSet(); - var propEditors = new PluginManager.TypeList(PluginManager.TypeResolutionKind.FindAllTypes); - propEditors.AddType(typeof (LabelPropertyEditor)); - types.Add(propEditors); + // var propEditors = new PluginManager.TypeList(PluginManager.TypeResolutionKind.FindAllTypes); + // propEditors.AddType(typeof (LabelPropertyEditor)); + // types.Add(propEditors); - var found = types.SingleOrDefault(x => x.IsTypeList(PluginManager.TypeResolutionKind.FindAllTypes)); + // var found = types.SingleOrDefault(x => x.IsTypeList(PluginManager.TypeResolutionKind.FindAllTypes)); - Assert.IsNotNull(found); + // Assert.IsNotNull(found); - //This should not find a type list of this type - var shouldNotFind = types.SingleOrDefault(x => x.IsTypeList(PluginManager.TypeResolutionKind.FindAllTypes)); + // //This should not find a type list of this type + // var shouldNotFind = types.SingleOrDefault(x => x.IsTypeList(PluginManager.TypeResolutionKind.FindAllTypes)); - Assert.IsNull(shouldNotFind); - } + // Assert.IsNull(shouldNotFind); + //} [XsltExtension("Blah.Blah")] public class MyXsltExtension diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs index ab53b80f82..176fc1e46f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs @@ -29,7 +29,6 @@ namespace umbraco.cms.presentation.create.controls Cultures.Items.Add(new ListItem(ui.Text("choose") + "...", "")); foreach (CultureInfo ci in CultureInfo.GetCultures(CultureTypes.AllCultures)) { - if (!ci.IsNeutralCulture && !languageExists(ci.Name)) sortedCultures.Add(ci.DisplayName + "|||" + Guid.NewGuid().ToString(), ci.Name); }