removed old strings
This commit is contained in:
parent
7333494ba0
commit
142e740f11
7 changed files with 65 additions and 54 deletions
|
@ -537,9 +537,8 @@ export default {
|
||||||
return [{}, {}].concat(this.filteredRecipes);
|
return [{}, {}].concat(this.filteredRecipes);
|
||||||
},
|
},
|
||||||
noResultFor() {
|
noResultFor() {
|
||||||
if (this.filterFavourites) return "noRecsInFavs";
|
if (this.filterFavourites || this.filterTrylater || this.selectedCuisine)
|
||||||
if (this.filterTrylater) return "noRecsInTL";
|
return "noRecsInL";
|
||||||
if (this.selectedCuisine) return "noRecsInFtr";
|
|
||||||
return "noRecs";
|
return "noRecs";
|
||||||
},
|
},
|
||||||
imgWidth() {
|
imgWidth() {
|
||||||
|
@ -737,12 +736,11 @@ export default {
|
||||||
deleteRecipe(id) {
|
deleteRecipe(id) {
|
||||||
this.deletionDialogActive = true;
|
this.deletionDialogActive = true;
|
||||||
let index = this.recipes.findIndex((e) => e.id === id);
|
let index = this.recipes.findIndex((e) => e.id === id);
|
||||||
|
let recipeTitle = `"${this.recipes[index].title}"`;
|
||||||
this.$showModal(ConfirmDialog, {
|
this.$showModal(ConfirmDialog, {
|
||||||
props: {
|
props: {
|
||||||
title: localize("conf"),
|
title: localize("conf"),
|
||||||
description: `${localize("delRecInfo")} "${
|
description: `${localize("delRecInfo", recipeTitle)}`,
|
||||||
this.recipes[index].title
|
|
||||||
}"`,
|
|
||||||
cancelButtonText: "cBtn",
|
cancelButtonText: "cBtn",
|
||||||
okButtonText: "dBtn",
|
okButtonText: "dBtn",
|
||||||
},
|
},
|
||||||
|
@ -760,12 +758,11 @@ export default {
|
||||||
},
|
},
|
||||||
deleteRecipes(idsArr) {
|
deleteRecipes(idsArr) {
|
||||||
this.deletionDialogActive = true;
|
this.deletionDialogActive = true;
|
||||||
|
let selectionCount = `${this.selection.length} ${localize("recs")}`;
|
||||||
this.$showModal(ConfirmDialog, {
|
this.$showModal(ConfirmDialog, {
|
||||||
props: {
|
props: {
|
||||||
title: localize("conf"),
|
title: localize("conf"),
|
||||||
description: `${localize("delRecsInfo")} ${
|
description: `${localize("delRecsInfo", selectionCount)}`,
|
||||||
this.selection.length
|
|
||||||
} ${localize("recs")}`,
|
|
||||||
cancelButtonText: "cBtn",
|
cancelButtonText: "cBtn",
|
||||||
okButtonText: "dBtn",
|
okButtonText: "dBtn",
|
||||||
},
|
},
|
||||||
|
|
|
@ -452,21 +452,21 @@ export default {
|
||||||
let dayDiff = Math.ceil(diff / 86400);
|
let dayDiff = Math.ceil(diff / 86400);
|
||||||
if (isNaN(dayDiff) || dayDiff < 0) return "";
|
if (isNaN(dayDiff) || dayDiff < 0) return "";
|
||||||
|
|
||||||
function duration(value) {
|
function duration(value, number) {
|
||||||
return localize(value);
|
return number ? localize(value, number) : localize(value);
|
||||||
}
|
}
|
||||||
return (
|
return (
|
||||||
(diff < 86400 && lastTried > midnight && duration("today")) ||
|
(diff < 86400 && lastTried > midnight && duration("today")) ||
|
||||||
(dayDiff == 1 && "yesterday") ||
|
(dayDiff == 1 && "yesterday") ||
|
||||||
(dayDiff < 7 && dayDiff + " " + duration("dAgo")) ||
|
(dayDiff < 7 && duration("dAgo", dayDiff)) ||
|
||||||
(dayDiff < 31 && Math.round(dayDiff / 7) + " " + duration("wAgo")) ||
|
(dayDiff < 31 && duration("wAgo", Math.round(dayDiff / 7))) ||
|
||||||
(dayDiff < 366 && Math.round(dayDiff / 30) + " " + duration("mAgo")) ||
|
(dayDiff < 366 && duration("mAgo", Math.round(dayDiff / 30))) ||
|
||||||
(dayDiff > 365 && duration("ltAgo"))
|
(dayDiff > 365 && duration("ltAgo"))
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
showLastTried() {
|
showLastTried() {
|
||||||
this.toast = localize("triedInfo", this.niceDate(this.recipe.lastTried));
|
this.toast = localize("triedInfo", this.niceDate(this.recipe.lastTried));
|
||||||
utils.timer(5, (val) => {
|
utils.timer(10, (val) => {
|
||||||
if (!val) this.toast = val;
|
if (!val) this.toast = val;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
|
@ -78,9 +78,7 @@
|
||||||
"noFavs": "No favourites yet",
|
"noFavs": "No favourites yet",
|
||||||
"fsList": "Your favourite recipes are listed here",
|
"fsList": "Your favourite recipes are listed here",
|
||||||
"noRecs": "No recipes match your search",
|
"noRecs": "No recipes match your search",
|
||||||
"noRecsInTL": "No recipes match your search in the Try Later list",
|
"noRecsInL": "None of the recipes here matches your search",
|
||||||
"noRecsInFavs": "No recipes match your search in the Favourites list",
|
|
||||||
"noRecsInFtr": "No recipes match your search in the Filtered recipes",
|
|
||||||
"intf": "Interface",
|
"intf": "Interface",
|
||||||
"lang": "Language",
|
"lang": "Language",
|
||||||
"sysDef": "System default",
|
"sysDef": "System default",
|
||||||
|
|
32
app/store.ts
32
app/store.ts
|
@ -214,10 +214,10 @@ export default new Vuex.Store({
|
||||||
currentComponent: 'EnRecipes',
|
currentComponent: 'EnRecipes',
|
||||||
sortType: 'Oldest first',
|
sortType: 'Oldest first',
|
||||||
language: [
|
language: [
|
||||||
{
|
// {
|
||||||
locale: 'da',
|
// locale: 'da',
|
||||||
title: 'Dansk',
|
// title: 'Dansk',
|
||||||
},
|
// },
|
||||||
{
|
{
|
||||||
locale: 'de',
|
locale: 'de',
|
||||||
title: 'Deutsch',
|
title: 'Deutsch',
|
||||||
|
@ -246,6 +246,18 @@ export default new Vuex.Store({
|
||||||
locale: 'fr-CH',
|
locale: 'fr-CH',
|
||||||
title: 'Français (CH)',
|
title: 'Français (CH)',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
locale: 'hi',
|
||||||
|
title: 'हिंदी',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
locale: 'ml',
|
||||||
|
title: 'മലയാളം',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
locale: 'id',
|
||||||
|
title: 'Indonesia',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
locale: 'it',
|
locale: 'it',
|
||||||
title: 'Italiano',
|
title: 'Italiano',
|
||||||
|
@ -258,10 +270,10 @@ export default new Vuex.Store({
|
||||||
locale: 'nl',
|
locale: 'nl',
|
||||||
title: 'Nederlands',
|
title: 'Nederlands',
|
||||||
},
|
},
|
||||||
{
|
// {
|
||||||
locale: 'pt',
|
// locale: 'pt',
|
||||||
title: 'Português',
|
// title: 'Português',
|
||||||
},
|
// },
|
||||||
{
|
{
|
||||||
locale: 'ru',
|
locale: 'ru',
|
||||||
title: 'Русский',
|
title: 'Русский',
|
||||||
|
@ -270,6 +282,10 @@ export default new Vuex.Store({
|
||||||
locale: 'ta',
|
locale: 'ta',
|
||||||
title: 'தமிழ்',
|
title: 'தமிழ்',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
locale: 'te',
|
||||||
|
title: 'తెలుగు',
|
||||||
|
},
|
||||||
],
|
],
|
||||||
shakeEnabled: true,
|
shakeEnabled: true,
|
||||||
importSummary: {
|
importSummary: {
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
- [New] Redesigned user interface
|
- [New] Redesigned user interface
|
||||||
- [New] Recipe list view modes
|
- [New] Recipe list view modes
|
||||||
- [New] Black theme
|
- [New] Black theme
|
||||||
- [New] Dedicated filters panel
|
- [New] Dedicated filter panel
|
||||||
|
- [New] Set Backup folder location
|
||||||
|
- [New] Set Meal Planner's first day of the week to Monday
|
||||||
- [Fixed] Crash on app start with blocked sensors #30
|
- [Fixed] Crash on app start with blocked sensors #30
|
||||||
- [Fixed] No app name in launcher #29
|
- [Fixed] No app name in launcher #29
|
||||||
|
- [Improvement] Change theme without restarting the app
|
||||||
- [Removed] Storage permission
|
- [Removed] Storage permission
|
||||||
- Change theme without restarting the app
|
- [Added App Languages] Hindi, Indonedian, Italian, Malayalam, Spanish and Telugu
|
||||||
- Set Backup folder location
|
- [Updated] Translations
|
||||||
- Set Meal Planner's first day of the week to Monday
|
|
||||||
- Added app languages: French, Italian, Norwegian Bokmål
|
|
||||||
- Updated translations
|
|
||||||
- Several bug fixes
|
|
||||||
- Dropped support for Android Lollipop
|
- Dropped support for Android Lollipop
|
||||||
|
- Several bug fixes
|
||||||
|
|
|
@ -3,9 +3,9 @@ EnRecipes is an open source, privacy-friendly digital cookbook that lets you cre
|
||||||
<b>Features:</b>
|
<b>Features:</b>
|
||||||
|
|
||||||
* Create recipes quickly
|
* Create recipes quickly
|
||||||
* Add photo, notes and combinations to your recipes
|
* Add photo, combinations and notes to your recipes
|
||||||
* Organise your recipes by cuisine, category and tags
|
* Organise your recipes by cuisine, category and tags
|
||||||
* Mark recipes as favourites and add them to your Try Later list
|
* Add recipes to your Try Later list and mark them as favourites
|
||||||
* Quickly search for recipes by title or ingredient
|
* Quickly search for recipes by title or ingredient
|
||||||
* Scale your recipe ingredients to serve more or less people
|
* Scale your recipe ingredients to serve more or less people
|
||||||
* Get notified of the last time you tried a recipe
|
* Get notified of the last time you tried a recipe
|
||||||
|
@ -19,7 +19,7 @@ EnRecipes is an open source, privacy-friendly digital cookbook that lets you cre
|
||||||
* 100% free and open-source
|
* 100% free and open-source
|
||||||
* Private by Design
|
* Private by Design
|
||||||
* No annoying ads or pop-ups
|
* No annoying ads or pop-ups
|
||||||
* No internet access is required and never asks for any unwanted permissions
|
* No permissions required
|
||||||
|
|
||||||
<b>Credits:</b>
|
<b>Credits:</b>
|
||||||
|
|
||||||
|
|
36
package-lock.json
generated
36
package-lock.json
generated
|
@ -419,9 +419,9 @@
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/@nativescript/webpack": {
|
"node_modules/@nativescript/webpack": {
|
||||||
"version": "5.0.0-beta.7",
|
"version": "5.0.0-beta.9",
|
||||||
"resolved": "https://registry.npmjs.org/@nativescript/webpack/-/webpack-5.0.0-beta.7.tgz",
|
"resolved": "https://registry.npmjs.org/@nativescript/webpack/-/webpack-5.0.0-beta.9.tgz",
|
||||||
"integrity": "sha512-2LqrP7rSP8iaqyHezAdDasalaNNKpAAQJEuZb4Uu3kPM1tFRSYKs4SMbAEWR11JcQ+p9azfeHXlsHbTt6sm7Sw==",
|
"integrity": "sha512-DbsPLX7IYxeq6wtzOKNdLBVWakQCYF16UuFKTnQWfmPqRAHANn+Cpn48qhVmrLXp3u/BxHHdoPmDx5080j+Kvg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/core": "7.13.15",
|
"@babel/core": "7.13.15",
|
||||||
|
@ -608,9 +608,9 @@
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/@types/node": {
|
"node_modules/@types/node": {
|
||||||
"version": "14.14.40",
|
"version": "14.14.41",
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.40.tgz",
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz",
|
||||||
"integrity": "sha512-2HoZZGylcnz19ZSbvWhgWHqvprw1ZGHanxIrDWYykPD4CauLW4gcyLzCVfUN2kv/1t1F3CurQIdi+s1l9+XgEA==",
|
"integrity": "sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/@types/parse-json": {
|
"node_modules/@types/parse-json": {
|
||||||
|
@ -1343,9 +1343,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/caniuse-lite": {
|
"node_modules/caniuse-lite": {
|
||||||
"version": "1.0.30001208",
|
"version": "1.0.30001209",
|
||||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001208.tgz",
|
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001209.tgz",
|
||||||
"integrity": "sha512-OE5UE4+nBOro8Dyvv0lfx+SRtfVIOM9uhKqFmJeUbGriqhhStgp1A0OyBpgy3OUF8AhYCT+PVwPC1gMl2ZcQMA==",
|
"integrity": "sha512-2Ktt4OeRM7EM/JaOZjuLzPYAIqmbwQMNnYbgooT+icoRGrKOyAxA1xhlnotBD1KArRSPsuJp3TdYcZYrL7qNxA==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/chalk": {
|
"node_modules/chalk": {
|
||||||
|
@ -5147,9 +5147,9 @@
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"@nativescript/webpack": {
|
"@nativescript/webpack": {
|
||||||
"version": "5.0.0-beta.7",
|
"version": "5.0.0-beta.9",
|
||||||
"resolved": "https://registry.npmjs.org/@nativescript/webpack/-/webpack-5.0.0-beta.7.tgz",
|
"resolved": "https://registry.npmjs.org/@nativescript/webpack/-/webpack-5.0.0-beta.9.tgz",
|
||||||
"integrity": "sha512-2LqrP7rSP8iaqyHezAdDasalaNNKpAAQJEuZb4Uu3kPM1tFRSYKs4SMbAEWR11JcQ+p9azfeHXlsHbTt6sm7Sw==",
|
"integrity": "sha512-DbsPLX7IYxeq6wtzOKNdLBVWakQCYF16UuFKTnQWfmPqRAHANn+Cpn48qhVmrLXp3u/BxHHdoPmDx5080j+Kvg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"@babel/core": "7.13.15",
|
"@babel/core": "7.13.15",
|
||||||
|
@ -5283,9 +5283,9 @@
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"@types/node": {
|
"@types/node": {
|
||||||
"version": "14.14.40",
|
"version": "14.14.41",
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.40.tgz",
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz",
|
||||||
"integrity": "sha512-2HoZZGylcnz19ZSbvWhgWHqvprw1ZGHanxIrDWYykPD4CauLW4gcyLzCVfUN2kv/1t1F3CurQIdi+s1l9+XgEA==",
|
"integrity": "sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"@types/parse-json": {
|
"@types/parse-json": {
|
||||||
|
@ -5842,9 +5842,9 @@
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"caniuse-lite": {
|
"caniuse-lite": {
|
||||||
"version": "1.0.30001208",
|
"version": "1.0.30001209",
|
||||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001208.tgz",
|
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001209.tgz",
|
||||||
"integrity": "sha512-OE5UE4+nBOro8Dyvv0lfx+SRtfVIOM9uhKqFmJeUbGriqhhStgp1A0OyBpgy3OUF8AhYCT+PVwPC1gMl2ZcQMA==",
|
"integrity": "sha512-2Ktt4OeRM7EM/JaOZjuLzPYAIqmbwQMNnYbgooT+icoRGrKOyAxA1xhlnotBD1KArRSPsuJp3TdYcZYrL7qNxA==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"chalk": {
|
"chalk": {
|
||||||
|
|
Loading…
Reference in a new issue