From 4f3f046ec1dd9d095ae45adef32419e1789abf95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simen=20Heggest=C3=B8yl?=
 <simen.heggestoyl@origo.oslo.kommune.no>
Date: Mon, 25 Sep 2023 14:05:21 +0200
Subject: [PATCH] Say "Delete <thing>" i/o "Delete" in drawer modals

---
 src/components/drawers/EditItemDrawer.vue | 6 +++++-
 src/components/drawers/EditKeyResult.vue  | 6 +++++-
 src/components/drawers/EditObjective.vue  | 6 +++++-
 src/components/drawers/KpiDrawer.vue      | 6 +++++-
 src/locale/locales/en-US.json             | 8 ++++++--
 src/locale/locales/nb-NO.json             | 8 ++++++--
 6 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/components/drawers/EditItemDrawer.vue b/src/components/drawers/EditItemDrawer.vue
index 093985d2f..dbb7612e0 100644
--- a/src/components/drawers/EditItemDrawer.vue
+++ b/src/components/drawers/EditItemDrawer.vue
@@ -142,7 +142,11 @@
           :object-type="type"
         />
         <div v-else class="button-row">
-          <btn-delete :disabled="loading" @click="archive" />
+          <btn-delete
+            :disabled="loading"
+            :label="$t('admin.item.delete', { name: item.name })"
+            @click="archive"
+          />
         </div>
       </template>
     </template>
diff --git a/src/components/drawers/EditKeyResult.vue b/src/components/drawers/EditKeyResult.vue
index f6f7efd6d..63ace8eb2 100644
--- a/src/components/drawers/EditKeyResult.vue
+++ b/src/components/drawers/EditKeyResult.vue
@@ -137,7 +137,11 @@
           object-type="keyResult"
         />
         <div v-else class="button-row">
-          <btn-delete :disabled="loading" @click="archive" />
+          <btn-delete
+            :disabled="loading"
+            :label="$t('admin.keyResult.delete')"
+            @click="archive"
+          />
         </div>
       </template>
     </template>
diff --git a/src/components/drawers/EditObjective.vue b/src/components/drawers/EditObjective.vue
index 3002c447c..9dc6ece34 100644
--- a/src/components/drawers/EditObjective.vue
+++ b/src/components/drawers/EditObjective.vue
@@ -100,7 +100,11 @@
           object-type="objective"
         />
         <div v-else class="button-row">
-          <btn-delete :disabled="loading" @click="archive" />
+          <btn-delete
+            :disabled="loading"
+            :label="$t('admin.objective.delete')"
+            @click="archive"
+          />
         </div>
       </template>
     </template>
diff --git a/src/components/drawers/KpiDrawer.vue b/src/components/drawers/KpiDrawer.vue
index fd83a9fad..54d6de85c 100644
--- a/src/components/drawers/KpiDrawer.vue
+++ b/src/components/drawers/KpiDrawer.vue
@@ -206,7 +206,11 @@
           :text="$t('kpi.archived')"
         />
         <div v-else class="button-row">
-          <btn-delete :disabled="loading" @click="archive" />
+          <btn-delete
+            :disabled="loading"
+            :label="$t('admin.measurement.delete')"
+            @click="archive"
+          />
         </div>
       </template>
     </template>
diff --git a/src/locale/locales/en-US.json b/src/locale/locales/en-US.json
index 02e5e0575..f7b2db6b9 100644
--- a/src/locale/locales/en-US.json
+++ b/src/locale/locales/en-US.json
@@ -419,6 +419,7 @@
     "item": {
       "change": "Edit {name}",
       "updated": "{name} was updated!",
+      "delete": "Delete {name}",
       "slugChangeInfo": "When changing the name of this item, the address to it might also change. In that case you will be automatically redirected after saving the form.",
       "redirectInfo": "You will be redirected in {count} seconds."
     },
@@ -427,19 +428,22 @@
       "created": "Objective was created!",
       "updated": "Objective was updated!",
       "change": "Edit objective",
+      "delete": "Delete objective",
       "useLastPeriod": "Set to last used period:"
     },
     "keyResult": {
       "new": "New key result",
       "created": "Key result was created!",
       "updated": "Key result was updated!",
-      "change": "Edit key result"
+      "change": "Edit key result",
+      "delete": "Delete key result"
     },
     "measurement": {
       "new": "New measurement",
       "created": "Measurement created!",
       "updated": "Measurement updated!",
-      "change": "Edit measurement"
+      "change": "Edit measurement",
+      "delete": "Delete measurement"
     },
     "apiSecret": "If you are using the API to update key results and/or measurements, you need to write an API Secret UUID here for the API call header (okr-team-secret)",
     "apiDocs": "API documentation",
diff --git a/src/locale/locales/nb-NO.json b/src/locale/locales/nb-NO.json
index e038281df..a3819aa2c 100644
--- a/src/locale/locales/nb-NO.json
+++ b/src/locale/locales/nb-NO.json
@@ -419,6 +419,7 @@
     "item": {
       "change": "Rediger {name}",
       "updated": "{name} ble endret!",
+      "delete": "Slett {name}",
       "slugChangeInfo": "Endring av navn kan også resultere i at gjeldende adresse for \"{name}\" endres. Du blir i så fall automatisk videresendt til den nye adressen etter at skjemaet lagres.",
       "redirectInfo": "Du videresendes om {count} sekunder."
     },
@@ -427,19 +428,22 @@
       "created": "Målet ble opprettet!",
       "updated": "Målet ble endret!",
       "change": "Rediger mål",
+      "delete": "Slett mål",
       "useLastPeriod": "Sett til sist brukte periode:"
     },
     "keyResult": {
       "new": "Nytt nøkkelresultat",
       "created": "Nøkkelresultatet ble opprettet!",
       "updated": "Nøkkelresultatet ble endret!",
-      "change": "Rediger Nøkkelresultat"
+      "change": "Rediger Nøkkelresultat",
+      "delete": "Slett nøkkelresultat"
     },
     "measurement": {
       "new": "Legg til måling",
       "created": "Målingen ble opprettet!",
       "updated": "Målingen ble endret!",
-      "change": "Rediger måling"
+      "change": "Rediger måling",
+      "delete": "Slett måling"
     },
     "apiSecret": "Hvis du har tenkt til å bruke API-et for å oppdatere nøkkelresultater og/eller målinger, så trenger du å skrive inn en streng her som legges inn i headeren til kallet (okr-team-secret)",
     "apiDocs": "API-dokumentasjon",