# HG changeset patch
# User Torsten Irländer <torsten.irlaender@intevation.de>
# Date 1389710499 -3600
# Node ID 4d8819844c48205bf3af0210bb185b7381e7a154
# Parent  9ba41a46f6e53e38a2b40065aa625abdbc4902b7
Fixed circular requirement.

diff -r 9ba41a46f6e5 -r 4d8819844c48 resources/datetime/UX_DateTimePicker.js
--- a/resources/datetime/UX_DateTimePicker.js	Tue Jan 14 15:08:35 2014 +0100
+++ b/resources/datetime/UX_DateTimePicker.js	Tue Jan 14 15:41:39 2014 +0100
@@ -1,14 +1,8 @@
-Ext.define("Ext.locale.en.ux.picker.DateTimePicker", {
-	  override: "Ext.ux.DateTimePicker",
-	  todayText: "Now",
-	  timeLabel: 'Time'
-  });
-
 Ext.define('Ext.ux.DateTimePicker', {
 	  extend: 'Ext.picker.Date',
 	  alias: 'widget.datetimepicker',
-	  todayText: '现在',
-	  timeLabel: '时间',
+	  todayText: "Now",
+	  timeLabel: 'Time',
 	  requires: ['Ext.ux.form.TimePickerField'],
 
 	  initComponent: function() {
@@ -117,4 +111,4 @@
 		  }
 		  return me;
 	  }
-  });
\ No newline at end of file
+  });