projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auf CustomerVendor auf currency_id umgestellt
[kivitendo-erp.git]
/
SL
/
Helper
/
DateTime.pm
diff --git
a/SL/Helper/DateTime.pm
b/SL/Helper/DateTime.pm
index
58fe6f8
..
639ed45
100644
(file)
--- a/
SL/Helper/DateTime.pm
+++ b/
SL/Helper/DateTime.pm
@@
-2,6
+2,8
@@
package DateTime;
use strict;
use strict;
+use SL::Util qw(_hashify);
+
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);
}
@@
-10,14
+12,25
@@
sub today_local {
return shift->now(time_zone => $::locale->get_local_time_zone)->truncate(to => 'day');
}
return shift->now(time_zone => $::locale->get_local_time_zone)->truncate(to => 'day');
}
+sub to_kivitendo {
+ my ($self, %params) = _hashify(1, @_);
+ return $::locale->format_date_object($self, %params);
+}
+
sub to_lxoffice {
sub to_lxoffice {
- return $::locale->format_date(\%::myconfig, $_[0]);
+ # Legacy name.
+ goto &to_kivitendo;
}
}
-sub from_
lxoffice
{
+sub from_
kivitendo
{
return $::locale->parse_date_to_object(\%::myconfig, $_[1]);
}
return $::locale->parse_date_to_object(\%::myconfig, $_[1]);
}
+sub from_lxoffice {
+ # Legacy name.
+ goto &from_kivitendo;
+}
+
1;
__END__
1;
__END__
@@
-40,16
+53,23
@@
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_kivitendo %param>
+
+Formats the date and time according to the current kivitendo user's
+date format with L<Locale::format_datetime_object>.
-Formats the date according to the current Lx-Office user's date
-format.
+The legacy name C<to_lxoffice> is still supported.
-=item C<from_
lxoffice
>
+=item C<from_
kivitendo $string
>
-Parses a date string formatted in the current
Lx-Office
user's date
+Parses a date string formatted in the current
kivitendo
user's date
format and returns an instance of L<DateTime>.
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_kivitendo>).
+
+The legacy name C<from_lxoffice> is still supported.
+
=back
=head1 AUTHOR
=back
=head1 AUTHOR