From a7dbbe7697ed59a02b973d8ca14dfb542f49c371 Mon Sep 17 00:00:00 2001
From: Joshua Ferraro <jmf@liblime.com>
Date: Tue, 18 Mar 2008 01:10:00 -0400
Subject: [PATCH] fixes bug 1924: Language selection lists English only and
 that several times.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 C4/Languages.pm                                             | 3 +++
 .../intranet-tmpl/prog/en/modules/installer/step1.tmpl      | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/C4/Languages.pm b/C4/Languages.pm
index b4a2f3a5f0..a7b4856051 100644
--- a/C4/Languages.pm
+++ b/C4/Languages.pm
@@ -149,6 +149,9 @@ sub getTranslatedLanguages {
         foreach my $theme ( _get_themes('opac') ) {
             push @languages, _get_language_dirs($htdocs,$theme);
         }
+        my %seen;
+        $seen{$_}++ for @languages;
+        @languages = keys %seen;
         return _build_languages_arrayref($all_languages,\@languages,$current_language,\@enabled_languages);
     }
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl
index f8e15bcac9..c9b3bbbba9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl
@@ -13,13 +13,13 @@ listed, please inform your systems administrator.</p>
 <!-- TMPL_IF NAME="installer_languages_loop" -->
         <!-- TMPL_LOOP NAME="installer_languages_loop" -->
             <!-- TMPL_IF NAME="plural" -->
-            <optgroup label="<!-- TMPL_VAR NAME="rfc4646_subtag" -->">
+            <optgroup label="<!-- TMPL_VAR NAME="language" -->">
             <!-- TMPL_LOOP NAME="sublanguages_loop" -->
-                <option value="<!-- TMPL_VAR NAME="rfc4646_subtag" -->"><!-- TMPL_VAR NAME="rfc4646_subtag" --></option>
+                <option value="<!-- TMPL_VAR NAME="rfc4646_subtag" -->"><!-- TMPL_IF NAME="native_description" --><!-- TMPL_VAR NAME="native_description" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="rfc4646_subtag" --><!-- /TMPL_IF --></option>
             <!-- /TMPL_LOOP -->
             </optgroup>
             <!-- TMPL_ELSE -->
-		<option value="<!-- TMPL_VAR NAME="rfc4646_subtag" -->"><!-- TMPL_VAR NAME="rfc4646_subtag" --></option>
+		<option value="<!-- TMPL_VAR NAME="rfc4646_subtag" -->"><!-- TMPL_IF NAME="native_description" --><!-- TMPL_VAR NAME="native_description" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="rfc4646_subtag" --><!-- /TMPL_IF --></option>
             <!-- /TMPL_IF -->
         <!-- /TMPL_LOOP -->
 <!-- /TMPL_IF -->
-- 
2.39.5