Merge branch 'master' of ssh://git-sdonath@lx-office.linet-services.de/~/lx-office-erp

diff --git a/locale/de/all b/locale/de/all
index 532d3d4..9d78ab9 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# -*- coding: ISO-8859-15; -*-
+# -*- coding: iso-8859-15; -*-
 # vim: fenc=ISO-8859-15
 
 # These are all the texts to build the translations files.

diff --git a/scripts/locales.pl b/scripts/locales.pl
index d156ddd..fa787a2 100755 (executable)
--- a/scripts/locales.pl
+++ b/scripts/locales.pl
@@ -601,7 +601,9 @@ sub generate_file {
 
   open my $fh, '>', $file or die "$! : $file";
 
-  print $fh "#!/usr/bin/perl\n# -*- coding: $charset; -*-\n# vim: fenc=$charset\n\n";
+  my $emacs_charset = lc $charset;
+
+  print $fh "#!/usr/bin/perl\n# -*- coding: $emacs_charset; -*-\n# vim: fenc=$charset\n\n";
   print $fh $header, "\n" if $header;
   print $fh "$data_name = $delim[0]\n" if $data_name;