Merge branch 'mealie-next' into feat/standardize-units

This commit is contained in:
Michael Genson
2026-02-26 16:53:15 +00:00
19 changed files with 2429 additions and 2340 deletions

View File

@@ -95,6 +95,8 @@
<GroupDataPage
:icon="$globals.icons.units"
:title="$t('general.units')"
:create-title="$t('data-pages.units.create-unit')"
:edit-title="$t('data-pages.units.edit-unit')"
:table-headers="tableHeaders"
:table-config="tableConfig"
:data="unitStore || []"
@@ -247,22 +249,26 @@ type StandardizedUnitTypeOption = {
const formItems = computed<AutoFormItems>(() => [
{
cols: 8,
label: i18n.t("general.name"),
varName: "name",
type: fieldTypes.TEXT,
rules: [validators.required],
},
{
label: i18n.t("general.plural-name"),
varName: "pluralName",
type: fieldTypes.TEXT,
},
{
cols: 4,
label: i18n.t("data-pages.units.abbreviation"),
varName: "abbreviation",
type: fieldTypes.TEXT,
},
{
cols: 8,
label: i18n.t("general.plural-name"),
varName: "pluralName",
type: fieldTypes.TEXT,
},
{
cols: 4,
label: i18n.t("data-pages.units.plural-abbreviation"),
varName: "pluralAbbreviation",
type: fieldTypes.TEXT,
@@ -273,11 +279,14 @@ const formItems = computed<AutoFormItems>(() => [
type: fieldTypes.TEXT,
},
{
section: i18n.t("general.settings"),
cols: 4,
label: i18n.t("data-pages.units.use-abbv"),
varName: "useAbbreviation",
type: fieldTypes.BOOLEAN,
},
{
cols: 4,
label: i18n.t("data-pages.units.fraction"),
varName: "fraction",
type: fieldTypes.BOOLEAN,