projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Beispielscript für CSV-Import über die Kommandozeile
[kivitendo-erp.git]
/
SL
/
Locale.pm
diff --git
a/SL/Locale.pm
b/SL/Locale.pm
index
1f0c9f3
..
3f7df7e
100644
(file)
--- a/
SL/Locale.pm
+++ b/
SL/Locale.pm
@@
-55,7
+55,7
@@
sub new {
my ($type, $country) = @_;
my ($type, $country) = @_;
- $country ||= $::l
anguage
;
+ $country ||= $::l
x_office_conf{system}->{language}
;
$country =~ s|.*/||;
$country =~ s|\.||g;
$country =~ s|.*/||;
$country =~ s|\.||g;
@@
-96,8
+96,8
@@
sub _init {
}
}
}
}
- my $db_charset = $
main::dbcharset
|| Common::DEFAULT_CHARSET;
- $self->{is_utf8} = (any { lc($::
dbcharset
|| '') eq $_ } qw(utf8 utf-8 unicode)) ? 1 : 0;
+ my $db_charset = $
::lx_office_conf{system}->{dbcharset}
|| Common::DEFAULT_CHARSET;
+ $self->{is_utf8} = (any { lc($::
lx_office_conf{system}->{dbcharset}
|| '') eq $_ } qw(utf8 utf-8 unicode)) ? 1 : 0;
if ($self->{is_utf8}) {
binmode STDOUT, ":utf8";
if ($self->{is_utf8}) {
binmode STDOUT, ":utf8";
@@
-232,6
+232,7
@@
sub findsub {
my ($self, $text) = @_;
my $text_rev = lc $self->{iconv_reverse}->convert($text);
my ($self, $text) = @_;
my $text_rev = lc $self->{iconv_reverse}->convert($text);
+ $text_rev =~ s/[\s\-]+/_/g;
if (!$self->{texts_reverse}) {
$self->{texts_reverse} = { };
if (!$self->{texts_reverse}) {
$self->{texts_reverse} = { };
@@
-241,7
+242,7
@@
sub findsub {
$original =~ s/_+/_/g;
$translation = lc $translation;
$original =~ s/_+/_/g;
$translation = lc $translation;
- $translation =~ s/
\s
+/_/g;
+ $translation =~ s/
[\s\-]
+/_/g;
$self->{texts_reverse}->{$translation} ||= [ ];
push @{ $self->{texts_reverse}->{$translation} }, $original;
$self->{texts_reverse}->{$translation} ||= [ ];
push @{ $self->{texts_reverse}->{$translation} }, $original;
@@
-496,4
+497,10
@@
sub restore_numberformat {
$myconfig->{numberformat} = $self->{saved_numberformat} if $self->{saved_numberformat};
}
$myconfig->{numberformat} = $self->{saved_numberformat} if $self->{saved_numberformat};
}
+sub get_local_time_zone {
+ my $self = shift;
+ $self->{local_time_zone} ||= DateTime::TimeZone->new(name => 'local');
+ return $self->{local_time_zone};
+}
+
1;
1;