Attachment 17590 Details for Bug 10023 – Bug 10023: Change degree notation for number to No.

[patch] Bug 10023: Change degree notation for number to No.

Bug-10023-Change-degree-notation-for-number-to-No.patch (text/plain), 3.48 KB, created by Marcel de Rooy on 2013-04-22 12:39:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2013-04-22 12:39:23 UTC

Size: 3.48 KB

patch

obsolete

>From 84e98ca5d8cb3a51934d96cdd809a4dcbcf41009 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <Katrin.Fischer.83@web.de>
>Date: Sun, 14 Apr 2013 16:29:40 +0200
>Subject: [PATCH] Bug 10023: Change degree notation for number to No.
>Content-Type: text/plain; charset=utf-8
>
>This patch changes N<little circle> to No. in three templates.
>
>To test:
>1) Search for a vendor with visible baskets.
>   Check that the first column of the basket table in the
>   is now labelled No.
>
>2) Print a PDF order in acquisitons with layout2pages.
>
>3) Print a PDF oder in acquisitons with layout3pages.
>
>Check both generated PDFs for the correct syntax.
>
>Note: you need to switch the system preference
>OrderPdfFormat in order to test 2) and 3).
>The 2 possible settings are:
>pdfformat::layout3pages
>pdfformat::layout2pages
>
>It's not only Koha - git bz doesn't like the degree
>notation either.
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>
>I prefer "No." over "#" and my survey of the templates shows that "No."
>appears more often. Looks like something to add to our style guide.
>Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> acqui/pdfformat/layout2pages.pm                    |    2 +-
> acqui/pdfformat/layout3pages.pm                    |    2 +-
> .../prog/en/modules/acqui/booksellers.tt           |    2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/acqui/pdfformat/layout2pages.pm b/acqui/pdfformat/layout2pages.pm
>index 88accdd..66e2ba0 100644
>--- a/acqui/pdfformat/layout2pages.pm
>+++ b/acqui/pdfformat/layout2pages.pm
>@@ -82,7 +82,7 @@ sub printorders {
>     
>     my $abaskets;
>     my $arrbasket;
>-    my @keys = ('Basket#', 'Document', 'Qty', 'RRP tax inc.', 'Discount', 'GST', 'Total tax exc.', 'Total tax inc.');
>+    my @keys = ('Basket (No.)', 'Document', 'Qty', 'RRP tax inc.', 'Discount', 'GST', 'Total tax exc.', 'Total tax inc.');
>     for my $bkey (@keys) {
>         push(@$arrbasket, $bkey);
>     }
>diff --git a/acqui/pdfformat/layout3pages.pm b/acqui/pdfformat/layout3pages.pm
>index 47fb37a..aabf2a4 100644
>--- a/acqui/pdfformat/layout3pages.pm
>+++ b/acqui/pdfformat/layout3pages.pm
>@@ -92,7 +92,7 @@ sub printorders {
>         # add basketgroup number
>         $text->font( $pdf->corefont("Times", -encoding => "utf8"), 6/mm );
>         $text->translate(20/mm,  ($height-15)/mm);
>-        $text->text("Order# ".$basketgroup->{'id'}.". Basket# ".$basket->{basketno}.". ".$basket->{booksellernote});
>+        $text->text("Order no. ".$basketgroup->{'id'}.". Basket no. ".$basket->{basketno}.". ".$basket->{booksellernote});
>         $text->translate(20/mm,  ($height-20)/mm);
>         $text->font( $pdf->corefont("Times", -encoding => "utf8"), 4/mm );
>         $text->text( ( $basket->{billingplace} ? "Billing at " . C4::Branch::GetBranchName( $basket->{billingplace} ) : "" )
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
>index 1f0cc10..9aaf34e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
>@@ -87,7 +87,7 @@ $(document).ready(function() {
>                         <table class="baskets">
>                             <thead>
>                                 <tr>
>-                                    <th>#</th>
>+                                    <th>No.</th>
>                                     <th>Name</th>
>                                     <th>Item count</th>
>                                     <th>Biblio count</th>
>-- 
>1.7.7.6

Actions: View | Diff | Splinter Review

Attachments on bug 10023: 17345 | 17416 | 17417 | 17459 | 17589 | 17590