From aba68720bb3bf2ad71c3f0338d34a3f49bbe0fd5 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 21 Nov 2012 06:54:52 -0100 Subject: [PATCH] Localized the create window for new Scrips (js) --- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 1 + src/Umbraco.Web.UI/umbraco/create/script.ascx | 7 +++---- src/Umbraco.Web/Umbraco.Web.csproj | 4 +++- .../umbraco.presentation/umbraco/create/script.ascx | 7 +++---- .../umbraco.presentation/umbraco/create/script.ascx.cs | 3 +++ .../umbraco/create/script.ascx.designer.cs | 3 +-- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index fd4b779f43..e42ca5fc63 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -327,6 +327,7 @@ any domain and just set the culture.]]> Welcome... Width Yes + Folder Background color diff --git a/src/Umbraco.Web.UI/umbraco/create/script.ascx b/src/Umbraco.Web.UI/umbraco/create/script.ascx index 9fea6d92eb..e2d3302a6d 100644 --- a/src/Umbraco.Web.UI/umbraco/create/script.ascx +++ b/src/Umbraco.Web.UI/umbraco/create/script.ascx @@ -2,13 +2,12 @@ -Name: *
+<%=umbraco.ui.Text("name")%>: *
-Type:
+<%=umbraco.ui.Text("type")%>:
- Folder
@@ -17,6 +16,6 @@ Type:
- or + <%=umbraco.ui.Text("or")%> <%=umbraco.ui.Text("cancel")%>
\ No newline at end of file diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 6df96af69f..c6c74be2ee 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -1893,7 +1893,9 @@ - + + ASPXCodeBehind + diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx index 9fea6d92eb..e2d3302a6d 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx @@ -2,13 +2,12 @@ -Name: *
+<%=umbraco.ui.Text("name")%>: *
-Type:
+<%=umbraco.ui.Text("type")%>:
- Folder
@@ -17,6 +16,6 @@ Type:
- or + <%=umbraco.ui.Text("or")%> <%=umbraco.ui.Text("cancel")%>
\ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.cs index d6eb4ac525..89b73e27a3 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.cs @@ -72,6 +72,9 @@ namespace umbraco.presentation.umbraco.create string[] fileTypes = UmbracoSettings.ScriptFileTypes.Split(','); + scriptType.Items.Add(new ListItem(ui.Text("folder"), "")); + scriptType.Items.FindByText(ui.Text("folder")).Selected = true; + foreach (string str in fileTypes) { scriptType.Items.Add(new ListItem("." + str + " file", str)); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.designer.cs index dd673476c7..348110f4ab 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.designer.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4200 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------