mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-10 16:47:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/importer_to_vue

Browse Source 
# Conflicts:
#	vue/src/apps/RecipeEditView/RecipeEditView.vue
#	vue/src/utils/openapi/api.ts
This commit is contained in:
vabene1111
2022-04-22 16:41:13 +02:00
parent 57ec6a2b3d 05383a2bc3
commit 2ddb0c719a
62 changed files with 2619 additions and 1380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vue/src/locales/en.json
View File

@@ -4,6 +4,7 @@
"err_creating_resource": "There was an error creating a resource!",
"err_updating_resource": "There was an error updating a resource!",
"err_deleting_resource": "There was an error deleting a resource!",
"err_deleting_protected_resource": "The object you are trying to delete is still used and can't be deleted.",
"err_moving_resource": "There was an error moving a resource!",
"err_merging_resource": "There was an error merging a resource!",
"success_fetching_resource": "Successfully fetched a resource!",
@@ -63,6 +64,7 @@
"Make_Ingredient": "Make Ingredient",
"Enable_Amount": "Enable Amount",
"Disable_Amount": "Disable Amount",
"Ingredient Editor": "Ingredient Editor",
"Add_Step": "Add Step",
"Keywords": "Keywords",
"Books": "Books",
@@ -87,6 +89,7 @@
"Note": "Note",
"Success": "Success",
"Failure": "Failure",
"Protected": "Protected",
"Ingredients": "Ingredients",
"Supermarket": "Supermarket",
"Categories": "Categories",