Merge pull request #30 from quicktranslate-module/master-3.x

Master 3.x

Author: asioso

src/QuickTranslateBundle/Resources/public/js/utilities/createDeeplApiUrl.js

@@ -53,6 +53,7 @@ function createDeeplApiUrl(key, type, data, langFrom = null, langTo, autoDetect
     if(glossaryId) {
         glossaryPart = '&glossary_id=' + glossaryId;
     }
+    data = encodeURIComponent(data)
 
     if (autoDetect) {
         return url + '/v2/translate?auth_key=' + key + '&text=' + data + '&target_lang=' + langTo + '&split_sentences=nonewlines&tag_handling=xml' + glossaryPart;

src/QuickTranslateBundle/Resources/public/js/utilities/xmlRegReplace.js

@@ -19,8 +19,5 @@ function xmlRegReplace(xml, replaceBack = false) {
     return xml.replace(/\s\s+/g, "")
         .replace(/\r?\n|\r/g, " ")
         .replace(/ /g, " ")
-        .replace(/<br( \/)?>/g, "(br)")
-        .replace(/&amp;/g, "%26")
-        .replace(/&/g, "%26")
-        .replace(/#/g, "(HaShTaG)");
+        .replace(/<br( \/)?>/g, "(br)");
 };