Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 5889: Messages name in english for notifications on public interface.

Browse source 
Modification of template to allow multilanguage support. Alsa fixing columns
overflow.

BibLibre bug #5939

Tests: It works. Messages strings can now be extracted and placed in .po file
for translation.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This commit is contained in:
Sophie Meynieux 2011-03-17 11:46:26 +01:00 committed by Chris Cormack
parent 1411a92936
commit 6282f652b2
5 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
C4/Form/MessagingPreferences.pm
View file

@ -122,6 +122,7 @@ sub set_form_values {
my $messaging_options = C4::Members::Messaging::GetMessagingOptions();
PREF: foreach my $option ( @$messaging_options ) {
my $pref = C4::Members::Messaging::GetMessagingPreferences( { %{ $target_params }, message_name => $option->{'message_name'} } );
$option->{ $option->{'message_name'} } = 1;
# make a hashref of the days, selecting one.
if ( $option->{'takes_days'} ) {
my $days_in_advance = $pref->{'days_in_advance'} ? $pref->{'days_in_advance'} : 0;

8
admin/categorie.pl
View file

@ -240,9 +240,11 @@ sub _get_brief_messaging_prefs {
my $pref = C4::Members::Messaging::GetMessagingPreferences( { categorycode => $categorycode,
message_name => $option->{'message_name'} } );
next unless $pref->{'transports'};
my $brief_pref = { message_attribute_id => $option->{'message_attribute_id'},
message_name => $option->{'message_name'},
};
my $brief_pref = {
message_attribute_id => $option->{'message_attribute_id'},
message_name => $option->{'message_name'},
$option->{'message_name'} => 1
};
foreach my $transport ( @{$pref->{'transports'}} ) {
push @{ $brief_pref->{'transports'} }, { transport => $transport };
}

12
koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
View file

@ -27,7 +27,13 @@
</tr>
<!-- TMPL_LOOP name="messaging_preferences" -->
<tr>
<td><!-- TMPL_VAR NAME="message_name" --></td>
<td><!-- TMPL_IF NAME="Item DUE" -->Item DUE
<!-- TMPL_ELSIF NAME="Advance Notice" -->Advance Notice
<!-- TMPL_ELSIF NAME="Upcoming Events" -->Upcoming Events
<!-- TMPL_ELSIF NAME="Hold Filled" -->Hold Filled
<!-- TMPL_ELSIF NAME="Item Check-in" -->Item Check-in
<!-- TMPL_ELSIF NAME="Item Checkout" -->Item Checkout
<!-- TMPL_ELSE -->Unknown <!-- /TMPL_IF --></td>
<!-- TMPL_IF NAME="takes_days" -->
<td>
<!-- TMPL_IF NAME="messaging_form_inactive" -->
@ -45,7 +51,7 @@
<!-- TMPL_ELSE -->
<td>-</td>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="transport_sms" -->
<!-- <!-- TMPL_IF NAME="transport_sms" -->
<!-- TMPL_IF NAME="SMSSendDriver" --><td>
<!-- TMPL_IF NAME="messaging_form_inactive" -->
<input type="checkbox"
@ -61,7 +67,7 @@
</td><!-- /TMPL_IF -->
<!-- TMPL_ELSE -->
<td>-</td>
<!-- /TMPL_IF -->
<!-- /TMPL_IF --> -->
<!-- TMPL_IF NAME="transport_email" -->
<td>

8
koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
View file

@ -323,7 +323,13 @@ Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" escape="html" -->
<td>
<!-- TMPL_IF NAME="messaging_prefs" -->
<!-- TMPL_LOOP NAME="messaging_prefs" -->
<!-- TMPL_VAR NAME="message_name" --> :
<!-- TMPL_IF NAME="Item DUE" -->Item DUE
<!-- TMPL_ELSIF NAME="Advance Notice" -->Advance Notice
<!-- TMPL_ELSIF NAME="Upcoming Events" -->Upcoming Events
<!-- TMPL_ELSIF NAME="Hold Filled" -->Hold Filled
<!-- TMPL_ELSIF NAME="Item Check-in" -->Item Check-in
<!-- TMPL_ELSIF NAME="Item Checkout" -->Item Checkout
<!-- TMPL_ELSE -->Unknown <!-- /TMPL_IF --> :
<!-- TMPL_LOOP NAME="transports" -->
<!-- TMPL_VAR NAME="transport" -->
<!-- /TMPL_LOOP -->

12
koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tmpl
View file

@ -39,7 +39,13 @@
<tr><th>&nbsp;</th><th>Days in advance</th><!-- TMPL_IF NAME="SMSSendDriver" --><th>SMS</th><!-- /TMPL_IF --><th>Email</th><th>Digests only?</th><!-- <th>RSS</th> --><th>Do not notify</th></tr>
<!-- TMPL_LOOP name="messaging_preferences" -->
<tr>
<td><!-- TMPL_VAR NAME="message_name" --></td>
<td><!-- TMPL_IF NAME="Item DUE" -->Item DUE
<!-- TMPL_ELSIF NAME="Advance Notice" -->Advance Notice
<!-- TMPL_ELSIF NAME="Upcoming Events" -->Upcoming Events
<!-- TMPL_ELSIF NAME="Hold Filled" -->Hold Filled
<!-- TMPL_ELSIF NAME="Item Check-in" -->Item Check-in
<!-- TMPL_ELSIF NAME="Item Checkout" -->Item Checkout
<!-- TMPL_ELSE -->Unknown <!-- /TMPL_IF --></td>
<!-- TMPL_IF NAME="takes_days" -->
<td><select name="<!-- TMPL_VAR NAME="message_attribute_id" -->-DAYS">
<!-- TMPL_LOOP name="select_days" -->
@ -52,14 +58,14 @@
<!-- TMPL_ELSE -->
<td>-</td>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="transport_sms" -->
<!-- <!-- TMPL_IF NAME="transport_sms" -->
<!-- TMPL_IF NAME="SMSSendDriver" --><td><input type="checkbox"
id="sms<!-- TMPL_VAR NAME="message_attribute_id" -->"
name="<!-- TMPL_VAR NAME="message_attribute_id" -->"
value="sms" <!-- TMPL_VAR NAME="transport_sms" --> onclick = "document.opacmessaging.none<!-- TMPL_VAR NAME="message_attribute_id" -->.checked=false;" /></td><!-- /TMPL_IF -->
<!-- TMPL_ELSE -->
<td>-</td>
<!-- /TMPL_IF -->
<!-- /TMPL_IF --> -->
<!-- TMPL_IF NAME="transport_email" -->
<td><input type="checkbox"