Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6463/UI
Modified Files:
HTML.pm
Log Message:
Fixed a bug that 'session is not defined' error occurs
Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.374
retrieving revision 1.375
diff -C2 -d -r1.374 -r1.375
*** HTML.pm 6 Sep 2007 17:05:42 -0000 1.374
--- HTML.pm 6 Sep 2007 17:34:10 -0000 1.375
***************
*** 2970,2973 ****
--- 2970,2976 ----
}
+ # Store the language for the user.
+ my $language_for_user = $self->user_config_( $self->{sessions__}{$session}{user}, 'language');
+
foreach my $row (@rows) {
my %row_data;
***************
*** 3001,3005 ****
$col_data{History_Cell_Value} =
$self->shorten__( $col_data{History_Cell_Title},
! $length );
push ( @column_data, \%col_data );
next;
--- 3004,3010 ----
$col_data{History_Cell_Value} =
$self->shorten__( $col_data{History_Cell_Title},
! $length,
! $language_for_user
! );
push ( @column_data, \%col_data );
next;
***************
*** 3009,3013 ****
$col_data{History_If_Subject_Column} = 1;
! if ( $self->user_config_( $self->{sessions__}{$session}{user}, 'language' ) eq 'Nihongo' ) {
# Remove wrong characters as euc-jp.
for my $i (1..4) {
--- 3014,3018 ----
$col_data{History_If_Subject_Column} = 1;
! if ( $language_for_user eq 'Nihongo' ) {
# Remove wrong characters as euc-jp.
for my $i (1..4) {
***************
*** 3018,3022 ****
$col_data{History_Cell_Title} = $$row[4];
$col_data{History_Cell_Value} =
! $self->shorten__( $$row[4], $length );
$col_data{History_Mail_File} = $$row[0];
$col_data{History_Fields} =
--- 3023,3027 ----
$col_data{History_Cell_Title} = $$row[4];
$col_data{History_Cell_Value} =
! $self->shorten__( $$row[4], $length, $language_for_user );
$col_data{History_Mail_File} = $$row[0];
$col_data{History_Fields} =
***************
*** 3109,3117 ****
sub shorten__
{
! my ( $self, $string, $length ) = @_;
if ( length($string)>$length) {
$string =~ /(.{$length})/;
! $1 =~ /((?:$euc_jp)*)/o if ( $self->user_config_( $self->{sessions__}{$session}{user}, 'language' ) eq 'Nihongo' );
$string = "$1...";
}
--- 3114,3122 ----
sub shorten__
{
! my ( $self, $string, $length, $language ) = @_;
if ( length($string)>$length) {
$string =~ /(.{$length})/;
! $1 =~ /((?:$euc_jp)*)/o if ( $language eq 'Nihongo' );
$string = "$1...";
}
|
