From c025f2b986a2e690d30b042ea1152b1d376df187 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Mon, 25 Jun 2018 08:47:27 +0200 Subject: [PATCH] Bug 20988: koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves --- .../course_reserves/add_items-step1.tt | 15 ++-- .../course_reserves/add_items-step2.tt | 35 ++++---- .../modules/course_reserves/course-details.tt | 81 ++++++++++--------- .../course_reserves/course-reserves.tt | 33 ++++---- .../prog/en/modules/course_reserves/course.tt | 59 +++++++------- .../modules/course_reserves/invalid-course.tt | 7 +- 6 files changed, 118 insertions(+), 112 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt index 7cdc9afc8b..4e31a36bba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt @@ -1,5 +1,6 @@ +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Course reserves › Add items +[% t('Koha › Course reserves › Add items') %] [% INCLUDE 'doc-head-close.inc' %] @@ -7,7 +8,7 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
@@ -15,9 +16,9 @@ [% IF ERROR_ITEM_NOT_FOUND %] [% IF UNKNOWN_BARCODE %] -
No item found with barcode [% UNKNOWN_BARCODE %]
+
[% t('No item found with barcode') %] [% UNKNOWN_BARCODE %]
[% ELSE %] -
No item found
+
[% t('No item found') %]
[% END %] [% END %] @@ -26,10 +27,10 @@
- Add items: scan barcode + [% t('Add items: scan barcode') %]
  1. - +
@@ -38,7 +39,7 @@
- Cancel + [% t('Cancel') %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt index 9389d576fd..5c2c5e7836 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt @@ -1,6 +1,7 @@ +[% PROCESS 'i18n.inc' %] [% USE Branches %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Course reserves › Add items +[% t('Koha › Course reserves › Add items') %] [% INCLUDE 'doc-head-close.inc' %] @@ -9,14 +10,14 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
- [% IF course_reserve %]
This course already has this item on reserve.
[% END %] - [% IF course_item %]
Number of courses reserving this item: [% course_item.course_reserves.size %]
[% END %] + [% IF course_reserve %]
[% t('This course already has this item on reserve.') %]
[% END %] + [% IF course_item %]
[% t('Number of courses reserving this item:') %] [% course_item.course_reserves.size %]
[% END %]
@@ -24,19 +25,19 @@
- Add [% biblio.title %] to [% course.course_name %] + [% t('Add') %] [% biblio.title %] [% t('to') %] [% course.course_name %]
  1. - Barcode: + [% t('Barcode:') %] [% item.barcode %]
    2. [% IF item_level_itypes %]
  2. - + - + [% FOREACH c IN ccodes %] [% IF course_item.ccode && ( ( course.enabled == 'yes' && c.authorised_value == item.ccode ) || ( course.enabled == 'no' && c.authorised_value == course_item.ccode ) ) %] @@ -65,9 +66,9 @@
  3. - + - + [% FOREACH b IN Branches.all() %] [% IF course_item.holdingbranch && ( ( course.enabled == 'yes' && b.branchcode == item.holdingbranch ) || ( course.enabled == 'no' && b.branchcode == course_item.holdingbranch ) ) %] @@ -94,12 +95,12 @@
  4. - +
  5. - +
    6. @@ -109,7 +110,7 @@
    - Cancel + [% t('Cancel') %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt index 11a495eef9..73ae2d7c50 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt @@ -1,10 +1,11 @@ +[% PROCESS 'i18n.inc' %] [% USE Asset %] [% USE AuthorisedValues %] [% USE ItemTypes %] [% USE Branches %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Course reserves › Course details for [% course.course_name %] +[% t('Koha › Course reserves › Course details for') %] [% course.course_name %] [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("css/datatables.css") %] @@ -15,7 +16,7 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
@@ -24,51 +25,51 @@ [% IF CAN_user_coursereserves_add_reserves OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_manage_courses %]
[% IF CAN_user_coursereserves_add_reserves %] - Add reserves + [% t('Add reserves') %] [% END %] [% IF ( CAN_user_coursereserves_manage_courses ) %] - Edit course + [% t('Edit course') %] [% END %] [% IF ( CAN_user_coursereserves_manage_courses ) %] - Delete course + [% t('Delete course') %] [% END %]
[% END %]
    -
  1. Course name [% course.course_name %]
    2. -
  2. Term [% AuthorisedValues.GetByCode( 'TERM', course.term ) %]
    3. -
  3. Department [% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]
    4. -
  4. Course number [% course.course_number %]
    5. -
  5. Section [% course.section %]
    6. -
  6. Instructors [% FOREACH i IN course.instructors %]
    [% i.firstname %] [% i.surname %]
    [% END %]
    7. -
  7. Staff note [% course.staff_note %]
    8. -
  8. Public note [% course.public_note %]
    9. -
  9. Student count [% course.students_count %]
    10. -
  10. Status [% IF course.enabled == 'yes' %]Active[% ELSE %]Inactive[% END %]
    11. +
  11. [% t('Course name') %] [% course.course_name %]
    12. +
  12. [% t('Term') %] [% AuthorisedValues.GetByCode( 'TERM', course.term ) %]
    13. +
  13. [% t('Department') %] [% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]
    14. +
  14. [% t('Course number') %] [% course.course_number %]
    15. +
  15. [% t('Section') %] [% course.section %]
    16. +
  16. [% t('Instructors') %] [% FOREACH i IN course.instructors %]
    [% i.firstname %] [% i.surname %]
    [% END %]
    17. +
  17. [% t('Staff note') %] [% course.staff_note %]
    18. +
  18. [% t('Public note') %] [% course.public_note %]
    19. +
  19. [% t('Student count') %] [% course.students_count %]
    20. +
  20. [% t('Status') %] [% IF course.enabled == 'yes' %][% t('Active') %][% ELSE %][% t('Inactive') %][% END %]
[% IF course_reserves %] - + - - - - - [% IF item_level_itypes %][% END %] - - - - - - - + + + + + [% IF item_level_itypes %][% END %] + + + + + + + [% IF CAN_user_coursereserves_add_reserves || CAN_user_coursereserves_delete_reserves %] - + [% END %] @@ -78,7 +79,7 @@ - + [% IF item_level_itypes %] @@ -176,16 +177,16 @@ [% IF CAN_user_coursereserves_add_reserves || CAN_user_coursereserves_delete_reserves %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt index 2a8528b3eb..555f021e17 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt @@ -1,8 +1,9 @@ +[% PROCESS 'i18n.inc' %] [% USE Asset %] [% USE AuthorisedValues %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Course reserves +[% t('Koha › Course reserves') %] [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("css/datatables.css") %] @@ -13,7 +14,7 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
@@ -22,7 +23,7 @@ [% IF CAN_user_coursereserves_add_reserves OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_manage_courses %]
[% IF ( CAN_user_coursereserves_manage_courses ) %] - New course + [% t('New course') %] [% END %]
[% END %] @@ -48,20 +49,20 @@
--> -

Courses

+

[% t('Courses') %]

Reserves[% t('Reserves') %]
TitleAuthorBarcodeCall numberItem typeCollectionLocationLibraryStaff notePublic noteLinkOther course reserves[% t('Title') %][% t('Author') %][% t('Barcode') %][% t('Call number') %][% t('Item type') %][% t('Collection') %][% t('Location') %][% t('Library') %][% t('Staff note') %][% t('Public note') %][% t('Link') %][% t('Other course reserves') %]Actions[% t('Actions') %]
[% cr.biblio.title %] [% cr.biblio.author %][% cr.item.barcode %][% cr.item.barcode %] [% cr.item.itemcallnumber %] @@ -89,7 +90,7 @@ [% ItemTypes.GetDescription( cr.course_item.itype ) %] [% END %] [% ELSE %] - Unchanged + [% t('Unchanged') %] [% IF cr.item.itype %] ([% ItemTypes.GetDescription( cr.item.itype ) %]) [% END %] @@ -104,7 +105,7 @@ [% AuthorisedValues.GetByCode( 'CCODE', cr.course_item.ccode ) %] [% END %] [% ELSE %] - Unchanged + [% t('Unchanged') %] [% IF cr.item.ccode %] ([% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %]) [% END %] @@ -118,7 +119,7 @@ [% AuthorisedValues.GetByCode( 'LOC', cr.course_item.location ) %] [% END %] [% ELSE %] - Unchanged + [% t('Unchanged') %] [% IF cr.item.location %] ([% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %]) [% END %] @@ -132,7 +133,7 @@ [% Branches.GetName( cr.course_item.holdingbranch ) %] [% END %] [% ELSE %] - Unchanged + [% t('Unchanged') %] [% IF cr.item.holdingbranch %] ([% Branches.GetName( cr.item.holdingbranch ) %]) [% END %] @@ -153,9 +154,9 @@ [% IF (cr.item.uri) %] - Item URI + [% t('Item URI') %] [% ELSIF (cr.biblioitem.url) %] - Record URL + [% t('Record URL') %] [% END %] [% IF CAN_user_coursereserves_add_reserves %] - Edit + [% t('Edit') %] [% END %] [% IF CAN_user_coursereserves_delete_reserves %] [% IF cr.item.onloan %] - + [% ELSE %] - + [% END %] - Remove + [% t('Remove') %] [% END %]
- - - - - - - - - - + + + + + + + + + + @@ -83,9 +84,9 @@ [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt index a0978c9c7e..9d688aa442 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt @@ -1,6 +1,7 @@ +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Course reserves › [% IF course_name %] Edit [% course_name %] [% ELSE %] New course [% END %] +[% t('Koha › Course reserves ›') %] [% IF course_name %] [% t('Edit') %] [% course_name %] [% ELSE %] [% t('New course') %] [% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -9,7 +10,7 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - + [% IF ( departments ) %] @@ -20,12 +21,12 @@ [% IF course_id %][% END %]
- [% IF course_id %]Edit course[% ELSE %]Create course[% END %] + [% IF course_id %][% t('Edit course') %][% ELSE %][% t('Create course') %][% END %]
  1. - + - Required + [% t('Required') %]
  2. - + - Required + [% t('Required') %]
  3. - - + +
  4. - + - Required + [% t('Required') %]
  5. [% IF terms %] - + [% ELSE %] - Term: - No TERM authorised values found! Please create one or more authorised values with the category TERM. + [% t('Term:') %] + [% t('No TERM authorised values found! Please create one or more authorised values with the category TERM.') %] [% END %]
  6. - Instructors: + [% t('Instructors:') %]
    -
    [% FOREACH i IN instructors %]
    [% i.surname %], [% i.firstname %] ( Remove ) -
    [% END %]
    +
    [% FOREACH i IN instructors %]
    [% i.surname %], [% i.firstname %] ( [% t('Remove') %] ) +
    [% END %]
    - - + +
  7. - +
  8. - +
  9. - +
  10. - + [% IF enabled == 'no' %] [% ELSE %] @@ -118,9 +119,9 @@ [% IF course_id %] - Cancel + [% t('Cancel') %] [% ELSE %] - Cancel + [% t('Cancel') %] [% END %]
@@ -131,11 +132,11 @@

- No DEPARTMENT authorized values found! + [% t('No DEPARTMENT authorized values found!') %] [% IF ( CAN_user_parameters ) %] - Please create one or more authorized values with the category DEPARTMENT. + [% t('Please') %] [% t('create one or more authorized values') %] [% t('with the category DEPARTMENT.') %] [% ELSE %] - An administrator must create one or more authorized values with the category DEPARTMENT. + [% t('An administrator must create one or more authorized values with the category DEPARTMENT.') %] [% END %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt index eb12031abf..b09e854c37 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt @@ -1,19 +1,20 @@ +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Course reserves +[% t('Koha › Course reserves') %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
-

Invalid course!

+

[% t('Invalid course!') %]

-- 2.17.1
NameDept.Course #SectionTermInstructorsStaff notePublic note# of StudentsEnabled[% t('Name') %][% t('Dept.') %][% t('Course #') %][% t('Section') %][% t('Term') %][% t('Instructors') %][% t('Staff note') %][% t('Public note') %][% t('# of Students') %][% t('Enabled') %]
[% c.students_count %] [% IF c.enabled == 'yes' %] - Yes + [% t('Yes') %] [% ELSE %] - No + [% t('No') %] [% END %]