next if ($control->{ignore});
- $control->{charset} ||= Common::DEFAULT_CHARSET;
+ $control->{charset} = $control->{charset} || $control->{encoding} || Common::DEFAULT_CHARSET;
if (!$control->{"tag"}) {
_control_error($form, $file_name, $locale->text("Missing 'tag' field.")) ;
my $file_charset = Common::DEFAULT_CHARSET;
while (<$fh>) {
last if !/^--/;
- next if !/^--\s*\@charset:\s*(.+)/;
+ next if !/^--\s*\@(?:charset|encoding):\s*(.+)/;
$file_charset = $1;
last;
}
} else {
while (<$fh>) {
last if !/^--/;
- next if !/^--\s*\@charset:\s*(.+)/;
+ next if !/^--\s*\@(?:charset|encoding):\s*(.+)/;
$file_charset = $1;
last;
}
before the current one is applied.
=item charset
+=item encoding
-The charset this file uses. Defaults to C<ISO-8859-15> if missing.
+The charset this file uses. Defaults to C<ISO-8859-15> if
+missing. Both terms are recognized.
=item priority