From a72fe3a99185fc52d95fabe0212978b4b1aed657 Mon Sep 17 00:00:00 2001
From: Tomas Bures <bures@d3s.mff.cuni.cz>
Date: Sun, 18 Nov 2018 15:59:28 +0100
Subject: [PATCH] Updates

---
 client/src/templates/helpers.js | 3 ---
 locales/extract.js              | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/src/templates/helpers.js b/client/src/templates/helpers.js
index c2ce99a8..a9b63819 100644
--- a/client/src/templates/helpers.js
+++ b/client/src/templates/helpers.js
@@ -578,9 +578,6 @@ export function getEditForm(owner, typeKey, prefix = '') {
         {owner.templateTypes[typeKey].getHTMLEditor(owner)}
 
         <ACEEditor id={prefix + 'text'} height="400px" mode="text" label={t('Template content (plain text)')} help={<Trans>To extract the text from HTML click <ActionLink onClickAsync={::owner.extractPlainText}>here</ActionLink>. Please note that your existing plaintext in the field above will be overwritten. This feature uses the <a href="http://premailer.dialect.ca/api">Premailer API</a>, a third party service. Their Terms of Service and Privacy Policy apply.</Trans>}/>
-        /*prefix:helpers*/<Trans i18nKey="userMessagesUnread" count={count}>
-            Hello <strong title={t('nameTitle')}>{{name}}</strong>, you have {{count}} unread message. <Link to="/msgs">Go to messages</Link>.
-        </Trans>
     </div>;
 }
 
diff --git a/locales/extract.js b/locales/extract.js
index 4af7074e..431a2d4e 100644
--- a/locales/extract.js
+++ b/locales/extract.js
@@ -118,7 +118,7 @@ function parseSpec(specStr) {
 }
 
 // see http://blog.stevenlevithan.com/archives/match-quoted-string
-const tMatcher = /(^|[ {+(=])((?:tUI|tLog|t|tMark)\s*\(\s*(?:\/\*(.*?)\*\/)?\s*)(["'])((?:(?!\1)[^\\]|\\.)*)(\4)/;
+const tMatcher = /(^|[ {+(=])((?:tUI|tLog|t|tMark)\s*\(\s*(?:\/\*(.*?)\*\/)?\s*)(["'])((?:(?!\4)[^\\]|\\.)*)(\4)/;
 const transMatcher = /(\/\*(.*?)\*\/\s*)?(\<Trans[ >][\s\S]*?\<\/Trans\>)/;
 
 const jsxParser = acorn.Parser.extend(acornJsx());
@@ -277,6 +277,7 @@ function run() {
         fs.writeFileSync(localeFile, JSON.stringify(resDict, null, 2));
     }
 }
+processFile('../client/src/templates/helpers.js');
 
 const rl = readline.createInterface({
     input: process.stdin,