Skip to content

9488 internationalization issues #9493

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.

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
merged 6 commits into from
Jun 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/main/java/edu/harvard/iq/dataverse/DataFile.java
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ public String getIngestReportMessage() {
return ingestReports.get(0).getReport();
}
}
return "Ingest failed. No further information is available.";
return BundleUtil.getStringFromBundle("file.ingestFailed");
}

public boolean isTabularData() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;

import edu.harvard.iq.dataverse.util.BundleUtil;
import edu.harvard.iq.dataverse.validation.EMailValidator;
import edu.harvard.iq.dataverse.validation.URLValidator;
import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -59,7 +60,7 @@ public boolean isValid(DatasetFieldValue value, ConstraintValidatorContext conte
boolean valid = value.getValue().matches(value.getDatasetField().getDatasetFieldType().getValidationFormat());
if (!valid) {
try {
context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " is not a valid entry.").addConstraintViolation();
context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " " + BundleUtil.getStringFromBundle("dataset.metadata.invalidEntry")).addConstraintViolation();
} catch (NullPointerException e) {
return false;
}
Expand Down Expand Up @@ -128,7 +129,7 @@ public boolean isValid(DatasetFieldValue value, ConstraintValidatorContext conte
}
if (!valid) {
try {
context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " is not a valid date. \"" + YYYYformat + "\" is a supported format.").addConstraintViolation();
context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " " + BundleUtil.getStringFromBundle("dataset.metadata.invalidDate") ).addConstraintViolation();
} catch (NullPointerException npe) {

}
Expand All @@ -143,7 +144,7 @@ public boolean isValid(DatasetFieldValue value, ConstraintValidatorContext conte
} catch (Exception e) {
logger.fine("Float value failed validation: " + value.getValue() + " (" + dsfType.getDisplayName() + ")");
try {
context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " is not a valid number.").addConstraintViolation();
context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " " + BundleUtil.getStringFromBundle("dataset.metadata.invalidNumber") ).addConstraintViolation();
} catch (NullPointerException npe) {

}
Expand All @@ -157,7 +158,7 @@ public boolean isValid(DatasetFieldValue value, ConstraintValidatorContext conte
Integer.parseInt(value.getValue());
} catch (Exception e) {
try {
context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " is not a valid integer.").addConstraintViolation();
context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " " + BundleUtil.getStringFromBundle("dataset.metadata.invalidInteger") ).addConstraintViolation();
} catch (NullPointerException npe) {

}
Expand All @@ -170,15 +171,15 @@ public boolean isValid(DatasetFieldValue value, ConstraintValidatorContext conte
if (fieldType.equals(FieldType.URL) && !lengthOnly) {
boolean isValidUrl = URLValidator.isURLValid(value.getValue());
if (!isValidUrl) {
context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " " + value.getValue() + " {url.invalid}").addConstraintViolation();
context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " " + value.getValue() + " " + BundleUtil.getStringFromBundle("dataset.metadata.invalidURL")).addConstraintViolation();
return false;
}
}

if (fieldType.equals(FieldType.EMAIL) && !lengthOnly) {
boolean isValidMail = EMailValidator.isEmailValid(value.getValue());
if (!isValidMail) {
context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " " + value.getValue() + " {email.invalid}").addConstraintViolation();
context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " " + value.getValue() + " " + BundleUtil.getStringFromBundle("dataset.metadata.invalidEmail")).addConstraintViolation();
return false;
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
import edu.harvard.iq.dataverse.branding.BrandingUtil;
import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailServiceBean;
import edu.harvard.iq.dataverse.dataset.DatasetUtil;
import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
import edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key;
import edu.harvard.iq.dataverse.util.BundleUtil;
Expand Down Expand Up @@ -494,7 +495,7 @@ public String getMessageTextBasedOnNotification(UserNotification userNotificatio
case STATUSUPDATED:
version = (DatasetVersion) targetObject;
pattern = BundleUtil.getStringFromBundle("notification.email.status.change");
String[] paramArrayStatus = {version.getDataset().getDisplayName(), (version.getExternalStatusLabel()==null) ? "<none>" : version.getExternalStatusLabel()};
String[] paramArrayStatus = {version.getDataset().getDisplayName(), (version.getExternalStatusLabel()==null) ? "<none>" : DatasetUtil.getLocaleExternalStatus(version.getExternalStatusLabel())};
messageText += MessageFormat.format(pattern, paramArrayStatus);
return messageText;
case CREATEACC:
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/propertyFiles/Bundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1595,6 +1595,12 @@ dataset.metadata.persistentId=Persistent Identifier
dataset.metadata.persistentId.tip=The Dataset's unique persistent identifier, either a DOI or Handle
dataset.metadata.alternativePersistentId=Previous Dataset Persistent ID
dataset.metadata.alternativePersistentId.tip=A previously used persistent identifier for the Dataset, either a DOI or Handle
dataset.metadata.invalidEntry=is not a valid entry.
dataset.metadata.invalidDate=is not a valid date. "yyyy" is a supported format.
dataset.metadata.invalidNumber=is not a valid number.
dataset.metadata.invalidInteger=is not a valid integer.
dataset.metadata.invalidURL=is not a valid URL.
dataset.metadata.invalidEmail=is not a valid email address.
file.metadata.preview=Preview
file.metadata.filetags=File Tags
file.metadata.persistentId=File Persistent ID
Expand Down Expand Up @@ -1735,6 +1741,7 @@ file.download.subset.header=Download Data Subset
file.preview=Preview:
file.fileName=File Name
file.sizeNotAvailable=Size not available
file.ingestFailed=Ingest failed. No further information is available.
file.type.tabularData=Tabular Data
file.originalChecksumType=Original File {0}
file.checksum.exists.tip=A file with this checksum already exists in the dataset.
Expand Down
3 changes: 2 additions & 1 deletion src/main/webapp/dataverseuser.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -422,12 +422,13 @@
</h:outputFormat>
</ui:fragment>
<ui:fragment rendered="#{item.type == 'STATUSUPDATED'}">
<o:importFunctions type="edu.harvard.iq.dataverse.dataset.DatasetUtil" />
<span class="icon-dataset text-icon-inline text-muted"></span>
<h:outputFormat value="#{bundle['notification.statusUpdated']}" escape="false">
<o:param>
<a href="/dataset.xhtml?persistentId=#{item.theObject.getDataset().getGlobalId()}&amp;version=DRAFT&amp;faces-redirect=true" title="#{item.theObject.getDataset().getDisplayName()}">#{item.theObject.getDataset().getDisplayName()}</a>
</o:param>
<f:param value="#{item.theObject.externalStatusLabel}"/>
<f:param value="#{DatasetUtil:getLocaleExternalStatus(item.theObject.externalStatusLabel)}"/>
</h:outputFormat>
</ui:fragment>
<ui:fragment rendered="#{item.type == 'DATASETMENTIONED'}">
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/file-download-button-fragment.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -336,4 +336,4 @@
</li>
</ui:fragment>
<!-- END: Compute Options -->
</ui:composition>
</ui:composition>