Skip to content

Commit cda6ffc

Browse files
committed
#1512, use errorbox
1 parent 95cdcb2 commit cda6ffc

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

Diff for: src/i18n/locales/en-US.json

-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
"saveArea-tooltip": "Save Area",
7878
"confirm-success": "Okay",
7979
"cancel-save": "Don't save",
80-
"invalid-headline-text": "Invalid Edits",
8180
"invalid-text": "The segments do not create a valid video. Either change or discard your edits if you wish to proceed. Contact an adminstrator for further help."
8281
},
8382

Diff for: src/main/Save.tsx

+9-4
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,14 @@ const Save: React.FC = () => {
8080
} else {
8181
return (
8282
<>
83-
<span css={{ maxWidth: "500px" }}>
84-
{validSegments ? t("save.info-text") : t("save.invalid-text")}
85-
</span>
83+
{validSegments ? <span>
84+
{t("save.info-text")}
85+
</span> : <ErrorBox>
86+
<span css={{ whiteSpace: "pre-line" }}>
87+
{t("save.invalid-text")}
88+
</span>
89+
</ErrorBox>
90+
}
8691
<div css={backOrContinueStyle}>
8792
<PageButton pageNumber={0} label={t("various.goBack-button")} Icon={LuChevronLeft} />
8893
{validSegments && <SaveButton />}
@@ -94,7 +99,7 @@ const Save: React.FC = () => {
9499

95100
return (
96101
<div css={saveStyle}>
97-
<h1>{validSegments ? t("save.headline-text") : t("save.invalid-headline-text")}</h1>
102+
<h1>{t("save.headline-text")}</h1>
98103
{render()}
99104
{postWorkflowStatus === "failed" &&
100105
<ErrorBox>

Diff for: src/main/WorkflowSelection.tsx

+6-2
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,12 @@ const WorkflowSelection: React.FC = () => {
116116
if (!validSegments) {
117117
return (
118118
render(
119-
t("save.invalid-headline-text"),
120-
<span css={{ maxWidth: "500px" }}>{t("save.invalid-text")}</span>,
119+
t("workflowSelection.saveAndProcess-text"),
120+
<ErrorBox>
121+
<span css={{ whiteSpace: "pre-line" }}>
122+
{t("save.invalid-text")}
123+
</span>
124+
</ErrorBox>,
121125
false,
122126
<div/>,
123127
saveStatus,

0 commit comments

Comments
 (0)