[Koha-cvs] CVS: koha/C4 Output.pm,1.45.2.1,1.45.2.2

[Ambrose C. LI]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8507

Modified Files:
      Tag: rel_2_0
	Output.pm 
Log Message:
Backport from HEAD - allow user to specify zh_TW yet get the Chinese
templates from the zh-TW directory


Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.45.2.1
retrieving revision 1.45.2.2
diff -C2 -r1.45.2.1 -r1.45.2.2
*** Output.pm	22 Dec 2003 12:52:37 -0000	1.45.2.1
--- Output.pm	29 Feb 2004 07:59:08 -0000	1.45.2.2
***************
*** 130,137 ****
    foreach my $th (@themes) {
      foreach my $la (@languages) {
! 	if (-e "$htdocs/$th/$la/$tmpl") {
! 	    $theme = $th;
! 	    $lang = $la;
! 	    last THEME;
  	}
      }
--- 130,141 ----
    foreach my $th (@themes) {
      foreach my $la (@languages) {
! 	for (my $pass = 1; $pass <= 2; $pass += 1) {
! 	    $la =~ s/([-_])/ $1 eq '-'? '_': '-' /eg if $pass == 2;
! 	    if (-e "$htdocs/$th/$la/$tmpl") {
! 		$theme = $th;
! 		$lang = $la;
! 		last THEME;
! 	    }
! 	last unless $la =~ /[-_]/;
  	}
      }