Change {group} tag to {playlist} ({group} is still understood in switch for backwards compat).

Tidy up tag list dialog (missing \n in de)
Include {playlist} in the separate tag list for the playlists.
This commit is contained in:
Mark Gillespie 2017-01-20 23:33:37 +00:00
parent cdf640b21f
commit 7502842cdd
4 changed files with 7 additions and 5 deletions

View file

@ -85,7 +85,8 @@ public class MusicPathBuilder {
if (!TextUtils.isEmpty(musicTrack.getAlbum()))
value = musicTrack.getAlbum();
break;
case "group":
case "playlist":
case "group": //previous name, for compatability
if (!TextUtils.isEmpty(musicTrack.getContainerName()))
value = musicTrack.getContainerName();
break;

View file

@ -75,7 +75,8 @@
<string name="settings_export_structure_alba">Verzeichnisbaum für Alben</string>
<string name="settings_export_structure_alba_dialog_title">Setze den Verzeichnisbaum</string>
<string name="settings_export_subdirectory_structure_album_example">Beispiel: Beatles/Help!/13. Yesterday.mp3</string>
<string name="settings_export_subdirectory_structure_dialog_message">"Nutze / für einen neuen Order. Available Tags: - {album-artist} - {album} - {artist} - {title} - {disc=CD $} - {no=$$.} - {year} - {genre} "</string>
<string name="settings_export_subdirectory_structure_dialog_message">Nutze / für einen neuen Order \n Available Tags: \n - {album-artist} \n - {album} \n - {artist} \n - {title} \n - {disc=CD $} \n - {no=$$.} \n - {year} \n - {genre} \n</string>
<string name="settings_playlist_export_subdirectory_structure_dialog_message">Nutze / für einen neuen Order \n Available Tags: \n - {playlist} \n - {album-artist} \n - {album} \n - {artist} \n - {title} \n - {disc=CD $} \n - {no=$$.} \n - {year} \n - {genre} \n</string>
<string name="settings_export_structure_groups_dialog_title">Setze den Verzeichnisbaum</string>
<string name="settings_export_subdirectory_structure_group_example">Beispiel: Great Songs/4. Beatles - Yesterday.mp3</string>
<string name="settings_version_number">Versionsnummer</string>

View file

@ -94,7 +94,7 @@
<string name="settings_category_export_location">Export Location</string>
<string name="settings_export_path">Export Base Path</string>
<string name="settings_export_subdirectory_structure_dialog_message">Use / for a new folder \n Available Tags: \n - {album-artist} \n - {album} \n - {artist} \n - {title} \n - {disc=CD $} \n - {no=$$.} \n - {year} \n - {genre} \n</string>
<string name="settings_playlist_export_subdirectory_structure_dialog_message">Use / for a new folder \n Available Tags: \n - {playlist} \n - {album-artist} \n - {album} \n - {artist} \n - {title} \n - {disc=CD $} \n - {no=$$.} \n - {year} \n - {genre} \n</string>
<string name="settings_export_path_alba">Export path for albums</string>
<string name="settings_export_structure_alba">Subdirectory structure for albums</string>
@ -140,7 +140,7 @@
<string name="pref_header_debug">Debug</string>
<string name="settings_export_structure_alba_default_value" translatable="false">{album-artist}/{album}/{disc=CD $}/{no=$$.} {title}.mp3</string>
<string name="settings_export_structure_groups_default_value" translatable="false">{group}/{group-no=$$.} {artist} - {title}.mp3</string>
<string name="settings_export_structure_groups_default_value" translatable="false">{playlist}/{artist} - {title}.mp3</string>
<string name="debug_trigger_export_all_title">Trigger ExportAllService now</string>
<string name="file_handling_category">File Handling</string>

View file

@ -24,7 +24,7 @@
<!-- Path structure for groups -->
<EditTextPreference
android:defaultValue="@string/settings_export_structure_groups_default_value"
android:dialogMessage="@string/settings_export_subdirectory_structure_dialog_message"
android:dialogMessage="@string/settings_playlist_export_subdirectory_structure_dialog_message"
android:dialogTitle="@string/settings_export_structure_groups_dialog_title"
android:hint="@string/settings_export_structure_groups_default_value"
android:key="preference_groups_export_structure"