From 626ef1091e67800208d4461aa9234e82c2464f01 Mon Sep 17 00:00:00 2001 From: Aleisha Date: Sun, 20 Mar 2016 23:37:38 +0000 Subject: [PATCH] Bug 15861: Isolated 'The' in help files untranslatable Changes made: help/reports/reports-home.tt Line 11: Koha database schema: shows the entire Koha database structure so that you can write effective SQL Queries Line 12: Koha reports library: lists reports written by Koha users around the world. help/rotating_collections/rotatingCollections.tt Line 7: Important: AutomaticItemReturn (system preference) must be set to .. TEST PLAN --------- 1) Log in to staff client 2) Click 'Reports' 3) Click 'Help' -- Notice the two lines starting with 'The' 4) Click 'Tools' 5) Click 'Rotating collections' in the Catalog column 6) Click 'Help' -- Notice the Important has a 'The' 7) Apply patch 8) Repeat steps 2-6 -- Notice the wording has changed to eliminate 'The' 9) Run koha qa test tools Sponsored-by: Catalyst IT Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com (cherry picked from commit b72f9b8c51eb11861b931f193628460e2219a4fc) Signed-off-by: Julian Maurice --- .../prog/en/modules/help/reports/reports-home.tt | 6 +++--- .../help/rotating_collections/rotatingCollections.tt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reports-home.tt index 2b05ad5a8c..0f81c03e04 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reports-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reports-home.tt @@ -8,8 +8,8 @@
  • Custom Reports
    • Koha's data is stored in a MySQL database which means that librarians can generate nearly any report they would like by either using the Guided Reports Wizard or writing their own SQL query.
      • -
    • The Koha database schema will help you learn the Koha database structure so that you can write effective SQL Queries
      • -
    • The Koha reports library lists reports written by Koha users around the world.
      • +
    • Koha database schema: shows the entire Koha database structure so that you can write effective SQL Queries
      • +
    • Koha reports library: lists reports written by Koha users around the world.
  • Statistical Reports @@ -21,4 +21,4 @@

    See the full documentation for Reports in the manual (online).

    -[% INCLUDE 'help-bottom.inc' %] \ No newline at end of file +[% INCLUDE 'help-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/rotating_collections/rotatingCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/rotating_collections/rotatingCollections.tt index e7323f5506..d1415c409a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/rotating_collections/rotatingCollections.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/rotating_collections/rotatingCollections.tt @@ -4,7 +4,7 @@

    Rotating Collections is a tool for managing collections of materials that frequently get shifted from library to library. It adds the ability to store not only an item's home library and current location, but also information about where it is supposed to be transferred to next to ensure that all items in the collection are sent to the correct library. When an item in a rotating collection is checked in, library staff are notified that the item is part of a rotating collection and which branch it should be sent to if it is not at the correct one.

    -

    Important: The AutomaticItemReturn system preference must be set to "Don't automatically transfer items to their home library when they are returned" for Rotating Collections to function properly.

    +

    Important: AutomaticItemReturn (system preference) must be set to "Don't automatically transfer items to their home library when they are returned" for Rotating Collections to function properly.

      To create a new rotating collection, click the "New Collection" button, fill in the Title and Description, and click Submit. Once submitted you'll see "Collection Name added successfully"; click "Return to rotating collections home" to return to the main Rotating Collections management page (or click Rotating Collections in the sidebar). -- 2.20.1