Skip to content

Commit 20ddd0a

Browse files
committed
Revert "A couple renames" (only the big one)
This reverts commit 1b6840f.
1 parent 0ecc525 commit 20ddd0a

File tree

7 files changed

+10
-9
lines changed

7 files changed

+10
-9
lines changed

src/RealtimeServer/scriptureforge/models/question.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ export interface Question extends ProjectData {
2929
dateArchived?: string;
3030
dateModified: string;
3131
dateCreated: string;
32-
sourceQuestionId?: string;
32+
transceleratorQuestionId?: string;
3333
}

src/RealtimeServer/scriptureforge/services/question-service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ export class QuestionService extends SFProjectDataService<Question> {
187187
dateCreated: {
188188
bsonType: 'string'
189189
},
190-
sourceQuestionId: {
190+
transceleratorQuestionId: {
191191
bsonType: 'string'
192192
}
193193
},

src/SIL.XForge.Scripture/ClientApp/src/app/checking/import-questions-dialog/import-questions-dialog.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ <h2 mat-dialog-title class="dialog-icon-title">
308308
(click)="confirmParatextTagSelection()"
309309
[disabled]="errorState === 'paratext_tag_load_error'"
310310
>
311-
{{ t("next") }}
311+
{{ t("import_from_paratext_next") }}
312312
</button>
313313
}
314314
@if (status === "filter_questions" || status === "file_import_errors") {

src/SIL.XForge.Scripture/ClientApp/src/app/checking/import-questions-dialog/import-questions-dialog.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ describe('ImportQuestionsDialogComponent', () => {
247247
verseNum: 1,
248248
verse: '1-3'
249249
});
250-
expect(question.sourceQuestionId).toBe('2');
250+
expect(question.transceleratorQuestionId).toBe('2');
251251
}));
252252

253253
it('should properly import questions that are on a single verse', fakeAsync(() => {
@@ -891,7 +891,7 @@ class TestEnvironment {
891891
this.existingQuestions.push({
892892
data: {
893893
text: doc.text + ' [before edit]',
894-
sourceQuestionId: doc.id,
894+
transceleratorQuestionId: doc.id,
895895
answers: [] as Answer[],
896896
verseRef: fromVerseRef(new VerseRef(doc.book, doc.startChapter, verse))
897897
} as Question,

src/SIL.XForge.Scripture/ClientApp/src/app/checking/import-questions-dialog/import-questions-dialog.component.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ export class ImportQuestionsDialogComponent implements OnDestroy {
344344
const sfVersionOfQuestion: QuestionDoc | undefined = questionQuery.docs.find(
345345
doc =>
346346
doc.data != null &&
347-
(useQuestionIds ? doc.data.sourceQuestionId === question.id : doc.data.text === question.text) &&
347+
(useQuestionIds ? doc.data.transceleratorQuestionId === question.id : doc.data.text === question.text) &&
348348
toVerseRef(doc.data.verseRef).equals(question.verseRef)
349349
);
350350

@@ -443,7 +443,8 @@ export class ImportQuestionsDialogComponent implements OnDestroy {
443443
isArchived: false,
444444
dateCreated: currentDate,
445445
dateModified: currentDate,
446-
sourceQuestionId: listItem.question.id
446+
//todo rename
447+
transceleratorQuestionId: listItem.question.id
447448
};
448449
await this.zone.runOutsideAngular(() =>
449450
this.checkingQuestionsService.createQuestion(this.data.projectId, newQuestion, undefined, undefined)

src/SIL.XForge.Scripture/ClientApp/src/assets/i18n/non_checking_en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,7 @@
519519
"import_from_paratext_no_tags_available": "There are no tagged notes available to import.",
520520
"import_from_paratext_tag_load_error": "We could not load Paratext notes. Please try again later.",
521521
"import_from_paratext_tag_conversion_error": "We could not parse the notes for this Paratext type. Please try again or try a different type.",
522+
"import_from_paratext_next": "Next",
522523
"import_from_transcelerator": "Import from Transcelerator",
523524
"import_progress": "Imported {{ completed }} of {{ total }} questions...",
524525
"import_questions": "Import Questions",
@@ -529,7 +530,6 @@
529530
"missing_header_row": "The file you imported needs to have a header row with columns titled {{ boldStart }}Reference{{ boldEnd }} and {{ boldStart }}Question{{ boldEnd }}.",
530531
"must_be_valid_reference": "Must be a valid reference",
531532
"network_error_transcelerator": "Network error fetching Transcelerator questions. Retrying ({{ count }}).",
532-
"next": "Next",
533533
"no_questions_available": "There are no questions for the books in this project.",
534534
"no_transcelerator_offline": "Importing from Transcelerator is not available offline.",
535535
"question_for_verse": "Question for verse {{ number }}",

src/SIL.XForge.Scripture/Models/Question.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ public class Question : ProjectData
1515
public DateTime? DateArchived { get; set; }
1616
public DateTime DateModified { get; set; }
1717
public DateTime DateCreated { get; set; }
18-
public string SourceQuestionId { get; set; }
18+
public string TransceleratorQuestionId { get; set; }
1919
}

0 commit comments

Comments
 (0)