X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLocale.pm;h=b6065da7761d8f9df1054c1c9fc49ed242603d29;hb=fe546cb027a1604ce2ba0f93b1bd241794fb66e4;hp=ccf494343e9fbf843ced5e3acd17738ed6af8fa8;hpb=008c2e1529744e195616ac2cbf7736f06a90816e;p=kivitendo-erp.git

diff --git a/SL/Locale.pm b/SL/Locale.pm
index ccf494343..b6065da77 100644
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -77,7 +77,6 @@ sub _init {
   my $self     = shift;
   my $country  = shift;
 
-  $self->{charset}     = Common::DEFAULT_CHARSET;
   $self->{countrycode} = $country;
 
   if ($country && -d "locale/$country") {
@@ -87,29 +86,17 @@ sub _init {
       eval($code);
       close(IN);
     }
-
-    if (open IN, "<", "locale/$country/charset") {
-      $self->{charset} = <IN>;
-      close IN;
-
-      chomp $self->{charset};
-    }
   }
 
-  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";
-    binmode STDERR, ":utf8";
-  }
+  binmode STDOUT, ":utf8";
+  binmode STDERR, ":utf8";
 
-  $self->{iconv}            = SL::Iconv->new($self->{charset}, $db_charset);
-  $self->{iconv_reverse}    = SL::Iconv->new($db_charset,      $self->{charset});
-  $self->{iconv_english}    = SL::Iconv->new('ASCII',          $db_charset);
-  $self->{iconv_iso8859}    = SL::Iconv->new('ISO-8859-15',    $db_charset);
-  $self->{iconv_to_iso8859} = SL::Iconv->new($db_charset,      'ISO-8859-15');
-  $self->{iconv_utf8}       = SL::Iconv->new('UTF-8',          $db_charset);
+  $self->{iconv}            = SL::Iconv->new('UTF-8',       'UTF-8');
+  $self->{iconv_reverse}    = SL::Iconv->new('UTF-8',       'UTF-8');
+  $self->{iconv_english}    = SL::Iconv->new('ASCII',       'UTF-8');
+  $self->{iconv_iso8859}    = SL::Iconv->new('ISO-8859-15', 'UTF-8');
+  $self->{iconv_to_iso8859} = SL::Iconv->new('UTF-8',       'ISO-8859-15');
+  $self->{iconv_utf8}       = SL::Iconv->new('UTF-8',       'UTF-8');
 
   $self->_read_special_chars_file($country);
 
@@ -121,12 +108,6 @@ sub _init {
     (qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec));
 }
 
-sub is_utf8 {
-  my $self   = shift;
-  my $handle = shift;
-  return $self->{is_utf8} && (!$handle || $handle->is_utf8);
-}
-
 sub _handle_markup {
   my $self    = shift;
   my $str     = shift;
@@ -403,8 +384,7 @@ sub format_date_object {
   my ($self, $datetime, %params)    = @_;
 
   my $format             =  $::myconfig{dateformat} || 'yyyy-mm-dd';
-  $format                =~ s/yyyy/\%Y/;
-  $format                =~ s/yy/\%y/;
+  $format                =~ s/yy(?:yy)?/\%Y/;
   $format                =~ s/mm/\%m/;
   $format                =~ s/dd/\%d/;
 
@@ -515,7 +495,7 @@ sub with_raw_io {
   $self->{raw_io_active} = 1;
   binmode $fh, ":raw";
   $code->();
-  binmode $fh, ":utf8" if $self->is_utf8;
+  binmode $fh, ":utf8";
   $self->{raw_io_active} = 0;
 }
 
@@ -540,7 +520,20 @@ sub get_local_time_zone {
   return $self->{local_time_zone};
 }
 
+sub language_join {
+  my ($self, $items, %params) = @_;
+
+  $items               ||= [];
+  $params{conjunction} ||= $::locale->text('and');
+  my $num                = scalar @{ $items };
+
+  return 0 == $num ? ''
+       : 1 == $num ? $items->[0]
+       :             join(', ', @{ $items }[0..$num - 2]) . ' ' . $params{conjunction} . ' ' . $items->[$num - 1];
+}
+
 1;
+
 __END__
 
 =pod
@@ -611,10 +604,6 @@ Add hour:minute:second to the date.
 
 TODO: Describe get_local_time_zone
 
-=item C<is_utf8>
-
-TODO: Describe is_utf8
-
 =item C<lang_to_locale>
 
 TODO: Describe lang_to_locale