aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar vantezzen <hello@vantezzen.io>2019-09-29 20:21:30 +0200
committerLibravatar vantezzen <hello@vantezzen.io>2019-09-29 20:21:30 +0200
commit4fde59b2c37ec7e7548a5251ef4689f43bb8ae16 (patch)
treeed677819719b361142d6b73fc01bca1938aa8841
parentMerge branch 'develop' of https://github.com/Makazzz/ferdi into Makazzz-develop (diff)
downloadferdium-app-4fde59b2c37ec7e7548a5251ef4689f43bb8ae16.tar.gz
ferdium-app-4fde59b2c37ec7e7548a5251ef4689f43bb8ae16.tar.zst
ferdium-app-4fde59b2c37ec7e7548a5251ef4689f43bb8ae16.zip
Fix termsBase generation
-rw-r--r--src/lib/Menu.js12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index b35a1aafa..80fa0e463 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -287,6 +287,10 @@ function getActiveWebview() {
287 return window.ferdi.stores.services.active.webview; 287 return window.ferdi.stores.services.active.webview;
288} 288}
289 289
290function termsBase() {
291 return window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' ? window.ferdi.stores.settings.all.app.server : 'https://meetfranz.com';
292}
293
290const _templateFactory = intl => [ 294const _templateFactory = intl => [
291 { 295 {
292 label: intl.formatMessage(menuItems.edit), 296 label: intl.formatMessage(menuItems.edit),
@@ -463,11 +467,11 @@ const _templateFactory = intl => [
463 }, 467 },
464 { 468 {
465 label: intl.formatMessage(menuItems.tos), 469 label: intl.formatMessage(menuItems.tos),
466 click() { shell.openExternal('${termsBase}/terms'); }, 470 click() { shell.openExternal(`${termsBase()}/terms`); },
467 }, 471 },
468 { 472 {
469 label: intl.formatMessage(menuItems.privacy), 473 label: intl.formatMessage(menuItems.privacy),
470 click() { shell.openExternal('${termsBase}/privacy'); }, 474 click() { shell.openExternal(`${termsBase()}/privacy`); },
471 }, 475 },
472 ], 476 ],
473 }, 477 },
@@ -684,11 +688,11 @@ const _titleBarTemplateFactory = intl => [
684 }, 688 },
685 { 689 {
686 label: intl.formatMessage(menuItems.tos), 690 label: intl.formatMessage(menuItems.tos),
687 click() { shell.openExternal('${termsBase}/terms'); }, 691 click() { shell.openExternal(`${termsBase()}/terms`); },
688 }, 692 },
689 { 693 {
690 label: intl.formatMessage(menuItems.privacy), 694 label: intl.formatMessage(menuItems.privacy),
691 click() { shell.openExternal('${termsBase}/privacy'); }, 695 click() { shell.openExternal(`${termsBase()}/privacy`); },
692 }, 696 },
693 ], 697 ],
694 }, 698 },