From d9cb0a35dd39fbc83ac00fe7f1eb1b27a363d4fd 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: the locale value is not selected on 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
4/ do the same on editing a numbering pattern
(serials/subscription-numberpatterns.pl?op=modify&id=XX)
---
 .../prog/en/modules/serials/subscription-add.tt              |   10 ++++++----
 .../prog/en/modules/serials/subscription-numberpatterns.tt   |    8 ++++++--
 2 files changed, 12 insertions(+), 6 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 b0d84ee..713b3b1 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>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
index 686cdc8..5997cf8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
@@ -227,8 +227,12 @@ function show_blocking_subs() {
                   <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.language %]">[% l.description %]</option>
+                          [% END %]
                       [% END %]
                     </select>
                   <span class="hint">If empty, system locale is used</span>
-- 
1.7.10.4