From 71f95ca3c6fb493029360129add3f79aaf896252 Mon Sep 17 00:00:00 2001 From: boc-the-git <3479092+boc-the-git@users.noreply.github.com> Date: Thu, 16 Nov 2023 01:55:46 +1100 Subject: [PATCH 01/54] Update bug-report.yaml (#2724) --- .github/ISSUE_TEMPLATE/bug-report.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml index 8c4e8d114627..7994b9d3fb1b 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yaml +++ b/.github/ISSUE_TEMPLATE/bug-report.yaml @@ -12,7 +12,7 @@ body: Please confirm and check all the following prior to submission. If you do not do this, your issue may be closed. options: - - label: This is not a feature request + - label: This is not a feature request. required: true - label: I added a very descriptive title to this issue. required: true @@ -22,7 +22,7 @@ body: required: true - label: I already read the docs and didn't find an answer. required: true - - label: This issue can be replicated on the demo site (https://demo.mealie.io/) + - label: This issue can be replicated on the demo site (https://demo.mealie.io/). required: false - type: textarea id: description @@ -41,13 +41,15 @@ body: - type: textarea id: logs attributes: - label: Please provide relevent logs + label: Please provide relevant logs + placeholder: For example from `docker-compose logs` or other system logs. validations: required: true - type: textarea id: version attributes: label: Mealie Version + placeholder: Docker image, as well as 'Build' tag from https://yourmealieurl/admin/site-settings, if UI is working - type: dropdown id: os attributes: From bc575ec5ae955c6e9717500aef7a76f874929138 Mon Sep 17 00:00:00 2001 From: Hayden <64056131+hay-kot@users.noreply.github.com> Date: Wed, 15 Nov 2023 09:24:24 -0600 Subject: [PATCH 02/54] feat: auto detect first login (#2722) * 'hide' default email and password env variables * first login API endpoint * run code-generators * frontend indicators for default username and pw * remove old env variables from docs * fix env set variable * remove password from tests --- .../installation/backend-config.md | 24 +++--- .../use-locales/available-locales.ts | 74 ++++++++-------- frontend/lang/messages/en-US.json | 4 +- frontend/lib/api/types/admin.ts | 19 +++++ frontend/lib/api/types/group.ts | 31 ++++++- frontend/lib/api/types/recipe.ts | 2 +- frontend/lib/api/types/response.ts | 2 + frontend/pages/login.vue | 26 +++++- mealie/app.py | 1 - mealie/core/settings/settings.py | 13 ++- mealie/repos/seed/init_users.py | 12 +-- mealie/routes/app/app_about.py | 22 ++++- mealie/schema/admin/__init__.py | 4 +- mealie/schema/admin/about.py | 9 ++ mealie/schema/recipe/__init__.py | 84 +++++++++---------- mealie/schema/response/__init__.py | 3 +- mealie/schema/user/user.py | 2 +- tests/fixtures/fixture_admin.py | 6 +- .../admin_tests/test_admin_user_actions.py | 4 +- .../user_tests/test_user_login.py | 4 +- tests/unit_tests/test_config.py | 2 - tests/utils/api_routes/__init__.py | 6 ++ 22 files changed, 234 insertions(+), 120 deletions(-) diff --git a/docs/docs/documentation/getting-started/installation/backend-config.md b/docs/docs/documentation/getting-started/installation/backend-config.md index b0cb440edf56..dce06309bc20 100644 --- a/docs/docs/documentation/getting-started/installation/backend-config.md +++ b/docs/docs/documentation/getting-started/installation/backend-config.md @@ -4,19 +4,17 @@ ### General -| Variables | Default | Description | -| ---------------- | :-------------------: | ----------------------------------------------------------------------------------- | -| PUID | 911 | UserID permissions between host OS and container | -| PGID | 911 | GroupID permissions between host OS and container | -| DEFAULT_GROUP | Home | The default group for users | -| DEFAULT_EMAIL | changeme@example.com | The default username for the superuser | -| DEFAULT_PASSWORD | MyPassword | The default password for the superuser | -| BASE_URL | http://localhost:8080 | Used for Notifications | -| TOKEN_TIME | 48 | The time in hours that a login/auth token is valid | -| API_PORT | 9000 | The port exposed by backend API. **Do not change this if you're running in Docker** | -| API_DOCS | True | Turns on/off access to the API documentation locally. | -| TZ | UTC | Must be set to get correct date/time on the server | -| ALLOW_SIGNUP | true | Allow user sign-up without token | +| Variables | Default | Description | +| ------------- | :-------------------: | ----------------------------------------------------------------------------------- | +| PUID | 911 | UserID permissions between host OS and container | +| PGID | 911 | GroupID permissions between host OS and container | +| DEFAULT_GROUP | Home | The default group for users | +| BASE_URL | http://localhost:8080 | Used for Notifications | +| TOKEN_TIME | 48 | The time in hours that a login/auth token is valid | +| API_PORT | 9000 | The port exposed by backend API. **Do not change this if you're running in Docker** | +| API_DOCS | True | Turns on/off access to the API documentation locally. | +| TZ | UTC | Must be set to get correct date/time on the server | +| ALLOW_SIGNUP | true | Allow user sign-up without token | ### Security diff --git a/frontend/composables/use-locales/available-locales.ts b/frontend/composables/use-locales/available-locales.ts index b1322df04fca..d0737020e5c7 100644 --- a/frontend/composables/use-locales/available-locales.ts +++ b/frontend/composables/use-locales/available-locales.ts @@ -3,117 +3,117 @@ export const LOCALES = [ { name: "繁體中文 (Chinese traditional)", value: "zh-TW", - progress: 26, + progress: 28, }, { name: "简体中文 (Chinese simplified)", value: "zh-CN", - progress: 34, + progress: 65, }, { name: "Tiếng Việt (Vietnamese)", value: "vi-VN", - progress: 0, + progress: 2, }, { name: "Українська (Ukrainian)", value: "uk-UA", - progress: 100, + progress: 99, }, { name: "Türkçe (Turkish)", value: "tr-TR", - progress: 47, + progress: 50, }, { name: "Svenska (Swedish)", value: "sv-SE", - progress: 60, + progress: 71, }, { name: "српски (Serbian)", value: "sr-SP", - progress: 2, + progress: 4, }, { name: "Slovenian", value: "sl-SI", - progress: 47, + progress: 49, }, { name: "Slovak", value: "sk-SK", - progress: 99, + progress: 97, }, { name: "Pусский (Russian)", value: "ru-RU", - progress: 31, + progress: 99, }, { name: "Română (Romanian)", value: "ro-RO", - progress: 12, + progress: 32, }, { name: "Português (Portuguese)", value: "pt-PT", - progress: 69, + progress: 99, }, { name: "Português do Brasil (Brazilian Portuguese)", value: "pt-BR", - progress: 97, + progress: 98, }, { name: "Polski (Polish)", value: "pl-PL", - progress: 99, + progress: 97, }, { name: "Norsk (Norwegian)", value: "no-NO", - progress: 73, + progress: 85, }, { name: "Nederlands (Dutch)", value: "nl-NL", - progress: 100, + progress: 98, }, { name: "Latvian", value: "lv-LV", - progress: 0, + progress: 1, }, { name: "Lithuanian", value: "lt-LT", - progress: 99, + progress: 97, }, { name: "한국어 (Korean)", value: "ko-KR", - progress: 3, + progress: 5, }, { name: "日本語 (Japanese)", value: "ja-JP", - progress: 9, + progress: 11, }, { name: "Italiano (Italian)", value: "it-IT", - progress: 98, + progress: 96, }, { name: "Magyar (Hungarian)", value: "hu-HU", - progress: 43, + progress: 99, }, { name: "Croatian", value: "hr-HR", - progress: 100, + progress: 97, }, { name: "עברית (Hebrew)", @@ -123,27 +123,27 @@ export const LOCALES = [ { name: "Galician", value: "gl-ES", - progress: 0, + progress: 1, }, { name: "Français (French)", value: "fr-FR", - progress: 100, + progress: 99, }, { name: "French, Canada", value: "fr-CA", - progress: 54, + progress: 97, }, { name: "Suomi (Finnish)", value: "fi-FI", - progress: 31, + progress: 95, }, { name: "Español (Spanish)", value: "es-ES", - progress: 59, + progress: 76, }, { name: "American English", @@ -153,46 +153,46 @@ export const LOCALES = [ { name: "British English", value: "en-GB", - progress: 2, + progress: 4, }, { name: "Ελληνικά (Greek)", value: "el-GR", - progress: 33, + progress: 35, }, { name: "Deutsch (German)", value: "de-DE", - progress: 100, + progress: 99, }, { name: "Dansk (Danish)", value: "da-DK", - progress: 90, + progress: 100, }, { name: "Čeština (Czech)", value: "cs-CZ", - progress: 60, + progress: 66, }, { name: "Català (Catalan)", value: "ca-ES", - progress: 54, + progress: 61, }, { name: "Bulgarian", value: "bg-BG", - progress: 13, + progress: 99, }, { name: "العربية (Arabic)", value: "ar-SA", - progress: 7, + progress: 16, }, { name: "Afrikaans (Afrikaans)", value: "af-ZA", - progress: 0, + progress: 96, }, ] diff --git a/frontend/lang/messages/en-US.json b/frontend/lang/messages/en-US.json index 1444ab3cafe9..e53f977c35a8 100644 --- a/frontend/lang/messages/en-US.json +++ b/frontend/lang/messages/en-US.json @@ -868,7 +868,9 @@ "user-can-invite-other-to-group": "User can invite other to group", "user-can-manage-group": "User can manage group", "user-can-organize-group-data": "User can organize group data", - "enable-advanced-features": "Enable advanced features" + "enable-advanced-features": "Enable advanced features", + "it-looks-like-this-is-your-first-time-logging-in": "It looks like this is your first time logging in.", + "dont-want-to-see-this-anymore-be-sure-to-change-your-email": "Don't want to see this anymore? Be sure to change your email in your user settings!" }, "language-dialog": { "translated": "translated", diff --git a/frontend/lib/api/types/admin.ts b/frontend/lib/api/types/admin.ts index 6275df0f9253..e11d17f52f15 100644 --- a/frontend/lib/api/types/admin.ts +++ b/frontend/lib/api/types/admin.ts @@ -34,6 +34,9 @@ export interface AppInfo { demoStatus: boolean; allowSignup: boolean; } +export interface AppStartupInfo { + isFirstLogin: boolean; +} export interface AppStatistics { totalRecipes: number; totalUsers: number; @@ -41,6 +44,22 @@ export interface AppStatistics { uncategorizedRecipes: number; untaggedRecipes: number; } +export interface AppTheme { + lightPrimary?: string; + lightAccent?: string; + lightSecondary?: string; + lightSuccess?: string; + lightInfo?: string; + lightWarning?: string; + lightError?: string; + darkPrimary?: string; + darkAccent?: string; + darkSecondary?: string; + darkSuccess?: string; + darkInfo?: string; + darkWarning?: string; + darkError?: string; +} export interface BackupOptions { recipes?: boolean; settings?: boolean; diff --git a/frontend/lib/api/types/group.ts b/frontend/lib/api/types/group.ts index 6e0be1ebe40a..d8aa408fe018 100644 --- a/frontend/lib/api/types/group.ts +++ b/frontend/lib/api/types/group.ts @@ -6,7 +6,14 @@ */ export type WebhookType = "mealplan"; -export type SupportedMigrations = "nextcloud" | "chowdown" | "copymethat" | "paprika" | "mealie_alpha" | "tandoor" | "plantoeat"; +export type SupportedMigrations = + | "nextcloud" + | "chowdown" + | "copymethat" + | "paprika" + | "mealie_alpha" + | "tandoor" + | "plantoeat"; export interface CreateGroupPreferences { privateGroup?: boolean; @@ -263,39 +270,56 @@ export interface RecipeIngredient { } export interface IngredientUnit { name: string; + pluralName?: string; description?: string; extras?: { [k: string]: unknown; }; fraction?: boolean; abbreviation?: string; + pluralAbbreviation?: string; useAbbreviation?: boolean; + aliases?: IngredientUnitAlias[]; id: string; createdAt?: string; updateAt?: string; } +export interface IngredientUnitAlias { + name: string; +} export interface CreateIngredientUnit { name: string; + pluralName?: string; description?: string; extras?: { [k: string]: unknown; }; fraction?: boolean; abbreviation?: string; + pluralAbbreviation?: string; useAbbreviation?: boolean; + aliases?: CreateIngredientUnitAlias[]; +} +export interface CreateIngredientUnitAlias { + name: string; } export interface IngredientFood { name: string; + pluralName?: string; description?: string; extras?: { [k: string]: unknown; }; labelId?: string; + aliases?: IngredientFoodAlias[]; id: string; label?: MultiPurposeLabelSummary; createdAt?: string; updateAt?: string; } +export interface IngredientFoodAlias { + name: string; +} export interface MultiPurposeLabelSummary { name: string; color?: string; @@ -304,11 +328,16 @@ export interface MultiPurposeLabelSummary { } export interface CreateIngredientFood { name: string; + pluralName?: string; description?: string; extras?: { [k: string]: unknown; }; labelId?: string; + aliases?: CreateIngredientFoodAlias[]; +} +export interface CreateIngredientFoodAlias { + name: string; } export interface ShoppingListCreate { name?: string; diff --git a/frontend/lib/api/types/recipe.ts b/frontend/lib/api/types/recipe.ts index 271800ae1f0b..61db519fe5b4 100644 --- a/frontend/lib/api/types/recipe.ts +++ b/frontend/lib/api/types/recipe.ts @@ -465,7 +465,7 @@ export interface ScrapeRecipe { export interface ScrapeRecipeTest { url: string; } -export interface SlugResponse { } +export interface SlugResponse {} export interface TagIn { name: string; } diff --git a/frontend/lib/api/types/response.ts b/frontend/lib/api/types/response.ts index 1ce11f11d853..f111333b372f 100644 --- a/frontend/lib/api/types/response.ts +++ b/frontend/lib/api/types/response.ts @@ -5,6 +5,7 @@ /* Do not modify it by hand - just update the pydantic models and then re-run the script */ +export type OrderByNullPosition = "first" | "last"; export type OrderDirection = "asc" | "desc"; export interface ErrorResponse { @@ -19,6 +20,7 @@ export interface PaginationQuery { page?: number; perPage?: number; orderBy?: string; + orderByNullPosition?: OrderByNullPosition; orderDirection?: OrderDirection & string; queryFilter?: string; paginationSeed?: string; diff --git a/frontend/pages/login.vue b/frontend/pages/login.vue index 546b44720de8..2e6bfcec6b24 100644 --- a/frontend/pages/login.vue +++ b/frontend/pages/login.vue @@ -7,6 +7,18 @@ 'bg-off-white': !$vuetify.theme.dark && !isDark, }" > + +
+

+ {{ $tc('user.it-looks-like-this-is-your-first-time-logging-in')}} +

+

{{ $tc('user.username') }}: changeme@example.com

+

{{ $tc('user.password') }}: MyPassword

+

+ {{ $tc('user.dont-want-to-see-this-anymore-be-sure-to-change-your-email') }} +

+
+ Mealie @@ -101,12 +113,14 @@ From 6f2358106cfe2b1526bc8c9619897c07cd230bfe Mon Sep 17 00:00:00 2001 From: boc-the-git <3479092+boc-the-git@users.noreply.github.com> Date: Tue, 21 Nov 2023 04:15:36 +1100 Subject: [PATCH 48/54] docs: Tidying Doco for iOS (#2735) --- docs/docs/documentation/community-guide/ios.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/docs/documentation/community-guide/ios.md b/docs/docs/documentation/community-guide/ios.md index 8acaa2e025ff..86d5c6bec8b2 100644 --- a/docs/docs/documentation/community-guide/ios.md +++ b/docs/docs/documentation/community-guide/ios.md @@ -23,9 +23,9 @@ First, click the [link](https://www.icloud.com/shortcuts/cc568d1615bc4f998789f85 ![screenshot](../../assets/img/sc1half.png) -Next, you need to replace `url` and `port` with the information for your mealie instance. +Next, you need to replace `url` and `port` with the information for your Mealie instance. -If you have a TLD that you use, put that here with no port. If you just run local, Then, you need to put in your mealie instance IP and the port of `9926`. +If you have a domain that you use (e.g. `https://mealie.example.com`), put that here. If you just run local, then you need to put in your Mealie instance IP and the port you use (e.g. the default is `9925`). ![screenshot](../../assets/img/sc2half.png) @@ -36,4 +36,4 @@ Finally, you need to replace the word `keyhere` with your API token. Keep the wo ![screenshot](../../assets/img/sc3half.png) -You should now be able to share a website to the shortcut and have mealie grab all the necessary information! +You should now be able to share a website to the shortcut and have Mealie grab all the necessary information! From f9742b30d86f49e5fe4ffd3cbb1a11285ab6ebf8 Mon Sep 17 00:00:00 2001 From: boc-the-git <3479092+boc-the-git@users.noreply.github.com> Date: Tue, 21 Nov 2023 04:27:16 +1100 Subject: [PATCH 49/54] docs: Minor doco tidying (#2736) * Fix dead link on roadmap.md * Fix typo * Add hyperlink --- .github/ISSUE_TEMPLATE/config.yml | 4 ++-- MAINTAINERS.md | 2 +- docs/docs/documentation/getting-started/roadmap.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index a70d6373b08e..d3310a660f69 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,4 +1,4 @@ contact_links: - name: Feature Requests - url: https://github.com/hay-kot/mealie/discussions/new?category=feature-request - about: Please add any Feature Requests as a Github Discussion using the for in this issue. + url: https://github.com/mealie-recipes/mealie/discussions/new?category=feature-request + about: Please add any Feature Requests as a Github Discussion using the form in this issue. diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 21c8424a2345..2e4bf7b49a7b 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -1,3 +1,3 @@ # Maintainers Guide -See -> ./docs/docs/contributors/developers-guide/maintainers.md +See -> [/docs/docs/contributors/developers-guide/maintainers.md](/docs/docs/contributors/developers-guide/maintainers.md) diff --git a/docs/docs/documentation/getting-started/roadmap.md b/docs/docs/documentation/getting-started/roadmap.md index bb02a37fde74..fd4b6687650d 100644 --- a/docs/docs/documentation/getting-started/roadmap.md +++ b/docs/docs/documentation/getting-started/roadmap.md @@ -1,7 +1,7 @@ # Development Road Map ## Feature Requests -[Please request new features on Github](https://github.com/hay-kot/mealie/issues/317) +[Please request new features on Github](https://github.com/mealie-recipes/mealie/discussions/new?category=feature-request) ## Progress See the [Github Projects page](https://github.com/users/hay-kot/projects/2) to see what is currently being worked on From 6c2ac73df76175572e0c3f24ea1535dd847e5997 Mon Sep 17 00:00:00 2001 From: Michael Genson <71845777+michael-genson@users.noreply.github.com> Date: Mon, 20 Nov 2023 18:43:44 +0000 Subject: [PATCH 50/54] fixed dead recipe link --- frontend/components/Domain/Recipe/RecipeList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/components/Domain/Recipe/RecipeList.vue b/frontend/components/Domain/Recipe/RecipeList.vue index 982370289ea7..4aa2958d2319 100644 --- a/frontend/components/Domain/Recipe/RecipeList.vue +++ b/frontend/components/Domain/Recipe/RecipeList.vue @@ -7,7 +7,7 @@ :class="attrs.class.sheet" :style="tile ? 'max-width: 100%; width: fit-content;' : 'width: 100%;'" > - + {{ $globals.icons.primary }} From 63ac21bce27f8169dc7158861f898b587cd4251b Mon Sep 17 00:00:00 2001 From: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com> Date: Tue, 21 Nov 2023 15:31:05 +0100 Subject: [PATCH 51/54] feat: Add Categories, Tags and Tools to Manage Data Page (#2737) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add categories * add tags * 🧹 * 🧹 l18n * add tools * remove broken on Hand for tools * fix for tools onHand not updating from frontend * tools: re-add "on Hand" * remove itemized icon from create button * change combine icon * add divider to BaseOverflowButton * divide and conquer --------- Co-authored-by: Michael Genson <71845777+michael-genson@users.noreply.github.com> --- .../Domain/Recipe/RecipeOrganizerDialog.vue | 4 +- .../Domain/Recipe/RecipeOrganizerPage.vue | 5 +- .../components/global/BaseOverflowButton.vue | 38 ++-- frontend/lang/messages/en-US.json | 17 +- frontend/pages/group/data.vue | 20 ++ frontend/pages/group/data/categories.vue | 174 ++++++++++++++++ frontend/pages/group/data/foods.vue | 2 +- frontend/pages/group/data/labels.vue | 5 +- frontend/pages/group/data/tags.vue | 175 ++++++++++++++++ frontend/pages/group/data/tools.vue | 187 ++++++++++++++++++ frontend/pages/group/data/units.vue | 2 +- 11 files changed, 605 insertions(+), 24 deletions(-) create mode 100644 frontend/pages/group/data/categories.vue create mode 100644 frontend/pages/group/data/tags.vue create mode 100644 frontend/pages/group/data/tools.vue diff --git a/frontend/components/Domain/Recipe/RecipeOrganizerDialog.vue b/frontend/components/Domain/Recipe/RecipeOrganizerDialog.vue index e4c90090b31a..378cda2b061b 100644 --- a/frontend/components/Domain/Recipe/RecipeOrganizerDialog.vue +++ b/frontend/components/Domain/Recipe/RecipeOrganizerDialog.vue @@ -131,8 +131,8 @@ export default defineComponent({ async function select() { if (store) { - // @ts-ignore - only property really required is the name - await store.actions.createOne({ name: state.name }); + // @ts-expect-error the same state is used for different organizer types, which have different requirements + await store.actions.createOne({ ...state }); } const newItem = store.items.value.find((item) => item.name === state.name); diff --git a/frontend/components/Domain/Recipe/RecipeOrganizerPage.vue b/frontend/components/Domain/Recipe/RecipeOrganizerPage.vue index 2f832470b312..9d8c035fd9d9 100644 --- a/frontend/components/Domain/Recipe/RecipeOrganizerPage.vue +++ b/frontend/components/Domain/Recipe/RecipeOrganizerPage.vue @@ -16,6 +16,7 @@ + @@ -75,7 +76,7 @@ import Fuse from "fuse.js"; import { defineComponent, computed, ref, reactive, useContext, useRoute } from "@nuxtjs/composition-api"; import { useContextPresets } from "~/composables/use-context-presents"; import RecipeOrganizerDialog from "~/components/Domain/Recipe/RecipeOrganizerDialog.vue"; -import { RecipeOrganizer } from "~/lib/api/types/non-generated"; +import { Organizer, RecipeOrganizer } from "~/lib/api/types/non-generated"; import { useRouteQuery } from "~/composables/use-router"; import { deepCopy } from "~/composables/use-utils"; @@ -83,6 +84,7 @@ interface GenericItem { id: string; name: string; slug: string; + onHand: boolean; } export default defineComponent({ @@ -217,6 +219,7 @@ export default defineComponent({ updateTarget, deleteOne, deleteTarget, + Organizer, presets, itemsSorted, searchString, diff --git a/frontend/components/global/BaseOverflowButton.vue b/frontend/components/global/BaseOverflowButton.vue index d8f1820ba024..6c9aef686a02 100644 --- a/frontend/components/global/BaseOverflowButton.vue +++ b/frontend/components/global/BaseOverflowButton.vue @@ -14,33 +14,42 @@ - - - {{ item.icon }} - - {{ item.text }} - + - + - - - {{ item.icon }} - - {{ item.text }} - + @@ -64,6 +73,7 @@ export interface MenuItem { to?: string; value?: string; event?: string; + divider?: boolean; } export default defineComponent({ diff --git a/frontend/lang/messages/en-US.json b/frontend/lang/messages/en-US.json index e53f977c35a8..c42c09c00cf9 100644 --- a/frontend/lang/messages/en-US.json +++ b/frontend/lang/messages/en-US.json @@ -953,7 +953,22 @@ "select-data": "Select Data", "select-language": "Select Language", "columns": "Columns", - "combine": "Combine" + "combine": "Combine", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "User Registration", diff --git a/frontend/pages/group/data.vue b/frontend/pages/group/data.vue index 70349df329ef..1e40c55a7dc4 100644 --- a/frontend/pages/group/data.vue +++ b/frontend/pages/group/data.vue @@ -44,6 +44,9 @@ export default defineComponent({ foods: i18n.tc("general.foods"), units: i18n.tc("general.units"), labels: i18n.tc("data-pages.labels.labels"), + categories: i18n.tc("category.categories"), + tags: i18n.tc("tag.tags"), + tools: i18n.tc("tool.tools"), }; const route = useRoute(); @@ -53,6 +56,7 @@ export default defineComponent({ text: i18n.t("general.recipes"), value: "new", to: "/group/data/recipes", + divider: true, }, { text: i18n.t("general.foods"), @@ -68,7 +72,23 @@ export default defineComponent({ text: i18n.t("data-pages.labels.labels"), value: "new", to: "/group/data/labels", + divider: true, }, + { + text: i18n.t("category.categories"), + value: "new", + to: "/group/data/categories", + }, + { + text: i18n.t("tag.tags"), + value: "new", + to: "/group/data/tags", + }, + { + text: i18n.t("tool.tools"), + value: "new", + to: "/group/data/tools", + } ]); const buttonText = computed(() => { diff --git a/frontend/pages/group/data/categories.vue b/frontend/pages/group/data/categories.vue new file mode 100644 index 000000000000..856178ba8ed3 --- /dev/null +++ b/frontend/pages/group/data/categories.vue @@ -0,0 +1,174 @@ + + + diff --git a/frontend/pages/group/data/foods.vue b/frontend/pages/group/data/foods.vue index d722f77e203c..642f5e48248c 100644 --- a/frontend/pages/group/data/foods.vue +++ b/frontend/pages/group/data/foods.vue @@ -168,7 +168,7 @@ diff --git a/frontend/pages/group/data/labels.vue b/frontend/pages/group/data/labels.vue index c748d448be09..cc10fb1f6fe1 100644 --- a/frontend/pages/group/data/labels.vue +++ b/frontend/pages/group/data/labels.vue @@ -90,10 +90,7 @@ @edit-one="editEventHandler" > From 23e398e0dfc1917e6af83b5b0f631815283dcbf6 Mon Sep 17 00:00:00 2001 From: Hayden <64056131+hay-kot@users.noreply.github.com> Date: Tue, 21 Nov 2023 12:00:22 -0600 Subject: [PATCH 52/54] New Crowdin updates (#2747) * New translations en-us.json (Romanian) * New translations en-us.json (French) * New translations en-us.json (Spanish) * New translations en-us.json (Afrikaans) * New translations en-us.json (Arabic) * New translations en-us.json (Bulgarian) * New translations en-us.json (Catalan) * New translations en-us.json (Czech) * New translations en-us.json (Danish) * New translations en-us.json (German) * New translations en-us.json (Greek) * New translations en-us.json (Finnish) * New translations en-us.json (Hebrew) * New translations en-us.json (Hungarian) * New translations en-us.json (Italian) * New translations en-us.json (Japanese) * New translations en-us.json (Korean) * New translations en-us.json (Lithuanian) * New translations en-us.json (Dutch) * New translations en-us.json (Norwegian) * New translations en-us.json (Polish) * New translations en-us.json (Portuguese) * New translations en-us.json (Russian) * New translations en-us.json (Slovak) * New translations en-us.json (Slovenian) * New translations en-us.json (Serbian (Cyrillic)) * New translations en-us.json (Serbian (Cyrillic)) * New translations en-us.json (Serbian (Cyrillic)) * New translations en-us.json (Serbian (Cyrillic)) * New translations en-us.json (Swedish) * New translations en-us.json (Turkish) * New translations en-us.json (Ukrainian) * New translations en-us.json (Chinese Simplified) * New translations en-us.json (Chinese Traditional) * New translations en-us.json (Vietnamese) * New translations en-us.json (Galician) * New translations en-us.json (Portuguese, Brazilian) * New translations en-us.json (Croatian) * New translations en-us.json (Latvian) * New translations en-us.json (English, United Kingdom) * New translations en-us.json (French, Canada) --- frontend/lang/messages/af-ZA.json | 17 +- frontend/lang/messages/ar-SA.json | 17 +- frontend/lang/messages/bg-BG.json | 17 +- frontend/lang/messages/ca-ES.json | 17 +- frontend/lang/messages/cs-CZ.json | 17 +- frontend/lang/messages/da-DK.json | 17 +- frontend/lang/messages/de-DE.json | 17 +- frontend/lang/messages/el-GR.json | 17 +- frontend/lang/messages/en-GB.json | 17 +- frontend/lang/messages/es-ES.json | 17 +- frontend/lang/messages/fi-FI.json | 17 +- frontend/lang/messages/fr-CA.json | 17 +- frontend/lang/messages/fr-FR.json | 17 +- frontend/lang/messages/gl-ES.json | 17 +- frontend/lang/messages/he-IL.json | 17 +- frontend/lang/messages/hr-HR.json | 17 +- frontend/lang/messages/hu-HU.json | 17 +- frontend/lang/messages/it-IT.json | 17 +- frontend/lang/messages/ja-JP.json | 17 +- frontend/lang/messages/ko-KR.json | 17 +- frontend/lang/messages/lt-LT.json | 17 +- frontend/lang/messages/lv-LV.json | 17 +- frontend/lang/messages/nl-NL.json | 17 +- frontend/lang/messages/no-NO.json | 53 ++- frontend/lang/messages/pl-PL.json | 17 +- frontend/lang/messages/pt-BR.json | 17 +- frontend/lang/messages/pt-PT.json | 17 +- frontend/lang/messages/ro-RO.json | 17 +- frontend/lang/messages/ru-RU.json | 17 +- frontend/lang/messages/sk-SK.json | 17 +- frontend/lang/messages/sl-SI.json | 17 +- frontend/lang/messages/sr-SP.json | 349 +++++++++--------- frontend/lang/messages/sv-SE.json | 17 +- frontend/lang/messages/tr-TR.json | 17 +- frontend/lang/messages/uk-UA.json | 17 +- frontend/lang/messages/vi-VN.json | 17 +- frontend/lang/messages/zh-CN.json | 17 +- frontend/lang/messages/zh-TW.json | 17 +- mealie/lang/messages/sr-SP.json | 38 +- .../seed/resources/labels/locales/sr-SP.json | 42 +-- .../seed/resources/units/locales/sr-SP.json | 60 +-- 41 files changed, 862 insertions(+), 292 deletions(-) diff --git a/frontend/lang/messages/af-ZA.json b/frontend/lang/messages/af-ZA.json index 9b202c0850a8..49f12f8e338a 100644 --- a/frontend/lang/messages/af-ZA.json +++ b/frontend/lang/messages/af-ZA.json @@ -953,7 +953,22 @@ "select-data": "Kies data", "select-language": "Kies taal", "columns": "Kolomme", - "combine": "Kombineer" + "combine": "Kombineer", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Gebruiker registrasie", diff --git a/frontend/lang/messages/ar-SA.json b/frontend/lang/messages/ar-SA.json index 109807c5a7a5..e8664d6a6e24 100644 --- a/frontend/lang/messages/ar-SA.json +++ b/frontend/lang/messages/ar-SA.json @@ -953,7 +953,22 @@ "select-data": "Select Data", "select-language": "Select Language", "columns": "Columns", - "combine": "Combine" + "combine": "Combine", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "User Registration", diff --git a/frontend/lang/messages/bg-BG.json b/frontend/lang/messages/bg-BG.json index f4ea0dd95f8a..eda1adb7c426 100644 --- a/frontend/lang/messages/bg-BG.json +++ b/frontend/lang/messages/bg-BG.json @@ -953,7 +953,22 @@ "select-data": "Изберете данни", "select-language": "Изберете език", "columns": "Колони", - "combine": "Обедини" + "combine": "Обедини", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Регистрации на потребител", diff --git a/frontend/lang/messages/ca-ES.json b/frontend/lang/messages/ca-ES.json index 920a6a78bd73..b0f6f4ba3cc9 100644 --- a/frontend/lang/messages/ca-ES.json +++ b/frontend/lang/messages/ca-ES.json @@ -953,7 +953,22 @@ "select-data": "Select Data", "select-language": "Select Language", "columns": "Columns", - "combine": "Combine" + "combine": "Combine", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Registre d'usuari", diff --git a/frontend/lang/messages/cs-CZ.json b/frontend/lang/messages/cs-CZ.json index 70e9dba7d21c..000d4974d2d1 100644 --- a/frontend/lang/messages/cs-CZ.json +++ b/frontend/lang/messages/cs-CZ.json @@ -953,7 +953,22 @@ "select-data": "Vybrat data", "select-language": "Select Language", "columns": "Sloupce", - "combine": "Kombinovat" + "combine": "Kombinovat", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Registrace uživatele", diff --git a/frontend/lang/messages/da-DK.json b/frontend/lang/messages/da-DK.json index 4c6122103a77..e113bb8a020a 100644 --- a/frontend/lang/messages/da-DK.json +++ b/frontend/lang/messages/da-DK.json @@ -953,7 +953,22 @@ "select-data": "vælg data", "select-language": "Vælg sprog", "columns": "Kolonner", - "combine": "Kombinér" + "combine": "Kombinér", + "categories": { + "edit-category": "Rediger kategori", + "new-category": "Ny kategori", + "category-data": "Kategoridata" + }, + "tags": { + "new-tag": "Nyt mærke", + "edit-tag": "Rediger Mærke", + "tag-data": "Mærke data" + }, + "tools": { + "new-tool": "Nyt Værktøj", + "edit-tool": "Redigér værktøjer", + "tool-data": "Værktøjs Data" + } }, "user-registration": { "user-registration": "Brugerregistrering", diff --git a/frontend/lang/messages/de-DE.json b/frontend/lang/messages/de-DE.json index 137e36eec0cd..373a2126b052 100644 --- a/frontend/lang/messages/de-DE.json +++ b/frontend/lang/messages/de-DE.json @@ -953,7 +953,22 @@ "select-data": "Daten auswählen", "select-language": "Sprache wählen", "columns": "Spalten", - "combine": "Zusammenführen" + "combine": "Zusammenführen", + "categories": { + "edit-category": "Kategorie bearbeiten", + "new-category": "Neue Kategorie", + "category-data": "Kategorie-Daten" + }, + "tags": { + "new-tag": "Neues Schlagwort", + "edit-tag": "Schlagwort bearbeiten", + "tag-data": "Schlagwort-Daten" + }, + "tools": { + "new-tool": "Neues Utensil", + "edit-tool": "Utensil bearbeiten", + "tool-data": "Utensil-Daten" + } }, "user-registration": { "user-registration": "Benutzerregistrierung", diff --git a/frontend/lang/messages/el-GR.json b/frontend/lang/messages/el-GR.json index 2dbf00836437..12106519e334 100644 --- a/frontend/lang/messages/el-GR.json +++ b/frontend/lang/messages/el-GR.json @@ -953,7 +953,22 @@ "select-data": "Select Data", "select-language": "Select Language", "columns": "Columns", - "combine": "Combine" + "combine": "Combine", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "User Registration", diff --git a/frontend/lang/messages/en-GB.json b/frontend/lang/messages/en-GB.json index c5742683d957..4909a87eb549 100644 --- a/frontend/lang/messages/en-GB.json +++ b/frontend/lang/messages/en-GB.json @@ -953,7 +953,22 @@ "select-data": "Select Data", "select-language": "Select Language", "columns": "Columns", - "combine": "Combine" + "combine": "Combine", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "User Registration", diff --git a/frontend/lang/messages/es-ES.json b/frontend/lang/messages/es-ES.json index fc0eea9739a3..eaf426d38914 100644 --- a/frontend/lang/messages/es-ES.json +++ b/frontend/lang/messages/es-ES.json @@ -953,7 +953,22 @@ "select-data": "Seleccionar datos", "select-language": "Seleccionar idioma", "columns": "Columnas", - "combine": "Combinar" + "combine": "Combinar", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Registro de usuario", diff --git a/frontend/lang/messages/fi-FI.json b/frontend/lang/messages/fi-FI.json index 6f8ace75c326..f4e1caab1f14 100644 --- a/frontend/lang/messages/fi-FI.json +++ b/frontend/lang/messages/fi-FI.json @@ -953,7 +953,22 @@ "select-data": "Valitse Tiedot", "select-language": "Valitse kieli", "columns": "Sarakkeet", - "combine": "Yhdistä" + "combine": "Yhdistä", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Käyttäjien rekisteröinti", diff --git a/frontend/lang/messages/fr-CA.json b/frontend/lang/messages/fr-CA.json index 1453fd8a63cd..ccd9dfa1faf6 100644 --- a/frontend/lang/messages/fr-CA.json +++ b/frontend/lang/messages/fr-CA.json @@ -953,7 +953,22 @@ "select-data": "Sélectionner les données", "select-language": "Sélectionnez une langue", "columns": "Colonnes", - "combine": "Combiner" + "combine": "Combiner", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Inscription d’utilisateur", diff --git a/frontend/lang/messages/fr-FR.json b/frontend/lang/messages/fr-FR.json index 4fc5a4776533..5c1583a9b9e3 100644 --- a/frontend/lang/messages/fr-FR.json +++ b/frontend/lang/messages/fr-FR.json @@ -953,7 +953,22 @@ "select-data": "Sélectionner les données", "select-language": "Sélectionnez une langue", "columns": "Colonnes", - "combine": "Combiner" + "combine": "Combiner", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Inscription d’utilisateur", diff --git a/frontend/lang/messages/gl-ES.json b/frontend/lang/messages/gl-ES.json index 3841429bc34b..9291c79ec4f5 100644 --- a/frontend/lang/messages/gl-ES.json +++ b/frontend/lang/messages/gl-ES.json @@ -953,7 +953,22 @@ "select-data": "Select Data", "select-language": "Select Language", "columns": "Columns", - "combine": "Combine" + "combine": "Combine", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "User Registration", diff --git a/frontend/lang/messages/he-IL.json b/frontend/lang/messages/he-IL.json index cc75eea48fde..0bc91256940e 100644 --- a/frontend/lang/messages/he-IL.json +++ b/frontend/lang/messages/he-IL.json @@ -953,7 +953,22 @@ "select-data": "בחר נתונים", "select-language": "בחירת שפה", "columns": "עמודות", - "combine": "שילוב" + "combine": "שילוב", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "רישום משתמשים", diff --git a/frontend/lang/messages/hr-HR.json b/frontend/lang/messages/hr-HR.json index 6ee7b59b4995..564dfbc260fa 100644 --- a/frontend/lang/messages/hr-HR.json +++ b/frontend/lang/messages/hr-HR.json @@ -953,7 +953,22 @@ "select-data": "Označite Podatke", "select-language": "Odaberite Jezik", "columns": "Stupci", - "combine": "Kombiniraj" + "combine": "Kombiniraj", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Registracija Korisnika", diff --git a/frontend/lang/messages/hu-HU.json b/frontend/lang/messages/hu-HU.json index d9c4c872d3cb..49942fa3d85c 100644 --- a/frontend/lang/messages/hu-HU.json +++ b/frontend/lang/messages/hu-HU.json @@ -953,7 +953,22 @@ "select-data": "Válassza ki az adatot", "select-language": "Nyelv kiválasztása", "columns": "Oszlopok", - "combine": "Összevonás" + "combine": "Összevonás", + "categories": { + "edit-category": "Kategória szerkesztése", + "new-category": "Új kategória", + "category-data": "Kategória adatai" + }, + "tags": { + "new-tag": "Új címke", + "edit-tag": "Címke szerkesztése", + "tag-data": "Címke adatok" + }, + "tools": { + "new-tool": "Új eszköz", + "edit-tool": "Eszköz szerkesztése", + "tool-data": "Eszköz adatai" + } }, "user-registration": { "user-registration": "Felhasználó regisztráció", diff --git a/frontend/lang/messages/it-IT.json b/frontend/lang/messages/it-IT.json index 8a39d0fb5dbc..821ef3ee0f16 100644 --- a/frontend/lang/messages/it-IT.json +++ b/frontend/lang/messages/it-IT.json @@ -953,7 +953,22 @@ "select-data": "Seleziona Dati", "select-language": "Seleziona Lingua", "columns": "Colonne", - "combine": "Unisci" + "combine": "Unisci", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Registrazione Utente", diff --git a/frontend/lang/messages/ja-JP.json b/frontend/lang/messages/ja-JP.json index b3b26972f3af..6577b0a2cca7 100644 --- a/frontend/lang/messages/ja-JP.json +++ b/frontend/lang/messages/ja-JP.json @@ -953,7 +953,22 @@ "select-data": "Select Data", "select-language": "Select Language", "columns": "Columns", - "combine": "Combine" + "combine": "Combine", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "User Registration", diff --git a/frontend/lang/messages/ko-KR.json b/frontend/lang/messages/ko-KR.json index 4f1ec2a38fa7..bbf3c20e622d 100644 --- a/frontend/lang/messages/ko-KR.json +++ b/frontend/lang/messages/ko-KR.json @@ -953,7 +953,22 @@ "select-data": "Select Data", "select-language": "Select Language", "columns": "Columns", - "combine": "Combine" + "combine": "Combine", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "User Registration", diff --git a/frontend/lang/messages/lt-LT.json b/frontend/lang/messages/lt-LT.json index a94023d9d1b5..4a85c8528c26 100644 --- a/frontend/lang/messages/lt-LT.json +++ b/frontend/lang/messages/lt-LT.json @@ -953,7 +953,22 @@ "select-data": "Pasirinkti duomenis", "select-language": "Pasirinkti kalbą", "columns": "Stulpeliai", - "combine": "Sujungti" + "combine": "Sujungti", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Vartotojo registracija", diff --git a/frontend/lang/messages/lv-LV.json b/frontend/lang/messages/lv-LV.json index 3841429bc34b..9291c79ec4f5 100644 --- a/frontend/lang/messages/lv-LV.json +++ b/frontend/lang/messages/lv-LV.json @@ -953,7 +953,22 @@ "select-data": "Select Data", "select-language": "Select Language", "columns": "Columns", - "combine": "Combine" + "combine": "Combine", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "User Registration", diff --git a/frontend/lang/messages/nl-NL.json b/frontend/lang/messages/nl-NL.json index b96e8166f713..f821258439c2 100644 --- a/frontend/lang/messages/nl-NL.json +++ b/frontend/lang/messages/nl-NL.json @@ -953,7 +953,22 @@ "select-data": "Selecteer gegevens", "select-language": "Selecteer taal", "columns": "Kolommen", - "combine": "Samenvoegen" + "combine": "Samenvoegen", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Gebruikersregistratie", diff --git a/frontend/lang/messages/no-NO.json b/frontend/lang/messages/no-NO.json index c88743fc4f07..eda03ea74644 100644 --- a/frontend/lang/messages/no-NO.json +++ b/frontend/lang/messages/no-NO.json @@ -886,36 +886,36 @@ "seed-dialog-text": "Legg til databasen med mat basert på ditt lokale språk. Dette vil opprette 200+ felles matvarer som kan brukes til å organisere databasen. Næringsmidler oversettes via en samfunnsinnsats.", "seed-dialog-warning": "Du har allerede elementer i databasen. Denne handlingen vil ikke rekonfigurere duplikater, du må administrere dem manuelt.", "combine-food": "Kombiner mat", - "source-food": "Source Food", - "target-food": "Target Food", + "source-food": "Kilde mat", + "target-food": "Mål Mat", "create-food": "Lag mat", "food-label": "Mat etikett", "edit-food": "Rediger mat", "food-data": "Mat data", - "example-food-singular": "ex: Onion", - "example-food-plural": "ex: Onions" + "example-food-singular": "Feks: Tomat", + "example-food-plural": "Feks: Tomater" }, "units": { "seed-dialog-text": "Lag en database med vanlige enheter basert på ditt lokale språk.", - "combine-unit-description": "Combining the selected units will merge the Source Unit and Target Unit into a single unit. The {source-unit-will-be-deleted} and all of the references to the Source Unit will be updated to point to the Target Unit.", + "combine-unit-description": "Ved å kombinere de valgte enhetene vil kildeenheten og målenheten slås sammen i en enkelt enhet. {source-unit-will-be-deleted} og alle referansene til kildeenheten vil bli oppdatert til å peke til målenheten.", "combine-unit": "Kombiner enhet", - "source-unit": "Source Unit", - "target-unit": "Target Unit", - "merging-unit-into-unit": "Merging {0} into {1}", + "source-unit": "Kildeenhet", + "target-unit": "Målenhet", + "merging-unit-into-unit": "Slår sammen {0} til {1}", "create-unit": "Opprett enhet", "abbreviation": "Forkortelse", - "plural-abbreviation": "Plural Abbreviation", + "plural-abbreviation": "Flertallsforkortelse", "description": "Beskrivelse", "display-as-fraction": "Vis som brøkdel", "use-abbreviation": "Bruk forkortelse", "edit-unit": "Rediger enhet", - "unit-data": "Unit Data", - "use-abbv": "Use Abbv.", + "unit-data": "Enhetsdata", + "use-abbv": "Bruk forkortelse.", "fraction": "Brøk", - "example-unit-singular": "ex: Tablespoon", - "example-unit-plural": "ex: Tablespoons", - "example-unit-abbreviation-singular": "ex: Tbsp", - "example-unit-abbreviation-plural": "ex: Tbsps" + "example-unit-singular": "Feks: Spiseskje", + "example-unit-plural": "Feks: Spiseskjeer", + "example-unit-abbreviation-singular": "Feks: SS", + "example-unit-abbreviation-plural": "Feks: SS" }, "labels": { "seed-dialog-text": "Lag en database med vanlige enheter basert på ditt lokale språk.", @@ -927,9 +927,9 @@ "purge-exports": "Fjern eksporter", "are-you-sure-you-want-to-delete-all-export-data": "Er du sikker på at du vil slette all historikk?", "confirm-delete-recipes": "Er du sikker på at du vil slette denne oppskriften? Denne handlingen kan ikke angres.", - "the-following-recipes-selected-length-will-be-exported": "The following recipes ({0}) will be exported.", - "settings-chosen-explanation": "Settings chosen here, excluding the locked option, will be applied to all selected recipes.", - "selected-length-recipe-s-settings-will-be-updated": "{count} recipe(s) settings will be updated.", + "the-following-recipes-selected-length-will-be-exported": "Følgende oppskrifter ({0}) vil bli eksportert.", + "settings-chosen-explanation": "Innstillinger valgt her, bortsett fra det låste alternativet, vil bli brukt på alle valgte oppskrifter.", + "selected-length-recipe-s-settings-will-be-updated": "Innstillingene til {count} oppskrift(er) vil bli oppdatert.", "recipe-data": "Oppskriftsdata", "recipe-data-description": "Use this section to manage the data associated with your recipes. You can perform several bulk actions on your recipes including exporting, deleting, tagging, and assigning categories.", "recipe-columns": "Recipe Columns", @@ -953,7 +953,22 @@ "select-data": "Velg data", "select-language": "Velg språk", "columns": "Kolonner", - "combine": "Kombiner" + "combine": "Kombiner", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Brukerregistrering", diff --git a/frontend/lang/messages/pl-PL.json b/frontend/lang/messages/pl-PL.json index 919d6df9f59b..d60503970d13 100644 --- a/frontend/lang/messages/pl-PL.json +++ b/frontend/lang/messages/pl-PL.json @@ -953,7 +953,22 @@ "select-data": "Wybierz Dane", "select-language": "Wybierz język", "columns": "Kolumny", - "combine": "Połącz" + "combine": "Połącz", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Rejestracja użytkownika", diff --git a/frontend/lang/messages/pt-BR.json b/frontend/lang/messages/pt-BR.json index f70f995bf710..0b0c41a95809 100644 --- a/frontend/lang/messages/pt-BR.json +++ b/frontend/lang/messages/pt-BR.json @@ -953,7 +953,22 @@ "select-data": "Selecionar dados", "select-language": "Selecionar idioma", "columns": "Colunas", - "combine": "Combinar" + "combine": "Combinar", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Cadastro de usuário", diff --git a/frontend/lang/messages/pt-PT.json b/frontend/lang/messages/pt-PT.json index f971380d9843..56287cc28386 100644 --- a/frontend/lang/messages/pt-PT.json +++ b/frontend/lang/messages/pt-PT.json @@ -953,7 +953,22 @@ "select-data": "Selecionar dados", "select-language": "Selecionar idioma", "columns": "Colunas", - "combine": "Combinar" + "combine": "Combinar", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Registo de Utilizador", diff --git a/frontend/lang/messages/ro-RO.json b/frontend/lang/messages/ro-RO.json index c047b091b9b8..071c398454be 100644 --- a/frontend/lang/messages/ro-RO.json +++ b/frontend/lang/messages/ro-RO.json @@ -953,7 +953,22 @@ "select-data": "Select Data", "select-language": "Select Language", "columns": "Columns", - "combine": "Combine" + "combine": "Combine", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "User Registration", diff --git a/frontend/lang/messages/ru-RU.json b/frontend/lang/messages/ru-RU.json index 7cd60000d326..50b9da10675d 100644 --- a/frontend/lang/messages/ru-RU.json +++ b/frontend/lang/messages/ru-RU.json @@ -953,7 +953,22 @@ "select-data": "Выберите данные", "select-language": "Выберите язык", "columns": "Столбцы", - "combine": "Объединить" + "combine": "Объединить", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Регистрация", diff --git a/frontend/lang/messages/sk-SK.json b/frontend/lang/messages/sk-SK.json index 137e613234bc..9184b0c796c3 100644 --- a/frontend/lang/messages/sk-SK.json +++ b/frontend/lang/messages/sk-SK.json @@ -953,7 +953,22 @@ "select-data": "Vyberte dáta", "select-language": "Vyberte jazyk", "columns": "Stĺpce", - "combine": "Kombinovať" + "combine": "Kombinovať", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Registrácia", diff --git a/frontend/lang/messages/sl-SI.json b/frontend/lang/messages/sl-SI.json index 8070e364abd6..f46b156f4c3c 100644 --- a/frontend/lang/messages/sl-SI.json +++ b/frontend/lang/messages/sl-SI.json @@ -953,7 +953,22 @@ "select-data": "Select Data", "select-language": "Select Language", "columns": "Columns", - "combine": "Combine" + "combine": "Combine", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Registracija uporabnika", diff --git a/frontend/lang/messages/sr-SP.json b/frontend/lang/messages/sr-SP.json index 428c16fa4238..7e8997278354 100644 --- a/frontend/lang/messages/sr-SP.json +++ b/frontend/lang/messages/sr-SP.json @@ -1,18 +1,18 @@ { "about": { "about": "О апликацији", - "about-mealie": "О Меалие-у", - "api-docs": "АПИ Документација", + "about-mealie": "О Мили", + "api-docs": "API документација", "api-port": "API прикључак", - "application-mode": "Мод Апликације", - "database-type": "Тип Базе Података", - "database-url": "URL базе", - "default-group": "Подразумевана Група", + "application-mode": "Режим апликације", + "database-type": "Тип базе података", + "database-url": "URL базе података", + "default-group": "Подразумевана група", "demo": "Демо", - "demo-status": "Статус Демоа", + "demo-status": "Демо статус", "development": "Развој", "docs": "Документација", - "download-log": "Преузми евиденцију", + "download-log": "Преузми дневник евиденције", "download-recipe-json": "Последњи прикупљени JSON", "github": "Github", "log-lines": "Log Lines", @@ -56,7 +56,7 @@ "event-delete-confirmation": "Да ли сте сигурни да желите да обришете овај догађај?", "event-deleted": "Догађај је избрисан", "event-updated": "Догађај је ажуриран", - "new-notification-form-description": "Mealie користи Apprise библиотеку за генерисање обавештења. Они нуде много опција за услуге које можете користити за обавештења. Погледајте њихову вики страницу за свеобухватан водич о томе како креирати URL за вашу услугу. Ако је доступно, одабир врсте вашег обавештења може укључивати додатне функције.", + "new-notification-form-description": "Mили користи Apprise библиотеку за генерисање обавештења. Они нуде много опција за услуге које можете користити за обавештења. Погледајте њихову вики страницу за свеобухватан водич о томе како креирати URL за вашу услугу. Ако је доступно, одабир врсте вашег обавештења може укључивати додатне функције.", "new-version": "Доступна је нова верзија!", "notification": "Обавештење", "refresh": "Освежи", @@ -70,8 +70,8 @@ "enable-notifier": "Омогући обавештење", "what-events": "На које догађаје би требао да се претплати овај обавештавач?", "user-events": "Догађаји корисника", - "mealplan-events": "Догађаји планирања оброка", - "when-a-user-in-your-group-creates-a-new-mealplan": "Када корисник у вашој групи креира нови план оброка", + "mealplan-events": "Догађаји јеловника", + "when-a-user-in-your-group-creates-a-new-mealplan": "Када корисник у вашој групи креира нови јеловник", "shopping-list-events": "Догађаји списка за куповину", "cookbook-events": "Догађаји кувара", "tag-events": "Догађаји ознаке", @@ -146,66 +146,66 @@ "submit": "Пошаљи", "success-count": "Успешно {count}", "sunday": "недеља", - "templates": "Templates:", - "test": "Test", + "templates": "Шаблони:", + "test": "Тест", "themes": "Теме", "thursday": "четвртак", - "token": "Token", + "token": "Токен", "tuesday": "уторак", "type": "Тип", "update": "Ажурирај", "updated": "Ажурирано", - "upload": "Upload", + "upload": "Отпреми", "url": "URL", - "view": "View", + "view": "Преглед", "wednesday": "среда", "yes": "Да", - "foods": "Foods", + "foods": "Храна", "units": "Јединице", - "back": "Back", - "next": "Next", - "toggle-view": "Toggle View", - "date": "Date", - "id": "Id", - "owner": "Owner", - "date-added": "Date Added", - "none": "None", - "run": "Run", - "menu": "Menu", - "a-name-is-required": "A Name is Required", - "delete-with-name": "Delete {name}", - "confirm-delete-generic-with-name": "Are you sure you want to delete this {name}?", - "confirm-delete-own-admin-account": "Please note that you are trying to delete your own admin account! This action cannot be undone and will permanently delete your account?", + "back": "Назад", + "next": "Сљедећи", + "toggle-view": "Промени приказ", + "date": "Датум", + "id": "Ид", + "owner": "Власник", + "date-added": "Датум додавања", + "none": "Ниједно", + "run": "Покрени", + "menu": "Мени", + "a-name-is-required": "Име је неопходно", + "delete-with-name": "Обриши {name}", + "confirm-delete-generic-with-name": "Да ли сте сигурни да желите да обришете {name}?", + "confirm-delete-own-admin-account": "Обратите пажњу да покушавате избрисати свој администраторски налог! Ова акција не може бити поништена и трајно ће избрисати ваш налог?", "organizer": "Организатор", - "transfer": "Transfer", - "copy": "Copy", - "color": "Color", - "timestamp": "Timestamp", + "transfer": "Пренос", + "copy": "Копирај", + "color": "Боја", + "timestamp": "Временска ознака", "last-made": "Последњи пут прављено", - "learn-more": "Learn More", - "this-feature-is-currently-inactive": "This feature is currently inactive", - "clipboard-not-supported": "Clipboard not supported", - "copied-to-clipboard": "Copied to clipboard", - "your-browser-does-not-support-clipboard": "Your browser does not support clipboard", - "copied-items-to-clipboard": "No item copied to clipboard|One item copied to clipboard|Copied {count} items to clipboard", - "actions": "Actions", - "selected-count": "Selected: {count}", - "export-all": "Export All", - "refresh": "Refresh", - "upload-file": "Upload File", - "created-on-date": "Created on: {0}" + "learn-more": "Сазнај више", + "this-feature-is-currently-inactive": "Ова функција је тренутно неактивна", + "clipboard-not-supported": "Привремена меморија није подржана", + "copied-to-clipboard": "Копирано у привремену меморију", + "your-browser-does-not-support-clipboard": "Ваш прегледач не подржава привремену меморију", + "copied-items-to-clipboard": "Ниједна ставка није копирана на привремену меморију|Једна ставка је копирана на привремену меморију|Копираних {count} ставки на привремену меморију", + "actions": "Радње", + "selected-count": "Изабрано: {count}", + "export-all": "Извези све", + "refresh": "Освежи", + "upload-file": "Учитај датотеку", + "created-on-date": "Крерирано: {0}" }, "group": { - "are-you-sure-you-want-to-delete-the-group": "Are you sure you want to delete {groupName}?", - "cannot-delete-default-group": "Cannot delete default group", - "cannot-delete-group-with-users": "Cannot delete group with users", - "confirm-group-deletion": "Confirm Group Deletion", - "create-group": "Create Group", - "error-updating-group": "Error updating group", - "group": "Group", - "group-deleted": "Group deleted", - "group-deletion-failed": "Group deletion failed", - "group-id-with-value": "Group ID: {groupID}", + "are-you-sure-you-want-to-delete-the-group": "Да ли сте сигурни да желите да обришете {groupName}?", + "cannot-delete-default-group": "Није могуће обрисати подразумевану групу", + "cannot-delete-group-with-users": "Није могуће обрисати групу у којој има корисника", + "confirm-group-deletion": "Потврди брисање групе", + "create-group": "Направи групу", + "error-updating-group": "Грешка при ажурирању групе", + "group": "Група", + "group-deleted": "Група је обрисана", + "group-deletion-failed": "Неуспело брисање групе", + "group-id-with-value": "ID групе: {groupID}", "group-name": "Назив групе", "group-not-found": "Група није пронађена", "group-with-value": "Група: {groupID}", @@ -239,49 +239,49 @@ "disable-users-from-commenting-on-recipes": "Онемогући кориснике да коментаришу рецепте", "disable-users-from-commenting-on-recipes-description": "Сакрива секцију коментара на страници рецепта и онемогућава коментаре", "disable-organizing-recipe-ingredients-by-units-and-food": "Онемогући организацију састојака рецепта по јединицама и намирницама", - "disable-organizing-recipe-ingredients-by-units-and-food-description": "Hides the Food, Unit, and Amount fields for ingredients and treats ingredients as plain text fields.", - "general-preferences": "General Preferences", - "group-recipe-preferences": "Group Recipe Preferences", - "report": "Report", - "group-management": "Group Management", - "admin-group-management": "Admin Group Management", - "admin-group-management-text": "Changes to this group will be reflected immediately.", + "disable-organizing-recipe-ingredients-by-units-and-food-description": "Скрива поља за храну, јединицу мере и количину за намирнице и третира их као обична текстуална поља.", + "general-preferences": "Општа подешавања", + "group-recipe-preferences": "Подешавања групе рецепта", + "report": "Извештај", + "group-management": "Управљање групом", + "admin-group-management": "Управљање администраторском групом", + "admin-group-management-text": "Промене у овој групи биће одмах видљиве.", "group-id-value": "Group Id: {0}" }, "meal-plan": { - "create-a-new-meal-plan": "Create a New Meal Plan", + "create-a-new-meal-plan": "Направи нови јеловник", "dinner-this-week": "Dinner This Week", "dinner-today": "Dinner Today", "dinner-tonight": "DINNER TONIGHT", - "edit-meal-plan": "Edit Meal Plan", + "edit-meal-plan": "Уреди јеловник", "end-date": "End Date", "group": "Group (Beta)", "main": "Main", - "meal-planner": "Meal Planner", - "meal-plans": "Meal Plans", + "meal-planner": "Јеловник", + "meal-plans": "Јеловници", "mealplan-categories": "КАТЕГОРИЈЕ ЈЕЛОВНИКА", - "mealplan-created": "Mealplan created", - "mealplan-creation-failed": "Mealplan creation failed", - "mealplan-deleted": "Mealplan Deleted", - "mealplan-deletion-failed": "Mealplan deletion failed", - "mealplan-settings": "Mealplan Settings", - "mealplan-update-failed": "Mealplan update failed", - "mealplan-updated": "Mealplan Updated", + "mealplan-created": "Јеловник је креиран", + "mealplan-creation-failed": "Неуспело креирање јеловника", + "mealplan-deleted": "Јеловник је обрисан", + "mealplan-deletion-failed": "Неуспешно брисање јеловника", + "mealplan-settings": "Подешавања јеловника", + "mealplan-update-failed": "Неуспешно ажурирање јеловника", + "mealplan-updated": "Јеловник је ажуриран", "no-meal-plan-defined-yet": "No meal plan defined yet", "no-meal-planned-for-today": "No meal planned for today", "only-recipes-with-these-categories-will-be-used-in-meal-plans": "Само рецепти са овим категоријама ће бити коришћени у јеловницима", - "planner": "Planner", + "planner": "Планер", "quick-week": "Quick Week", "side": "Side", "sides": "Sides", - "start-date": "Start Date", + "start-date": "Датум почетка", "rule-day": "Rule Day", "meal-type": "Meal Type", - "breakfast": "Breakfast", - "lunch": "Lunch", - "dinner": "Dinner", - "type-any": "Any", - "day-any": "Any", + "breakfast": "Доручак", + "lunch": "Ручак", + "dinner": "Вечера", + "type-any": "Било који", + "day-any": "Било који", "editor": "Editor", "meal-recipe": "Meal Recipe", "meal-title": "Meal Title", @@ -296,10 +296,10 @@ "for-all-meal-types": "for all meal types", "for-type-meal-types": "for {0} meal types", "meal-plan-rules": "Meal Plan Rules", - "new-rule": "New Rule", - "meal-plan-rules-description": "You can create rules for auto selecting recipes for your meal plans. These rules are used by the server to determine the random pool of recipes to select from when creating meal plans. Note that if rules have the same day/type constraints then the categories of the rules will be merged. In practice, it's unnecessary to create duplicate rules, but it's possible to do so.", - "new-rule-description": "When creating a new rule for a meal plan you can restrict the rule to be applicable for a specific day of the week and/or a specific type of meal. To apply a rule to all days or all meal types you can set the rule to \"Any\" which will apply it to all the possible values for the day and/or meal type.", - "recipe-rules": "Recipe Rules", + "new-rule": "Ново правило", + "meal-plan-rules-description": "Можете креирати правила за аутоматски избор рецепата за ваше јеловнике. Ова правила користи сервер за одређивање случајног сета рецепата из којег ће бити изабране при креирању јеловника. Обратите пажњу да ако правила имају исто ограничење дана/типа, категорије правила ће бити спојене. У пракси, није потребно креирати дупла правила, али је могуће то учинити.", + "new-rule-description": "При креирању новог правила за јеловник, можете ограничити примену правила на одређени дан у недељи и/или на одређени тип оброка. Како бисте применили правило на све дане или све типове оброка, можете поставити правило на 'Било који', што ће га применити на све могуће вредности за дан и/или тип оброка.", + "recipe-rules": "Правила за рецепт", "applies-to-all-days": "Applies to all days", "applies-on-days": "Applies on {0}s", "meal-plan-settings": "Meal Plan Settings" @@ -360,24 +360,24 @@ "github-issues": "GitHub Issues", "google-ld-json-info": "Google ld+json Info", "must-be-a-valid-url": "Must be a Valid URL", - "paste-in-your-recipe-data-each-line-will-be-treated-as-an-item-in-a-list": "Paste in your recipe data. Each line will be treated as an item in a list", + "paste-in-your-recipe-data-each-line-will-be-treated-as-an-item-in-a-list": "Налепите ваше податке о рецепту. Свака линија ће бити третирана као ставка на списку", "recipe-markup-specification": "Recipe Markup Specification", "recipe-url": "Recipe URL", "upload-a-recipe": "Upload a Recipe", "upload-individual-zip-file": "Upload an individual .zip file exported from another Mealie instance.", - "url-form-hint": "Copy and paste a link from your favorite recipe website", + "url-form-hint": "Копирајте и налепите везу са вашег омиљеног сајта за рецепте", "view-scraped-data": "View Scraped Data", "trim-whitespace-description": "Trim leading and trailing whitespace as well as blank lines", "trim-prefix-description": "Trim first character from each line", "split-by-numbered-line-description": "Attempts to split a paragraph by matching '1)' or '1.' patterns", - "import-by-url": "Import a recipe by URL", - "create-manually": "Create a recipe manually", + "import-by-url": "Увези рецепт помоћу URL везе", + "create-manually": "Направи рецепт ручно", "make-recipe-image": "Make this the recipe image" }, "page": { "404-page-not-found": "404 Page not found", "all-recipes": "All Recipes", - "new-page-created": "New page created", + "new-page-created": "Нова страна је креирана", "page": "Page", "page-creation-failed": "Page creation failed", "page-deleted": "Page deleted", @@ -391,7 +391,7 @@ }, "recipe": { "add-key": "Add Key", - "add-to-favorites": "Add to Favorites", + "add-to-favorites": "Додај у омиљене", "api-extras": "API Extras", "calories": "Calories", "calories-suffix": "calories", @@ -430,7 +430,7 @@ "prep-time": "Време припреме", "protein-content": "Protein", "public-recipe": "Public Recipe", - "recipe-created": "Recipe created", + "recipe-created": "Рецепт је направљен", "recipe-creation-failed": "Recipe creation failed", "recipe-deleted": "Recipe deleted", "recipe-image": "Recipe Image", @@ -439,7 +439,7 @@ "recipe-settings": "Recipe Settings", "recipe-update-failed": "Recipe update failed", "recipe-updated": "Recipe updated", - "remove-from-favorites": "Remove from Favorites", + "remove-from-favorites": "Уклони из омиљених", "remove-section": "Remove Section", "save-recipe-before-use": "Save recipe before use", "section-title": "Section Title", @@ -455,21 +455,21 @@ "no-recipe": "No Recipe", "locked-by-owner": "Locked by Owner", "join-the-conversation": "Join the Conversation", - "add-recipe-to-mealplan": "Add Recipe to Mealplan", + "add-recipe-to-mealplan": "Додај рецепт у јеловник", "entry-type": "Entry Type", "date-format-hint": "MM/DD/YYYY format", "date-format-hint-yyyy-mm-dd": "YYYY-MM-DD format", "add-to-list": "Add to List", "add-to-plan": "Add to Plan", - "add-to-timeline": "Add to Timeline", + "add-to-timeline": "Додај на временску линију", "recipe-added-to-list": "Recipe added to list", - "recipe-added-to-mealplan": "Recipe added to mealplan", - "failed-to-add-recipe-to-mealplan": "Failed to add recipe to mealplan", + "recipe-added-to-mealplan": "Рецепт је додат у јеловник", + "failed-to-add-recipe-to-mealplan": "Неуспешно додавање рецепта у јеловник", "yield": "Yield", "quantity": "Quantity", "choose-unit": "Choose Unit", - "press-enter-to-create": "Press Enter to Create", - "choose-food": "Choose Food", + "press-enter-to-create": "Притисни Ентер да направиш", + "choose-food": "Изабери храну", "notes": "Notes", "toggle-section": "Toggle Section", "see-original-text": "See Original Text", @@ -492,16 +492,16 @@ "resume-timer": "Resume Timer", "stop-timer": "Stop Timer" }, - "edit-timeline-event": "Edit Timeline Event", - "timeline": "Timeline", - "timeline-is-empty": "Nothing on the timeline yet. Try making this recipe!", + "edit-timeline-event": "Уреди догађај на временској линији", + "timeline": "Временска линија", + "timeline-is-empty": "Још увек нема ништа на временској линији. Покушајте направити овај рецепт!", "group-global-timeline": "{groupName} Global Timeline", - "open-timeline": "Open Timeline", + "open-timeline": "Отвори временску линију", "made-this": "I Made This", "how-did-it-turn-out": "How did it turn out?", "user-made-this": "{user} made this", "last-made-date": "Последњи пут прављено {date}", - "api-extras-description": "Recipes extras are a key feature of the Mealie API. They allow you to create custom json key/value pairs within a recipe to reference from 3rd part applications. You can use these keys to contain information to trigger automation or custom messages to relay to your desired device.", + "api-extras-description": "Додаци рецепата су кључна карактеристика Mили API-а. Омогућавају вам да креирате прилагођене JSON парове кључ/вредност унутар рецепта за референцу из других апликација. Можете користити ове кључеве за садржај информација за покретање аутоматизације или прилагођених порука које ће бити прослеђене на ваш уређај по жељи.", "message-key": "Message Key", "parse": "Parse", "attach-images-hint": "Attach images by dragging & dropping them into the editor", @@ -510,29 +510,29 @@ "parse-ingredients": "Разложи састојке", "edit-markdown": "Edit Markdown", "recipe-creation": "Recipe Creation", - "select-one-of-the-various-ways-to-create-a-recipe": "Select one of the various ways to create a recipe", + "select-one-of-the-various-ways-to-create-a-recipe": "Изаберите један од различитих начина за прављење рецепта", "looking-for-migrations": "Looking For Migrations?", - "import-with-url": "Import with URL", - "create-recipe": "Create Recipe", - "import-with-zip": "Import with .zip", - "create-recipe-from-an-image": "Create recipe from an image", - "bulk-url-import": "Bulk URL Import", + "import-with-url": "Увези помоћу URL везе", + "create-recipe": "Направи рецепт", + "import-with-zip": "Увези помоћу .zip архиве", + "create-recipe-from-an-image": "Направи рецепт са слике", + "bulk-url-import": "Масовни увоз помоћу URL", "debug-scraper": "Debug Scraper", - "create-a-recipe-by-providing-the-name-all-recipes-must-have-unique-names": "Create a recipe by providing the name. All recipes must have unique names.", + "create-a-recipe-by-providing-the-name-all-recipes-must-have-unique-names": "Направи рецепт додајући име. Сви рецепти морају имати јединствена имена.", "new-recipe-names-must-be-unique": "New recipe names must be unique", "scrape-recipe": "Scrape Recipe", "scrape-recipe-description": "Scrape a recipe by url. Provide the url for the site you want to scrape, and Mealie will attempt to scrape the recipe from that site and add it to your collection.", "import-original-keywords-as-tags": "Увези оригиналне кључне речи као ознаке", "stay-in-edit-mode": "Stay in Edit mode", - "import-from-zip": "Import from Zip", + "import-from-zip": "Увези из Zip архиве", "import-from-zip-description": "Import a single recipe that was exported from another Mealie instance.", "zip-files-must-have-been-exported-from-mealie": ".zip files must have been exported from Mealie", - "create-a-recipe-by-uploading-a-scan": "Create a recipe by uploading a scan.", + "create-a-recipe-by-uploading-a-scan": "Направи рецепт учитавањем скениране слике.", "upload-a-png-image-from-a-recipe-book": "Upload a png image from a recipe book", "recipe-bulk-importer": "Recipe Bulk Importer", "recipe-bulk-importer-description": "The Bulk recipe importer allows you to import multiple recipes at once by queueing the sites on the backend and running the task in the background. This can be useful when initially migrating to Mealie, or when you want to import a large number of recipes.", "set-categories-and-tags": "Постави категорије и ознаке", - "bulk-imports": "Bulk Imports", + "bulk-imports": "Масовни увоз", "bulk-import-process-has-started": "Bulk Import process has started", "bulk-import-process-has-failed": "Bulk import process has failed", "report-deletion-failed": "Report deletion failed", @@ -547,28 +547,28 @@ "remove-image": "Remove image" }, "search": { - "advanced-search": "Advanced Search", - "and": "and", - "exclude": "Exclude", - "include": "Include", - "max-results": "Max Results", - "or": "Or", - "has-any": "Has Any", - "has-all": "Has All", - "results": "Results", + "advanced-search": "Напредна претрага", + "and": "и", + "exclude": "Искључи", + "include": "Укључи", + "max-results": "Макс. резултата", + "or": "Или", + "has-any": "Садржи било који", + "has-all": "Садржи све", + "results": "Резултати", "search": "Претрага", "search-mealie": "Претражи Мили (стисни /)", "search-placeholder": "Претражи...", - "tag-filter": "Tag Filter", - "search-hint": "Press '/'", - "advanced": "Advanced", - "auto-search": "Аутоматско тражење" + "tag-filter": "Филтер по ознакама", + "search-hint": "Стисни '/'", + "advanced": "Напредна", + "auto-search": "Аутоматска претрага" }, "settings": { "add-a-new-theme": "Add a New Theme", "admin-settings": "Admin Settings", "backup": { - "backup-created-at-response-export_path": "Backup Created at {path}", + "backup-created-at-response-export_path": "Резервна копија је креирана на {path}", "backup-deleted": "Backup deleted", "backup-tag": "Backup Tag", "create-heading": "Create a Backup", @@ -655,7 +655,7 @@ "toolbox": { "assign-all": "Assign All", "bulk-assign": "Bulk Assign", - "new-name": "New Name", + "new-name": "Нови назив", "no-unused-items": "No Unused Items", "recipes-affected": "No Recipes Affected|One Recipe Affected|{count} Recipes Affected", "remove-unused": "Remove Unused", @@ -690,7 +690,7 @@ "general-about": "General About", "application-version": "Application Version", "application-version-error-text": "Your current version ({0}) does not match the latest release. Considering updating to the latest version ({1}).", - "mealie-is-up-to-date": "Mealie is up to date", + "mealie-is-up-to-date": "Мили је ажуриран на последњу верзију", "secure-site": "Secure Site", "secure-site-error-text": "Serve via localhost or secure with https. Clipboard and additional browser APIs may not work.", "secure-site-success-text": "Site is accessed by localhost or https", @@ -704,20 +704,20 @@ "recipe-scraper-version": "Recipe Scraper Version" }, "shopping-list": { - "all-lists": "All Lists", - "create-shopping-list": "Create Shopping List", + "all-lists": "Сви спискови", + "create-shopping-list": "Направи списак за куповину", "from-recipe": "From Recipe", "list-name": "List Name", - "new-list": "New List", + "new-list": "Novi spisak", "quantity": "Quantity: {0}", "shopping-list": "Shopping List", - "shopping-lists": "Shopping Lists", - "food": "Food", + "shopping-lists": "Списак за куповину", + "food": "Храна", "note": "Note", - "label": "Label", + "label": "Natpis", "linked-item-warning": "This item is linked to one or more recipe. Adjusting the units or foods will yield unexpected results when adding or removing the recipe from this list.", "toggle-food": "Toggle Food", - "manage-labels": "Manage Labels", + "manage-labels": "Управљај натписима", "are-you-sure-you-want-to-delete-this-item": "Are you sure you want to delete this item?", "copy-as-text": "Copy as Text", "copy-as-markdown": "Copy as Markdown", @@ -728,7 +728,7 @@ "check-all-items": "Check All Items", "linked-recipes-count": "No Linked Recipes|One Linked Recipe|{count} Linked Recipes", "items-checked-count": "No items checked|One item checked|{count} items checked", - "no-label": "No Label", + "no-label": "Без натписа", "completed-on": "Completed on {date}" }, "sidebar": { @@ -741,7 +741,7 @@ "manage-users": "Manage Users", "migrations": "Migrations", "profile": "Profile", - "search": "Search", + "search": "Претрага", "site-settings": "Site Settings", "tags": "Ознаке", "toolbox": "Toolbox", @@ -750,8 +750,8 @@ "background-tasks": "Background Tasks", "parser": "Parser", "developer": "Developer", - "cookbook": "Cookbook", - "create-cookbook": "Create a new cookbook" + "cookbook": "Кувар", + "create-cookbook": "Направи нови кувар" }, "signup": { "error-signing-up": "Error Signing Up", @@ -764,7 +764,7 @@ "welcome-to-mealie": "Welcome to Mealie! To become a user of this instance you are required to have a valid invitation link. If you haven't recieved an invitation you are unable to sign-up. To recieve a link, contact the sites administrator." }, "tag": { - "tag-created": "Tag created", + "tag-created": "Ознака је креирана", "tag-creation-failed": "Tag creation failed", "tag-deleted": "Tag deleted", "tag-deletion-failed": "Tag deletion failed", @@ -776,13 +776,13 @@ "tag-name": "Tag Name" }, "tool": { - "tools": "Tools", + "tools": "Прибор", "on-hand": "On Hand", "create-a-tool": "Create a Tool", - "tool-name": "Tool Name", + "tool-name": "Назив прибора", "create-new-tool": "Create New Tool", "on-hand-checkbox-label": "Show as On Hand (Checked)", - "required-tools": "Required Tools" + "required-tools": "Потребан прибор" }, "user": { "admin": "Admin", @@ -807,7 +807,7 @@ "link-id": "Link ID", "link-name": "Link Name", "login": "Login", - "logout": "Logout", + "logout": "Одјава", "manage-users": "Manage Users", "new-password": "New Password", "new-user": "New User", @@ -820,11 +820,11 @@ "register": "Register", "reset-password": "Reset Password", "sign-in": "Sign in", - "total-mealplans": "Total MealPlans", + "total-mealplans": "Укупно рецепата", "total-users": "Total Users", "upload-photo": "Upload Photo", "use-8-characters-or-more-for-your-password": "Use 8 characters or more for your password", - "user-created": "User created", + "user-created": "Корисник је креиран", "user-creation-failed": "User creation failed", "user-deleted": "User deleted", "user-id-with-value": "User ID: {id}", @@ -842,27 +842,27 @@ "you-are-not-allowed-to-create-a-user": "You are not allowed to create a user", "you-are-not-allowed-to-delete-this-user": "You are not allowed to delete this user", "enable-advanced-content": "Enable Advanced Content", - "enable-advanced-content-description": "Enables advanced features like Recipe Scaling, API keys, Webhooks, and Data Management. Don't worry, you can always change this later", - "favorite-recipes": "Favorite Recipes", + "enable-advanced-content-description": "Омогућава напредне функције као што су промена рецепта, API кључеви, Webhooks и управљање подацима. Немојте се бринути, увек можете касније променити ово", + "favorite-recipes": "Омиљени рецепти", "email-or-username": "Email or Username", "remember-me": "Remember Me", "please-enter-your-email-and-password": "Please enter your email and password", "invalid-credentials": "Invalid Credentials", "account-locked-please-try-again-later": "Account Locked. Please try again later", - "user-favorites": "User Favorites", + "user-favorites": "Корисникови омиљени рецепти", "password-strength-values": { "weak": "Weak", "good": "Good", "strong": "Strong", "very-strong": "Very Strong" }, - "user-management": "User Management", + "user-management": "Управљање корисницима", "reset-locked-users": "Reset Locked Users", "admin-user-creation": "Admin User Creation", "user-details": "User Details", "user-name": "User Name", "authentication-method": "Authentication Method", - "authentication-method-hint": "This specifies how a user will authenticate with Mealie. If you're not sure, choose 'Mealie", + "authentication-method-hint": "Ово одређује како ће се корисник аутентификовати са Mили. Ако нисте сигурни, изаберите 'Mealie'", "permissions": "Permissions", "administrator": "Administrator", "user-can-invite-other-to-group": "User can invite other to group", @@ -921,7 +921,7 @@ "seed-dialog-text": "Seed the database with common labels based on your local language.", "edit-label": "Edit Label", "new-label": "New Label", - "labels": "Labels" + "labels": "Натписи" }, "recipes": { "purge-exports": "Purge Exports", @@ -948,12 +948,27 @@ "manage-aliases": "Manage Aliases", "seed-data": "Seed Data", "seed": "Seed", - "data-management": "Data Management", - "data-management-description": "Select which data set you want to make changes to.", + "data-management": "Управљање подацима", + "data-management-description": "Изаберите који скуп података желите изменити.", "select-data": "Select Data", "select-language": "Select Language", "columns": "Columns", - "combine": "Combine" + "combine": "Combine", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "User Registration", @@ -961,7 +976,7 @@ "create-a-new-group": "Create a New Group", "provide-registration-token-description": "Please provide the registration token associated with the group that you'd like to join. You'll need to obtain this from an existing group member.", "group-details": "Group Details", - "group-details-description": "Before you create an account you'll need to create a group. Your group will only contain you, but you'll be able to invite others later. Members in your group can share meal plans, shopping lists, recipes, and more!", + "group-details-description": "Пре него што креирате налог, морате креирати групу. Ваша група ће садржавати само вас, али касније ћете моћи позвати друге. Чланови ваше групе могу делити јеловнике, спискове за куповину, рецепте и још много тога!", "use-seed-data": "Use Seed Data", "use-seed-data-description": "Mealie ships with a collection of Foods, Units, and Labels that can be used to populate your group with helpful data for organizing your recipes.", "account-details": "Account Details" @@ -991,7 +1006,7 @@ "issue-link-text": "Track our progress here" }, "form": { - "quantity-label-abbreviated": "Qty" + "quantity-label-abbreviated": "Кол." }, "markdown-editor": { "preview-markdown-button-label": "Preview Markdown" @@ -1036,7 +1051,7 @@ "page-title": "Site Maintenance", "summary-title": "Summary", "button-label-get-summary": "Get Summary", - "button-label-open-details": "Details", + "button-label-open-details": "Детаљи", "info-description-data-dir-size": "Data Directory Size", "info-description-log-file-size": "Log File Size", "info-description-cleanable-directories": "Cleanable Directories", @@ -1099,7 +1114,7 @@ "api-tokens-description": "Manage your API Tokens for access from external applications", "group-description": "These items are shared within your group. Editing one of them will change it for the whole group!", "group-settings": "Group Settings", - "group-settings-description": "Manage your common group settings like mealplan and privacy settings.", + "group-settings-description": "Управљајте општим подешавањима групе као што су подешавања јеловника и приватности.", "cookbooks-description": "Manage a collection of recipe categories and generate pages for them.", "members": "Members", "members-description": "See who's in your group and manage their permissions.", @@ -1114,7 +1129,7 @@ "error-sending-email": "Error Sending Email", "personal-information": "Personal Information", "preferences": "Preferences", - "show-advanced-description": "Show advanced features (API Keys, Webhooks, and Data Management)", + "show-advanced-description": "Прикажи напредне функције (API кључеви, Webhooks и управљање подацима)", "back-to-profile": "Back to Profile", "looking-for-privacy-settings": "Looking for Privacy Settings?", "manage-your-api-tokens": "Manage Your API Tokens", @@ -1128,14 +1143,14 @@ "cookbook": { "cookbooks": "Кувари", "description": "Кувари су још један начин за организовање рецепата креирањем пресека рецепата и ознака. Креирање кувара додаће ставку на бочну траку и све рецепте са изабраним ознакама и категоријама биће приказане у кувару.", - "public-cookbook": "Public Cookbook", + "public-cookbook": "Јавни кувар", "public-cookbook-description": "Public Cookbooks can be shared with non-mealie users and will be displayed on your groups page.", - "filter-options": "Filter Options", + "filter-options": "Опције филтера", "filter-options-description": "When require all is selected the cookbook will only include recipes that have all of the items selected. This applies to each subset of selectors and not a cross section of the selected items.", "require-all-categories": "Захтевај све категорије", "require-all-tags": "Захтевај све ознаке", - "require-all-tools": "Require All Tools", + "require-all-tools": "Захтева сав прибор", "cookbook-name": "Cookbook Name", - "cookbook-with-name": "Cookbook {0}" + "cookbook-with-name": "Кувар {0}" } } diff --git a/frontend/lang/messages/sv-SE.json b/frontend/lang/messages/sv-SE.json index 970c13674bf8..c8d4ead31285 100644 --- a/frontend/lang/messages/sv-SE.json +++ b/frontend/lang/messages/sv-SE.json @@ -953,7 +953,22 @@ "select-data": "Välj data", "select-language": "Välj språk", "columns": "Kolumner", - "combine": "Kombinera" + "combine": "Kombinera", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Användarregistrering", diff --git a/frontend/lang/messages/tr-TR.json b/frontend/lang/messages/tr-TR.json index bb4c6fd88196..8ab03a88e810 100644 --- a/frontend/lang/messages/tr-TR.json +++ b/frontend/lang/messages/tr-TR.json @@ -953,7 +953,22 @@ "select-data": "Select Data", "select-language": "Select Language", "columns": "Columns", - "combine": "Birleştir" + "combine": "Birleştir", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "User Registration", diff --git a/frontend/lang/messages/uk-UA.json b/frontend/lang/messages/uk-UA.json index 4921ff797d19..731970c5baff 100644 --- a/frontend/lang/messages/uk-UA.json +++ b/frontend/lang/messages/uk-UA.json @@ -953,7 +953,22 @@ "select-data": "Вибір даних", "select-language": "Вибір мови", "columns": "Стовпці", - "combine": "Об'єднати" + "combine": "Об'єднати", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "Реєстрація користувачів", diff --git a/frontend/lang/messages/vi-VN.json b/frontend/lang/messages/vi-VN.json index 46c12efc930d..165724b9a617 100644 --- a/frontend/lang/messages/vi-VN.json +++ b/frontend/lang/messages/vi-VN.json @@ -953,7 +953,22 @@ "select-data": "Select Data", "select-language": "Select Language", "columns": "Columns", - "combine": "Combine" + "combine": "Combine", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "User Registration", diff --git a/frontend/lang/messages/zh-CN.json b/frontend/lang/messages/zh-CN.json index 8209da2fb946..c1ed4f324ba2 100644 --- a/frontend/lang/messages/zh-CN.json +++ b/frontend/lang/messages/zh-CN.json @@ -953,7 +953,22 @@ "select-data": "Select Data", "select-language": "Select Language", "columns": "Columns", - "combine": "Combine" + "combine": "Combine", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "User Registration", diff --git a/frontend/lang/messages/zh-TW.json b/frontend/lang/messages/zh-TW.json index 84bb23701442..72081e6d195a 100644 --- a/frontend/lang/messages/zh-TW.json +++ b/frontend/lang/messages/zh-TW.json @@ -953,7 +953,22 @@ "select-data": "Select Data", "select-language": "Select Language", "columns": "Columns", - "combine": "Combine" + "combine": "Combine", + "categories": { + "edit-category": "Edit Category", + "new-category": "New Category", + "category-data": "Category Data" + }, + "tags": { + "new-tag": "New Tag", + "edit-tag": "Edit Tag", + "tag-data": "Tag Data" + }, + "tools": { + "new-tool": "New Tool", + "edit-tool": "Edit Tool", + "tool-data": "Tool Data" + } }, "user-registration": { "user-registration": "User Registration", diff --git a/mealie/lang/messages/sr-SP.json b/mealie/lang/messages/sr-SP.json index a4990159d5d5..2b07d8cca182 100644 --- a/mealie/lang/messages/sr-SP.json +++ b/mealie/lang/messages/sr-SP.json @@ -1,35 +1,35 @@ { "generic": { - "server-error": "An unexpected error occurred" + "server-error": "Догодила се неочекивана грешка" }, "recipe": { - "unique-name-error": "Recipe names must be unique" + "unique-name-error": "Назив рецепта мора бити јединствен" }, "mealplan": { - "no-recipes-match-your-rules": "No recipes match your rules" + "no-recipes-match-your-rules": "Нема рецепата који одговарају вашим правилима" }, "user": { - "user-updated": "User updated", - "password-updated": "Password updated", - "invalid-current-password": "Invalid current password", - "ldap-update-password-unavailable": "Unable to update password, user is controlled by LDAP" + "user-updated": "Корисник је ажуриран", + "password-updated": "Лозинка је ажурирана", + "invalid-current-password": "Тренутна лозинка је неисправна", + "ldap-update-password-unavailable": "Лозинку није могуће ажурирати, корисник је контролисан од стране LDAP-а" }, "group": { - "report-deleted": "Report deleted." + "report-deleted": "Рецепт је избрисан." }, "exceptions": { - "permission_denied": "You do not have permission to perform this action", - "no-entry-found": "The requested resource was not found", - "integrity-error": "Database integrity error", - "username-conflict-error": "This username is already taken", - "email-conflict-error": "This email is already in use" + "permission_denied": "Немате дозволу за извршење ове радње", + "no-entry-found": "Захтевани ресурс није пронађен", + "integrity-error": "Грешка у интегритету базе података", + "username-conflict-error": "Корисничко име је већ заузето", + "email-conflict-error": "Овај е-мејл је већ у употреби" }, "notifications": { - "generic-created": "{name} was created", - "generic-updated": "{name} was updated", - "generic-created-with-url": "{name} has been created, {url}", - "generic-updated-with-url": "{name} has been updated, {url}", - "generic-duplicated": "{name} has been duplicated", - "generic-deleted": "{name} has been deleted" + "generic-created": "{name} је крериран", + "generic-updated": "{name} је ажуриран", + "generic-created-with-url": "{name} је направљено, {url}", + "generic-updated-with-url": "{name} је ажурирано, {url}", + "generic-duplicated": "{name} је дуплиран", + "generic-deleted": "{name} је обрисан" } } diff --git a/mealie/repos/seed/resources/labels/locales/sr-SP.json b/mealie/repos/seed/resources/labels/locales/sr-SP.json index fe4d0175fcb7..6d5515da75c7 100644 --- a/mealie/repos/seed/resources/labels/locales/sr-SP.json +++ b/mealie/repos/seed/resources/labels/locales/sr-SP.json @@ -1,65 +1,65 @@ [ { - "name": "Produce" + "name": "Домаћи производи" }, { - "name": "Grains" + "name": "Житарице" }, { - "name": "Fruits" + "name": "Воће" }, { - "name": "Vegetables" + "name": "Поврће" }, { - "name": "Meat" + "name": "Месо" }, { - "name": "Seafood" + "name": "Морски плодови" }, { - "name": "Beverages" + "name": "Пића" }, { - "name": "Baked Goods" + "name": "Пецива" }, { - "name": "Canned Goods" + "name": "Конзервирана храна" }, { - "name": "Condiments" + "name": "Зачини" }, { - "name": "Confectionary" + "name": "Кондиторски производи" }, { - "name": "Dairy Products" + "name": "Млечни производи" }, { - "name": "Frozen Foods" + "name": "Смрзнута храна" }, { - "name": "Health Foods" + "name": "Здрава храна" }, { - "name": "Household" + "name": "Домаћинство" }, { - "name": "Meat Products" + "name": "Месни производи" }, { - "name": "Snacks" + "name": "Грицкалице" }, { - "name": "Spices" + "name": "Зачини" }, { - "name": "Sweets" + "name": "Слаткиши" }, { - "name": "Alcohol" + "name": "Алкохол" }, { - "name": "Other" + "name": "Остало" } ] diff --git a/mealie/repos/seed/resources/units/locales/sr-SP.json b/mealie/repos/seed/resources/units/locales/sr-SP.json index 336525a5aa59..c6181476bf94 100644 --- a/mealie/repos/seed/resources/units/locales/sr-SP.json +++ b/mealie/repos/seed/resources/units/locales/sr-SP.json @@ -1,86 +1,86 @@ { "teaspoon": { - "name": "teaspoon", + "name": "кашичица", "description": "", - "abbreviation": "tsp" + "abbreviation": "кашичица" }, "tablespoon": { - "name": "tablespoon", + "name": "кашика", "description": "", - "abbreviation": "tbsp" + "abbreviation": "кашика" }, "cup": { - "name": "cup", + "name": "шоља", "description": "", - "abbreviation": "cup" + "abbreviation": "шоља" }, "fluid-ounce": { - "name": "fluid ounce", + "name": "течна унца", "description": "", - "abbreviation": "fl oz" + "abbreviation": "течна унца" }, "pint": { - "name": "pint", + "name": "пинта", "description": "", "abbreviation": "pt" }, "quart": { - "name": "quart", + "name": "четврт галона", "description": "", "abbreviation": "qt" }, "gallon": { - "name": "gallon", + "name": "галон", "description": "", - "abbreviation": "gal" + "abbreviation": "гал" }, "milliliter": { - "name": "milliliter", + "name": "милиметар", "description": "", - "abbreviation": "ml" + "abbreviation": "мл" }, "liter": { - "name": "liter", + "name": "литар", "description": "", - "abbreviation": "l" + "abbreviation": "л" }, "pound": { - "name": "pound", + "name": "фунта", "description": "", "abbreviation": "lb" }, "ounce": { - "name": "ounce", + "name": "унца", "description": "", - "abbreviation": "oz" + "abbreviation": "унца (oz)" }, "gram": { - "name": "gram", + "name": "грам", "description": "", - "abbreviation": "g" + "abbreviation": "г" }, "kilogram": { - "name": "kilogram", + "name": "килограм", "description": "", - "abbreviation": "kg" + "abbreviation": "кг" }, "milligram": { - "name": "milligram", + "name": "милиграм", "description": "", - "abbreviation": "mg" + "abbreviation": "мг" }, "splash": { - "name": "splash", + "name": "мала количина (splash)", "description": "", "abbreviation": "" }, "dash": { - "name": "dash", + "name": "осмина кашичице", "description": "", "abbreviation": "" }, "serving": { - "name": "serving", + "name": "порција", "description": "", "abbreviation": "" }, @@ -90,12 +90,12 @@ "abbreviation": "" }, "clove": { - "name": "clove", + "name": "клинчић", "description": "", "abbreviation": "" }, "can": { - "name": "can", + "name": "конзерва", "description": "", "abbreviation": "" } From 0775072ffa2577b7c7e5549f38e605e6f8da7d6d Mon Sep 17 00:00:00 2001 From: Michael Genson <71845777+michael-genson@users.noreply.github.com> Date: Tue, 21 Nov 2023 12:11:10 -0600 Subject: [PATCH 53/54] feat: add meal plan to shopping list (#2653) * refactored recipe add to shopping list dialog * added context menu to meal plan day * cleaned up presentation * consolidate repeated recipes * added alerts * lint * lint v2 * fixed undefined recipeRef bug * lint * made scale + slug implementation less horrible --- .../Group/GroupMealPlanDayContextMenu.vue | 145 +++++++++ .../Domain/Recipe/RecipeContextMenu.vue | 167 +--------- .../Recipe/RecipeDialogAddToShoppingList.vue | 303 ++++++++++++++++++ frontend/lang/messages/en-US.json | 2 + .../pages/group/mealplan/planner/view.vue | 92 +++--- 5 files changed, 523 insertions(+), 186 deletions(-) create mode 100644 frontend/components/Domain/Group/GroupMealPlanDayContextMenu.vue create mode 100644 frontend/components/Domain/Recipe/RecipeDialogAddToShoppingList.vue diff --git a/frontend/components/Domain/Group/GroupMealPlanDayContextMenu.vue b/frontend/components/Domain/Group/GroupMealPlanDayContextMenu.vue new file mode 100644 index 000000000000..9eb740a81a46 --- /dev/null +++ b/frontend/components/Domain/Group/GroupMealPlanDayContextMenu.vue @@ -0,0 +1,145 @@ + + + diff --git a/frontend/components/Domain/Recipe/RecipeContextMenu.vue b/frontend/components/Domain/Recipe/RecipeContextMenu.vue index 1dc79fb813c6..fa1d6133f0e2 100644 --- a/frontend/components/Domain/Recipe/RecipeContextMenu.vue +++ b/frontend/components/Domain/Recipe/RecipeContextMenu.vue @@ -69,77 +69,12 @@ > - - - - - {{ list.name }} - - - - - - - - - - - - - -
- -
- + import { computed, defineComponent, reactive, toRefs, useContext, useRoute, useRouter, ref } from "@nuxtjs/composition-api"; -import RecipeIngredientListItem from "./RecipeIngredientListItem.vue"; +import RecipeDialogAddToShoppingList from "./RecipeDialogAddToShoppingList.vue"; import RecipeDialogPrintPreferences from "./RecipeDialogPrintPreferences.vue"; import RecipeDialogShare from "./RecipeDialogShare.vue"; import { useLoggedInState } from "~/composables/use-logged-in-state"; import { useUserApi } from "~/composables/api"; import { alert } from "~/composables/use-toast"; import { usePlanTypeOptions } from "~/composables/use-group-mealplan"; -import { Recipe, RecipeIngredient } from "~/lib/api/types/recipe"; +import { Recipe } from "~/lib/api/types/recipe"; import { ShoppingListSummary } from "~/lib/api/types/group"; import { PlanEntryType } from "~/lib/api/types/meal-plan"; import { useAxiosDownloader } from "~/composables/api/use-axios-download"; @@ -204,9 +139,9 @@ export interface ContextMenuItem { export default defineComponent({ components: { + RecipeDialogAddToShoppingList, RecipeDialogPrintPreferences, RecipeDialogShare, - RecipeIngredientListItem }, props: { useItems: { @@ -279,7 +214,6 @@ export default defineComponent({ recipeDeleteDialog: false, mealplannerDialog: false, shoppingListDialog: false, - shoppingListIngredientDialog: false, recipeDuplicateDialog: false, recipeName: props.name, loading: false, @@ -374,7 +308,7 @@ export default defineComponent({ } } - // Add leading and Apppending Items + // Add leading and Appending Items state.menuItems = [...state.menuItems, ...props.leadingItems, ...props.appendItems]; const icon = props.menuIcon || $globals.icons.dotsVertical; @@ -383,9 +317,8 @@ export default defineComponent({ // Context Menu Event Handler const shoppingLists = ref(); - const selectedShoppingList = ref(); const recipeRef = ref(props.recipe); - const recipeIngredients = ref<{ checked: boolean; ingredient: RecipeIngredient, disableAmount: boolean }[]>([]); + const recipeRefWithScale = computed(() => recipeRef.value ? { scale: props.recipeScale, ...recipeRef.value } : undefined); async function getShoppingLists() { const { data } = await api.shopping.lists.getAll(); @@ -401,61 +334,6 @@ export default defineComponent({ } } - async function openShoppingListIngredientDialog(list: ShoppingListSummary) { - selectedShoppingList.value = list; - if (!recipeRef.value) { - await refreshRecipe(); - } - - if (recipeRef.value?.recipeIngredient) { - recipeIngredients.value = recipeRef.value.recipeIngredient.map((ingredient) => { - return { - checked: true, - ingredient, - disableAmount: recipeRef.value.settings?.disableAmount || false - }; - }); - } - - state.shoppingListDialog = false; - state.shoppingListIngredientDialog = true; - } - - function bulkCheckIngredients(value = true) { - recipeIngredients.value.forEach((data) => { - data.checked = value; - }); - } - - async function addRecipeToList() { - if (!selectedShoppingList.value) { - return; - } - - const ingredients: RecipeIngredient[] = []; - recipeIngredients.value.forEach((data) => { - if (data.checked) { - ingredients.push(data.ingredient); - } - }); - - if (!ingredients.length) { - return; - } - - const { data } = await api.shopping.lists.addRecipe( - selectedShoppingList.value.id, - props.recipeId, - props.recipeScale, - ingredients - ); - if (data) { - alert.success(i18n.t("recipe.recipe-added-to-list") as string); - state.shoppingListDialog = false; - state.shoppingListIngredientDialog = false; - } - } - const router = useRouter(); async function deleteRecipe() { @@ -516,10 +394,12 @@ export default defineComponent({ state.printPreferencesDialog = true; }, shoppingList: () => { - getShoppingLists(); + const promises: Promise[] = [getShoppingLists()]; + if (!recipeRef.value) { + promises.push(refreshRecipe()); + } - state.shoppingListDialog = true; - state.shoppingListIngredientDialog = false; + Promise.allSettled(promises).then(() => { state.shoppingListDialog = true }); }, share: () => { state.shareDialog = true; @@ -544,28 +424,15 @@ export default defineComponent({ return { ...toRefs(state), recipeRef, + recipeRefWithScale, shoppingLists, - selectedShoppingList, - openShoppingListIngredientDialog, - addRecipeToList, - bulkCheckIngredients, duplicateRecipe, contextMenuEventHandler, deleteRecipe, addRecipeToPlan, icon, planTypeOptions, - recipeIngredients, }; }, }); - - diff --git a/frontend/components/Domain/Recipe/RecipeDialogAddToShoppingList.vue b/frontend/components/Domain/Recipe/RecipeDialogAddToShoppingList.vue new file mode 100644 index 000000000000..a3621043685c --- /dev/null +++ b/frontend/components/Domain/Recipe/RecipeDialogAddToShoppingList.vue @@ -0,0 +1,303 @@ + + + + + diff --git a/frontend/lang/messages/en-US.json b/frontend/lang/messages/en-US.json index c42c09c00cf9..899fe7c7f08e 100644 --- a/frontend/lang/messages/en-US.json +++ b/frontend/lang/messages/en-US.json @@ -463,7 +463,9 @@ "add-to-plan": "Add to Plan", "add-to-timeline": "Add to Timeline", "recipe-added-to-list": "Recipe added to list", + "recipes-added-to-list": "Recipes added to list", "recipe-added-to-mealplan": "Recipe added to mealplan", + "failed-to-add-recipes-to-list": "Failed to add recipe to list", "failed-to-add-recipe-to-mealplan": "Failed to add recipe to mealplan", "yield": "Yield", "quantity": "Quantity", diff --git a/frontend/pages/group/mealplan/planner/view.vue b/frontend/pages/group/mealplan/planner/view.vue index 415eeb1b2600..028d2cfdbf3d 100644 --- a/frontend/pages/group/mealplan/planner/view.vue +++ b/frontend/pages/group/mealplan/planner/view.vue @@ -1,51 +1,65 @@