michael/enrecipes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/main' into main

Browse source
This commit is contained in:
Hosted Weblate 2021-04-15 18:44:31 +02:00
commit bb3f2cb3a8
4 changed files with 55 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/components/Settings/Options.vue
View file

@ -59,8 +59,9 @@
</template>
<script>
import { ApplicationSettings, Observable } from "@nativescript/core";
import { Observable } from "@nativescript/core";
import { mapState, mapActions } from "vuex";
import { localize } from "@nativescript/localize";
import * as utils from "~/shared/utils";
export default {
@ -106,7 +107,7 @@ export default {
toggleShake({ object }) {
let checked = object.checked;
if (checked && !utils.hasAccelerometer()) {
checked = false;
object.checked = false;
this.toast = localize("noAccSensor");
utils.timer(5, (val) => {
if (!val) this.toast = val;

20
app/i18n/en-GB.default.json
View file

@ -11,12 +11,9 @@
"Barbecue": "Barbecue",
"Beverages": "Beverages",
"Breads": "Breads",
"Breakfast": "Breakfast",
"Desserts": "Desserts",
"Dinner": "Dinner",
"Drinks": "Drinks",
"Healthy": "Healthy",
"Lunch": "Lunch",
"Main dishes": "Main dishes",
"Meat": "Meat",
"Noodles": "Noodles",
@ -27,7 +24,6 @@
"Sauces": "Sauces",
"Seafood": "Seafood",
"Side dishes": "Side dishes",
"Snacks": "Snacks",
"Soups": "Soups",
"Undefined": "Undefined",
"Vegan": "Vegan",
@ -112,7 +108,6 @@
"aIngBtn": "ADD INGREDIENT",
"inss": "Instructions",
"aStpBtn": "ADD STEP",
"cmb": "Combination",
"cmbs": "Combinations",
"addCmbBtn": "ADD COMBINATION",
"no": "Note",
@ -137,8 +132,6 @@
"shr": "Share",
"pht": "Recipe photo",
"rec": "Recipe as text",
"fil": "Recipe as file",
"ovw": "Overview",
"aNBtn": "ADD NEW",
"SET": "SET",
"appRst": "App restart required",
@ -147,10 +140,6 @@
"nNBtn": "NOT NOW",
"conBtn": "CONTINUE",
"aFBu": "Add a recipe to perform a backup",
"favd": "Added to Favourites",
"unfavd": "Removed from Favourites",
"aTry": "Added to Try Later",
"rmTry": "Removed from Try Later",
"conf": "Confirm",
"delRecInfo": "You are about to permanently delete the recipe:",
"delRecsInfo": "You are about to permanently delete:",
@ -172,9 +161,9 @@
"recPic": "Recipe photo",
"cPic": "Crop photo",
"breakfast": "Breakfast",
"lunch": "lunch",
"dinner": "dinner",
"snacks": "snacks",
"lunch": "Lunch",
"dinner": "Dinner",
"snacks": "Snacks",
"triedInfo": "You tried this recipe:",
"today": "today",
"yesterday": "yesterday",
@ -182,7 +171,6 @@
"wAgo": "weeks ago",
"mAgo": "months ago",
"ltAgo": "a long time ago",
"vrfy": "Verifying",
"appCrd": "Shared via EnRecipes. Get it on F-Droid, IzzyOnDroid or the Play Store.",
"gh": "View on GitHub",
"priv": "Privacy policy",
@ -212,7 +200,6 @@
"newUnit": "New unit",
"Unit": "Unit",
"cui": "Cuisine",
"cuis": "Cuisines",
"allCuis": "All Cuisines",
"American": "American",
"Brazilian": "Brazilian",
@ -267,7 +254,6 @@
"invFile": "Invalid file",
"donate": "Donate",
"appInfo": "EnRecipes is an open source, privacy-friendly digital cookbook that lets you create, manage and share your recipes",
"help": "Help",
"trySer": "SEARCH IN ALL THE RECIPES?",
"January": "January",
"February": "February",

8
app/store.ts
View file

@ -45,12 +45,12 @@ const defaultCategories = [
'Barbecue',
'Beverages',
'Breads',
'Breakfast',
'breakfast',
'Desserts',
'Dinner',
'dinner',
'Drinks',
'Healthy',
'Lunch',
'lunch',
'Main dishes',
'Meat',
'Noodles',
@ -61,7 +61,7 @@ const defaultCategories = [
'Sauces',
'Seafood',
'Side dishes',
'Snacks',
'snacks',
'Soups',
'Undefined',
'Vegan',

94
package-lock.json generated
View file

@ -419,9 +419,9 @@
"dev": true
},
"node_modules/@nativescript/webpack": {
"version": "5.0.0-beta.6",
"resolved": "https://registry.npmjs.org/@nativescript/webpack/-/webpack-5.0.0-beta.6.tgz",
"integrity": "sha512-/NvzzElwWpl7HUphV3MLAzzEeRFGFgi5huG5Mx8p5MxPZOIdC2nM18nT+qZT1UhoRTzYlW13Z0ZSBGBlbyPTGw==",
"version": "5.0.0-beta.7",
"resolved": "https://registry.npmjs.org/@nativescript/webpack/-/webpack-5.0.0-beta.7.tgz",
"integrity": "sha512-2LqrP7rSP8iaqyHezAdDasalaNNKpAAQJEuZb4Uu3kPM1tFRSYKs4SMbAEWR11JcQ+p9azfeHXlsHbTt6sm7Sw==",
"dev": true,
"dependencies": {
"@babel/core": "7.13.15",
@ -576,9 +576,9 @@
"integrity": "sha512-AiAruGY7IxgKW/Jn4+iRVPpXvXMDPnuUchJLujQ1ipZ1f8IIDgMch3A5nMxJWY1KSn72AYZLoQZxmEN3YxzZIA=="
},
"node_modules/@types/eslint": {
"version": "7.2.9",
"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.9.tgz",
"integrity": "sha512-SdAAXZNvWfhtf3X3y1cbbCZhP3xyPh7mfTvzV6CgfWc/ZhiHpyr9bVroe2/RCHIf7gczaNcprhaBLsx0CCJHQA==",
"version": "7.2.10",
"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.10.tgz",
"integrity": "sha512-kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ==",
"dev": true,
"dependencies": {
"@types/estree": "*",
@ -608,9 +608,9 @@
"dev": true
},
"node_modules/@types/node": {
"version": "14.14.37",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz",
"integrity": "sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==",
"version": "14.14.40",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.40.tgz",
"integrity": "sha512-2HoZZGylcnz19ZSbvWhgWHqvprw1ZGHanxIrDWYykPD4CauLW4gcyLzCVfUN2kv/1t1F3CurQIdi+s1l9+XgEA==",
"dev": true
},
"node_modules/@types/parse-json": {
@ -1828,9 +1828,9 @@
"dev": true
},
"node_modules/electron-to-chromium": {
"version": "1.3.716",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.716.tgz",
"integrity": "sha512-yUWKAfpJH5ovgwIlNbBHioedAWolzTVl6tmMaXP1RmCMyYv+U+ukvo9gwA10mLW0eFbyW4n/oC4UIN12gTMn/w==",
"version": "1.3.717",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.717.tgz",
"integrity": "sha512-OfzVPIqD1MkJ7fX+yTl2nKyOE4FReeVfMCzzxQS+Kp43hZYwHwThlGP+EGIZRXJsxCM7dqo8Y65NOX/HP12iXQ==",
"dev": true
},
"node_modules/emoji-regex": {
@ -2241,9 +2241,9 @@
}
},
"node_modules/get-stream": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz",
"integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==",
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
"dev": true,
"engines": {
"node": ">=10"
@ -4242,6 +4242,7 @@
"version": "4.2.4",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz",
"integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==",
"dev": true,
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
@ -4289,7 +4290,8 @@
"node_modules/vue": {
"version": "2.6.12",
"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz",
"integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="
"integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==",
"dev": true
},
"node_modules/vue-hot-reload-api": {
"version": "2.3.4",
@ -5145,9 +5147,9 @@
"dev": true
},
"@nativescript/webpack": {
"version": "5.0.0-beta.6",
"resolved": "https://registry.npmjs.org/@nativescript/webpack/-/webpack-5.0.0-beta.6.tgz",
"integrity": "sha512-/NvzzElwWpl7HUphV3MLAzzEeRFGFgi5huG5Mx8p5MxPZOIdC2nM18nT+qZT1UhoRTzYlW13Z0ZSBGBlbyPTGw==",
"version": "5.0.0-beta.7",
"resolved": "https://registry.npmjs.org/@nativescript/webpack/-/webpack-5.0.0-beta.7.tgz",
"integrity": "sha512-2LqrP7rSP8iaqyHezAdDasalaNNKpAAQJEuZb4Uu3kPM1tFRSYKs4SMbAEWR11JcQ+p9azfeHXlsHbTt6sm7Sw==",
"dev": true,
"requires": {
"@babel/core": "7.13.15",
@ -5249,9 +5251,9 @@
"integrity": "sha512-AiAruGY7IxgKW/Jn4+iRVPpXvXMDPnuUchJLujQ1ipZ1f8IIDgMch3A5nMxJWY1KSn72AYZLoQZxmEN3YxzZIA=="
},
"@types/eslint": {
"version": "7.2.9",
"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.9.tgz",
"integrity": "sha512-SdAAXZNvWfhtf3X3y1cbbCZhP3xyPh7mfTvzV6CgfWc/ZhiHpyr9bVroe2/RCHIf7gczaNcprhaBLsx0CCJHQA==",
"version": "7.2.10",
"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.10.tgz",
"integrity": "sha512-kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ==",
"dev": true,
"requires": {
"@types/estree": "*",
@ -5281,9 +5283,9 @@
"dev": true
},
"@types/node": {
"version": "14.14.37",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz",
"integrity": "sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==",
"version": "14.14.40",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.40.tgz",
"integrity": "sha512-2HoZZGylcnz19ZSbvWhgWHqvprw1ZGHanxIrDWYykPD4CauLW4gcyLzCVfUN2kv/1t1F3CurQIdi+s1l9+XgEA==",
"dev": true
},
"@types/parse-json": {
@ -5539,8 +5541,7 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.2.tgz",
"integrity": "sha512-3OBzV2fBGZ5TBfdW50cha1lHDVf9vlvRXnjpVbJBa20pSZQaSkMJZiwA8V2vD9ogyeXn8nU5s5A6mHyf5jhMzA==",
"dev": true,
"requires": {}
"dev": true
},
"@webpack-cli/info": {
"version": "1.2.3",
@ -5555,8 +5556,7 @@
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.3.1.tgz",
"integrity": "sha512-0qXvpeYO6vaNoRBI52/UsbcaBydJCggoBBnIo/ovQQdn6fug0BgwsjorV1hVS7fMqGVTZGcVxv8334gjmbj5hw==",
"dev": true,
"requires": {}
"dev": true
},
"@xtuc/ieee754": {
"version": "1.2.0",
@ -5589,8 +5589,7 @@
"version": "0.2.7",
"resolved": "https://registry.npmjs.org/acorn-private-class-elements/-/acorn-private-class-elements-0.2.7.tgz",
"integrity": "sha512-+GZH2wOKNZOBI4OOPmzpo4cs6mW297sn6fgIk1dUI08jGjhAaEwvC39mN2gJAg2lmAQJ1rBkFqKWonL3Zz6PVA==",
"dev": true,
"requires": {}
"dev": true
},
"acorn-private-methods": {
"version": "0.3.3",
@ -5643,8 +5642,7 @@
"version": "3.5.2",
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
"dev": true,
"requires": {}
"dev": true
},
"ansi-colors": {
"version": "4.1.1",
@ -6211,9 +6209,9 @@
"dev": true
},
"electron-to-chromium": {
"version": "1.3.716",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.716.tgz",
"integrity": "sha512-yUWKAfpJH5ovgwIlNbBHioedAWolzTVl6tmMaXP1RmCMyYv+U+ukvo9gwA10mLW0eFbyW4n/oC4UIN12gTMn/w==",
"version": "1.3.717",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.717.tgz",
"integrity": "sha512-OfzVPIqD1MkJ7fX+yTl2nKyOE4FReeVfMCzzxQS+Kp43hZYwHwThlGP+EGIZRXJsxCM7dqo8Y65NOX/HP12iXQ==",
"dev": true
},
"emoji-regex": {
@ -6532,9 +6530,9 @@
"dev": true
},
"get-stream": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz",
"integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==",
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
"dev": true
},
"glob": {
@ -6649,8 +6647,7 @@
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
"integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
"dev": true,
"requires": {}
"dev": true
},
"ignore": {
"version": "5.1.8",
@ -7382,8 +7379,7 @@
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
"integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
"dev": true,
"requires": {}
"dev": true
},
"postcss-modules-local-by-default": {
"version": "4.0.0",
@ -8005,7 +8001,8 @@
"typescript": {
"version": "4.2.4",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz",
"integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg=="
"integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==",
"dev": true
},
"uniq": {
"version": "1.0.1",
@ -8043,7 +8040,8 @@
"vue": {
"version": "2.6.12",
"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz",
"integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="
"integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==",
"dev": true
},
"vue-hot-reload-api": {
"version": "2.3.4",
@ -8127,8 +8125,7 @@
"vuex": {
"version": "3.6.2",
"resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
"integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
"requires": {}
"integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="
},
"watchpack": {
"version": "2.1.1",
@ -8334,8 +8331,7 @@
"version": "7.4.4",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz",
"integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==",
"dev": true,
"requires": {}
"dev": true
},
"xmlbuilder": {
"version": "9.0.7",