From affe02d81935ff6a2d6fa6bf08d9e4091e3503d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?= Date: Mon, 17 Oct 2011 08:03:29 +0200 Subject: [PATCH] [SIGNED-OFF] Bug 7026 Web installer does not switch language Language installer should switch to template files of language selected in first step. It used to do that, but the feature seems to be broken now. Web installer remains English after selecting a different language. To reproduce: - make sure your database is empty - run 'perl translate install - access web installer - select language other then en on the first page => templates should change to translated templates Signed-off-by: Katrin Fischer Test plan provided works, correct language and sample files are selected. In a second test I deleted the staff templates for de-DE and repeated the steps. de-DE is not offered in the language selection of the web installer now, but does appear in the opaclanguages list after running the web installer. (Bug 5660) Signed-off-by: Katrin Fischer --- installer/InstallAuth.pm | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/installer/InstallAuth.pm b/installer/InstallAuth.pm index 3918698..2c07bbe 100644 --- a/installer/InstallAuth.pm +++ b/installer/InstallAuth.pm @@ -163,13 +163,7 @@ sub _get_template_language { my ($opaclang)= @_; return 'en' unless $opaclang; my $path= C4::Context->config('intrahtdocs')."/prog/$opaclang"; - my $pref= ','.C4::Context->preference('language').','; - if(-d $path) { - if($pref =~ /,$opaclang,/ ) { - return $opaclang; - } - } - return 'en'; + -d $path ? $opaclang : 'en'; } =item checkauth -- 1.7.5.4