diff --git a/frontend/src/components/FormHelpers/ImportOptions.vue b/frontend/src/components/FormHelpers/ImportOptions.vue index 74f133edb..333f5d5fd 100644 --- a/frontend/src/components/FormHelpers/ImportOptions.vue +++ b/frontend/src/components/FormHelpers/ImportOptions.vue @@ -36,11 +36,11 @@ export default { }, users: { value: true, - text: this.$t("general.users"), + text: this.$t("user.users"), }, groups: { value: true, - text: this.$t("general.groups"), + text: this.$t("group.groups"), }, }, }; diff --git a/frontend/src/components/ImportSummaryDialog/index.vue b/frontend/src/components/ImportSummaryDialog/index.vue index 1e2dde36f..aa816aa41 100644 --- a/frontend/src/components/ImportSummaryDialog/index.vue +++ b/frontend/src/components/ImportSummaryDialog/index.vue @@ -29,8 +29,8 @@ {{ $t("general.themes") }} {{ $t("general.settings") }} {{ $t("settings.pages") }} - {{ $t("general.users") }} - {{ $t("general.groups") }} + {{ $t("user.users") }} + {{ $t("group.groups") }} @@ -92,10 +92,10 @@ export default { return this.calculateNumbers(this.$t("general.themes"), this.themeData); }, userNumbers() { - return this.calculateNumbers(this.$t("general.users"), this.userData); + return this.calculateNumbers(this.$t("user.users"), this.userData); }, groupNumbers() { - return this.calculateNumbers(this.$t("general.groups"), this.groupData); + return this.calculateNumbers(this.$t("group.groups"), this.groupData); }, pageNumbers() { return this.calculateNumbers(this.$t("settings.pages"), this.pageData); diff --git a/frontend/src/components/UI/Dialogs/BackupDialog.vue b/frontend/src/components/UI/Dialogs/BackupDialog.vue index b666129dc..a23b82713 100644 --- a/frontend/src/components/UI/Dialogs/BackupDialog.vue +++ b/frontend/src/components/UI/Dialogs/BackupDialog.vue @@ -8,7 +8,7 @@ :loading="loading" > diff --git a/frontend/src/components/UI/TheSidebar.vue b/frontend/src/components/UI/TheSidebar.vue index 6153efec6..d328de84c 100644 --- a/frontend/src/components/UI/TheSidebar.vue +++ b/frontend/src/components/UI/TheSidebar.vue @@ -12,7 +12,7 @@ {{ user.fullName }} - {{ user.admin ? "Admin" : "User" }} + {{ user.admin ? $t('user.admin') : $t('user.user') }} @@ -155,7 +155,7 @@ export default { { icon: "mdi-account-group", to: "/admin/manage-users", - title: this.$t("settings.manage-users"), + title: this.$t("user.manage-users"), }, { icon: "mdi-database-import", diff --git a/frontend/src/locales/dateTimeFormats/en-US.json b/frontend/src/locales/dateTimeFormats/en-US.json index 9e0240f38..25c6e007b 100644 --- a/frontend/src/locales/dateTimeFormats/en-US.json +++ b/frontend/src/locales/dateTimeFormats/en-US.json @@ -16,7 +16,6 @@ "day": "numeric", "weekday": "long", "hour": "numeric", - "minute": "numeric", - "hour12": true + "minute": "numeric" } } \ No newline at end of file diff --git a/frontend/src/locales/messages/en-US.json b/frontend/src/locales/messages/en-US.json index d64ebf629..7330f3846 100644 --- a/frontend/src/locales/messages/en-US.json +++ b/frontend/src/locales/messages/en-US.json @@ -9,6 +9,7 @@ "api-port": "API Port", "application-mode": "Application Mode", "database-type": "Database Type", + "database-url": "Database URL", "default-group": "Default Group", "demo": "Demo", "demo-status": "Demo Status", @@ -17,10 +18,10 @@ "download-recipe-json": "Last Scraped JSON", "not-demo": "Not Demo", "production": "Production", - "database-url": "Database URL", "version": "Version" }, "category": { + "category": "Category", "category-created": "Category created", "category-creation-failed": "Category creation failed", "category-deleted": "Category Deleted", @@ -28,16 +29,18 @@ "category-filter": "Category Filter", "category-update-failed": "Category update failed", "category-updated": "Category updated", - "category": "Category" + "uncategorized-count": "Uncategorized {count}" }, "general": { "apply": "Apply", "cancel": "Cancel", + "clear": "Clear", "close": "Close", "confirm": "Confirm", "create": "Create", "created": "Created", "current-parenthesis": "(Current)", + "custom": "Custom", "dashboard": "Dashboard", "delete": "Delete", "disabled": "Disabled", @@ -53,7 +56,6 @@ "filter": "Filter", "friday": "Friday", "get": "Get", - "groups": "Groups", "image": "Image", "image-upload-failed": "Image upload failed", "import": "Import", @@ -61,11 +63,12 @@ "link": "Link", "monday": "Monday", "name": "Name", + "new": "New", "no": "No", "ok": "OK", "options": "Options:", - "rating": "Rating", "random": "Random", + "rating": "Rating", "recent": "Recent", "recipes": "Recipes", "rename-object": "Rename {0}", @@ -73,13 +76,13 @@ "saturday": "Saturday", "save": "Save", "settings": "Settings", + "shuffle": "Shuffle", "sort": "Sort", "sort-alphabetically": "Alphabetical", "status": "Status", "submit": "Submit", "success-count": "Success: {count}", "sunday": "Sunday", - "shuffle": "Shuffle", "templates": "Templates:", "themes": "Themes", "thursday": "Thursday", @@ -89,7 +92,6 @@ "updated": "Updated", "upload": "Upload", "url": "URL", - "users": "Users", "wednesday": "Wednesday", "yes": "Yes" }, @@ -108,6 +110,7 @@ "group-not-found": "Group not found", "groups": "Groups", "groups-can-only-be-set-by-administrators": "Groups can only be set by administrators", + "manage-groups": "Manage Groups", "user-group": "User Group", "user-group-created": "User Group Created", "user-group-creation-failed": "User Group Creation Failed" @@ -116,15 +119,18 @@ "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", "end-date": "End Date", "group": "Group (Beta)", "meal-planner": "Meal Planner", "meal-plans": "Meal Plans", + "mealplan-categories": "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", "no-meal-plan-defined-yet": "No meal plan defined yet", @@ -254,6 +260,7 @@ "current": "Version:", "custom-pages": "Custom Pages", "edit-page": "Edit Page", + "events": "Events", "first-day-of-week": "First day of the week", "group-settings-updated": "Group Settings Updated", "homepage": { @@ -267,7 +274,6 @@ "latest": "Latest", "local-api": "Local API", "locale-settings": "Locale settings", - "manage-users": "Manage Users", "migrations": "Migrations", "new-page": "New Page", "page-name": "Page Name", @@ -305,6 +311,14 @@ "theme-updated": "Theme updated", "warning": "Warning" }, + "token": { + "active-tokens": "ACTIVE TOKENS", + "api-token": "API Token", + "api-tokens": "API Tokens", + "copy-this-token-for-use-with-an-external-application-this-token-will-not-be-viewable-again": "Copy this token for use with an external application. This token will not be viewable again.", + "create-an-api-token": "Create an API Token", + "token-name": "Token Name" + }, "toolbox": { "assign-all": "Assign All", "bulk-assign": "Bulk Assign", @@ -319,7 +333,8 @@ "meal-planner-webhooks": "Meal Planner Webhooks", "test-webhooks": "Test Webhooks", "the-urls-listed-below-will-recieve-webhooks-containing-the-recipe-data-for-the-meal-plan-on-its-scheduled-day-currently-webhooks-will-execute-at": "The URLs listed below will receive webhooks containing the recipe data for the meal plan on it's scheduled day. Currently Webhooks will execute at", - "webhook-url": "Webhook URL" + "webhook-url": "Webhook URL", + "webhooks-caps": "WEBHOOKS" } }, "signup": { @@ -340,7 +355,8 @@ "tag-deletion-failed": "Tag deletion failed", "tag-update-failed": "Tag update failed", "tag-updated": "Tag updated", - "tags": "Tags" + "tags": "Tags", + "untagged-count": "Untagged {count}" }, "user": { "admin": "Admin", @@ -364,6 +380,7 @@ "link-name": "Link Name", "login": "Login", "logout": "Logout", + "manage-users": "Manage Users", "new-password": "New Password", "new-user": "New User", "password": "Password", @@ -377,6 +394,7 @@ "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": "User", "user-created": "User created", "user-creation-failed": "User creation failed", "user-deleted": "User deleted", diff --git a/frontend/src/pages/Admin/Dashboard/BackupViewer.vue b/frontend/src/pages/Admin/Dashboard/BackupViewer.vue index cda4e95df..769178f90 100644 --- a/frontend/src/pages/Admin/Dashboard/BackupViewer.vue +++ b/frontend/src/pages/Admin/Dashboard/BackupViewer.vue @@ -11,7 +11,9 @@