diff options
Diffstat (limited to 'views')
39 files changed, 344 insertions, 344 deletions
diff --git a/views/404.handlebars b/views/404.handlebars index 8b821c3..89d3f33 100755 --- a/views/404.handlebars +++ b/views/404.handlebars @@ -1,4 +1,4 @@  <main class="page"> -    <h1>{{t "404.notfound"}}</h1> -    <p>{{t "404.desc"}}</p> +    <h1>{{t "views.404notfound"}}</h1> +    <p>{{t "views.404desc"}}</p>  </main> diff --git a/views/createEventMagicLink.handlebars b/views/createEventMagicLink.handlebars index 7f76710..2703949 100644 --- a/views/createEventMagicLink.handlebars +++ b/views/createEventMagicLink.handlebars @@ -1,5 +1,5 @@  <main class="page"> -  <h2 class="mb-4">{{t "ml.requestml" }}</h2> +  <h2 class="mb-4">{{t "routes.magiclink.requestml" }}</h2>    <form      action="/magic-link/event/create" @@ -8,10 +8,10 @@      hx-target="article"    >      <p> -      {{t "ml.requestmldesc" }} +      {{t "views.createeventmagiclink.requestmldesc" }}      </p>      <p> -      {{t "ml.requestmlcontact" }} +      {{t "views.createeventmagiclink.requestmlcontact" }}      </p>      {{#if message}}        <div class="alert alert-{{message.type}}" role="alert"> @@ -19,11 +19,11 @@        </div>      {{/if}}      <div class="form-group"> -      <label for="email">{{t "emailaddr" }}</label> -    <input type="email" class="form-control" id="email" placeholder="{{t "emailaddr" }}" required name="email"> +      <label for="email">{{t "common.emailaddr" }}</label> +    <input type="email" class="form-control" id="email" placeholder="{{t "common.emailaddr" }}" required name="email">      </div>      <div class="form-group text-center"> -      <button type="submit" class="button button--primary w-50">{{t "ml.requestmlbutton" }}</button> +      <button type="submit" class="button button--primary w-50">{{t "routes.magiclink.requestmlbutton" }}</button>      </div>    </form>  </main> diff --git a/views/emails/addEventAttendee/addEventAttendeeHtml.handlebars b/views/emails/addEventAttendee/addEventAttendeeHtml.handlebars index 5709689..fcd68b4 100644 --- a/views/emails/addEventAttendee/addEventAttendeeHtml.handlebars +++ b/views/emails/addEventAttendee/addEventAttendeeHtml.handlebars @@ -1,9 +1,9 @@ -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.addeventattendee.preface" }}</p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.addeventattendee.eventlink" }}: <a href="https://{{domain}}/{{eventID}}">https://{{domain}}/{{eventID}}</a></p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.addeventattendee.toremove" }}: <a href="https://{{domain}}/event/{{eventID}}/unattend/{{removalPasswordHash}}">{{t "mail.addeventattendee.clicktocancel" }}</a>.</p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{{t "mail.addeventattendee.removapasswordhtml" }}}: {{removalPassword}}</p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.love" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.addeventattendee.preface" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.addeventattendee.eventlink" }}: <a href="https://{{domain}}/{{eventID}}">https://{{domain}}/{{eventID}}</a></p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.addeventattendee.toremove" }}: <a href="https://{{domain}}/event/{{eventID}}/unattend/{{removalPasswordHash}}">{{t "views.emails.addeventattendee.clicktocancel" }}</a>.</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{{t "views.emails.addeventattendee.removapasswordhtml" }}}: {{removalPassword}}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.love" }}</p>  <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{siteName}}</p>  <hr/> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "mail.holdup" }}</strong></p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{{t "mail.addeventattendee.dontknowhtml" }}}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "views.emails.holdup" }}</strong></p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{{t "views.emails.addeventattendee.dontknowhtml" }}}</p> diff --git a/views/emails/addEventAttendee/addEventAttendeeText.handlebars b/views/emails/addEventAttendee/addEventAttendeeText.handlebars index b7b92ae..c264989 100644 --- a/views/emails/addEventAttendee/addEventAttendeeText.handlebars +++ b/views/emails/addEventAttendee/addEventAttendeeText.handlebars @@ -1,12 +1,12 @@ -{{t "mail.addeventattendee.preface" }} +{{t "views.emails.addeventattendee.preface" }} -{{t "mail.addeventattendee.eventlink" }}: https://{{domain}}/{{eventID}} +{{t "views.emails.addeventattendee.eventlink" }}: https://{{domain}}/{{eventID}} -{{t "mail.addeventattendee.removelink" }}: https://{{domain}}/event/{{eventID}}/unattend/{{removalPasswordHash}} +{{t "views.emails.addeventattendee.removelink" }}: https://{{domain}}/event/{{eventID}}/unattend/{{removalPasswordHash}} -{{t "mail.addeventattendee.removepassword" }}: {{removalPassword}} +{{t "views.emails.addeventattendee.removepassword" }}: {{removalPassword}} -{{t "mail.love" }} +{{t "views.emails.love" }}  {{siteName}} -{{t "mail.dontknow" }}
\ No newline at end of file +{{t "views.emails.dontknow" }}
\ No newline at end of file diff --git a/views/emails/addEventComment/addEventCommentHtml.handlebars b/views/emails/addEventComment/addEventCommentHtml.handlebars index 3cc93cc..d15eb00 100644 --- a/views/emails/addEventComment/addEventCommentHtml.handlebars +++ b/views/emails/addEventComment/addEventCommentHtml.handlebars @@ -1,7 +1,7 @@ -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{{t "mail.addeventcomment.prefacehtml" }}}</p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.addeventcomment.link" }}: <a href="https://{{domain}}/{{eventID}}">https://{{domain}}/{{eventID}}</a></p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.love" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{{t "views.emails.addeventcomment.prefacehtml" }}}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.addeventcomment.link" }}: <a href="https://{{domain}}/{{eventID}}">https://{{domain}}/{{eventID}}</a></p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.love" }}</p>  <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{siteName}}</p>  <hr/> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "mail.holdup" }}</strong></p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.dontknow" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "views.emails.holdup" }}</strong></p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.dontknow" }}</p> diff --git a/views/emails/addEventComment/addEventCommentText.handlebars b/views/emails/addEventComment/addEventCommentText.handlebars index fed799c..ec0b87c 100644 --- a/views/emails/addEventComment/addEventCommentText.handlebars +++ b/views/emails/addEventComment/addEventCommentText.handlebars @@ -1,9 +1,9 @@ -{{t "mail.addeventcomment.preface" commentAuthor }} +{{t "views.emails.addeventcomment.preface" commentAuthor }} -{{t "mail.addeventcomment.link" }}: https://{{domain}}/{{eventID}} +{{t "views.emails.addeventcomment.link" }}: https://{{domain}}/{{eventID}} -{{t "mail.love" }} +{{t "views.emails.love" }}  {{siteName}} -{{t "mail.dontknow" }} +{{t "views.emails.dontknow" }} diff --git a/views/emails/createEvent/createEventHtml.handlebars b/views/emails/createEvent/createEventHtml.handlebars index d437c32..9310c2a 100644 --- a/views/emails/createEvent/createEventHtml.handlebars +++ b/views/emails/createEvent/createEventHtml.handlebars @@ -1,6 +1,6 @@ -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.createevent.preface" }}</p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.createevent.sharelink" }}: <a href="https://{{domain}}/{{eventID}}">https://{{domain}}/{{eventID}}</a></p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{{t "mail.createeventhtml.desc" }}}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.createevent.preface" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.createevent.sharelink" }}: <a href="https://{{domain}}/{{eventID}}">https://{{domain}}/{{eventID}}</a></p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{{t "views.emails.createeventhtml.desc" }}}</p>  <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;">    <tbody> @@ -9,7 +9,7 @@          <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">            <tbody>              <tr> -              <td style="font-family: sans-serif; font-size: 14px; vertical-align: top; background-color: #28a745; border-radius: 5px; text-align: center;"> <a href="https://{{domain}}/{{eventID}}?e={{editToken}}" target="_blank" style="display: inline-block; color: #ffffff; background-color: #28a745; border: solid 1px #28a745; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 14px; font-weight: bold; margin: 0; padding: 12px 25px; text-transform: capitalize; border-color: #28a745;">{{t "mail.createeventhtml.editevent" }}</a> </td> +              <td style="font-family: sans-serif; font-size: 14px; vertical-align: top; background-color: #28a745; border-radius: 5px; text-align: center;"> <a href="https://{{domain}}/{{eventID}}?e={{editToken}}" target="_blank" style="display: inline-block; color: #ffffff; background-color: #28a745; border: solid 1px #28a745; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 14px; font-weight: bold; margin: 0; padding: 12px 25px; text-transform: capitalize; border-color: #28a745;">{{t "views.emails.createeventhtml.editevent" }}</a> </td>              </tr>            </tbody>          </table> diff --git a/views/emails/createEvent/createEventText.handlebars b/views/emails/createEvent/createEventText.handlebars index 3352a88..7c85d5c 100644 --- a/views/emails/createEvent/createEventText.handlebars +++ b/views/emails/createEvent/createEventText.handlebars @@ -1,6 +1,6 @@ -{{t "mail.createevent.preface" }} +{{t "views.emails.createevent.preface" }} -{{t "mail.createevent.sharelink" }}: https://{{domain}}/{{eventID}} +{{t "views.emails.createevent.sharelink" }}: https://{{domain}}/{{eventID}} -{{t "mail.createevent.desc" }} +{{t "views.emails.createevent.desc" }}  https://{{domain}}/{{eventID}}?e={{editToken}} diff --git a/views/emails/createEventGroup/createEventGroupHtml.handlebars b/views/emails/createEventGroup/createEventGroupHtml.handlebars index bc70bcf..1f73b75 100644 --- a/views/emails/createEventGroup/createEventGroupHtml.handlebars +++ b/views/emails/createEventGroup/createEventGroupHtml.handlebars @@ -1,8 +1,8 @@ -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.createeventgroup.preface" }}</p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.createeventgroup.link" }}: <a href="https://{{domain}}/group/{{eventGroupID}}?e={{editToken}}">https://{{domain}}/group/{{eventGroupID}}?e={{editToken}}</a></p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.createeventgroup.eventlink" }}</p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "group.p.eventgroupid" }}</strong>: {{eventGroupID}}</p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "group.editpswddesc" }}</strong>: {{editToken}}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.createeventgroup.preface" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.createeventgroup.link" }}: <a href="https://{{domain}}/group/{{eventGroupID}}?e={{editToken}}">https://{{domain}}/group/{{eventGroupID}}?e={{editToken}}</a></p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.createeventgroup.eventlink" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "common.eventgroupid" }}</strong>: {{eventGroupID}}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "views.emails.createevent.editpswddesc" }}</strong>: {{editToken}}</p>  <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;">    <tbody>      <tr> @@ -10,7 +10,7 @@          <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">            <tbody>              <tr> -              <td style="font-family: sans-serif; font-size: 14px; vertical-align: top; background-color: #28a745; border-radius: 5px; text-align: center;"> <a href="https://{{domain}}/group/{{eventGroupID}}?e={{editToken}}" target="_blank" style="display: inline-block; color: #ffffff; background-color: #28a745; border: solid 1px #28a745; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 14px; font-weight: bold; margin: 0; padding: 12px 25px; text-transform: capitalize; border-color: #28a745;">{{t "mail.createeventgroup.editgrouplinkhtml" }}</a> </td> +              <td style="font-family: sans-serif; font-size: 14px; vertical-align: top; background-color: #28a745; border-radius: 5px; text-align: center;"> <a href="https://{{domain}}/group/{{eventGroupID}}?e={{editToken}}" target="_blank" style="display: inline-block; color: #ffffff; background-color: #28a745; border: solid 1px #28a745; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 14px; font-weight: bold; margin: 0; padding: 12px 25px; text-transform: capitalize; border-color: #28a745;">{{t "views.emails.createeventgroup.editgrouplinkhtml" }}</a> </td>              </tr>            </tbody>          </table> @@ -18,10 +18,10 @@      </tr>    </tbody>  </table> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.createeventgroup.sharelink" }}: <a href="https://{{domain}}/group/{{eventGroupID}}?e={{editToken}}">https://{{domain}}/group/{{eventGroupID}}</a></p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.createeventgroup.done" }}</p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.love" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.createeventgroup.sharelink" }}: <a href="https://{{domain}}/group/{{eventGroupID}}?e={{editToken}}">https://{{domain}}/group/{{eventGroupID}}</a></p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.createeventgroup.done" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.love" }}</p>  <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{siteName}}</p>  <hr/> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "mail.holdup" }}</strong></p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.createeventgroup.dontknow" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "views.emails.holdup" }}</strong></p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.createeventgroup.dontknow" }}</p> diff --git a/views/emails/createEventGroup/createEventGroupText.handlebars b/views/emails/createEventGroup/createEventGroupText.handlebars index 61fc86b..7599bda 100644 --- a/views/emails/createEventGroup/createEventGroupText.handlebars +++ b/views/emails/createEventGroup/createEventGroupText.handlebars @@ -1,20 +1,20 @@ -{{{t "mail.createeventgroup.preface" }}} +{{{t "views.emails.createeventgroup.preface" }}} -{{t "mail.createeventgroup.link" }}: https://{{domain}}/group/{{eventGroupID}}?e={{editToken}} +{{t "views.emails.createeventgroup.link" }}: https://{{domain}}/group/{{eventGroupID}}?e={{editToken}} -{{t "mail.createeventgroup.eventlink" }} +{{t "views.emails.createeventgroup.eventlink" }} -{{t "group.p.eventgroupid" }}: {{eventGroupID}} +{{t "common.eventgroupid" }}: {{eventGroupID}} -{{t "group.editpswddesc" }}: {{editToken}} +{{t "views.emails.createevent.editpswddesc" }}: {{editToken}} -{{t "mail.createeventgroup.editgrouplink" }}: https://{{domain}}/group/{{eventGroupID}}?e={{editToken}} +{{t "views.emails.createeventgroup.editgrouplink" }}: https://{{domain}}/group/{{eventGroupID}}?e={{editToken}} -{{t "mail.createeventgroup.sharelink" }}: https://{{domain}}/group/{{eventGroupID}} +{{t "views.emails.createeventgroup.sharelink" }}: https://{{domain}}/group/{{eventGroupID}} -{{t "mail.createeventgroup.done" }} +{{t "views.emails.createeventgroup.done" }} -{{t "mail.love" }} +{{t "views.emails.love" }}  {{siteName}} -{{t "mail.createeventgroup.dontknow" }}
\ No newline at end of file +{{t "views.emails.createeventgroup.dontknow" }}
\ No newline at end of file diff --git a/views/emails/createEventMagicLink/createEventMagicLinkHtml.handlebars b/views/emails/createEventMagicLink/createEventMagicLinkHtml.handlebars index 77d94cc..5afd37e 100644 --- a/views/emails/createEventMagicLink/createEventMagicLinkHtml.handlebars +++ b/views/emails/createEventMagicLink/createEventMagicLinkHtml.handlebars @@ -1,8 +1,8 @@ -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.magiclink.preface" }}</p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.magiclink.link" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.magiclink.preface" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.magiclink.link" }}</p>  <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><a href="https://{{domain}}/new/{{token}}">https://{{domain}}/new/{{token}}</a></p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.love" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.love" }}</p>  <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{siteName}}</p>  <hr/> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "mail.holdup" }}</strong></p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.magiclink.dontknow" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "views.emails.holdup" }}</strong></p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.magiclink.dontknow" }}</p> diff --git a/views/emails/createEventMagicLink/createEventMagicLinkText.handlebars b/views/emails/createEventMagicLink/createEventMagicLinkText.handlebars index 6eedd4c..7f01539 100644 --- a/views/emails/createEventMagicLink/createEventMagicLinkText.handlebars +++ b/views/emails/createEventMagicLink/createEventMagicLinkText.handlebars @@ -1,10 +1,10 @@ -{{t "mail.magiclink.preface" }} +{{t "views.emails.magiclink.preface" }} -{{t "mail.magiclink.link" }} +{{t "views.emails.magiclink.link" }}  https://{{domain}}/new/{{token}} -{{t "mail.love" }} +{{t "views.emails.love" }}  {{siteName}} -{{t "mail.magiclink.dontknow" }} +{{t "views.emails.magiclink.dontknow" }} diff --git a/views/emails/deleteEvent/deleteEventHtml.handlebars b/views/emails/deleteEvent/deleteEventHtml.handlebars index 315f4ea..1298e9f 100644 --- a/views/emails/deleteEvent/deleteEventHtml.handlebars +++ b/views/emails/deleteEvent/deleteEventHtml.handlebars @@ -1,4 +1,4 @@ -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.deleteevent.preface" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.deleteevent.preface" }}</p>  <hr/> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "mail.holdup" }}</strong></p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.deleteevent.done" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "views.emails.holdup" }}</strong></p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.deleteevent.done" }}</p> diff --git a/views/emails/deleteEvent/deleteEventText.handlebars b/views/emails/deleteEvent/deleteEventText.handlebars index 592cb35..02ba7f6 100644 --- a/views/emails/deleteEvent/deleteEventText.handlebars +++ b/views/emails/deleteEvent/deleteEventText.handlebars @@ -1,3 +1,3 @@ -{{t "mail.deleteevent.preface" }} +{{t "views.emails.deleteevent.preface" }} -{{t "mail.deleteevent.done" }} +{{t "views.emails.deleteevent.done" }} diff --git a/views/emails/editEvent/editEventHtml.handlebars b/views/emails/editEvent/editEventHtml.handlebars index 2714aca..269edf2 100644 --- a/views/emails/editEvent/editEventHtml.handlebars +++ b/views/emails/editEvent/editEventHtml.handlebars @@ -1,8 +1,8 @@ -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.editevent.preface" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.editevent.preface" }}</p>  <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{{diffText}}}</p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.editevent.link" }}: <a href="https://{{domain}}/{{eventID}}">https://{{domain}}/{{eventID}}</a></p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.love" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.editevent.link" }}: <a href="https://{{domain}}/{{eventID}}">https://{{domain}}/{{eventID}}</a></p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.love" }}</p>  <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{siteName}}</p>  <hr/> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "mail.holdup" }}</strong></p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.editevent.dontknow" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "views.emails.holdup" }}</strong></p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.editevent.dontknow" }}</p> diff --git a/views/emails/editEvent/editEventText.handlebars b/views/emails/editEvent/editEventText.handlebars index 30f31e7..760d16d 100644 --- a/views/emails/editEvent/editEventText.handlebars +++ b/views/emails/editEvent/editEventText.handlebars @@ -1,9 +1,9 @@ -{{t "mail.editevent.preface" }} +{{t "views.emails.editevent.preface" }}  {{{diffText}}} -{{t "mail.editevent.link" }}: https://{{domain}}/{{eventID}} +{{t "views.emails.editevent.link" }}: https://{{domain}}/{{eventID}} -{{t "mail.love" }} +{{t "views.emails.love" }}  {{siteName}} -{{t "mail.editevent.dontknow" }} +{{t "views.emails.editevent.dontknow" }} diff --git a/views/emails/eventGroupUpdated/eventGroupUpdatedHtml.handlebars b/views/emails/eventGroupUpdated/eventGroupUpdatedHtml.handlebars index b639406..3cb255e 100644 --- a/views/emails/eventGroupUpdated/eventGroupUpdatedHtml.handlebars +++ b/views/emails/eventGroupUpdated/eventGroupUpdatedHtml.handlebars @@ -1,8 +1,8 @@ -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.eventgroupupdate.preface" }}</p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.eventgroupupdate.beforelink" }} <a href="https://{{domain}}/{{eventID}}">'{{eventName}}'</a>{{t "mail.eventgroupupdate.afterlink" }}.</p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.eventgroupupdate.grouplink" }}: <a href="https://{{domain}}/group/{{eventGroupID}}">https://{{domain}}/group/{{eventGroupID}}</a></p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.love" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.eventgroupupdate.preface" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.eventgroupupdate.beforelink" }} <a href="https://{{domain}}/{{eventID}}">'{{eventName}}'</a>{{t "views.emails.eventgroupupdate.afterlink" }}.</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.eventgroupupdate.grouplink" }}: <a href="https://{{domain}}/group/{{eventGroupID}}">https://{{domain}}/group/{{eventGroupID}}</a></p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.love" }}</p>  <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{siteName}}</p>  <hr/> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "mail.eventgroupupdate.holduphtml" }}</strong></p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.eventgroupupdate.dontknow" }} <a href="https://{{domain}}/unsubscribe/{{eventGroupID}}?email={{emailAddress}}">{{t "mail.eventgroupupdate.unsubscribe" }}</a>{{t "period" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "views.emails.eventgroupupdate.holduphtml" }}</strong></p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.eventgroupupdate.dontknow" }} <a href="https://{{domain}}/unsubscribe/{{eventGroupID}}?email={{emailAddress}}">{{t "views.emails.eventgroupupdate.unsubscribe" }}</a></p> diff --git a/views/emails/eventGroupUpdated/eventGroupUpdatedText.handlebars b/views/emails/eventGroupUpdated/eventGroupUpdatedText.handlebars index 7f23f3c..73e7c40 100644 --- a/views/emails/eventGroupUpdated/eventGroupUpdatedText.handlebars +++ b/views/emails/eventGroupUpdated/eventGroupUpdatedText.handlebars @@ -1,10 +1,10 @@ -{{t "mail.eventgroupupdate.preface" }} +{{t "views.emails.eventgroupupdate.preface" }} -{{t "mail.eventgroupupdate.link" }}: https://{{domain}}/{{eventID}} {{t "mail.eventgroupupdate.afterlink" }}. +{{t "views.emails.eventgroupupdate.link" }}: https://{{domain}}/{{eventID}} {{t "views.emails.eventgroupupdate.afterlink" }}. -{{t "mail.eventgroupupdate.grouplink" }}: https://{{domain}}/group/{{eventGroupID}} +{{t "views.emails.eventgroupupdate.grouplink" }}: https://{{domain}}/group/{{eventGroupID}} -{{t "mail.love" }} +{{t "views.emails.love" }}  {{siteName}} -{{t "mail.eventgroupupdate.dontknowhtml" }}: https://{{domain}}/unsubscribe/{{eventGroupID}}?email={{emailAddress}}{{t "period" }} +{{t "views.emails.eventgroupupdate.dontknowhtml" }}: https://{{domain}}/unsubscribe/{{eventGroupID}}?email={{emailAddress}} diff --git a/views/emails/removeEventAttendee/removeEventAttendeeHtml.handlebars b/views/emails/removeEventAttendee/removeEventAttendeeHtml.handlebars index 396f115..70765a1 100644 --- a/views/emails/removeEventAttendee/removeEventAttendeeHtml.handlebars +++ b/views/emails/removeEventAttendee/removeEventAttendeeHtml.handlebars @@ -1,4 +1,4 @@ -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.removeeventattendee.preface" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.removeeventattendee.preface" }}</p>  <hr/> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "mail.holdup" }}</strong></p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.removeeventattendee.dontknow" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "views.emails.holdup" }}</strong></p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.removeeventattendee.dontknow" }}</p> diff --git a/views/emails/removeEventAttendee/removeEventAttendeeText.handlebars b/views/emails/removeEventAttendee/removeEventAttendeeText.handlebars index 69d1553..70672d9 100644 --- a/views/emails/removeEventAttendee/removeEventAttendeeText.handlebars +++ b/views/emails/removeEventAttendee/removeEventAttendeeText.handlebars @@ -1,3 +1,3 @@ -{{t "mail.remoeeventattendee.preface"} }} +{{t "views.emails.remoeeventattendee.preface"} }} -{{t "mail.removeeventattendee.dontknow" }}
\ No newline at end of file +{{t "views.emails.removeeventattendee.dontknow" }}
\ No newline at end of file diff --git a/views/emails/subscribed/subscribedHtml.handlebars b/views/emails/subscribed/subscribedHtml.handlebars index 3cbbe8f..343b304 100644 --- a/views/emails/subscribed/subscribedHtml.handlebars +++ b/views/emails/subscribed/subscribedHtml.handlebars @@ -1,8 +1,8 @@ -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.subscribed.preface" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.subscribed.preface" }}</p>  <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: -0; Margin-bottom: 15px;">{{t "mail.subscribed.desc" }}</p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.love" }}</p> +0; Margin-bottom: 15px;">{{t "views.emails.subscribed.desc" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.love" }}</p>  <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{siteName}}</p>  <hr/> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "mail.eventgroupupdate.holduphtml" }}</strong></p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.eventgroupupdate.dontknow" }} <a href="https://{{domain}}/unsubscribe/{{eventGroupID}}?email={{emailAddress}}">{{t "mail.eventgroupupdate.unsubscribe" }}</a>{{t "period" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "views.emails.eventgroupupdate.holduphtml" }}</strong></p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.eventgroupupdate.dontknow" }} <a href="https://{{domain}}/unsubscribe/{{eventGroupID}}?email={{emailAddress}}">{{t "views.emails.eventgroupupdate.unsubscribe" }}</a></p> diff --git a/views/emails/subscribed/subscribedText.handlebars b/views/emails/subscribed/subscribedText.handlebars index eb9d8a6..d9970b2 100644 --- a/views/emails/subscribed/subscribedText.handlebars +++ b/views/emails/subscribed/subscribedText.handlebars @@ -1,7 +1,7 @@ -{{t "mail.subscribed.preface", {eventGroupName: {{eventGroupName}}} }} -{{t "mail.subscribed.desc" }} +{{t "views.emails.subscribed.preface", {eventGroupName: {{eventGroupName}}} }} +{{t "views.emails.subscribed.desc" }} -{{t "mail.love" }} +{{t "views.emails.love" }}  {{siteName}} -{{t "mail.eventgroupupdate.dontknowhtml" }}: https://{{domain}}/unsubscribe/{{eventGroupID}}?email={{emailAddress}}{{t "period" }} +{{t "views.emails.eventgroupupdate.dontknowhtml" }}: https://{{domain}}/unsubscribe/{{eventGroupID}}?email={{emailAddress}} diff --git a/views/emails/unattendEvent/unattendEventHtml.handlebars b/views/emails/unattendEvent/unattendEventHtml.handlebars index f4b9dbe..5f59ea8 100644 --- a/views/emails/unattendEvent/unattendEventHtml.handlebars +++ b/views/emails/unattendEvent/unattendEventHtml.handlebars @@ -1,8 +1,8 @@ -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.unattendevent.preface" }}</p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.unattendevent.desc" }}</p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.addeventattendee.eventlink" }}: <a href="https://{{domain}}/{{eventID}}">https://{{domain}}/{{eventID}}</a></p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.love" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.unattendevent.preface" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.unattendevent.desc" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.addeventattendee.eventlink" }}: <a href="https://{{domain}}/{{eventID}}">https://{{domain}}/{{eventID}}</a></p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.love" }}</p>  <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{siteName}}</p>  <hr/> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "mail.holdup" }}</strong></p> -<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "mail.unattendevent.dontknow" }}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><strong>{{t "views.emails.holdup" }}</strong></p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.unattendevent.dontknow" }}</p> diff --git a/views/emails/unattendEvent/unattendEventText.handlebars b/views/emails/unattendEvent/unattendEventText.handlebars index e582951..f936d54 100644 --- a/views/emails/unattendEvent/unattendEventText.handlebars +++ b/views/emails/unattendEvent/unattendEventText.handlebars @@ -1,10 +1,10 @@ -{{t "mail.unattendevent.preface" }} +{{t "views.emails.unattendevent.preface" }} -{{t "mail.unattendevent.desc" }} +{{t "views.emails.unattendevent.desc" }} -{{t "mail.addeventattendee.eventlink" }}: https://{{domain}}/{{eventID}} +{{t "views.emails.addeventattendee.eventlink" }}: https://{{domain}}/{{eventID}} -{{t "mail.love" }} +{{t "views.emails.love" }}  {{siteName}} -{{t "mail.unattendevent.dontknow" }} +{{t "views.emails.unattendevent.dontknow" }} diff --git a/views/event.handlebars b/views/event.handlebars index 426e5df..85e7f40 100755 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -11,7 +11,7 @@    </div>    <div class="col-lg-3 ml-2 edit-buttons">      {{#if editingEnabled}} -      <button type="button" id="editEvent" class="button button--primary ml-auto d-block" {{#if eventHasConcluded}}disabled{{/if}} data-event-id="{{eventData.id}}" data-toggle="modal" data-target="#editModal"><i class="fas fa-edit"></i> {{t "event.edit" }}</button> +      <button type="button" id="editEvent" class="button button--primary ml-auto d-block" {{#if eventHasConcluded}}disabled{{/if}} data-event-id="{{eventData.id}}" data-toggle="modal" data-target="#editModal"><i class="fas fa-edit"></i> {{t "views.event.edit" }}</button>      {{/if}}    </div>  </div> @@ -39,7 +39,7 @@            <time class="dt-end" datetime="{{eventEndISO}}"></time>            <br>            <span class="text-muted"> -            {{#if eventHasBegun}}{{#unless eventHasConcluded}}{{t "event.started"}} {{else}}{{t "event.ended"}} {{/unless}}{{/if}}{{fromNow}} +            {{#if eventHasBegun}}{{#unless eventHasConcluded}}{{t "views.event.started"}} {{else}}{{t "views.event.ended"}} {{/unless}}{{/if}}{{fromNow}}            </span>          </li>          {{#if eventHasHost}} @@ -47,7 +47,7 @@              <span class="fa-li">                <i class="fas fa-fw fa-user-circle"></i>              </span> -            <span class="text-muted">{{{t "event.hostedby" }}} +            <span class="text-muted">{{{t "views.event.hostedby" }}}            </li>          {{/if}}          {{#if eventData.eventGroup}} @@ -55,7 +55,7 @@              <span class="fa-li">                <i class="fas fa-fw fa-calendar-alt"></i>              </span> -            <span class="text-muted">{{{t "event.partof" }}}</span> +            <span class="text-muted">{{{t "views.event.partof" }}}</span>            </li>          {{/if}}          {{#if eventData.url}} @@ -74,7 +74,7 @@            </span>            <a class="u-url" href="https://{{domain}}/{{eventData.id}}">https://{{domain}}/{{eventData.id}}</a>            <button type="button" id="copyEventLink" class="eventInformationAction button button--outline-secondary button--sm" data-clipboard-text="https://{{domain}}/{{eventData.id}}"> -            <i class="fas fa-copy"></i> {{t "copy" }} +            <i class="fas fa-copy"></i> {{t "common.copy" }}            </button>          </li>          {{#if isFederated}} @@ -84,7 +84,7 @@            </span>            @{{eventData.id}}@{{domain}}            <button type="button" id="copyAPLink" class="eventInformationAction button button--outline-secondary button--sm" data-clipboard-text="@{{eventData.id}}@{{domain}}"> -            <i class="fas fa-copy"></i> {{t "copy" }} +            <i class="fas fa-copy"></i> {{t "common.copy" }}            </button>          </li>          {{/if}} @@ -94,16 +94,16 @@    <aside id="event__actions">      <div class="button-stack" role="group" aria-label="Event actions">        <a href="http://www.google.com/calendar/event?action=TEMPLATE&dates={{parsedStart}}%2F{{parsedEnd}}&text={{escapedName}}&location={{parsedLocation}}&ctz={{timezone}}" class="button button--outline-secondary button--sm"> -        <i class="far fa-calendar-plus"></i> {{t "event.addtoGC" }} +        <i class="far fa-calendar-plus"></i> {{t "views.event.addtoGC" }}        </a>        <button type="button" id="exportICS" class="button button--outline-secondary button--sm" data-event-id="{{eventData.id}}"> -        <i class="fas fa-download"></i> {{t "event.ICSexport" }} +        <i class="fas fa-download"></i> {{t "views.event.ICSexport" }}        </button>        <a target="_blank" href="http://maps.google.com/?q={{parsedLocation}}" class="button button--outline-secondary button--sm"> -        <i class="fas fa-map-marked"></i> {{t "event.showonGM" }} +        <i class="fas fa-map-marked"></i> {{t "views.event.showonGM" }}        </a>        <a target="_blank" href="https://www.openstreetmap.org/search?query={{parsedLocation}}" class="button button--outline-secondary button--sm"> -        <i class="fas fa-map-marked"></i> {{t "event.showonOM" }} +        <i class="fas fa-map-marked"></i> {{t "views.event.showonOM" }}        </a>      </div> @@ -115,20 +115,20 @@  {{#if eventHasConcluded}}  <div class="alert alert-warning mb-4" role="alert"> -{{t "event.concludeddel" }}</div> +{{t "views.event.concludeddel" }}</div>  {{/if}}  {{#if firstLoad}}  <div class="alert alert-success alert-dismissible fade show" role="alert">    <button type="button" class="close" data-dismiss="alert" aria-label="Close">      <span aria-hidden="true">×</span>    </button> -  <p>{{t "event.welcome" }}</p> -  <p>{{{t "event.attention" }}}</p> -  <p>{{{t "event.share" }}}</p> +  <p>{{t "views.event.welcome" }}</p> +  <p>{{{t "views.event.attention" }}}</p> +  <p>{{{t "views.event.share" }}}</p>  </div>  {{/if}}  <div class="card mb-4" id="eventDescription"> -  <h5 class="card-header">{{t "event.about" }}</h5> +  <h5 class="card-header">{{t "views.event.about" }}</h5>    <div class="card-body p-summary">      {{{parsedDescription}}}    </div> @@ -136,40 +136,40 @@  {{#if eventData.usersCanAttend}}  <div class="card mb-4" id="eventAttendees"> -  <h5 class="card-header">{{t "event.attendees" }} {{#if numberOfAttendees}}{{t "event.numberofattende" }}{{/if}} +  <h5 class="card-header">{{t "views.event.attendees" }} {{#if numberOfAttendees}}{{t "views.event.numberofattende" }}{{/if}}      <div class="button--group" role="group" aria-label="Attendance controls">        {{#unless noMoreSpots}} -        <button type="button" id="attendEvent" class="button button--primary" data-event-id="{{eventData.id}}"><i class="fas fa-user-plus"></i> {{t "event.addme" }}</button> +        <button type="button" id="attendEvent" class="button button--primary" data-event-id="{{eventData.id}}"><i class="fas fa-user-plus"></i> {{t "views.event.addme" }}</button>        {{/unless}} -      <button type="button" id="unattendEvent" class="button button--secondary" data-toggle="modal" data-target="#unattendModal"><i class="fas fa-user-times"></i> {{t "event.removeme" }}</button> +      <button type="button" id="unattendEvent" class="button button--secondary" data-toggle="modal" data-target="#unattendModal"><i class="fas fa-user-times"></i> {{t "views.event.removeme" }}</button>      </div>    </h5>    <div class="card-body text-center">      {{#if eventData.maxAttendees}}        {{#if noMoreSpots}} -        <div class="alert alert-warning text-center" id="attendees-alert">{{t "event.capacity" }}</div> +        <div class="alert alert-warning text-center" id="attendees-alert">{{t "views.event.capacity" }}</div>        {{else}} -        <div class="alert alert-warning text-center" id="attendees-alert">{{plural "event.remaining" spotsRemaining }}</div> +        <div class="alert alert-warning text-center" id="attendees-alert">{{plural "views.event.remaining" spotsRemaining }}</div>        {{/if}}      {{/if}}      {{#if numberOfAttendees}}        <ul class="attendeesList">          {{#each visibleAttendees}} -          <li{{#if ../editingEnabled}} data-attendee-name="{{this.name}}" data-attendee-id="{{this._id}}"{{/if}}><span class="attendee-name">{{this.name}}</span>{{#if ../editingEnabled}} <a href="#" class="remove-attendee" data-toggle="modal" data-target="#removeAttendeeModal" title="{{t "event.removeuser" }}"><i class="fas fa-user-times"></i></a>{{/if}}</li> +          <li{{#if ../editingEnabled}} data-attendee-name="{{this.name}}" data-attendee-id="{{this._id}}"{{/if}}><span class="attendee-name">{{this.name}}</span>{{#if ../editingEnabled}} <a href="#" class="remove-attendee" data-toggle="modal" data-target="#removeAttendeeModal" title="{{t "views.event.removeuser" }}"><i class="fas fa-user-times"></i></a>{{/if}}</li>          {{/each}}          {{#if editingEnabled}}            {{#each hiddenAttendees}} -            <li{{#if ../editingEnabled}} data-attendee-name="{{this.name}}" data-attendee-id="{{this._id}}"{{/if}} class="hidden-attendee"><span class="attendee-name">{{this.name}} {{t "event.hidden" }}</span>{{#if ../editingEnabled}} <a href="#" class="remove-attendee" data-toggle="modal" data-target="#removeAttendeeModal" title="{{t "event.removeuser" }}"><i class="fas fa-user-times"></i></a>{{/if}}</li> +            <li{{#if ../editingEnabled}} data-attendee-name="{{this.name}}" data-attendee-id="{{this._id}}"{{/if}} class="hidden-attendee"><span class="attendee-name">{{this.name}} {{t "views.event.hidden" }}</span>{{#if ../editingEnabled}} <a href="#" class="remove-attendee" data-toggle="modal" data-target="#removeAttendeeModal" title="{{t "views.event.removeuser" }}"><i class="fas fa-user-times"></i></a>{{/if}}</li>            {{/each}}          {{/if}}        </ul>        {{#unless editingEnabled}}          {{#if numberOfHiddenAttendees}} -          <div class="hidden-attendees-message">{{plural "event.hiddenattendee" numberOfHiddenAttendees }}</div> +          <div class="hidden-attendees-message">{{plural "views.event.hiddenattendee" numberOfHiddenAttendees }}</div>          {{/if}}        {{/unless}}      {{else}} -      <p class="text-center text-muted mb-0">{{t "event.noattendees" }}</p> +      <p class="text-center text-muted mb-0">{{t "views.event.noattendees" }}</p>      {{/if}}    </div>  </div> @@ -178,7 +178,7 @@    <div class="modal-dialog" role="document">      <div class="modal-content">        <div class="modal-header"> -        <h5 class="modal-title" id="attendModalLabel">{{t "event.addself" }}</h5> +        <h5 class="modal-title" id="attendModalLabel">{{t "views.event.addself" }}</h5>          <button type="button" class="close" data-dismiss="modal" aria-label="Close">            <span aria-hidden="true">×</span>          </button> @@ -186,41 +186,41 @@        <form id="attendEventForm" action="/attendevent/{{eventData.id}}" method="post">      <div class="modal-body">        <div class="form-group"> -        <label for="attendeeName">{{t "event.attendeename" }}</label> +        <label for="attendeeName">{{t "views.event.attendeename" }}</label>          <div class="form-group"> -          <input type="text" class="form-control" id="attendeeName" name="attendeeName" placeholder="{{t "event.attendeenamedesc" }}" data-validation="required length" data-validation-length="1-30"> +          <input type="text" class="form-control" id="attendeeName" name="attendeeName" placeholder="{{t "views.event.attendeenamedesc" }}" data-validation="required length" data-validation-length="1-30">          </div>        </div>        <div class="form-group"> -        <label for="attendeeName">{{t "event.attendeenum" }}</label> +        <label for="attendeeName">{{t "views.event.attendeenum" }}</label>          <div class="form-group">            <input type="number" class="form-control" id="attendeeNumber" name="attendeeNumber" value="1" data-validation="required number" >          </div>        </div>        <div class="form-group"> -        <label for="attendeeEmail">{{t "event.attendeeemail" }}</label> -        <p class="form-text small">{{t "joinemaildesc" }}</p> +        <label for="attendeeEmail">{{t "views.event.attendeeemail" }}</label> +        <p class="form-text small">{{t "views.event.joinemaildesc" }}</p>          <div class="form-group"> -          <input type="email" class="form-control" id="attendeeEmail" name="attendeeEmail" placeholder="{{t "event.nospam" }}" data-validation="email" data-validation-optional="true"> +          <input type="email" class="form-control" id="attendeeEmail" name="attendeeEmail" placeholder="{{t "views.event.nospam" }}" data-validation="email" data-validation-optional="true">          </div>        </div>        <div class="form-check">          <input class="form-check-input" type="checkbox" id="attendeeVisible" name="attendeeVisible" checked>          <label class="form-check-label" for="attendeeVisible"> -          {{t "event.attendeevisible" }} +          {{t "views.event.attendeevisible" }}          </label> -        <p class="form-text small">{{t "event.attendeevisibledesc" }}</p> +        <p class="form-text small">{{t "views.event.attendeevisibledesc" }}</p>        </div>        <div class="form-group"> -        <label for="removalPassword">{{t "event.removepswd" }}</label> -        <p class="form-text small">{{{t "event.removepswddesc" }}}</p> +        <label for="removalPassword">{{t "views.event.removepswd" }}</label> +        <p class="form-text small">{{{t "views.event.removepswddesc" }}}</p>          <input type="text" class="form-control" readonly id="removalPassword"          name="removalPassword">        </div>      </div>        <div class="modal-footer"> -        <button type="button" class="button button--secondary" data-dismiss="modal">{{t "close" }}</button> -        <button type="submit" class="button button--primary">{{t "event.addmyself" }}</button> +        <button type="button" class="button button--secondary" data-dismiss="modal">{{t "common.close" }}</button> +        <button type="submit" class="button button--primary">{{t "views.event.addmyself" }}</button>        </div>        </form>      </div> @@ -231,7 +231,7 @@    <div class="modal-dialog" role="document">      <div class="modal-content">        <div class="modal-header"> -        <h5 class="modal-title" id="unattendModalLabel">{{{t "event.removemyselfdesc" }}}</h5> +        <h5 class="modal-title" id="unattendModalLabel">{{{t "views.event.removemyselfdesc" }}}</h5>          <button type="button" class="close" data-dismiss="modal" aria-label="Close">            <span aria-hidden="true">×</span>          </button> @@ -239,15 +239,15 @@        <form id="unattendEventForm" x-on:submit.prevent="fetch(`/event/attendee/{{eventData.id}}?${new URLSearchParams({ p: password }).toString()}`, { method: 'DELETE' }).then(response => response.ok ? window.location.reload() : response.json()).then(data => message = data)">        <div class="modal-body">          <div class="form-group"> -          <label for="removalPassword" class="form-label">{{t "event.removepswd" }}</label> -          <p class="form-text small">{{t "event.lostpswd" }}</p> +          <label for="removalPassword" class="form-label">{{t "views.event.removepswd" }}</label> +          <p class="form-text small">{{t "views.event.lostpswd" }}</p>            <div x-bind:class="{ 'alert-danger': message?.error, 'alert-success': message?.success }" class="alert" x-text="message?.error || message?.success" x-show="message?.error || message?.success"></div>            <input type="password" class="form-control" id="removalPassword" name="removalPassword" x-model="password" required>          </div>        </div>        <div class="modal-footer"> -        <button type="button" class="button button--secondary" data-dismiss="modal">{{t "close" }}</button> -        <button type="submit" class="button button--primary">{{t "event.removemyself" }}</button> +        <button type="button" class="button button--secondary" data-dismiss="modal">{{t "common.close" }}</button> +        <button type="submit" class="button button--primary">{{t "views.event.removemyself" }}</button>        </div>        </form>      </div> @@ -259,18 +259,18 @@      <div class="modal-dialog" role="document">        <div class="modal-content">          <div class="modal-header"> -          <h5 class="modal-title" id="removeAttendeeModalLabel">{{{t "event.removeattendeedesc" }}}</h5> +          <h5 class="modal-title" id="removeAttendeeModalLabel">{{{t "views.event.removeattendeedesc" }}}</h5>            <button type="button" class="close" data-dismiss="modal" aria-label="Close">              <span aria-hidden="true">×</span>            </button>          </div>        <form id="removeAttendeeForm" action="/removeattendee/{{eventData.id}}/" method="post">        <div class="modal-body"> -        <p>{{t "event.confremoveattendee" }}</p> +        <p>{{t "views.event.confremoveattendee" }}</p>            </div>          <div class="modal-footer"> -          <button type="button" class="button button--secondary" data-dismiss="modal">{{t "close" }}</button> -          <button type="submit" class="button button--danger">{{t "event.removeAttendee" }}</button> +          <button type="button" class="button button--secondary" data-dismiss="modal">{{t "common.close" }}</button> +          <button type="submit" class="button button--danger">{{t "views.event.removeAttendee" }}</button>          </div>          </form>        </div> @@ -282,19 +282,19 @@  {{#if eventData.usersCanComment}}  <div class="card mb-4" id="eventComments"> -  <h5 class="card-header">{{t "event.discussion" }}</h5> +  <h5 class="card-header">{{t "views.event.discussion" }}</h5>    <div class="card-body">      <form id="commentForm" action="/post/comment/{{eventData.id}}/" method="post"> -      <label for="commentAuthor">{{t "event.commentauthor" }}</label> +      <label for="commentAuthor">{{t "views.event.commentauthor" }}</label>        <div class="form-group"> -        <input type="text" class="form-control" id="commentAuthor" name="commentAuthor" placeholder="{{t "event.commentauthorph" }}" required> +        <input type="text" class="form-control" id="commentAuthor" name="commentAuthor" placeholder="{{t "views.event.commentauthorph" }}" required>        </div> -      <label for="commentContent">{{t "event.comment" }}</label> +      <label for="commentContent">{{t "views.event.comment" }}</label>        <div class="form-group">          <div class="d-flex flex-gap"> -          <textarea class="form-control" id="commentContent" name="commentContent" style="resize: none;" placeholder="{{t "event.commentcontent" }}" required></textarea> +          <textarea class="form-control" id="commentContent" name="commentContent" style="resize: none;" placeholder="{{t "views.event.commentcontent" }}" required></textarea>            <div class="input-group-append"> -            <button type="submit" class="button button--primary" id="postComment">{{t "event.postbutton" }} <i class="fas fa-chevron-right"></i></button> +            <button type="submit" class="button button--primary" id="postComment">{{t "views.event.postbutton" }} <i class="fas fa-chevron-right"></i></button>            </div>          </div>        </div> @@ -324,12 +324,12 @@              </div>              <div class="col-lg-3 commentMetadata text-right">                <button type="button" class="button button--outline button--sm openReplyBox"> -                <i class="fas fa-comment"></i> {{t "event.reply" }} +                <i class="fas fa-comment"></i> {{t "views.event.reply" }}                </button>                {{#if ../editingEnabled}}                  <form class="d-inline" action="/deletecomment/{{../eventData.id}}/{{this._id}}/{{../eventData.editToken}}" method="post">                    <button type="submit" class="button button--outline button--sm deleteComment"> -                    <i class="fas fa-trash"></i> {{t "del" }} +                    <i class="fas fa-trash"></i> {{t "views.del" }}                    </button>                  </form>                {{/if}} @@ -339,14 +339,14 @@              <div class="col-md">                <form id="replyForm" action="/post/reply/{{../eventData.id}}/{{this._id}}" method="post">                  <div class="form-group"> -                  <input type="text" class="form-control form-control-sm" id="replyAuthor" name="replyAuthor" placeholder="Y{{t "event.attendeename" }}" required> +                  <input type="text" class="form-control form-control-sm" id="replyAuthor" name="replyAuthor" placeholder="Y{{t "views.event.attendeename" }}" required>                  </div>                  <div class="form-group">                    <div class="d-flex flex-gap"> -                    <textarea class="form-control form-control-sm" id="replyContent" name="replyContent" style="resize: none;" placeholder="{{t "event.replycontent" }}" required></textarea> +                    <textarea class="form-control form-control-sm" id="replyContent" name="replyContent" style="resize: none;" placeholder="{{t "views.event.replycontent" }}" required></textarea>                      <div class="input-group-append">                      </div> -                      <button type="submit" class="button button--primary button--sm" id="postReply">{{t "reply" }} <i class="fas fa-chevron-right"></i></button> +                      <button type="submit" class="button button--primary button--sm" id="postReply">{{t "views.event.reply" }} <i class="fas fa-chevron-right"></i></button>                    </div>                  </div>                </form> @@ -364,7 +364,7 @@    <div class="modal-dialog" role="document">      <div class="modal-content">        <div class="modal-header"> -        <h5 class="modal-title" id="editTokenModalLabel">{{t "edittoken" }}</h5> +        <h5 class="modal-title" id="editTokenModalLabel">{{t "views.edittaken" }}</h5>          <button type="button" class="close" data-dismiss="modal" aria-label="Close">            <span aria-hidden="true">×</span>          </button> @@ -372,9 +372,9 @@        <form id="verifyTokenForm" action="/verifytoken/event/{{eventData.id}}" method="post">        <div class="modal-body">          <div class="form-group"> -          <p class="form-text small">{{t "edittokendesc" }}</p> +          <p class="form-text small">{{t "views.edittokendesc" }}</p>            <div class="form-group"> -            <input type="text" class="form-control" id="editToken" name="editToken" placeholder="{{t "right" }}" data-validation="required"> +            <input type="text" class="form-control" id="editToken" name="editToken" placeholder="{{t "views.right" }}" data-validation="required">            </div>            <div class="form-group">                <div class="alert alert-danger" style="display:none;"></div> @@ -382,8 +382,8 @@          </div>        </div>        <div class="modal-footer"> -        <button type="button" class="button button--secondary" data-dismiss="modal">{{t "close" }}</button> -        <button type="submit" class="button button--primary">{{t "event.edit" }}</button> +        <button type="button" class="button button--secondary" data-dismiss="modal">{{t "common.close" }}</button> +        <button type="submit" class="button button--primary">{{t "views.event.edit" }}</button>        </div>        </form>      </div> @@ -406,11 +406,11 @@        </div>        <form id="deleteEventForm" action="/deleteevent/{{eventData.id}}/{{eventData.editToken}}" method="post">        <div class="modal-body"> -        <p>{{t "event.delconfirm" }}</p> +        <p>{{t "views.event.delconfirm" }}</p>        </div>        <div class="modal-footer"> -        <button type="button" class="button button--secondary" data-dismiss="modal">{{t "close" }}</button> -        <button type="submit" class="button button--danger">{{t "event.del" }}</button> +        <button type="button" class="button button--secondary" data-dismiss="modal">{{t "common.close" }}</button> +        <button type="submit" class="button button--danger">{{t "views.event.del" }}</button>        </div>        </form>      </div> @@ -530,13 +530,13 @@ window.eventData = {{{ json jsonData }}};        })      })      $("#copyEventLink").click(function(){ -      $(this).html('<i class="fas fa-copy"></i> {{t "copied" }}'); -      setTimeout(function(){ $("#copyEventLink").html('<i class="fas fa-copy"></i> {{t "copy" }}');}, 5000); +      $(this).html('<i class="fas fa-copy"></i> {{t "common.copied" }}'); +      setTimeout(function(){ $("#copyEventLink").html('<i class="fas fa-copy"></i> {{t "common.copy" }}');}, 5000);      })      new ClipboardJS('#copyAPLink');      $("#copyAPLink").click(function(){ -      $(this).html('<i class="fas fa-copy"></i> {{t "copied" }}'); -      setTimeout(function(){ $("#copyAPLink").html('<i class="fas fa-copy"></i> {{t "copy" }}');}, 5000); +      $(this).html('<i class="fas fa-copy"></i> {{t "common.copied" }}'); +      setTimeout(function(){ $("#copyAPLink").html('<i class="fas fa-copy"></i> {{t "common.copy" }}');}, 5000);      })      if ($("#joinCheckbox").is(':checked')){        $("#maxAttendeesCheckboxContainer").css("display","flex"); @@ -552,7 +552,7 @@ window.eventData = {{{ json jsonData }}};            if (response.data.freeSpots !== undefined) {              modal.find('#attendeeNumber')                .attr('data-validation-allowing', `range[1;${response.data.freeSpots}]`) -              .attr('data-validation-error-msg', `{{t "event.numlimit" }}`); +              .attr('data-validation-error-msg', `{{t "views.event.views.event.numlimit" }}`);            }            modal.modal();          }) @@ -577,7 +577,7 @@ window.eventData = {{{ json jsonData }}};                  }              },              error: function(response, status, xhr) { -               form.find('.alert').text('{{t "incorrectpwd" }}').show(); +               form.find('.alert').text('{{t "views.incorrectpswd" }}').show();              }          });        }); diff --git a/views/eventgroup.handlebars b/views/eventgroup.handlebars index ba58e23..43abd77 100755 --- a/views/eventgroup.handlebars +++ b/views/eventgroup.handlebars @@ -10,7 +10,7 @@    </div>    <div class="col-lg-2 ml-2 edit-buttons">      {{#if editingEnabled}} -      <button type="button" id="editGroup" class="button button--primary text-nowrap ml-auto d-block" data-event-id="{{eventGroupData.id}}" data-toggle="modal" data-target="#editModal"><i class="fas fa-edit"></i> {{t "group.edit" }}</button> +      <button type="button" id="editGroup" class="button button--primary text-nowrap ml-auto d-block" data-event-id="{{eventGroupData.id}}" data-toggle="modal" data-target="#editModal"><i class="fas fa-edit"></i> {{t "views.eventgroup.edit" }}</button>      {{/if}}    </div>  </div> @@ -20,7 +20,7 @@    <button type="button" class="close" data-dismiss="alert" aria-label="Close">      <span aria-hidden="true">×</span>    </button> -  {{{t "group.welcome" }}} +  {{{t "views.eventgroup.welcome" }}}  </div>  {{/if}}  <div id="event__basics"> @@ -32,7 +32,7 @@              <span class="fa-li">                <i class="fas fa-fw fa-user-circle"></i>              </span> -            <span class="text-muted">{{{t "group.hostedby" }}} +            <span class="text-muted">{{{t "views.eventgroup.hostedby" }}}            </li>          {{/if}}          {{#if eventGroupData.url}} @@ -51,7 +51,7 @@            </span>            <a href="https://{{domain}}/group/{{eventGroupData.id}}">https://{{domain}}/group/{{eventGroupData.id}}</a>            <button type="button" id="copyEventLink" class="eventInformationAction button button--outline-secondary button--sm" data-clipboard-text="https://{{domain}}/group/{{eventGroupData.id}}"> -            <i class="fas fa-copy"></i> {{t "copy" }} +            <i class="fas fa-copy"></i> {{t "common.copy" }}            </button>          </li>          <li> @@ -63,9 +63,9 @@            <button type="button" id="copyFeedLink"              class="eventInformationAction button button--outline-secondary button--sm"              data-clipboard-text="https://{{domain}}/group/{{eventGroupData.id}}/feed.ics"> -            <i class="fas fa-copy"></i> {{t "copy" }} +            <i class="fas fa-copy"></i> {{t "common.copy" }}            </button> -          <p class="text-muted small">{{t "group.feedlinkdesc" }}</p> +          <p class="text-muted small">{{t "views.eventgroup.feedlinkdesc" }}</p>          </li>        </ul>      </div> <!-- /card --> @@ -75,31 +75,31 @@        <button type="button" class="button button--outline-secondary button--sm"          data-event-id="{{eventGroupData.id}}" data-toggle="modal"          data-target="#subscribeModal"> -        <i class="fas fa-envelope"></i> {{t "group.subscribetitle" }} +        <i class="fas fa-envelope"></i> {{t "views.eventgroup.subscribetitle" }}        </button>        <button type="button" id="exportICS" class="button button--outline-secondary          button--sm" data-event-id="{{eventGroupData.id}}"> -        <i class="fas fa-download"></i> {{t "group.ICSexport" }} +        <i class="fas fa-download"></i> {{t "views.eventgroup.ICSexport" }}        </button>      </div>      {{#unless editingEnabled}} -        <button type="button" id="editGroup" class="button button--outline-secondary button--sm" data-event-id="{{eventGroupData.id}}" data-toggle="modal" data-target="#editTokenModal"><i class="fas fa-edit"></i> {{t "group.editmode" }}</button> +        <button type="button" id="editGroup" class="button button--outline-secondary button--sm" data-event-id="{{eventGroupData.id}}" data-toggle="modal" data-target="#editTokenModal"><i class="fas fa-edit"></i> {{t "views.eventgroup.editmode" }}</button>      {{/unless}}    </aside>  </div>  {{#if editingEnabled}}    <div class="alert alert-info mb-4"> -    <p>{{t "group.addevent" }}</p> +    <p>{{t "views.eventgroup.addevent" }}</p>      <div class="table-responsive">        <table style="width:100%">          <tr style="border-bottom:1px solid rgba(0,0,0,0.2)"> -          <td><strong>{{t "group.p.eventgroupid" }}</strong></td> +          <td><strong>{{t "common.eventgroupid" }}</strong></td>            <td><span class="code" id="eventGroupID">{{eventGroupData.id}}</span></td>          </tr>          <tr> -          <td><strong>{{t "group.editpswd" }}</strong></td> +          <td><strong>{{t "views.eventgroup.editpswd" }}</strong></td>            <td><span class="code" id="eventGroupEditToken">{{eventGroupData.editToken}}</span></td>          </tr>        </table> @@ -109,19 +109,19 @@  {{/if}}      <div class="card mb-4" id="eventDescription"> -        <h5 class="card-header">{{t "group.about" }}</h5> +        <h5 class="card-header">{{t "views.eventgroup.about" }}</h5>          <div class="card-body">              {{{parsedDescription}}}          </div>      </div>      <div class="card mt-4 mb-4" id="upcomingEvents"> -        <h5 class="card-header">{{t "upcomingevents" }}</h5> +        <h5 class="card-header">{{t "views.eventgroup.upcomingevents" }}</h5>          {{> eventList upcomingEvents}}      </div>      <div class="card mt-4 mb-4" id="pastEvents"> -        <h5 class="card-header">{{t "pastevents" }}</h5> +        <h5 class="card-header">{{t "views.eventgroup.pastevents" }}</h5>          {{> eventList pastEvents}}      </div>  </div> @@ -140,12 +140,12 @@        </div>        <form id="deleteEventGroupForm" action="/deleteeventgroup/{{eventGroupData.id}}/{{eventGroupData.editToken}}" method="post">        <div class="modal-body"> -        <p>{{t "group.delconfirm" }}</p> -        <p>{{{t "group.deldesc" }}}</p> +        <p>{{t "views.eventgroup.delconfirm" }}</p> +        <p>{{{t "views.eventgroup.deldesc" }}}</p>        </div>        <div class="modal-footer"> -        <button type="button" class="button button--secondary" data-dismiss="modal">{{t "close" }}</button> -        <button type="submit" class="button button--danger">{{t "group.del" }}</button> +        <button type="button" class="button button--secondary" data-dismiss="modal">{{t "common.close" }}</button> +        <button type="submit" class="button button--danger">{{t "views.eventgroup.del" }}</button>        </div>        </form>      </div> @@ -159,7 +159,7 @@    <div class="modal-dialog" role="document">      <div class="modal-content">        <div class="modal-header"> -        <h5 class="modal-title" id="subscribeModalLabel">{{t "group.subscribe" }}</h5> +        <h5 class="modal-title" id="subscribeModalLabel">{{t "views.eventgroup.subscribe" }}</h5>          <button type="button" class="close" data-dismiss="modal" aria-label="Close">            <span aria-hidden="true">×</span>          </button> @@ -167,7 +167,7 @@        <form id="subscribeForm" action="/subscribe/{{eventGroupData.id}}" method="post">        <div class="modal-body">          <div class="form-group"> -          <p class="form-text small">{{t "group.subscribedesc" }}</p> +          <p class="form-text small">{{t "views.eventgroup.subscribedesc" }}</p>          </div>          <div class="form-group">            <input type="email" class="form-control" id="emailAddress" @@ -175,8 +175,8 @@          </div>        </div>        <div class="modal-footer"> -        <button type="button" class="button button--secondary" data-dismiss="modal">{{t "close" }}</button> -        <button type="submit" class="button button--primary">{{t "group.subscribebutton" }}</button> +        <button type="button" class="button button--secondary" data-dismiss="modal">{{t "common.close" }}</button> +        <button type="submit" class="button button--primary">{{t "views.eventgroup.subscribebutton" }}</button>        </div>        </form>      </div> @@ -187,7 +187,7 @@    <div class="modal-dialog" role="document">      <div class="modal-content">        <div class="modal-header"> -        <h5 class="modal-title" id="editTokenModalLabel">{{t "edittoken" }}</h5> +        <h5 class="modal-title" id="editTokenModalLabel">{{t "views.edittaken" }}</h5>          <button type="button" class="close" data-dismiss="modal" aria-label="Close">            <span aria-hidden="true">×</span>          </button> @@ -195,9 +195,9 @@        <form id="verifyTokenForm" action="/verifytoken/group/{{eventGroupData.id}}" method="post">        <div class="modal-body">          <div class="form-group"> -          <p class="form-text small">{{t "edittokendesc" }}</p> +          <p class="form-text small">{{t "views.edittokendesc" }}</p>            <div class="form-group"> -            <input type="text" class="form-control" id="editToken" name="editToken" placeholder="{{t "right" }}" data-validation="required"> +            <input type="text" class="form-control" id="editToken" name="editToken" placeholder="{{t "views.right" }}" data-validation="required">            </div>            <div class="form-group">                <div class="alert alert-danger" style="display:none;"></div> @@ -205,8 +205,8 @@          </div>        </div>        <div class="modal-footer"> -        <button type="button" class="button button--secondary" data-dismiss="modal">{{t "close" }}</button> -        <button type="submit" class="button button--primary">{{t "group.edit" }}</button> +        <button type="button" class="button button--secondary" data-dismiss="modal">{{t "common.close" }}</button> +        <button type="submit" class="button button--primary">{{t "views.eventgroup.edit" }}</button>        </div>        </form>      </div> @@ -273,12 +273,12 @@ window.groupData = {{{ json jsonData }}};        })      })      $("#copyEventLink").click(function(){ -      $(this).html('<i class="fas fa-copy"></i> {{t "copied" }}!'); -      setTimeout(function(){ $("#copyEventLink").html('<i class="fas fa-copy"></i> {{t "copy" }}');}, 5000); +      $(this).html('<i class="fas fa-copy"></i> {{t "common.copied" }}!'); +      setTimeout(function(){ $("#copyEventLink").html('<i class="fas fa-copy"></i> {{t "common.copy" }}');}, 5000);      });      $("#copyFeedLink").click(function(){ -      $(this).html('<i class="fas fa-copy"></i> {{t "copied" }}'); -      setTimeout(function(){ $("#copyFeedLink").html('<i class="fas fa-copy"></i> {{t "copy" }}');}, 5000); +      $(this).html('<i class="fas fa-copy"></i> {{t "common.copied" }}'); +      setTimeout(function(){ $("#copyFeedLink").html('<i class="fas fa-copy"></i> {{t "common.copy" }}');}, 5000);      });        $('#verifyTokenForm').on('submit', function(e) { @@ -296,7 +296,7 @@ window.groupData = {{{ json jsonData }}};                  }              },              error: function(response, status, xhr) { -               form.find('.alert').text('{{t "incorrectpwd" }}').show(); +               form.find('.alert').text('{{t "views.incorrectpswd" }}').show();              }          });        }); diff --git a/views/home.handlebars b/views/home.handlebars index d9efc09..21eec0f 100755 --- a/views/home.handlebars +++ b/views/home.handlebars @@ -1,5 +1,5 @@  <main class="page"> -  <h2 class="mb-3 pb-2 text-center border-bottom">{{{t "home.about" }}}</h2> +  <h2 class="mb-3 pb-2 text-center border-bottom">{{{t "views.home.about" }}}</h2>    {{#if instanceDescription}}    <div class="instance-description mb-4"> @@ -9,49 +9,49 @@    {{> instanceRules }} -  <h2 class="mb-3 mt-5 pb-2 text-center border-bottom">{{t "home.aboutgathio"}}</h2> +  <h2 class="mb-3 mt-5 pb-2 text-center border-bottom">{{t "views.home.aboutgathio"}}</h2> -  <p class="lead text-center">{{t "home.intro"}}</p> +  <p class="lead text-center">{{t "views.home.intro"}}</p>    <div id="example-event" class="text-center w-100 mt-4 mb-5">      <img -      alt="{{t "home.imgexample" }}" +      alt="{{t "views.home.imgexample" }}"        src="images/example-event-2023.png" class="img-fluid w-75 mx-auto shadow-lg rounded">    </div> -  <h3>{{t "home.privacytitle" }}</h3> +  <h3>{{t "views.home.privacytitle" }}</h3> -  <p>{{t "home.privdesc" }} </p> +  <p>{{t "views.home.privdesc" }} </p> -  <p>{{t "home.privmail" }}</p> +  <p>{{t "views.home.privmail" }}</p> -  <p>{{t "home.autodelete" }}</p> +  <p>{{t "views.home.autodelete" }}</p> -  <p>{{t "home.privacy" }} </p> +  <p>{{t "views.home.privacy" }} </p> -  <p>{{t "home.attention" }} </p> +  <p>{{t "views.home.attention" }} </p> -  <h3>{{t "home.conftitle" }}</h3> +  <h3>{{t "views.home.conftitle" }}</h3> -  <p>{{{t "home.flagshipsetting" }}}</p> +  <p>{{{t "views.home.flagshipsetting" }}}</p> -  <p>{{t "home.onpre" }}</p> +  <p>{{t "views.home.onpre" }}</p> -  <h3>{{t "home.fedtitle" }}</h3> +  <h3>{{t "views.home.fedtitle" }}</h3> -  <p>{{{t "home.selfhost" }}}</p> +  <p>{{{t "views.home.selfhost" }}}</p> -  <h3>{{t "home.opensource" }}</h3> +  <h3>{{t "views.home.opensource" }}</h3> -  <p>{{{t "home.osdesc" }}}</p> +  <p>{{{t "views.home.osdesc" }}}</p>    {{#if showKofi}}    <div class="card border-secondary mt-5 mb-3 mx-auto" style="min-width:300px;max-width:50%;">      <div class="card-body text-secondary"> -      <p>{{{t "home.kofidesc" }}}</p> +      <p>{{{t "views.home.kofidesc" }}}</p>        <script type='text/javascript' src='https://ko-fi.com/widgets/widget_2.js'></script>        <script -        type='text/javascript'>kofiwidget2.init('{{t "home.kofi" }}', '#46b798', 'Q5Q2O7T5'); kofiwidget2.draw();</script> +        type='text/javascript'>kofiwidget2.init('{{t "views.home.kofi" }}', '#46b798', 'Q5Q2O7T5'); kofiwidget2.draw();</script>      </div>    </div>    {{/if}} diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars index d48ef49..f3b39d4 100755 --- a/views/layouts/main.handlebars +++ b/views/layouts/main.handlebars @@ -16,14 +16,14 @@      <meta property="og:type" content="website">      <meta property="og:image:width" content="260">      <meta property="og:image:height" content="260"> -    <meta property="og:description" content="{{#if metadata.description}}{{metadata.description}}{{else}}{{t "main.defaultmetadata" }}{{/if}}"> +    <meta property="og:description" content="{{#if metadata.description}}{{metadata.description}}{{else}}{{t "views.layouts.main.defaultmetadata" }}{{/if}}">      <meta property="og:title" content="{{#if metadata.title}}{{metadata.title}} · {{siteName}}{{else}}{{siteName}}{{/if}}">      <meta property="og:url" content="{{#if metadata.url}}{{metadata.url}}{{else}}https://{{domain}}/{{/if}}">      <meta property="og:image" content="{{#if metadata.image}}{{metadata.image}}{{else}}https://{{domain}}/og-image.jpg{{/if}}">      <meta name="twitter:card" content="summary">      <meta name="twitter:title" content="{{#if metadata.title}}{{metadata.title}} · {{siteName}}{{else}}{{siteName}}{{/if}}"> -    <meta name="twitter:description" content="{{#if metadata.description}}{{metadata.description}}{{else}}{{t "main.defaultmetadata" }}{{/if}}"> +    <meta name="twitter:description" content="{{#if metadata.description}}{{metadata.description}}{{else}}{{t "views.layouts.main.defaultmetadata" }}{{/if}}">      <meta name="twitter:image" content="{{#if metadata.image}}{{metadata.image}}{{else}}https://{{domain}}/og-image.jpg{{/if}}"> @@ -77,7 +77,7 @@              </p>            {{/if}}            <p class="small text-muted"> -            {{{t "main.footnote" }}} +            {{{t "views.layouts.main.footnote" }}}            </p>          </footer>        </section> diff --git a/views/newevent.handlebars b/views/newevent.handlebars index 62756ca..9de2efd 100755 --- a/views/newevent.handlebars +++ b/views/newevent.handlebars @@ -1,25 +1,25 @@  <main class="page" x-data="{currentTab: null}"> -<h2 class="mb-3 pb-2 text-center border-bottom">{{t "newevent.pagetitle" }}</h2> +<h2 class="mb-3 pb-2 text-center border-bottom">{{t "views.newevent.pagetitle" }}</h2>  <div class="container-fluid mb-4">    <div class="row">      <div class="col-lg-4 p-2"> -      <button type="button" id="showNewEventFormButton" class="button w-100" x-bind:class="currentTab === 'event' ? 'button--primary' : 'button--secondary'" x-on:click="currentTab = 'event'"><i class="fas fa-calendar-day"></i> {{t "newevent.neweventbutton" }}</button> +      <button type="button" id="showNewEventFormButton" class="button w-100" x-bind:class="currentTab === 'event' ? 'button--primary' : 'button--secondary'" x-on:click="currentTab = 'event'"><i class="fas fa-calendar-day"></i> {{t "views.newevent.neweventbutton" }}</button>      </div>      <div class="col-lg-4 p-2"> -      <button type="button" id="showImportEventFormButton" class="button w-100" x-bind:class="currentTab === 'importEvent' ? 'button--primary' : 'button--secondary'" x-on:click="currentTab = 'importEvent'"><i class="fas fa-file-import"></i> {{t "newevent.importevent" }}</button> +      <button type="button" id="showImportEventFormButton" class="button w-100" x-bind:class="currentTab === 'importEvent' ? 'button--primary' : 'button--secondary'" x-on:click="currentTab = 'importEvent'"><i class="fas fa-file-import"></i> {{t "views.newevent.importevent" }}</button>      </div>      <div class="col-lg-4 p-2"> -      <button type="button" id="showNewEventGroupFormButton" class="button w-100" x-bind:class="currentTab === 'group' ? 'button--primary' : 'button--secondary'" x-on:click="currentTab = 'group'"><i class="fas fa-calendar-alt"></i> {{t "newevent.neweventgroup" }} </button> +      <button type="button" id="showNewEventGroupFormButton" class="button w-100" x-bind:class="currentTab === 'group' ? 'button--primary' : 'button--secondary'" x-on:click="currentTab = 'group'"><i class="fas fa-calendar-alt"></i> {{t "views.newevent.neweventgroup" }} </button>      </div>    </div>  </div>  <div class="alert alert-info mb-4 text-center" role="alert"> -  <i class="fas fa-exclamation-circle"></i> {{{t "newevent.visiblealert" }}} +  <i class="fas fa-exclamation-circle"></i> {{{t "views.newevent.visiblealert" }}}  </div>  <div id="newEventFormContainer" x-show="currentTab === 'event'" style="display: none"> -  <h4 class="mb-2">{{t "newevent.createnew" }}</h4> +  <h4 class="mb-2">{{t "views.newevent.createnew" }}</h4>    <form      id="newEventForm"      enctype="multipart/form-data" @@ -38,7 +38,7 @@            class="button button--primary w-50"            x-bind:disabled="submitting"            x-bind:class="submitting ? 'button--loading' : ''" -          x-text="submitting ? '{{t "creating" }}' : '{{t "create" }}'" +          x-text="submitting ? '{{t "common.creating" }}' : '{{t "common.create" }}'"          ></button>        </div>      </div> @@ -50,9 +50,9 @@  </div>  <div id="newEventGroupFormContainer" x-show="currentTab === 'group'" style="display: none"> -  <h4 class="mb-2">{{t "newevent.newgroup" }}</h4> -  <p class="text-muted">{{t "newevent.groupdesc" }}</p> -  <p class="text-muted">{{{t "newevent.groupattention" }}}</p> +  <h4 class="mb-2">{{t "views.newevent.newgroup" }}</h4> +  <p class="text-muted">{{t "views.newevent.groupdesc" }}</p> +  <p class="text-muted">{{{t "views.newevent.groupattention" }}}</p>    <form id="newEventGroupForm" enctype="multipart/form-data" x-data="newEventGroupForm()" @submit.prevent="submitForm">      {{> eventGroupForm }}      <div class="form-group row"> @@ -62,7 +62,7 @@            class="button button--primary w-50"            x-bind:disabled="submitting"            x-bind:class="submitting ? 'button--loading' : ''" -          x-text="submitting ? '{{t "creating" }}' : '{{t "create" }}'" +          x-text="submitting ? '{{t "common.creating" }}' : '{{t "common.create" }}'"          ></button>        </div>      </div> diff --git a/views/optionsform.handlebars b/views/optionsform.handlebars index 06dbe95..78e184b 100755 --- a/views/optionsform.handlebars +++ b/views/optionsform.handlebars @@ -4,19 +4,19 @@      <div class="form-check">        <input class="form-check-input" type="checkbox" id="joinCheckbox" name="joinCheckbox" {{#if data.joinCheckbox}}checked{{/if}}>        <label class="form-check-label" for="joinCheckbox"> -        {{t "join" }} +        {{t "views.join" }}        </label>      </div>      <div class="form-check">        <input class="form-check-input" type="checkbox" id="guestlistCheckbox" name="guestlistCheckbox"  {{#if data.guestlistCheckbox}}checked{{/if}}>        <label class="form-check-label" for="guestlistCheckbox"> -        {{t "options.showlistattendees" }} +        {{t "views.options.showlistattendees" }}        </label>      </div>      <div class="form-check">        <input class="form-check-input" type="checkbox" id="interactionCheckbox" name="interactionCheckbox" {{#if data.interactionCheckbox}}checked{{/if}}>        <label class="form-check-label" for="interactionCheckbox"> -        {{t "interaction" }} +        {{t "views.interaction" }}        </label>      </div>    </div> @@ -28,19 +28,19 @@      <div class="form-check">        <input class="form-check-input" type="checkbox" id="joinCheckbox" name="joinCheckbox" {{#if eventData.usersCanAttend}}checked{{/if}}>        <label class="form-check-label" for="joinCheckbox"> -        {{t "join" }} +        {{t "views.join" }}        </label>      </div>      <div class="form-check">        <input class="form-check-input" type="checkbox" id="guestlistCheckbox" name="guestlistCheckbox"  {{#if eventData.showUsersList}}checked{{/if}}>        <label class="form-check-label" for="guestlistCheckbox"> -        {{t "options.showlistattendees" }} +        {{t "views.options.showlistattendees" }}        </label>      </div>      <div class="form-check">        <input class="form-check-input" type="checkbox" id="interactionCheckbox" name="interactionCheckbox" {{#if eventData.usersCanComment}}checked{{/if}}>        <label class="form-check-label" for="interactionCheckbox"> -        {{t "interaction" }} +        {{t "views.interaction" }}        </label>      </div>    </div> diff --git a/views/partials/editeventgroupmodal.handlebars b/views/partials/editeventgroupmodal.handlebars index fb3033d..7f2bde3 100644 --- a/views/partials/editeventgroupmodal.handlebars +++ b/views/partials/editeventgroupmodal.handlebars @@ -2,7 +2,7 @@    <div class="modal-dialog modal-xl modal-dialog-scrollable" role="document">      <div class="modal-content">        <div class="modal-header"> -        <h5 class="modal-title" id="editModalLabel">{{{t "group.edit" }}} </h5> +        <h5 class="modal-title" id="editModalLabel">{{{t "viewws.eventgroup.edit" }}} </h5>          <button type="button" class="close" data-dismiss="modal" aria-label="Close">            <span aria-hidden="true">×</span>          </button> @@ -14,23 +14,23 @@            <div class="form-group">              <div class="card border-danger mb-3"> -              <div class="card-header text-danger">{{t "group.p.del" }}</div> +              <div class="card-header text-danger">{{t "views.partials.editeventgroup.del" }}</div>                <div class="card-body text-danger"> -                <button type="button" id="deleteEvent" class="button button--danger" data-toggle="modal" data-target="#deleteModal"><i class="fas fa-trash"></i> {{t "group.p.delbutton" }}</button> +                <button type="button" id="deleteEvent" class="button button--danger" data-toggle="modal" data-target="#deleteModal"><i class="fas fa-trash"></i> {{t "views.partials.editeventgroup.delbutton" }}</button>                </div>              </div>            </div>          </form>        </div>        <div class="modal-footer"> -        <button type="button" class="button button--secondary" data-dismiss="modal">{{t "close" }}</button> +        <button type="button" class="button button--secondary" data-dismiss="modal">{{t "common.close" }}</button>          <button            type="submit"            class="button button--primary"            @click="submitForm"            x-bind:disabled="submitting"            x-bind:class="submitting ? 'button--loading' : ''" -          x-text="submitting ? '{{t "saving" }}' : '{{t "save" }}'" +          x-text="submitting ? '{{t "views.partials.saving" }}' : '{{t "views.partials.save" }}'"          ></button>        </div>      </div> diff --git a/views/partials/editeventmodal.handlebars b/views/partials/editeventmodal.handlebars index 6deac7f..88fb91d 100644 --- a/views/partials/editeventmodal.handlebars +++ b/views/partials/editeventmodal.handlebars @@ -7,7 +7,7 @@    <div class="modal-dialog modal-xl modal-dialog-scrollable" role="document">      <div class="modal-content">        <div class="modal-header"> -        <h5 class="modal-title" id="editModalLabel">{{{t "event.p.edit" }}}</h5> +        <h5 class="modal-title" id="editModalLabel">{{{t "views.event.p.edit" }}}</h5>          <button type="button" class="close" data-dismiss="modal" aria-label="Close">            <span aria-hidden="true">×</span>          </button> @@ -19,25 +19,25 @@            <div class="form-group">              <div class="card border-danger mb-3"> -              <div class="card-header text-danger">{{t "event.p.delthis" }}</div> +              <div class="card-header text-danger">{{t "views.event.p.delthis" }}</div>                <div class="card-body text-danger">                  <button type="button" id="deleteEvent" class="button button--danger" data-toggle="modal"                    data-target="#deleteModal" data-event-id="{{eventData.id}}"><i class="fas fa-trash"></i> -                  {{t "del" }}</button> +                  {{t "views.del" }}</button>                </div>              </div>            </div>          </form>        </div>        <div class="modal-footer"> -        <button type="button" class="button button--secondary" data-dismiss="modal">{{t "close" }}</button> +        <button type="button" class="button button--secondary" data-dismiss="modal">{{t "common.close" }}</button>          <button            type="submit"            class="button button--primary"            @click="submitForm"            x-bind:disabled="submitting"            x-bind:class="submitting ? 'button--loading' : ''" -          x-text="submitting ? '{{t "saving" }}' : '{{t "save" }}'" +          x-text="submitting ? '{{t "views.partials.saving" }}' : '{{t "views.partials.save" }}'"          ></button>        </div>      </div> diff --git a/views/partials/eventForm.handlebars b/views/partials/eventForm.handlebars index e40ffa8..0ba3ca1 100755 --- a/views/partials/eventForm.handlebars +++ b/views/partials/eventForm.handlebars @@ -1,100 +1,100 @@  <input type="hidden" name="magicLinkToken" value="{{magicLinkToken}}" x-ref="magicLinkToken">  <div class="form-group"> -  <label for="eventName" >{{t "event.p.eventname" }}</label> +  <label for="eventName" >{{t "views.event.p.eventname" }}</label>    <div class="form-group "> -    <input type="text" class="form-control" id="eventName" name="eventName" placeholder="{{t "snappy" }}" x-model="data.eventName" > +    <input type="text" class="form-control" id="eventName" name="eventName" placeholder="{{t "views.partials.snappy" }}" x-model="data.eventName" >    </div>  </div>  <div class="form-group"> -  <label for="eventLocation" >{{t "event.p.eventlocation" }}</label> +  <label for="eventLocation" >{{t "views.event.p.eventlocation" }}</label>    <div class="form-group "> -    <input type="text" class="form-control" id="eventLocation" name="eventLocation" placeholder="{{t "event.locationdesc" }}" x-model="data.eventLocation"> +    <input type="text" class="form-control" id="eventLocation" name="eventLocation" placeholder="{{t "views.event.locationdesc" }}" x-model="data.eventLocation">    </div>  </div>  <div class="form-group"> -  <label for="eventStart" >{{t "event.p.eventstart" }}</label> +  <label for="eventStart" >{{t "views.event.p.eventstart" }}</label>    <div class="form-group">      <input type="datetime-local" class="form-control" id="eventStart" name="eventStart"  x-model="data.eventStart" x-on:blur="updateEventEnd">    </div>  </div>  <div class="form-group"> -  <label for="eventEnd" >{{t "event.p.eventend" }}</label> +  <label for="eventEnd" >{{t "views.event.p.eventend" }}</label>    <div class="form-group ">      <input type="datetime-local" class="form-control" id="eventEnd" name="eventEnd"  x-model="data.eventEnd">    </div>  </div>  <div class="form-group"> -  <label for="timezone" >{{t "event.p.timezone" }}</label> +  <label for="timezone" >{{t "views.event.p.timezone" }}</label>    <div class="form-group ">      <select class="select2" id="timezone" name="timezone" x-ref="timezone"></select>    </div>  </div>  <div class="form-group"> -  <label for="eventDescription" >{{t "event.p.eventdescription" }}</label> +  <label for="eventDescription" >{{t "views.event.p.eventdescription" }}</label>    <div class="form-group "> -    <textarea class="form-control expand" id="eventDescription" name="eventDescription" placeholder="{{t "event.editlater" }}" x-model="data.eventDescription" ></textarea> -    <small class="form-text">{{{t "mdsupport" }}}</small> +    <textarea class="form-control expand" id="eventDescription" name="eventDescription" placeholder="{{t "views.event.editlater" }}" x-model="data.eventDescription" ></textarea> +    <small class="form-text">{{{t "views.partials.mdsupport" }}}</small>    </div>  </div>  <div class="form-group"> -  <label for="eventURL">{{t "event.p.eventurl" }}</label> +  <label for="eventURL">{{t "views.event.p.eventurl" }}</label>    <div class="form-group ">      <input type="url" class="form-control" id="eventURL" name="eventURL" placeholder="https://example.com" x-model="data.eventURL"> -    <small class="form-text">{{t "event.p.eventurldesc" }}</small> +    <small class="form-text">{{t "views.event.p.eventurldesc" }}</small>    </div>  </div>  <div class="form-group"> -  <label for="eventImage" >{{t "coverimg" }}</label> +  <label for="eventImage" >{{t "common.coverimg" }}</label>    <div class="form-group ">      <div class="image-preview" id="event-image-preview"> -      <label for="image-upload" id="event-image-label">{{t "choosefile" }}</label> +      <label for="image-upload" id="event-image-label">{{t "views.partials.choosefile" }}</label>        <input type="file" name="imageUpload" id="event-image-upload" accept="image/jpeg,image/gif,image/png" x-ref="eventImageUpload" />      </div> -    <small class="form-text">{{t "recommendeddimensions" }}</small> +    <small class="form-text">{{t "views.partials.recommendeddimensions" }}</small>      {{#if eventData.image}}        <div class="form-group my-2"> -        <button type="button" class="button button--danger" id="deleteImage">{{t "imgdel" }}</button> +        <button type="button" class="button button--danger" id="deleteImage">{{t "views.partials.delimg" }}</button>        </div>      {{/if}}    </div>  </div>  <div class="form-group"> -  <label for="hostName" >{{t "event.p.hostname" }}</label> +  <label for="hostName" >{{t "views.event.p.hostname" }}</label>    <div class="form-group "> -    <input type="text" class="form-control" id="hostName" name="hostName" placeholder="{{t "event.p.hostnamedesc" }}" x-model="data.hostName" > +    <input type="text" class="form-control" id="hostName" name="hostName" placeholder="{{t "views.event.p.hostnamedesc" }}" x-model="data.hostName" >    </div>  </div>  <div class="form-group"> -  <label for="creatorEmail" >{{t "event.p.creatoremail" }}</label> +  <label for="creatorEmail" >{{t "views.event.p.creatoremail" }}</label>    <div class="form-group "> -    <input type="email" class="form-control" id="creatorEmail" name="creatorEmail" placeholder="{{t "wontshow" }}" x-model.fill="data.creatorEmail" {{#if creatorEmail}}value="{{creatorEmail}}" readonly{{/if}}> -    <small class="form-text">{{t "creatoremaildesc" }}</small> +    <input type="email" class="form-control" id="creatorEmail" name="creatorEmail" placeholder="{{t "views.partials.wontshow" }}" x-model.fill="data.creatorEmail" {{#if creatorEmail}}value="{{creatorEmail}}" readonly{{/if}}> +    <small class="form-text">{{t "views.partials.creatoremaildesc" }}</small>    </div>  </div>  <div class="form-group"> -  <label>{{t "event.options" }}</label> +  <label>{{t "views.event.options" }}</label>    <div >      {{#if showPublicEventList}}        <div class="form-check">          <input class="form-check-input" type="checkbox" id="publicEventCheckbox" name="publicCheckbox" x-model="data.publicCheckbox">          <label class="form-check-label" for="publicEventCheckbox"> -          {{t "event.p.publicevent" }} +          {{t "views.event.p.publicevent" }}          </label>        </div>      {{/if}}      <div class="form-check">        <input class="form-check-input" type="checkbox" id="eventGroupCheckbox" name="eventGroupCheckbox" x-model="data.eventGroupCheckbox">        <label class="form-check-label" for="eventGroupCheckbox"> -        {{t "event.p.eventgroup" }} +        {{t "views.event.p.eventgroup" }}        </label>      </div>      <div class="card my-2" id="eventGroupData" x-show="data.eventGroupCheckbox">        <div class="card-header"> -        <strong>{{t "event.p.eventgroupdata" }}</strong> +        <strong>{{t "views.event.p.eventgroupdata" }}</strong>        </div>        <div class="card-body" x-data="eventGroupLinker()">          <div class="form-group-label" x-show="data.groups.length > 0"> -          <label>{{t "event.p.eventgrouplinker" }}</label> +          <label>{{t "views.event.p.eventgrouplinker" }}</label>          </div>          <div class="form-group" x-show="data.groups.length > 0">            <select @@ -111,7 +111,7 @@            </select>          </div>          <button type="button" class="button button--outline-primary w-100 text-center" x-on:click="manualGroupInputVisible = !manualGroupInputVisible"> -          {{t "event.p.groupbutton" }} <i class="fas" :class="{'fa-caret-down': !manualGroupInputVisible, 'fa-caret-up': manualGroupInputVisible}"></i> +          {{t "views.event.p.groupbutton" }} <i class="fas" :class="{'fa-caret-down': !manualGroupInputVisible, 'fa-caret-up': manualGroupInputVisible}"></i>          </button>          <div            class="form-group slider" @@ -120,15 +120,15 @@            :style="manualGroupInputVisible && {height: $el.scrollHeight+`px`}"            :aria-hidden="!manualGroupInputVisible"          > -          <label for="eventGroupID" class="mt-2">{{t "group.p.eventgroupid" }}</label> +          <label for="eventGroupID" class="mt-2">{{t "common.eventgroupid" }}</label>            <div class="form-group">              <input type="text" class="form-control text-monospace" id="eventGroupID" name="eventGroupID" x-model="data.eventGroupID" x-on:input="resetGroupSelector"> -            <small class="form-text">{{t "event.p.eventgroupid" }}</small> +            <small class="form-text">{{t "views.event.p.eventgroupid" }}</small>            </div> -          <label for="eventGroupEditToken">{{t "group.p.eventgroupedittoken" }}</label> +          <label for="eventGroupEditToken">{{t "views.partials.eventform.eventgroupedittoken" }}</label>            <div class="form-group mb-0">              <input type="text" class="form-control text-monospace" id="eventGroupEditToken" name="eventGroupEditToken" x-model="data.eventGroupEditToken" x-on:input="resetGroupSelector"> -            <small class="form-text">{{t "event.p.eventgroupedittoken" }}</small> +            <small class="form-text">{{t "views.event.p.eventgroupedittoken" }}</small>            </div>          </div>        </div> @@ -136,27 +136,27 @@      <div class="form-check">        <input class="form-check-input" type="checkbox" id="interactionCheckbox" name="interactionCheckbox" x-model="data.interactionCheckbox">        <label class="form-check-label" for="interactionCheckbox"> -        {{t "interaction" }} +        {{t "views.interaction" }}        </label>      </div>      <div class="form-check">        <input class="form-check-input" type="checkbox" id="joinCheckbox" name="joinCheckbox" x-model="data.joinCheckbox">        <label class="form-check-label" for="joinCheckbox"> -        {{t "join" }} +        {{t "views.join" }}        </label>      </div>      <div class="form-check" id="maxAttendeesCheckboxContainer" x-show="data.joinCheckbox">        <input class="form-check-input" type="checkbox" id="maxAttendeesCheckbox" name="maxAttendeesCheckbox" x-model="data.maxAttendeesCheckbox">        <label class="form-check-label" for="maxAttendeesCheckbox"> -        {{t "event.p.maxattendeestitle" }} +        {{t "views.event.p.maxattendeestitle" }}        </label>      </div>    </div>  </div>  <div class="form-group" id="maxAttendeesContainer" x-show="data.maxAttendeesCheckbox && data.joinCheckbox"> -  <label for="maxAttendees" >{{t "event.p.maxattendees" }}</label> +  <label for="maxAttendees" >{{t "views.event.p.maxattendees" }}</label>    <div class="form-group "> -    <input type="number" class="form-control" id="maxAttendees" name="maxAttendees" placeholder="{{t "event.enternum" }}" x-model="data.maxAttendees" > +    <input type="number" class="form-control" id="maxAttendees" name="maxAttendees" placeholder="{{t "views.event.enternum" }}" x-model="data.maxAttendees" >    </div>  </div>  <div class="form-group"> @@ -166,7 +166,7 @@        role="alert"        x-show="errors.length > 0"      > -      <p><i class="fas fa-exclamation-triangle"></i> {{t "fixerrors" }}</p> +      <p><i class="fas fa-exclamation-triangle"></i> {{t "views.partials.fixerrors" }}</p>        <ul>          <template x-for="error in errors">            <li x-html="error.message"></li> diff --git a/views/partials/eventGroupForm.handlebars b/views/partials/eventGroupForm.handlebars index 0f30790..5cc8b40 100644 --- a/views/partials/eventGroupForm.handlebars +++ b/views/partials/eventGroupForm.handlebars @@ -1,44 +1,44 @@  <input type="hidden" name="magicLinkToken" value="{{magicLinkToken}}" x-ref="magicLinkToken">  <div class="form-group"> -    <label for="eventGroupName">{{t "group.p.eventgroupname" }}</label> -    <input type="text" class="form-control" id="eventGroupName" name="eventGroupName" placeholder="{{t "snappy" }}" x-model="data.eventGroupName"> +    <label for="eventGroupName">{{t "common.eventgroupname" }}</label> +    <input type="text" class="form-control" id="eventGroupName" name="eventGroupName" placeholder="{{t "views.partials.snappy" }}" x-model="data.eventGroupName">  </div>  <div class="form-group"> -    <label for="eventGroupDescription">{{t "group.p.eventgroupdescription" }}</label> +    <label for="eventGroupDescription">{{t "views.partials.eventgroupform.eventgroupddesc" }}</label>      <textarea class="form-control" id="eventGroupDescription" name="eventGroupDescription" x-model="data.eventGroupDescription">{{eventGroupData.description}}</textarea> -    <small class="form-text">{{{t "mdsupport" }}}</small> +    <small class="form-text">{{{t "views.partials.mdsupport" }}}</small>  </div>  <div class="form-group"> -    <label for="eventGroupURL">{{t "group.p.eventgroupurl" }}</label> +    <label for="eventGroupURL">{{t "views.partials.eventgroupform.eventgroupurl" }}</label>      <input type="url" class="form-control" id="eventGroupURL" name="eventGroupURL" placeholder="https://example.com" x-model="data.eventGroupURL"> -    <small class="form-text">{{t "group.p.eventgroupurldesc" }}</small> +    <small class="form-text">{{t "views.partials.eventgroupform.eventgroupurldesc" }}</small>  </div>  <div class="form-group"> -    <label for="hostName">{{t "group.p.hostname" }}</label> -    <input type="text" class="form-control" id="eventGroupHostName" name="hostName" placeholder="{{t "group.p.isshowgroup" }}"  x-model="data.hostName"> +    <label for="hostName">{{t "views.partials.eventgroupform.hostname" }}</label> +    <input type="text" class="form-control" id="eventGroupHostName" name="hostName" placeholder="{{t "views.partials.eventgroupform.isshowningroup" }}"  x-model="data.hostName">  </div>  <div class="form-group"> -    <label for="creatorEmail">{{t "group.p.creatoremail" }}</label> +    <label for="creatorEmail">{{t "views.partials.eventgroupform.creatoremail" }}</label>      <div class="form-group"> -        <input type="email" class="form-control" id="eventGroupCreatorEmail" name="creatorEmail" placeholder="{{t "wontshow" }}" x-model.fill="data.creatorEmail" {{#if creatorEmail}}value="{{creatorEmail}}" readonly{{/if}}> -        <small class="form-text">{{t "creatoremaildesc" }}</small> +        <input type="email" class="form-control" id="eventGroupCreatorEmail" name="creatorEmail" placeholder="{{t "views.partials.wontshow" }}" x-model.fill="data.creatorEmail" {{#if creatorEmail}}value="{{creatorEmail}}" readonly{{/if}}> +        <small class="form-text">{{t "views.partials.creatoremaildesc" }}</small>      </div>  </div>  <div class="form-group"> -    <label>{{t "coverimg" }}</label> +    <label>{{t "common.coverimg" }}</label>      <div class="image-preview" id="group-image-preview"> -        <label for="eventGroupImageUpload" id="group-image-label">{{t "choosefile" }}</label> +        <label for="eventGroupImageUpload" id="group-image-label">{{t "views.partials.choosefile" }}</label>          <input type="file" name="imageUpload" id="group-image-upload" accept="image/jpeg,image/gif,image/png" x-ref="eventGroupImageUpload"/>      </div> -    <small class="form-text">{{t "recommendeddimensions" }}</small> +    <small class="form-text">{{t "views.partials.recommendeddimensions" }}</small>  </div>  {{#if showPublicEventList}}    <div class="form-group"> -    <label>{{{t "group.options" }}}</label> +    <label>{{{t "views.partials.eventgroup.options" }}}</label>      <div class="form-check">        <input class="form-check-input" type="checkbox" id="publicGroupCheckbox" name="publicCheckbox" x-model="data.publicCheckbox">        <label class="form-check-label" for="publicGroupCheckbox"> -        {{t "group.p.publicgroup" }} +        {{t "views.partials.eventgroupform.publicgroup" }}        </label>      </div>    </div> @@ -50,7 +50,7 @@        role="alert"        x-show="errors.length > 0"      > -      <p><i class="fas fa-exclamation-triangle"></i> {{t "fixerrors" }}</p> +      <p><i class="fas fa-exclamation-triangle"></i> {{t "views.partials.fixerrors" }}</p>        <ul>          <template x-for="error in errors">            <li x-html="error.message"></li> diff --git a/views/partials/eventList.handlebars b/views/partials/eventList.handlebars index c36c428..b694fa3 100644 --- a/views/partials/eventList.handlebars +++ b/views/partials/eventList.handlebars @@ -17,6 +17,6 @@          {{/each}}      {{/each}}  {{else}} -    <div class="list-group-item">{{t "noevents" }}</div> +    <div class="list-group-item">{{t "views.partials.eventlist.noevents" }}</div>  {{/if}}  </div> diff --git a/views/partials/importeventform.handlebars b/views/partials/importeventform.handlebars index 12522dc..f788d16 100644 --- a/views/partials/importeventform.handlebars +++ b/views/partials/importeventform.handlebars @@ -1,6 +1,6 @@ -<h4 class="mb-2">{{t "newevent.importevent" }}</h4> +<h4 class="mb-2">{{t "views.newevent.importevent" }}</h4>  <p> -  {{t "newevent.p.importdesc" }} +  {{t "views.newevent.p.importdesc" }}  </p>  <img class="img-thumbnail mb-3 d-block mx-auto" src="/images/facebook-export.png" alt="Image showing the location of the export option on Facebook" /> @@ -11,15 +11,15 @@      <div class="custom-file" id="icsImportContainer">      <input required name="icsImportControl" type="file" class="custom-file-input" id="icsImportControl" aria-describedby="fileHelp" accept="text/calendar" x-ref="icsImportControl"/>      <label name="icsImportLabel" class="custom-file-label" id="icsImportLabel" for="icsImportControl"> -       <i class="far fa-file-alt"></i> {{t "selectfile" }} +       <i class="far fa-file-alt"></i> {{t "views.partials.importevent.selectfile" }}      </label>    </div>    </div>    <div class="form-group"> -    <label for="creatorEmail" class="form-label">{{t "youremail" }}</label> +    <label for="creatorEmail" class="form-label">{{t "common.youremail" }}</label>      <div class="form-group"> -      <input type="email" class="form-control" id="importCreatorEmail" name="creatorEmail" placeholder="{{t "wontshow" }}" x-model.fill="data.creatorEmail" {{#if creatorEmail}}value="{{creatorEmail}}" readonly{{/if}}> -    <small class="form-text">{{t "creatoremaildesc" }}</small> +      <input type="email" class="form-control" id="importCreatorEmail" name="creatorEmail" placeholder="{{t "views.partials.wontshow" }}" x-model.fill="data.creatorEmail" {{#if creatorEmail}}value="{{creatorEmail}}" readonly{{/if}}> +    <small class="form-text">{{t "views.partials.creatoremaildesc" }}</small>      </div>    </div>    <div class="form-group"> @@ -29,7 +29,7 @@          role="alert"          x-show="errors.length > 0"        > -        <p><i class="fas fa-exclamation-triangle"></i> {{t "fixerrors" }}</p> +        <p><i class="fas fa-exclamation-triangle"></i> {{t "views.partials.fixerrors" }}</p>          <ul>            <template x-for="error in errors">              <li x-html="error.message"></li> @@ -43,6 +43,6 @@      class="d-block mx-auto button button--primary w-50"      x-bind:disabled="submitting"      x-bind:class="submitting ? 'button--loading' : ''" -    x-text="submitting ? '{{t "newevent.p.importing" }}' : '{{t "newevent.p.import" }}'" +    x-text="submitting ? '{{t "views.newevent.p.importing" }}' : '{{t "views.newevent.p.import" }}'"    ></button>  </form> diff --git a/views/partials/instanceRules.handlebars b/views/partials/instanceRules.handlebars index c0a6c6c..5cf3bcf 100644 --- a/views/partials/instanceRules.handlebars +++ b/views/partials/instanceRules.handlebars @@ -1,6 +1,6 @@  <div class="card mb-4">      <div class="card-header"> -        <h6 class="mb-1">{{t "instancesettings" }}</h6> +        <h6 class="mb-1">{{t "views.partials.instancerules.instancesettings" }}</h6>      </div>      <ul class="list-group list-group-flush"> diff --git a/views/partials/sidebar.handlebars b/views/partials/sidebar.handlebars index 1015799..ae4929d 100755 --- a/views/partials/sidebar.handlebars +++ b/views/partials/sidebar.handlebars @@ -2,10 +2,10 @@      <h1><a href="/">gathio</a></h1>      <ul id="sidebar__nav"> -        <li><a class="button button--primary" href="/new"><i class="far fa-calendar-plus"></i> {{t "sidebar.createevent" }}</a></li> +        <li><a class="button button--primary" href="/new"><i class="far fa-calendar-plus"></i> {{t "views.partials.sidebar.createevent" }}</a></li>          {{#if showPublicEventList}} -            <li><a href="/events">{{t "sidebar.events" }}</a></li> -            <li><a href="/about">{{t "sidebar.about" }}</a></li> +            <li><a href="/events">{{t "views.partials.sidebar.events" }}</a></li> +            <li><a href="/about">{{t "views.partials.sidebar.about" }}</a></li>          {{/if}}      </ul>  </div> diff --git a/views/publicEventList.handlebars b/views/publicEventList.handlebars index 1340e2f..e95379b 100644 --- a/views/publicEventList.handlebars +++ b/views/publicEventList.handlebars @@ -12,39 +12,39 @@  <ul class="nav d-flex flex-gap--small">    <li> -    <a id="eventsTab" class="button button--lg" x-bind:class="currentTab === 'events' ? 'button--primary' : 'button--secondary'" aria-current="page" href="#" x-on:click.prevent="currentTab = 'events'">{{t "publiclist.events" }}</a> +    <a id="eventsTab" class="button button--lg" x-bind:class="currentTab === 'events' ? 'button--primary' : 'button--secondary'" aria-current="page" href="#" x-on:click.prevent="currentTab = 'events'">{{t "views.publiceventlist.events" }}</a>    </li>    <li> -    <a id="groupsTab" class="button button--lg" x-bind:class="currentTab === 'groups' ? 'button--primary' : 'button--secondary'" href="#" x-on:click.prevent="currentTab = 'groups'">{{t "publiclist.groups" }}</a> +    <a id="groupsTab" class="button button--lg" x-bind:class="currentTab === 'groups' ? 'button--primary' : 'button--secondary'" href="#" x-on:click.prevent="currentTab = 'groups'">{{t "views.publiceventlist.groups" }}</a>    </li>  </ul>  <div x-show="currentTab === 'events'">      <div class="card mt-4 mb-4" id="upcomingEvents"> -        <h5 class="card-header">{{t "publiclist.upcomingevents" }}</h5> +        <h5 class="card-header">{{t "views.publiceventlist.upcomingevents" }}</h5>          {{> eventList upcomingEvents }}      </div>      <div class="card mt-4 mb-4" id="pastEvents"> -        <h5 class="card-header">{{t "publiclist.pastevents" }}</h5> +        <h5 class="card-header">{{t "views.publiceventlist.pastevents" }}</h5>          {{> eventList pastEvents }}      </div>  </div>  <div x-show="currentTab === 'groups'">      <div class="card mt-4 mb-4" id="eventGroups"> -    <h5 class="card-header">{{t "eventgroups" }}</h5> +    <h5 class="card-header">{{t "common.eventgroups" }}</h5>      <div class="list-group list-group-flush">      {{#if eventGroups}}          {{#each eventGroups}}          <a href="/group/{{this.id}}" class="list-group-item list-group-item-action">              <i class="fas fa-fw fa-calendar-alt"></i>              <strong>{{this.name}}</strong> -            <span class="badge badge-secondary ml-2">{{{t "publiclist.numoevents" }}}</span> +            <span class="badge badge-secondary ml-2">{{{t "views.publiceventlist.numoevents" }}}</span>          </a>          {{/each}}      {{else}} -        <div class="list-group-item">{{t "publiclist.nogroups" }}</div> +        <div class="list-group-item">{{t "views.publiceventlist.nogroups" }}</div>      {{/if}}  </div>  | 
