Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

[kivitendo-erp.git] / SL / Helper / DateTime.pm

diff --git a/SL/Helper/DateTime.pm b/SL/Helper/DateTime.pm
index fa035eb..59a100c 100644 (file)
--- a/SL/Helper/DateTime.pm
+++ b/SL/Helper/DateTime.pm
@@ -1,5 +1,7 @@
 package DateTime;
 
 package DateTime;
 

+use strict;
+

 sub now_local {
   return shift->now(time_zone => $::locale->get_local_time_zone);
 }
 sub now_local {
   return shift->now(time_zone => $::locale->get_local_time_zone);
 }


@@ -9,7 +11,9 @@ sub today_local {
 }
 
 sub to_lxoffice {
 }
 
 sub to_lxoffice {

-  return $::locale->format_date(\%::myconfig, $_[0]);
+  my $self   = shift;
+  my %params = (scalar(@_) == 1) && (ref($_[0]) eq 'HASH') ? %{ $_[0] } : @_;
+  return $::locale->format_date_object($self, %params);

 }
 
 sub from_lxoffice {
 }
 
 sub from_lxoffice {


@@ -38,16 +42,19 @@ Returns the current time with the time zone set to the local time zone.
 
 Returns the current date with the time zone set to the local time zone.
 
 
 Returns the current date with the time zone set to the local time zone.
 

-=item C<to_lxoffice>
+=item C<to_lxoffice %param>

 
 

-Formats the date according to the current Lx-Office user's date
-format.
+Formats the date and time according to the current Lx-Office user's
+date format with L<Locale::format_datetime_object>.

 
 

-=item C<from_lxoffice>
+=item C<from_lxoffice $string>

 
 Parses a date string formatted in the current Lx-Office user's date
 format and returns an instance of L<DateTime>.
 
 
 Parses a date string formatted in the current Lx-Office user's date
 format and returns an instance of L<DateTime>.
 

+Note that only dates can be parsed at the moment, not the time
+component (as opposed to L<to_lxoffice>).
+

 =back
 
 =head1 AUTHOR
 =back
 
 =head1 AUTHOR