Index: strings.txt
===================================================================
--- strings.txt (revision 3986)
+++ strings.txt (working copy)
@@ -6122,6 +6122,10 @@
PT Mudar Nome
SE Byt namn
+NAME
+ EN Name:
+ FR Nom :
+
SAVED_PLAYLISTS
CZ Procházet playlisty
DE Playlisten nachschlagen
@@ -6211,20 +6215,6 @@
PT Sem Título
SE Namnlös
-DELETE_THIS_PLAYLIST
- CZ Vymazat playlist
- DE Diese Playlist löschen
- DK Slet denne playliste
- EN Delete this playlist
- ES Borrar esta lista
- FI Poista soittolista
- FR Supprimer cette liste de lecture
- JP このプレイリストを削除する
- NL Verwijder deze playlist
- NO Slett denne spillelisten
- PT Remover esta Playlist
- SE Radera låtlistan
-
THIS_ENTIRE_PLAYLIST
CZ Tenhle celý playlist
DE Diese vollständige Playlist
@@ -6275,6 +6265,9 @@
JP 上書き確認
SE bekräfta överskrivning
+CONFIRM_DELETE
+ EN Confirm Delete
+
TRACK
CZ Skladba
DE Lied
@@ -7296,6 +7289,9 @@
PT O nome escolhido já existe. Escolha outro nome para a playlist.
SE Namnet du valde används redan. Välj ett annat namn för din låtlista.
+DELETE_WARNING
+ EN Are you sure you want to delete? Check 'confirm delete' to delete your playlist.
+
SCAN_WARNING
CZ SlimServer stále prohledává hudební archiv, takže se některé položky nyní nemusí zobrazit.
DE Der SlimServer durchsucht immer noch ihr Musikverzeichnis. Deshalb werden einige Lieder in diesem Bereich noch nicht angezeigt.
@@ -8072,7 +8068,7 @@
CZ Odstranit
DE Löschen
DK Fjern
- EN Remove
+ EN Delete
ES Eliminar
FI Poista
FR Supprimer
@@ -9441,3 +9437,4 @@
ALBUMARTIST
DE Album-Interpret
EN Album Artist
+
\ No newline at end of file
Index: Slim/Web/EditPlaylist.pm
===================================================================
--- Slim/Web/EditPlaylist.pm (revision 3986)
+++ Slim/Web/EditPlaylist.pm (working copy)
@@ -242,8 +242,17 @@
my $ds = Slim::Music::Info::getCurrentDataStore();
my $playlistObj = $ds->objectForId('track', $params->{'id'});
- if ($playlistObj) {
+ $params->{'level'} = 0;
+
+ # Warn the user if the playlist already exists.
+ if ($playlistObj && !$params->{'confirm'}) {
+ $params->{'DELETE_WARNING'} = 1;
+ $params->{'level'} = 1;
+ $params->{'playlist'} = $playlistObj->id;
+
+ } elsif ($playlistObj) {
+
removePlaylistFromDisk($playlistObj);
# Do a fast delete, and then commit it.
@@ -254,7 +263,6 @@
# Send the user off to the top level browse playlists
$params->{'hierarchy'} = 'playlist,playlistTrack';
- $params->{'level'} = 0;
return Slim::Web::Pages::browsedb($client, $params);
}
Index: HTML/ExBrowse2/browse_playlist.html
===================================================================
--- HTML/ExBrowse2/browse_playlist.html (revision 3986)
+++ HTML/ExBrowse2/browse_playlist.html (working copy)
@@ -20,6 +20,11 @@
[% "NOTE" | string %] [% "RENAME_WARNING" | string %]
[% END %]
+[% IF DELETE_WARNING %]
+
[% "HOME" | string %] / [% "SAVED_PLAYLISTS" | string %]
+