Revision be6f6cfd
Von Moritz Bunkus vor fast 14 Jahren hinzugefügt
SL/Locale.pm | ||
---|---|---|
55 | 55 |
|
56 | 56 |
my ($type, $country) = @_; |
57 | 57 |
|
58 |
$country ||= $::language;
|
|
58 |
$country ||= $::lx_office_conf{system}->{language};
|
|
59 | 59 |
$country =~ s|.*/||; |
60 | 60 |
$country =~ s|\.||g; |
61 | 61 |
|
... | ... | |
96 | 96 |
} |
97 | 97 |
} |
98 | 98 |
|
99 |
my $db_charset = $main::dbcharset || Common::DEFAULT_CHARSET;
|
|
100 |
$self->{is_utf8} = (any { lc($::dbcharset || '') eq $_ } qw(utf8 utf-8 unicode)) ? 1 : 0;
|
|
99 |
my $db_charset = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET;
|
|
100 |
$self->{is_utf8} = (any { lc($::lx_office_conf{system}->{dbcharset} || '') eq $_ } qw(utf8 utf-8 unicode)) ? 1 : 0;
|
|
101 | 101 |
|
102 | 102 |
if ($self->{is_utf8}) { |
103 | 103 |
binmode STDOUT, ":utf8"; |
Auch abrufbar als: Unified diff
Globale Variablen für Systemeinstellungen und Features nach %::lx_office_conf verschoben
Betroffen sind:
$webdav
$vertreter
$lizenzen
$show_best_before
$parts_show_image
$parts_image_css
$parts_listing_images
$eur
$dbcharset
$language