Skip to content

Commit

Permalink
Merge pull request #7199 from unfoldingWord/bugfix-mcleanb-7198
Browse files Browse the repository at this point in the history
Bugfix/Fix checking migration error
  • Loading branch information
mannycolon authored Dec 4, 2021
2 parents 764d2a0 + 1db3512 commit 0f2d103
Show file tree
Hide file tree
Showing 9 changed files with 1,381 additions and 11 deletions.
14 changes: 13 additions & 1 deletion src/__mocks__/fs-extra.js
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,19 @@ function __loadFilesIntoMockFs(copyFiles, sourceFolder, mockDestinationFolder) {
for (let copyFile of copyFiles) {
const filePath2 = path.join(sourceFolder_, __correctSeparatorsFromLinux(copyFile));
let fileData = null;
const isDir = fsActual.statSync(filePath2).isDirectory();
let isDir = false;

try {
if (fsActual.existsSync(filePath2)) {
isDir = fsActual.statSync(filePath2).isDirectory();
} else {
console.log(`__loadFilesIntoMockFs() - does not exist: ${filePath2}`);
continue;
}
} catch (e) {
console.error(`__loadFilesIntoMockFs() - could not test: ${filePath2}`);
continue;
}

if (!isDir) {
fileData = fsActual.readFileSync(filePath2).toString();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
{
"contextId": {
"checkId": "gad9",
"occurrenceNote": "If it would be clearer in your language, you could express the idea behind the abstract nouns **grace**, **mercy**, and **peace** with verbal phrases, with **God the Father** and **Jesus Christ** as the subject. Alternate translation: “May God the Father and Jesus Christ show us kindness, be merciful to us, and give us peace” (See: [Abstract Nouns](rc://en/ta/man/translate/figs-abstractnouns))",
"reference": {
"bookId": "2jn",
"chapter": 1,
"verse": 3
},
"tool": "translationNotes",
"groupId": "figs-abstractnouns",
"quote": [
{
"word": "ἔσται",
"occurrence": 1
},
{
"word": "μεθ",
"occurrence": 1
},
{
"word": "",
"occurrence": 1
},
{
"word": "ἡμῶν",
"occurrence": 1
},
{
"word": "χάρις",
"occurrence": 1
},
{
"word": ",",
"occurrence": 1
},
{
"word": "ἔλεος",
"occurrence": 1
},
{
"word": ",",
"occurrence": 2
},
{
"word": "εἰρήνη",
"occurrence": 1
},
{
"word": ",",
"occurrence": 3
},
{
"word": "παρὰ",
"occurrence": 1
},
{
"word": "Θεοῦ",
"occurrence": 1
},
{
"word": "Πατρός",
"occurrence": 1
},
{
"word": "καὶ",
"occurrence": 1
},
{
"word": "παρὰ",
"occurrence": 2
},
{
"word": "Ἰησοῦ",
"occurrence": 1
},
{
"word": "Χριστοῦ",
"occurrence": 1
}
],
"quoteString": "ἔσται μεθ’ ἡμῶν χάρις, ἔλεος, εἰρήνη, παρὰ Θεοῦ Πατρός καὶ παρὰ Ἰησοῦ Χριστοῦ",
"glQuote": "Grace, mercy, and peace will be with us from God the Father and from Jesus Christ",
"occurrence": 1
},
"modifiedTimestamp": "2021-05-24T08:01:00.619Z",
"gatewayLanguageCode": "en",
"gatewayLanguageQuote": "Grace, mercy, and peace will be … us from God the Father and from Jesus Christ",
"selections": [
{
"text": "ತಂದೆಯಾದ ದೇವರಿಂದಲೂ ಮತ್ತು",
"occurrence": 1,
"occurrences": 1
},
{
"text": "ಯೇಸು ಕ್ರಿಸ್ತನಿಂದಲೂ ಕೃಪೆಯು, ಕರುಣೆಯು, ಮತ್ತು ಶಾಂತಿಯು,",
"occurrence": 1,
"occurrences": 1
},
{
"text": "ನಮ್ಮ",
"occurrence": 1,
"occurrences": 1
},
{
"text": "ಇರಲಿ",
"occurrence": 1,
"occurrences": 1
}
],
"nothingToSelect": false,
"username": "test"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"contextId": {
"checkId": "w6tr",
"occurrenceNote": "The abstract nouns **truth** and **love** describe qualities of God the Father and Jesus Christ. If it would be clearer in your language, you could express the ideas behind these abstract nouns with adjectives. Alternative translation: “who are truthful and loving” (See: [Abstract Nouns](rc://en/ta/man/translate/figs-abstractnouns))",
"reference": {
"bookId": "2jn",
"chapter": 1,
"verse": 3
},
"tool": "translationNotes",
"groupId": "figs-abstractnouns",
"quote": [
{
"word": "ἐν",
"occurrence": 1
},
{
"word": "ἀληθείᾳ",
"occurrence": 1
},
{
"word": "καὶ",
"occurrence": 2
},
{
"word": "ἀγάπῃ",
"occurrence": 1
}
],
"quoteString": "ἐν ἀληθείᾳ καὶ ἀγάπῃ",
"glQuote": "in truth and love",
"occurrence": 1
},
"modifiedTimestamp": "2021-05-24T08:01:10.625Z",
"gatewayLanguageCode": "en",
"gatewayLanguageQuote": "in truth and love",
"selections": [
{
"text": "ಸತ್ಯ ಮತ್ತು ಪ್ರೀತಿಯಲ್ಲಿ",
"occurrence": 1,
"occurrences": 1
}
],
"nothingToSelect": false,
"username": "test"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
{
"contextId": {
"occurrenceNote": "If it would be clearer in your language, you could express the idea behind the abstract nouns **grace**, **mercy**, and **peace** with verbal phrases, with **God the Father** and **Jesus Christ** as the subject. Alternate translation: “May God the Father and Jesus Christ show us kindness, be merciful to us, and give us peace” (See: [Abstract Nouns](rc://en/ta/man/translate/figs-abstractnouns))",
"reference": {
"bookId": "2jn",
"chapter": 1,
"verse": 3
},
"tool": "translationNotes",
"groupId": "figs-abstractnouns",
"quote": [
{
"word": "ἔσται",
"occurrence": 1
},
{
"word": "μεθ",
"occurrence": 1
},
{
"word": "",
"occurrence": 1
},
{
"word": "ἡμῶν",
"occurrence": 1
},
{
"word": "χάρις",
"occurrence": 1
},
{
"word": ",",
"occurrence": 1
},
{
"word": "ἔλεος",
"occurrence": 1
},
{
"word": ",",
"occurrence": 2
},
{
"word": "εἰρήνη",
"occurrence": 1
},
{
"word": ",",
"occurrence": 3
},
{
"word": "παρὰ",
"occurrence": 1
},
{
"word": "Θεοῦ",
"occurrence": 1
},
{
"word": "Πατρός",
"occurrence": 1
},
{
"word": "καὶ",
"occurrence": 1
},
{
"word": "παρὰ",
"occurrence": 2
},
{
"word": "Ἰησοῦ",
"occurrence": 1
},
{
"word": "Χριστοῦ",
"occurrence": 1
}
],
"quoteString": "ἔσται μεθ’ ἡμῶν χάρις, ἔλεος, εἰρήνη, παρὰ Θεοῦ Πατρός καὶ παρὰ Ἰησοῦ Χριστοῦ",
"glQuote": "Grace, mercy, and peace will be with us from God the Father and from Jesus Christ",
"occurrence": 1
},
"modifiedTimestamp": "2021-05-24T08:01:00.619Z",
"gatewayLanguageCode": "en",
"gatewayLanguageQuote": "Grace, mercy, and peace will be … us from God the Father and from Jesus Christ",
"selections": [
{
"text": "ತಂದೆಯಾದ ದೇವರಿಂದಲೂ ಮತ್ತು",
"occurrence": 1,
"occurrences": 1
},
{
"text": "ಯೇಸು ಕ್ರಿಸ್ತನಿಂದಲೂ ಕೃಪೆಯು, ಕರುಣೆಯು, ಮತ್ತು ಶಾಂತಿಯು,",
"occurrence": 1,
"occurrences": 1
},
{
"text": "ನಮ್ಮ",
"occurrence": 1,
"occurrences": 1
},
{
"text": "ಇರಲಿ",
"occurrence": 1,
"occurrences": 1
}
],
"nothingToSelect": false,
"username": "test"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"contextId": {
"occurrenceNote": "The abstract nouns **truth** and **love** describe qualities of God the Father and Jesus Christ. If it would be clearer in your language, you could express the ideas behind these abstract nouns with adjectives. Alternative translation: “who are truthful and loving” (See: [Abstract Nouns](rc://en/ta/man/translate/figs-abstractnouns))",
"reference": {
"bookId": "2jn",
"chapter": 1,
"verse": 3
},
"tool": "translationNotes",
"groupId": "figs-abstractnouns",
"quote": [
{
"word": "ἐν",
"occurrence": 1
},
{
"word": "ἀληθείᾳ",
"occurrence": 1
},
{
"word": "καὶ",
"occurrence": 2
},
{
"word": "ἀγάπῃ",
"occurrence": 1
}
],
"quoteString": "ἐν ἀληθείᾳ καὶ ἀγάπῃ",
"glQuote": "in truth and love",
"occurrence": 1
},
"modifiedTimestamp": "2021-05-24T08:01:10.625Z",
"gatewayLanguageCode": "en",
"gatewayLanguageQuote": "in truth and love",
"selections": [
{
"text": "ಸತ್ಯ ಮತ್ತು ಪ್ರೀತಿಯಲ್ಲಿ",
"occurrence": 1,
"occurrences": 1
}
],
"nothingToSelect": false,
"username": "test"
}
Loading

0 comments on commit 0f2d103

Please sign in to comment.