Skip to content

Commit c1c06e3

Browse files
authored
Merge pull request #11408 from Recherche-Data-Gouv/11399-convert-unicode-values-to-utf-8
Encoding of properties values in UTF-8
2 parents 74fed3d + 9e147dc commit c1c06e3

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

src/main/java/propertyFiles/Bundle.properties

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ passwdReset.submitRequest=Submit Password Request
392392
passwdReset.successSubmit.tip=If this email is associated with an account, then an email will be sent with further instructions to {0}.
393393
passwdReset.debug=DEBUG
394394
passwdReset.resetUrl=The reset URL is
395-
passwdReset.noEmail.tip=No email was actually sent because a user could not be found using the provided email address {0} but we don't mention this because we don't malicious users to use the form to determine if there is an account associated with an email address.
395+
passwdReset.noEmail.tip=No email was actually sent because a user could not be found using the provided email address {0} but we don''t mention this because we don''t malicious users to use the form to determine if there is an account associated with an email address.
396396
passwdReset.illegalLink.tip=Your password reset link is not valid. If you need to reset your password, {0}click here{1} in order to request that your password to be reset again.
397397
passwdReset.newPasswd.details=Please pick a strong password that matches the criteria below.
398398
passwdReset.newPasswd=New Password
@@ -1012,8 +1012,8 @@ dataverse.guestbookentry.atdownload=Guestbook Entry At Download
10121012
dataverse.guestbookentry.atrequest=Guestbook Entry At Access Request
10131013
dataverse.inputlevels.error.invalidfieldtypename=Invalid dataset field type name: {0}
10141014
dataverse.inputlevels.error.cannotberequiredifnotincluded=The input level for the dataset field type {0} cannot be required if it is not included
1015-
dataverse.facets.error.fieldtypenotfound=Can't find dataset field type '{0}'
1016-
dataverse.facets.error.fieldtypenotfacetable=Dataset field type '{0}' is not facetable
1015+
dataverse.facets.error.fieldtypenotfound=Can''t find dataset field type ''{0}''
1016+
dataverse.facets.error.fieldtypenotfacetable=Dataset field type ''{0}'' is not facetable
10171017
dataverse.metadatablocks.error.invalidmetadatablockname=Invalid metadata block name: {0}
10181018
dataverse.metadatablocks.error.containslistandinheritflag=Metadata block can not contain both {0} and {1}: true
10191019
dataverse.create.error.jsonparse=Error parsing Json: {0}
@@ -1790,7 +1790,7 @@ dataset.requestAccessToRestrictedFilesWithEmbargo=Embargoed files cannot be acce
17901790
dataset.privateurl.infoMessageAuthor=Privately share this draft dataset before it is published: {0}
17911791
dataset.privateurl.infoMessageReviewer=You are viewing a preview of this unpublished dataset version.
17921792
dataset.privateurl.header=Unpublished Dataset Preview URL
1793-
dataset.privateurl.tip=To cite this data in publications, use the dataset's persistent ID instead of this URL. For more information about the Preview URL feature, please refer to the <a href="{0}/{1}/user/dataset-management.html#private-url-to-review-unpublished-dataset" title="Preview URL for Reviewing an Unpublished Dataset - Dataverse User Guide" target="_blank">User Guide</a>.
1793+
dataset.privateurl.tip=To cite this data in publications, use the dataset''s persistent ID instead of this URL. For more information about the Preview URL feature, please refer to the <a href="{0}/{1}/user/dataset-management.html#private-url-to-review-unpublished-dataset" title="Preview URL for Reviewing an Unpublished Dataset - Dataverse User Guide" target="_blank">User Guide</a>.
17941794
dataset.privateurl.onlyone=Only one Preview URL can be active for a single draft dataset.
17951795
dataset.privateurl.absent=Preview URL has not been created.
17961796
dataset.privateurl.general.button.label=Create General Preview URL
@@ -1901,8 +1901,8 @@ file.delete.duplicate.single=Delete Duplicate File
19011901
file.metadata=Metadata
19021902
file.deleted.success=Files "{0}" will be permanently deleted from this version of this dataset once you click on the Save Changes button.
19031903
file.deleted.replacement.success=The replacement file has been deleted.
1904-
file.deleted.upload.success.single=File has been deleted and won\u2019t be included in this upload.
1905-
file.deleted.upload.success.multiple=Files have been deleted and won\u2019t be included in this upload.
1904+
file.deleted.upload.success.single=File has been deleted and won't be included in this upload.
1905+
file.deleted.upload.success.multiple=Files have been deleted and won't be included in this upload.
19061906
file.editAccess=Edit Access
19071907
file.restrict=Restrict
19081908
file.unrestrict=Unrestrict
@@ -2032,7 +2032,7 @@ file.dataFilesTab.terms.editTermsBtn=Edit Terms Requirements
20322032
file.dataFilesTab.terms.list.termsOfUse.header=Dataset Terms
20332033
file.dataFilesTab.terms.list.license=License/Data Use Agreement
20342034
file.dataFilesTab.terms.list.license.edit.description=This dataset will be published under the terms specified below. Our Community Norms as well as good scientific practices expect that proper credit is given via citation.
2035-
file.dataFilesTab.terms.list.license.customterms.txt=\u2014 the following Custom Dataset Terms have been defined for this dataset.
2035+
file.dataFilesTab.terms.list.license.customterms.txt=- the following Custom Dataset Terms have been defined for this dataset.
20362036
file.dataFilesTab.terms.list.license.view.description=Our <a href="https://dataverse.org/best-practices/dataverse-community-norms" title="Dataverse Community Norms - Dataverse.org" target="_blank">Community Norms</a> as well as good scientific practices expect that proper credit is given via citation. Please use the data citation shown on the dataset page.
20372037
file.dataFilesTab.terms.list.termsOfUse.termsOfUse=Terms of Use
20382038
file.dataFilesTab.terms.list.termsOfUse.termsOfUse.title=Outlines how this data can be used once downloaded
@@ -3043,7 +3043,7 @@ xlsxfilereader.ioexception.linecount=Mismatch between line counts in first and f
30433043
rtabfileparser.ioexception.failed=Failed to read line {0} of the Data file.
30443044
rtabfileparser.ioexception.mismatch=Reading mismatch, line {0} of the Data file: {1} delimited values expected, {2} found.
30453045
rtabfileparser.ioexception.boolean=Unexpected value for the Boolean variable ({0}):
3046-
rtabfileparser.ioexception.read=Couldn't read Boolean variable ({0})!
3046+
rtabfileparser.ioexception.read=Couldn''t read Boolean variable ({0})!
30473047
rtabfileparser.ioexception.parser1=R Tab File Parser: Could not obtain varQnty from the dataset metadata.
30483048
rtabfileparser.ioexception.parser2=R Tab File Parser: varQnty=0 in the dataset metadata!
30493049

@@ -3142,7 +3142,7 @@ api.ldninbox.citation.alert={0},<br><br> The {1} has just been notified that the
31423142
api.ldninbox.citation.subject={0}: A Dataset Citation has been reported!
31433143

31443144
#Schema Validation
3145-
schema.validation.exception.value.missing=Invalid data for key:{0} typeName:{1}. 'value' missing.
3145+
schema.validation.exception.value.missing=Invalid data for key:{0} typeName:{1}. ''value'' missing.
31463146
schema.validation.exception.list.notmultiple=Invalid data for key:{0} typeName:{1}. Found value as list but ''multiple'' is set to false.
31473147
schema.validation.exception.notlist.multiple=Invalid data for key:{0} typeName:{1}. Fields with ''multiple'' set to true must be a list.
31483148
schema.validation.exception.compound=Compound data type must be accompanied by a value that is either an object (multiple=false) or a list of objects (multiple=true)

src/main/java/propertyFiles/astrophysics.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ datasetfieldtype.astroFacility.description=The observatory or facility where the
3232
datasetfieldtype.astroInstrument.description=The instrument used to collect the data.
3333
datasetfieldtype.astroObject.description=Astronomical Objects represented in the data (Given as SIMBAD recognizable names preferred).
3434
datasetfieldtype.resolution.Spatial.description=The spatial (angular) resolution that is typical of the observations, in decimal degrees.
35-
datasetfieldtype.resolution.Spectral.description=The spectral resolution that is typical of the observations, given as the ratio \u03bb/\u0394\u03bb.
35+
datasetfieldtype.resolution.Spectral.description=The spectral resolution that is typical of the observations, given as the ratio λ/Δλ.
3636
datasetfieldtype.resolution.Temporal.description=The temporal resolution that is typical of the observations, given in seconds.
3737
datasetfieldtype.coverage.Spectral.Bandpass.description=Conventional bandpass name
3838
datasetfieldtype.coverage.Spectral.CentralWavelength.description=The central wavelength of the spectral bandpass, in meters.

src/main/java/propertyFiles/geospatial.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ controlledvocabulary.country.cook_islands=Cook Islands
8989
controlledvocabulary.country.costa_rica=Costa Rica
9090
controlledvocabulary.country.croatia=Croatia
9191
controlledvocabulary.country.cuba=Cuba
92-
controlledvocabulary.country.curacao=Cura\u00e7ao
92+
controlledvocabulary.country.curacao=Curaçao
9393
controlledvocabulary.country.cyprus=Cyprus
9494
controlledvocabulary.country.czech_republic=Czech Republic
95-
controlledvocabulary.country.cote_d'ivoire=C\u00f4te d'Ivoire
95+
controlledvocabulary.country.cote_d'ivoire=Côte d'Ivoire
9696
controlledvocabulary.country.denmark=Denmark
9797
controlledvocabulary.country.djibouti=Djibouti
9898
controlledvocabulary.country.dominica=Dominica
@@ -216,8 +216,8 @@ controlledvocabulary.country.qatar=Qatar
216216
controlledvocabulary.country.romania=Romania
217217
controlledvocabulary.country.russian_federation=Russian Federation
218218
controlledvocabulary.country.rwanda=Rwanda
219-
controlledvocabulary.country.reunion=R\u00e9union
220-
controlledvocabulary.country.saint_barthelemy=Saint Barth\u00e9lemy
219+
controlledvocabulary.country.reunion=Réunion
220+
controlledvocabulary.country.saint_barthelemy=Saint Barthélemy
221221
controlledvocabulary.country.saint_helena,_ascension_and_tristan_da_cunha=Saint Helena, Ascension and Tristan da Cunha
222222
controlledvocabulary.country.saint_kitts_and_nevis=Saint Kitts and Nevis
223223
controlledvocabulary.country.saint_lucia=Saint Lucia
@@ -282,4 +282,4 @@ controlledvocabulary.country.western_sahara=Western Sahara
282282
controlledvocabulary.country.yemen=Yemen
283283
controlledvocabulary.country.zambia=Zambia
284284
controlledvocabulary.country.zimbabwe=Zimbabwe
285-
controlledvocabulary.country.aland_islands=\u00c5land Islands
285+
controlledvocabulary.country.aland_islands=Åland Islands

0 commit comments

Comments
 (0)