2 files changed, 68 insertions, 1 deletions
diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs
index d3440e265..624e40a57 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs
@@ -45,7 +45,7 @@ namespace HandBrakeWPF.Converters.Audio
                     }
                     else
                     {
-                        audioTracks.Append( "," + EnumHelper<AudioEncoder>.GetDisplay(track.Encoder));
+                        audioTracks.Append(", " + EnumHelper<AudioEncoder>.GetDisplay(track.Encoder));
                     }
                 }
             }
diff --git a/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitlesQueueDisplayConverter.cs b/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitlesQueueDisplayConverter.cs
new file mode 100644
index 000000000..e30967ae3
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitlesQueueDisplayConverter.cs
@@ -0,0 +1,67 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SubtitlesQueueDisplayConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Subtitle Queue Display Converter
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters.Subtitles
+{
+    using System;
+    using System.Collections.ObjectModel;
+    using System.Globalization;
+    using System.Text;
+    using System.Windows.Data;
+
+    using HandBrake.ApplicationServices.Model.Encoding;
+
+    /// <summary>
+    /// Subtitle Queue Display Converter
+    /// </summary>
+    public class SubtitlesQueueDisplayConverter : IValueConverter
+    {
+        /// <summary>
+        /// Converts a value. 
+        /// </summary>
+        /// <returns>
+        /// A converted value. If the method returns null, the valid null value is used.
+        /// </returns>
+        /// <param name="value">The value produced by the binding source.</param><param name="targetType">The type of the binding target property.</param><param name="parameter">The converter parameter to use.</param><param name="culture">The culture to use in the converter.</param>
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            ObservableCollection<SubtitleTrack> tracks = value as ObservableCollection<SubtitleTrack>;
+            StringBuilder audioTracks = new StringBuilder();
+            if (tracks != null)
+            {
+                foreach (SubtitleTrack track in tracks)
+                {
+                    string text = track.SourceTrack != null ? track.SourceTrack.ToString() : (track.SrtFileName + ".srt");
+                    if (string.IsNullOrEmpty(audioTracks.ToString()))
+                    {
+                        audioTracks.Append(text);
+                    }
+                    else
+                    {
+                        audioTracks.Append(", " + text);
+                    }
+                }
+            }
+
+            return string.IsNullOrEmpty(audioTracks.ToString()) ? "None" : audioTracks.ToString();
+        }
+
+        /// <summary>
+        /// Converts a value. 
+        /// </summary>
+        /// <returns>
+        /// A converted value. If the method returns null, the valid null value is used.
+        /// </returns>
+        /// <param name="value">The value that is produced by the binding target.</param><param name="targetType">The type to convert to.</param><param name="parameter">The converter parameter to use.</param><param name="culture">The culture to use in the converter.</param>
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}