From 7573b0321c7c364785cc6c0de217accc7bed0722 Mon Sep 17 00:00:00 2001
From: Arkadiusz Fal <arek@arekf.net>
Date: Tue, 27 Sep 2022 15:22:40 +0200
Subject: [PATCH] More localization fixes

---
 Shared/Player/Controls/ControlsOverlay.swift   |  8 ++++----
 Shared/Player/Controls/OSD/OpeningStream.swift | 11 ++---------
 Shared/Player/Controls/PlaybackStatsView.swift |  8 ++++----
 Shared/Settings/PlayerSettings.swift           |  2 +-
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/Shared/Player/Controls/ControlsOverlay.swift b/Shared/Player/Controls/ControlsOverlay.swift
index c5ac61b0..43ec6acc 100644
--- a/Shared/Player/Controls/ControlsOverlay.swift
+++ b/Shared/Player/Controls/ControlsOverlay.swift
@@ -26,7 +26,7 @@ struct ControlsOverlay: View {
     var body: some View {
         ScrollView {
             VStack {
-                Section(header: controlsHeader("Rate & Captions")) {
+                Section(header: controlsHeader("Rate & Captions".localized())) {
                     HStack(spacing: rateButtonsSpacing) {
                         decreaseRateButton
                         #if os(tvOS)
@@ -50,14 +50,14 @@ struct ControlsOverlay: View {
                     #endif
                 }
 
-                Section(header: controlsHeader("Quality Profile")) {
+                Section(header: controlsHeader("Quality Profile".localized())) {
                     qualityProfileButton
                     #if os(tvOS)
                     .focused($focusedField, equals: .qualityProfile)
                     #endif
                 }
 
-                Section(header: controlsHeader("Stream & Player")) {
+                Section(header: controlsHeader("Stream & Player".localized())) {
                     qualityButton
                     #if os(tvOS)
                     .focused($focusedField, equals: .stream)
@@ -71,7 +71,7 @@ struct ControlsOverlay: View {
                 if player.activeBackend == .mpv,
                    showMPVPlaybackStats
                 {
-                    Section(header: controlsHeader("Statistics")) {
+                    Section(header: controlsHeader("Statistics".localized())) {
                         PlaybackStatsView()
                     }
                     #if os(tvOS)
diff --git a/Shared/Player/Controls/OSD/OpeningStream.swift b/Shared/Player/Controls/OSD/OpeningStream.swift
index a855e6c9..b9da4dbf 100644
--- a/Shared/Player/Controls/OSD/OpeningStream.swift
+++ b/Shared/Player/Controls/OSD/OpeningStream.swift
@@ -14,7 +14,7 @@ struct OpeningStream: View {
     }
 
     var reason: String {
-        guard player.videoBeingOpened != nil else {
+        guard player.videoBeingOpened == nil else {
             return "Loading streams...".localized()
         }
 
@@ -22,19 +22,12 @@ struct OpeningStream: View {
             return "Opening audio stream...".localized()
         }
 
-        return String(format: "Opening %@ stream...".localized(), streamQuality)
+        return String(format: "Opening %@ stream...".localized(), player.streamSelection?.shortQuality ?? "")
     }
 
     var state: String? {
         player.videoBeingOpened.isNil ? model.bufferingStateText : nil
     }
-
-    var streamQuality: String {
-        guard let stream = player.streamSelection else { return " " }
-        guard !player.musicMode else { return " audio " }
-
-        return " \(stream.shortQuality) "
-    }
 }
 
 struct OpeningStream_Previews: PreviewProvider {
diff --git a/Shared/Player/Controls/PlaybackStatsView.swift b/Shared/Player/Controls/PlaybackStatsView.swift
index 37aeb001..ad0c431a 100644
--- a/Shared/Player/Controls/PlaybackStatsView.swift
+++ b/Shared/Player/Controls/PlaybackStatsView.swift
@@ -7,10 +7,10 @@ struct PlaybackStatsView: View {
 
     var body: some View {
         VStack(alignment: .leading, spacing: 6) {
-            mpvPlaybackStatRow("Hardware decoder", player.mpvBackend.hwDecoder)
-            mpvPlaybackStatRow("Dropped frames", String(player.mpvBackend.frameDropCount))
-            mpvPlaybackStatRow("Stream FPS", String(format: "%.2ffps", player.mpvBackend.outputFps))
-            mpvPlaybackStatRow("Cached time", String(format: "%.2fs", player.mpvBackend.cacheDuration))
+            mpvPlaybackStatRow("Hardware decoder".localized(), player.mpvBackend.hwDecoder)
+            mpvPlaybackStatRow("Dropped frames".localized(), String(player.mpvBackend.frameDropCount))
+            mpvPlaybackStatRow("Stream FPS".localized(), String(format: "%.2ffps", player.mpvBackend.outputFps))
+            mpvPlaybackStatRow("Cached time".localized(), String(format: "%.2fs", player.mpvBackend.cacheDuration))
         }
         .padding(.top, 2)
         #if os(tvOS)
diff --git a/Shared/Settings/PlayerSettings.swift b/Shared/Settings/PlayerSettings.swift
index 28972022..563159ac 100644
--- a/Shared/Settings/PlayerSettings.swift
+++ b/Shared/Settings/PlayerSettings.swift
@@ -209,7 +209,7 @@ struct PlayerSettings: View {
     }
 
     private var fullScreenPlayerControlsLayoutPicker: some View {
-        Picker("Fullscreen Size", selection: $fullScreenPlayerControlsLayout) {
+        Picker("Fullscreen size", selection: $fullScreenPlayerControlsLayout) {
             ForEach(PlayerControlsLayout.allCases.filter(\.available), id: \.self) { layout in
                 Text(layout.description).tag(layout.rawValue)
             }