From 1fd6a7d2249fdf6ba5ca9ced6ea43348ebe0941d Mon Sep 17 00:00:00 2001
From: INOUE Daisuke <inoue.daisuke@gmail.com>
Date: Wed, 2 Apr 2025 01:49:11 +0900
Subject: rename translation keys as filestructure

---
 views/partials/editeventgroupmodal.handlebars | 10 ++--
 views/partials/editeventmodal.handlebars      | 10 ++--
 views/partials/eventForm.handlebars           | 74 +++++++++++++--------------
 views/partials/eventGroupForm.handlebars      | 34 ++++++------
 views/partials/eventList.handlebars           |  2 +-
 views/partials/importeventform.handlebars     | 16 +++---
 views/partials/instanceRules.handlebars       |  2 +-
 views/partials/sidebar.handlebars             |  6 +--
 8 files changed, 77 insertions(+), 77 deletions(-)

(limited to 'views/partials')

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">&times;</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">&times;</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>
-- 
cgit v1.2.3