From ff0b85a0e0d86bc95ed78056f5225a3a1c14c6ea Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Tue, 19 Nov 2013 11:27:52 +0100
Subject: [PATCH] Bug 11265: ensure current locale is selected when editing a
 subscription

Test plan:
0/ you have to have some locales defined, run dpkg-reconfigure locales
to configure locales
1/ edit a subscription (or add a new one) and select a locale
2/ save
3/ edit again and verify the locale value is selected

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described. No koha-qa errors.

Tested creating a suscription, selecting locale (have many) and saving.
When editing suscription:
1) Without patch locale value is not showed on page, empty value
2) With patch correct value is displayed

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script. Template change only.
Works as expected - saved locale is now shown on editing the
subscription and will not be deleted upon saving.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 .../prog/en/modules/serials/subscription-add.tt        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
index b0d84eecf6..713b3b198a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
@@ -706,10 +706,12 @@ $(document).ready(function() {
                                         <label for="locale">Locale</label>
                                         <select id="locale" name="locale">
                                             <option value=""></option>
-                                            [% FOREACH locale IN locales %]
-                                                <option value="[% locale %]">
-                                                    [% locale %]
-                                                </option>
+                                            [% FOREACH l IN locales %]
+                                                [% IF l == locale %]
+                                                    <option value="[% l %]" selected="selected">[% l %]</option>
+                                                [% ELSE %]
+                                                    <option value="[% l %]">[% l %]</option>
+                                                [% END %]
                                             [% END %]
                                         </select>
                                         <span class="hint">If empty, system locale is used</span>
-- 
2.20.1