Index: admin_templates/regional/languages_edit.tpl
===================================================================
--- admin_templates/regional/languages_edit.tpl (revision 15359)
+++ admin_templates/regional/languages_edit.tpl (working copy)
@@ -66,7 +66,9 @@
+
+
Index: install/english.lang
===================================================================
--- install/english.lang (revision 15433)
+++ install/english.lang (working copy)
@@ -1,6 +1,6 @@
-
+
JGJvZHkNCjxici8+PGJyLz4NCg0KU2luY2VyZWx5LDxici8+PGJyLz4NCg0KV2Vic2l0ZSBhZG1pbmlzdHJhdGlvbi4NCg0KPCEtLSMjIDxpbnAyOmVtYWlsLWxvZ19JdGVtTGluayB0ZW1wbGF0ZT0icGxhdGZvcm0vbXlfYWNjb3VudC9lbWFpbCIvPiAjIy0tPg==
@@ -625,7 +625,9 @@
U2VudA==
U2VydmVy
U2Vzc2lvbiBMb2cgSUQ=
+ U2hvcnQgRGF0ZSBGb3JtYXQ=
U2hvcnQgSVNPIENvZGU=
+ U2hvcnQgVGltZSBGb3JtYXQ=
U2ltcGxlIFNlYXJjaA==
U2l0ZSBEb21haW4gTGltaXRhdGlvbg==
TmFtZQ==
Index: install/install_schema.sql
===================================================================
--- install/install_schema.sql (revision 15433)
+++ install/install_schema.sql (working copy)
@@ -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: install/upgrades.sql
===================================================================
--- install/upgrades.sql (revision 15433)
+++ install/upgrades.sql (working copy)
@@ -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: units/helpers/language_import_helper.php
===================================================================
--- units/helpers/language_import_helper.php (revision 15359)
+++ units/helpers/language_import_helper.php (working copy)
@@ -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: units/languages/languages_config.php
===================================================================
--- units/languages/languages_config.php (revision 15359)
+++ units/languages/languages_config.php (working copy)
@@ -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'),