summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2019-04-09 17:19:24 +0200
committerAndrej Mihajlov <and@mullvad.net>2019-04-09 17:19:24 +0200
commit5af66ab2c15893896db6f897b3304e19054e2d69 (patch)
treecd13c57aab4fc60dcc47c5879de92926c910818e
parentb427aa1adca8fcfeca7f777499f0b4e1c84e3c6e (diff)
parent0d241b7ea617e2f15d76b0bfd60a09e99e8a6feb (diff)
downloadmullvadvpn-5af66ab2c15893896db6f897b3304e19054e2d69.tar.xz
mullvadvpn-5af66ab2c15893896db6f897b3304e19054e2d69.zip
Merge branch 'fix-po-encoding'
-rw-r--r--gui/src/shared/gettext.ts6
1 files changed, 3 insertions, 3 deletions
diff --git a/gui/src/shared/gettext.ts b/gui/src/shared/gettext.ts
index 07a560bdd8..c8cc97969c 100644
--- a/gui/src/shared/gettext.ts
+++ b/gui/src/shared/gettext.ts
@@ -35,10 +35,10 @@ export function loadTranslations(currentLocale: string, catalogue: Gettext) {
function parseTranslation(locale: string, domain: string, catalogue: Gettext): boolean {
const filename = path.join(LOCALES_DIR, locale, `${domain}.po`);
- let buffer: Buffer;
+ let contents: string;
try {
- buffer = fs.readFileSync(filename);
+ contents = fs.readFileSync(filename, { encoding: 'utf8' });
} catch (error) {
if (error.code !== 'ENOENT') {
log.error(`Cannot read the gettext file "${filename}": ${error.message}`);
@@ -48,7 +48,7 @@ function parseTranslation(locale: string, domain: string, catalogue: Gettext): b
let translations: object;
try {
- translations = po.parse(buffer);
+ translations = po.parse(contents);
} catch (error) {
log.error(`Cannot parse the gettext file "${filename}": ${error.message}`);
return false;