$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} };
+ }
+ }
}
}
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();