View | Details | Raw Unified | Return to bug 11263
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (-4 / +4 lines)
Lines 707-720 $(document).ready(function() { Link Here
707
                                        <select id="locale" name="locale">
707
                                        <select id="locale" name="locale">
708
                                            <option value=""></option>
708
                                            <option value=""></option>
709
                                            [% FOREACH l IN locales %]
709
                                            [% FOREACH l IN locales %]
710
                                                [% IF l == locale %]
710
                                                [% IF l.language == locale.language %]
711
                                                    <option value="[% l %]" selected="selected">[% l %]</option>
711
                                                    <option value="[% l.language %]" selected="selected">[% l.description %]</option>
712
                                                [% ELSE %]
712
                                                [% ELSE %]
713
                                                    <option value="[% l %]">[% l %]</option>
713
                                                    <option value="[% l.language %]">[% l.description %]</option>
714
                                                [% END %]
714
                                                [% END %]
715
                                            [% END %]
715
                                            [% END %]
716
                                        </select>
716
                                        </select>
717
                                        <span class="hint">If empty, system locale is used</span>
717
                                        <span class="hint">If empty, English is used</span>
718
                                    </li>
718
                                    </li>
719
                                    <li id="more_options">
719
                                    <li id="more_options">
720
                                        <table id="moreoptionst">
720
                                        <table id="moreoptionst">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt (-1 / +1 lines)
Lines 231-237 function show_blocking_subs() { Link Here
231
                        <option value="[% locale %]">[% locale %]</option>
231
                        <option value="[% locale %]">[% locale %]</option>
232
                      [% END %]
232
                      [% END %]
233
                    </select>
233
                    </select>
234
                  <span class="hint">If empty, system locale is used</span>
234
                  <span class="hint">If empty, English is used</span>
235
                </li>
235
                </li>
236
              </ol>
236
              </ol>
237
              <table>
237
              <table>
(-)a/serials/subscription-add.pl (-9 / +8 lines)
Lines 215-229 if ($op eq 'addsubscription') { Link Here
215
    }
215
    }
216
    $template->param(numberpatterns => \@numberpatternloop);
216
    $template->param(numberpatterns => \@numberpatternloop);
217
217
218
    # Get installed locales
218
    my $languages = [ map {
219
    # FIXME this will not work with all environments.
219
        {
220
    # If call to locale fails, @locales will be an empty array, which is fine.
220
            language => $_->{language},
221
    my @locales = map {
221
            description => $_->{native_description} || $_->{language}
222
        chomp;
222
        }
223
        # we don't want POSIX and C locales
223
    } @{ C4::Languages::getTranslatedLanguages() } ];
224
        /^C|^POSIX$/ ? () : $_
224
225
    } `locale -a`;
225
    $template->param( locales => $languages );
226
    $template->param(locales => \@locales);
227
226
228
    output_html_with_http_headers $query, $cookie, $template->output;
227
    output_html_with_http_headers $query, $cookie, $template->output;
229
}
228
}
(-)a/serials/subscription-numberpatterns.pl (-7 / +7 lines)
Lines 105-121 if($op && ($op eq 'new' || $op eq 'modify')) { Link Here
105
    my @frequencies = GetSubscriptionFrequencies();
105
    my @frequencies = GetSubscriptionFrequencies();
106
    my @subtypes;
106
    my @subtypes;
107
    push @subtypes, { value => $_ } for (qw/ issues weeks months /);
107
    push @subtypes, { value => $_ } for (qw/ issues weeks months /);
108
    my @locales = map {
108
    my $languages = [ map {
109
        chomp;
109
        {
110
        /^C|^POSIX$/ ? () : $_
110
            language => $_->{language},
111
    } `locale -a`;
111
            description => $_->{native_description} || $_->{language}
112
        }
113
    } @{ C4::Languages::getTranslatedLanguages() } ];
112
114
113
    $template->param(
115
    $template->param(
114
        $op => 1,
116
        $op => 1,
115
        frequencies_loop => \@frequencies,
117
        frequencies_loop => \@frequencies,
116
        subtypes_loop => \@subtypes,
118
        subtypes_loop => \@subtypes,
117
        locales => \@locales,
119
        locales => $languages,
118
        DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
119
    );
120
    );
120
    output_html_with_http_headers $input, $cookie, $template->output;
121
    output_html_with_http_headers $input, $cookie, $template->output;
121
    exit;
122
    exit;
122
- 

Return to bug 11263