# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
#======================================================================
#
# Translations and number/date formatting
return $locales_by_country{$country}
}
+sub is_supported {
+ my ($country) = @_;
+
+ return -f "locale/$country/all";
+}
+
sub _init {
my $self = shift;
my $country = shift;
$self->{countrycode} = $country;
if ($country && -d "locale/$country") {
- local *IN;
- if (open(IN, "<", "locale/$country/all")) {
- my $code = join("", <IN>);
+ if (open my $in, "<", "locale/$country/all") {
+ local $/ = undef;
+ my $code = <$in>;
eval($code);
- close(IN);
+ close($in);
+ }
+
+ if (-d "locale/$country/more") {
+ opendir my $dh, "locale/$country/more" or die "can't open locale/$country/more: $!";
+ my @files = sort grep -f "locale/$country/more/$_", readdir $dh;
+ close $dh;
+
+ for my $file (@files) {
+ if (open my $in, "<", "locale/$country/more/$file") {
+ local $/ = undef;
+ my $code = <$in>;
+ eval($code);
+ close($in);
+ $self->{texts}{$_} = $self->{more_texts}{$_} for keys %{ $self->{more_texts} };
+ }
+ }
}
}
($yy, $mm, $dd) = ($date =~ /(..)(..)(..)/);
}
- $dd *= 1;
- $mm *= 1;
+ $_ ||= 0 for ($dd, $mm, $yy);
+ $_ *= 1 for ($dd, $mm, $yy);
$yy = ($yy < 70) ? $yy + 2000 : $yy;
$yy = ($yy >= 70 && $yy <= 99) ? $yy + 1900 : $yy;
}
sub parse_date_to_object {
- my $self = shift;
- my ($yy, $mm, $dd) = $self->parse_date(@_);
+ my ($self, $string, %params) = @_;
+
+ return undef if !defined $string;
+
+ return DateTime->today_local if lc($string) eq 'today';
+ return DateTime->today_local->subtract(days => 1) if lc($string) eq 'yesterday';
+
+ $params{dateformat} ||= $::myconfig{dateformat} || 'yy-mm-dd';
+ $params{numberformat} ||= $::myconfig{numberformat} || '1,000.00';
+ my $num_separator = $params{numberformat} =~ m{,\d+$} ? ',' : '.';
+
+ my ($date_str, $time_str) = split m{\s+}, $string, 2;
+ my ($yy, $mm, $dd) = $self->parse_date(\%params, $date_str);
- return $yy && $mm && $dd ? DateTime->new(year => $yy, month => $mm, day => $dd) : undef;
+ my ($hour, $minute, $second) = split m/:/, ($time_str || '');
+ $second ||= '0';
+
+ ($second, my $millisecond) = split quotemeta($num_separator), $second, 2;
+ $_ ||= 0 for ($hour, $minute, $millisecond);
+
+ $millisecond = substr $millisecond, 0, 3;
+ $millisecond .= '0' x (3 - length $millisecond);
+
+ return undef unless $yy && $mm && $dd;
+ return DateTime->new(year => $yy, month => $mm, day => $dd, hour => $hour * 1, minute => $minute * 1, second => $second * 1, nanosecond => $millisecond * 1000000);
}
sub format_date_object_to_time {
sub format_date_object {
my ($self, $datetime, %params) = @_;
- my $format = $::myconfig{dateformat} || 'yyyy-mm-dd';
+ my $format = $params{dateformat} || $::myconfig{dateformat} || 'yyyy-mm-dd';
+ my $num_separator = ($params{numberformat} || $::myconfig{numberformat} || '1,000.00') =~ m{,\d+$} ? ',' : '.';
$format =~ s/yy(?:yy)?/\%Y/;
$format =~ s/mm/\%m/;
$format =~ s/dd/\%d/;
my $precision = $params{precision} || 'day';
$precision =~ s/s$//;
my %precision_spec_map = (
- second => '%H:%M:%S',
- minute => '%H:%M',
- hour => '%H',
+ millisecond => '%H:%M:%S' . $num_separator . '%3N',
+ second => '%H:%M:%S',
+ minute => '%H:%M',
+ hour => '%H',
);
$format .= ' ' . $precision_spec_map{$precision} if $precision_spec_map{$precision};
my ($yy, $mm, $dd) = $self->parse_date($myconfig, $date);
- $output_format =~ /d+/;
+ $output_format =~ /(d+)/;
substr($output_format, $-[0], $+[0] - $-[0]) =
- sprintf("%0" . (length($&)) . "d", $dd);
+ sprintf("%0" . (length($1)) . "d", $dd);
- $output_format =~ /m+/;
+ $output_format =~ /(m+)/;
substr($output_format, $-[0], $+[0] - $-[0]) =
- sprintf("%0" . (length($&)) . "d", $mm);
+ sprintf("%0" . (length($1)) . "d", $mm);
$output_format =~ /y+/;
substr($output_format, $-[0], $+[0] - $-[0]) = $yy;
$yy = $yy % 100 if 2 == $yy_len;
my $format = ref $myconfig eq '' ? "$myconfig" : $myconfig->{dateformat};
- $format =~ s{ d+ }{ sprintf("%0" . (length($&)) . "d", $dd) }gex;
- $format =~ s{ m+ }{ sprintf("%0" . (length($&)) . "d", $mm) }gex;
- $format =~ s{ y+ }{ sprintf("%0${yy_len}d", $yy) }gex;
+ $format =~ s{ (d+) }{ sprintf("%0" . (length($1)) . "d", $dd) }gex;
+ $format =~ s{ (m+) }{ sprintf("%0" . (length($1)) . "d", $mm) }gex;
+ $format =~ s{ (y+) }{ sprintf("%0${yy_len}d", $yy) }gex;
$main::lxdebug->leave_sub();
=item C<format_date_object $datetime, %params>
-Formats the C<$datetime> object accoring to the user's locale setting.
+Formats the C<$datetime> object according to the user's locale setting.
The parameter C<precision> can control whether or not the time
component is formatted as well:
Add hour:minute:second to the date.
+=item * C<millisecond>
+
+Add hour:minute:second.millisecond to the date. The decimal separator
+is derived from the number format.
+
+=item * C<numberformat>
+
+The number format to use, e.g. C<1,000.00>. If unset the user's
+current number format is used.
+
+=item * C<dateformat>
+
+The date format to use, e.g. C<mm/dd/yy>. If unset the user's current
+date format is used.
+
=back
=item C<get_local_time_zone>
TODO: Describe parse_date
-=item C<parse_date_to_object>
+=item C<parse_date_to_object $string, %params>
+
+Parses a date and optional timestamp in C<$string> and returns an
+instance of L<DateTime>. The date and number formats used are the ones
+the user has currently selected. They can be overriden by passing them
+in as parameters to this function, though.
-TODO: Describe parse_date_to_object
+The time stamps can have up to millisecond precision.
=item C<quote_special_chars>
projects / kivitendo-erp.git / blobdiff