diff --git a/vue3/src/components/dialogs/StepIngredientSorterDialog.vue b/vue3/src/components/dialogs/StepIngredientSorterDialog.vue
index 5a3069bef..5d9ee212a 100644
--- a/vue3/src/components/dialogs/StepIngredientSorterDialog.vue
+++ b/vue3/src/components/dialogs/StepIngredientSorterDialog.vue
@@ -7,24 +7,28 @@
- {{ $t('First') }}
- {{
- $t('Up')
- }}
-
- {{ $t('Down') }}
-
- {{ $t('Last') }}
-
+
+ {{ $t('First') }}
+
+ {{
+ $t('Up')
+ }}
+
+ {{ $t('Down') }}
+
+ {{ $t('Last') }}
+
+
+
{{ $t('Step') }}
{{ i + 1 }} {{ s.name }}
- {{$t('Close')}}
+ {{ $t('Close') }}
@@ -39,8 +43,8 @@ import {ref, watch} from "vue";
import {useDisplay} from "vuetify/framework";
const dialog = defineModel({required: true, default: false})
-const step = defineModel('step', {required: true})
-const recipe = defineModel('recipe', {required: true})
+const step = defineModel('step', {required: true})
+const recipe = defineModel('recipe', {required: true})
const props = defineProps({
stepIndex: {type: Number, required: true},
ingredientIndex: {type: Number, required: true},
diff --git a/vue3/src/components/inputs/StepEditor.vue b/vue3/src/components/inputs/StepEditor.vue
index 493ce61e1..5eda06431 100644
--- a/vue3/src/components/inputs/StepEditor.vue
+++ b/vue3/src/components/inputs/StepEditor.vue
@@ -91,7 +91,10 @@
$t('Move')
}}
-
+
+ {{$t('Original_Text')}}
+ {{ ingredient.originalText}}
+
@@ -178,6 +181,7 @@
+
{{ $t('Recipe') }}
{{ $t('Steps') }}
{{ $t('Properties') }}
- {{ $t('Settings') }}
+ {{ $t('Miscellaneous') }}
@@ -24,7 +24,7 @@
-
+
@@ -99,9 +99,9 @@
v-model="editingObj.showIngredientOverview">
-
+
+ append-to-body v-if="editingObj._private">
diff --git a/vue3/src/composables/useModelEditorFunctions.ts b/vue3/src/composables/useModelEditorFunctions.ts
index b0590eded..f58a4bb0f 100644
--- a/vue3/src/composables/useModelEditorFunctions.ts
+++ b/vue3/src/composables/useModelEditorFunctions.ts
@@ -153,9 +153,8 @@ export function useModelEditorFunctions(modelName: EditorSupportedModels, emi
let name = ''
-
if (editingObj.value.id) {
- name = modelClass.value.getLabel(editingObj.value, useUserPreferenceStore().serverSettings.debug)
+ name = modelClass.value.getLabel(editingObj.value)
}
if (name == '') {
diff --git a/vue3/src/locales/ar.json b/vue3/src/locales/ar.json
index 7fa916e50..538d3ff88 100644
--- a/vue3/src/locales/ar.json
+++ b/vue3/src/locales/ar.json
@@ -578,6 +578,7 @@
"today_recipes": "",
"tree_root": "",
"tree_select": "",
+ "unsaved": "",
"updatedon": "",
"view_recipe": "",
"warning_duplicate_filter": "",
diff --git a/vue3/src/locales/bg.json b/vue3/src/locales/bg.json
index f624e740e..6c65cf46b 100644
--- a/vue3/src/locales/bg.json
+++ b/vue3/src/locales/bg.json
@@ -565,6 +565,7 @@
"today_recipes": "Днешните рецепти",
"tree_root": "Корен на дървото",
"tree_select": "Използвайте Избор на дърво",
+ "unsaved": "",
"updatedon": "Актуализирано на",
"view_recipe": "Вижте рецепта",
"warning_duplicate_filter": "Предупреждение: Поради технически ограничения наличието на множество филтри от една и съща комбинация (и/или/не) може да доведе до неочаквани резултати.",
diff --git a/vue3/src/locales/ca.json b/vue3/src/locales/ca.json
index 4d9af3455..4b69041f4 100644
--- a/vue3/src/locales/ca.json
+++ b/vue3/src/locales/ca.json
@@ -708,6 +708,7 @@
"tree_root": "",
"tree_select": "",
"tsp": "",
+ "unsaved": "",
"updatedon": "",
"view_recipe": "",
"warning_duplicate_filter": "",
diff --git a/vue3/src/locales/cs.json b/vue3/src/locales/cs.json
index c532d062c..512bb92be 100644
--- a/vue3/src/locales/cs.json
+++ b/vue3/src/locales/cs.json
@@ -701,6 +701,7 @@
"tree_root": "Kořen stromu",
"tree_select": "Použít stromový výběr",
"tsp": "lžička [tsp] (US, objem)",
+ "unsaved": "",
"updatedon": "Upraveno",
"view_recipe": "Zobrazit recept",
"warning_duplicate_filter": "Varování: Kvůli technickým omezení může použití několika filtrů se stejnou kombinací (a/nebo/ne) přinést neočekávaný výsledek.",
diff --git a/vue3/src/locales/da.json b/vue3/src/locales/da.json
index 029895834..8bc48bc15 100644
--- a/vue3/src/locales/da.json
+++ b/vue3/src/locales/da.json
@@ -679,6 +679,7 @@
"tree_root": "Roden af træet",
"tree_select": "Benyt træ vælger",
"tsp": "teaspoon [tsp] (US, volumen)",
+ "unsaved": "",
"updatedon": "Opdateret den",
"view_recipe": "Vis opskrift",
"warning_duplicate_filter": "Advarsel: På grund af tekniske begrænsninger, kan det give uforventede resultater at have flere filtre med den samme kombination af (og/eller/not).",
diff --git a/vue3/src/locales/de.json b/vue3/src/locales/de.json
index cc038a0fa..8f973b051 100644
--- a/vue3/src/locales/de.json
+++ b/vue3/src/locales/de.json
@@ -714,6 +714,7 @@
"tree_root": "Ursprung des Baums",
"tree_select": "Baum-Auswahl verwenden",
"tsp": "Teelöffel [tsp] (US, Volumen)",
+ "unsaved": "nicht gespeichert",
"updatedon": "Geändert am",
"view_recipe": "Rezept anschauen",
"warning_duplicate_filter": "Warnung: Wegen technischen Limitierungen können mehrere Filter der selben Kombination (und/oder/nicht) zu unerwarteten Ergebnissen führen.",
diff --git a/vue3/src/locales/el.json b/vue3/src/locales/el.json
index cc04e9115..8a2f06488 100644
--- a/vue3/src/locales/el.json
+++ b/vue3/src/locales/el.json
@@ -662,6 +662,7 @@
"tree_root": "Ρίζα του δέντρου",
"tree_select": "Χρήση επιλογής δέντρου",
"tsp": "κουτάλι του γλυκού [tsp] (ΗΠΑ, όγκος)",
+ "unsaved": "",
"updatedon": "Ενημερώθηκε στις",
"view_recipe": "Εμφάνιση συνταγής",
"warning_duplicate_filter": "Προειδοποίηση: Λόγω τεχνικών περιορισμών η ύπαρξη πολλαπλών φίλτρων με τους ίδιους συνδυασμούς (και/ή/όχι) μπορεί να οδηγήσει σε απρόσμενα αποτελέσματα.",
diff --git a/vue3/src/locales/en.json b/vue3/src/locales/en.json
index 86e7c8756..7d53e5e9f 100644
--- a/vue3/src/locales/en.json
+++ b/vue3/src/locales/en.json
@@ -711,6 +711,7 @@
"tree_root": "Root of Tree",
"tree_select": "Use Tree Selection",
"tsp": "teaspoon [tsp] (US, volume)",
+ "unsaved": "unsaved",
"updatedon": "Updated On",
"view_recipe": "View Recipe",
"warning_duplicate_filter": "Warning: Due to technical limitations having multiple filters of the same combination (and/or/not) might yield unexpected results.",
diff --git a/vue3/src/locales/es.json b/vue3/src/locales/es.json
index 14761ed04..f5fb12c53 100644
--- a/vue3/src/locales/es.json
+++ b/vue3/src/locales/es.json
@@ -708,6 +708,7 @@
"tree_root": "Raíz del Árbol",
"tree_select": "Usar Selección en Árbol",
"tsp": "cucharadita [tsp] (US, volumen)",
+ "unsaved": "",
"updatedon": "Actualizado En",
"view_recipe": "Ver Receta",
"warning_duplicate_filter": "Aviso: Debido a limitaciones técnicas tener multiples filtros de la misma combinación (y/o/no - and/or/not) puede causar resultados inesperados.",
diff --git a/vue3/src/locales/fi.json b/vue3/src/locales/fi.json
index a92500216..3dba674b5 100644
--- a/vue3/src/locales/fi.json
+++ b/vue3/src/locales/fi.json
@@ -371,5 +371,6 @@
"to_navigate": "",
"to_select": "",
"tree_root": "Root of Tree",
+ "unsaved": "",
"warning_feature_beta": "Tämä ominaisuus on BETA (testaus) vaiheessa. Bugeja ja hajottavia muutoksia saattaa ilmaantua tulevaisuudessa tätä ominaisuutta (mahdollisesti menettää ominaisuuksiin liittyvää tietoa) käytettäessä."
}
\ No newline at end of file
diff --git a/vue3/src/locales/fr.json b/vue3/src/locales/fr.json
index a0f746519..7e5b58869 100644
--- a/vue3/src/locales/fr.json
+++ b/vue3/src/locales/fr.json
@@ -694,6 +694,7 @@
"total": "total",
"tree_root": "Racine de l’arbre",
"tree_select": "Utiliser l'arbre de sélection",
+ "unsaved": "",
"updatedon": "Mis à jour le",
"view_recipe": "Voir la recette",
"warning_duplicate_filter": "Attention : en raison de limitations techniques, l'emploi de multiples filtres (and/or/not) peut mener à des résultats inattendus.",
diff --git a/vue3/src/locales/he.json b/vue3/src/locales/he.json
index 8041226b2..17b205ce3 100644
--- a/vue3/src/locales/he.json
+++ b/vue3/src/locales/he.json
@@ -709,6 +709,7 @@
"tree_root": "מקור העץ",
"tree_select": "השתמש בבחירת עץ",
"tsp": "כפית",
+ "unsaved": "",
"updatedon": "עודכן ב",
"view_recipe": "הצג מתכון",
"warning_duplicate_filter": "אזהרה: בשל אתגרים טכנולוגיים, השימוש במספר מסננים בעל אותו צירוף עלול לגרום לתוצאות בלתי צפויות.",
diff --git a/vue3/src/locales/hu.json b/vue3/src/locales/hu.json
index 28f55a393..9fd8204a5 100644
--- a/vue3/src/locales/hu.json
+++ b/vue3/src/locales/hu.json
@@ -667,6 +667,7 @@
"tree_root": "",
"tree_select": "",
"tsp": "teáskanál [tsp] (USA, térfogat)",
+ "unsaved": "",
"updatedon": "Frissítve",
"view_recipe": "Recept megtekintése",
"warning_duplicate_filter": "Figyelem! A technikai megkötések miatt több azonos kombinációjú szűrő (és/vagy nem) használata nem várt eredményt adhat.",
diff --git a/vue3/src/locales/hy.json b/vue3/src/locales/hy.json
index 6b37e96b2..6cd788d99 100644
--- a/vue3/src/locales/hy.json
+++ b/vue3/src/locales/hy.json
@@ -281,5 +281,6 @@
"to_close": "",
"to_navigate": "",
"to_select": "",
+ "unsaved": "",
"warning_feature_beta": "Այս հատկությունը ԲԵՏԱ տարբերակում է։ Ակնկալեք սխալներ և անգամ խափանող թարմացումներ ապագայում։"
}
\ No newline at end of file
diff --git a/vue3/src/locales/id.json b/vue3/src/locales/id.json
index 86caebe63..81ae3eb6d 100644
--- a/vue3/src/locales/id.json
+++ b/vue3/src/locales/id.json
@@ -603,6 +603,7 @@
"today_recipes": "",
"tree_root": "",
"tree_select": "",
+ "unsaved": "",
"updatedon": "",
"view_recipe": "",
"warning_duplicate_filter": "",
diff --git a/vue3/src/locales/is.json b/vue3/src/locales/is.json
index 194cf4b5c..d6b315b69 100644
--- a/vue3/src/locales/is.json
+++ b/vue3/src/locales/is.json
@@ -707,6 +707,7 @@
"tree_root": "",
"tree_select": "",
"tsp": "",
+ "unsaved": "",
"updatedon": "",
"view_recipe": "",
"warning_duplicate_filter": "",
diff --git a/vue3/src/locales/it.json b/vue3/src/locales/it.json
index dd08daef9..f8d3c6434 100644
--- a/vue3/src/locales/it.json
+++ b/vue3/src/locales/it.json
@@ -619,6 +619,7 @@
"today_recipes": "Ricette di oggi",
"tree_root": "Radice dell'albero",
"tree_select": "Usa selezione ad albero",
+ "unsaved": "",
"updatedon": "Aggiornato il",
"view_recipe": "Mostra ricetta",
"warning_duplicate_filter": "Avviso: a causa di limitazioni tecniche, usare più filtri di ricerca della stessa combinazione (and/or/not) potrebbe portare a risultati inaspettati.",
diff --git a/vue3/src/locales/lt.json b/vue3/src/locales/lt.json
index c33b95f7f..19857514a 100644
--- a/vue3/src/locales/lt.json
+++ b/vue3/src/locales/lt.json
@@ -677,6 +677,7 @@
"tree_root": "",
"tree_select": "",
"tsp": "",
+ "unsaved": "",
"updatedon": "",
"view_recipe": "",
"warning_duplicate_filter": "",
diff --git a/vue3/src/locales/nb_NO.json b/vue3/src/locales/nb_NO.json
index dbb8d3732..cc377e4c5 100644
--- a/vue3/src/locales/nb_NO.json
+++ b/vue3/src/locales/nb_NO.json
@@ -642,6 +642,7 @@
"today_recipes": "",
"tree_root": "Rot av tre",
"tree_select": "",
+ "unsaved": "",
"updatedon": "",
"view_recipe": "",
"warning_duplicate_filter": "",
diff --git a/vue3/src/locales/nl.json b/vue3/src/locales/nl.json
index 19b065fd3..91d38d05f 100644
--- a/vue3/src/locales/nl.json
+++ b/vue3/src/locales/nl.json
@@ -666,6 +666,7 @@
"tree_root": "Hoogste niveau",
"tree_select": "Gebruik boomselectie",
"tsp": "theelepel [tsp] (VS, volume)",
+ "unsaved": "",
"updatedon": "Geüpdatet op",
"view_recipe": "Bekijk recept",
"warning_duplicate_filter": "Waarschuwing: door technische beperkingen kan het hebben van meerdere filters of dezelfde combinatie (en/of/niet) tot onverwachte resultaten leiden.",
diff --git a/vue3/src/locales/pl.json b/vue3/src/locales/pl.json
index 850afba53..5440c9c25 100644
--- a/vue3/src/locales/pl.json
+++ b/vue3/src/locales/pl.json
@@ -711,6 +711,7 @@
"tree_root": "Poziom główny drzewa",
"tree_select": "Użyj drzewa wyboru",
"tsp": "łyżeczka [tsp] (USA, objętość)",
+ "unsaved": "",
"updatedon": "Zaktualizowano dnia",
"view_recipe": "Zobacz przepis",
"warning_duplicate_filter": "Ostrzeżenie: Ze względu na ograniczenia techniczne posiadanie wielu filtrów o tej samej kombinacji (i/lub/nie) może dać nieoczekiwane wyniki.",
diff --git a/vue3/src/locales/pt.json b/vue3/src/locales/pt.json
index 9e9db551c..f9b5bba45 100644
--- a/vue3/src/locales/pt.json
+++ b/vue3/src/locales/pt.json
@@ -558,6 +558,7 @@
"today_recipes": "",
"tree_root": "Raiz da árvore",
"tree_select": "",
+ "unsaved": "",
"updatedon": "Atualizado em",
"view_recipe": "",
"warning_duplicate_filter": "",
diff --git a/vue3/src/locales/pt_BR.json b/vue3/src/locales/pt_BR.json
index 4ac095382..ac7e1024e 100644
--- a/vue3/src/locales/pt_BR.json
+++ b/vue3/src/locales/pt_BR.json
@@ -670,6 +670,7 @@
"total": "total",
"tree_root": "Raiz",
"tree_select": "Usar Árvore de Seleção",
+ "unsaved": "",
"updatedon": "Atualizado Em",
"view_recipe": "Visualizar receita",
"warning_duplicate_filter": "Aviso: Por limitações técnicas, ter múltiplos filtros de uma mesma combinação (e, ou, não) pode ocasionar resultados inesperados.",
diff --git a/vue3/src/locales/ro.json b/vue3/src/locales/ro.json
index ae0474f17..12580424b 100644
--- a/vue3/src/locales/ro.json
+++ b/vue3/src/locales/ro.json
@@ -624,6 +624,7 @@
"today_recipes": "Rețete de astăzi",
"tree_root": "Rădăcina copacului",
"tree_select": "Utilizarea selecției arborilor",
+ "unsaved": "",
"updatedon": "Actualizat la data de",
"view_recipe": "Vizionează rețeta",
"warning_duplicate_filter": "Atenționare: Din cauza limitărilor tehnice care au mai multe filtre de aceeași combinație (și/sau/nu) ar putea da rezultate neașteptate.",
diff --git a/vue3/src/locales/ru.json b/vue3/src/locales/ru.json
index 44b5e5428..c9dd1a941 100644
--- a/vue3/src/locales/ru.json
+++ b/vue3/src/locales/ru.json
@@ -494,6 +494,7 @@
"to_select": "",
"tree_root": "Главный элемент",
"tree_select": "Выбор дерева для использования",
+ "unsaved": "",
"updatedon": "Обновлено",
"view_recipe": "Посмотреть рецепт",
"warning_feature_beta": "Данный функционал находится в стадии BETA (тестируется). Возможны баги и серьезные изменения функционала в будущем.",
diff --git a/vue3/src/locales/sl.json b/vue3/src/locales/sl.json
index cae0cb524..807e8b923 100644
--- a/vue3/src/locales/sl.json
+++ b/vue3/src/locales/sl.json
@@ -465,6 +465,7 @@
"today_recipes": "Današnji recepti",
"tree_root": "",
"tree_select": "Uporabi drevesno označbo",
+ "unsaved": "",
"warning_feature_beta": "Ta funkcija je trenutno v stanju BETA (testiranje). Pri uporabi te funkcije pričakujte napake in morebitne prelomne spremembe v prihodnosti (morda izgubite podatke, povezane s to funkcijo).",
"warning_space_delete": "Izbrišete lahko svoj prostor, vključno z vsemi recepti, nakupovalnimi seznami, načrti obrokov in vsem drugim, kar ste ustvarili. Tega ni mogoče preklicati! Ste prepričani, da želite to storiti?"
}
\ No newline at end of file
diff --git a/vue3/src/locales/sv.json b/vue3/src/locales/sv.json
index 9fd61fa28..e99c451ba 100644
--- a/vue3/src/locales/sv.json
+++ b/vue3/src/locales/sv.json
@@ -711,6 +711,7 @@
"tree_root": "Roten av trädet",
"tree_select": "Använd trädval",
"tsp": "tesked [tsp] (US, volym)",
+ "unsaved": "",
"updatedon": "Uppdaterad den",
"view_recipe": "Visa recept",
"warning_duplicate_filter": "Varning: På grund av tekniska begränsningar kan flera filter av samma kombination (och/eller/inte) ge oväntade resultat.",
diff --git a/vue3/src/locales/tr.json b/vue3/src/locales/tr.json
index 9ed5e29f7..37531d4d3 100644
--- a/vue3/src/locales/tr.json
+++ b/vue3/src/locales/tr.json
@@ -709,6 +709,7 @@
"tree_root": "Ağaç Kökü",
"tree_select": "Ağaç Seçimini Kullan",
"tsp": "çay kaşığı [tsp] (ABD, hacim)",
+ "unsaved": "",
"updatedon": "Güncelleme Zamanı",
"view_recipe": "Tarif Görüntüle",
"warning_duplicate_filter": "Uyarı: Teknik sınırlamalar nedeniyle aynı kombinasyona sahip (ve/veya/değil) birden fazla filtreye sahip olmak beklenmedik sonuçlara yol açabilir.",
diff --git a/vue3/src/locales/uk.json b/vue3/src/locales/uk.json
index 01b4a09df..4e8893f09 100644
--- a/vue3/src/locales/uk.json
+++ b/vue3/src/locales/uk.json
@@ -584,6 +584,7 @@
"today_recipes": "",
"tree_root": "Корінь Дерева",
"tree_select": "",
+ "unsaved": "",
"updatedon": "",
"view_recipe": "",
"warning_duplicate_filter": "",
diff --git a/vue3/src/locales/zh_Hans.json b/vue3/src/locales/zh_Hans.json
index 5ae37b9eb..9c74f9ba7 100644
--- a/vue3/src/locales/zh_Hans.json
+++ b/vue3/src/locales/zh_Hans.json
@@ -701,6 +701,7 @@
"tree_root": "树根",
"tree_select": "使用树形选择",
"tsp": "茶匙【tsp】(美制,体积)",
+ "unsaved": "",
"updatedon": "更新时间",
"view_recipe": "查看食谱",
"warning_duplicate_filter": "警告:由于技术限制,使用相同组合(和/或/不)的多个筛选器可能会产生意想不到的结果。",
diff --git a/vue3/src/locales/zh_Hant.json b/vue3/src/locales/zh_Hant.json
index ad354f1b3..d91a43e1f 100644
--- a/vue3/src/locales/zh_Hant.json
+++ b/vue3/src/locales/zh_Hant.json
@@ -258,6 +258,7 @@
"to_close": "",
"to_navigate": "",
"to_select": "",
+ "unsaved": "",
"warning_feature_beta": "此功能目前處於測試階段 (BETA)。使用此功能時,請預期可能會有漏洞和破壞性變更,未來可能會丟失與功能相關的數據。",
"warning_space_delete": "您可以刪除您的空間,包括所有食譜、購物清單、餐飲計畫以及其他您創建的內容。此操作無法撤銷!您確定要這樣做嗎?"
}
\ No newline at end of file
diff --git a/vue3/src/types/Models.ts b/vue3/src/types/Models.ts
index 473362625..37c1b5634 100644
--- a/vue3/src/types/Models.ts
+++ b/vue3/src/types/Models.ts
@@ -735,16 +735,11 @@ export class GenericModel {
/**
* gets a label for a specific object instance using the model toStringKeys property
* @param obj obj to get label for
- * @param includeId debug function to include the ID as part of the object label
*/
- getLabel(obj: EditorSupportedTypes, includeId?: boolean) {
+ getLabel(obj: EditorSupportedTypes) {
let name = ''
if (obj) {
- if (includeId) {
- name += '#' + obj.id
- }
-
this.model.toStringKeys.forEach(key => {
let value = getNestedProperty(obj, key)
name += ' ' + ((value != null) ? value : '')