Osmwithspace/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge branch 'develop' into feature/maproulette

Browse source
This commit is contained in:
Robin van der Linde 2022-07-27 10:25:17 +02:00
commit f174a3d776
Signed by untrusted user: Robin-van-der-Linde
GPG key ID: 53956B3252478F0D
43 changed files with 2097 additions and 371 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/automerge-translations.sh
View file

@ -1,4 +1,4 @@
#! /bin/bash
#! /usr/bin/env bash
# Automerge translations automatically fetches the translations from weblate

20
scripts/mergeJsonFiles.ts Normal file
View file

@ -0,0 +1,20 @@
import {readFileSync, writeFileSync} from "fs";
import {Utils} from "../Utils";
function main(args: string[]) {
console.log("File Merge")
if (args.length != 3) {
console.log("Usage: input1.json input2.json output.json")
console.log("You passed in the arguments: " + args.join(","))
return
}
const [input1, input2, output] = args
const f1 = JSON.parse(readFileSync(input1, "utf8"))
const f2 = JSON.parse(readFileSync(input2, "utf8"))
Utils.Merge(f1, f2)
writeFileSync(output, JSON.stringify(f2, null, " "))
}
main(process.argv.slice(2))