From 8fcb670bde6e6540474947112e253b534e1b5b6b Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Fri, 24 Jan 2020 01:07:25 +0100
Subject: [PATCH] Remove translations from reply fallback

---
 resources/langs/nheko_de.ts    | 24 ------------------------
 resources/langs/nheko_el.ts    | 24 ------------------------
 resources/langs/nheko_en.ts    | 24 ------------------------
 resources/langs/nheko_fi.ts    | 24 ------------------------
 resources/langs/nheko_fr.ts    | 24 ------------------------
 resources/langs/nheko_nl.ts    | 24 ------------------------
 resources/langs/nheko_pl.ts    | 24 ------------------------
 resources/langs/nheko_ru.ts    | 24 ------------------------
 resources/langs/nheko_zh_CN.ts | 24 ------------------------
 src/Utils.cpp                  | 18 +++++++++---------
 10 files changed, 9 insertions(+), 225 deletions(-)

diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts
index 5c7ac5223..e4271a6e4 100644
--- a/resources/langs/nheko_de.ts
+++ b/resources/langs/nheko_de.ts
@@ -1282,30 +1282,6 @@ Medien-Größe: %2
 </context>
 <context>
     <name>utils</name>
-    <message>
-        <location filename="../../src/Utils.cpp" line="+292"/>
-        <location line="+35"/>
-        <source>sent a file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent an image.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent an audio file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent a video</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../../src/Utils.h" line="+4"/>
         <source>Unknown Message Type</source>
diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts
index ee7bf891d..982a14ac0 100644
--- a/resources/langs/nheko_el.ts
+++ b/resources/langs/nheko_el.ts
@@ -1280,30 +1280,6 @@ Media size: %2
 </context>
 <context>
     <name>utils</name>
-    <message>
-        <location filename="../../src/Utils.cpp" line="+292"/>
-        <location line="+35"/>
-        <source>sent a file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent an image.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent an audio file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent a video</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../../src/Utils.h" line="+4"/>
         <source>Unknown Message Type</source>
diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts
index 4ebe7e594..60b1fe3d4 100644
--- a/resources/langs/nheko_en.ts
+++ b/resources/langs/nheko_en.ts
@@ -1284,30 +1284,6 @@ Media size: %2
 </context>
 <context>
     <name>utils</name>
-    <message>
-        <location filename="../../src/Utils.cpp" line="+292"/>
-        <location line="+35"/>
-        <source>sent a file.</source>
-        <translation>sent a file.</translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent an image.</source>
-        <translation>sent an image.</translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent an audio file.</source>
-        <translation>sent an audio file.</translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent a video</source>
-        <translation>sent a video.</translation>
-    </message>
     <message>
         <location filename="../../src/Utils.h" line="+4"/>
         <source>Unknown Message Type</source>
diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts
index 30264f5d1..b4b184c9f 100644
--- a/resources/langs/nheko_fi.ts
+++ b/resources/langs/nheko_fi.ts
@@ -1284,30 +1284,6 @@ Median koko: %2
 </context>
 <context>
     <name>utils</name>
-    <message>
-        <location filename="../../src/Utils.cpp" line="+292"/>
-        <location line="+35"/>
-        <source>sent a file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent an image.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent an audio file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent a video</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../../src/Utils.h" line="+4"/>
         <source>Unknown Message Type</source>
diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts
index 7721e1c98..c713dcb18 100644
--- a/resources/langs/nheko_fr.ts
+++ b/resources/langs/nheko_fr.ts
@@ -1283,30 +1283,6 @@ Taille du média : %2
 </context>
 <context>
     <name>utils</name>
-    <message>
-        <location filename="../../src/Utils.cpp" line="+292"/>
-        <location line="+35"/>
-        <source>sent a file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent an image.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent an audio file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent a video</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../../src/Utils.h" line="+4"/>
         <source>Unknown Message Type</source>
diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts
index 7cd06e4b9..82b0f8815 100644
--- a/resources/langs/nheko_nl.ts
+++ b/resources/langs/nheko_nl.ts
@@ -1282,30 +1282,6 @@ Mediagrootte: %2
 </context>
 <context>
     <name>utils</name>
-    <message>
-        <location filename="../../src/Utils.cpp" line="+292"/>
-        <location line="+35"/>
-        <source>sent a file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent an image.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent an audio file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent a video</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../../src/Utils.h" line="+4"/>
         <source>Unknown Message Type</source>
diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts
index cfcbb82c9..6fb2133b2 100644
--- a/resources/langs/nheko_pl.ts
+++ b/resources/langs/nheko_pl.ts
@@ -1286,30 +1286,6 @@ Rozmiar multimediów: %2
 </context>
 <context>
     <name>utils</name>
-    <message>
-        <location filename="../../src/Utils.cpp" line="+292"/>
-        <location line="+35"/>
-        <source>sent a file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent an image.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent an audio file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent a video</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../../src/Utils.h" line="+4"/>
         <source>Unknown Message Type</source>
diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts
index d1f5c63cb..1b84074f6 100644
--- a/resources/langs/nheko_ru.ts
+++ b/resources/langs/nheko_ru.ts
@@ -1285,30 +1285,6 @@ Media size: %2
 </context>
 <context>
     <name>utils</name>
-    <message>
-        <location filename="../../src/Utils.cpp" line="+292"/>
-        <location line="+35"/>
-        <source>sent a file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent an image.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent an audio file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent a video</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../../src/Utils.h" line="+4"/>
         <source>Unknown Message Type</source>
diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts
index 43f4e15fd..f8b194344 100644
--- a/resources/langs/nheko_zh_CN.ts
+++ b/resources/langs/nheko_zh_CN.ts
@@ -1290,30 +1290,6 @@ Media size: %2
 </context>
 <context>
     <name>utils</name>
-    <message>
-        <location filename="../../src/Utils.cpp" line="+292"/>
-        <location line="+35"/>
-        <source>sent a file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent an image.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent an audio file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-32"/>
-        <location line="+35"/>
-        <source>sent a video</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../../src/Utils.h" line="+4"/>
         <source>Unknown Message Type</source>
diff --git a/src/Utils.cpp b/src/Utils.cpp
index e6b921600..5a67ef62a 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -403,21 +403,21 @@ utils::markdownToHtml(const QString &text)
 QString
 utils::getFormattedQuoteBody(const RelatedInfo &related, const QString &html)
 {
-        auto getFormattedBody = [related]() {
+        auto getFormattedBody = [related]() -> QString {
                 using MsgType = mtx::events::MessageType;
 
                 switch (related.type) {
                 case MsgType::File: {
-                        return QString(QCoreApplication::translate("utils", "sent a file."));
+                        return "sent a file.";
                 }
                 case MsgType::Image: {
-                        return QString(QCoreApplication::translate("utils", "sent an image."));
+                        return "sent an image.";
                 }
                 case MsgType::Audio: {
-                        return QString(QCoreApplication::translate("utils", "sent an audio file."));
+                        return "sent an audio file.";
                 }
                 case MsgType::Video: {
-                        return QString(QCoreApplication::translate("utils", "sent a video"));
+                        return "sent a video";
                 }
                 default: {
                         return related.quoted_formatted_body;
@@ -443,16 +443,16 @@ utils::getQuoteBody(const RelatedInfo &related)
 
         switch (related.type) {
         case MsgType::File: {
-                return QString(QCoreApplication::translate("utils", "sent a file."));
+                return "sent a file.";
         }
         case MsgType::Image: {
-                return QString(QCoreApplication::translate("utils", "sent an image."));
+                return "sent an image.";
         }
         case MsgType::Audio: {
-                return QString(QCoreApplication::translate("utils", "sent an audio file."));
+                return "sent an audio file.";
         }
         case MsgType::Video: {
-                return QString(QCoreApplication::translate("utils", "sent a video"));
+                return "sent a video";
         }
         default: {
                 return related.quoted_body;
-- 
GitLab