Skip to content

4634 move english strings to property file #4643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kcondon merged 3 commits into from
May 7, 2018
Merged

4634 move english strings to property file #4643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acd9a33
Moving English strings from xhtml pages to bundle.properties
JayanthyChengan May 2, 2018
65ddee9
Merge branch 'develop' into 4634-move-English-strings-to-property-file
JayanthyChengan May 2, 2018
aecda15
Merge remote-tracking branch 'origin/develop' into 4634-move-English-…
JayanthyChengan May 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/main/java/Bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,8 @@ user.createBtn=Create Account
user.updatePassword.welcome=Welcome to Dataverse {0}, {1}
user.updatePassword.warning=With the release of our new Dataverse 4.0 upgrade, the password requirements and General Terms of Use have updated. As this is the first time you are using Dataverse since the update, you need to create a new password and agree to the new General Terms of Use.
user.updatePassword.password={0}
user.password=Password
user.newPassword=New Password
authenticationProvidersAvailable.tip={0}There are no active authentication providers{1}If you are a system administrator, please enable one using the API.{2}If you are not a system administrator, please contact the one for your institution.

passwdVal.passwdReq.title=Your password must contain:
Expand Down Expand Up @@ -709,6 +711,7 @@ dataverse.create.failure=This dataverse was not able to be created.
dataverse.create.authenticatedUsersOnly=Only authenticated users can create dataverses.
dataverse.update.success=You have successfully updated your dataverse!
dataverse.update.failure=This dataverse was not able to be updated.
dataverse.selected=Selected

# rolesAndPermissionsFragment.xhtml

Expand Down Expand Up @@ -1385,6 +1388,7 @@ file.downloadBtn.format.original=Original File Format ({0})
file.downloadBtn.format.rdata=RData Format
file.downloadBtn.format.var=Variable Metadata
file.downloadBtn.format.citation=Data File Citation
file.downloadBtn.format.datasubset=Data Subset
file.more.information.link=Link to more file information for
file.requestAccess=Request Access
file.requestAccess.dialog.msg=You need to <a href="/loginpage.xhtml{0}" target="{1}" title="Log into your Dataverse Account">Log In</a> to request access to this file.
Expand Down Expand Up @@ -1735,3 +1739,19 @@ ingest.csv.invalidHeader=Invalid header row. One of the cells is empty.
ingest.csv.lineMismatch=Mismatch between line counts in first and final passes!, {0} found on first pass, but {1} found on second.
ingest.csv.recordMismatch=Reading mismatch, line {0} of the Data file: {1} delimited values expected, {2} found.
ingest.csv.nullStream=Stream can't be null.

#dataset.xhtml #editFilesFragment.xhtml
dataset.access.accessHeader=File Restrictions

#dataserFieldForEditFragment.xhtml
dataset.AddReplication=Add "Replication Data for" to Title
dataset.replicationDataFor=Replication Data for:


#mydata_fragment.xhtml
mydataFragment.infoAccess=Here are all the dataverses, datasets, and files you have access to. You can filter through them by publication status and roles.
mydataFragment.moreResults=View More Results
mydataFragment.publicationStatus=Publication Status
mydataFragment.roles=Roles
mydataFragment.resultsByUserName=Results by Username
mydataFragment.search=Search my data...
2 changes: 1 addition & 1 deletion src/main/webapp/dataset.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1330,7 +1330,7 @@
</div>
</p:dialog>

<p:dialog id="accessPopup" header="File Restrictions" widgetVar="accessPopup" modal="true">
<p:dialog id="accessPopup" header="#{bundle['dataset.access.accessHeader']}" widgetVar="accessPopup" modal="true">
<ui:fragment rendered="#{DatasetPage.editMode == 'CREATE' or empty DatasetPage.editMode }">
<div class="form-horizontal">
<div class="form-group">
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/datasetFieldForEditFragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
<!-- This button / script is for replication data for the title field and is client side only -->
<ui:fragment rendered="#{dsfv.datasetField.datasetFieldType.name == 'title' and DatasetPage.editMode == 'CREATE' }">
<input type="button" id="replicationDataButton" tabindex="#{block.index+1}"
class="btn btn-default" value="Add &#34;Replication Data for&#34; to Title"
class="btn btn-default" value="#{bundle['dataset.AddReplication']}"
onclick="replicationFor();return false;"/>

<script type="text/javascript">
function replicationFor() {
$(".datasetfield-title")[0].value = "Replication Data for: " + $(".datasetfield-title")[0].value;
$(".datasetfield-title")[0].value = "#{bundle['dataset.replicationDataFor']} " + $(".datasetfield-title")[0].value;
$('#replicationDataButton').prop('disabled', true);
}
</script>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/dataverse.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
<p:ajax process="editFacets" update="editFacets" listener="#{DataversePage.changeFacetsMetadataBlock}"/>
</p:selectOneMenu>
</f:facet>
<f:facet name="targetCaption">Selected</f:facet>
<f:facet name="targetCaption">#{bundle['dataverse.selected']}</f:facet>
<p:ajax event="transfer" listener="#{DataversePage.onFacetTransfer}" update="editFacets" />
</p:pickList>
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/main/webapp/dataverseuser.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@

<p:tabView id="dataRelatedToMeView" activeIndex="#{DataverseUserPage.activeIndex}" dynamic="true" rendered="#{empty DataverseUserPage.editMode}">
<p:ajax event="tabChange" listener="#{DataverseUserPage.onTabChange}" update="@all" oncomplete="javascript:dataverseuser_page_rebind();" />
<p:tab id="myData" title="My Data">
<p:tab id="myData" title="#{bundle['user.dataRelatedToMe']}">
<ui:include src="mydata_fragment.xhtml"></ui:include>
</p:tab>
<p:tab id="notifications" title="#{bundle['header.user.selectTab.notifications']}">
Expand Down Expand Up @@ -392,10 +392,10 @@
<div class="col-sm-2 form-col-container">
<p class="form-control-static #{DataverseUserPage.emailIsVerified ? 'text-success' : 'text-danger'}">
<ui:fragment rendered="#{DataverseUserPage.emailNotVerified}">
<span class="glyphicon glyphicon-ban-circle"/> Not Verified
<span class="glyphicon glyphicon-ban-circle"/> #{bundle['confirmEmail.notVerified']}
</ui:fragment>
<ui:fragment rendered="#{!DataverseUserPage.emailNotVerified}">
<span class="glyphicon glyphicon-ok"/> Verified
<span class="glyphicon glyphicon-ok"/> #{bundle['confirmEmail.verified']}
</ui:fragment>
</p>
</div>
Expand Down Expand Up @@ -530,7 +530,7 @@
</div>
</div>
<div class="col-sm-4 col-sm-offset-3">
<p:password id="inputPassword" tabindex="2" label="#{DataverseUserPage.editMode == 'CREATE' ? 'Password' : 'New Password'}" styleClass="form-control" match="retypePassword" value="#{DataverseUserPage.inputPassword}" validator="#{DataverseUserPage.validateNewPassword}" />
<p:password id="inputPassword" tabindex="2" label="#{DataverseUserPage.editMode == 'CREATE' ? bundle['user.password'] : bundle['user.newPassword']}" styleClass="form-control" match="retypePassword" value="#{DataverseUserPage.inputPassword}" validator="#{DataverseUserPage.validateNewPassword}" />
<p:message for="inputPassword" display="text" />
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/editFilesFragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@
<p:commandButton value="#{bundle.cancel}" onclick="PF('deleteFileConfirmation').hide()" type="button" />
</div>
</p:dialog>
<p:dialog id="editFileAccessPopup" header="File Restrictions" widgetVar="editFileAccessPopup" modal="true">
<p:dialog id="editFileAccessPopup" header="#{bundle['dataset.access.accessHeader']}" widgetVar="editFileAccessPopup" modal="true">
<div class="form-horizontal">
<div class="form-group">
<label for="metadata_TermsAccess" class="col-sm-3 control-label">
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/file-download-button-fragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,15 +228,15 @@
actionListener="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse,fileMetadata, 'subset')}"
update="@widgetVar(downloadDataSubsetPopup)"
oncomplete="PF('downloadDataSubsetPopup').show()"
value="Data Subset"
value="#{bundle['file.downloadBtn.format.datasubset']}"
/>
<p:commandLink id="fileDowloadDataSubsetButtonPopupReq" rendered="#{downloadPopupRequired}"
process="@this"
disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload or empty fileMetadata.dataFile.id) ? 'disabled' : ''}"
actionListener="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse,fileMetadata, 'subset')}"
update="@widgetVar(downloadPopup)"
oncomplete="PF('downloadPopup').show()"
value="Data Subset"
value="#{bundle['file.downloadBtn.format.datasubset']}"
/>
</li>
<li class="dropdown-submenu pull-left">
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/file.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<ul class="dropdown-menu pull-right text-left" role="menu">
<li>
<h:outputLink value="/editdatafiles.xhtml?selectedFileIds=#{FilePage.fileMetadata.dataFile.id}&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;mode=SINGLE&#38;version=#{FilePage.version}">
<h:outputText id="editFile-Multi-Link" value="Metadata"/>
<h:outputText id="editFile-Multi-Link" value="#{bundle['file.dataFilesTab.metadata.header']}"/>
</h:outputLink>
</li>
<ui:fragment rendered="#{!settingsWrapper.publicInstall}">
Expand Down
20 changes: 10 additions & 10 deletions src/main/webapp/mydata_fragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
<div class="row">
<div class="col-xs-12">
<p class="help-block">
<span class="glyphicon glyphicon-info-sign"></span> Here are all the dataverses, datasets, and files you have access to. You can filter through them by publication status and roles.
<span class="glyphicon glyphicon-info-sign"></span> #{bundle['mydataFragment.infoAccess']}
</p>
</div>
</div>

<div class="row" id="my_data_filter_column2">
<div class="col-xs-7" style="padding:10px 30px;">
<input type="text" size="40" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all search-input" name="mydata_search_term" id="mydata_search_term" placeholder="Search my data..." />
<input type="text" size="40" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all search-input" name="mydata_search_term" id="mydata_search_term" placeholder="#{bundle['mydataFragment.search']}" />

&#160; <a id="btn_find_my_data" class="btn btn-default"><span class="glyphicon glyphicon-search"></span>Find</a>
&#160; <a id="btn_find_my_data" class="btn btn-default"><span class="glyphicon glyphicon-search"></span>#{bundle['find']}</a>
<!-- &#160; <a target="_self" href="/dataverse/root/search" >Advanced Search </a> -->
</div>
<ui:fragment rendered="#{MyDataPage.isSuperuser()}">
<div class="col-xs-4 pull-right text-right" style="margin-right:30px;margin-bottom:0;padding:8px 6px;background:none;">
Results by Username
#{bundle['mydataFragment.resultsByUserName']}
<input type="text" name="userIdentifier" id="userIdentifier" value="#{MyDataPage.getAuthUserIdentifier()}" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all" />

</div>
Expand All @@ -46,25 +46,25 @@
<div class="checkbox" style="margin-top:3px;margin-bottom:0;">
<input style="margin-left:0;" name="dvobject_types" id="id_cbox_dv_dataverse" type="checkbox" value="Dataverse" checked="checked" />
<label class="facetTypeLabel">
<a class="mydata_dvobject_label"><i class="icon-dataverse text-icon-inline"></i><span class="facetTypeDataverse">Dataverses</span> <span id="id_dataverses_count"></span></a>
<a class="mydata_dvobject_label"><i class="icon-dataverse text-icon-inline"></i><span class="facetTypeDataverse">#{bundle['dataverse.results.types.dataverses']}</span> <span id="id_dataverses_count"></span></a>
</label>
</div>
<div class="checkbox" style="margin-top:3px;margin-bottom:0;">
<input style="margin-left:0;" name="dvobject_types" id="id_cbox_dv_dataset" type="checkbox" value="Dataset" checked="checked" />
<label class="facetTypeLabel">
<a class="mydata_dvobject_label"><i class="icon-dataset text-icon-inline"></i><span class="facetTypeDataset">Datasets</span> <span id="id_datasets_count"></span></a>
<a class="mydata_dvobject_label"><i class="icon-dataset text-icon-inline"></i><span class="facetTypeDataset">#{bundle['dataverse.results.types.datasets']}</span> <span id="id_datasets_count"></span></a>
</label>
</div>
<div class="checkbox" style="margin-top:3px;margin-bottom:0;">
<input style="margin-left:0;" name="dvobject_types" id="id_cbox_dv_file" type="checkbox" value="DataFile" />
<label class="facetTypeLabel">
<a class="mydata_dvobject_label"><i class="icon-file text-icon-inline"></i><span class="facetTypeFile">Files</span> <span id="id_files_count"></span></a>
<a class="mydata_dvobject_label"><i class="icon-file text-icon-inline"></i><span class="facetTypeFile">#{bundle['dataverse.results.types.files']}</span> <span id="id_files_count"></span></a>
</label>
</div>
</div>
<!-- end dvobject checkboxes -->
<!-- start: publish states -->
<b>Publication Status</b>
<b>#{bundle['mydataFragment.publicationStatus']}</b>
<div id="div_published_states" style="border-bottom:1px solid #ddd; padding-bottom:8px; margin-bottom:0.5em;">
<ui:repeat value="#{MyDataPage.publishedStatesForMyDataPage}" var="pstate">
<div class="checkbox" style="margin-top:3px;margin-bottom:0;">
Expand All @@ -77,7 +77,7 @@
</div>
<!-- end: publish states -->
<!-- start: role states -->
<b>Roles</b>
<b>#{bundle['mydataFragment.roles']}</b>
<div id="div_role_states" style="border-bottom:1px solid #ddd; padding-bottom:8px; margin-bottom:0.5em;">
<ui:repeat value="#{MyDataPage.roleInfoForCheckboxes}" var="roleInfoList">
<div class="checkbox" style="margin-top:3px;margin-bottom:0;">
Expand All @@ -99,7 +99,7 @@
<div id="div-result-message"></div>
<div id="resultsTable"><div id="div-card-results"></div></div>
<div id="div-more-cards-link" class="text-center" style="display:none;">
<a id="lnk_add_more_cards" class="btn btn-default">View More Results</a>
<a id="lnk_add_more_cards" class="btn btn-default">#{bundle['mydataFragment.moreResults']}</a>
</div>

<div id="div-json-results"></div>
Expand Down