[open-ils-commits] r1289 - in servres/branches/i18n/conifer: integration/linktool/templates templates templates/admin templates/components templates/item (gfawcett)
svn at svn.open-ils.org
svn at svn.open-ils.org
Mon Mar 28 20:56:12 EDT 2011
Author: gfawcett
Date: 2011-03-28 20:56:10 -0400 (Mon, 28 Mar 2011)
New Revision: 1289
Modified:
servres/branches/i18n/conifer/integration/linktool/templates/associate.xhtml
servres/branches/i18n/conifer/integration/linktool/templates/index.xhtml
servres/branches/i18n/conifer/integration/linktool/templates/new_site_cannot.xhtml
servres/branches/i18n/conifer/integration/linktool/templates/whichsite.xhtml
servres/branches/i18n/conifer/templates/admin/su.xhtml
servres/branches/i18n/conifer/templates/browse_index.xhtml
servres/branches/i18n/conifer/templates/components/site.xhtml
servres/branches/i18n/conifer/templates/item/common_metadata.xhtml
servres/branches/i18n/conifer/templates/item/item_add_cat_search.xhtml
servres/branches/i18n/conifer/templates/item/item_add_elec.xhtml
servres/branches/i18n/conifer/templates/item/item_add_url.xhtml
servres/branches/i18n/conifer/templates/item/item_metadata.xhtml
servres/branches/i18n/conifer/templates/site_invitation.xhtml
servres/branches/i18n/conifer/templates/site_join.xhtml
Log:
more message-text cleanups in the templates.
Modified: servres/branches/i18n/conifer/integration/linktool/templates/associate.xhtml
===================================================================
--- servres/branches/i18n/conifer/integration/linktool/templates/associate.xhtml 2011-03-29 00:56:06 UTC (rev 1288)
+++ servres/branches/i18n/conifer/integration/linktool/templates/associate.xhtml 2011-03-29 00:56:10 UTC (rev 1289)
@@ -1,5 +1,6 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
xmlns:py="http://genshi.edgewall.org/">
<xi:include href="linktoolmaster.xhtml"/>
<head>
@@ -12,9 +13,7 @@
<body>
<h1>No associated reserves items.</h1>
<div py:if="extsite.is_currentish()">
- <p>There are no reserves materials associated with this course
- site. As an instructor, you can choose one of the following
- options:</p>
+ <p>There are no reserves materials associated with this course site. As an instructor, you can choose one of the following options:</p>
<ol>
<li>
<div><b>Link this course site to one of my current reserves list</b></div>
@@ -40,15 +39,12 @@
</li>
-->
</ol>
- <p>Or, you can just <a href="${ROOT}/browse/">browse the reserves</a>.</p>
+ <p i18n:msg="browse">Or, you can just <a href="${ROOT}/browse/">browse the reserves</a>.</p>
</div>
<div py:if="not extsite.is_currentish()"
py:with="t=extsite.term_obj or 'unknown'; c=extsite.coursecode or 'unknown'">
- <p>There are no reserves materials associated with this course
- site.</p> <p>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.</p>
+ <p>There are no reserves materials associated with this course site.</p>
+ <p i18n:msg="term,course">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.</p>
<p><a href="${ROOT}/browse/">Browse the reserves</a></p>
</div>
</body>
Modified: servres/branches/i18n/conifer/integration/linktool/templates/index.xhtml
===================================================================
--- servres/branches/i18n/conifer/integration/linktool/templates/index.xhtml 2011-03-29 00:56:06 UTC (rev 1288)
+++ servres/branches/i18n/conifer/integration/linktool/templates/index.xhtml 2011-03-29 00:56:10 UTC (rev 1289)
@@ -10,7 +10,7 @@
</script>
</head>
<body>
-<h1>Welcome</h1>
+<h1>Welcome!</h1>
${repr(list(related_sites))}
</body>
</html>
Modified: servres/branches/i18n/conifer/integration/linktool/templates/new_site_cannot.xhtml
===================================================================
--- servres/branches/i18n/conifer/integration/linktool/templates/new_site_cannot.xhtml 2011-03-29 00:56:06 UTC (rev 1288)
+++ servres/branches/i18n/conifer/integration/linktool/templates/new_site_cannot.xhtml 2011-03-29 00:56:10 UTC (rev 1289)
@@ -1,5 +1,6 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
xmlns:py="http://genshi.edgewall.org/">
<xi:include href="linktoolmaster.xhtml"/>
<head>
@@ -11,10 +12,7 @@
</head>
<body>
<h1>Cannot create site...</h1>
- <p>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.</p>
- <p>
+ <p i18n:msg="course,term">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.</p> <p>
<a href="https://clew.uwindsor.ca/xsl-portal/site/${request.session['clew-site']}/">
Go back
</a>
Modified: servres/branches/i18n/conifer/integration/linktool/templates/whichsite.xhtml
===================================================================
--- servres/branches/i18n/conifer/integration/linktool/templates/whichsite.xhtml 2011-03-29 00:56:06 UTC (rev 1288)
+++ servres/branches/i18n/conifer/integration/linktool/templates/whichsite.xhtml 2011-03-29 00:56:10 UTC (rev 1289)
@@ -4,9 +4,8 @@
<xi:include href="linktoolmaster.xhtml"/>
<head/>
<body>
- <h1 style="padding-top: 1em;">Please choose a set of reserves materials</h1>
- <p>There is more than one set of reserves materials related to this
- site. Please choose from the list below:</p>
+ <h1 style="padding-top: 1em;">Please choose a set of reserves materials.</h1>
+ <p>There is more than one set of reserves materials related to this site. Please choose from the list below:</p>
<ul>
<li py:for="site in related_sites"
style="margin-bottom: 1em;"><a href="${site.site_url()}">${site}</a></li>
Modified: servres/branches/i18n/conifer/templates/admin/su.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/admin/su.xhtml 2011-03-29 00:56:06 UTC (rev 1288)
+++ servres/branches/i18n/conifer/templates/admin/su.xhtml 2011-03-29 00:56:10 UTC (rev 1289)
@@ -14,7 +14,7 @@
<body>
<h1>${title}</h1>
<form action="." method="POST">
- <p>UWin ID to impersonate:</p>
+ <p>User ID to impersonate:</p>
<p><input type="text" name="userid"/></p>
<p><input type="submit" value="${_('Impersonate')}"/></p>
</form>
Modified: servres/branches/i18n/conifer/templates/browse_index.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/browse_index.xhtml 2011-03-29 00:56:06 UTC (rev 1288)
+++ servres/branches/i18n/conifer/templates/browse_index.xhtml 2011-03-29 00:56:10 UTC (rev 1289)
@@ -6,6 +6,7 @@
?>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
xmlns:py="http://genshi.edgewall.org/">
<xi:include href="master.xhtml"/>
<head>
@@ -13,9 +14,8 @@
</head>
<body>
<h1>${title}</h1>
- <div py:if="user.is_anonymous()">
- (Note: some reserve materials may require you
- to <a href="${ROOT}${settings.LOGIN_URL}?next=${ROOT}/">log in</a>)
+ <div py:if="user.is_anonymous()" i18n:msg="log_in">
+ (Note: some reserve materials may require you to <a href="${ROOT}${settings.LOGIN_URL}?next=${ROOT}/">log in</a>)
</div>
<img py:def="lock(condition=True)"
Modified: servres/branches/i18n/conifer/templates/components/site.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/components/site.xhtml 2011-03-29 00:56:06 UTC (rev 1288)
+++ servres/branches/i18n/conifer/templates/components/site.xhtml 2011-03-29 00:56:10 UTC (rev 1289)
@@ -3,6 +3,7 @@
?>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
xmlns:xi="http://www.w3.org/2001/XInclude"
py:strip="">
@@ -59,7 +60,7 @@
<span py:if="_circmod == 'RESERVE 7 DAY'">7 Day Loan</span>
</div>
<div class="callnumber"><span py:if="_avail > 0">Ask for: </span><span class="standout">${_callno}</span></div>
- <div py:if="_dueinfo">NEXT DUE: ${_dueinfo}</div>
+ <div py:if="_dueinfo" i18n:msg="due_info" i18n:comment="The next copy is due back:">NEXT DUE: ${_dueinfo}</div>
</div>
<div py:if="not valid" class="unavailable">
Modified: servres/branches/i18n/conifer/templates/item/common_metadata.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/item/common_metadata.xhtml 2011-03-29 00:56:06 UTC (rev 1288)
+++ servres/branches/i18n/conifer/templates/item/common_metadata.xhtml 2011-03-29 00:56:10 UTC (rev 1289)
@@ -1,5 +1,6 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
xmlns:py="http://genshi.edgewall.org/"
py:strip="True">
<?python
@@ -15,7 +16,7 @@
<tr><th>Title of document</th><td><input type="text" name="title" value="${item.title}"/></td></tr>
<tr><th>Title of source</th><td><input type="text" name="source_title" value="${item.source_title}"/></td></tr>
<tr py:for="n, author in enumerate(authors)">
- <th>Author #${n+1}</th><td><input type="text" name="author${n+1}" value="${author}"/></td>
+ <th i18n:msg="num">Author #${n+1}</th><td><input type="text" name="author${n+1}" value="${author}"/></td>
</tr>
<tr><th>Publisher</th><td><input type="text" name="publisher" value="${item.publisher}"/></td></tr>
<tr><th>Published</th><td><input type="text" name="published" value="${item.published}"/></td></tr>
Modified: servres/branches/i18n/conifer/templates/item/item_add_cat_search.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/item/item_add_cat_search.xhtml 2011-03-29 00:56:06 UTC (rev 1288)
+++ servres/branches/i18n/conifer/templates/item/item_add_cat_search.xhtml 2011-03-29 00:56:10 UTC (rev 1289)
@@ -10,6 +10,7 @@
?>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
xmlns:py="http://genshi.edgewall.org/">
<xi:include href="../master.xhtml"/>
<xi:include href="../paginate.xhtml"/>
@@ -45,13 +46,13 @@
</form>
<div py:def="page_control" py:if="results">
<p>
- ${start}–${min(numhits, start+limit-1)} of ${numhits} results.
+ <span i18n:msg="first,last,total">${start}–${min(numhits, start+limit-1)} of ${numhits} results.</span>
<span py:if="start-limit>0">
- <a href=".?query=${query}&start=${start-limit}&limit=${limit}">Previous ${limit}</a>
+ <a href=".?query=${query}&start=${start-limit}&limit=${limit}" i18n:msg="count">Previous ${limit}</a>
•
</span>
<span py:if="start+limit<numhits">
- <a href=".?query=${query}&start=${start+limit}&limit=${limit}">Next ${limit}</a>
+ <a href=".?query=${query}&start=${start+limit}&limit=${limit}" i18n:msg="count">Next ${limit}</a>
</span>
</p>
</div>
Modified: servres/branches/i18n/conifer/templates/item/item_add_elec.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/item/item_add_elec.xhtml 2011-03-29 00:56:06 UTC (rev 1288)
+++ servres/branches/i18n/conifer/templates/item/item_add_elec.xhtml 2011-03-29 00:56:10 UTC (rev 1289)
@@ -29,7 +29,7 @@
enctype="multipart/form-data">
<table class="metadata_table">
${common_table(item)}
- <tr><th>File</th><td><input type="file" name="file"/></td></tr>
+ <tr><th>Electronic file</th><td><input type="file" name="file"/></td></tr>
</table>
<p><input type="submit" value="${_('Upload file and Create item')}"/>
${go_back_link()}
@@ -47,7 +47,7 @@
<h2>Replace file contents</h2>
<form action="." method="POST" enctype="multipart/form-data">
<table class="metadata_table">
- <tr><th>File</th><td><input type="file" name="file"/></td></tr>
+ <tr><th>Electronic file</th><td><input type="file" name="file"/></td></tr>
</table>
<p><input type="submit" value="${_('Upload new file contents')}"/></p>
Modified: servres/branches/i18n/conifer/templates/item/item_add_url.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/item/item_add_url.xhtml 2011-03-29 00:56:06 UTC (rev 1288)
+++ servres/branches/i18n/conifer/templates/item/item_add_url.xhtml 2011-03-29 00:56:10 UTC (rev 1289)
@@ -5,6 +5,7 @@
?>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
xmlns:py="http://genshi.edgewall.org/">
<xi:include href="../master.xhtml"/>
<xi:include href="../components/site.xhtml"/>
@@ -23,7 +24,7 @@
${nested_title(parent_item)}
${offer_to_delete(item)}
<div py:if="not is_edit" style="float:right;">
- <a href="javascript:void($('#refworks,.metadata_table').toggle());">Import RIS</a>
+ <a href="javascript:void($('#refworks,.metadata_table').toggle());" i18n:comment="Refworks Import Format">Import RIS</a>
</div>
<h2>${title}</h2>
Modified: servres/branches/i18n/conifer/templates/item/item_metadata.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/item/item_metadata.xhtml 2011-03-29 00:56:06 UTC (rev 1288)
+++ servres/branches/i18n/conifer/templates/item/item_metadata.xhtml 2011-03-29 00:56:10 UTC (rev 1289)
@@ -67,7 +67,7 @@
title="${_avail} of ${_desk} copies available at reserves desk; ${_lib} total copies in library system">
<th>Call Number (take this to the counter)</th>
<td>
- <div class="${_avail > 0 and 'available' or 'unavailable'}" py:if="_dueinfo">DUE: ${_dueinfo}</div>
+ <div class="${_avail > 0 and 'available' or 'unavailable'}" py:if="_dueinfo" i18n:msg="duedate">DUE: ${_dueinfo}</div>
<div class="callnumber ${_avail > 0 and 'available' or 'unavailable'}">${_callno}</div>
<div py:if="_circmod">
<span py:if="_circmod == 'RSV2'">2 Hour Loan</span>
@@ -105,16 +105,12 @@
</div>
<div id="ask_to_download_panel">
<p py:if="custom_declaration" py:content="custom_declaration"/>
- <p py:if="not custom_declaration">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.</p>
+ <p py:if="not custom_declaration">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.</p>
<p><a class="bigdownload" href="javascript:askToDownload();"><button onclick="askToDownload();">Request to download this document</button></a></p>
</div>
<div id="downloadpanel">
<p><a class="bigdownload" href="${item.item_download_url()}"><button onclick="location='${item.item_download_url()}';">Click here to download the document.</button></a></p>
- <p>Document type: ${item.fileobj_mimetype}. Size: ${item.fileobj.size} bytes.</p>
+ <p i18n:msg="type,bytes">Document type: ${item.fileobj_mimetype}. Size: ${item.fileobj.size} bytes.</p>
</div>
</div>
Modified: servres/branches/i18n/conifer/templates/site_invitation.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/site_invitation.xhtml 2011-03-29 00:56:06 UTC (rev 1288)
+++ servres/branches/i18n/conifer/templates/site_invitation.xhtml 2011-03-29 00:56:10 UTC (rev 1289)
@@ -15,11 +15,7 @@
</head>
<body>
<h1>${title}</h1>
- <p>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.</p>
+ <p>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.</p>
<div class="errors" py:if="error">${error}</div>
<form action="." method="POST">
<table class="metadata_table">
Modified: servres/branches/i18n/conifer/templates/site_join.xhtml
===================================================================
--- servres/branches/i18n/conifer/templates/site_join.xhtml 2011-03-29 00:56:06 UTC (rev 1288)
+++ servres/branches/i18n/conifer/templates/site_join.xhtml 2011-03-29 00:56:10 UTC (rev 1289)
@@ -13,8 +13,7 @@
${site_banner(site)}
<h2>${title}</h2>
- <p>If you choose to join this site, it will be added to your "My
- Reserves" list.</p>
+ <p>If you choose to join this site, it will be added to your "My Reserves" list.</p>
<form action="." method="POST">
<p><input type="submit" value="${_('Yes, join this site')}"/> ${go_back_link()}</p>
</form>
More information about the open-ils-commits
mailing list