Skip to content

Commit e8435ac

Browse files
authored
Merge pull request #8614 from scholarsportal/8593_errormessage_internationalization
Large file upload - internationalization of error message
2 parents 82cc65e + 3756337 commit e8435ac

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/main/webapp/dataset-widgets.xhtml

+2-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@
7272
data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.uploadNew.title']}"></span>
7373
</label>
7474
<p:fileUpload invalidFileMessage="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.upload.invalidMsg']}" id="changelogo" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update="@form"
75-
sizeLimit="#{systemConfig.uploadLogoSizeLimit}"
75+
sizeLimit="#{systemConfig.uploadLogoSizeLimit}"
76+
invalidSizeMessage="#{bundle['file.edit.error.file_exceeds_limit']}"
7677
dragDropSupport="true" auto="true" multiple="false"
7778
listener="#{DatasetWidgetsPage.handleImageFileUpload}" label="#{bundle['dataset.thumbnailsAndWidget.thumbnailImage.upload']}"/>
7879
</div>

src/main/webapp/themeAndWidgetsFragment.xhtml

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
</p:panelGrid>
5656
<p:panelGrid rendered="#{empty themeWidgetFragment.editDv.dataverseTheme.logo}" columns="2" styleClass="noBorders">
5757
<p:fileUpload id="uploadlogo" invalidFileMessage="#{bundle['dataverse.theme.logo.image.invalidMsg']}" sizeLimit="#{systemConfig.uploadLogoSizeLimit}" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update=":themeWidgetsForm:themeWidgetsTabView" dragDropSupport="true" auto="true" multiple="false"
58-
listener="#{themeWidgetFragment.handleImageFileUpload}" label="#{bundle['dataverse.theme.logo.image.uploadImgFile']}"/>
58+
listener="#{themeWidgetFragment.handleImageFileUpload}" label="#{bundle['dataverse.theme.logo.image.uploadImgFile']}" invalidSizeMessage="#{bundle['file.edit.error.file_exceeds_limit']}"/>
5959
</p:panelGrid>
6060
<ui:fragment rendered="#{not empty themeWidgetFragment.editDv.dataverseTheme.logo}">
6161
<div class="form-col-container col-sm-4">
@@ -201,7 +201,7 @@
201201
</p:panelGrid>
202202
<p:panelGrid rendered="#{empty themeWidgetFragment.editDv.dataverseTheme.logoFooter}" columns="2" styleClass="noBorders">
203203
<p:fileUpload id="uploadlogoFooter" invalidFileMessage="#{bundle['dataverse.theme.logo.image.invalidMsg']}" sizeLimit="#{systemConfig.uploadLogoSizeLimit}" allowTypes="/(\.|\/)(jpg|jpeg|tff|png|gif)$/" update=":themeWidgetsForm:themeWidgetsTabView" dragDropSupport="true" auto="true" multiple="false"
204-
listener="#{themeWidgetFragment.handleImageFooterFileUpload}" label="#{bundle['dataverse.theme.logo.image.uploadImgFile']}"/>
204+
listener="#{themeWidgetFragment.handleImageFooterFileUpload}" label="#{bundle['dataverse.theme.logo.image.uploadImgFile']}" invalidSizeMessage="#{bundle['file.edit.error.file_exceeds_limit']}"/>
205205
</p:panelGrid>
206206
<ui:fragment rendered="#{not empty themeWidgetFragment.editDv.dataverseTheme.logoFooter}">
207207
<div class="form-col-container col-sm-3">

0 commit comments

Comments
 (0)