diff --git a/.hgsubstate b/.hgsubstate
index 824913279..bbbb1d410 100644
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -5,4 +5,4 @@ cfc264d41c1d299c104d76c5032d8ffee3047dcd src/Orchard.Web/Modules/Orchard.Rules
 0b96793c3737e50863270c24debf6d44065b73bb src/Orchard.Web/Modules/Orchard.Tokens
 4ed51e0e76c2aacc2de90ce9984fd00cfdfae2ce src/orchard.web/Modules/Orchard.Alias
 0e660c8cfbfb5217abfb7cf6adf6f2cf484174d6 src/orchard.web/Modules/Orchard.Projections
-92bea953e399da87adbc0654a30fd5e55c9bf9e1 src/orchard.web/modules/Orchard.Fields
+533a4703ec0326a0e6f1a5afceeae43880f5bfea src/orchard.web/modules/Orchard.Fields
diff --git a/src/Orchard.Web/Core/Common/Views/Parts.Common.Date.Edit.cshtml b/src/Orchard.Web/Core/Common/Views/Parts.Common.Date.Edit.cshtml
index 7ddec6858..b9e2f92cd 100644
--- a/src/Orchard.Web/Core/Common/Views/Parts.Common.Date.Edit.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/Parts.Common.Date.Edit.cshtml
@@ -14,6 +14,7 @@
 
     @* generates the localization script *@
     @Display(New.DatePickerLocalization())
+    @Display(New.TimePickerLocalization())
 
 <script type="text/javascript">
 //<![CDATA[
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.cshtml b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.cshtml
index fd9a8d4f5..2361e49d8 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.cshtml
@@ -21,6 +21,7 @@
     
     @* generates the localization script *@
     @Display(New.DatePickerLocalization())
+    @Display(New.TimePickerLocalization())
 
 <script type="text/javascript">    
 //<![CDATA[
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml b/src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml
index 6151cf171..7a07fec8b 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml
@@ -14,6 +14,7 @@
 
     @* generates the localization script *@
     @Display(New.DatePickerLocalization())
+    @Display(New.TimePickerLocalization())
 
 <script type="text/javascript">
 //<![CDATA[
diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj b/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj
index ef476a22a..80facb004 100644
--- a/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj
+++ b/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj
@@ -165,7 +165,9 @@
     <Content Include="web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="Views\TimePickerLocalization.cshtml" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Views/DatePickerLocalization.cshtml b/src/Orchard.Web/Modules/Orchard.jQuery/Views/DatePickerLocalization.cshtml
index 3799ca5da..3b25dc859 100644
--- a/src/Orchard.Web/Modules/Orchard.jQuery/Views/DatePickerLocalization.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.jQuery/Views/DatePickerLocalization.cshtml
@@ -4,9 +4,7 @@
 @{
     
     Style.Require("jQueryUI_DatePicker");
-    Style.Require("jQueryUI_TimePicker");
     Script.Require("jQueryUI_DatePicker");
-    Script.Require("jQueryUI_TimePicker");
 
     var cultureInfo = CultureInfo.GetCultureInfo(WorkContext.CurrentCulture);
     
@@ -27,11 +25,6 @@
         .Replace("Y", "y")
         .Replace("M", "m")
         ;
-    
-    var timeFormat = dateTimeLocalization.ShortTimeFormat.Text
-        .Replace("H", "h");
-
-    var ampm = timeFormat.ToLowerInvariant().Contains("tt") ? "true" : "false";
 }
 
 @functions {
@@ -63,21 +56,6 @@
         };
 
         $.datepicker.setDefaults($.datepicker.regional['']);
-
-        $.timepicker.regional[''] = {
-            timeOnlyTitle: '@T("Choose time")',
-            timeText: '@T("Time")',
-            hourText: '@T("Hour")',
-            minuteText: '@T("Minute")',
-            currentText: '@T("Now")', // Display text for current time link
-            closeText: '@T("Done")', // Display text for close link
-            timeFormat: '@timeFormat',
-            amNames: ['@cultureInfo.DateTimeFormat.AMDesignator', 'AM', 'A'],
-            pmNames: ['@cultureInfo.DateTimeFormat.PMDesignator', 'PM', 'P'],
-            ampm: @ampm
-        };
-
-        $.timepicker.setDefaults($.timepicker.regional['']);
     })
 //]]>
 </script>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Views/TimePickerLocalization.cshtml b/src/Orchard.Web/Modules/Orchard.jQuery/Views/TimePickerLocalization.cshtml
new file mode 100644
index 000000000..a2dd7bf4b
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.jQuery/Views/TimePickerLocalization.cshtml
@@ -0,0 +1,38 @@
+@using Orchard.Core.Shapes.Localization
+@using System.Globalization
+
+@{
+    
+    Style.Require("jQueryUI_TimePicker");
+    Script.Require("jQueryUI_TimePicker");
+
+    var cultureInfo = CultureInfo.GetCultureInfo(WorkContext.CurrentCulture);
+    
+    var dateTimeLocalization = WorkContext.Resolve<IDateTimeLocalization>();
+    
+    var timeFormat = dateTimeLocalization.ShortTimeFormat.Text
+        .Replace("H", "h");
+
+    var ampm = timeFormat.ToLowerInvariant().Contains("tt") ? "true" : "false";
+}
+
+<script type="text/javascript">
+//<![CDATA[
+    $(function() {
+        $.timepicker.regional[''] = {
+            timeOnlyTitle: '@T("Choose time")',
+            timeText: '@T("Time")',
+            hourText: '@T("Hour")',
+            minuteText: '@T("Minute")',
+            currentText: '@T("Now")', // Display text for current time link
+            closeText: '@T("Done")', // Display text for close link
+            timeFormat: '@timeFormat',
+            amNames: ['@cultureInfo.DateTimeFormat.AMDesignator', 'AM', 'A'],
+            pmNames: ['@cultureInfo.DateTimeFormat.PMDesignator', 'PM', 'P'],
+            ampm: @ampm
+        };
+
+        $.timepicker.setDefaults($.timepicker.regional['']);
+    })
+//]]>
+</script>
\ No newline at end of file