Skip to content

Commit 429f573

Browse files
committed
Merge branch 'theme-watermark-filestypes' of Arnei/opencast-admin-interface into r/19.x
Pull request #1524 Fixes #1377 Correctly limit theme watermark filetypes
2 parents 6192e09 + f171580 commit 429f573

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

src/components/configuration/partials/wizard/WatermarkPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ const WatermarkPage = <T extends RequiredFormProps>({
7575
</header>
7676
<div className="obj-container padded">
7777
<FileUpload
78-
acceptableTypes="image/*"
78+
acceptableTypes="image/gif,image/png,image/jpg,image/jpeg,image/bmp"
7979
fileId="watermarkFile"
8080
fileName="watermarkFileName"
8181
formik={formik}

src/i18n/org/opencastproject/adminui/languages/lang-en_US.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1672,7 +1672,7 @@
16721672
"BOTTOM_RIGHT": "Bottom right",
16731673
"UPLOAD": "Upload",
16741674
"POSITION": "Watermark position and preview",
1675-
"FILEUPLOAD_DESCRIPTION": "File should have an alpha channel (transparent background). Acceptable file types are: .PNG, .GIF, .SVG, .WEBP",
1675+
"FILEUPLOAD_DESCRIPTION": "File should have an alpha channel (transparent background). Acceptable file types are: gif, png, jp(e)g, or bmp",
16761676
"UPLOAD_LABEL": "Upload image",
16771677
"UPLOAD_BUTTON": "Upload"
16781678
},

0 commit comments

Comments
 (0)