From: Thomas Heck Date: Tue, 28 Aug 2012 15:48:23 +0000 (+0200) Subject: Datumsformate "dd-mm-yy" und "mm-dd-yy" entfernt. X-Git-Tag: release-3.0.0beta1~270 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0f13c96b9a8a89a3dfdb8c84d523746b42bad7d5;p=kivitendo-erp.git Datumsformate "dd-mm-yy" und "mm-dd-yy" entfernt. fixt #1871 --- diff --git a/SL/DB.pm b/SL/DB.pm index 861fe6a52..dd551636b 100644 --- a/SL/DB.pm +++ b/SL/DB.pm @@ -38,9 +38,7 @@ sub create { my %_dateformats = ( 'yy-mm-dd' => 'ISO', 'yyyy-mm-dd' => 'ISO', 'mm/dd/yy' => 'SQL, US', - 'mm-dd-yy' => 'POSTGRES, US', 'dd/mm/yy' => 'SQL, EUROPEAN', - 'dd-mm-yy' => 'POSTGRES, EUROPEAN', 'dd.mm.yy' => 'GERMAN' ); diff --git a/SL/Form.pm b/SL/Form.pm index 2f4283359..547611d68 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -788,10 +788,8 @@ sub write_trigger { # default my %dateformats = ( "dd.mm.yy" => "%d.%m.%Y", - "dd-mm-yy" => "%d-%m-%Y", "dd/mm/yy" => "%d/%m/%Y", "mm/dd/yy" => "%m/%d/%Y", - "mm-dd-yy" => "%m-%d-%Y", "yyyy-mm-dd" => "%Y-%m-%d", ); diff --git a/SL/User.pm b/SL/User.pm index 2addf2905..0ac87fe90 100644 --- a/SL/User.pm +++ b/SL/User.pm @@ -199,18 +199,14 @@ sub dbconnect_vars { 'Pg' => { 'yy-mm-dd' => 'set DateStyle to \'ISO\'', 'yyyy-mm-dd' => 'set DateStyle to \'ISO\'', 'mm/dd/yy' => 'set DateStyle to \'SQL, US\'', - 'mm-dd-yy' => 'set DateStyle to \'POSTGRES, US\'', 'dd/mm/yy' => 'set DateStyle to \'SQL, EUROPEAN\'', - 'dd-mm-yy' => 'set DateStyle to \'POSTGRES, EUROPEAN\'', 'dd.mm.yy' => 'set DateStyle to \'GERMAN\'' }, 'Oracle' => { 'yy-mm-dd' => 'ALTER SESSION SET NLS_DATE_FORMAT = \'YY-MM-DD\'', 'yyyy-mm-dd' => 'ALTER SESSION SET NLS_DATE_FORMAT = \'YYYY-MM-DD\'', 'mm/dd/yy' => 'ALTER SESSION SET NLS_DATE_FORMAT = \'MM/DD/YY\'', - 'mm-dd-yy' => 'ALTER SESSION SET NLS_DATE_FORMAT = \'MM-DD-YY\'', 'dd/mm/yy' => 'ALTER SESSION SET NLS_DATE_FORMAT = \'DD/MM/YY\'', - 'dd-mm-yy' => 'ALTER SESSION SET NLS_DATE_FORMAT = \'DD-MM-YY\'', 'dd.mm.yy' => 'ALTER SESSION SET NLS_DATE_FORMAT = \'DD.MM.YY\'', }); diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index 7581e9b34..c704174c8 100755 --- a/bin/mozilla/admin.pl +++ b/bin/mozilla/admin.pl @@ -73,7 +73,7 @@ our $form; our $locale; our $auth; -my @valid_dateformats = qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd); +my @valid_dateformats = qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd); my @valid_numberformats = ('1,000.00', '1000.00', '1.000,00', '1000,00'); my @all_stylesheets = qw(lx-office-erp.css Win2000.css Mobile.css kivitendo.css); my @all_menustyles = ( diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index 7549bc161..c84772813 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -742,7 +742,7 @@ sub language_header { print $::form->parse_html_template('am/language_header', { numberformats => [ '1,000.00', '1000.00', '1.000,00', '1000,00' ], - dateformats => [ qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd) ], + dateformats => [ qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd) ], }); $::lxdebug->leave_sub; @@ -1006,7 +1006,7 @@ sub config { my %myconfig = %main::myconfig; my $locale = $main::locale; - _build_cfg_options('dateformat', qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd)); + _build_cfg_options('dateformat', qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd)); _build_cfg_options('numberformat', ('1,000.00', '1000.00', '1.000,00', '1000,00')); my @formats = ();