Skip to content

Commit cd056aa

Browse files
nghtctrlnghtctrl
authored
Merge branch 'sillsdev:develop' into develop
2 parents 4e03128 + 2888f80 commit cd056aa

8 files changed

Lines changed: 75 additions & 30 deletions

File tree

‎localization/TranscriberAdmin-en-1.2.xliff‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11977,6 +11977,20 @@
1197711977
<context context-type="sourcefile">passageDetail.tsx</context>
1197811978
</context-group>
1197911979
</trans-unit>
11980+
<trans-unit id="workflowSteps.prompt">
11981+
<source>Prompt</source>
11982+
<target/>
11983+
<context-group>
11984+
<context context-type="sourcefile">passageDetail.tsx</context>
11985+
</context-group>
11986+
</trans-unit>
11987+
<trans-unit id="workflowSteps.promptTip">
11988+
<source>Listen to the prompt above. Then, move to the next step.</source>
11989+
<target/>
11990+
<context-group>
11991+
<context context-type="sourcefile">passageDetail.tsx</context>
11992+
</context-group>
11993+
</trans-unit>
1198011994
<trans-unit id="workflowSteps.wholeBackTranslate">
1198111995
<source>Whole Back Translate</source>
1198211996
<target/>

‎localization/TranscriberAdmin-en.xlf‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10264,6 +10264,18 @@
1026410264
<target/>
1026510265
</segment>
1026610266
</unit>
10267+
<unit id="workflowSteps.prompt">
10268+
<segment>
10269+
<source>Prompt</source>
10270+
<target/>
10271+
</segment>
10272+
</unit>
10273+
<unit id="workflowSteps.promptTip">
10274+
<segment>
10275+
<source>Listen to the prompt above. Then, move to the next step.</source>
10276+
<target/>
10277+
</segment>
10278+
</unit>
1026710279
<unit id="workflowSteps.wholeBackTranslate">
1026810280
<segment>
1026910281
<source>Whole Back Translate</source>

‎migration/bold-workflow/insert-bold-workflowsteps.sql‎

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,40 @@ SELECT
1717
WHERE NOT EXISTS (SELECT 1 FROM artifacttypes at WHERE at.typename = 'carefulspeech')
1818
AND EXISTS (SELECT 1 FROM users LIMIT 1);
1919

20+
-- Prompt — same tool JSON as other Internalization steps (e.g. transcriber / OBT).
21+
INSERT INTO workflowsteps (process, name, sequencenum, tool, permissions, datecreated, dateupdated, lastmodifiedby)
22+
SELECT
23+
'bold',
24+
'Prompt',
25+
1,
26+
'{"tool": "resource"}'::jsonb,
27+
'{}'::jsonb,
28+
(now() AT TIME ZONE 'utc'),
29+
(now() AT TIME ZONE 'utc'),
30+
(SELECT u.id FROM users u WHERE u.email = :'user_email' ORDER BY u.id ASC LIMIT 1)
31+
WHERE NOT EXISTS (SELECT 1 FROM workflowsteps WHERE process = 'bold' AND sequencenum = 1)
32+
AND EXISTS (SELECT 1 FROM users LIMIT 1);
33+
2034
-- Record — same tool JSON as other Record steps (e.g. transcriber / OBT).
2135
INSERT INTO workflowsteps (process, name, sequencenum, tool, permissions, datecreated, dateupdated, lastmodifiedby)
2236
SELECT
2337
'bold',
2438
'Record',
25-
1,
39+
2,
2640
'{"tool": "record"}'::jsonb,
2741
'{}'::jsonb,
2842
(now() AT TIME ZONE 'utc'),
2943
(now() AT TIME ZONE 'utc'),
3044
(SELECT u.id FROM users u WHERE u.email = :'user_email' ORDER BY u.id ASC LIMIT 1)
31-
WHERE NOT EXISTS (SELECT 1 FROM workflowsteps WHERE process = 'bold' AND sequencenum = 1)
45+
WHERE NOT EXISTS (SELECT 1 FROM workflowsteps WHERE process = 'bold' AND sequencenum = 2)
3246
AND EXISTS (SELECT 1 FROM users LIMIT 1);
3347

3448
-- Careful speech — phrase back translate with carefulspeech artifact and its own named segment bucket.
3549
INSERT INTO workflowsteps (process, name, sequencenum, tool, permissions, datecreated, dateupdated, lastmodifiedby)
3650
SELECT
3751
'bold',
38-
'Careful speech',
39-
2,
52+
'CarefulSpeech',
53+
3,
4054
(
4155
'{"tool": "phraseBackTranslate", "settings": "{\"artifactTypeId\": \"'
4256
|| (SELECT CAST(id AS TEXT) FROM artifacttypes WHERE typename = 'carefulspeech' ORDER BY id LIMIT 1)
@@ -46,16 +60,16 @@ SELECT
4660
(now() AT TIME ZONE 'utc'),
4761
(now() AT TIME ZONE 'utc'),
4862
(SELECT u.id FROM users u WHERE u.email = :'user_email' ORDER BY u.id ASC LIMIT 1)
49-
WHERE NOT EXISTS (SELECT 1 FROM workflowsteps WHERE process = 'bold' AND sequencenum = 2)
63+
WHERE NOT EXISTS (SELECT 1 FROM workflowsteps WHERE process = 'bold' AND sequencenum = 3)
5064
AND EXISTS (SELECT 1 FROM users LIMIT 1)
5165
AND EXISTS (SELECT 1 FROM artifacttypes WHERE typename = 'carefulspeech');
5266

53-
-- Lwc translation — same settings pattern as Phrase Back Translation (vernacular phrase BT artifact + BT regions).
67+
-- LWC translation — same settings pattern as Phrase Back Translation (vernacular phrase BT artifact + BT regions).
5468
INSERT INTO workflowsteps (process, name, sequencenum, tool, permissions, datecreated, dateupdated, lastmodifiedby)
5569
SELECT
5670
'bold',
57-
'Lwc translation',
58-
3,
71+
'LwcTranslation',
72+
4,
5973
(
6074
'{"tool": "phraseBackTranslate", "settings": "{\"artifactTypeId\": \"'
6175
|| (SELECT CAST(id AS TEXT) FROM artifacttypes WHERE typename = 'backtranslation' ORDER BY id LIMIT 1)
@@ -65,16 +79,16 @@ SELECT
6579
(now() AT TIME ZONE 'utc'),
6680
(now() AT TIME ZONE 'utc'),
6781
(SELECT u.id FROM users u WHERE u.email = :'user_email' ORDER BY u.id ASC LIMIT 1)
68-
WHERE NOT EXISTS (SELECT 1 FROM workflowsteps WHERE process = 'bold' AND sequencenum = 3)
82+
WHERE NOT EXISTS (SELECT 1 FROM workflowsteps WHERE process = 'bold' AND sequencenum = 4)
6983
AND EXISTS (SELECT 1 FROM users LIMIT 1)
7084
AND EXISTS (SELECT 1 FROM artifacttypes WHERE typename = 'backtranslation');
7185

7286
-- Careful transcription — transcribe the careful speech artifact (same pattern as PBT transcribe).
7387
INSERT INTO workflowsteps (process, name, sequencenum, tool, permissions, datecreated, dateupdated, lastmodifiedby)
7488
SELECT
7589
'bold',
76-
'Careful transcription',
77-
4,
90+
'CarefulTranscription',
91+
5,
7892
(
7993
'{"tool": "transcribe", "settings": "{\"artifactTypeId\": \"'
8094
|| (SELECT CAST(id AS TEXT) FROM artifacttypes WHERE typename = 'carefulspeech' ORDER BY id LIMIT 1)
@@ -84,16 +98,16 @@ SELECT
8498
(now() AT TIME ZONE 'utc'),
8599
(now() AT TIME ZONE 'utc'),
86100
(SELECT u.id FROM users u WHERE u.email = :'user_email' ORDER BY u.id ASC LIMIT 1)
87-
WHERE NOT EXISTS (SELECT 1 FROM workflowsteps WHERE process = 'bold' AND sequencenum = 4)
101+
WHERE NOT EXISTS (SELECT 1 FROM workflowsteps WHERE process = 'bold' AND sequencenum = 5)
88102
AND EXISTS (SELECT 1 FROM users LIMIT 1)
89103
AND EXISTS (SELECT 1 FROM artifacttypes WHERE typename = 'carefulspeech');
90104

91-
-- Lwc transcription — same as back-translation transcription (phrase BT artifact).
105+
-- LWC transcription — same as back-translation transcription (phrase BT artifact).
92106
INSERT INTO workflowsteps (process, name, sequencenum, tool, permissions, datecreated, dateupdated, lastmodifiedby)
93107
SELECT
94108
'bold',
95-
'Lwc transcription',
96-
5,
109+
'LwcTranscription',
110+
6,
97111
(
98112
'{"tool": "transcribe", "settings": "{\"artifactTypeId\": \"'
99113
|| (SELECT CAST(id AS TEXT) FROM artifacttypes WHERE typename = 'backtranslation' ORDER BY id LIMIT 1)
@@ -103,30 +117,30 @@ SELECT
103117
(now() AT TIME ZONE 'utc'),
104118
(now() AT TIME ZONE 'utc'),
105119
(SELECT u.id FROM users u WHERE u.email = :'user_email' ORDER BY u.id ASC LIMIT 1)
106-
WHERE NOT EXISTS (SELECT 1 FROM workflowsteps WHERE process = 'bold' AND sequencenum = 5)
120+
WHERE NOT EXISTS (SELECT 1 FROM workflowsteps WHERE process = 'bold' AND sequencenum = 6)
107121
AND EXISTS (SELECT 1 FROM users LIMIT 1)
108122
AND EXISTS (SELECT 1 FROM artifacttypes WHERE typename = 'backtranslation');
109123

110124
-- Free translation — whole back translate (same tool JSON as other WBT steps).
111125
INSERT INTO workflowsteps (process, name, sequencenum, tool, permissions, datecreated, dateupdated, lastmodifiedby)
112126
SELECT
113127
'bold',
114-
'Free translation',
115-
6,
128+
'FreeTranslation',
129+
7,
116130
'{"tool": "wholeBackTranslate"}'::jsonb,
117131
'{}'::jsonb,
118132
(now() AT TIME ZONE 'utc'),
119133
(now() AT TIME ZONE 'utc'),
120134
(SELECT u.id FROM users u WHERE u.email = :'user_email' ORDER BY u.id ASC LIMIT 1)
121-
WHERE NOT EXISTS (SELECT 1 FROM workflowsteps WHERE process = 'bold' AND sequencenum = 6)
135+
WHERE NOT EXISTS (SELECT 1 FROM workflowsteps WHERE process = 'bold' AND sequencenum = 7)
122136
AND EXISTS (SELECT 1 FROM users LIMIT 1);
123137

124138
-- Free transcription — same as whole-back-translation transcription step (WBT artifact).
125139
INSERT INTO workflowsteps (process, name, sequencenum, tool, permissions, datecreated, dateupdated, lastmodifiedby)
126140
SELECT
127141
'bold',
128-
'Free transcription',
129-
7,
142+
'FreeTranscription',
143+
8,
130144
(
131145
'{"tool": "transcribe", "settings": "{\"artifactTypeId\": \"'
132146
|| (SELECT CAST(id AS TEXT) FROM artifacttypes WHERE typename = 'wholebacktranslation' ORDER BY id LIMIT 1)
@@ -136,6 +150,6 @@ SELECT
136150
(now() AT TIME ZONE 'utc'),
137151
(now() AT TIME ZONE 'utc'),
138152
(SELECT u.id FROM users u WHERE u.email = :'user_email' ORDER BY u.id ASC LIMIT 1)
139-
WHERE NOT EXISTS (SELECT 1 FROM workflowsteps WHERE process = 'bold' AND sequencenum = 7)
153+
WHERE NOT EXISTS (SELECT 1 FROM workflowsteps WHERE process = 'bold' AND sequencenum = 8)
140154
AND EXISTS (SELECT 1 FROM users LIMIT 1)
141155
AND EXISTS (SELECT 1 FROM artifacttypes WHERE typename = 'wholebacktranslation');

src/renderer/public/localization/strings52d33407.json renamed to src/renderer/public/localization/strings59ed000e.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎src/renderer/src/crud/useOfflineSetup.ts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -287,27 +287,28 @@ export const useOfflineSetup = () => {
287287
offlineRecs.filter((w) => w.attributes.process === 'bold').length === 0
288288
) {
289289
await makeWorkflowProcessSteps('bold', [
290+
{ name: 'Prompt', tool: 'resource' },
290291
{ name: 'Record', tool: 'record' },
291292
{
292-
name: 'Careful speech',
293+
name: 'CarefulSpeech',
293294
tool: 'phraseBackTranslate',
294295
artId: CS,
295296
namedRegion: NamedRegions.CarefulSpeech,
296297
},
297298
{
298-
name: 'Lwc translation',
299+
name: 'LwcTranslation',
299300
tool: 'phraseBackTranslate',
300301
artId: PBT,
301302
namedRegion: NamedRegions.BackTranslation,
302303
},
303304
{
304-
name: 'Careful transcription',
305+
name: 'CarefulTranscription',
305306
tool: 'transcribe',
306307
artId: CS,
307308
},
308-
{ name: 'Lwc transcription', tool: 'transcribe', artId: PBT },
309-
{ name: 'Free translation', tool: 'wholeBackTranslate' },
310-
{ name: 'Free transcription', tool: 'transcribe', artId: WBT },
309+
{ name: 'LwcTranscription', tool: 'transcribe', artId: PBT },
310+
{ name: 'FreeTranslation', tool: 'wholeBackTranslate' },
311+
{ name: 'FreeTranscription', tool: 'transcribe', artId: WBT },
311312
]);
312313
}
313314
if (

‎src/renderer/src/store/localization/exported-strings-name.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "stringsName": "strings52d33407.json" }
1+
{ "stringsName": "strings59ed000e.json" }

‎src/renderer/src/store/localization/model.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2006,6 +2006,8 @@ export interface IWorkflowStepsStrings extends Localize.LocalizedStringsMethods
20062006
"unsaved": string;
20072007
"markVerses": string;
20082008
"markVersesTip": string;
2009+
"prompt": string;
2010+
"promptTip": string;
20092011
"wholeBackTranslate": string;
20102012
"wholeBackTranslateTip": string;
20112013
"wholeBackTranslation": string;

‎src/renderer/src/store/localization/reducers.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2110,6 +2110,8 @@ const initialState = {
21102110
"unsaved": "Unsaved content",
21112111
"markVerses": "Mark Verses",
21122112
"markVersesTip": "Listen to the recording and mark where the verse boundaries occur.",
2113+
"prompt": "Prompt",
2114+
"promptTip": "Listen to the prompt above. Then, move to the next step.",
21132115
"wholeBackTranslate": "Whole Back Translate",
21142116
"wholeBackTranslateTip": "Record the back translation of the entire passage in the language of the consultant.",
21152117
"wholeBackTranslation": "Whole Back Translate",

0 commit comments

Comments
 (0)