Attachment #3033 for bug #3755

View | Details | Raw Unified | Return to bug 3755
Collapse All | Expand All

Lines 1351-1356 Link Here

(-)lib/Mail/SpamAssassin.pm (+6 lines)
1351		1351
1352	$self->{config_text} .= $self->read_cf ($fname, 'user prefs file');	1352	$self->{config_text} .= $self->read_cf ($fname, 'user prefs file');
1353	}	1353	}
		1354
		1355	# Read the language files
		1356	$fname = $sysrules;
		1357	if (defined $fname) {
		1358	$self->{config_text} .= $self->read_cf ("$fname/lang", 'lang files');
		1359	}
1354	}	1360	}
1355		1361
1356	if ($self->{config_text} !~ /\S/) {	1362	if ($self->{config_text} !~ /\S/) {

Lines 243-248 Link Here

(-)lib/Mail/SpamAssassin/Conf/Parser.pm (+3 lines)
243	next unless($line); # skip empty lines	243	next unless($line); # skip empty lines
244		244
245	# handle i18n	245	# handle i18n
		246	if ($conf->{use_language} ne "LANG") {
		247	$lang = $conf->{use_language};
		248	}
246	if ($line =~ s/^lang\s+(\S+)\s+//) { next if ($lang !~ /^$1/i); }	249	if ($line =~ s/^lang\s+(\S+)\s+//) { next if ($lang !~ /^$1/i); }
247		250
248	my($key, $value) = split(/\s+/, $line, 2);	251	my($key, $value) = split(/\s+/, $line, 2);





=over 4

=item use_language xx				(default: LANG)

This options defines which language you want SpamAssassin to use in
its reports.

The default is to use the value of the LANG enviroment variable. If
you use spamd or your users do not have shell access you can override
the LANG enviroment variable with this setting.

Examples:

  use_language de
  use_language pt_br
  use_language LANG

=cut

  push (@cmds, {
    setting => 'use_language',
    default => 'LANG',
    type => $CONF_TYPE_STRING
  });

=over 4

=item ok_locales xx [ yy zz ... ]		(default: all)

This option is used to specify which locales (country codes) are

Return to bug 3755

Lines 795-800 Link Here

(-)lib/Mail/SpamAssassin/Conf.pm (+25 lines)
795		795
796	=over 4	796	=over 4
797		797
		798	=item use_language xx (default: LANG)
		799
		800	This options defines which language you want SpamAssassin to use in
		801	its reports.
		802
		803	The default is to use the value of the LANG enviroment variable. If
		804	you use spamd or your users do not have shell access you can override
		805	the LANG enviroment variable with this setting.
		806
		807	Examples:
		808
		809	use_language de
		810	use_language pt_br
		811	use_language LANG
		812
		813	=cut
		814
		815	push (@cmds, {
		816	setting => 'use_language',
		817	default => 'LANG',
		818	type => $CONF_TYPE_STRING
		819	});
		820
		821	=over 4
		822
798	=item ok_locales xx [ yy zz ... ] (default: all)	823	=item ok_locales xx [ yy zz ... ] (default: all)
799		824
800	This option is used to specify which locales (country codes) are	825	This option is used to specify which locales (country codes) are