Perl-Scripte mit UTF-8 encodierten Umlaugen brauchen "use utf8"

diff --git a/locale/de/all b/locale/de/all
index f25d6372fbd00b96f7ef256127b7700a7fa15e0a..d83821a12a5dc6364569c81d9172a3fdc7aed2a5 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -2,6 +2,8 @@
 # -*- coding: utf-8; -*-
 # vim: fenc=UTF-8
 
 # -*- coding: utf-8; -*-
 # vim: fenc=UTF-8
 

+use utf8;
+

 # These are all the texts to build the translations files.
 # The file has the form of 'english text'  => 'foreign text',
 # you can add the translation in this file or in the 'missing' file
 # These are all the texts to build the translations files.
 # The file has the form of 'english text'  => 'foreign text',
 # you can add the translation in this file or in the 'missing' file


@@ -153,7 +155,6 @@ $self->{texts} = {
   'Add bank account'            => 'Bankkonto erfassen',
   'Add custom variable'         => 'Benutzerdefinierte Variable erfassen',
   'Add note'                    => 'Notiz erfassen',
   'Add bank account'            => 'Bankkonto erfassen',
   'Add custom variable'         => 'Benutzerdefinierte Variable erfassen',
   'Add note'                    => 'Notiz erfassen',

-  'Add to group'                => 'Zu Gruppe hinzufügen',

   'Add unit'                    => 'Einheit hinzufügen',
   'Address'                     => 'Adresse',
   'Administration'              => 'Administration',
   'Add unit'                    => 'Einheit hinzufügen',
   'Address'                     => 'Adresse',
   'Administration'              => 'Administration',


@@ -1011,8 +1012,6 @@ $self->{texts} = {
   'May '                        => 'Mai',
   'May set the BCC field when sending emails' => 'Beim Verschicken von Emails das Feld \'BCC\' setzen',
   'Medium Number'               => 'Datenträgernummer',
   'May '                        => 'Mai',
   'May set the BCC field when sending emails' => 'Beim Verschicken von Emails das Feld \'BCC\' setzen',
   'Medium Number'               => 'Datenträgernummer',

-  'Members not of'              => 'Benutzer nicht in Gruppe',
-  'Members of'                  => 'Benutzer in Gruppe',

   'Memo'                        => 'Memo',
   'Menu'                        => 'Menü',
   'Message'                     => 'Nachricht',
   'Memo'                        => 'Memo',
   'Menu'                        => 'Menü',
   'Message'                     => 'Nachricht',

diff --git a/locale/de_DE/all b/locale/de_DE/all
index 60afbed2d87da88ae601b8061cc1da306991aa2b..9cf56b7c68950e8cf5d3bc57874400034bd2b0c5 100644 (file)
--- a/locale/de_DE/all
+++ b/locale/de_DE/all
@@ -2,6 +2,8 @@
 # -*- coding: utf-8; -*-
 # vim: fenc=UTF-8
 
 # -*- coding: utf-8; -*-
 # vim: fenc=UTF-8
 

+use utf8;
+

 # These are all the texts to build the translations files.
 # The file has the form of 'english text'  => 'foreign text',
 # you can add the translation in this file or in the 'missing' file
 # These are all the texts to build the translations files.
 # The file has the form of 'english text'  => 'foreign text',
 # you can add the translation in this file or in the 'missing' file

diff --git a/locale/en/all b/locale/en/all
index e562295db9fe9d392cba1291a88410ef5e96fae7..461e7dce6df52367dfcad59a3fd6b9168b08a3de 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -2,6 +2,8 @@
 # -*- coding: utf-8; -*-
 # vim: fenc=UTF-8
 
 # -*- coding: utf-8; -*-
 # vim: fenc=UTF-8
 

+use utf8;
+

 # These are all the texts to build the translations files.
 # The file has the form of 'english text'  => 'foreign text',
 # you can add the translation in this file or in the 'missing' file
 # These are all the texts to build the translations files.
 # The file has the form of 'english text'  => 'foreign text',
 # you can add the translation in this file or in the 'missing' file

diff --git a/scripts/locales.pl b/scripts/locales.pl
index 25579c3ea5e9f57f84368aa3639df7428f45660e..ff2638b627f9da9c8f873ac8db6f0e66c0a673ae 100755 (executable)
--- a/scripts/locales.pl
+++ b/scripts/locales.pl
@@ -600,12 +600,12 @@ sub generate_file {
   my $data_name = $params{data_name};
   my @delim     = split //, ($params{delim} || '{}');
 
   my $data_name = $params{data_name};
   my @delim     = split //, ($params{delim} || '{}');
 

-  open my $fh, '>', $file or die "$! : $file";
+  open my $fh, '>:encoding(utf8)', $file or die "$! : $file";

 
   $charset =~ s/\r?\n//g;
   my $emacs_charset = lc $charset;
 
 
   $charset =~ s/\r?\n//g;
   my $emacs_charset = lc $charset;
 

-  print $fh "#!/usr/bin/perl\n# -*- coding: $emacs_charset; -*-\n# vim: fenc=$charset\n\n";
+  print $fh "#!/usr/bin/perl\n# -*- coding: $emacs_charset; -*-\n# vim: fenc=$charset\n\nuse utf8;\n\n";

   print $fh $header, "\n" if $header;
   print $fh "$data_name = $delim[0]\n" if $data_name;
 
   print $fh $header, "\n" if $header;
   print $fh "$data_name = $delim[0]\n" if $data_name;