From e67f85695cdf935d92a67a70d02f72d81c353d7d Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Thu, 10 Oct 2013 19:47:12 +0200
Subject: [PATCH] fixes U4-3054 icon picker viewstate

---
 src/Umbraco.Web.UI/umbraco/config/lang/he.xml             | 6 ++++++
 .../umbraco/controls/ContentTypeControlNew.ascx.cs        | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml
index 066804d191..59774d1a33 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml
@@ -35,6 +35,12 @@
     <key alias="toPublish">שלח לפירסום</key>
     <key alias="translate">תרגם</key>
     <key alias="update">עדכן</key>
+    <key alias="DeleteCMSImportAction">Delete</key>
+    <key alias="ExecuteCMSImportWizardAction">Execute</key>
+    <key alias="ScheduleCMSImportWizardAction">Schedule</key>
+    <key alias="StartCMSImportWizardAction">Import Data</key>
+    <key alias="StartCMSImportChildDefinitionAction">Create child definition</key>
+    <key alias="LastRunInfoAction">Scheduled task log</key>
   </area>
   <area alias="assignDomain">
     <key alias="addNew">הוסף דומיין חדש</key>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
index a75bc7848f..8b9bc185d8 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
@@ -120,6 +120,11 @@ namespace umbraco.controls
                 PanePropertiesInherited.Visible = true;
             }
 
+            if (string.IsNullOrEmpty(_contentType.IconUrl))
+                lt_icon.Text = "icon-document";
+            else
+                lt_icon.Text = _contentType.IconUrl.TrimStart('.');
+
             checkTxtAliasJs.Text = string.Format("checkAlias('{0}');", txtAlias.ClientID);
         }
         
@@ -264,6 +269,9 @@ namespace umbraco.controls
         protected void save_click(object sender, EventArgs e)
         {
 
+            //sync state betweet lt and hidden value
+            lt_icon.Text = tb_icon.Value;
+
             var state = new SaveAsyncState(
                 UmbracoContext,
                 new SaveClickEventArgs("Saved")