projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Teil 2.1 von: Usability und Lokalisierung, Administration, Gruppen
[kivitendo-erp.git]
/
SL
/
Locale.pm
diff --git
a/SL/Locale.pm
b/SL/Locale.pm
index
0668081
..
4fde616
100644
(file)
--- a/
SL/Locale.pm
+++ b/
SL/Locale.pm
@@
-36,6
+36,7
@@
package Locale;
package Locale;
+use DateTime;
use Encode;
use List::Util qw(first);
use List::MoreUtils qw(any);
use Encode;
use List::Util qw(first);
use List::MoreUtils qw(any);
@@
-212,7
+213,7
@@
sub text {
my $self = shift;
my $text = shift;
my $self = shift;
my $text = shift;
- if (
exists
$self->{texts}->{$text}) {
+ if ($self->{texts}->{$text}) {
$text = $self->{iconv}->convert($self->{texts}->{$text});
} else {
$text = $self->{iconv_english}->convert($text);
$text = $self->{iconv}->convert($self->{texts}->{$text});
} else {
$text = $self->{iconv_english}->convert($text);
@@
-239,6
+240,7
@@
sub findsub {
$original =~ s/_+/_/g;
$translation = lc $translation;
$original =~ s/_+/_/g;
$translation = lc $translation;
+ $translation =~ s/\s+/_/g;
$self->{texts_reverse}->{$translation} ||= [ ];
push @{ $self->{texts_reverse}->{$translation} }, $original;
$self->{texts_reverse}->{$translation} ||= [ ];
push @{ $self->{texts_reverse}->{$translation} }, $original;
@@
-373,6
+375,13
@@
sub parse_date {
return ($yy, $mm, $dd);
}
return ($yy, $mm, $dd);
}
+sub parse_date_to_object {
+ my $self = shift;
+ my ($yy, $mm, $dd) = $self->parse_date(@_);
+
+ return $yy && $mm && $dd ? DateTime->new(year => $yy, month => $mm, day => $dd) : undef;
+}
+
sub reformat_date {
$main::lxdebug->enter_sub();
sub reformat_date {
$main::lxdebug->enter_sub();
@@
-401,14
+410,23
@@
sub reformat_date {
sub format_date {
$main::lxdebug->enter_sub();
sub format_date {
$main::lxdebug->enter_sub();
- my ($self, $myconfig, $yy, $mm, $dd) = @_;
+ my $self = shift;
+ my $myconfig = shift;
+ my $yy = shift;
+ my $mm = shift;
+ my $dd = shift;
+ my $yy_len = shift || 4;
+
+ ($yy, $mm, $dd) = ($yy->year, $yy->month, $yy->day) if ref $yy eq 'DateTime';
$main::lxdebug->leave_sub() and return "" unless $yy && $mm && $dd;
$main::lxdebug->leave_sub() and return "" unless $yy && $mm && $dd;
- my $format = $myconfig->{dateformat};
+ $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{ d+ }{ sprintf("%0" . (length($&)) . "d", $dd) }gex;
$format =~ s{ m+ }{ sprintf("%0" . (length($&)) . "d", $mm) }gex;
- $format =~ s{ y+ }{ sprintf("%
4d",
$yy) }gex;
+ $format =~ s{ y+ }{ sprintf("%
0${yy_len}d",
$yy) }gex;
$main::lxdebug->leave_sub();
$main::lxdebug->leave_sub();
@@
-444,14
+462,22
@@
sub remap_special_chars {
return $self->quote_special_chars($dst_format, $self->quote_special_chars("${src_format}-reverse", shift));
}
return $self->quote_special_chars($dst_format, $self->quote_special_chars("${src_format}-reverse", shift));
}
+sub raw_io_active {
+ my $self = shift;
+
+ return !!$self->{raw_io_active};
+}
+
sub with_raw_io {
my $self = shift;
my $fh = shift;
my $code = shift;
sub with_raw_io {
my $self = shift;
my $fh = shift;
my $code = shift;
+ $self->{raw_io_active} = 1;
binmode $fh, ":raw";
$code->();
binmode $fh, ":utf8" if $self->is_utf8;
binmode $fh, ":raw";
$code->();
binmode $fh, ":utf8" if $self->is_utf8;
+ $self->{raw_io_active} = 0;
}
1;
}
1;