Merge remote-tracking branch 'origin/main' into main
This commit is contained in:
commit
0676140ae3
2 changed files with 8 additions and 8 deletions
|
@ -102,7 +102,7 @@ export default {
|
||||||
{},
|
{},
|
||||||
{
|
{
|
||||||
icon: "folder",
|
icon: "folder",
|
||||||
title: "Backup folder",
|
title: "buFol",
|
||||||
subTitle: this.backupFolder,
|
subTitle: this.backupFolder,
|
||||||
action: this.setBackupFolder,
|
action: this.setBackupFolder,
|
||||||
},
|
},
|
||||||
|
@ -434,16 +434,16 @@ export default {
|
||||||
showImportSummary() {
|
showImportSummary() {
|
||||||
let { found, imported, updated } = this.importSummary;
|
let { found, imported, updated } = this.importSummary;
|
||||||
let exists = Math.abs(found - imported - updated) + updated;
|
let exists = Math.abs(found - imported - updated) + updated;
|
||||||
let importedNote = `\n${imported} ${localize("recI")}`;
|
let importedNote = `\n${localize("recI")} ${imported}`;
|
||||||
let existsNote = `\n${exists} ${localize("recE")}`;
|
let existsNote = `\n${localize("recE")} ${exists}`;
|
||||||
let updatedNote = `\n${updated} ${localize("recU")}`;
|
let updatedNote = `\n${localize("recU")} ${updated}`;
|
||||||
this.progress = null;
|
this.progress = null;
|
||||||
this.$showModal(ConfirmDialog, {
|
this.$showModal(ConfirmDialog, {
|
||||||
props: {
|
props: {
|
||||||
title: "impSuc",
|
title: "impSuc",
|
||||||
description: `${found} ${localize(
|
description: `${found} ${localize(
|
||||||
"recF"
|
"recF"
|
||||||
)}${importedNote}${existsNote}${updatedNote}`,
|
)}\n${importedNote}${existsNote}${updatedNote}`,
|
||||||
okButtonText: "OK",
|
okButtonText: "OK",
|
||||||
},
|
},
|
||||||
}).then(() => this.clearImportSummary());
|
}).then(() => this.clearImportSummary());
|
||||||
|
|
|
@ -237,9 +237,9 @@
|
||||||
"impSuc": "Import success",
|
"impSuc": "Import success",
|
||||||
"expSuc": "Export success",
|
"expSuc": "Export success",
|
||||||
"recF": "recipes found",
|
"recF": "recipes found",
|
||||||
"recI": "recipes imported",
|
"recI": "Imported:",
|
||||||
"recE": "recipes already exists",
|
"recE": "Already exist:",
|
||||||
"recU": "recipes updated",
|
"recU": "Updated:",
|
||||||
"OK": "OK",
|
"OK": "OK",
|
||||||
"Filtered recipes": "Filtered recipes",
|
"Filtered recipes": "Filtered recipes",
|
||||||
"Created": "Created",
|
"Created": "Created",
|
||||||
|
|
Loading…
Reference in a new issue