Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Name which map name has a conflict when importing (#1844)

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier
2020-04-12 15:56:36 +02:00
committed by GitHub
parent e47dcd75ff
commit 9e811be477
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@@ -380,7 +380,7 @@ editor.unsaved = [scarlet]You have unsaved changes![]\nAre you sure you want to
editor.resizemap = Resize Map editor.resizemap = Resize Map
editor.mapname = Map Name: editor.mapname = Map Name:
editor.overwrite = [accent]Warning!\nThis overwrites an existing map. editor.overwrite = [accent]Warning!\nThis overwrites an existing map.
editor.overwrite.confirm = [scarlet]Warning![] A map with this name already exists. Are you sure you want to overwrite it? editor.overwrite.confirm = [scarlet]Warning![] A map with this name already exists. Are you sure you want to overwrite it?\n"[accent]{0}[]"
editor.exists = A map with this name already exists. editor.exists = A map with this name already exists.
editor.selectmap = Select a map to load: editor.selectmap = Select a map to load:

2
core/src/mindustry/ui/dialogs/MapsDialog.java
View File

@@ -98,7 +98,7 @@ public class MapsDialog extends FloatingDialog{
if(conflict != null && !conflict.custom){ if(conflict != null && !conflict.custom){
ui.showInfo(Core.bundle.format("editor.import.exists", name)); ui.showInfo(Core.bundle.format("editor.import.exists", name));
}else if(conflict != null){ }else if(conflict != null){
ui.showConfirm("$confirm", "$editor.overwrite.confirm", () -> { ui.showConfirm("$confirm", Core.bundle.format("editor.overwrite.confirm", map.name()), () -> {
maps.tryCatchMapError(() -> { maps.tryCatchMapError(() -> {
maps.removeMap(conflict); maps.removeMap(conflict);
maps.importMap(map.file); maps.importMap(map.file);