Index: branches/unlabeled/unlabeled-1.5.52/core/units/languages/languages_config.php
===================================================================
diff -u -r1838 -r3942
--- branches/unlabeled/unlabeled-1.5.52/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 1838)
+++ branches/unlabeled/unlabeled-1.5.52/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 3942)
@@ -119,6 +119,8 @@
 										'IconURL' => Array('type' => 'string','default' => ''),
 										'DateFormat' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
 										'TimeFormat' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
+										'InputDateFormat' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('m/d/Y' => 'm/d/Y'),  'not_null' => '1','default' => 'm/d/Y', 'required' => 1),
+            							'InputTimeFormat' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('g:i:s A' => 'g:i:s A'), 'not_null' => '1','default' => 'g:i:s A', 'required' => 1),
 										'DecimalPoint' => Array('type' => 'string','not_null' => '1','default' => ''),
 										'ThousandSep' => Array('type' => 'string','not_null' => '1','default' => ''),
 										'Charset' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
Index: branches/unlabeled/unlabeled-1.5.52/kernel/units/languages/languages_config.php
===================================================================
diff -u -r1838 -r3942
--- branches/unlabeled/unlabeled-1.5.52/kernel/units/languages/languages_config.php	(.../languages_config.php)	(revision 1838)
+++ branches/unlabeled/unlabeled-1.5.52/kernel/units/languages/languages_config.php	(.../languages_config.php)	(revision 3942)
@@ -119,6 +119,8 @@
 										'IconURL' => Array('type' => 'string','default' => ''),
 										'DateFormat' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
 										'TimeFormat' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
+										'InputDateFormat' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('m/d/Y' => 'm/d/Y'),  'not_null' => '1','default' => 'm/d/Y', 'required' => 1),
+            							'InputTimeFormat' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('g:i:s A' => 'g:i:s A'), 'not_null' => '1','default' => 'g:i:s A', 'required' => 1),
 										'DecimalPoint' => Array('type' => 'string','not_null' => '1','default' => ''),
 										'ThousandSep' => Array('type' => 'string','not_null' => '1','default' => ''),
 										'Charset' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
Index: branches/unlabeled/unlabeled-1.8.10/kernel/admin_templates/regional/languages_edit.tpl
===================================================================
diff -u -r3667 -r3942
--- branches/unlabeled/unlabeled-1.8.10/kernel/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 3667)
+++ branches/unlabeled/unlabeled-1.8.10/kernel/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 3942)
@@ -67,6 +67,10 @@
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="lang" field="IconURL" title="!la_fld_IconURL!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="lang" field="DateFormat" title="!la_fld_DateFormat!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="lang" field="TimeFormat" title="!la_fld_TimeFormat!"/>
+		
+		<inp2:m_ParseBlock name="inp_edit_options" prefix="lang" field="InputDateFormat" title="!la_fld_InputDateFormat!"/>
+		<inp2:m_ParseBlock name="inp_edit_options" prefix="lang" field="InputTimeFormat" title="!la_fld_InputTimeFormat!"/>
+		
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="lang" field="DecimalPoint" title="!la_fld_DecimalPoint!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="lang" field="ThousandSep" title="!la_fld_ThousandSep!"/>
 		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="lang" field="PrimaryLang" title="!la_fld_PrimaryLang!"/>
Index: branches/unlabeled/unlabeled-1.15.10/core/units/languages/import_xml.php
===================================================================
diff -u -r3606 -r3942
--- branches/unlabeled/unlabeled-1.15.10/core/units/languages/import_xml.php	(.../import_xml.php)	(revision 3606)
+++ branches/unlabeled/unlabeled-1.15.10/core/units/languages/import_xml.php	(.../import_xml.php)	(revision 3942)
@@ -219,11 +219,15 @@
 			
 			$path = join (' ',$this->path);	
 			
-			$language_nodes = Array('DATEFORMAT','TIMEFORMAT','DECIMAL','THOUSANDS','CHARSET','UNITSYSTEM');
+			$language_nodes = Array('DATEFORMAT','TIMEFORMAT','INPUTDATEFORMAT','INPUTTIMEFORMAT','DECIMAL','THOUSANDS','CHARSET','UNITSYSTEM');
 			
 			
 			$node_field_map = Array('LANGUAGES LANGUAGE DATEFORMAT'		=>	'DateFormat',
 									'LANGUAGES LANGUAGE TIMEFORMAT'		=>	'TimeFormat',
+									
+									'LANGUAGES LANGUAGE INPUTDATEFORMAT'=>	'InputDateFormat',
+									'LANGUAGES LANGUAGE INPUTTIMEFORMAT'=>	'InputTimeFormat',
+									
 									'LANGUAGES LANGUAGE DECIMAL' 		=>	'DecimalPoint',
 									'LANGUAGES LANGUAGE THOUSANDS'		=>	'ThousandSep',
 									'LANGUAGES LANGUAGE CHARSET'		=>	'Charset',
@@ -326,7 +330,8 @@
 				// languages
 				$row = $this->Conn->GetRow( sprintf($sql, $lang_table, $language_id) );
 				$ret .= "\t".'<LANGUAGE PackName="'.$row['PackName'].'"><DATEFORMAT>'.$row['DateFormat'].'</DATEFORMAT>';
-				$ret .= '<TIMEFORMAT>'.$row['TimeFormat'].'</TIMEFORMAT><DECIMAL>'.$row['DecimalPoint'].'</DECIMAL>';
+				$ret .= '<TIMEFORMAT>'.$row['TimeFormat'].'</TIMEFORMAT><INPUTDATEFORMAT>'.$row['InputDateFormat'].'</INPUTDATEFORMAT>';
+				$ret .= '<INPUTTIMEFORMAT>'.$row['InputTimeFormat'].'</INPUTTIMEFORMAT><DECIMAL>'.$row['DecimalPoint'].'</DECIMAL>';
 				$ret .= '<THOUSANDS>'.$row['ThousandSep'].'</THOUSANDS><CHARSET>'.$row['Charset'].'</CHARSET>';
 				$ret .= '<UNITSYSTEM>'.$row['UnitSystem'].'</UNITSYSTEM>'."\n";
 				
Index: branches/unlabeled/unlabeled-1.15.10/kernel/units/languages/import_xml.php
===================================================================
diff -u -r3606 -r3942
--- branches/unlabeled/unlabeled-1.15.10/kernel/units/languages/import_xml.php	(.../import_xml.php)	(revision 3606)
+++ branches/unlabeled/unlabeled-1.15.10/kernel/units/languages/import_xml.php	(.../import_xml.php)	(revision 3942)
@@ -219,11 +219,15 @@
 			
 			$path = join (' ',$this->path);	
 			
-			$language_nodes = Array('DATEFORMAT','TIMEFORMAT','DECIMAL','THOUSANDS','CHARSET','UNITSYSTEM');
+			$language_nodes = Array('DATEFORMAT','TIMEFORMAT','INPUTDATEFORMAT','INPUTTIMEFORMAT','DECIMAL','THOUSANDS','CHARSET','UNITSYSTEM');
 			
 			
 			$node_field_map = Array('LANGUAGES LANGUAGE DATEFORMAT'		=>	'DateFormat',
 									'LANGUAGES LANGUAGE TIMEFORMAT'		=>	'TimeFormat',
+									
+									'LANGUAGES LANGUAGE INPUTDATEFORMAT'=>	'InputDateFormat',
+									'LANGUAGES LANGUAGE INPUTTIMEFORMAT'=>	'InputTimeFormat',
+									
 									'LANGUAGES LANGUAGE DECIMAL' 		=>	'DecimalPoint',
 									'LANGUAGES LANGUAGE THOUSANDS'		=>	'ThousandSep',
 									'LANGUAGES LANGUAGE CHARSET'		=>	'Charset',
@@ -326,7 +330,8 @@
 				// languages
 				$row = $this->Conn->GetRow( sprintf($sql, $lang_table, $language_id) );
 				$ret .= "\t".'<LANGUAGE PackName="'.$row['PackName'].'"><DATEFORMAT>'.$row['DateFormat'].'</DATEFORMAT>';
-				$ret .= '<TIMEFORMAT>'.$row['TimeFormat'].'</TIMEFORMAT><DECIMAL>'.$row['DecimalPoint'].'</DECIMAL>';
+				$ret .= '<TIMEFORMAT>'.$row['TimeFormat'].'</TIMEFORMAT><INPUTDATEFORMAT>'.$row['InputDateFormat'].'</INPUTDATEFORMAT>';
+				$ret .= '<INPUTTIMEFORMAT>'.$row['InputTimeFormat'].'</INPUTTIMEFORMAT><DECIMAL>'.$row['DecimalPoint'].'</DECIMAL>';
 				$ret .= '<THOUSANDS>'.$row['ThousandSep'].'</THOUSANDS><CHARSET>'.$row['Charset'].'</CHARSET>';
 				$ret .= '<UNITSYSTEM>'.$row['UnitSystem'].'</UNITSYSTEM>'."\n";