[Koha-devel] CVS: koha/translator translator.pl,1.1,1.2

Wed Jun 27 23:53:07 CEST 2001

Update of /cvsroot/koha/koha/translator
In directory usw-pr-cvs1:/tmp/cvs-serv24880/translator

Modified Files:
	translator.pl 
Log Message:
Modified so that the first available language is chosen if none is specified

Index: translator.pl
===================================================================
RCS file: /cvsroot/koha/koha/translator/translator.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** translator.pl	2001/06/26 22:13:50	1.1
--- translator.pl	2001/06/27 21:53:05	1.2
***************
*** 21,43 ****
  textdomain("koha");

! my %lang=(
!   fr => "fr_FR",
!   pl => "pl_PL",
! );

! my @lang=split/,/,$ENV{"HTTP_ACCEPT_LANGUAGE"};
  my $lang="us_US";

! foreach (@lang){
!   my $lg=$lang{$_};
!   setlocale(LC_MESSAGES,$lg);
!   my $tmp = gettext($_);
!   if ($tmp ne $_)
!   {
!     $lang=$tmp;
!     last;
    }
  }

  setlocale(LC_MESSAGES,$lang);

--- 21,50 ----
  textdomain("koha");

! my @locale=`locale -a`;
! my %lang;
! foreach(@locale){
!   next unless (/_/);
!   push @{$lang{$`}}, $';
! }

! my $str_env=$ENV{"HTTP_ACCEPT_LANGUAGE"};
! $str_env=~s/\s*//g;
! my @lang=split/,/,$str_env;
  my $lang="us_US";

! foreach my $locale(@lang){
!   goto find_locale if ($locale eq 'en');
!   foreach my $lg(@{$lang{$locale}}){
!     setlocale(LC_MESSAGES,$locale."_".$lg);
!     my $tmp = gettext($locale);
!     if ($tmp ne $locale)
!     {
!       $lang=$tmp;
!       goto find_locale;
!     }
    }
  }

+ find_locale:
  setlocale(LC_MESSAGES,$lang);

***************
*** 63,66 ****
--- 70,75 ----

  $dgettxt{'iso-8859-1'}=1;
+ $dgettxt{'us_US'}=1;
+ 
  my $txt =<<TXT;
  <HTML>
***************
*** 103,107 ****
    $dane=~s/\\\"/&zamien/ges;		# change \"

!   # taka out graphics
    $dane=~s/[\"\']\/?([\w-\/\.]*?\.gif)[\"\']/&zamien($1)/ges;

--- 112,116 ----
    $dane=~s/\\\"/&zamien/ges;		# change \"

!   # take out graphics
    $dane=~s/[\"\']\/?([\w-\/\.]*?\.gif)[\"\']/&zamien($1)/ges;

***************
*** 168,170 ****
      return "%${\($dane{$tmp})}%";
  }
- 
--- 177,178 ----