From tomascohen at gmail.com Sun Mar 3 02:56:46 2013
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Sat, 2 Mar 2013 22:56:46 -0300
Subject: [Koha-patches] [PATCH] Bug 9731 - Remove changelanguage.pl in favor
of (already present) opac-changelanguage.pl
Message-ID: <1362275806-18010-1-git-send-email-tomascohen@gmail.com>
Remove that file that duplicates the behaviour of the correct opac-changelanguage.pl file and fix references to it in the templates.
To+
Sponsored-by: Universidad Nacional de C?rdoba
---
.../opac-tmpl/ccsr/en/includes/opac-bottom.inc | 4 +--
.../opac-tmpl/prog/en/includes/opac-bottom.inc | 4 +--
opac/changelanguage.pl | 28 --------------------
3 files changed, 4 insertions(+), 32 deletions(-)
delete mode 100755 opac/changelanguage.pl
diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc
index b89e6ac..d360fee 100644
--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc
@@ -47,7 +47,7 @@
[% IF ( sublanguages_loo.sublanguage_current ) %]
[% END %]
[% END %]
[% END %]
diff --git a/opac/changelanguage.pl b/opac/changelanguage.pl
deleted file mode 100755
index 6095324..0000000
--- a/opac/changelanguage.pl
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/perl
-
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-use strict;
-use warnings;
-
-use C4::Templates;
-use CGI;
-
-my $query = new CGI;
-my $language = $query->param('language');
-my $url = $query->referer();
-
-C4::Templates::setlanguagecookie( $query, $language, $url );
--
1.7.10.4
From tomascohen at gmail.com Sun Mar 3 02:57:20 2013
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Sat, 2 Mar 2013 22:57:20 -0300
Subject: [Koha-patches] [PATCH] Bug 9735 - Let the language be selected
through URL parameters
Message-ID: <1362275840-18103-1-git-send-email-tomascohen@gmail.com>
Passing language= as a parameter in any Koha's URL can be used to set the desired language.
This patch touches
- C4::Templates
- C4::Auth
Adds a new method getlanguagecookie that does exactly that, for use in get_template_and_user.
Also modifies getlanguage so it checks (a) if there's a 'language' parameter in the CGI object and (b) checks if its valid and enabled for the desired interface.
To test:
* Without the patch
- access any koha page
- add ?language=code to the end of the URL (change code for a valid language code
it needs to be installed using perl translate install code, and enabled either for
the staff or opac interface, depending where are you testing)
- Nothing happens with the language parameter
* With the patch
- access any koha page
- add ?language=code (the same as before) and hit enter
- the language should be changed to the one you chose
- if you browse through some links, you will see
koha 'remembers' the language you passed as a parameter
(i.e. the language cookie has been updated).
Regards
To+
Sponsored-by: Universidad Nacional de C?rdoba
---
C4/Auth.pm | 10 ++++++++++
C4/Templates.pm | 34 +++++++++++++++++++++++++++++++++-
2 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/C4/Auth.pm b/C4/Auth.pm
index efe1200..e42f676 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -472,6 +472,16 @@ sub get_template_and_user {
$template->param(OpacPublic => '1') if ($user || C4::Context->preference("OpacPublic"));
}
+
+ # Check if we were asked using parameters to force a specific language
+ if ( defined $in->{'query'}->param('language') ) {
+ # Extract the language, let C4::Templates::getlanguage choose
+ # what to do
+ my $language = C4::Templates::getlanguage($in->{'query'},$in->{'type'});
+ my $languagecookie = C4::Templates::getlanguagecookie($in->{'query'},$language);
+ $cookie = [$cookie, $languagecookie];
+ }
+
return ( $template, $borrowernumber, $cookie, $flags);
}
diff --git a/C4/Templates.pm b/C4/Templates.pm
index 78dcddd..47a6656 100644
--- a/C4/Templates.pm
+++ b/C4/Templates.pm
@@ -314,17 +314,49 @@ sub setlanguagecookie {
);
}
+=head2 getlanguagecookie
+
+ my $cookie = getlanguagecookie($query,$language);
+
+Returns a cookie object containing the calculated language to be used.
+
+=cut
+
+sub getlanguagecookie {
+ my ( $query, $language ) = @_;
+ my $cookie = $query->cookie(
+ -name => 'KohaOpacLanguage',
+ -value => $language,
+ -HttpOnly => 1,
+ -expires => '+3y'
+ );
+
+ return $cookie;
+}
+
+=head2 getlanguage
+
+ Select a language based on the URL parameter 'language', a cookie,
+ syspref available languages & browser
+
+=cut
sub getlanguage {
my ($query, $interface) = @_;
- # Select a language based on cookie, syspref available languages & browser
my $preference_to_check =
$interface eq 'intranet' ? 'language' : 'opaclanguages';
+ # Get the available/valid languages list
my @languages = split /,/, C4::Context->preference($preference_to_check);
my $lang;
+ # Chose language from the URL
+ $lang = $query->param( 'language' );
+ if ( defined $lang && any { $_ eq $lang } @languages) {
+ return $lang;
+ }
+
#?cookie
if ( $query->cookie('KohaOpacLanguage') ) {
$lang = $query->cookie('KohaOpacLanguage');
--
1.7.10.4
From oleonard at myacpl.org Tue Mar 5 22:28:15 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 5 Mar 2013 16:28:15 -0500
Subject: [Koha-patches] [PATCH] Bug 9695 - Use alphabet system preference on
page used to browse patrons for patron card batches
Message-ID: <1362518895-10428-1-git-send-email-oleonard@myacpl.org>
When adding patrons to a batch for creating patron cards, the template
shows alphabet links for browsing all patrons. This patch converts the
hard-coded alphabet links to use the new alphabet system preference.
To test, go to the patron card creator and create a new batch. Click
"Add items" to pop up the window for browsing for patrons to add to the
batch. You should see a working array of alphabet letters which link to
patron search results.
---
.../prog/en/modules/patroncards/members-search.tt | 29 ++------------------
patroncards/members-search.pl | 2 ++
2 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt
index f34c2bd..c3a1df7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt
@@ -49,32 +49,9 @@ function add_item(borrowernum,batch_id,type_id){
Browse by last name:
- A
- B
- C
- D
- E
- F
- G
- H
- I
- J
- K
- L
- M
- N
- O
- P
- Q
- R
- S
- T
- U
- V
- W
- X
- Y
- Z
+ [% FOREACH letter IN alphabet.split(' ') %]
+ [% letter %]
+ [% END %]