diff --git a/package.json b/package.json index 641c7941..9d6ff730 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,8 @@ "scripts": { "compile-sass": "sass --update .:.", "build-worker": "tsc -p shared/js/workers/tsconfig_worker_codec.json", - "dtsgen": "node build/dtsgen/index.js", - "trgen": "node build/trgen/index.js", + "dtsgen": "node tools/dtsgen/index.js", + "trgen": "node tools/trgen/index.js", "ttsc": "ttsc" }, "author": "TeaSpeak (WolverinDEV)", diff --git a/shared/html/templates.html b/shared/html/templates.html index bbdc5fd2..15c92438 100644 --- a/shared/html/templates.html +++ b/shared/html/templates.html @@ -31,7 +31,7 @@
diff --git a/shared/i18n/de_DE_google_translate.translation b/shared/i18n/de_DE_google_translate.translation index 3cdec968..0b7f5d39 100644 --- a/shared/i18n/de_DE_google_translate.translation +++ b/shared/i18n/de_DE_google_translate.translation @@ -1,6 +1,6 @@ { "info": { - "name": "Auto translated messages for language de by the google translator", + "name": "German translation, based on Google Translate", "contributors": [ { "name": "Google Translate, via script by Markus Hadenfeldt", @@ -23,9 +23,10 @@ } }, { - "translated": "Klingt initialisiert", + "translated": "Audios initialisiert", "flags": [ - "google-translate" + "google-translate", + "human-modified" ], "key": { "message": "Sounds initialitzed" @@ -2291,9 +2292,10 @@ } }, { - "translated": "die Einstellungen", + "translated": "Einstellungen", "flags": [ - "google-translate" + "google-translate", + "human-modified" ], "key": { "message": "Settings" diff --git a/shared/i18n/info.json b/shared/i18n/info.json index eca92fca..0f1415d6 100644 --- a/shared/i18n/info.json +++ b/shared/i18n/info.json @@ -1,9 +1,5 @@ { "translations": [ - { - "key": "de_DE", - "path": "de_DE.translation" - }, { "key": "de_DE_gt", "path": "de_DE_google_translate.translation" diff --git a/shared/js/i18n/localize.ts b/shared/js/i18n/localize.ts index 096a63c4..fd01ff77 100644 --- a/shared/js/i18n/localize.ts +++ b/shared/js/i18n/localize.ts @@ -71,7 +71,7 @@ namespace i18n { const sloppy = fast_translate[message]; if(sloppy) return sloppy; - console.log("Translating \"%s\". Default: \"%s\"", key, message); + log.info(LogCategory.I18N, "Translating \"%s\". Default: \"%s\"", key, message); let translated = message; for(const translation of translations) { @@ -92,7 +92,6 @@ namespace i18n { async: true, success: result => { try { - console.dir(result); const file = (typeof(result) === "string" ? JSON.parse(result) : result) as TranslationFile; if(!file) { reject("Invalid json"); @@ -191,6 +190,16 @@ namespace i18n { for(const repo of config.repositories) (repo.repository || {load_timestamp: 0}).load_timestamp = 0; + if(config.repositories.length == 0) { + //Add the default TeaSpeak repository + load_repository(settings.static("i18n.default_repository", "i18n/")).then(repo => { + log.info(LogCategory.I18N, tr("Successfully added default repository from \"%s\"."), repo.url); + register_repository(repo); + }).catch(error => { + log.warn(LogCategory.I18N, tr("Failed to add default repository. Error: %o"), error); + }); + } + return _cached_repository_config = config; } @@ -242,7 +251,6 @@ namespace i18n { export function iterate_translations(callback_entry: (repository: TranslationRepository, entry: TranslationFile) => any, callback_finish: () => any) { let count = 0; const update_finish = () => { - console.error(count); if(count == 0 && callback_finish) callback_finish(); }; diff --git a/build/dtsgen/declarator.ts b/tools/dtsgen/declarator.ts similarity index 100% rename from build/dtsgen/declarator.ts rename to tools/dtsgen/declarator.ts diff --git a/build/dtsgen/index.ts b/tools/dtsgen/index.ts similarity index 100% rename from build/dtsgen/index.ts rename to tools/dtsgen/index.ts diff --git a/build/dtsgen/test/test_01.ts b/tools/dtsgen/test/test_01.ts similarity index 100% rename from build/dtsgen/test/test_01.ts rename to tools/dtsgen/test/test_01.ts diff --git a/build/dtsgen/test/test_02.ts b/tools/dtsgen/test/test_02.ts similarity index 100% rename from build/dtsgen/test/test_02.ts rename to tools/dtsgen/test/test_02.ts diff --git a/build/dtsgen/tsconfig.json b/tools/dtsgen/tsconfig.json similarity index 100% rename from build/dtsgen/tsconfig.json rename to tools/dtsgen/tsconfig.json diff --git a/build/trgen/bin/tsc.sh b/tools/trgen/bin/tsc.sh similarity index 100% rename from build/trgen/bin/tsc.sh rename to tools/trgen/bin/tsc.sh diff --git a/build/trgen/compiler.ts b/tools/trgen/compiler.ts similarity index 100% rename from build/trgen/compiler.ts rename to tools/trgen/compiler.ts diff --git a/build/trgen/generator.ts b/tools/trgen/generator.ts similarity index 100% rename from build/trgen/generator.ts rename to tools/trgen/generator.ts diff --git a/build/trgen/index.ts b/tools/trgen/index.ts similarity index 100% rename from build/trgen/index.ts rename to tools/trgen/index.ts diff --git a/build/trgen/jsrender_generator.ts b/tools/trgen/jsrender_generator.ts similarity index 100% rename from build/trgen/jsrender_generator.ts rename to tools/trgen/jsrender_generator.ts diff --git a/build/trgen/test/test_01.ts b/tools/trgen/test/test_01.ts similarity index 100% rename from build/trgen/test/test_01.ts rename to tools/trgen/test/test_01.ts diff --git a/build/trgen/test/test_02.html b/tools/trgen/test/test_02.html similarity index 100% rename from build/trgen/test/test_02.html rename to tools/trgen/test/test_02.html diff --git a/build/trgen/ts_generator.ts b/tools/trgen/ts_generator.ts similarity index 100% rename from build/trgen/ts_generator.ts rename to tools/trgen/ts_generator.ts diff --git a/build/trgen/tsconfig.json b/tools/trgen/tsconfig.json similarity index 100% rename from build/trgen/tsconfig.json rename to tools/trgen/tsconfig.json diff --git a/build/trgen/ttsc_transformer.ts b/tools/trgen/ttsc_transformer.ts similarity index 100% rename from build/trgen/ttsc_transformer.ts rename to tools/trgen/ttsc_transformer.ts diff --git a/tools/trmanager/index.html b/tools/trmanager/index.html new file mode 100644 index 00000000..ebc0c722 --- /dev/null +++ b/tools/trmanager/index.html @@ -0,0 +1,10 @@ + + + + + Translation Manager + + +
This needs some improvements
+ + \ No newline at end of file