Index: branches/5.2.x/core/units/languages/languages_config.php
===================================================================
diff -u -N -r15238 -r15436
--- branches/5.2.x/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 15238)
+++ branches/5.2.x/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 15436)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: languages_config.php 15238 2012-03-26 17:25:31Z alex $
+* @version	$Id: languages_config.php 15436 2012-07-12 16:09:50Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -187,7 +187,9 @@
 			'not_null' => '1', 'required' => 1, 'default' => 'g:i:s A',
 		),
 		'DateFormat' => Array ('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => 'm/d/Y'),
+		'ShortDateFormat' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => 'm/d'),
 		'TimeFormat' => Array ('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => 'g:i:s A'),
+		'ShortTimeFormat' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => 'g:i A'),
 		'DecimalPoint' => Array ('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => '.'),
 		'ThousandSep' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 		'Charset' => Array ('type' => 'string', 'not_null' => '1', 'required' => 1, 'default' => 'utf-8'),
Index: branches/5.2.x/core/units/helpers/language_import_helper.php
===================================================================
diff -u -N -r15359 -r15436
--- branches/5.2.x/core/units/helpers/language_import_helper.php	(.../language_import_helper.php)	(revision 15359)
+++ branches/5.2.x/core/units/helpers/language_import_helper.php	(.../language_import_helper.php)	(revision 15436)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: language_import_helper.php 15359 2012-05-27 20:04:02Z alex $
+* @version	$Id: language_import_helper.php 15436 2012-07-12 16:09:50Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -738,8 +738,9 @@
 		function _getExportFields()
 		{
 			return Array (
-				'PackName', 'LocalName', 'DateFormat', 'TimeFormat', 'InputDateFormat', 'InputTimeFormat',
-				'DecimalPoint', 'ThousandSep', 'Charset', 'UnitSystem', 'Locale', 'UserDocsUrl'
+				'PackName', 'LocalName', 'DateFormat', 'ShortDateFormat', 'TimeFormat', 'ShortTimeFormat',
+				'InputDateFormat', 'InputTimeFormat', 'DecimalPoint', 'ThousandSep', 'Charset', 'UnitSystem',
+				'Locale', 'UserDocsUrl'
 			);
 		}
 
Index: branches/5.2.x/core/install/install_schema.sql
===================================================================
diff -u -N -r15433 -r15436
--- branches/5.2.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 15433)
+++ branches/5.2.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 15436)
@@ -169,7 +169,9 @@
   IconURL varchar(255) DEFAULT NULL,
   IconDisabledURL varchar(255) DEFAULT NULL,
   DateFormat varchar(50) NOT NULL DEFAULT 'm/d/Y',
+  ShortDateFormat varchar(255) NOT NULL DEFAULT 'm/d',
   TimeFormat varchar(50) NOT NULL DEFAULT 'g:i:s A',
+  ShortTimeFormat varchar(255) NOT NULL DEFAULT 'g:i A',
   InputDateFormat varchar(50) NOT NULL DEFAULT 'm/d/Y',
   InputTimeFormat varchar(50) NOT NULL DEFAULT 'g:i:s A',
   DecimalPoint varchar(10) NOT NULL DEFAULT '.',
Index: branches/5.2.x/core/install/upgrades.sql
===================================================================
diff -u -N -r15433 -r15436
--- branches/5.2.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 15433)
+++ branches/5.2.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 15436)
@@ -2763,3 +2763,12 @@
 ALTER TABLE ScheduledTasks ADD RunSchedule VARCHAR(255) NOT NULL DEFAULT '* * * * *' AFTER Event;
 DELETE FROM UserPersistentSessionData WHERE VariableName = 'scheduled-task[Default]columns_.';
 DELETE FROM LanguageLabels WHERE PhraseKey = 'LA_FLD_RUNINTERVAL';
+
+ALTER TABLE Languages
+	ADD ShortDateFormat VARCHAR(255) NOT NULL DEFAULT 'm/d' AFTER DateFormat,
+	ADD ShortTimeFormat VARCHAR(255) NOT NULL DEFAULT 'g:i A' AFTER TimeFormat;
+
+UPDATE Languages
+SET
+	ShortDateFormat = REPLACE(REPLACE(DateFormat, '/Y', ''), '/y', ''),
+	ShortTimeFormat = REPLACE(TimeFormat, ':s', '');
Index: branches/5.2.x/core/admin_templates/regional/languages_edit.tpl
===================================================================
diff -u -N -r15225 -r15436
--- branches/5.2.x/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 15225)
+++ branches/5.2.x/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 15436)
@@ -66,7 +66,9 @@
 			<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="InputDateFormat"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="InputTimeFormat"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="DateFormat"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="ShortDateFormat"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="TimeFormat"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="ShortTimeFormat"/>
 
 			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="DecimalPoint"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="ThousandSep"/>
Index: branches/5.2.x/core/install/english.lang
===================================================================
diff -u -N -r15433 -r15436
--- branches/5.2.x/core/install/english.lang	(.../english.lang)	(revision 15433)
+++ branches/5.2.x/core/install/english.lang	(.../english.lang)	(revision 15436)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LANGUAGES Version="6">
-	<LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
+	<LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" ShortDateFormat="m/d" TimeFormat="g:i A" ShortTimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
 		<EMAILDESIGNS>
 			<HTML>JGJvZHkNCjxici8+PGJyLz4NCg0KU2luY2VyZWx5LDxici8+PGJyLz4NCg0KV2Vic2l0ZSBhZG1pbmlzdHJhdGlvbi4NCg0KPCEtLSMjIDxpbnAyOmVtYWlsLWxvZ19JdGVtTGluayB0ZW1wbGF0ZT0icGxhdGZvcm0vbXlfYWNjb3VudC9lbWFpbCIvPiAjIy0tPg==</HTML>
 		</EMAILDESIGNS>
@@ -625,7 +625,9 @@
 			<PHRASE Label="la_fld_SentStatus" Module="Core" Type="1" Column="U2VudA==">U2VudA==</PHRASE>
 			<PHRASE Label="la_fld_Server" Module="Core" Type="1">U2VydmVy</PHRASE>
 			<PHRASE Label="la_fld_SessionLogId" Module="Core" Type="1" Column="U2Vzc2lvbiBMb2cgSUQ=">U2Vzc2lvbiBMb2cgSUQ=</PHRASE>
+			<PHRASE Label="la_fld_ShortDateFormat" Module="Core" Type="1" Column="U2hvcnQgRGF0ZSBGb3JtYXQ=">U2hvcnQgRGF0ZSBGb3JtYXQ=</PHRASE>
 			<PHRASE Label="la_fld_ShortIsoCode" Module="Core" Type="1" Column="U2hvcnQgSVNPIENvZGU=">U2hvcnQgSVNPIENvZGU=</PHRASE>
+			<PHRASE Label="la_fld_ShortTimeFormat" Module="Core" Type="1" Column="U2hvcnQgVGltZSBGb3JtYXQ=">U2hvcnQgVGltZSBGb3JtYXQ=</PHRASE>
 			<PHRASE Label="la_fld_SimpleSearch" Module="Core" Type="1">U2ltcGxlIFNlYXJjaA==</PHRASE>
 			<PHRASE Label="la_fld_SiteDomainLimitation" Module="Core" Type="1" Column="U2l0ZSBEb21haW4gTGltaXRhdGlvbg==">U2l0ZSBEb21haW4gTGltaXRhdGlvbg==</PHRASE>
 			<PHRASE Label="la_fld_SkinName" Module="Core" Type="1" Column="TmFtZQ==">TmFtZQ==</PHRASE>