i18n dictionary entries

git-svn-id: http://scm.dspace.org/svn/repo/trunk@1235 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Scott Yeadon
2005-06-16 00:33:56 +00:00
parent 58ce35fda9
commit 71264ba00e
3 changed files with 138 additions and 74 deletions

View File

@@ -751,7 +751,7 @@ jsp.submit.choose-file.info3 =<strong>Netscape users please note:</strong> By de
jsp.submit.choose-file.info4 =Instructions for Netscape users are available.
jsp.submit.choose-file.info6 =Please also note that the DSpace system is able to preserve the content of certain types of files better than other types.
jsp.submit.choose-file.info7 =Information about file types and levels of support for each are available.
jsp.submit.choose-file.info9 =Please give a brief description of the contents of this file, for example "Main article", or "Experiment data readings.
jsp.submit.choose-file.info9 =Please give a brief description of the contents of this file, for example "Main article", or "Experiment data readings".
jsp.submit.choose-file.title =Upload a File
jsp.submit.complete.heading =Submit: Submission Complete!
@@ -829,6 +829,31 @@ jsp.submit.progressbar.verify = Verify
jsp.submit.progressbar.license = License
jsp.submit.progressbar.complete = Complete
jsp.submit.review.title = Verify Submission
jsp.submit.review.heading = Submit: Verify Submission
jsp.submit.review.info1 = <strong>Not quite there yet,</strong> but nearly!
jsp.submit.review.info2 = Please spend a few minutes to examine what you've just submitted below. If anything is wrong, please go back and correct it by using the buttons next to the error, or by clicking on the progress bar at the top of the page.
jsp.submit.review.info3 = <strong>If everything is OK,</strong> please click the "Next" button at the bottom of the page.
jsp.submit.review.info4 = You can safely check the files you've uploaded - a new window will be opened to display them.
jsp.submit.review.init-question1 = Item has more than one title:
jsp.submit.review.init-question2 = Previously published item:
jsp.submit.review.init-question3 = Item consists of more than one file:
jsp.submit.review.state1 = Yes
jsp.submit.review.state2 = No
jsp.submit.review.button.correct = Correct one of these
jsp.submit.review.no_md = <em>None</em>
jsp.submit.review.unknown = (Unknown)
jsp.submit.review.known = (Known)
jsp.submit.review.supported = (Supported)
jsp.submit.review.upload1 = Uploaded&nbsp;Files:
jsp.submit.review.upload2 = Uploaded&nbsp;File:
jsp.submit.review.button.upload1 = Add or Remove a File
jsp.submit.review.button.upload2 = Upload a different file
jsp.submit.review.button.edit = Edit File Details
jsp.submit.review.button.previous = &lt; Previous
jsp.submit.review.button.next = Next &gt;
jsp.submit.review.button.cancelsave = Cancel/Save
jsp.submit.saved.info =Your submission has been saved for you to finish later. You can continue the submission by going to your "My DSpace" page and clicking on the relevant "Resume" button.
jsp.submit.saved.title =Submission Saved
@@ -877,6 +902,35 @@ jsp.submit.upload-error.info =There was a problem uploading your file. Either t
jsp.submit.upload-error.retry.button =Retry Upload
jsp.submit.upload-error.title =Error Uploading File
jsp.submit.upload-file-list.title = Uploaded Files
jsp.submit.upload-file-list.heading1 = Submit: File Uploaded Successfully
jsp.submit.upload-file-list.heading2 = Submit: Uploaded Files
jsp.submit.upload-file-list.info1 = <strong>Your file was successfully uploaded.</strong>
jsp.submit.upload-file-list.info2 = The table below shows the files you have uploaded for this item.
jsp.submit.upload-file-list.info3 = You can verify that the file(s) have been uploaded correctly by:
jsp.submit.upload-file-list.info4 = Clicking on the filenames above. This will download the file in a new browser window, so that you can check the contents.
jsp.submit.upload-file-list.info5 = Comparing checksums displayed above with checksums worked out on your local computer. They should be exactly the same.
jsp.submit.upload-file-list.info6 = The system can calculate a checksum you can verify.
jsp.submit.upload-file-list.tableheading1 = Primary<br>bitstream
jsp.submit.upload-file-list.tableheading2 = File
jsp.submit.upload-file-list.tableheading3 = Size
jsp.submit.upload-file-list.tableheading4 = Description
jsp.submit.upload-file-list.tableheading5 = File Format
jsp.submit.upload-file-list.tableheading6 = Checksum
jsp.submit.upload-file-list.empty1 = <em>None</em>
jsp.submit.upload-file-list.supportlevel1 = supported
jsp.submit.upload-file-list.supportlevel2 = known
jsp.submit.upload-file-list.supportlevel1 = unsupported
jsp.submit.upload-file-list.button1 = Change
jsp.submit.upload-file-list.button2 = Remove
jsp.submit.upload-file-list.button3 = Show checksums
jsp.submit.upload-file-list.button4 = Add Another File
jsp.submit.upload-file-list.button5 = &lt; Previous
jsp.submit.upload-file-list.button6 = Next &gt;
jsp.submit.upload-file-list.button7 = Cancel/Save
jsp.submit.upload-file-list.help1 = Click here to find out how to do this.
jsp.submit.upload-file-list.help2 = Click here for more information.
jsp.submit.verify-prune.heading =Submit: Caution
jsp.submit.verify-prune.info1 =The changes you've made to the first "Describe Your Item" page will affect your submission:
jsp.submit.verify-prune.info2 =You've indicated that your submission does not have alternative titles, but you've already entered some. If you proceed with this change, the alternative titles you've entered will be removed.

View File

@@ -64,7 +64,12 @@
<%@ page import="org.dspace.content.Item" %>
<%@ page import="org.dspace.core.Utils" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.LocaleSupport" %>
<%@ page import="javax.servlet.jsp.PageContext" %>
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%
SubmissionInfo si =
@@ -82,14 +87,16 @@
javax.servlet.jsp.JspWriter out,
DCInputSet inputSet,
SubmissionInfo si,
Item item, int pageNum)
Item item,
int pageNum,
PageContext pageContext)
throws ServletException, IOException
{
InProgressSubmission ip = si.submission;
DCInput[] inputs = inputSet.getPageRows(pageNum,
ip.hasMultipleTitles(),
ip.isPublishedBefore());
for (int z = 0; z < inputs.length; z++)
for (int z = 0; z < inputs.length; z++)
{
String inputType = inputs[z].getInputType();
String pairsName = inputs[z].getPairsType();
@@ -113,7 +120,8 @@
}
if (values.length == 0)
{
row.append("<em>None</em>").append("</td>").append("</tr>");
row.append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.review.no_md"))
.append("</td>").append("</tr>");
}
else
{
@@ -157,7 +165,7 @@
}
%>
<dspace:layout locbar="off" navbar="off" title="Verify Submission" nocache="true">
<dspace:layout locbar="off" navbar="off" titlekey="jsp.submit.review.title" nocache="true">
<form action="<%= request.getContextPath() %>/submit" method=post>
<jsp:include page="/submit/progressbar.jsp">
@@ -166,20 +174,16 @@
<jsp:param name="md_pages" value="<%= si.numMetadataPages %>"/>
</jsp:include>
<H1>Submit: Verify Submission</H1>
<h1><fmt:message key="jsp.submit.review.heading"/></h1>
<P><strong>Not quite there yet,</strong> but nearly!</P>
<p><fmt:message key="jsp.submit.review.info1"/></p>
<P>Please spend a few minutes to examine what you've just submitted below.
If anything is wrong, please go back and correct it by using the buttons
next to the error, or by clicking on the progress bar at the top of the
page.
<dspace:popup page="/help/index.html#verify">(More Help...)</dspace:popup></P>
<p><fmt:message key="jsp.submit.review.info2"/>
<dspace:popup page="/help/index.html#verify"><fmt:message key="jsp.morehelp"/></dspace:popup></p>
<P><strong>If everything is OK,</strong> please click the "Next" button at the bottom of the page.</P>
<p><fmt:message key="jsp.submit.review.info3"/></p>
<P>You can safely check the files you've uploaded - a new window will
be opened to display them.</P>
<p><fmt:message key="jsp.submit.review.info4"/></p>
<table align=center class=miscTable width=80%>
<%-- ====================================================== --%>
@@ -192,21 +196,21 @@
<td width=100%>
<table>
<tr>
<td class=metadataFieldLabel>Item has more than one title:</td>
<td class=metadataFieldValue><%= (si.submission.hasMultipleTitles() ? "Yes" : "No") %></td>
<td class=metadataFieldLabel><fmt:message key="jsp.submit.review.init-question1"/></td>
<td class=metadataFieldValue><%= (si.submission.hasMultipleTitles() ? LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.review.state1") : LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.review.state2")) %></td>
</tr>
<tr>
<td class=metadataFieldLabel>Previously published item:</td>
<td class=metadataFieldValue><%= (si.submission.isPublishedBefore() ? "Yes" : "No") %></td>
<td class=metadataFieldLabel><fmt:message key="jsp.submit.review.init-question2"/></td>
<td class=metadataFieldValue><%= (si.submission.isPublishedBefore() ? LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.review.state1") : LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.review.state2")) %></td>
</tr>
<tr>
<td class=metadataFieldLabel>Item consists of more than one file:</td>
<td class=metadataFieldValue><%= (si.submission.hasMultipleFiles() ? "Yes" : "No") %></td>
<td class=metadataFieldLabel><fmt:message key="jsp.submit.review.init-question3"/></td>
<td class=metadataFieldValue><%= (si.submission.hasMultipleFiles() ? LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.review.state1") : LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.review.state2")) %></td>
</tr>
</table>
</td>
<td valign=middle>
<input type=submit name=submit_jump_<%= SubmitServlet.INITIAL_QUESTIONS %> value="Correct one of these">
<input type=submit name=submit_jump_<%= SubmitServlet.INITIAL_QUESTIONS %> value="<fmt:message key="jsp.submit.review.button.correct"/>">
</td>
</tr>
</table>
@@ -228,12 +232,12 @@
<table>
<%
layoutSection(request, out, inputSet, si, item, i);
layoutSection(request, out, inputSet, si, item, i, pageContext);
%>
</table>
</td>
<td valign=middle>
<input type=submit name=submit_jump_<%= SubmitServlet.EDIT_METADATA_1 + i %> value="Correct one of these">
<input type=submit name=submit_jump_<%= SubmitServlet.EDIT_METADATA_1 + i %> value="<fmt:message key="jsp.submit.review.button.correct"/>">
</td>
</tr>
</table>
@@ -251,11 +255,11 @@
<tr>
<td width=100%>
<table>
layoutSection(request, out, inputSet, si, item, 1);
layoutSection(request, out, inputSet, si, item, 1, pageContext);
</table>
</td>
<td valign=middle align=right>
<input type=submit name=submit_jump_<%= SubmitServlet.EDIT_METADATA_2 %> value="Correct one of these">
<input type=submit name=submit_jump_<%= SubmitServlet.EDIT_METADATA_2 %> value="<fmt:message key="jsp.submit.review.button.correct"/>">
</td>
</tr>
</table>
@@ -272,7 +276,7 @@
<td width=100%>
<table>
<tr>
<td class=metadataFieldLabel><%= (si.submission.hasMultipleFiles() ? "Uploaded&nbsp;Files:" : "Uploaded&nbsp;File:") %></td>
<td class=metadataFieldLabel><%= (si.submission.hasMultipleFiles() ? LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.review.upload1") : LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.review.upload2")) %></td>
<td class=metadataFieldValue>
<%
Bitstream[] bitstreams = item.getNonInternalBitstreams();
@@ -288,18 +292,18 @@
downloadLink = "html/db-id/" + item.getID();
}
%>
<A HREF="<%= request.getContextPath() %>/<%= downloadLink %>/<%= UIUtil.encodeBitstreamName(bitstreams[i].getName()) %>" target="_blank"><%= bitstreams[i].getName() %></A> - <%= bitstreams[i].getFormatDescription() %>
<a href="<%= request.getContextPath() %>/<%= downloadLink %>/<%= UIUtil.encodeBitstreamName(bitstreams[i].getName()) %>" target="_blank"><%= bitstreams[i].getName() %></a> - <%= bitstreams[i].getFormatDescription() %>
<%
switch (format.getSupportLevel())
{
case 0:
%>(Unknown)<%
%><fmt:message key="jsp.submit.review.unknown"/><%
break;
case 1:
%>(Known)<%
%><fmt:message key="jsp.submit.review.known"/><%
break;
case 2:
%>(Supported)<%
%><fmt:message key="jsp.submit.review.supported"/><%
}
%>
<br>
@@ -317,14 +321,14 @@
{
%>
<input type=submit name=submit_jump_<%= SubmitServlet.UPLOAD_FILES %>
value="<%= (si.submission.hasMultipleFiles() ? "Add or Remove a File" : "Upload a different file") %>">
value="<%= (si.submission.hasMultipleFiles() ? LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.review.button.upload1") : LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.review.button.upload2")) %>">
<%
}
else
{
%>
<input type=submit name=submit_jump_<%= SubmitServlet.UPLOAD_FILES %>
value="Edit File Details">
value="<fmt:message key="jsp.submit.review.button.edit"/>">
<%
}
%>
@@ -339,21 +343,21 @@
<%= SubmitServlet.getSubmissionParameters(si) %>
<input type=hidden name=step value=<%= SubmitServlet.REVIEW_SUBMISSION %>>
<P>&nbsp;</P>
<p>&nbsp;</p>
<center>
<table border=0 width=80%>
<tr>
<td width="100%">&nbsp;</td>
<td>
<input type=submit name=submit_prev value="&lt; Previous">
<input type=submit name=submit_prev value="<fmt:message key="jsp.submit.review.button.previous"/>">
</td>
<td>
<input type=submit name=submit_next value="Next &gt;">
<input type=submit name=submit_next value="<fmt:message key="jsp.submit.review.button.next"/>">
</td>
<td>&nbsp;&nbsp;&nbsp;</td>
<td align=right>
<input type=submit name=submit_cancel value="Cancel/Save">
<input type=submit name=submit_cancel value="<fmt:message key="jsp.submit.review.button.cancelsave"/>">
</td>
</tr>
</table>
@@ -361,4 +365,4 @@
</form>
</dspace:layout>
</dspace:layout>

View File

@@ -58,9 +58,10 @@
<%@ page import="org.dspace.content.Bitstream" %>
<%@ page import="org.dspace.content.BitstreamFormat" %>
<%@ page import="org.dspace.content.Bundle" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.LocaleSupport" %>
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%
SubmissionInfo si =
@@ -70,7 +71,7 @@
boolean showChecksums = ((Boolean) request.getAttribute("show.checksums")).booleanValue();
%>
<dspace:layout locbar="off" navbar="off" title="Uploaded Files">
<dspace:layout locbar="off" navbar="off" titlekey="jsp.submit.upload-file-list.title">
<form action="<%= request.getContextPath() %>/submit" method=post>
@@ -80,30 +81,37 @@
<jsp:param name="md_pages" value="<%= si.numMetadataPages %>"/>
</jsp:include>
<H1>Submit: <%= (justUploaded ? "File Uploaded Successfully" : "Uploaded Files") %></H1>
<%-- <h1>Submit: <%= (justUploaded ? "File Uploaded Successfully" : "Uploaded Files") %></h1> --%>
<%
if (justUploaded)
{
%>
<P><strong>Your file was successfully uploaded.</strong></P>
<h1><fmt:message key="jsp.submit.upload-file-list.heading1"/></h1>
<p><fmt:message key="jsp.submit.upload-file-list.info1"/></p>
<%
}
else
{
%>
<h1><fmt:message key="jsp.submit.upload-file-list.heading2"/></h1>
<%
}
%>
<P>The table below shows the files you have uploaded for this item. <dspace:popup page="/help/index.html#uploadedfile">(More Help...)</dspace:popup></P>
<p><fmt:message key="jsp.submit.upload-file-list.info2"/> <dspace:popup page="/help/index.html#uploadedfile"><fmt:message key="jsp.morehelp"/></dspace:popup></p>
<table class="miscTable" align=center>
<tr>
<th class="oddRowEvenCol">Primary<br>bitstream</th>
<th class="oddRowOddCol">File</th>
<th class="oddRowEvenCol">Size</th>
<th class="oddRowOddCol">Description</th>
<th class="oddRowEvenCol">File Format</th>
<th class="oddRowEvenCol"><fmt:message key="jsp.submit.upload-file-list.tableheading1"/></th>
<th class="oddRowOddCol"><fmt:message key="jsp.submit.upload-file-list.tableheading2"/></th>
<th class="oddRowEvenCol"><fmt:message key="jsp.submit.upload-file-list.tableheading3"/></th>
<th class="oddRowOddCol"><fmt:message key="jsp.submit.upload-file-list.tableheading4"/></th>
<th class="oddRowEvenCol"><fmt:message key="jsp.submit.upload-file-list.tableheading5"/></th>
<%
if (showChecksums)
{
%>
<th class="oddRowOddCol">Checksum</th>
<th class="oddRowOddCol"><fmt:message key="jsp.submit.upload-file-list.tableheading6"/></th>
<%
}
@@ -133,16 +141,16 @@
{
BitstreamFormat format = bitstreams[i].getFormat();
String description = bitstreams[i].getFormatDescription();
String supportLevel = "supported";
String supportLevel = LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.upload-file-list.supportlevel1");
if(format.getSupportLevel() == 1)
{
supportLevel = "known";
supportLevel = LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.upload-file-list.supportlevel2");
}
if(format.getSupportLevel() == 0)
{
supportLevel = "unsupported";
supportLevel = LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.upload-file-list.supportlevel3");
}
// Full param to dspace:popup must be single variable
@@ -157,17 +165,17 @@
<% }
} %> >
</td>
<td class="<%= row %>RowOddCol"><A HREF="<%= request.getContextPath() %>/retrieve/<%= bitstreams[i].getID() %>/<%= org.dspace.app.webui.util.UIUtil.encodeBitstreamName(bitstreams[i].getName()) %>" target="_blank"><%= bitstreams[i].getName() %></A></td>
<td class="<%= row %>RowOddCol"><a href="<%= request.getContextPath() %>/retrieve/<%= bitstreams[i].getID() %>/<%= org.dspace.app.webui.util.UIUtil.encodeBitstreamName(bitstreams[i].getName()) %>" target="_blank"><%= bitstreams[i].getName() %></a></td>
<td class="<%= row %>RowEvenCol"><%= bitstreams[i].getSize() %> bytes</td>
<td class="<%= row %>RowOddCol">
<%= (bitstreams[i].getDescription() == null || bitstreams[i].getDescription().equals("")
? "<em>None</em>"
? LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.upload-file-list.empty1")
: bitstreams[i].getDescription()) %>
<input type=submit name="submit_describe_<%= bitstreams[i].getID() %>" value="Change">
<input type=submit name="submit_describe_<%= bitstreams[i].getID() %>" value="<fmt:message key="jsp.submit.upload-file-list.button1"/>">
</td>
<td class="<%= row %>RowEvenCol">
<%= description %> <dspace:popup page="<%= supportLevelLink %>">(<%= supportLevel %>)</dspace:popup>
<input type=submit name="submit_format_<%= bitstreams[i].getID() %>" value="Change">
<input type=submit name="submit_format_<%= bitstreams[i].getID() %>" value="<fmt:message key="jsp.submit.upload-file-list.button1"/>">
</td>
<%
// Checksum
@@ -187,7 +195,7 @@
String column = (showChecksums ? "Even" : "Odd");
%>
<td class="<%= row %>Row<%= column %>Col">
<input type=submit name="submit_remove_<%= bitstreams[i].getID() %>" value="Remove">
<input type=submit name="submit_remove_<%= bitstreams[i].getID() %>" value="<fmt:message key="jsp.submit.upload-file-list.button2"/>">
</td>
<%
}
@@ -201,7 +209,7 @@
<%-- HACK: Need a space - is there a nicer way to do this than <BR> or a --%>
<%-- blank <P>? --%>
<BR>
<br>
<%-- Show information about how to verify correct upload, but not in workflow
mode! --%>
@@ -209,30 +217,28 @@
if (!SubmitServlet.isWorkflow(si))
{
%>
<P class="uploadHelp">You can verify that the file(s) have been uploaded correctly by:</P>
<UL class="uploadHelp">
<LI class="uploadHelp">Clicking on the filenames above. This will download the file in a
new browser window, so that you can check the contents.</LI>
<p class="uploadHelp"><fmt:message key="jsp.submit.upload-file-list.info3"/></p>
<ul class="uploadHelp">
<li class="uploadHelp"><fmt:message key="jsp.submit.upload-file-list.info4"/></li>
<%
if (showChecksums)
{
%>
<LI class="uploadHelp">Comparing checksums displayed above with checksums worked out on
your local computer. They should be exactly the same.
<dspace:popup page="/help/index.html#checksum">Click here to find out how to do this.</dspace:popup></LI>
<li class="uploadHelp"><fmt:message key="jsp.submit.upload-file-list.info5"/>
<dspace:popup page="/help/index.html#checksum"><fmt:message key="jsp.submit.upload-file-list.help1"/></dspace:popup></li>
<%
}
else
{
%>
<LI class="uploadHelp">The system can calculate a checksum you can verify.
<dspace:popup page="/help/index.html#checksum">Click here for more information.</dspace:popup> <input type=submit name=submit_show_checksums value="Show checksums"></LI>
<li class="uploadHelp"><fmt:message key="jsp.submit.upload-file-list.info6"/>
<dspace:popup page="/help/index.html#checksum"><fmt:message key="jsp.submit.upload-file-list.help2"/></dspace:popup> <input type=submit name=submit_show_checksums value="<fmt:message key="jsp.submit.upload-file-list.button3"/>"></li>
<%
}
%>
</UL>
</ul>
<BR>
<br>
<%
}
%>
@@ -248,7 +254,7 @@
if (!SubmitServlet.isWorkflow(si))
{
%>
<p><input type=submit name=submit_more value="Add Another File"></p>
<p><input type=submit name=submit_more value="<fmt:message key="jsp.submit.upload-file-list.button4"/>"></p>
<%
}
%>
@@ -256,14 +262,14 @@
<tr>
<td width="100%">&nbsp;</td>
<td>
<input type=submit name=submit_prev value="&lt; Previous">
<input type=submit name=submit_prev value="<fmt:message key="jsp.submit.upload-file-list.button5"/>">
</td>
<td>
<input type=submit name=submit_next value="Next &gt;">
<input type=submit name=submit_next value="<fmt:message key="jsp.submit.upload-file-list.button6"/>">
</td>
<td>&nbsp;&nbsp;&nbsp;</td>
<td align=right>
<input type=submit name=submit_cancel value="Cancel/Save">
<input type=submit name=submit_cancel value="<fmt:message key="jsp.submit.upload-file-list.button7"/>">
</td>
</tr>
</table>
@@ -271,4 +277,4 @@
</form>
</dspace:layout>
</dspace:layout>