From 9950c62579298a5dac8cbd51d700507ce4d90063 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 29 May 2017 12:37:35 +0200 Subject: fix strings.ts generation --- gulpfile.js | 7 ++++++- src/i18n/strings.ts | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index e7d4ccef3..0f206ed80 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -49,6 +49,7 @@ const Stream = require("stream").Stream; const vfs = require("vinyl-fs"); const webpack = require("webpack"); const po2json = require("po2json"); +const path = require("path"); const paths = { ts: { @@ -322,7 +323,11 @@ function pofilesToJs(targetPath) { if (error) { throw error; } - const lang = file.stem; + const lang = path.basename(file.path, ".po"); + if (!lang) { + throw Error(); + } + console.log("lang", lang); const pojson = po2json.parse(buf, {format: "jed1.x", fuzzy: true}); outStream.write("strings['" + lang + "'] = " + JSON.stringify(pojson, null, " ") + ";\n"); cb(); diff --git a/src/i18n/strings.ts b/src/i18n/strings.ts index 19a9293a4..806989369 100644 --- a/src/i18n/strings.ts +++ b/src/i18n/strings.ts @@ -15,7 +15,7 @@ */ export let strings: {[s: string]: any} = {}; -strings['undefined'] = { +strings['de'] = { "domain": "messages", "locale_data": { "messages": { @@ -174,7 +174,7 @@ strings['undefined'] = { } } }; -strings['undefined'] = { +strings['en-US'] = { "domain": "messages", "locale_data": { "messages": { @@ -333,7 +333,7 @@ strings['undefined'] = { } } }; -strings['undefined'] = { +strings['fr'] = { "domain": "messages", "locale_data": { "messages": { @@ -492,7 +492,7 @@ strings['undefined'] = { } } }; -strings['undefined'] = { +strings['it'] = { "domain": "messages", "locale_data": { "messages": { -- cgit v1.2.3