hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1666 from atmire/w2p-91400_Fix-for-missing-comma-in-json-files

Browse Source 
Fix for missing comma in json files
This commit is contained in:
Tim Donohue
2022-06-03 16:53:38 -05:00
committed by GitHub
parent c6e591402f d6e181d0b2
commit 02e089a51b
2 changed files with 1888 additions and 1884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/sync-i18n-files.ts
View File

@@ -1,4 +1,5 @@
import { projectRoot } from '../webpack/helpers'; import { projectRoot } from '../webpack/helpers';
const commander = require('commander'); const commander = require('commander');
const fs = require('fs'); const fs = require('fs');
const JSON5 = require('json5'); const JSON5 = require('json5');
@@ -119,7 +120,7 @@ function syncFileWithSource(pathToTargetFile, pathToOutputFile) {
outputChunks.forEach(function (chunk) { outputChunks.forEach(function (chunk) {
progressBar.increment(); progressBar.increment();
chunk.split("\n").forEach(function (line) { chunk.split("\n").forEach(function (line) {
file.write(" " + line + "\n"); file.write((line === '' ? '' : ` ${line}`) + "\n");
}); });
}); });
file.write("\n}"); file.write("\n}");
@@ -192,7 +193,10 @@ function createNewChunkComparingSourceAndTarget(correspondingTargetChunk, source
const targetList = correspondingTargetChunk.split("\n"); const targetList = correspondingTargetChunk.split("\n");
const oldKeyValueInTargetComments = getSubStringWithRegex(correspondingTargetChunk, "\\s*\\/\\/\\s*\".*"); const oldKeyValueInTargetComments = getSubStringWithRegex(correspondingTargetChunk, "\\s*\\/\\/\\s*\".*");
const keyValueTarget = targetList[targetList.length - 1]; let keyValueTarget = targetList[targetList.length - 1];
if (!keyValueTarget.endsWith(",")) {
keyValueTarget = keyValueTarget + ",";
}
if (oldKeyValueInTargetComments != null) { if (oldKeyValueInTargetComments != null) {
const oldKeyValueUncommented = getSubStringWithRegex(oldKeyValueInTargetComments[0], "\".*")[0]; const oldKeyValueUncommented = getSubStringWithRegex(oldKeyValueInTargetComments[0], "\".*")[0];

2
src/assets/i18n/lv.json5
View File

@@ -5552,7 +5552,7 @@
// "workflowAdmin.search.results.head": "Administer Workflow", // "workflowAdmin.search.results.head": "Administer Workflow",
"workflowAdmin.search.results.head": "Administrēt darba plūsmu" "workflowAdmin.search.results.head": "Administrēt darba plūsmu",