From e6466b2c320cdab46a74aa343b6c56c5783e3f94 Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@jermolene.com>
Date: Thu, 10 May 2018 08:52:02 +0100
Subject: [PATCH] Fix problem with extraneous space in new journal titles

---
 core/ui/PageControls/new-journal.tid     | 4 +++-
 core/ui/ViewToolbar/new-journal-here.tid | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/ui/PageControls/new-journal.tid b/core/ui/PageControls/new-journal.tid
index c18148aa7..b197244b5 100644
--- a/core/ui/PageControls/new-journal.tid
+++ b/core/ui/PageControls/new-journal.tid
@@ -5,13 +5,15 @@ description: {{$:/language/Buttons/NewJournal/Hint}}
 
 \define journalButton()
 <$button tooltip={{$:/language/Buttons/NewJournal/Hint}} aria-label={{$:/language/Buttons/NewJournal/Caption}} class=<<tv-config-toolbar-class>>>
-<$action-sendmessage $message="tm-new-tiddler" title=<<now """$(journalTitleTemplate)$ """>> tags=<<journalTags>> text=<<journalText>>/>
+<$wikify name="journalTitle" text="""<$macrocall $name="now" format=<<journalTitleTemplate>>/>""">
+<$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<journalTags>> text=<<journalText>>/>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/new-journal-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/NewJournal/Caption}}/></span>
 </$list>
+</$wikify>
 </$button>
 \end
 <$set name="journalTitleTemplate" value={{$:/config/NewJournal/Title}}>
diff --git a/core/ui/ViewToolbar/new-journal-here.tid b/core/ui/ViewToolbar/new-journal-here.tid
index 63ef3cc51..54291a6f2 100644
--- a/core/ui/ViewToolbar/new-journal-here.tid
+++ b/core/ui/ViewToolbar/new-journal-here.tid
@@ -9,7 +9,8 @@ description: {{$:/language/Buttons/NewJournalHere/Hint}}
 \end
 \define journalButton()
 <$button tooltip={{$:/language/Buttons/NewJournalHere/Hint}} aria-label={{$:/language/Buttons/NewJournalHere/Caption}} class=<<tv-config-toolbar-class>>>
-<$action-sendmessage $message="tm-new-tiddler" title=<<now """$(journalTitleTemplate)$ """>> tags=<<journalButtonTags>>/>
+<$wikify name="journalTitle" text="""<$macrocall $name="now" format=<<journalTitleTemplate>>/>""">
+<$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<journalButtonTags>>/>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/new-journal-button}}
 </$list>
@@ -18,6 +19,7 @@ description: {{$:/language/Buttons/NewJournalHere/Hint}}
 <$text text={{$:/language/Buttons/NewJournalHere/Caption}}/>
 </span>
 </$list>
+</$wikify>
 </$button>
 \end
 <$set name="journalTitleTemplate" value={{$:/config/NewJournal/Title}}>