brian/wanderer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge trails function added (#627)

Browse Source 
* merge trails function added

* fix conflict resolve issues

* avoid incorrect authorship when merging trail comments

* require edit access for all selected trails before merge

* fix likes checkbox binding in trail merge modal

* improve error handling

* require editable target and deletable sources for merge

* avoid duplicate trail fetch during merge

* prevent duplicate likes when merging trails

* check photo download responses during trail merge

* add merge completion toast notifications

* cleanup

* small fixes

* move merge code to backend, option to merge single trail selection with similar one, automatic merge for integrations add as option, maintenance page to find and merge similar trails added

* fix build error

* fix

* docu, beautifying, refactoring

---------

Co-authored-by: Flomp <Flomp@users.noreply.github.com>
This commit is contained in:
slothful-vassal
2026-05-09 13:09:26 +02:00
committed by GitHub
parent d2268429c7
commit b5739cb72e
43 changed files with 5232 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
web/src/lib/stores/trail_merge_i18n.ts Normal file
View File

@@ -0,0 +1,26 @@
import { get } from "svelte/store";
import { _ } from "svelte-i18n";
const mergeErrorCodes = new Set([
"trail_merge_auth_required",
"trail_merge_actor_not_found",
"trail_merge_invalid_request",
"trail_merge_unknown_suggest_mode",
"trail_merge_missing_actor",
"trail_merge_missing_trail_id",
"trail_merge_same_source_target",
"trail_merge_requires_multiple_trails",
"trail_merge_missing_source_trail_id",
"trail_merge_source_actor_mismatch",
"trail_merge_source_not_found",
"trail_merge_target_not_found",
"trail_merge_not_allowed",
]);
export function translateTrailMergeError(message: string): string {
if (mergeErrorCodes.has(message)) {
return get(_)(message);
}
return message;
}