From 4394a20f87922e768852dd693b7d3eb8ef3f90f4 Mon Sep 17 00:00:00 2001
From: nurjinn jafar <nurjin.jafar@nordeck.net>
Date: Tue, 18 Aug 2020 09:56:38 +0200
Subject: [PATCH] setting added to User Settings -> Preferences -> Timeline as
 an opt out for users with german translation

---
 .../views/settings/tabs/user/PreferencesUserSettingsTab.js   | 1 +
 src/i18n/strings/de_DE.json                                  | 3 ++-
 src/i18n/strings/en_EN.json                                  | 1 +
 src/settings/Settings.ts                                     | 5 +++++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index a77815a68c..6ed2fc2e39 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -49,6 +49,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
         'showAvatarChanges',
         'showDisplaynameChanges',
         'showImages',
+        'dontShowChatEffects',
     ];
 
     static ADVANCED_SETTINGS = [
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 09dbcb2e18..edfe21d9d6 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2361,5 +2361,6 @@
     "%(brand)s encountered an error during upload of:": "%(brand)s hat einen Fehler festgestellt beim hochladen von:",
     "Use your account to sign in to the latest version of the app at <a />": "Verwende dein Konto um dich an der neusten Version der App anzumelden<a />",
     "We’re excited to announce Riot is now Element!": "Wir freuen uns bekanntzugeben: Riot ist jetzt Element!",
-    "Learn more at <a>element.io/previously-riot</a>": "Erfahre mehr unter <a>element.io/previously-riot</a>"
+    "Learn more at <a>element.io/previously-riot</a>": "Erfahre mehr unter <a>element.io/previously-riot</a>",
+    "Don't show chat effects": "Chat Effekte nicht zeigen"
 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 974a96406f..98aee655fe 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -503,6 +503,7 @@
     "Manually verify all remote sessions": "Manually verify all remote sessions",
     "IRC display name width": "IRC display name width",
     "Enable experimental, compact IRC style layout": "Enable experimental, compact IRC style layout",
+    "Don't show chat effects": "Don't show chat effects",
     "Collecting app version information": "Collecting app version information",
     "Collecting logs": "Collecting logs",
     "Uploading report": "Uploading report",
diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index 714d80f983..59a3a4799b 100644
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -586,4 +586,9 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         displayName: _td("Enable experimental, compact IRC style layout"),
         default: false,
     },
+    "dontShowChatEffects": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td("Don't show chat effects"),
+        default: false,
+    },
 };