From acd9a335c883933f79b23da9b9f691e2ef711025 Mon Sep 17 00:00:00 2001 From: Jayanthy Chengan Date: Wed, 2 May 2018 16:10:19 -0400 Subject: [PATCH] Moving English strings from xhtml pages to bundle.properties --- src/main/java/Bundle.properties | 20 +++++++++++++++++++ src/main/webapp/dataset.xhtml | 2 +- .../webapp/datasetFieldForEditFragment.xhtml | 4 ++-- src/main/webapp/dataverse.xhtml | 2 +- src/main/webapp/dataverseuser.xhtml | 8 ++++---- src/main/webapp/editFilesFragment.xhtml | 2 +- .../file-download-button-fragment.xhtml | 4 ++-- src/main/webapp/file.xhtml | 2 +- src/main/webapp/mydata_fragment.xhtml | 20 +++++++++---------- 9 files changed, 42 insertions(+), 22 deletions(-) diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties index 062940884e6..124ec39adc8 100755 --- a/src/main/java/Bundle.properties +++ b/src/main/java/Bundle.properties @@ -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: @@ -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 @@ -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 Log In to request access to this file. @@ -1731,3 +1735,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... \ No newline at end of file diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml index 48549ce172f..97ee2445ed3 100755 --- a/src/main/webapp/dataset.xhtml +++ b/src/main/webapp/dataset.xhtml @@ -1330,7 +1330,7 @@ - +
diff --git a/src/main/webapp/datasetFieldForEditFragment.xhtml b/src/main/webapp/datasetFieldForEditFragment.xhtml index 07b2f066eed..57ce0b980ff 100644 --- a/src/main/webapp/datasetFieldForEditFragment.xhtml +++ b/src/main/webapp/datasetFieldForEditFragment.xhtml @@ -39,12 +39,12 @@ diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml index 2bd4b9b29bb..2a2abb1b08b 100644 --- a/src/main/webapp/dataverse.xhtml +++ b/src/main/webapp/dataverse.xhtml @@ -334,7 +334,7 @@ - Selected + #{bundle['dataverse.selected']}
diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml index f13c1a7162c..1ef8f9de5a6 100644 --- a/src/main/webapp/dataverseuser.xhtml +++ b/src/main/webapp/dataverseuser.xhtml @@ -70,7 +70,7 @@ - + @@ -392,10 +392,10 @@

- Not Verified + #{bundle['confirmEmail.notVerified']} - Verified + #{bundle['confirmEmail.verified']}

@@ -530,7 +530,7 @@
- +
diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml index f3f9a82d2a9..c70c45a0db7 100644 --- a/src/main/webapp/editFilesFragment.xhtml +++ b/src/main/webapp/editFilesFragment.xhtml @@ -312,7 +312,7 @@ - +