Skip to content

Commit 0761593

Browse files
committed
Merge branch 'develop'
2 parents caa4541 + 8927c6d commit 0761593

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
run: npx semantic-release
4444
discord:
4545
name: Send Discord Notification
46+
needs: semantic-release
4647
runs-on: ubuntu-20.04
4748
steps:
4849
- name: Get Build Job Status

src/components/RequestModal/MovieRequestModal.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ const messages = defineMessages({
3838
request4kfrom: 'There is currently a pending 4K request from {username}',
3939
errorediting: 'Something went wrong editing the request.',
4040
requestedited: 'Request edited.',
41+
autoapproval: 'Auto Approval',
4142
});
4243

4344
interface RequestModalProps extends React.HTMLAttributes<HTMLDivElement> {
@@ -259,7 +260,7 @@ const MovieRequestModal: React.FC<RequestModalProps> = ({
259260
hasPermission(Permission.AUTO_APPROVE) ||
260261
hasPermission(Permission.AUTO_APPROVE_MOVIE)) && (
261262
<p className="mt-6">
262-
<Alert title="Auto Approval" type="info">
263+
<Alert title={intl.formatMessage(messages.autoapproval)} type="info">
263264
{intl.formatMessage(messages.requestadmin)}
264265
</Alert>
265266
</p>

src/components/RequestModal/TvRequestModal.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ const messages = defineMessages({
3939
errorediting: 'Something went wrong editing the request.',
4040
requestedited: 'Request edited.',
4141
requestcancelled: 'Request cancelled.',
42+
autoapproval: 'Auto Approval',
4243
});
4344

4445
interface RequestModalProps extends React.HTMLAttributes<HTMLDivElement> {
@@ -313,10 +314,13 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
313314
>
314315
{(hasPermission(Permission.MANAGE_REQUESTS) ||
315316
hasPermission(Permission.AUTO_APPROVE) ||
316-
hasPermission(Permission.AUTO_APPROVE_MOVIE)) &&
317+
hasPermission(Permission.AUTO_APPROVE_TV)) &&
317318
!editRequest && (
318319
<p className="mt-6">
319-
<Alert title="Auto Approval" type="info">
320+
<Alert
321+
title={intl.formatMessage(messages.autoapproval)}
322+
type="info"
323+
>
320324
{intl.formatMessage(messages.requestadmin)}
321325
</Alert>
322326
</p>

src/i18n/locale/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@
134134
"components.RequestModal.AdvancedRequester.loadingprofiles": "Loading profiles…",
135135
"components.RequestModal.AdvancedRequester.qualityprofile": "Quality Profile",
136136
"components.RequestModal.AdvancedRequester.rootfolder": "Root Folder",
137+
"components.RequestModal.autoapproval": "Auto Approval",
137138
"components.RequestModal.cancel": "Cancel Request",
138139
"components.RequestModal.cancelling": "Cancelling…",
139140
"components.RequestModal.cancelrequest": "This will remove your request. Are you sure you want to continue?",

0 commit comments

Comments
 (0)