Attachment 3333 Details for Bug 5889 – Proposed patch

[patch] Proposed patch

0001-Bug-5889-Messages-name-in-english-for-notifications-.patch (text/plain), 7.41 KB, created by Julian Maurice on 2011-03-17 09:45:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2011-03-17 09:45:01 UTC

Size: 7.41 KB

patch

obsolete

>From 616ca05a20e63d71be22306d4b51945b10ef726c Mon Sep 17 00:00:00 2001
>From: Sophie Meynieux <sophie.meynieux@biblibre.com>
>Date: Wed, 2 Mar 2011 17:20:36 +0100
>Subject: [PATCH] Bug 5889: Messages name in english for notifications on public interface.
>
>Modification of template to allow multilanguage support. Alsa fixing columns overflow.
>
>BibLibre bug #5939
>---
> C4/Form/MessagingPreferences.pm                    |    1 +
> admin/categorie.pl                                 |    8 +++++---
> .../prog/en/includes/messaging-preference-form.inc |   12 +++++++++---
> .../prog/en/modules/admin/categorie.tmpl           |    8 +++++++-
> .../opac-tmpl/prog/en/modules/opac-messaging.tmpl  |   12 +++++++++---
> 5 files changed, 31 insertions(+), 10 deletions(-)
>
>diff --git a/C4/Form/MessagingPreferences.pm b/C4/Form/MessagingPreferences.pm
>index bd1c22f..808719f 100644
>--- a/C4/Form/MessagingPreferences.pm
>+++ b/C4/Form/MessagingPreferences.pm
>@@ -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;
>diff --git a/admin/categorie.pl b/admin/categorie.pl
>index bda7674..4a5d683 100755
>--- a/admin/categorie.pl
>+++ b/admin/categorie.pl
>@@ -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 };
>         }
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
>index 28dc633..f9af076 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
>@@ -27,7 +27,13 @@
>     </tr>
>     
>     <tr>
>-      <td></td>
>+      <td>Item DUE
>+          Advance Notice
>+          Upcoming Events
>+          Hold Filled
>+          Item Check-in
>+          Item Checkout
>+          Unknown </td>
>       
>       <td>
>           
>@@ -45,7 +51,7 @@
>       
>       <td>-</td>
>       
>-      
>+
>       <td>
>           
>                  <input type="checkbox"
>@@ -61,7 +67,7 @@
>       </td>
>       
>       <td>-</td>
>-      
>+       -->
> 
>       
>       <td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
>index 736f3bb..ba9e468 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
>@@ -323,7 +323,13 @@ Confirm Deletion of Category 
>                         <td>
>                             
>                                 
>-                                     :
>+                                    Item DUE
>+                                    Advance Notice
>+                                    Upcoming Events
>+                                    Hold Filled
>+                                    Item Check-in
>+                                    Item Checkout
>+                                    Unknown  :
>                                     
>                                         
>                                     
>diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tmpl
>index 1793a86..c585936 100644
>--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tmpl
>+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tmpl
>@@ -39,7 +39,13 @@
>     <tr><th>&nbsp;</th><th>Days in advance</th><th>SMS</th><th>Email</th><th>Digests only?</th><th>Do not notify</th></tr>
>     
>     <tr>
>-      <td></td>
>+      <td>Item DUE
>+          Advance Notice
>+          Upcoming Events
>+          Hold Filled
>+          Item Check-in
>+          Item Checkout
>+          Unknown </td>
>       
>       <td><select name="-DAYS">
>           
>@@ -52,14 +58,14 @@
>       
>       <td>-</td>
>       
>-      
>+
>       <td><input type="checkbox"
>                  id="sms"
>                  name=""
>                  value="sms"  onclick = "document.opacmessaging.none.checked=false;" /></td>
>       
>       <td>-</td>
>-      
>+       -->
> 
>       
>       <td><input type="checkbox"
>-- 
>1.7.4.1
>

Actions: View | Diff | Splinter Review

Attachments on bug 5889: 3333 | 3413 | 3999 | 4090