Merge branch 'develop' of https://github.com/getferdi/ferdi into develop

6 files changed, 14 insertions, 6 deletions

diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 164bc237b..627425948 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -458,7 +458,7 @@ export default class ServerApi {
 
   // News
   async getLatestNews() {
-    const url = `${apiBase()}/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`;
+    const url = `https://api.getferdi.com/v1/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`;
     const request = await sendAuthRequest(url);
     if (!request.ok) throw request;
     const data = await request.json();
@@ -468,7 +468,7 @@ export default class ServerApi {
   }
 
   async hideNews(id) {
-    const request = await sendAuthRequest(`${apiBase()}/news/${id}/read`);
+    const request = await sendAuthRequest(`https://api.getferdi.com/v1/news/${id}/read`);
     if (!request.ok) throw request;
     debug('ServerApi::hideNews resolves', id);
   }
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 01688d5cb..2709f7788 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -188,7 +188,7 @@
   "pricing.plan.pro-yearly": "Ferdi Professional jährlich",
   "pricing.trial.cta.accept": "Ja, Upgrade zu Ferdi Professional durchführen",
   "pricing.trial.cta.skip": "Weiter zu Ferdi",
-  "pricing.trial.cta.start": "Start using Ferdi",
+  "pricing.trial.cta.start": "Ferdi verwenden",
   "pricing.trial.error": "Tut uns leid, wir konnten deine kostenlose Testlizenz nicht aktivieren!",
   "pricing.trial.features.headline": "Ferdi Professional beinhaltet:",
   "pricing.trial.headline.pro": "Hi {name}, willkommen bei Ferdi",
@@ -255,7 +255,7 @@
   "settings.app.cacheInfo": "Der Ferdi Cache belegt derzeit {size}.",
   "settings.app.currentVersion": "Aktuelle Version:",
   "settings.app.form.accentColor": "Akzentfarbe",
-  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
+  "settings.app.form.adaptableDarkMode": "Angepassten DarkMode aktivieren",
   "settings.app.form.autoLaunchInBackground": "Im Hintergrund öffnen",
   "settings.app.form.autoLaunchOnStart": "Ferdi beim Systemstart ausführen",
   "settings.app.form.beta": "Beta-Versionen einbeziehen",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 908e2ace7..2edf358f5 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -255,11 +255,11 @@
   "settings.app.cacheInfo": "Le cache de Ferdi occupe actuellement {size} en espace disque.",
   "settings.app.currentVersion": "Version actuelle :",
   "settings.app.form.accentColor": "Accent de couleur",
-  "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode",
+  "settings.app.form.adaptableDarkMode": "Activer le mode sombre adaptable",
   "settings.app.form.autoLaunchInBackground": "Ouvrir en arrière-plan",
   "settings.app.form.autoLaunchOnStart": "Lancer Ferdi au démarrage",
   "settings.app.form.beta": "Accepter les versions bêta",
-  "settings.app.form.darkMode": "Activer le thème sombre",
+  "settings.app.form.darkMode": "Joindre le côté obscure",
   "settings.app.form.enableGPUAcceleration": "Activer l'accélération GPU",
   "settings.app.form.enableLock": "Activer le verrouillage de Ferdi",
   "settings.app.form.enableSpellchecking": "Activer la vérification orthographique",
diff --git a/src/index.html b/src/index.html
index 7f223b662..31e8aa553 100644
--- a/src/index.html
+++ b/src/index.html
@@ -14,6 +14,7 @@
   <script>
     document.querySelector('body').classList.add(process.env.OS_PLATFORM ? process.env.OS_PLATFORM : process.platform);
 
+    require('./sentry')
     const { isDevMode } = require('./environment');
     if (isDevMode) {
       const debugging = require('debug');
diff --git a/src/index.js b/src/index.js
index 3453b46f7..bc3c9555a 100644
--- a/src/index.js
+++ b/src/index.js
@@ -39,6 +39,7 @@ import handleDeepLink from './electron/deepLinking';
 import { isPositionValid } from './electron/windowUtils';
 import { appId } from './package.json'; // eslint-disable-line import/no-unresolved
 import './electron/exception';
+import './sentry';
 
 import {
   DEFAULT_APP_SETTINGS,
@@ -173,6 +174,7 @@ const createWindow = () => {
     webPreferences: {
       nodeIntegration: true,
       webviewTag: true,
+      preload: path.join(__dirname, 'sentry.js')
     },
   });
 
diff --git a/src/sentry.js b/src/sentry.js
new file mode 100644
index 000000000..4f6d7205d
--- /dev/null
+++ b/src/sentry.js
@@ -0,0 +1,5 @@
+import * as Sentry from '@sentry/electron';
+
+Sentry.init({
+  dsn: 'https://f3d022fbcf6243a68a58d681c2122ee4@sentry.io/1803053',
+});