GitHub/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud.git synced 2026-06-06 04:19:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts for locale files

Browse Source
This commit is contained in:
catborise
2020-11-05 14:27:57 +03:00
parent 917d14c74d 159e06221a
commit c83e26c797
9 changed files with 4475 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
instances/views.py
View File

@@ -1063,7 +1063,11 @@ def clone(request, pk):
}
messages.error(request, msg)
elif check_instance:
<<<<<<< HEAD
msg = _("Instance '%(clone_name)s' already exists!") % {"clone_name": clone_data["name"]}
=======
msg = _("Instance '%(clone_name)s' already exists!") % {'clone_name': clone_data['name']}
>>>>>>> 159e06221af435700047a8e5ababe758a12d7579
messages.error(request, msg)
elif not re.match(r"^[a-zA-Z0-9-]+$", clone_data["name"]):
msg = _("Instance name '%(clone_name)s' contains invalid characters!") % {"clone_name": clone_data["name"]}