Merge pull request #1489 from NicoPennec/fix/various

Various fixes
cgwire · Jul 14, 2024 · e104fdc · e104fdc
2 parents 459ee6a + b749f01
commit e104fdc
Show file tree

Hide file tree

Showing 9 changed files with 334 additions and 344 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "@fullcalendar/multimonth": "6.1.14",
     "@fullcalendar/vue": "6.1.14",
     "@google/model-viewer": "3.5.0",
-    "@sentry/vue": "8.15.0",
+    "@sentry/vue": "8.17.0",
     "async": "3.2.5",
     "bowser": "2.11.0",
     "chart.js": "2.9.4",

diff --git a/src/components/lists/AssetList.vue b/src/components/lists/AssetList.vue
@@ -278,7 +278,7 @@
               class="metadata-descriptor datatable-row-header"
               :title="asset.data ? asset.data[descriptor.field_name] : ''"
               :style="{
-                'z-index': 1000 - i, // Needed for combo to be above the next cell
+                'z-index': 1000 - i - k * 100, // Needed for combo to be above the next cell
                 left: offsets['editor-' + j]
                   ? `${offsets['editor-' + j]}px`
                   : '0'

diff --git a/src/components/lists/ShotList.vue b/src/components/lists/ShotList.vue
@@ -309,7 +309,7 @@
               class="metadata-descriptor datatable-row-header"
               :title="shot.data ? shot.data[descriptor.field_name] : ''"
               :style="{
-                'z-index': 1000 - i, // Need for combo to be above the next cell
+                'z-index': 1000 - i - k * 100, // Needed for combo to be above the next cell
                 left: offsets['editor-' + j]
                   ? `${offsets['editor-' + j]}px`
                   : '0'

diff --git a/src/components/modals/AddThumbnailsModal.vue b/src/components/modals/AddThumbnailsModal.vue
@@ -14,7 +14,7 @@
         </h1>
 
         <p>
-          {{ $t('entities.thumbnails.explaination') }}
+          {{ $t('entities.thumbnails.explanation') }}
         </p>
 
         <combobox-task-type
@@ -24,7 +24,7 @@
         />
 
         <p>
-          {{ $t('entities.thumbnails.explaination_two') }}
+          {{ $t('entities.thumbnails.explanation_two') }}
           {{ $t(`entities.thumbnails.${parent}_pattern`) }}
         </p>
 

diff --git a/src/components/modals/ManageShotsModal.vue b/src/components/modals/ManageShotsModal.vue
@@ -10,7 +10,7 @@
     <div class="modal-content">
       <div class="box">
         <page-title class="title" :text="$t('shots.manage')" />
-        <div class="explaination">{{ $t('shots.creation_explaination') }}</div>
+        <div class="explanation">{{ $t('shots.creation_explanation') }}</div>
         <div>
           <div class="flexrow">
             <combobox
@@ -430,7 +430,7 @@ input::placeholder {
   color: #bbb;
 }
 
-.explaination {
+.explanation {
   margin-bottom: 1em;
 }
 

diff --git a/src/components/pages/Bots.vue b/src/components/pages/Bots.vue
@@ -47,7 +47,7 @@
       v-if="isPeopleLoading || currentPeople.length > 0"
     />
     <div class="has-text-centered strong" v-else>
-      <p>{{ $t('bots.no_bots') }}</p>
+      <p>{{ $t('bots.no_bot') }}</p>
       <button-simple
         class="mt1"
         :text="$t('bots.new_bot')"

diff --git a/src/components/pages/ProductionQuota.vue b/src/components/pages/ProductionQuota.vue
@@ -54,7 +54,7 @@
             :text="
               computeMode === 'weighted'
                 ? $t('quota.explaination')
-                : $t('quota.explaination_feedback')
+                : $t('quota.explanation_feedback')
             "
           />
         </div>

diff --git a/src/components/pages/logs/PreviewFiles.vue b/src/components/pages/logs/PreviewFiles.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="mt1">
     <p class="flexrow">
-      <em class="flexrow-item">{{ $t('logs.preview_files.explaination') }}</em>
+      <em class="flexrow-item">{{ $t('logs.preview_files.explanation') }}</em>
       <span class="filler"></span>
       <button-simple class="flexrow-item" icon="refresh" @click="reload" />
     </p>