[popfile-commit] engine/UI HTML.pm,1.209,1.210

[<jgr...@us...>]

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv10730/UI

Modified Files:
	HTML.pm 
Log Message:
Merged Korean patch

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.209
retrieving revision 1.210
diff -C2 -d -r1.209 -r1.210
*** HTML.pm	2 Oct 2003 14:07:52 -0000	1.209
--- HTML.pm	6 Oct 2003 14:24:41 -0000	1.210
***************
*** 1395,1429 ****
          }
      } else {
!         for my $word (sort @words) {
!             $word =~ /^(.)/;
  
!             if ( $1 ne $last )  {
!                 if (! $firstRow) {
!                     $body .= "</td></tr>\n";
!                 } else {
!                     $firstRow = 0;
!                 }
!                 $body .= "<tr><th scope=\"row\" class=\"advancedAlphabet";
!                 if ($groupCounter == $groupSize) {
!                     $body .= "GroupSpacing";
                  }
!                 $body .= "\"><b>$1</b></th>\n";
!                 $body .= "<td class=\"advancedWords";
!                 if ($groupCounter == $groupSize) {
!                     $body .= "GroupSpacing";
!                     $groupCounter = 0;
                  }
!                 $body .= "\">";
  
  
!                 $last = $1;
!                 $need_comma = 0;
!                 $groupCounter += 1;
!             }
!             if ( $need_comma == 1 ) {
!                 $body .= ", $word";
!             } else {
!                 $body .= $word;
!                 $need_comma = 1;
              }
          }
--- 1395,1465 ----
          }
      } else {
!         if ( $self->config_( 'language' ) eq 'Korean' ) {
!     	    # don't use locale in Korean mode. Every other code is same
!     	    no locale;
!             for my $word (sort @words) {
!                 $word =~ /^(.)/;
  
!                 if ( $1 ne $last )  {
!                     if (! $firstRow) {
!                         $body .= "</td></tr>\n";
!                     } else {
!                         $firstRow = 0;
!                     }
!                     $body .= "<tr><th scope=\"row\" class=\"advancedAlphabet";
!                     if ($groupCounter == $groupSize) {
!                         $body .= "GroupSpacing";
!                     }
!                     $body .= "\"><b>$1</b></th>\n";
!                     $body .= "<td class=\"advancedWords";
!                     if ($groupCounter == $groupSize) {
!                         $body .= "GroupSpacing";
!                         $groupCounter = 0;
!                     }
!                     $body .= "\">";
! 
!                     $last = $1;
!                     $need_comma = 0;
!                     $groupCounter += 1;
                  }
!                 if ( $need_comma == 1 ) {
!                     $body .= ", $word";
!                 } else {
!                     $body .= $word;
!                     $need_comma = 1;
                  }
!             }
!         } else {
!             for my $word (sort @words) {
!                 $word =~ /^(.)/;
  
+                 if ( $1 ne $last )  {
+                     if (! $firstRow) {
+                         $body .= "</td></tr>\n";
+                     } else {
+                         $firstRow = 0;
+                     }
+                     $body .= "<tr><th scope=\"row\" class=\"advancedAlphabet";
+                     if ($groupCounter == $groupSize) {
+                         $body .= "GroupSpacing";
+                     }
+                     $body .= "\"><b>$1</b></th>\n";
+                     $body .= "<td class=\"advancedWords";
+                     if ($groupCounter == $groupSize) {
+                         $body .= "GroupSpacing";
+                         $groupCounter = 0;
+                     }
+                     $body .= "\">";
  
!                     $last = $1;
!                     $need_comma = 0;
!                     $groupCounter += 1;
!                 }
!                 if ( $need_comma == 1 ) {
!                     $body .= ", $word";
!                 } else {
!                     $body .= $word;
!                     $need_comma = 1;
!                 }
              }
          }
***************
*** 2685,2689 ****
          $short_subject =~ s/=20/ /g;
          $short_subject =~ /(.{40})/;
!         $short_subject = "$1...";
      }
  
--- 2721,2734 ----
          $short_subject =~ s/=20/ /g;
          $short_subject =~ /(.{40})/;
! 
!         # Do not truncate at 39 if the last char is the first byte of DBCS char(pair of two bytes).
!         # Truncate it 1 byte shorter.
!         if ( $self->config_( 'language' ) eq 'Korean' ) {
!             $short_subject = $1;
!             $short_subject =~ s/(([\x80-\xff].)*)[\x80-\xff]?$/$1/;
!             $short_subject .= "...";
!         } else {
!             $short_subject = "$1...";
!         }
      }