Skip to content

Internalize changes part 1 #469

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.

Sign up for GitHub

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
nabalone merged 13 commits into from
Jul 24, 2026
Merged

Internalize changes part 1 #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
df6b3eb
take 2 reviewed
nabalone Jul 21, 2026
6958fc6
take 2 unreviewed
nabalone Jul 21, 2026
69f4e6c
Fix internalization resource state and dialog spacing
nabalone Jul 22, 2026
7a66ec9
refactor: simplify artifact category selector and clarify audio resou…
nabalone Jul 22, 2026
0b0dcc9
fix: restore resource upload drop zone in Add Audio dialog
nabalone Jul 22, 2026
42adf52
spacing fix 1
nabalone Jul 22, 2026
1cf4512
fix: tighten Add Audio dialog layout and avoid record button gap
nabalone Jul 22, 2026
f7971c6
info icon wip
nabalone Jul 22, 2026
2590b96
fix: keep Add Audio recorder content-sized in the dialog
nabalone Jul 22, 2026
85e93dc
outside click should not close Add Audio Resource dialog
nabalone Jul 23, 2026
9c1ba31
undo wsaudioplayer dock record change
nabalone Jul 23, 2026
75f69ae
comment
nabalone Jul 23, 2026
8bf2b14
chore: regenerate localization bundle after develop rebase
nabalone Jul 23, 2026
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
102 changes: 93 additions & 9 deletions localization/TranscriberAdmin-en-1.2.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6500,6 +6500,41 @@
<context context-type="sourcefile">AddResource.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.addAudio">
<source>Audio...</source>
<target/>
<context-group>
<context context-type="sourcefile">AddResource.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.addAudioResource">
<source>Add Audio Resource</source>
<target/>
<context-group>
<context context-type="sourcefile">AddResource.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.addLinked">
<source>Linked Resource...</source>
<target/>
<context-group>
<context context-type="sourcefile">AddResource.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.addText">
<source>Text...</source>
<target/>
<context-group>
<context context-type="sourcefile">AddResource.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.addUrl">
<source>URL...</source>
<target/>
<context-group>
<context context-type="sourcefile">AddResource.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.allLevel">
<source>All {0}</source>
<target/>
Expand Down Expand Up @@ -6584,13 +6619,27 @@
<context context-type="sourcefile">PassageMedia.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.confirmClose">
<source>Do you want to close this dialog? Your changes will be discarded.</source>
<target/>
<context-group>
<context context-type="sourcefile">PassageMedia.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.createResources">
<source>Create Resources</source>
<target/>
<context-group>
<context context-type="sourcefile">PassageMedia.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.currentResource">
<source>Current {0}</source>
<target/>
<context-group>
<context context-type="sourcefile">ResourceData.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.deleteConfirm">
<source>Delete Resource?</source>
<target/>
Expand All @@ -6604,6 +6653,20 @@
<context-group>
<context context-type="sourcefile">PassageMedia.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.discardAndClose">
<source>Discard and Close</source>
<target/>
<context-group>
<context context-type="sourcefile">PassageMedia.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.editAudioResource">
<source>Edit Audio Resource</source>
<target/>
<context-group>
<context context-type="sourcefile">PassageMedia.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.editResource">
<source>Edit Resource</source>
Expand Down Expand Up @@ -6640,6 +6703,13 @@
<context context-type="sourcefile">AddResource.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.keepOpen">
<source>Keep Open</source>
<target/>
<context-group>
<context context-type="sourcefile">PassageMedia.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.keywords">
<source>Keywords</source>
<target/>
Expand Down Expand Up @@ -6675,6 +6745,13 @@
<context context-type="sourcefile">AddResource.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.next">
<source>Next</source>
<target/>
<context-group>
<context context-type="sourcefile">PassageMedia.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.no">
<source>No</source>
<target/>
Expand Down Expand Up @@ -6724,13 +6801,6 @@
<context context-type="sourcefile">AddResource.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.projectResourcePassage">
<source>Select {0} and Passages</source>
<target/>
<context-group>
<context context-type="sourcefile">AddResource.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.projectResourceSheet">
<source>Project Resource Sheet</source>
<target/>
Expand Down Expand Up @@ -6801,6 +6871,13 @@
<context context-type="sourcefile">AddResource.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.selectPassagesSub">
<source>Select this resource's passages.</source>
<target/>
<context-group>
<context context-type="sourcefile">PassageMedia.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.sharedResource">
<source>Link Shared</source>
<target/>
Expand Down Expand Up @@ -6886,7 +6963,7 @@
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.tip1a">
<source>Resources for:</source>
<source>Available for:</source>
<target/>
<context-group>
<context context-type="sourcefile">PassageMedia.tsx</context>
Expand Down Expand Up @@ -6921,12 +6998,19 @@
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.uploadProject">
<source>General - to be used by multiple {0} or passages. (Uploaded files will only appear under Configure General.)</source>
<source>Multiple {0} or Passages (General Resource)</source>
<target/>
<context-group>
<context context-type="sourcefile">PassageMedia.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.uploadTab">
<source>Upload</source>
<target/>
<context-group>
<context context-type="sourcefile">AddResource.tsx</context>
</context-group>
</trans-unit>
<trans-unit id="passageDetailArtifacts.verseLevel">
<source>{0} for verses in this passage</source>
<target/>
Expand Down
88 changes: 80 additions & 8 deletions localization/TranscriberAdmin-en.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5572,6 +5572,36 @@
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.addAudio">
<segment>
<source>Audio...</source>
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.addAudioResource">
<segment>
<source>Add Audio Resource</source>
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.addLinked">
<segment>
<source>Linked Resource...</source>
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.addText">
<segment>
<source>Text...</source>
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.addUrl">
<segment>
<source>URL...</source>
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.allLevel">
<segment>
<source>All {0}</source>
Expand Down Expand Up @@ -5644,12 +5674,24 @@
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.confirmClose">
<segment>
<source>Do you want to close this dialog? Your changes will be discarded.</source>
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.createResources">
<segment>
<source>Create Resources</source>
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.currentResource">
<segment>
<source>Current {0}</source>
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.deleteConfirm">
<segment>
<source>Delete Resource?</source>
Expand All @@ -5662,6 +5704,18 @@
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.discardAndClose">
<segment>
<source>Discard and Close</source>
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.editAudioResource">
<segment>
<source>Edit Audio Resource</source>
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.editResource">
<segment>
<source>Edit Resource</source>
Expand Down Expand Up @@ -5692,6 +5746,12 @@
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.keepOpen">
<segment>
<source>Keep Open</source>
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.keywords">
<segment>
<source>Keywords</source>
Expand Down Expand Up @@ -5722,6 +5782,12 @@
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.next">
<segment>
<source>Next</source>
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.no">
<segment>
<source>No</source>
Expand Down Expand Up @@ -5764,12 +5830,6 @@
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.projectResourcePassage">
<segment>
<source>Select {0} and Passages</source>
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.projectResourceSheet">
<segment>
<source>Project Resource Sheet</source>
Expand Down Expand Up @@ -5830,6 +5890,12 @@
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.selectPassagesSub">
<segment>
<source>Select this resource's passages.</source>
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.sharedResource">
<segment>
<source>Link Shared</source>
Expand Down Expand Up @@ -5904,7 +5970,7 @@
</unit>
<unit id="passageDetailArtifacts.tip1a">
<segment>
<source>Resources for:</source>
<source>Available for:</source>
<target/>
</segment>
</unit>
Expand Down Expand Up @@ -5934,7 +6000,13 @@
</unit>
<unit id="passageDetailArtifacts.uploadProject">
<segment>
<source>General - to be used by multiple {0} or passages. (Uploaded files will only appear under Configure General.)</source>
<source>Multiple {0} or Passages (General Resource)</source>
<target/>
</segment>
</unit>
<unit id="passageDetailArtifacts.uploadTab">
<segment>
<source>Upload</source>
<target/>
</segment>
</unit>
Expand Down
2 changes: 1 addition & 1 deletion .../public/localization/strings3177dccd.json → .../public/localization/strings628127c6.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion src/renderer/src/components/AudioTab/AudioTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,6 @@ export function AudioTab() {
</PaddedBox>
</Box>
<Uploader
recordAudio={false}
isOpen={uploadVisible}
onOpen={setUploadVisible}
showMessage={showMessage}
Expand Down
25 changes: 21 additions & 4 deletions src/renderer/src/components/MediaUploadContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,13 @@ interface IProps {
saveText?: string | undefined;
controlsRef?: React.RefObject<MediaUploadControlsRef>;
onSaveDisabled?: ((disabled: boolean) => void) | undefined;
/** When true, render `DialogContent`/`DialogActions` without the wrapping Box
* so they are direct children of a shared Dialog paper (MUI flex handles the
* scroll region + pinned actions, matching the record body).
* TODO future work: I would like to see if we can get rid of the wrapper altogether,
* but don't have time to check all the usages now. */

noWrapper?: boolean | undefined;
}

function MediaUploadContent(props: IProps) {
Expand All @@ -157,6 +164,7 @@ function MediaUploadContent(props: IProps) {
saveText,
controlsRef,
onSaveDisabled,
noWrapper,
} = props;
const [name, setName] = useState('');
const [files, setFilesx] = useState<File[]>([]);
Expand Down Expand Up @@ -363,10 +371,8 @@ function MediaUploadContent(props: IProps) {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [uploadType]);

return (
<Box
sx={{ display: 'flex', flexDirection: 'column', alignItems: 'stretch' }}
>
const body = (
<>
<DialogContent>
<DialogContentText>
{(text[uploadType] as string).replace('{0}', speaker || '')}
Expand Down Expand Up @@ -424,11 +430,22 @@ function MediaUploadContent(props: IProps) {
variant="contained"
color="primary"
disabled={saveDisabled}
sx={{ minWidth: '96px' }}
>
{saveText || t.upload}
</Button>
</DialogActions>
)}
</>
);

return noWrapper ? (
body
) : (
<Box
sx={{ display: 'flex', flexDirection: 'column', alignItems: 'stretch' }}
>
{body}
</Box>
);
}
Expand Down
Loading
Loading