From cd41b58ee42575f4464a93fc634343fa4459656c Mon Sep 17 00:00:00 2001 From: gfawcett Date: Tue, 29 Mar 2011 00:56:10 +0000 Subject: [PATCH] more message-text cleanups in the templates. git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/branches/i18n@1289 6d9bc8c9-1ec2-4278-b937-99fde70a366f --- conifer/integration/linktool/templates/associate.xhtml | 14 +++++--------- conifer/integration/linktool/templates/index.xhtml | 2 +- .../integration/linktool/templates/new_site_cannot.xhtml | 6 ++---- conifer/integration/linktool/templates/whichsite.xhtml | 5 ++--- conifer/templates/admin/su.xhtml | 2 +- conifer/templates/browse_index.xhtml | 6 +++--- conifer/templates/components/site.xhtml | 3 ++- conifer/templates/item/common_metadata.xhtml | 3 ++- conifer/templates/item/item_add_cat_search.xhtml | 7 ++++--- conifer/templates/item/item_add_elec.xhtml | 4 ++-- conifer/templates/item/item_add_url.xhtml | 3 ++- conifer/templates/item/item_metadata.xhtml | 10 +++------- conifer/templates/site_invitation.xhtml | 6 +----- conifer/templates/site_join.xhtml | 3 +-- 14 files changed, 31 insertions(+), 43 deletions(-) diff --git a/conifer/integration/linktool/templates/associate.xhtml b/conifer/integration/linktool/templates/associate.xhtml index 293d81a..fd2f2b9 100644 --- a/conifer/integration/linktool/templates/associate.xhtml +++ b/conifer/integration/linktool/templates/associate.xhtml @@ -1,5 +1,6 @@ @@ -12,9 +13,7 @@

No associated reserves items.

-

There are no reserves materials associated with this course - site. As an instructor, you can choose one of the following - options:

+

There are no reserves materials associated with this course site. As an instructor, you can choose one of the following options:

  1. Link this course site to one of my current reserves list
    @@ -40,15 +39,12 @@
    2. -->
-

Or, you can just browse the reserves.

+

Or, you can just browse the reserves.

-

There are no reserves materials associated with this course - site.

You can create reserves lists for course sites - associated with a current or future term. But this site is - associated with the term "${t}" and the course "${c}" — so - a reserves list cannot be created.

+

There are no reserves materials associated with this course site.

+

You can create reserves lists for course sites associated with a current or future term. But this site is associated with the term "${t}" and the course "${c}" — so a reserves list cannot be created.

Browse the reserves

diff --git a/conifer/integration/linktool/templates/index.xhtml b/conifer/integration/linktool/templates/index.xhtml index 8917db5..d7d3c9e 100644 --- a/conifer/integration/linktool/templates/index.xhtml +++ b/conifer/integration/linktool/templates/index.xhtml @@ -10,7 +10,7 @@ -

Welcome

+

Welcome!

${repr(list(related_sites))} diff --git a/conifer/integration/linktool/templates/new_site_cannot.xhtml b/conifer/integration/linktool/templates/new_site_cannot.xhtml index 063b10a..50c5a06 100644 --- a/conifer/integration/linktool/templates/new_site_cannot.xhtml +++ b/conifer/integration/linktool/templates/new_site_cannot.xhtml @@ -1,5 +1,6 @@ @@ -11,10 +12,7 @@

Cannot create site...

-

Sorry, but your site's course code (${coursecode or 'unknown'}) - and/or term code (${termcode or 'unknown'}) do not match any known - codes in the reserves system.

-

+

Sorry, but your site's course code (${coursecode or 'unknown'}) and/or term code (${termcode or 'unknown'}) do not match any known codes in the reserves system.

Go back diff --git a/conifer/integration/linktool/templates/whichsite.xhtml b/conifer/integration/linktool/templates/whichsite.xhtml index f121df1..7eb55ae 100644 --- a/conifer/integration/linktool/templates/whichsite.xhtml +++ b/conifer/integration/linktool/templates/whichsite.xhtml @@ -4,9 +4,8 @@ -

Please choose a set of reserves materials

-

There is more than one set of reserves materials related to this - site. Please choose from the list below:

+

Please choose a set of reserves materials.

+

There is more than one set of reserves materials related to this site. Please choose from the list below:

  • ${site}
    • diff --git a/conifer/templates/admin/su.xhtml b/conifer/templates/admin/su.xhtml index 3f1e222..98f06ca 100644 --- a/conifer/templates/admin/su.xhtml +++ b/conifer/templates/admin/su.xhtml @@ -14,7 +14,7 @@ title = _('Impersonate another user')

    ${title}

    -

    UWin ID to impersonate:

    +

    User ID to impersonate:

    diff --git a/conifer/templates/browse_index.xhtml b/conifer/templates/browse_index.xhtml index 3820921..a0c3063 100644 --- a/conifer/templates/browse_index.xhtml +++ b/conifer/templates/browse_index.xhtml @@ -6,6 +6,7 @@ blocks = itertools.groupby(sites, lambda s: s.course.department) ?> @@ -13,9 +14,8 @@ blocks = itertools.groupby(sites, lambda s: s.course.department)

    ${title}

    -
    - (Note: some reserve materials may require you - to log in) +
    + (Note: some reserve materials may require you to log in)
    @@ -59,7 +60,7 @@ searchtext = _('search this site...') 7 Day Loan
    Ask for: ${_callno}
    -
    NEXT DUE: ${_dueinfo}
    +
    NEXT DUE: ${_dueinfo}
    diff --git a/conifer/templates/item/common_metadata.xhtml b/conifer/templates/item/common_metadata.xhtml index 8975483..77c9e2c 100644 --- a/conifer/templates/item/common_metadata.xhtml +++ b/conifer/templates/item/common_metadata.xhtml @@ -1,5 +1,6 @@ Title of document Title of source - Author #${n+1} + Author #${n+1} Publisher Published diff --git a/conifer/templates/item/item_add_cat_search.xhtml b/conifer/templates/item/item_add_cat_search.xhtml index 89b1e54..e725c7e 100644 --- a/conifer/templates/item/item_add_cat_search.xhtml +++ b/conifer/templates/item/item_add_cat_search.xhtml @@ -10,6 +10,7 @@ dc_keys = ['dc:title', 'dc:creator', 'dc:publisher', 'dc:date'] ?> @@ -45,13 +46,13 @@ dc_keys = ['dc:title', 'dc:creator', 'dc:publisher', 'dc:date']

    - ${start}–${min(numhits, start+limit-1)} of ${numhits} results. + ${start}–${min(numhits, start+limit-1)} of ${numhits} results. - Previous ${limit} + Previous ${limit} • - Next ${limit} + Next ${limit}

    diff --git a/conifer/templates/item/item_add_elec.xhtml b/conifer/templates/item/item_add_elec.xhtml index 7fa9453..e21e47b 100644 --- a/conifer/templates/item/item_add_elec.xhtml +++ b/conifer/templates/item/item_add_elec.xhtml @@ -29,7 +29,7 @@ site.title = '%s: %s (%s)' % (site.course.code, site.course.name, site.term) enctype="multipart/form-data"> ${common_table(item)} - +
    File
    Electronic file

    ${go_back_link()} @@ -47,7 +47,7 @@ site.title = '%s: %s (%s)' % (site.course.code, site.course.name, site.term)

    Replace file contents

    - +
    File
    Electronic file

    diff --git a/conifer/templates/item/item_add_url.xhtml b/conifer/templates/item/item_add_url.xhtml index 4d860a4..39c8d3a 100644 --- a/conifer/templates/item/item_add_url.xhtml +++ b/conifer/templates/item/item_add_url.xhtml @@ -5,6 +5,7 @@ site.title = '%s: %s (%s)' % (site.course.code, site.course.name, site.term) ?> @@ -23,7 +24,7 @@ site.title = '%s: %s (%s)' % (site.course.code, site.course.name, site.term) ${nested_title(parent_item)} ${offer_to_delete(item)}

    ${title}

    diff --git a/conifer/templates/item/item_metadata.xhtml b/conifer/templates/item/item_metadata.xhtml index 2a4c3e2..ee444d8 100644 --- a/conifer/templates/item/item_metadata.xhtml +++ b/conifer/templates/item/item_metadata.xhtml @@ -67,7 +67,7 @@ callnum = item.call_number() title="${_avail} of ${_desk} copies available at reserves desk; ${_lib} total copies in library system"> Call Number (take this to the counter) -
    DUE: ${_dueinfo}
    +
    DUE: ${_dueinfo}
    ${_callno}
    2 Hour Loan @@ -105,16 +105,12 @@ callnum = item.call_number()

    -

    By pressing the 'Request' button - below, I am requesting a digital copy of a reading (chapter, article) - for my own private study and research use. I agree that I will not - reproduce, redistribute or transmit a copy of the reading in any - format.

    +

    By pressing the 'Request' button below, I am requesting a digital copy of a reading (chapter, article) for my own private study and research use. I agree that I will not reproduce, redistribute or transmit a copy of the reading in any format.

    -

    Document type: ${item.fileobj_mimetype}. Size: ${item.fileobj.size} bytes.

    +

    Document type: ${item.fileobj_mimetype}. Size: ${item.fileobj.size} bytes.

    diff --git a/conifer/templates/site_invitation.xhtml b/conifer/templates/site_invitation.xhtml index c038456..0673ffd 100644 --- a/conifer/templates/site_invitation.xhtml +++ b/conifer/templates/site_invitation.xhtml @@ -15,11 +15,7 @@ title = _('Join a site using an Invitation Code')

    ${title}

    -

    Your instructor may have provided you with an Invitation Code, - which will give you access to your course's reserves. Enter the - invitation code below to continue. Note that not all courses require - an invitation code; contact your instructor or the library staff for - more information.

    +

    Your instructor may have provided you with an Invitation Code, which will give you access to your course's reserves. Enter the invitation code below to continue. Note that not all courses require an invitation code; contact your instructor or the library staff for more information.

    ${error}
    diff --git a/conifer/templates/site_join.xhtml b/conifer/templates/site_join.xhtml index e16b11d..75a59f2 100644 --- a/conifer/templates/site_join.xhtml +++ b/conifer/templates/site_join.xhtml @@ -13,8 +13,7 @@ title = _('Join this site?') ${site_banner(site)}

    ${title}

    -

    If you choose to join this site, it will be added to your "My - Reserves" list.

    +

    If you choose to join this site, it will be added to your "My Reserves" list.

    ${go_back_link()}

    -- 2.11.0