diff --git a/src/Umbraco.Web.UI/umbraco/create/language.ascx b/src/Umbraco.Web.UI/umbraco/create/language.ascx
index feffae0a34..1814d741f6 100644
--- a/src/Umbraco.Web.UI/umbraco/create/language.ascx
+++ b/src/Umbraco.Web.UI/umbraco/create/language.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="c#" AutoEventWireup="True" Codebehind="language.ascx.cs" Inherits="umbraco.cms.presentation.create.controls.language" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
+<%@ Control Language="c#" AutoEventWireup="True" Inherits="umbraco.cms.presentation.create.controls.language" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index d4d6931953..0a0573a4f5 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -424,6 +424,9 @@
ASPXCodeBehind
+
+ ASPXCodeBehind
+
ASPXCodeBehind
@@ -1205,13 +1208,6 @@
Code
-
- language.ascx
- ASPXCodeBehind
-
-
- language.ascx
-
media.ascx
ASPXCodeBehind
@@ -1926,9 +1922,6 @@
ASPXCodeBehind
-
- ASPXCodeBehind
-
ASPXCodeBehind
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx
deleted file mode 100644
index c0d359b612..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ Control Language="c#" AutoEventWireup="True" Codebehind="language.ascx.cs" Inherits="umbraco.cms.presentation.create.controls.language" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-
-
-
-
-
-
- *
-
-
-
-
- <%=umbraco.ui.Text("cancel")%>
-
-
-
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 017b7fe9b4..5799f932e1 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections;
using System.Globalization;
using System.Web;
@@ -16,9 +16,6 @@ namespace umbraco.cms.presentation.create.controls
///
public partial class language : UserControl
{
- private Language[] m_langs = Language.getAll;
-
-
protected void Page_Load(object sender, EventArgs e)
{
// get all existing languages
@@ -31,7 +28,7 @@ namespace umbraco.cms.presentation.create.controls
Cultures.Items.Add(new ListItem(ui.Text("choose") + "...", ""));
foreach (CultureInfo ci in CultureInfo.GetCultures(CultureTypes.AllCultures))
{
- sortedCultures.Add(ci.DisplayName + "|||" + Guid.NewGuid().ToString(), ci.Name);
+ sortedCultures.Add(ci.DisplayName + "|||" + Guid.NewGuid().ToString(), ci.Name);
}
IDictionaryEnumerator ide = sortedCultures.GetEnumerator();
@@ -42,37 +39,6 @@ namespace umbraco.cms.presentation.create.controls
}
}
- private bool languageExists(string culture)
- {
- foreach (Language l in m_langs)
- {
- if (l.CultureAlias == culture)
- return true;
- }
- return false;
- }
-
- #region Web Form Designer generated code
-
- protected override void OnInit(EventArgs e)
- {
- //
- // CODEGEN: This call is required by the ASP.NET Web Form Designer.
- //
- InitializeComponent();
- base.OnInit(e);
- }
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- }
-
- #endregion
-
protected void sbmt_Click(object sender, EventArgs e)
{
LegacyDialogHandler.Create(
@@ -82,10 +48,47 @@ namespace umbraco.cms.presentation.create.controls
-1,
Cultures.SelectedValue);
- BasePage.Current.ClientTools
- .ChildNodeCreated()
- .CloseModalWindow();
+ BasePage.Current.ClientTools
+ .ChildNodeCreated()
+ .CloseModalWindow();
}
+
+ ///
+ /// pp1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::umbraco.uicontrols.PropertyPanel pp1;
+
+ ///
+ /// Cultures control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.DropDownList Cultures;
+
+ ///
+ /// RequiredFieldValidator1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
+
+ ///
+ /// sbmt control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Button sbmt;
+
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.designer.cs
deleted file mode 100644
index d3945627fd..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.designer.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-namespace umbraco.cms.presentation.create.controls {
-
-
- public partial class language {
-
- ///
- /// pp1 control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::umbraco.uicontrols.PropertyPanel pp1;
-
- ///
- /// Cultures control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.DropDownList Cultures;
-
- ///
- /// RequiredFieldValidator1 control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
-
- ///
- /// sbmt control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Button sbmt;
- }
-}