ashikk
/
jellyflood
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

localize

This commit is contained in:
Ethan Pippin 2022-01-10 15:48:29 -07:00
parent a02d9a225c
commit 057beca0ff
62 changed files with 612 additions and 451 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shared/Coordinators/LiveTVTabCoordinator.swift
View File

@ -32,7 +32,7 @@ final class LiveTVTabCoordinator: TabCoordinatable {
func makeProgramsTab(isActive: Bool) -> some View { func makeProgramsTab(isActive: Bool) -> some View {
HStack { HStack {
Image(systemName: "tv") Image(systemName: "tv")
Text("Programs") L10n.programs.text
} }
} }
@ -44,7 +44,7 @@ final class LiveTVTabCoordinator: TabCoordinatable {
func makeChannelsTab(isActive: Bool) -> some View { func makeChannelsTab(isActive: Bool) -> some View {
HStack { HStack {
Image(systemName: "square.grid.3x3") Image(systemName: "square.grid.3x3")
Text("Channels") L10n.channels.text
} }
} }
@ -56,7 +56,7 @@ final class LiveTVTabCoordinator: TabCoordinatable {
func makeHomeTab(isActive: Bool) -> some View { func makeHomeTab(isActive: Bool) -> some View {
HStack { HStack {
Image(systemName: "house") Image(systemName: "house")
Text("Home") L10n.home.text
} }
} }
} }

10
Shared/Coordinators/MainCoordinator/tvOSMainTabCoordinator.swift
View File

@ -43,26 +43,26 @@ final class MainTabCoordinator: TabCoordinatable {
} }
func makeTv() -> NavigationViewCoordinator<TVLibrariesCoordinator> { func makeTv() -> NavigationViewCoordinator<TVLibrariesCoordinator> {
NavigationViewCoordinator(TVLibrariesCoordinator(viewModel: TVLibrariesViewModel(), title: "TV Shows")) NavigationViewCoordinator(TVLibrariesCoordinator(viewModel: TVLibrariesViewModel(), title: L10n.tvShows))
} }
@ViewBuilder @ViewBuilder
func makeTvTab(isActive: Bool) -> some View { func makeTvTab(isActive: Bool) -> some View {
HStack { HStack {
Image(systemName: "tv") Image(systemName: "tv")
Text("TV Shows") L10n.tvShows.text
} }
} }
func makeMovies() -> NavigationViewCoordinator<MovieLibrariesCoordinator> { func makeMovies() -> NavigationViewCoordinator<MovieLibrariesCoordinator> {
NavigationViewCoordinator(MovieLibrariesCoordinator(viewModel: MovieLibrariesViewModel(), title: "Movies")) NavigationViewCoordinator(MovieLibrariesCoordinator(viewModel: MovieLibrariesViewModel(), title: L10n.movies))
} }
@ViewBuilder @ViewBuilder
func makeMoviesTab(isActive: Bool) -> some View { func makeMoviesTab(isActive: Bool) -> some View {
HStack { HStack {
Image(systemName: "film") Image(systemName: "film")
Text("Movies") L10n.movies.text
} }
} }
@ -74,7 +74,7 @@ final class MainTabCoordinator: TabCoordinatable {
func makeOtherTab(isActive: Bool) -> some View { func makeOtherTab(isActive: Bool) -> some View {
HStack { HStack {
Image(systemName: "folder") Image(systemName: "folder")
Text("Other") L10n.other.text
} }
} }

14
Shared/Errors/NetworkError.swift
View File

@ -67,7 +67,7 @@ enum NetworkError: Error {
{ {
let errorMessage: ErrorMessage let errorMessage: ErrorMessage
var logMessage = "An error has occurred." var logMessage = L10n.unknownError
var logConstructor = logConstructor var logConstructor = logConstructor
switch response { switch response {
@ -77,14 +77,14 @@ enum NetworkError: Error {
// https://developer.apple.com/documentation/foundation/1508628-url_loading_system_error_codes // https://developer.apple.com/documentation/foundation/1508628-url_loading_system_error_codes
switch err._code { switch err._code {
case -1001: case -1001:
logMessage = "Network timed out." logMessage = L10n.networkTimedOut
logConstructor.message = logMessage logConstructor.message = logMessage
errorMessage = ErrorMessage(code: err._code, errorMessage = ErrorMessage(code: err._code,
title: "Timed Out", title: L10n.error,
displayMessage: displayMessage, displayMessage: displayMessage,
logConstructor: logConstructor) logConstructor: logConstructor)
case -1004: case -1004:
logMessage = "Cannot connect to host." logMessage = L10n.cannotConnectToHost
logConstructor.message = logMessage logConstructor.message = logMessage
errorMessage = ErrorMessage(code: err._code, errorMessage = ErrorMessage(code: err._code,
title: L10n.error, title: L10n.error,
@ -128,7 +128,7 @@ enum NetworkError: Error {
{ {
let errorMessage: ErrorMessage let errorMessage: ErrorMessage
var logMessage = "An error has occurred." var logMessage = L10n.unknownError
var logConstructor = logConstructor var logConstructor = logConstructor
switch response { switch response {
@ -137,10 +137,10 @@ enum NetworkError: Error {
// Generic HTTP status codes // Generic HTTP status codes
switch code { switch code {
case 401: case 401:
logMessage = "User is unauthorized." logMessage = L10n.unauthorizedUser
logConstructor.message = logMessage logConstructor.message = logMessage
errorMessage = ErrorMessage(code: code, errorMessage = ErrorMessage(code: code,
title: "Unauthorized", title: L10n.unauthorized,
displayMessage: displayMessage, displayMessage: displayMessage,
logConstructor: logConstructor) logConstructor: logConstructor)
default: default:

21
Shared/Extensions/JellyfinAPIExtensions/BaseItemDtoExtensions.swift
View File

@ -248,15 +248,15 @@ public extension BaseItemDto {
var informationItems: [ItemDetail] = [] var informationItems: [ItemDetail] = []
if let productionYear = productionYear { if let productionYear = productionYear {
informationItems.append(ItemDetail(title: "Released", content: "\(productionYear)")) informationItems.append(ItemDetail(title: L10n.released, content: "\(productionYear)"))
} }
if let rating = officialRating { if let rating = officialRating {
informationItems.append(ItemDetail(title: "Rated", content: "\(rating)")) informationItems.append(ItemDetail(title: L10n.rated, content: "\(rating)"))
} }
if let runtime = getItemRuntime() { if let runtime = getItemRuntime() {
informationItems.append(ItemDetail(title: "Runtime", content: runtime)) informationItems.append(ItemDetail(title: L10n.runtime, content: runtime))
} }
return informationItems return informationItems
@ -267,12 +267,7 @@ public extension BaseItemDto {
if let container = container { if let container = container {
let containerList = container.split(separator: ",").joined(separator: ", ") let containerList = container.split(separator: ",").joined(separator: ", ")
mediaItems.append(ItemDetail(title: L10n.containers, content: containerList))
if containerList.count > 1 {
mediaItems.append(ItemDetail(title: "Containers", content: containerList))
} else {
mediaItems.append(ItemDetail(title: "Container", content: containerList))
}
} }
if let mediaStreams = mediaStreams { if let mediaStreams = mediaStreams {
@ -280,15 +275,15 @@ public extension BaseItemDto {
let subtitleStreams = mediaStreams.filter { $0.type == .subtitle } let subtitleStreams = mediaStreams.filter { $0.type == .subtitle }
if !audioStreams.isEmpty { if !audioStreams.isEmpty {
let audioList = audioStreams.compactMap { "\($0.displayTitle ?? "No Title") (\($0.codec ?? "No Codec"))" } let audioList = audioStreams.compactMap { "\($0.displayTitle ?? L10n.noTitle) (\($0.codec ?? L10n.noCodec))" }
.joined(separator: ", ") .joined(separator: ", ")
mediaItems.append(ItemDetail(title: "Audio", content: audioList)) mediaItems.append(ItemDetail(title: L10n.audio, content: audioList))
} }
if !subtitleStreams.isEmpty { if !subtitleStreams.isEmpty {
let subtitleList = subtitleStreams.compactMap { "\($0.displayTitle ?? "No Title") (\($0.codec ?? "No Codec"))" } let subtitleList = subtitleStreams.compactMap { "\($0.displayTitle ?? L10n.noTitle) (\($0.codec ?? L10n.noCodec))" }
.joined(separator: ", ") .joined(separator: ", ")
mediaItems.append(ItemDetail(title: "Subtitles", content: subtitleList)) mediaItems.append(ItemDetail(title: L10n.subtitles, content: subtitleList))
} }
} }

555
Shared/Generated/Strings.swift
View File

@ -1,11 +1,3 @@
//
// Swiftfin is subject to the terms of the Mozilla Public
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2022 Jellyfin & Jellyfin Contributors
//
// swiftlint:disable all // swiftlint:disable all
// Generated using SwiftGen — https://github.com/SwiftGen/SwiftGen // Generated using SwiftGen — https://github.com/SwiftGen/SwiftGen
@ -18,194 +10,385 @@ import Foundation
// swiftlint:disable explicit_type_interface function_parameter_count identifier_name line_length // swiftlint:disable explicit_type_interface function_parameter_count identifier_name line_length
// swiftlint:disable nesting type_body_length type_name vertical_whitespace_opening_braces // swiftlint:disable nesting type_body_length type_name vertical_whitespace_opening_braces
internal enum L10n { internal enum L10n {
/// Accessibility /// About
internal static let accessibility = L10n.tr("Localizable", "accessibility") internal static let about = L10n.tr("Localizable", "about")
/// Add URL /// Accessibility
internal static let addURL = L10n.tr("Localizable", "addURL") internal static let accessibility = L10n.tr("Localizable", "accessibility")
/// All Genres /// Add URL
internal static let allGenres = L10n.tr("Localizable", "allGenres") internal static let addURL = L10n.tr("Localizable", "addURL")
/// All Media /// All Genres
internal static let allMedia = L10n.tr("Localizable", "allMedia") internal static let allGenres = L10n.tr("Localizable", "allGenres")
/// Appearance /// All Media
internal static let appearance = L10n.tr("Localizable", "appearance") internal static let allMedia = L10n.tr("Localizable", "allMedia")
/// Apply /// Appearance
internal static let apply = L10n.tr("Localizable", "apply") internal static let appearance = L10n.tr("Localizable", "appearance")
/// Audio & Captions /// Apply
internal static let audioAndCaptions = L10n.tr("Localizable", "audioAndCaptions") internal static let apply = L10n.tr("Localizable", "apply")
/// Audio Track /// Audio
internal static let audioTrack = L10n.tr("Localizable", "audioTrack") internal static let audio = L10n.tr("Localizable", "audio")
/// Back /// Audio & Captions
internal static let back = L10n.tr("Localizable", "back") internal static let audioAndCaptions = L10n.tr("Localizable", "audioAndCaptions")
/// CAST /// Audio Track
internal static let cast = L10n.tr("Localizable", "cast") internal static let audioTrack = L10n.tr("Localizable", "audioTrack")
/// Change Server /// Auto Play
internal static let changeServer = L10n.tr("Localizable", "changeServer") internal static let autoPlay = L10n.tr("Localizable", "autoPlay")
/// Closed Captions /// Back
internal static let closedCaptions = L10n.tr("Localizable", "closedCaptions") internal static let back = L10n.tr("Localizable", "back")
/// Connect /// Cancel
internal static let connect = L10n.tr("Localizable", "connect") internal static let cancel = L10n.tr("Localizable", "cancel")
/// Connect Manually /// Cannot connect to host
internal static let connectManually = L10n.tr("Localizable", "connectManually") internal static let cannotConnectToHost = L10n.tr("Localizable", "cannotConnectToHost")
/// Connect to Jellyfin /// CAST
internal static let connectToJellyfin = L10n.tr("Localizable", "connectToJellyfin") internal static let cast = L10n.tr("Localizable", "cast")
/// Connect to Server /// Cast & Crew
internal static let connectToServer = L10n.tr("Localizable", "connectToServer") internal static let castAndCrew = L10n.tr("Localizable", "castAndCrew")
/// Continue Watching /// Change Server
internal static let continueWatching = L10n.tr("Localizable", "continueWatching") internal static let changeServer = L10n.tr("Localizable", "changeServer")
/// Dark /// Channels
internal static let dark = L10n.tr("Localizable", "dark") internal static let channels = L10n.tr("Localizable", "channels")
/// DIRECTOR /// Cinematic Views
internal static let director = L10n.tr("Localizable", "director") internal static let cinematicViews = L10n.tr("Localizable", "cinematicViews")
/// Discovered Servers /// Closed Captions
internal static let discoveredServers = L10n.tr("Localizable", "discoveredServers") internal static let closedCaptions = L10n.tr("Localizable", "closedCaptions")
/// Display order /// Compact
internal static let displayOrder = L10n.tr("Localizable", "displayOrder") internal static let compact = L10n.tr("Localizable", "compact")
/// Empty Next Up /// Confirm Close
internal static let emptyNextUp = L10n.tr("Localizable", "emptyNextUp") internal static let confirmClose = L10n.tr("Localizable", "confirmClose")
/// Episodes /// Connect
internal static let episodes = L10n.tr("Localizable", "episodes") internal static let connect = L10n.tr("Localizable", "connect")
/// Error /// Connect Manually
internal static let error = L10n.tr("Localizable", "error") internal static let connectManually = L10n.tr("Localizable", "connectManually")
/// Existing Server /// Connect to Jellyfin
internal static let existingServer = L10n.tr("Localizable", "existingServer") internal static let connectToJellyfin = L10n.tr("Localizable", "connectToJellyfin")
/// Filter Results /// Connect to a Jellyfin server
internal static let filterResults = L10n.tr("Localizable", "filterResults") internal static let connectToJellyfinServer = L10n.tr("Localizable", "connectToJellyfinServer")
/// Filters /// Connect to a Jellyfin server to get started
internal static let filters = L10n.tr("Localizable", "filters") internal static let connectToJellyfinServerStart = L10n.tr("Localizable", "connectToJellyfinServerStart")
/// Genres /// Connect to Server
internal static let genres = L10n.tr("Localizable", "genres") internal static let connectToServer = L10n.tr("Localizable", "connectToServer")
/// Home /// Containers
internal static let home = L10n.tr("Localizable", "home") internal static let containers = L10n.tr("Localizable", "containers")
/// Latest %@ /// Continue
internal static func latestWithString(_ p1: Any) -> String { internal static let `continue` = L10n.tr("Localizable", "continue")
L10n.tr("Localizable", "latestWithString", String(describing: p1)) /// Continue Watching
} internal static let continueWatching = L10n.tr("Localizable", "continueWatching")
/// Dark
/// Library internal static let dark = L10n.tr("Localizable", "dark")
internal static let library = L10n.tr("Localizable", "library") /// Default Scheme
/// Light internal static let defaultScheme = L10n.tr("Localizable", "defaultScheme")
internal static let light = L10n.tr("Localizable", "light") /// DIRECTOR
/// Loading internal static let director = L10n.tr("Localizable", "director")
internal static let loading = L10n.tr("Localizable", "loading") /// Discovered Servers
/// Local Servers internal static let discoveredServers = L10n.tr("Localizable", "discoveredServers")
internal static let localServers = L10n.tr("Localizable", "localServers") /// Display order
/// Login internal static let displayOrder = L10n.tr("Localizable", "displayOrder")
internal static let login = L10n.tr("Localizable", "login") /// Edit Jump Lengths
/// Login to %@ internal static let editJumpLengths = L10n.tr("Localizable", "editJumpLengths")
internal static func loginToWithString(_ p1: Any) -> String { /// Empty Next Up
L10n.tr("Localizable", "loginToWithString", String(describing: p1)) internal static let emptyNextUp = L10n.tr("Localizable", "emptyNextUp")
} /// Episodes
internal static let episodes = L10n.tr("Localizable", "episodes")
/// More Like This /// Error
internal static let moreLikeThis = L10n.tr("Localizable", "moreLikeThis") internal static let error = L10n.tr("Localizable", "error")
/// Next Up /// Existing Server
internal static let nextUp = L10n.tr("Localizable", "nextUp") internal static let existingServer = L10n.tr("Localizable", "existingServer")
/// No Cast devices found.. /// Existing User
internal static let noCastdevicesfound = L10n.tr("Localizable", "noCastdevicesfound") internal static let existingUser = L10n.tr("Localizable", "existingUser")
/// No results. /// Experimental
internal static let noResults = L10n.tr("Localizable", "noResults") internal static let experimental = L10n.tr("Localizable", "experimental")
/// Type: %@ not implemented yet :( /// Favorites
internal static func notImplementedYetWithType(_ p1: Any) -> String { internal static let favorites = L10n.tr("Localizable", "favorites")
L10n.tr("Localizable", "notImplementedYetWithType", String(describing: p1)) /// Filter Results
} internal static let filterResults = L10n.tr("Localizable", "filterResults")
/// Filters
/// Ok internal static let filters = L10n.tr("Localizable", "filters")
internal static let ok = L10n.tr("Localizable", "ok") /// Genres
/// Other User internal static let genres = L10n.tr("Localizable", "genres")
internal static let otherUser = L10n.tr("Localizable", "otherUser") /// Home
/// Page %1$@ of %2$@ internal static let home = L10n.tr("Localizable", "home")
internal static func pageOfWithNumbers(_ p1: Any, _ p2: Any) -> String { /// Information
L10n.tr("Localizable", "pageOfWithNumbers", String(describing: p1), String(describing: p2)) internal static let information = L10n.tr("Localizable", "information")
} /// Items
internal static let items = L10n.tr("Localizable", "items")
/// Password /// Jump Backward Length
internal static let password = L10n.tr("Localizable", "password") internal static let jumpBackwardLength = L10n.tr("Localizable", "jumpBackwardLength")
/// Play /// Jump Forward Length
internal static let play = L10n.tr("Localizable", "play") internal static let jumpForwardLength = L10n.tr("Localizable", "jumpForwardLength")
/// Playback settings /// Jump Gestures Enabled
internal static let playbackSettings = L10n.tr("Localizable", "playbackSettings") internal static let jumpGesturesEnabled = L10n.tr("Localizable", "jumpGesturesEnabled")
/// Playback Speed /// %s seconds
internal static let playbackSpeed = L10n.tr("Localizable", "playbackSpeed") internal static func jumpLengthSeconds(_ p1: UnsafePointer<CChar>) -> String {
/// Play Next return L10n.tr("Localizable", "jumpLengthSeconds", p1)
internal static let playNext = L10n.tr("Localizable", "playNext") }
/// Reset /// Larger
internal static let reset = L10n.tr("Localizable", "reset") internal static let larger = L10n.tr("Localizable", "larger")
/// Search… /// Largest
internal static let search = L10n.tr("Localizable", "search") internal static let largest = L10n.tr("Localizable", "largest")
/// S%1$@:E%2$@ /// Latest %@
internal static func seasonAndEpisode(_ p1: Any, _ p2: Any) -> String { internal static func latestWithString(_ p1: Any) -> String {
L10n.tr("Localizable", "seasonAndEpisode", String(describing: p1), String(describing: p2)) return L10n.tr("Localizable", "latestWithString", String(describing: p1))
} }
/// Library
/// Seasons internal static let library = L10n.tr("Localizable", "library")
internal static let seasons = L10n.tr("Localizable", "seasons") /// Light
/// See All internal static let light = L10n.tr("Localizable", "light")
internal static let seeAll = L10n.tr("Localizable", "seeAll") /// Loading
/// Select Cast Destination internal static let loading = L10n.tr("Localizable", "loading")
internal static let selectCastDestination = L10n.tr("Localizable", "selectCastDestination") /// Local Servers
/// Server %s already exists. Add new URL? internal static let localServers = L10n.tr("Localizable", "localServers")
internal static func serverAlreadyExistsPrompt(_ p1: UnsafePointer<CChar>) -> String { /// Login
L10n.tr("Localizable", "serverAlreadyExistsPrompt", p1) internal static let login = L10n.tr("Localizable", "login")
} /// Login to %@
internal static func loginToWithString(_ p1: Any) -> String {
/// Server Information return L10n.tr("Localizable", "loginToWithString", String(describing: p1))
internal static let serverInformation = L10n.tr("Localizable", "serverInformation") }
/// Server URL /// Media
internal static let serverURL = L10n.tr("Localizable", "serverURL") internal static let media = L10n.tr("Localizable", "media")
/// Signed in as %@ /// More Like This
internal static func signedInAsWithString(_ p1: Any) -> String { internal static let moreLikeThis = L10n.tr("Localizable", "moreLikeThis")
L10n.tr("Localizable", "signedInAsWithString", String(describing: p1)) /// Movies
} internal static let movies = L10n.tr("Localizable", "movies")
/// %d users
/// Sort by internal static func multipleUsers(_ p1: Int) -> String {
internal static let sortBy = L10n.tr("Localizable", "sortBy") return L10n.tr("Localizable", "multipleUsers", p1)
/// STUDIO }
internal static let studio = L10n.tr("Localizable", "studio") /// Name
/// Studios internal static let name = L10n.tr("Localizable", "name")
internal static let studios = L10n.tr("Localizable", "studios") /// Networking
/// Suggestions internal static let networking = L10n.tr("Localizable", "networking")
internal static let suggestions = L10n.tr("Localizable", "suggestions") /// Network timed out
/// Switch user internal static let networkTimedOut = L10n.tr("Localizable", "networkTimedOut")
internal static let switchUser = L10n.tr("Localizable", "switchUser") /// Next
/// System internal static let next = L10n.tr("Localizable", "next")
internal static let system = L10n.tr("Localizable", "system") /// Next Up
/// Tags internal static let nextUp = L10n.tr("Localizable", "nextUp")
internal static let tags = L10n.tr("Localizable", "tags") /// No Cast devices found..
/// Try again internal static let noCastdevicesfound = L10n.tr("Localizable", "noCastdevicesfound")
internal static let tryAgain = L10n.tr("Localizable", "tryAgain") /// No Codec
/// Unknown Error internal static let noCodec = L10n.tr("Localizable", "noCodec")
internal static let unknownError = L10n.tr("Localizable", "unknownError") /// No episodes available
/// Username internal static let noEpisodesAvailable = L10n.tr("Localizable", "noEpisodesAvailable")
internal static let username = L10n.tr("Localizable", "username") /// No local servers found
/// Who's watching? internal static let noLocalServersFound = L10n.tr("Localizable", "noLocalServersFound")
internal static let whosWatching = L10n.tr("Localizable", "WhosWatching") /// None
/// WIP internal static let `none` = L10n.tr("Localizable", "none")
internal static let wip = L10n.tr("Localizable", "wip") /// No overview available
/// Your Favorites internal static let noOverviewAvailable = L10n.tr("Localizable", "noOverviewAvailable")
internal static let yourFavorites = L10n.tr("Localizable", "yourFavorites") /// No results.
internal static let noResults = L10n.tr("Localizable", "noResults")
/// Normal
internal static let normal = L10n.tr("Localizable", "normal")
/// N/A
internal static let notAvailableSlash = L10n.tr("Localizable", "notAvailableSlash")
/// Type: %@ not implemented yet :(
internal static func notImplementedYetWithType(_ p1: Any) -> String {
return L10n.tr("Localizable", "notImplementedYetWithType", String(describing: p1))
}
/// No title
internal static let noTitle = L10n.tr("Localizable", "noTitle")
/// Ok
internal static let ok = L10n.tr("Localizable", "ok")
/// 1 user
internal static let oneUser = L10n.tr("Localizable", "oneUser")
/// Operating System
internal static let operatingSystem = L10n.tr("Localizable", "operatingSystem")
/// Other
internal static let other = L10n.tr("Localizable", "other")
/// Other User
internal static let otherUser = L10n.tr("Localizable", "otherUser")
/// Overlay
internal static let overlay = L10n.tr("Localizable", "overlay")
/// Overlay Type
internal static let overlayType = L10n.tr("Localizable", "overlayType")
/// Overview
internal static let overview = L10n.tr("Localizable", "overview")
/// Page %1$@ of %2$@
internal static func pageOfWithNumbers(_ p1: Any, _ p2: Any) -> String {
return L10n.tr("Localizable", "pageOfWithNumbers", String(describing: p1), String(describing: p2))
}
/// Password
internal static let password = L10n.tr("Localizable", "password")
/// Play
internal static let play = L10n.tr("Localizable", "play")
/// Playback settings
internal static let playbackSettings = L10n.tr("Localizable", "playbackSettings")
/// Playback Speed
internal static let playbackSpeed = L10n.tr("Localizable", "playbackSpeed")
/// Play Next
internal static let playNext = L10n.tr("Localizable", "playNext")
/// Play Next Item
internal static let playNextItem = L10n.tr("Localizable", "playNextItem")
/// Play Previous Item
internal static let playPreviousItem = L10n.tr("Localizable", "playPreviousItem")
/// Present
internal static let present = L10n.tr("Localizable", "present")
/// Press Down for Menu
internal static let pressDownForMenu = L10n.tr("Localizable", "pressDownForMenu")
/// Programs
internal static let programs = L10n.tr("Localizable", "programs")
/// Rated
internal static let rated = L10n.tr("Localizable", "rated")
/// Recently Added
internal static let recentlyAdded = L10n.tr("Localizable", "recentlyAdded")
/// Recommended
internal static let recommended = L10n.tr("Localizable", "recommended")
/// Refresh
internal static let refresh = L10n.tr("Localizable", "refresh")
/// Regular
internal static let regular = L10n.tr("Localizable", "regular")
/// Released
internal static let released = L10n.tr("Localizable", "released")
/// Remove
internal static let remove = L10n.tr("Localizable", "remove")
/// Remove All Users
internal static let removeAllUsers = L10n.tr("Localizable", "removeAllUsers")
/// Reset
internal static let reset = L10n.tr("Localizable", "reset")
/// Reset App Settings
internal static let resetAppSettings = L10n.tr("Localizable", "resetAppSettings")
/// Reset User Settings
internal static let resetUserSettings = L10n.tr("Localizable", "resetUserSettings")
/// Resume 5 Second Offset
internal static let resume5SecondOffset = L10n.tr("Localizable", "resume5SecondOffset")
/// Retry
internal static let retry = L10n.tr("Localizable", "retry")
/// Runtime
internal static let runtime = L10n.tr("Localizable", "runtime")
/// Search
internal static let search = L10n.tr("Localizable", "search")
/// Search…
internal static let searchDots = L10n.tr("Localizable", "searchDots")
/// Searching…
internal static let searchingDots = L10n.tr("Localizable", "searchingDots")
/// Season
internal static let season = L10n.tr("Localizable", "season")
/// S%1$@:E%2$@
internal static func seasonAndEpisode(_ p1: Any, _ p2: Any) -> String {
return L10n.tr("Localizable", "seasonAndEpisode", String(describing: p1), String(describing: p2))
}
/// Seasons
internal static let seasons = L10n.tr("Localizable", "seasons")
/// See All
internal static let seeAll = L10n.tr("Localizable", "seeAll")
/// See More
internal static let seeMore = L10n.tr("Localizable", "seeMore")
/// Select Cast Destination
internal static let selectCastDestination = L10n.tr("Localizable", "selectCastDestination")
/// Series
internal static let series = L10n.tr("Localizable", "series")
/// Server
internal static let server = L10n.tr("Localizable", "server")
/// Server %s is already connected
internal static func serverAlreadyConnected(_ p1: UnsafePointer<CChar>) -> String {
return L10n.tr("Localizable", "serverAlreadyConnected", p1)
}
/// Server %s already exists. Add new URL?
internal static func serverAlreadyExistsPrompt(_ p1: UnsafePointer<CChar>) -> String {
return L10n.tr("Localizable", "serverAlreadyExistsPrompt", p1)
}
/// Server Details
internal static let serverDetails = L10n.tr("Localizable", "serverDetails")
/// Server Information
internal static let serverInformation = L10n.tr("Localizable", "serverInformation")
/// Servers
internal static let servers = L10n.tr("Localizable", "servers")
/// Server URL
internal static let serverURL = L10n.tr("Localizable", "serverURL")
/// Settings
internal static let settings = L10n.tr("Localizable", "settings")
/// Show Cast & Crew
internal static let showCastAndCrew = L10n.tr("Localizable", "showCastAndCrew")
/// Show Poster Labels
internal static let showPosterLabels = L10n.tr("Localizable", "showPosterLabels")
/// Signed in as %@
internal static func signedInAsWithString(_ p1: Any) -> String {
return L10n.tr("Localizable", "signedInAsWithString", String(describing: p1))
}
/// Sign In
internal static let signIn = L10n.tr("Localizable", "signIn")
/// Sign in to get started
internal static let signInGetStarted = L10n.tr("Localizable", "signInGetStarted")
/// Sign In to %s
internal static func signInToServer(_ p1: UnsafePointer<CChar>) -> String {
return L10n.tr("Localizable", "signInToServer", p1)
}
/// Smaller
internal static let smaller = L10n.tr("Localizable", "smaller")
/// Smallest
internal static let smallest = L10n.tr("Localizable", "smallest")
/// Sort by
internal static let sortBy = L10n.tr("Localizable", "sortBy")
/// STUDIO
internal static let studio = L10n.tr("Localizable", "studio")
/// Studios
internal static let studios = L10n.tr("Localizable", "studios")
/// Subtitles
internal static let subtitles = L10n.tr("Localizable", "subtitles")
/// Subtitle Size
internal static let subtitleSize = L10n.tr("Localizable", "subtitleSize")
/// Suggestions
internal static let suggestions = L10n.tr("Localizable", "suggestions")
/// Switch User
internal static let switchUser = L10n.tr("Localizable", "switchUser")
/// System
internal static let system = L10n.tr("Localizable", "system")
/// Tags
internal static let tags = L10n.tr("Localizable", "tags")
/// Try again
internal static let tryAgain = L10n.tr("Localizable", "tryAgain")
/// TV Shows
internal static let tvShows = L10n.tr("Localizable", "tvShows")
/// Unable to connect to server
internal static let unableToConnectServer = L10n.tr("Localizable", "unableToConnectServer")
/// Unauthorized
internal static let unauthorized = L10n.tr("Localizable", "unauthorized")
/// Unauthorized user
internal static let unauthorizedUser = L10n.tr("Localizable", "unauthorizedUser")
/// Unknown
internal static let unknown = L10n.tr("Localizable", "unknown")
/// Unknown Error
internal static let unknownError = L10n.tr("Localizable", "unknownError")
/// URL
internal static let url = L10n.tr("Localizable", "url")
/// User
internal static let user = L10n.tr("Localizable", "user")
/// User %s is already signed in
internal static func userAlreadySignedIn(_ p1: UnsafePointer<CChar>) -> String {
return L10n.tr("Localizable", "userAlreadySignedIn", p1)
}
/// Username
internal static let username = L10n.tr("Localizable", "username")
/// Version
internal static let version = L10n.tr("Localizable", "version")
/// Video Player
internal static let videoPlayer = L10n.tr("Localizable", "videoPlayer")
/// Who's watching?
internal static let whosWatching = L10n.tr("Localizable", "WhosWatching")
/// WIP
internal static let wip = L10n.tr("Localizable", "wip")
/// Your Favorites
internal static let yourFavorites = L10n.tr("Localizable", "yourFavorites")
} }
// swiftlint:enable explicit_type_interface function_parameter_count identifier_name line_length // swiftlint:enable explicit_type_interface function_parameter_count identifier_name line_length
// swiftlint:enable nesting type_body_length type_name vertical_whitespace_opening_braces // swiftlint:enable nesting type_body_length type_name vertical_whitespace_opening_braces
// MARK: - Implementation Details // MARK: - Implementation Details
extension L10n { extension L10n {
private static func tr(_ table: String, _ key: String, _ args: CVarArg...) -> String { private static func tr(_ table: String, _ key: String, _ args: CVarArg...) -> String {
let format = BundleToken.bundle.localizedString(forKey: key, value: nil, table: table) let format = BundleToken.bundle.localizedString(forKey: key, value: nil, table: table)
return String(format: format, locale: Locale.current, arguments: args) return String(format: format, locale: Locale.current, arguments: args)
} }
} }
// swiftlint:disable convenience_type // swiftlint:disable convenience_type
private final class BundleToken { private final class BundleToken {
static let bundle: Bundle = { static let bundle: Bundle = {
#if SWIFT_PACKAGE #if SWIFT_PACKAGE
return Bundle.module return Bundle.module
#else #else
return Bundle(for: BundleToken.self) return Bundle(for: BundleToken.self)
#endif #endif
}() }()
} }
// swiftlint:enable convenience_type // swiftlint:enable convenience_type

23
Shared/Objects/DetailItem.swift
View File

@ -1,23 +0,0 @@
//
// Swiftfin is subject to the terms of the Mozilla Public
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2022 Jellyfin & Jellyfin Contributors
//
import Foundation
import JellyfinAPI
enum DetailItemType: String {
case movie = "Movie"
case season = "Season"
case series = "Series"
case episode = "Episode"
}
struct DetailItem {
let baseItem: BaseItemDto
let type: DetailItemType
}

4
Shared/Objects/OverlayType.swift
View File

@ -16,9 +16,9 @@ enum OverlayType: String, CaseIterable, Defaults.Serializable {
var label: String { var label: String {
switch self { switch self {
case .normal: case .normal:
return "Normal" return L10n.normal
case .compact: case .compact:
return "Compact" return L10n.compact
} }
} }
} }

10
Shared/Objects/SubtitleSize.swift
View File

@ -22,15 +22,15 @@ extension SubtitleSize {
var label: String { var label: String {
switch self { switch self {
case .smallest: case .smallest:
return "Smallest" return L10n.smallest
case .smaller: case .smaller:
return "Smaller" return L10n.smaller
case .regular: case .regular:
return "Regular" return L10n.regular
case .larger: case .larger:
return "Larger" return L10n.larger
case .largest: case .largest:
return "Largest" return L10n.largest
} }
} }
} }

2
Shared/Objects/VideoPlayerJumpLength.swift
View File

@ -16,7 +16,7 @@ enum VideoPlayerJumpLength: Int32, CaseIterable, Defaults.Serializable {
case five = 5 case five = 5
var label: String { var label: String {
"\(self.rawValue) seconds" L10n.jumpLengthSeconds("\(self.rawValue)")
} }
var shortLabel: String { var shortLabel: String {

8
Shared/SwiftfinStore/SwiftfinStore.swift
View File

@ -198,18 +198,18 @@ extension SwiftfinStore.Errors: LocalizedError {
var title: String { var title: String {
switch self { switch self {
case .existingServer: case .existingServer:
return "Existing Server" return L10n.existingServer
case .existingUser: case .existingUser:
return "Existing User" return L10n.existingUser
} }
} }
var errorDescription: String? { var errorDescription: String? {
switch self { switch self {
case let .existingServer(server): case let .existingServer(server):
return "Server \(server.name) already exists with same server ID" return L10n.serverAlreadyConnected(server.name)
case let .existingUser(user): case let .existingUser(user):
return "User \(user.username) already exists with same user ID" return L10n.userAlreadySignedIn(user.username)
} }
} }
} }

10
Shared/ViewModels/ConnectToServerViewModel.swift
View File

@ -40,7 +40,7 @@ final class ConnectToServerViewModel: ViewModel {
if errorMessage?.code != ErrorMessage.noShowErrorCode { if errorMessage?.code != ErrorMessage.noShowErrorCode {
message.append(contentsOf: "\(errorMessage?.code ?? ErrorMessage.noShowErrorCode)\n") message.append(contentsOf: "\(errorMessage?.code ?? ErrorMessage.noShowErrorCode)\n")
} }
message.append(contentsOf: "\(errorMessage?.title ?? "Unkown Error")") message.append(contentsOf: "\(errorMessage?.title ?? L10n.unknownError)")
return message return message
} }
@ -70,12 +70,12 @@ final class ConnectToServerViewModel: ViewModel {
self.addServerURIPayload = AddServerURIPayload(server: server, uri: uri) self.addServerURIPayload = AddServerURIPayload(server: server, uri: uri)
self.backAddServerURIPayload = AddServerURIPayload(server: server, uri: uri) self.backAddServerURIPayload = AddServerURIPayload(server: server, uri: uri)
default: default:
self.handleAPIRequestError(displayMessage: "Unable to connect to server.", logLevel: .critical, self.handleAPIRequestError(displayMessage: L10n.unableToConnectServer, logLevel: .critical,
tag: "connectToServer", tag: "connectToServer",
completion: completion) completion: completion)
} }
default: default:
self.handleAPIRequestError(displayMessage: "Unable to connect to server.", logLevel: .critical, self.handleAPIRequestError(displayMessage: L10n.unableToConnectServer, logLevel: .critical,
tag: "connectToServer", tag: "connectToServer",
completion: completion) completion: completion)
} }
@ -106,12 +106,12 @@ final class ConnectToServerViewModel: ViewModel {
func addURIToServer(addServerURIPayload: AddServerURIPayload) { func addURIToServer(addServerURIPayload: AddServerURIPayload) {
SessionManager.main.addURIToServer(server: addServerURIPayload.server, uri: addServerURIPayload.uri) SessionManager.main.addURIToServer(server: addServerURIPayload.server, uri: addServerURIPayload.uri)
.sink { completion in .sink { completion in
self.handleAPIRequestError(displayMessage: "Unable to connect to server.", logLevel: .critical, tag: "connectToServer", self.handleAPIRequestError(displayMessage: L10n.unableToConnectServer, logLevel: .critical, tag: "connectToServer",
completion: completion) completion: completion)
} receiveValue: { server in } receiveValue: { server in
SessionManager.main.setServerCurrentURI(server: server, uri: addServerURIPayload.uri) SessionManager.main.setServerCurrentURI(server: server, uri: addServerURIPayload.uri)
.sink { completion in .sink { completion in
self.handleAPIRequestError(displayMessage: "Unable to connect to server.", logLevel: .critical, self.handleAPIRequestError(displayMessage: L10n.unableToConnectServer, logLevel: .critical,
tag: "connectToServer", tag: "connectToServer",
completion: completion) completion: completion)
} receiveValue: { _ in } receiveValue: { _ in

2
Shared/ViewModels/ItemViewModel/SeriesItemViewModel.swift
View File

@ -64,7 +64,7 @@ final class SeriesItemViewModel: ItemViewModel {
endYear = dateFormatter.string(from: item.endDate!) endYear = dateFormatter.string(from: item.endDate!)
} }
return "\(startYear ?? "Unknown") - \(endYear ?? "Present")" return "\(startYear ?? L10n.unknown) - \(endYear ?? L10n.present)"
} }
private func requestSeasons() { private func requestSeasons() {

4
Shared/ViewModels/ServerListViewModel.swift
View File

@ -30,9 +30,9 @@ class ServerListViewModel: ObservableObject {
func userTextFor(server: SwiftfinStore.State.Server) -> String { func userTextFor(server: SwiftfinStore.State.Server) -> String {
if server.userIDs.count == 1 { if server.userIDs.count == 1 {
return "1 user" return L10n.oneUser
} else { } else {
return "\(server.userIDs.count) users" return L10n.multipleUsers(server.userIDs.count)
} }
} }

2
Shared/ViewModels/UserSignInViewModel.swift
View File

@ -36,7 +36,7 @@ final class UserSignInViewModel: ViewModel {
SessionManager.main.loginUser(server: server, username: username, password: password) SessionManager.main.loginUser(server: server, username: username, password: password)
.trackActivity(loading) .trackActivity(loading)
.sink { completion in .sink { completion in
self.handleAPIRequestError(displayMessage: "Unable to connect to server.", logLevel: .critical, tag: "login", self.handleAPIRequestError(displayMessage: L10n.unableToConnectServer, logLevel: .critical, tag: "login",
completion: completion) completion: completion)
} receiveValue: { _ in } receiveValue: { _ in
} }

2
Shared/Views/LiveTVChannelItemElement.swift
View File

@ -36,7 +36,7 @@ struct LiveTVChannelItemElement: View {
.font(.footnote) .font(.footnote)
.lineLimit(1) .lineLimit(1)
.frame(alignment: .center) .frame(alignment: .center)
Text(program?.name ?? "N/A") Text(program?.name ?? L10n.notAvailableSlash)
.font(.body) .font(.body)
.lineLimit(1) .lineLimit(1)
.foregroundColor(.green) .foregroundColor(.green)

2
Shared/Views/SearchBarView.swift
View File

@ -17,7 +17,7 @@ struct SearchBar: View {
var body: some View { var body: some View {
HStack(spacing: 8) { HStack(spacing: 8) {
TextField(L10n.search, text: $text) TextField(L10n.searchDots, text: $text)
.padding(8) .padding(8)
.padding(.horizontal, 16) .padding(.horizontal, 16)
#if os(iOS) #if os(iOS)

4
Swiftfin tvOS/Components/EpisodesRowView.swift
View File

@ -19,7 +19,7 @@ struct EpisodesRowView: View {
var body: some View { var body: some View {
VStack(alignment: .leading) { VStack(alignment: .leading) {
Text(viewModel.selectedSeason?.name ?? "Episodes") Text(viewModel.selectedSeason?.name ?? L10n.episodes)
.font(.title3) .font(.title3)
.padding(.horizontal, 50) .padding(.horizontal, 50)
@ -67,7 +67,7 @@ struct EpisodesRowView: View {
Text("--") Text("--")
.font(.caption) .font(.caption)
.foregroundColor(.secondary) .foregroundColor(.secondary)
Text("No episodes available") L10n.noEpisodesAvailable.text
.font(.footnote) .font(.footnote)
.padding(.bottom, 1) .padding(.bottom, 1)
} }

2
Swiftfin tvOS/Components/HomeCinematicView/CinematicNextUpCardView.swift
View File

@ -39,7 +39,7 @@ struct CinematicNextUpCardView: View {
if showOverlay { if showOverlay {
VStack(alignment: .leading, spacing: 0) { VStack(alignment: .leading, spacing: 0) {
Text("Next") L10n.next.text
.font(.subheadline) .font(.subheadline)
.padding(.vertical, 5) .padding(.vertical, 5)
.padding(.leading, 10) .padding(.leading, 10)

4
Swiftfin tvOS/Components/ItemDetailsView.swift
View File

@ -24,7 +24,7 @@ struct ItemDetailsView: View {
HStack(alignment: .top) { HStack(alignment: .top) {
VStack(alignment: .leading, spacing: 20) { VStack(alignment: .leading, spacing: 20) {
Text("Information") L10n.information.text
.font(.title3) .font(.title3)
.padding(.bottom, 5) .padding(.bottom, 5)
@ -36,7 +36,7 @@ struct ItemDetailsView: View {
Spacer() Spacer()
VStack(alignment: .leading, spacing: 20) { VStack(alignment: .leading, spacing: 20) {
Text("Media") L10n.media.text
.font(.title3) .font(.title3)
.padding(.bottom, 5) .padding(.bottom, 5)

4
Swiftfin tvOS/Components/SingleSeasonEpisodesRowView.swift
View File

@ -19,7 +19,7 @@ struct SingleSeasonEpisodesRowView: View {
var body: some View { var body: some View {
VStack(alignment: .leading) { VStack(alignment: .leading) {
Text("Episodes") L10n.episodes.text
.font(.title3) .font(.title3)
.padding(.horizontal, 50) .padding(.horizontal, 50)
@ -66,7 +66,7 @@ struct SingleSeasonEpisodesRowView: View {
Text("--") Text("--")
.font(.caption) .font(.caption)
.foregroundColor(.secondary) .foregroundColor(.secondary)
Text("No episodes available") L10n.noEpisodesAvailable.text
.font(.footnote) .font(.footnote)
.padding(.bottom, 1) .padding(.bottom, 1)
} }

2
Swiftfin tvOS/Views/BasicAppSettingsView.swift
View File

@ -48,6 +48,6 @@ struct BasicAppSettingsView: View {
L10n.reset.text L10n.reset.text
} }
}) })
.navigationTitle("Settings") .navigationTitle(L10n.settings)
} }
} }

4
Swiftfin tvOS/Views/ConnectToServerView.swift
View File

@ -46,7 +46,7 @@ struct ConnectToServerView: View {
} }
.disabled(viewModel.isLoading || uri.isEmpty) .disabled(viewModel.isLoading || uri.isEmpty)
} header: { } header: {
Text("Connect to a Jellyfin server") L10n.connectToJellyfinServer.text
} }
Section(header: L10n.localServers.text) { Section(header: L10n.localServers.text) {
@ -77,7 +77,7 @@ struct ConnectToServerView: View {
} }
.alert(item: $viewModel.errorMessage) { _ in .alert(item: $viewModel.errorMessage) { _ in
Alert(title: Text(viewModel.alertTitle), Alert(title: Text(viewModel.alertTitle),
message: Text(viewModel.errorMessage?.displayMessage ?? "Unknown Error"), message: Text(viewModel.errorMessage?.displayMessage ?? L10n.unknownError),
dismissButton: .cancel()) dismissButton: .cancel())
} }
.navigationTitle(L10n.connect) .navigationTitle(L10n.connect)

6
Swiftfin tvOS/Views/HomeView.swift
View File

@ -33,7 +33,7 @@ struct HomeView: View {
if viewModel.resumeItems.isEmpty { if viewModel.resumeItems.isEmpty {
HomeCinematicView(items: viewModel.latestAddedItems.map { .init(item: $0, type: .plain) }, HomeCinematicView(items: viewModel.latestAddedItems.map { .init(item: $0, type: .plain) },
forcedItemSubtitle: "Recently Added") forcedItemSubtitle: L10n.recentlyAdded)
if !viewModel.nextUpItems.isEmpty { if !viewModel.nextUpItems.isEmpty {
NextUpView(items: viewModel.nextUpItems) NextUpView(items: viewModel.nextUpItems)
@ -47,7 +47,7 @@ struct HomeView: View {
.focusSection() .focusSection()
} }
PortraitItemsRowView(rowTitle: "Recently Added", PortraitItemsRowView(rowTitle: L10n.recentlyAdded,
items: viewModel.latestAddedItems, items: viewModel.latestAddedItems,
showItemTitles: showPosterLabels) { item in showItemTitles: showPosterLabels) { item in
homeRouter.route(to: \.modalItem, item) homeRouter.route(to: \.modalItem, item)
@ -67,7 +67,7 @@ struct HomeView: View {
Button { Button {
viewModel.refresh() viewModel.refresh()
} label: { } label: {
Text("Refresh") L10n.refresh.text
} }
Spacer() Spacer()

4
Swiftfin tvOS/Views/ItemView/CinematicItemView/CinematicCollectionItemView.swift
View File

@ -46,13 +46,13 @@ struct CinematicCollectionItemView: View {
CinematicItemAboutView(viewModel: viewModel) CinematicItemAboutView(viewModel: viewModel)
PortraitItemsRowView(rowTitle: "Items", PortraitItemsRowView(rowTitle: L10n.items,
items: viewModel.collectionItems) { item in items: viewModel.collectionItems) { item in
itemRouter.route(to: \.item, item) itemRouter.route(to: \.item, item)
} }
if !viewModel.similarItems.isEmpty { if !viewModel.similarItems.isEmpty {
PortraitItemsRowView(rowTitle: "Recommended", PortraitItemsRowView(rowTitle: L10n.recommended,
items: viewModel.similarItems, items: viewModel.similarItems,
showItemTitles: showPosterLabels) { item in showItemTitles: showPosterLabels) { item in
itemRouter.route(to: \.item, item) itemRouter.route(to: \.item, item)

4
Swiftfin tvOS/Views/ItemView/CinematicItemView/CinematicEpisodeItemView.swift
View File

@ -60,14 +60,14 @@ struct CinematicEpisodeItemView: View {
.focusSection() .focusSection()
if let seriesItem = viewModel.series { if let seriesItem = viewModel.series {
PortraitItemsRowView(rowTitle: "Series", PortraitItemsRowView(rowTitle: L10n.series,
items: [seriesItem]) { seriesItem in items: [seriesItem]) { seriesItem in
itemRouter.route(to: \.item, seriesItem) itemRouter.route(to: \.item, seriesItem)
} }
} }
if !viewModel.similarItems.isEmpty { if !viewModel.similarItems.isEmpty {
PortraitItemsRowView(rowTitle: "Recommended", PortraitItemsRowView(rowTitle: L10n.recommended,
items: viewModel.similarItems, items: viewModel.similarItems,
showItemTitles: showPosterLabels) { item in showItemTitles: showPosterLabels) { item in
itemRouter.route(to: \.item, item) itemRouter.route(to: \.item, item)

4
Swiftfin tvOS/Views/ItemView/CinematicItemView/CinematicItemAboutView.swift
View File

@ -26,10 +26,10 @@ struct CinematicItemAboutView: View {
.frame(height: 385.5) .frame(height: 385.5)
VStack(alignment: .leading) { VStack(alignment: .leading) {
Text("About") L10n.about.text
.font(.title3) .font(.title3)
Text(viewModel.item.overview ?? "No details available") Text(viewModel.item.overview ?? L10n.noOverviewAvailable)
.padding(.top, 2) .padding(.top, 2)
.lineLimit(7) .lineLimit(7)
} }

2
Swiftfin tvOS/Views/ItemView/CinematicItemView/CinematicMovieItemView.swift
View File

@ -47,7 +47,7 @@ struct CinematicMovieItemView: View {
CinematicItemAboutView(viewModel: viewModel) CinematicItemAboutView(viewModel: viewModel)
if !viewModel.similarItems.isEmpty { if !viewModel.similarItems.isEmpty {
PortraitItemsRowView(rowTitle: "Recommended", PortraitItemsRowView(rowTitle: L10n.recommended,
items: viewModel.similarItems, items: viewModel.similarItems,
showItemTitles: showPosterLabels) { item in showItemTitles: showPosterLabels) { item in
itemRouter.route(to: \.item, item) itemRouter.route(to: \.item, item)

4
Swiftfin tvOS/Views/ItemView/CinematicItemView/CinematicSeasonItemView.swift
View File

@ -56,14 +56,14 @@ struct CinematicSeasonItemView: View {
SingleSeasonEpisodesRowView(viewModel: SingleSeasonEpisodesRowViewModel(seasonItemViewModel: viewModel)) SingleSeasonEpisodesRowView(viewModel: SingleSeasonEpisodesRowViewModel(seasonItemViewModel: viewModel))
if let seriesItem = viewModel.seriesItem { if let seriesItem = viewModel.seriesItem {
PortraitItemsRowView(rowTitle: "Series", PortraitItemsRowView(rowTitle: L10n.series,
items: [seriesItem]) { seriesItem in items: [seriesItem]) { seriesItem in
itemRouter.route(to: \.item, seriesItem) itemRouter.route(to: \.item, seriesItem)
} }
} }
if !viewModel.similarItems.isEmpty { if !viewModel.similarItems.isEmpty {
PortraitItemsRowView(rowTitle: "Recommended", PortraitItemsRowView(rowTitle: L10n.recommended,
items: viewModel.similarItems, items: viewModel.similarItems,
showItemTitles: showPosterLabels) { item in showItemTitles: showPosterLabels) { item in
itemRouter.route(to: \.item, item) itemRouter.route(to: \.item, item)

4
Swiftfin tvOS/Views/ItemView/CinematicItemView/CinematicSeriesItemView.swift
View File

@ -45,14 +45,14 @@ struct CinematicSeriesItemView: View {
CinematicItemAboutView(viewModel: viewModel) CinematicItemAboutView(viewModel: viewModel)
PortraitItemsRowView(rowTitle: "Seasons", PortraitItemsRowView(rowTitle: L10n.seasons,
items: viewModel.seasons, items: viewModel.seasons,
showItemTitles: showPosterLabels) { season in showItemTitles: showPosterLabels) { season in
itemRouter.route(to: \.item, season) itemRouter.route(to: \.item, season)
} }
if !viewModel.similarItems.isEmpty { if !viewModel.similarItems.isEmpty {
PortraitItemsRowView(rowTitle: "Recommended", PortraitItemsRowView(rowTitle: L10n.recommended,
items: viewModel.similarItems, items: viewModel.similarItems,
showItemTitles: showPosterLabels) { item in showItemTitles: showPosterLabels) { item in
itemRouter.route(to: \.item, item) itemRouter.route(to: \.item, item)

2
Swiftfin tvOS/Views/LibrarySearchView.swift
View File

@ -42,7 +42,7 @@ struct LibrarySearchView: View {
.onChange(of: searchQuery) { query in .onChange(of: searchQuery) { query in
viewModel.searchQuerySubject.send(query) viewModel.searchQuerySubject.send(query)
} }
.navigationBarTitle("Search") .navigationBarTitle(L10n.search)
} }
var suggestionsListView: some View { var suggestionsListView: some View {

2
Swiftfin tvOS/Views/LibraryView.swift
View File

@ -85,7 +85,7 @@ struct LibraryView: View {
VStack { VStack {
L10n.noResults.text L10n.noResults.text
Button {} label: { Button {} label: {
Text("Reload") L10n.refresh.text
} }
} }
} }

2
Swiftfin tvOS/Views/MovieLibrariesView.swift
View File

@ -73,7 +73,7 @@ struct MovieLibrariesView: View {
Button { Button {
print("movieLibraries reload") print("movieLibraries reload")
} label: { } label: {
Text("Reload") L10n.refresh.text
} }
} }
} }

10
Swiftfin tvOS/Views/ServerDetailView.swift
View File

@ -15,9 +15,9 @@ struct ServerDetailView: View {
var body: some View { var body: some View {
Form { Form {
Section(header: Text("Server Details")) { Section(header: L10n.serverDetails.text) {
HStack { HStack {
Text("Name") L10n.name.text
Spacer() Spacer()
Text(SessionManager.main.currentLogin.server.name) Text(SessionManager.main.currentLogin.server.name)
.foregroundColor(.secondary) .foregroundColor(.secondary)
@ -25,21 +25,21 @@ struct ServerDetailView: View {
.focusable() .focusable()
HStack { HStack {
Text("URI") L10n.url.text
Spacer() Spacer()
Text(SessionManager.main.currentLogin.server.currentURI) Text(SessionManager.main.currentLogin.server.currentURI)
.foregroundColor(.secondary) .foregroundColor(.secondary)
} }
HStack { HStack {
Text("Version") L10n.version.text
Spacer() Spacer()
Text(SessionManager.main.currentLogin.server.version) Text(SessionManager.main.currentLogin.server.version)
.foregroundColor(.secondary) .foregroundColor(.secondary)
} }
HStack { HStack {
Text("Operating System") L10n.operatingSystem.text
Spacer() Spacer()
Text(SessionManager.main.currentLogin.server.os) Text(SessionManager.main.currentLogin.server.os)
.foregroundColor(.secondary) .foregroundColor(.secondary)

8
Swiftfin tvOS/Views/ServerListView.swift
View File

@ -52,7 +52,7 @@ struct ServerListView: View {
Button(role: .destructive) { Button(role: .destructive) {
viewModel.remove(server: server) viewModel.remove(server: server)
} label: { } label: {
Label("Remove", systemImage: "trash") Label(L10n.remove, systemImage: "trash")
} }
} }
} }
@ -65,7 +65,7 @@ struct ServerListView: View {
@ViewBuilder @ViewBuilder
private var noServerView: some View { private var noServerView: some View {
VStack { VStack {
Text("Connect to a Jellyfin server to get started") L10n.connectToJellyfinServerStart.text
.frame(minWidth: 50, maxWidth: 500) .frame(minWidth: 50, maxWidth: 500)
.multilineTextAlignment(.center) .multilineTextAlignment(.center)
.font(.body) .font(.body)
@ -109,7 +109,7 @@ struct ServerListView: View {
Button { Button {
serverListRouter.route(to: \.basicAppSettings) serverListRouter.route(to: \.basicAppSettings)
} label: { } label: {
Text("Settings") L10n.settings.text
} }
} }
} }
@ -117,7 +117,7 @@ struct ServerListView: View {
var body: some View { var body: some View {
innerBody innerBody
.navigationTitle("Servers") .navigationTitle(L10n.servers)
.toolbar { .toolbar {
ToolbarItemGroup(placement: .navigationBarTrailing) { ToolbarItemGroup(placement: .navigationBarTrailing) {
trailingToolbarContent trailingToolbarContent

2
Swiftfin tvOS/Views/SettingsView/ExperimentalSettingsView.swift
View File

@ -25,7 +25,7 @@ struct ExperimentalSettingsView: View {
Toggle("Live TV (Alpha)", isOn: $liveTVAlphaEnabled) Toggle("Live TV (Alpha)", isOn: $liveTVAlphaEnabled)
} header: { } header: {
Text("Experimental") L10n.experimental.text
} }
} }
} }

25
Swiftfin tvOS/Views/SettingsView/OverlaySettingsView.swift
View File

@ -20,11 +20,28 @@ struct OverlaySettingsView: View {
var body: some View { var body: some View {
Form { Form {
Section(header: Text("Overlay")) { Section(header: L10n.overlay.text) {
Toggle("\(Image(systemName: "chevron.left.circle")) Play Previous Item", isOn: $shouldShowPlayPreviousItem) Toggle(isOn: $shouldShowPlayPreviousItem) {
Toggle("\(Image(systemName: "chevron.right.circle")) Play Next Item", isOn: $shouldShowPlayNextItem) HStack {
Toggle("\(Image(systemName: "play.circle.fill")) Auto Play", isOn: $shouldShowAutoPlay) Image(systemName: "chevron.left.circle")
L10n.playPreviousItem.text
}
}
Toggle(isOn: $shouldShowPlayNextItem) {
HStack {
Image(systemName: "chevron.right.circle")
L10n.playNextItem.text
}
}
Toggle(isOn: $shouldShowAutoPlay) {
HStack {
Image(systemName: "play.circle.fill")
L10n.autoPlay.text
}
}
} }
} }
} }

30
Swiftfin tvOS/Views/SettingsView/SettingsView.swift
View File

@ -51,7 +51,7 @@ struct SettingsView: View {
Button {} label: { Button {} label: {
HStack { HStack {
Text("User") L10n.user.text
Spacer() Spacer()
Text(viewModel.user.username) Text(viewModel.user.username)
.foregroundColor(.jellyfinPurple) .foregroundColor(.jellyfinPurple)
@ -62,7 +62,7 @@ struct SettingsView: View {
settingsRouter.route(to: \.serverDetail) settingsRouter.route(to: \.serverDetail)
} label: { } label: {
HStack { HStack {
Text("Server") L10n.server.text
.foregroundColor(.primary) .foregroundColor(.primary)
Spacer() Spacer()
Text(viewModel.server.name) Text(viewModel.server.name)
@ -76,36 +76,36 @@ struct SettingsView: View {
Button { Button {
SessionManager.main.logout() SessionManager.main.logout()
} label: { } label: {
Text("Switch User") L10n.switchUser.text
.foregroundColor(Color.jellyfinPurple) .foregroundColor(Color.jellyfinPurple)
.font(.callout) .font(.callout)
} }
} }
Section(header: Text("Video Player")) { Section(header: L10n.videoPlayer.text) {
Picker("Jump Forward Length", selection: $jumpForwardLength) { Picker(L10n.jumpForwardLength, selection: $jumpForwardLength) {
ForEach(VideoPlayerJumpLength.allCases, id: \.self) { length in ForEach(VideoPlayerJumpLength.allCases, id: \.self) { length in
Text(length.label).tag(length.rawValue) Text(length.label).tag(length.rawValue)
} }
} }
Picker("Jump Backward Length", selection: $jumpBackwardLength) { Picker(L10n.jumpBackwardLength, selection: $jumpBackwardLength) {
ForEach(VideoPlayerJumpLength.allCases, id: \.self) { length in ForEach(VideoPlayerJumpLength.allCases, id: \.self) { length in
Text(length.label).tag(length.rawValue) Text(length.label).tag(length.rawValue)
} }
} }
Toggle("Resume 5 Second Offset", isOn: $resumeOffset) Toggle(L10n.resume5SecondOffset, isOn: $resumeOffset)
Toggle("Press Down for Menu", isOn: $downActionShowsMenu) Toggle(L10n.pressDownForMenu, isOn: $downActionShowsMenu)
Toggle("Confirm Close", isOn: $confirmClose) Toggle(L10n.confirmClose, isOn: $confirmClose)
Button { Button {
settingsRouter.route(to: \.overlaySettings) settingsRouter.route(to: \.overlaySettings)
} label: { } label: {
HStack { HStack {
Text("Overlay") L10n.overlay.text
.foregroundColor(.primary) .foregroundColor(.primary)
Spacer() Spacer()
Image(systemName: "chevron.right") Image(systemName: "chevron.right")
@ -116,7 +116,7 @@ struct SettingsView: View {
settingsRouter.route(to: \.experimentalSettings) settingsRouter.route(to: \.experimentalSettings)
} label: { } label: {
HStack { HStack {
Text("Experimental") L10n.experimental.text
.foregroundColor(.primary) .foregroundColor(.primary)
Spacer() Spacer()
Image(systemName: "chevron.right") Image(systemName: "chevron.right")
@ -125,15 +125,15 @@ struct SettingsView: View {
} }
Section { Section {
Toggle("Cinematic Views", isOn: $tvOSCinematicViews) Toggle(L10n.cinematicViews, isOn: $tvOSCinematicViews)
} header: { } header: {
Text("Appearance") L10n.appearance.text
} }
Section(header: L10n.accessibility.text) { Section(header: L10n.accessibility.text) {
Toggle("Show Poster Labels", isOn: $showPosterLabels) Toggle(L10n.showPosterLabels, isOn: $showPosterLabels)
Picker("Subtitle size", selection: $subtitleSize) { Picker(L10n.subtitleSize, selection: $subtitleSize) {
ForEach(SubtitleSize.allCases, id: \.self) { size in ForEach(SubtitleSize.allCases, id: \.self) { size in
Text(size.label).tag(size.rawValue) Text(size.label).tag(size.rawValue)
} }

2
Swiftfin tvOS/Views/TVLibrariesView.swift
View File

@ -73,7 +73,7 @@ struct TVLibrariesView: View {
Button { Button {
print("tvLibraries reload") print("tvLibraries reload")
} label: { } label: {
Text("Reload") L10n.refresh.text
} }
} }
} }

6
Swiftfin tvOS/Views/UserListView.swift
View File

@ -39,7 +39,7 @@ struct UserListView: View {
Button(role: .destructive) { Button(role: .destructive) {
viewModel.remove(user: user) viewModel.remove(user: user)
} label: { } label: {
Label("Remove", systemImage: "trash") Label(L10n.remove, systemImage: "trash")
} }
} }
} }
@ -52,7 +52,7 @@ struct UserListView: View {
@ViewBuilder @ViewBuilder
private var noUserView: some View { private var noUserView: some View {
VStack { VStack {
Text("Sign in to get started") L10n.signInGetStarted.text
.frame(minWidth: 50, maxWidth: 500) .frame(minWidth: 50, maxWidth: 500)
.multilineTextAlignment(.center) .multilineTextAlignment(.center)
.font(.callout) .font(.callout)
@ -60,7 +60,7 @@ struct UserListView: View {
Button { Button {
userListRouter.route(to: \.userSignIn, viewModel.server) userListRouter.route(to: \.userSignIn, viewModel.server)
} label: { } label: {
Text("Sign in") L10n.signIn.text
.bold() .bold()
.font(.callout) .font(.callout)
} }

6
Swiftfin tvOS/Views/UserSignInView.swift
View File

@ -44,14 +44,14 @@ struct UserSignInView: View {
.disabled(viewModel.isLoading || username.isEmpty) .disabled(viewModel.isLoading || username.isEmpty)
} header: { } header: {
Text("Sign In to \(viewModel.server.name)") L10n.signInToServer(viewModel.server.name).text
} }
} }
.alert(item: $viewModel.errorMessage) { _ in .alert(item: $viewModel.errorMessage) { _ in
Alert(title: Text(viewModel.alertTitle), Alert(title: Text(viewModel.alertTitle),
message: Text(viewModel.errorMessage?.displayMessage ?? "Unknown Error"), message: Text(viewModel.errorMessage?.displayMessage ?? L10n.unknownError),
dismissButton: .cancel()) dismissButton: .cancel())
} }
.navigationTitle("Sign In") .navigationTitle(L10n.signIn)
} }
} }

22
Swiftfin tvOS/Views/VideoPlayer/tvOSOverlay/SmallMenuOverlay.swift
View File

@ -74,7 +74,7 @@ struct SmallMediaStreamSelectionView: View {
if updateFocusedLayer == .subtitles { if updateFocusedLayer == .subtitles {
HStack(spacing: 15) { HStack(spacing: 15) {
Image(systemName: "captions.bubble") Image(systemName: "captions.bubble")
Text("Subtitles") L10n.subtitles.text
} }
.padding() .padding()
.background(Color.white) .background(Color.white)
@ -82,7 +82,7 @@ struct SmallMediaStreamSelectionView: View {
} else { } else {
HStack(spacing: 15) { HStack(spacing: 15) {
Image(systemName: "captions.bubble") Image(systemName: "captions.bubble")
Text("Subtitles") L10n.subtitles.text
} }
.padding() .padding()
} }
@ -106,7 +106,7 @@ struct SmallMediaStreamSelectionView: View {
if updateFocusedLayer == .audio { if updateFocusedLayer == .audio {
HStack(spacing: 15) { HStack(spacing: 15) {
Image(systemName: "speaker.wave.3") Image(systemName: "speaker.wave.3")
Text("Audio") L10n.audio.text
} }
.padding() .padding()
.background(Color.white) .background(Color.white)
@ -114,7 +114,7 @@ struct SmallMediaStreamSelectionView: View {
} else { } else {
HStack(spacing: 15) { HStack(spacing: 15) {
Image(systemName: "speaker.wave.3") Image(systemName: "speaker.wave.3")
Text("Audio") L10n.audio.text
} }
.padding() .padding()
} }
@ -138,7 +138,7 @@ struct SmallMediaStreamSelectionView: View {
if updateFocusedLayer == .playbackSpeed { if updateFocusedLayer == .playbackSpeed {
HStack(spacing: 15) { HStack(spacing: 15) {
Image(systemName: "speedometer") Image(systemName: "speedometer")
Text("Playback Speed") L10n.playbackSpeed.text
} }
.padding() .padding()
.background(Color.white) .background(Color.white)
@ -146,7 +146,7 @@ struct SmallMediaStreamSelectionView: View {
} else { } else {
HStack(spacing: 15) { HStack(spacing: 15) {
Image(systemName: "speedometer") Image(systemName: "speedometer")
Text("Playback Speed") L10n.playbackSpeed.text
} }
.padding() .padding()
} }
@ -185,7 +185,7 @@ struct SmallMediaStreamSelectionView: View {
HStack { HStack {
if viewModel.subtitleStreams.isEmpty { if viewModel.subtitleStreams.isEmpty {
Button {} label: { Button {} label: {
Text("None") L10n.none.text
} }
} else { } else {
ForEach(viewModel.subtitleStreams, id: \.self) { subtitleStream in ForEach(viewModel.subtitleStreams, id: \.self) { subtitleStream in
@ -193,9 +193,9 @@ struct SmallMediaStreamSelectionView: View {
viewModel.selectedSubtitleStreamIndex = subtitleStream.index ?? -1 viewModel.selectedSubtitleStreamIndex = subtitleStream.index ?? -1
} label: { } label: {
if subtitleStream.index == viewModel.selectedSubtitleStreamIndex { if subtitleStream.index == viewModel.selectedSubtitleStreamIndex {
Label(subtitleStream.displayTitle ?? "No Title", systemImage: "checkmark") Label(subtitleStream.displayTitle ?? L10n.noTitle, systemImage: "checkmark")
} else { } else {
Text(subtitleStream.displayTitle ?? "No Title") Text(subtitleStream.displayTitle ?? L10n.noTitle)
} }
} }
} }
@ -220,9 +220,9 @@ struct SmallMediaStreamSelectionView: View {
viewModel.selectedAudioStreamIndex = audioStream.index ?? -1 viewModel.selectedAudioStreamIndex = audioStream.index ?? -1
} label: { } label: {
if audioStream.index == viewModel.selectedAudioStreamIndex { if audioStream.index == viewModel.selectedAudioStreamIndex {
Label(audioStream.displayTitle ?? "No Title", systemImage: "checkmark") Label(audioStream.displayTitle ?? L10n.noTitle, systemImage: "checkmark")
} else { } else {
Text(audioStream.displayTitle ?? "No Title") Text(audioStream.displayTitle ?? L10n.noTitle)
} }
} }
} }

42
Swiftfin.xcodeproj/project.pbxproj
View File

@ -375,8 +375,6 @@
E1AA33222782648000F6439C /* OverlaySliderColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1AA33212782648000F6439C /* OverlaySliderColor.swift */; }; E1AA33222782648000F6439C /* OverlaySliderColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1AA33212782648000F6439C /* OverlaySliderColor.swift */; };
E1AA33232782648000F6439C /* OverlaySliderColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1AA33212782648000F6439C /* OverlaySliderColor.swift */; }; E1AA33232782648000F6439C /* OverlaySliderColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1AA33212782648000F6439C /* OverlaySliderColor.swift */; };
E1AA332427829B5200F6439C /* OverlayType.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1AA331E2782639D00F6439C /* OverlayType.swift */; }; E1AA332427829B5200F6439C /* OverlayType.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1AA331E2782639D00F6439C /* OverlayType.swift */; };
E1AD104A26D94822003E4A08 /* DetailItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1AD104926D94822003E4A08 /* DetailItem.swift */; };
E1AD104B26D94822003E4A08 /* DetailItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1AD104926D94822003E4A08 /* DetailItem.swift */; };
E1AD104D26D96CE3003E4A08 /* BaseItemDtoExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1AD104C26D96CE3003E4A08 /* BaseItemDtoExtensions.swift */; }; E1AD104D26D96CE3003E4A08 /* BaseItemDtoExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1AD104C26D96CE3003E4A08 /* BaseItemDtoExtensions.swift */; };
E1AD104E26D96CE3003E4A08 /* BaseItemDtoExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1AD104C26D96CE3003E4A08 /* BaseItemDtoExtensions.swift */; }; E1AD104E26D96CE3003E4A08 /* BaseItemDtoExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1AD104C26D96CE3003E4A08 /* BaseItemDtoExtensions.swift */; };
E1AD105426D97161003E4A08 /* BaseItemDtoExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1AD104C26D96CE3003E4A08 /* BaseItemDtoExtensions.swift */; }; E1AD105426D97161003E4A08 /* BaseItemDtoExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1AD104C26D96CE3003E4A08 /* BaseItemDtoExtensions.swift */; };
@ -721,7 +719,6 @@
E1AA331C2782541500F6439C /* PrimaryButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrimaryButtonView.swift; sourceTree = "<group>"; }; E1AA331C2782541500F6439C /* PrimaryButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrimaryButtonView.swift; sourceTree = "<group>"; };
E1AA331E2782639D00F6439C /* OverlayType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverlayType.swift; sourceTree = "<group>"; }; E1AA331E2782639D00F6439C /* OverlayType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverlayType.swift; sourceTree = "<group>"; };
E1AA33212782648000F6439C /* OverlaySliderColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverlaySliderColor.swift; sourceTree = "<group>"; }; E1AA33212782648000F6439C /* OverlaySliderColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverlaySliderColor.swift; sourceTree = "<group>"; };
E1AD104926D94822003E4A08 /* DetailItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailItem.swift; sourceTree = "<group>"; };
E1AD104C26D96CE3003E4A08 /* BaseItemDtoExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseItemDtoExtensions.swift; sourceTree = "<group>"; }; E1AD104C26D96CE3003E4A08 /* BaseItemDtoExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseItemDtoExtensions.swift; sourceTree = "<group>"; };
E1AD105526D981CE003E4A08 /* PortraitHStackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PortraitHStackView.swift; sourceTree = "<group>"; }; E1AD105526D981CE003E4A08 /* PortraitHStackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PortraitHStackView.swift; sourceTree = "<group>"; };
E1AD105B26D9ABDD003E4A08 /* PillHStackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PillHStackView.swift; sourceTree = "<group>"; }; E1AD105B26D9ABDD003E4A08 /* PillHStackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PillHStackView.swift; sourceTree = "<group>"; };
@ -974,7 +971,6 @@
children = ( children = (
E1D4BF802719D22800A11E64 /* AppAppearance.swift */, E1D4BF802719D22800A11E64 /* AppAppearance.swift */,
E1D4BF862719D27100A11E64 /* Bitrates.swift */, E1D4BF862719D27100A11E64 /* Bitrates.swift */,
E1AD104926D94822003E4A08 /* DetailItem.swift */,
53192D5C265AA78A008A4215 /* DeviceProfileBuilder.swift */, 53192D5C265AA78A008A4215 /* DeviceProfileBuilder.swift */,
62EC353326766B03000E9F2D /* DeviceRotationViewModifier.swift */, 62EC353326766B03000E9F2D /* DeviceRotationViewModifier.swift */,
E19169CD272514760085832A /* HTTPScheme.swift */, E19169CD272514760085832A /* HTTPScheme.swift */,
@ -1674,7 +1670,6 @@
buildPhases = ( buildPhases = (
3D0F2756C71CDF6B9EEBD4E0 /* [CP] Check Pods Manifest.lock */, 3D0F2756C71CDF6B9EEBD4E0 /* [CP] Check Pods Manifest.lock */,
6286F0A3271C0ABA00C40ED5 /* R.swift */, 6286F0A3271C0ABA00C40ED5 /* R.swift */,
C6EE6AB295A273FF14E6EF56 /* [CP] Prepare Artifacts */,
5358705C2669D21600D05A09 /* Sources */, 5358705C2669D21600D05A09 /* Sources */,
5358705D2669D21600D05A09 /* Frameworks */, 5358705D2669D21600D05A09 /* Frameworks */,
5358705E2669D21600D05A09 /* Resources */, 5358705E2669D21600D05A09 /* Resources */,
@ -1819,7 +1814,7 @@
536D3D82267BEA550004248C /* XCRemoteSwiftPackageReference "ParallaxView" */, 536D3D82267BEA550004248C /* XCRemoteSwiftPackageReference "ParallaxView" */,
53649AAB269CFAEA00A2D8B7 /* XCRemoteSwiftPackageReference "Puppy" */, 53649AAB269CFAEA00A2D8B7 /* XCRemoteSwiftPackageReference "Puppy" */,
62C29E9A26D0FE4100C1D2E7 /* XCRemoteSwiftPackageReference "stinsen" */, 62C29E9A26D0FE4100C1D2E7 /* XCRemoteSwiftPackageReference "stinsen" */,
E13DD3C42716499E009D4DAF /* XCRemoteSwiftPackageReference "CoreStore" */, E13DD3C42716499E009D4DAF /* XCRemoteSwiftPackageReference "CoreStore.git" */,
E13DD3D127168E65009D4DAF /* XCRemoteSwiftPackageReference "Defaults" */, E13DD3D127168E65009D4DAF /* XCRemoteSwiftPackageReference "Defaults" */,
E1267D42271A212C003C492E /* XCRemoteSwiftPackageReference "CombineExt" */, E1267D42271A212C003C492E /* XCRemoteSwiftPackageReference "CombineExt" */,
E1C16B89271A2180009A5D25 /* XCRemoteSwiftPackageReference "SwiftyJSON" */, E1C16B89271A2180009A5D25 /* XCRemoteSwiftPackageReference "SwiftyJSON" */,
@ -2033,23 +2028,6 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Swiftfin iOS/Pods-Swiftfin iOS-frameworks.sh\"\n"; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Swiftfin iOS/Pods-Swiftfin iOS-frameworks.sh\"\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
C6EE6AB295A273FF14E6EF56 /* [CP] Prepare Artifacts */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Swiftfin tvOS/Pods-Swiftfin tvOS-artifacts-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Prepare Artifacts";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Swiftfin tvOS/Pods-Swiftfin tvOS-artifacts-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Swiftfin tvOS/Pods-Swiftfin tvOS-artifacts.sh\"\n";
showEnvVarsInLog = 0;
};
D4D3981ADF75BCD341D590C0 /* [CP] Check Pods Manifest.lock */ = { D4D3981ADF75BCD341D590C0 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
@ -2148,7 +2126,6 @@
62EC3530267666A5000E9F2D /* SessionManager.swift in Sources */, 62EC3530267666A5000E9F2D /* SessionManager.swift in Sources */,
E1E5D5372783A52C00692DFE /* CinematicEpisodeItemView.swift in Sources */, E1E5D5372783A52C00692DFE /* CinematicEpisodeItemView.swift in Sources */,
C4BE078E27298818003F4AD1 /* LiveTVHomeView.swift in Sources */, C4BE078E27298818003F4AD1 /* LiveTVHomeView.swift in Sources */,
E1AD104B26D94822003E4A08 /* DetailItem.swift in Sources */,
E13DD3E227176BD3009D4DAF /* ServerListViewModel.swift in Sources */, E13DD3E227176BD3009D4DAF /* ServerListViewModel.swift in Sources */,
53272539268C20100035FBF1 /* EpisodeItemView.swift in Sources */, 53272539268C20100035FBF1 /* EpisodeItemView.swift in Sources */,
E178859B2780F1F40094FBCF /* tvOSSlider.swift in Sources */, E178859B2780F1F40094FBCF /* tvOSSlider.swift in Sources */,
@ -2375,7 +2352,6 @@
E13DD3E927177ED6009D4DAF /* ServerListCoordinator.swift in Sources */, E13DD3E927177ED6009D4DAF /* ServerListCoordinator.swift in Sources */,
E1C812BD277A8E5D00918266 /* PlayerOverlayDelegate.swift in Sources */, E1C812BD277A8E5D00918266 /* PlayerOverlayDelegate.swift in Sources */,
E13DD3C227164941009D4DAF /* SwiftfinStore.swift in Sources */, E13DD3C227164941009D4DAF /* SwiftfinStore.swift in Sources */,
E1AD104A26D94822003E4A08 /* DetailItem.swift in Sources */,
62E632E0267D30CA0063E547 /* LibraryViewModel.swift in Sources */, 62E632E0267D30CA0063E547 /* LibraryViewModel.swift in Sources */,
E193D4DB27193CCA00900D82 /* PillStackable.swift in Sources */, E193D4DB27193CCA00900D82 /* PillStackable.swift in Sources */,
E1AA331F2782639D00F6439C /* OverlayType.swift in Sources */, E1AA331F2782639D00F6439C /* OverlayType.swift in Sources */,
@ -2797,7 +2773,7 @@
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 66; CURRENT_PROJECT_VERSION = 66;
DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = TY84JMYEFE;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
EXCLUDED_ARCHS = ""; EXCLUDED_ARCHS = "";
@ -2834,7 +2810,7 @@
CURRENT_PROJECT_VERSION = 66; CURRENT_PROJECT_VERSION = 66;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = TY84JMYEFE;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
EXCLUDED_ARCHS = ""; EXCLUDED_ARCHS = "";
@ -2865,7 +2841,7 @@
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 66; CURRENT_PROJECT_VERSION = 66;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = TY84JMYEFE;
INFOPLIST_FILE = WidgetExtension/Info.plist; INFOPLIST_FILE = WidgetExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0; IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
@ -2892,7 +2868,7 @@
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 66; CURRENT_PROJECT_VERSION = 66;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = TY84JMYEFE;
INFOPLIST_FILE = WidgetExtension/Info.plist; INFOPLIST_FILE = WidgetExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0; IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
@ -3024,7 +3000,7 @@
minimumVersion = 1.0.0; minimumVersion = 1.0.0;
}; };
}; };
E13DD3C42716499E009D4DAF /* XCRemoteSwiftPackageReference "CoreStore" */ = { E13DD3C42716499E009D4DAF /* XCRemoteSwiftPackageReference "CoreStore.git" */ = {
isa = XCRemoteSwiftPackageReference; isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/JohnEstropia/CoreStore.git"; repositoryURL = "https://github.com/JohnEstropia/CoreStore.git";
requirement = { requirement = {
@ -3141,17 +3117,17 @@
}; };
E13DD3C52716499E009D4DAF /* CoreStore */ = { E13DD3C52716499E009D4DAF /* CoreStore */ = {
isa = XCSwiftPackageProductDependency; isa = XCSwiftPackageProductDependency;
package = E13DD3C42716499E009D4DAF /* XCRemoteSwiftPackageReference "CoreStore" */; package = E13DD3C42716499E009D4DAF /* XCRemoteSwiftPackageReference "CoreStore.git" */;
productName = CoreStore; productName = CoreStore;
}; };
E13DD3CC27164CA7009D4DAF /* CoreStore */ = { E13DD3CC27164CA7009D4DAF /* CoreStore */ = {
isa = XCSwiftPackageProductDependency; isa = XCSwiftPackageProductDependency;
package = E13DD3C42716499E009D4DAF /* XCRemoteSwiftPackageReference "CoreStore" */; package = E13DD3C42716499E009D4DAF /* XCRemoteSwiftPackageReference "CoreStore.git" */;
productName = CoreStore; productName = CoreStore;
}; };
E13DD3CE27164E1F009D4DAF /* CoreStore */ = { E13DD3CE27164E1F009D4DAF /* CoreStore */ = {
isa = XCSwiftPackageProductDependency; isa = XCSwiftPackageProductDependency;
package = E13DD3C42716499E009D4DAF /* XCRemoteSwiftPackageReference "CoreStore" */; package = E13DD3C42716499E009D4DAF /* XCRemoteSwiftPackageReference "CoreStore.git" */;
productName = CoreStore; productName = CoreStore;
}; };
E13DD3D227168E65009D4DAF /* Defaults */ = { E13DD3D227168E65009D4DAF /* Defaults */ = {

9
Swiftfin/Components/EpisodesRowView.swift
View File

@ -26,15 +26,15 @@ struct EpisodesRowView: View {
viewModel.selectedSeason = season viewModel.selectedSeason = season
} label: { } label: {
if season.id == viewModel.selectedSeason?.id { if season.id == viewModel.selectedSeason?.id {
Label(season.name ?? "Season", systemImage: "checkmark") Label(season.name ?? L10n.season, systemImage: "checkmark")
} else { } else {
Text(season.name ?? "Season") Text(season.name ?? L10n.season)
} }
} }
} }
} label: { } label: {
HStack(spacing: 5) { HStack(spacing: 5) {
Text(viewModel.selectedSeason?.name ?? "Unknown") Text(viewModel.selectedSeason?.name ?? L10n.unknown)
.fontWeight(.semibold) .fontWeight(.semibold)
.fixedSize() .fixedSize()
Image(systemName: "chevron.down") Image(systemName: "chevron.down")
@ -85,7 +85,8 @@ struct EpisodesRowView: View {
Text("--") Text("--")
.font(.footnote) .font(.footnote)
.foregroundColor(.secondary) .foregroundColor(.secondary)
Text("No episodes available")
L10n.noEpisodesAvailable.text
.font(.body) .font(.body)
.padding(.bottom, 1) .padding(.bottom, 1)
.lineLimit(2) .lineLimit(2)

2
Swiftfin/Components/TruncatedTextView.swift
View File

@ -23,7 +23,7 @@ struct TruncatedTextView: View {
if !truncated { if !truncated {
return "" return ""
} else { } else {
return "See More" return L10n.seeMore
} }
} }

18
Swiftfin/Views/BasicAppSettingsView.swift
View File

@ -41,55 +41,55 @@ struct BasicAppSettingsView: View {
} }
Section { Section {
Picker("Default Scheme", selection: $defaultHTTPScheme) { Picker(L10n.defaultScheme, selection: $defaultHTTPScheme) {
ForEach(HTTPScheme.allCases, id: \.self) { scheme in ForEach(HTTPScheme.allCases, id: \.self) { scheme in
Text("\(scheme.rawValue)") Text("\(scheme.rawValue)")
} }
} }
} header: { } header: {
Text("Networking") L10n.networking.text
} }
Button { Button {
resetUserSettingsTapped = true resetUserSettingsTapped = true
} label: { } label: {
Text("Reset User Settings") L10n.resetUserSettings.text
} }
Button { Button {
resetAppSettingsTapped = true resetAppSettingsTapped = true
} label: { } label: {
Text("Reset App Settings") L10n.resetAppSettings.text
} }
Button { Button {
removeAllUsersTapped = true removeAllUsersTapped = true
} label: { } label: {
Text("Remove All Users") L10n.removeAllUsers.text
} }
} }
.alert("Reset User Settings", isPresented: $resetUserSettingsTapped, actions: { .alert(L10n.resetUserSettings, isPresented: $resetUserSettingsTapped, actions: {
Button(role: .destructive) { Button(role: .destructive) {
viewModel.resetUserSettings() viewModel.resetUserSettings()
} label: { } label: {
L10n.reset.text L10n.reset.text
} }
}) })
.alert("Reset App Settings", isPresented: $resetAppSettingsTapped, actions: { .alert(L10n.resetAppSettings, isPresented: $resetAppSettingsTapped, actions: {
Button(role: .destructive) { Button(role: .destructive) {
viewModel.resetAppSettings() viewModel.resetAppSettings()
} label: { } label: {
L10n.reset.text L10n.reset.text
} }
}) })
.alert("Remove All Users", isPresented: $removeAllUsersTapped, actions: { .alert(L10n.removeAllUsers, isPresented: $removeAllUsersTapped, actions: {
Button(role: .destructive) { Button(role: .destructive) {
viewModel.removeAllUsers() viewModel.removeAllUsers()
} label: { } label: {
L10n.reset.text L10n.reset.text
} }
}) })
.navigationBarTitle("Settings", displayMode: .inline) .navigationBarTitle(L10n.settings, displayMode: .inline)
.toolbar { .toolbar {
ToolbarItemGroup(placement: .navigationBarLeading) { ToolbarItemGroup(placement: .navigationBarLeading) {
Button { Button {

13
Swiftfin/Views/ConnectToServerView.swift
View File

@ -37,7 +37,7 @@ struct ConnectToServerView: View {
Button(role: .destructive) { Button(role: .destructive) {
viewModel.cancelConnection() viewModel.cancelConnection()
} label: { } label: {
Text("Cancel") L10n.cancel.text
} }
} else { } else {
Button { Button {
@ -48,17 +48,14 @@ struct ConnectToServerView: View {
.disabled(uri.isEmpty) .disabled(uri.isEmpty)
} }
} header: { } header: {
Text("Connect to a Jellyfin server") L10n.connectToJellyfinServer.text
} }
Section { Section {
if viewModel.searching { if viewModel.searching {
HStack(alignment: .center, spacing: 5) { HStack(alignment: .center, spacing: 5) {
Spacer() Spacer()
// Oct. 15, 2021 L10n.searchingDots.text
// There is a bug where ProgressView() won't appear sometimes when searching,
// dots were used instead but ProgressView() is preferred
Text("Searching...")
.foregroundColor(.secondary) .foregroundColor(.secondary)
Spacer() Spacer()
} }
@ -66,7 +63,7 @@ struct ConnectToServerView: View {
if viewModel.discoveredServers.isEmpty { if viewModel.discoveredServers.isEmpty {
HStack(alignment: .center) { HStack(alignment: .center) {
Spacer() Spacer()
Text("No local servers found") L10n.noLocalServersFound.text
.font(.callout) .font(.callout)
.foregroundColor(.secondary) .foregroundColor(.secondary)
Spacer() Spacer()
@ -106,7 +103,7 @@ struct ConnectToServerView: View {
} }
.alert(item: $viewModel.errorMessage) { _ in .alert(item: $viewModel.errorMessage) { _ in
Alert(title: Text(viewModel.alertTitle), Alert(title: Text(viewModel.alertTitle),
message: Text(viewModel.errorMessage?.displayMessage ?? "Unknown Error"), message: Text(viewModel.errorMessage?.displayMessage ?? L10n.unknownError),
dismissButton: .cancel()) dismissButton: .cancel())
} }
.alert(item: $viewModel.addServerURIPayload) { _ in .alert(item: $viewModel.addServerURIPayload) { _ in

2
Swiftfin/Views/ContinueWatchingView.swift
View File

@ -43,7 +43,7 @@ struct ContinueWatchingView: View {
.frame(height: 35) .frame(height: 35)
VStack(alignment: .leading, spacing: 0) { VStack(alignment: .leading, spacing: 0) {
Text(item.getItemProgressString() ?? "Continue") Text(item.getItemProgressString() ?? L10n.continue)
.font(.subheadline) .font(.subheadline)
.padding(.bottom, 5) .padding(.bottom, 5)
.padding(.leading, 10) .padding(.leading, 10)

4
Swiftfin/Views/HomeView.swift
View File

@ -39,7 +39,7 @@ struct HomeView: View {
.frame(minWidth: 50, maxWidth: 240) .frame(minWidth: 50, maxWidth: 240)
.multilineTextAlignment(.center) .multilineTextAlignment(.center)
PrimaryButtonView(title: "Retry") { PrimaryButtonView(title: L10n.retry) {
viewModel.refresh() viewModel.refresh()
} }
} }
@ -69,7 +69,7 @@ struct HomeView: View {
if !viewModel.latestAddedItems.isEmpty { if !viewModel.latestAddedItems.isEmpty {
PortraitImageHStackView(items: viewModel.latestAddedItems) { PortraitImageHStackView(items: viewModel.latestAddedItems) {
Text("Recently Added") L10n.recentlyAdded.text
.font(.title2) .font(.title2)
.fontWeight(.bold) .fontWeight(.bold)
.padding() .padding()

2
Swiftfin/Views/ItemOverviewView.swift
View File

@ -21,7 +21,7 @@ struct ItemOverviewView: View {
.font(.footnote) .font(.footnote)
.padding() .padding()
} }
.navigationBarTitle("Overview", displayMode: .inline) .navigationBarTitle(L10n.overview, displayMode: .inline)
.toolbar { .toolbar {
ToolbarItemGroup(placement: .navigationBarLeading) { ToolbarItemGroup(placement: .navigationBarLeading) {
Button { Button {

8
Swiftfin/Views/ItemView/ItemViewBody.swift
View File

@ -42,7 +42,7 @@ struct ItemViewBody: View {
.padding() .padding()
} }
} else { } else {
Text("No overview available") L10n.noOverviewAvailable.text
.font(.footnote) .font(.footnote)
.padding() .padding()
} }
@ -92,7 +92,7 @@ struct ItemViewBody: View {
if let seriesItem = episodeViewModel.series { if let seriesItem = episodeViewModel.series {
let a = [seriesItem] let a = [seriesItem]
PortraitImageHStackView(items: a) { PortraitImageHStackView(items: a) {
Text("Series") L10n.series.text
.fontWeight(.semibold) .fontWeight(.semibold)
.padding(.bottom) .padding(.bottom)
.padding(.horizontal) .padding(.horizontal)
@ -106,7 +106,7 @@ struct ItemViewBody: View {
if let collectionViewModel = viewModel as? CollectionItemViewModel { if let collectionViewModel = viewModel as? CollectionItemViewModel {
PortraitImageHStackView(items: collectionViewModel.collectionItems) { PortraitImageHStackView(items: collectionViewModel.collectionItems) {
Text("Items") L10n.items.text
.fontWeight(.semibold) .fontWeight(.semibold)
.padding(.bottom) .padding(.bottom)
.padding(.horizontal) .padding(.horizontal)
@ -121,7 +121,7 @@ struct ItemViewBody: View {
if let castAndCrew = viewModel.item.people { if let castAndCrew = viewModel.item.people {
PortraitImageHStackView(items: castAndCrew.filter { BaseItemPerson.DisplayedType.allCasesRaw.contains($0.type ?? "") }, PortraitImageHStackView(items: castAndCrew.filter { BaseItemPerson.DisplayedType.allCasesRaw.contains($0.type ?? "") },
topBarView: { topBarView: {
Text("Cast & Crew") L10n.castAndCrew.text
.fontWeight(.semibold) .fontWeight(.semibold)
.padding(.bottom) .padding(.bottom)
.padding(.horizontal) .padding(.horizontal)

4
Swiftfin/Views/ItemView/ItemViewDetailsView.swift
View File

@ -19,7 +19,7 @@ struct ItemViewDetailsView: View {
if !viewModel.informationItems.isEmpty { if !viewModel.informationItems.isEmpty {
VStack(alignment: .leading, spacing: 20) { VStack(alignment: .leading, spacing: 20) {
Text("Information") L10n.information.text
.font(.title3) .font(.title3)
.fontWeight(.bold) .fontWeight(.bold)
@ -38,7 +38,7 @@ struct ItemViewDetailsView: View {
if !viewModel.mediaItems.isEmpty { if !viewModel.mediaItems.isEmpty {
VStack(alignment: .leading, spacing: 20) { VStack(alignment: .leading, spacing: 20) {
Text("Media") L10n.media.text
.font(.title3) .font(.title3)
.fontWeight(.bold) .fontWeight(.bold)

2
Swiftfin/Views/LibraryListView.swift
View File

@ -21,7 +21,7 @@ struct LibraryListView: View {
LazyVStack { LazyVStack {
Button { Button {
libraryListRouter.route(to: \.library, libraryListRouter.route(to: \.library,
(viewModel: LibraryViewModel(filters: viewModel.withFavorites), title: "Favorites")) (viewModel: LibraryViewModel(filters: viewModel.withFavorites), title: L10n.favorites))
} label: { } label: {
ZStack { ZStack {
HStack { HStack {

2
Swiftfin/Views/LibrarySearchView.swift
View File

@ -45,7 +45,7 @@ struct LibrarySearchView: View {
.onChange(of: searchQuery) { query in .onChange(of: searchQuery) { query in
viewModel.searchQuerySubject.send(query) viewModel.searchQuerySubject.send(query)
} }
.navigationBarTitle("Search", displayMode: .inline) .navigationBarTitle(L10n.search, displayMode: .inline)
} }
var suggestionsListView: some View { var suggestionsListView: some View {

10
Swiftfin/Views/ServerDetailView.swift
View File

@ -22,15 +22,15 @@ struct ServerDetailView: View {
var body: some View { var body: some View {
Form { Form {
Section(header: Text("Server Details")) { Section(header: L10n.serverDetails.text) {
HStack { HStack {
Text("Name") L10n.name.text
Spacer() Spacer()
Text(viewModel.server.name) Text(viewModel.server.name)
.foregroundColor(.secondary) .foregroundColor(.secondary)
} }
Picker("URI", selection: $currentServerURI) { Picker(L10n.url, selection: $currentServerURI) {
ForEach(viewModel.server.uris.sorted(), id: \.self) { uri in ForEach(viewModel.server.uris.sorted(), id: \.self) { uri in
Text(uri).tag(uri) Text(uri).tag(uri)
.foregroundColor(.secondary) .foregroundColor(.secondary)
@ -40,14 +40,14 @@ struct ServerDetailView: View {
} }
HStack { HStack {
Text("Version") L10n.version.text
Spacer() Spacer()
Text(viewModel.server.version) Text(viewModel.server.version)
.foregroundColor(.secondary) .foregroundColor(.secondary)
} }
HStack { HStack {
Text("Operating System") L10n.operatingSystem.text
Spacer() Spacer()
Text(viewModel.server.os) Text(viewModel.server.os)
.foregroundColor(.secondary) .foregroundColor(.secondary)

6
Swiftfin/Views/ServerListView.swift
View File

@ -56,7 +56,7 @@ struct ServerListView: View {
Button(role: .destructive) { Button(role: .destructive) {
viewModel.remove(server: server) viewModel.remove(server: server)
} label: { } label: {
Label("Remove", systemImage: "trash") Label(L10n.remove, systemImage: "trash")
} }
} }
} }
@ -66,7 +66,7 @@ struct ServerListView: View {
private var noServerView: some View { private var noServerView: some View {
VStack { VStack {
Text("Connect to a Jellyfin server to get started") L10n.connectToJellyfinServerStart.text
.frame(minWidth: 50, maxWidth: 240) .frame(minWidth: 50, maxWidth: 240)
.multilineTextAlignment(.center) .multilineTextAlignment(.center)
@ -109,7 +109,7 @@ struct ServerListView: View {
var body: some View { var body: some View {
innerBody innerBody
.navigationTitle("Servers") .navigationTitle(L10n.servers)
.toolbar { .toolbar {
ToolbarItemGroup(placement: .navigationBarTrailing) { ToolbarItemGroup(placement: .navigationBarTrailing) {
trailingToolbarContent trailingToolbarContent

2
Swiftfin/Views/SettingsView/ExperimentalSettingsView.swift
View File

@ -21,7 +21,7 @@ struct ExperimentalSettingsView: View {
Toggle("Sync Subtitles with Adjacent Episodes", isOn: $syncSubtitleStateWithAdjacent) Toggle("Sync Subtitles with Adjacent Episodes", isOn: $syncSubtitleStateWithAdjacent)
} header: { } header: {
Text("Experimental") L10n.experimental.text
} }
} }
} }

30
Swiftfin/Views/SettingsView/OverlaySettingsView.swift
View File

@ -24,17 +24,35 @@ struct OverlaySettingsView: View {
var body: some View { var body: some View {
Form { Form {
Section(header: Text("Overlay")) { Section(header: L10n.overlay.text) {
Picker("Overlay Type", selection: $overlayType) { Picker(L10n.overlayType, selection: $overlayType) {
ForEach(OverlayType.allCases, id: \.self) { overlay in ForEach(OverlayType.allCases, id: \.self) { overlay in
Text(overlay.label).tag(overlay) Text(overlay.label).tag(overlay)
} }
} }
Toggle("\(Image(systemName: "chevron.left.circle")) Play Previous Item", isOn: $shouldShowPlayPreviousItem) Toggle(isOn: $shouldShowPlayPreviousItem) {
Toggle("\(Image(systemName: "chevron.right.circle")) Play Next Item", isOn: $shouldShowPlayNextItem) HStack {
Toggle("\(Image(systemName: "play.circle.fill")) Auto Play", isOn: $shouldShowAutoPlay) Image(systemName: "chevron.left.circle")
Toggle("Edit Jump Lengths", isOn: $shouldShowJumpButtonsInOverlayMenu) L10n.playPreviousItem.text
}
}
Toggle(isOn: $shouldShowPlayNextItem) {
HStack {
Image(systemName: "chevron.right.circle")
L10n.playNextItem.text
}
}
Toggle(isOn: $shouldShowAutoPlay) {
HStack {
Image(systemName: "play.circle.fill")
L10n.autoPlay.text
}
}
Toggle(L10n.editJumpLengths, isOn: $shouldShowJumpButtonsInOverlayMenu)
} }
} }
} }

28
Swiftfin/Views/SettingsView/SettingsView.swift
View File

@ -51,7 +51,7 @@ struct SettingsView: View {
Form { Form {
Section(header: EmptyView()) { Section(header: EmptyView()) {
HStack { HStack {
Text("User") L10n.user.text
Spacer() Spacer()
Text(viewModel.user.username) Text(viewModel.user.username)
.foregroundColor(.jellyfinPurple) .foregroundColor(.jellyfinPurple)
@ -61,7 +61,7 @@ struct SettingsView: View {
settingsRouter.route(to: \.serverDetail) settingsRouter.route(to: \.serverDetail)
} label: { } label: {
HStack { HStack {
Text("Server") L10n.server.text
.foregroundColor(.primary) .foregroundColor(.primary)
Spacer() Spacer()
Text(viewModel.server.name) Text(viewModel.server.name)
@ -76,7 +76,7 @@ struct SettingsView: View {
SessionManager.main.logout() SessionManager.main.logout()
} }
} label: { } label: {
Text("Switch User") L10n.switchUser.text
.font(.callout) .font(.callout)
} }
} }
@ -96,28 +96,28 @@ struct SettingsView: View {
// } // }
// } // }
Section(header: Text("Video Player")) { Section(header: L10n.videoPlayer.text) {
Picker("Jump Forward Length", selection: $jumpForwardLength) { Picker(L10n.jumpForwardLength, selection: $jumpForwardLength) {
ForEach(VideoPlayerJumpLength.allCases, id: \.self) { length in ForEach(VideoPlayerJumpLength.allCases, id: \.self) { length in
Text(length.label).tag(length.rawValue) Text(length.label).tag(length.rawValue)
} }
} }
Picker("Jump Backward Length", selection: $jumpBackwardLength) { Picker(L10n.jumpBackwardLength, selection: $jumpBackwardLength) {
ForEach(VideoPlayerJumpLength.allCases, id: \.self) { length in ForEach(VideoPlayerJumpLength.allCases, id: \.self) { length in
Text(length.label).tag(length.rawValue) Text(length.label).tag(length.rawValue)
} }
} }
Toggle("Jump Gestures Enabled", isOn: $jumpGesturesEnabled) Toggle(L10n.jumpGesturesEnabled, isOn: $jumpGesturesEnabled)
Toggle("Resume 5 Second Offset", isOn: $resumeOffset) Toggle(L10n.resume5SecondOffset, isOn: $resumeOffset)
Button { Button {
settingsRouter.route(to: \.overlaySettings) settingsRouter.route(to: \.overlaySettings)
} label: { } label: {
HStack { HStack {
Text("Overlay") L10n.overlay.text
.foregroundColor(.primary) .foregroundColor(.primary)
Spacer() Spacer()
Text(overlayType.label) Text(overlayType.label)
@ -129,7 +129,7 @@ struct SettingsView: View {
settingsRouter.route(to: \.experimentalSettings) settingsRouter.route(to: \.experimentalSettings)
} label: { } label: {
HStack { HStack {
Text("Experimental") L10n.experimental.text
.foregroundColor(.primary) .foregroundColor(.primary)
Spacer() Spacer()
Image(systemName: "chevron.right") Image(systemName: "chevron.right")
@ -138,22 +138,22 @@ struct SettingsView: View {
} }
Section(header: L10n.accessibility.text) { Section(header: L10n.accessibility.text) {
Toggle("Show Poster Labels", isOn: $showPosterLabels) Toggle(L10n.showPosterLabels, isOn: $showPosterLabels)
Toggle("Show Cast and Crew", isOn: $showCastAndCrew) Toggle(L10n.showCastAndCrew, isOn: $showCastAndCrew)
Picker(L10n.appearance, selection: $appAppearance) { Picker(L10n.appearance, selection: $appAppearance) {
ForEach(AppAppearance.allCases, id: \.self) { appearance in ForEach(AppAppearance.allCases, id: \.self) { appearance in
Text(appearance.localizedName).tag(appearance.rawValue) Text(appearance.localizedName).tag(appearance.rawValue)
} }
} }
Picker("Subtitle size", selection: $subtitleSize) { Picker(L10n.subtitleSize, selection: $subtitleSize) {
ForEach(SubtitleSize.allCases, id: \.self) { size in ForEach(SubtitleSize.allCases, id: \.self) { size in
Text(size.label).tag(size.rawValue) Text(size.label).tag(size.rawValue)
} }
} }
} }
} }
.navigationBarTitle("Settings", displayMode: .inline) .navigationBarTitle(L10n.settings, displayMode: .inline)
.toolbar { .toolbar {
ToolbarItemGroup(placement: .navigationBarLeading) { ToolbarItemGroup(placement: .navigationBarLeading) {
Button { Button {

6
Swiftfin/Views/UserListView.swift
View File

@ -45,7 +45,7 @@ struct UserListView: View {
Button(role: .destructive) { Button(role: .destructive) {
viewModel.remove(user: user) viewModel.remove(user: user)
} label: { } label: {
Label("Remove", systemImage: "trash") Label(L10n.remove, systemImage: "trash")
} }
} }
} }
@ -55,7 +55,7 @@ struct UserListView: View {
private var noUserView: some View { private var noUserView: some View {
VStack { VStack {
Text("Sign in to get started") L10n.signInGetStarted.text
.frame(minWidth: 50, maxWidth: 240) .frame(minWidth: 50, maxWidth: 240)
.multilineTextAlignment(.center) .multilineTextAlignment(.center)
@ -71,7 +71,7 @@ struct UserListView: View {
.padding(.horizontal, 30) .padding(.horizontal, 30)
.padding([.top, .bottom], 20) .padding([.top, .bottom], 20)
Text("Sign in") L10n.signIn.text
.foregroundColor(Color.white) .foregroundColor(Color.white)
.bold() .bold()
} }

10
Swiftfin/Views/UserSignInView.swift
View File

@ -34,26 +34,26 @@ struct UserSignInView: View {
Button(role: .destructive) { Button(role: .destructive) {
viewModel.cancelSignIn() viewModel.cancelSignIn()
} label: { } label: {
Text("Cancel") L10n.cancel.text
} }
} else { } else {
Button { Button {
viewModel.login(username: username, password: password) viewModel.login(username: username, password: password)
} label: { } label: {
Text("Sign In") L10n.signIn.text
} }
.disabled(username.isEmpty) .disabled(username.isEmpty)
} }
} header: { } header: {
Text("Sign In to \(viewModel.server.name)") L10n.signInToServer(viewModel.server.name).text
} }
} }
.alert(item: $viewModel.errorMessage) { _ in .alert(item: $viewModel.errorMessage) { _ in
Alert(title: Text(viewModel.alertTitle), Alert(title: Text(viewModel.alertTitle),
message: Text(viewModel.errorMessage?.displayMessage ?? "Unknown Error"), message: Text(viewModel.errorMessage?.displayMessage ?? L10n.unknownError),
dismissButton: .cancel()) dismissButton: .cancel())
} }
.navigationTitle("Sign In") .navigationTitle(L10n.signIn)
.navigationBarBackButtonHidden(viewModel.isLoading) .navigationBarBackButtonHidden(viewModel.isLoading)
} }
} }

23
Swiftfin/Views/VideoPlayer/VLCPlayerOverlayView.swift
View File

@ -142,16 +142,16 @@ struct VLCPlayerOverlayView: View {
viewModel.selectedAudioStreamIndex = audioStream.index ?? -1 viewModel.selectedAudioStreamIndex = audioStream.index ?? -1
} label: { } label: {
if audioStream.index == viewModel.selectedAudioStreamIndex { if audioStream.index == viewModel.selectedAudioStreamIndex {
Label(audioStream.displayTitle ?? "No Title", systemImage: "checkmark") Label(audioStream.displayTitle ?? L10n.noTitle, systemImage: "checkmark")
} else { } else {
Text(audioStream.displayTitle ?? "No Title") Text(audioStream.displayTitle ?? L10n.noTitle)
} }
} }
} }
} label: { } label: {
HStack { HStack {
Image(systemName: "speaker.wave.3") Image(systemName: "speaker.wave.3")
Text("Audio") L10n.audio.text
} }
} }
@ -161,16 +161,16 @@ struct VLCPlayerOverlayView: View {
viewModel.selectedSubtitleStreamIndex = subtitleStream.index ?? -1 viewModel.selectedSubtitleStreamIndex = subtitleStream.index ?? -1
} label: { } label: {
if subtitleStream.index == viewModel.selectedSubtitleStreamIndex { if subtitleStream.index == viewModel.selectedSubtitleStreamIndex {
Label(subtitleStream.displayTitle ?? "No Title", systemImage: "checkmark") Label(subtitleStream.displayTitle ?? L10n.noTitle, systemImage: "checkmark")
} else { } else {
Text(subtitleStream.displayTitle ?? "No Title") Text(subtitleStream.displayTitle ?? L10n.noTitle)
} }
} }
} }
} label: { } label: {
HStack { HStack {
Image(systemName: "captions.bubble") Image(systemName: "captions.bubble")
Text("Subtitles") L10n.subtitles.text
} }
} }
@ -189,7 +189,7 @@ struct VLCPlayerOverlayView: View {
} label: { } label: {
HStack { HStack {
Image(systemName: "speedometer") Image(systemName: "speedometer")
Text("Playback Speed") L10n.playbackSpeed.text
} }
} }
@ -209,7 +209,7 @@ struct VLCPlayerOverlayView: View {
} label: { } label: {
HStack { HStack {
Image(systemName: "goforward") Image(systemName: "goforward")
Text("Jump Forward Length") L10n.jumpForwardLength.text
} }
} }
@ -228,7 +228,7 @@ struct VLCPlayerOverlayView: View {
} label: { } label: {
HStack { HStack {
Image(systemName: "gobackward") Image(systemName: "gobackward")
Text("Jump Backward Length") L10n.jumpBackwardLength.text
} }
} }
} }
@ -337,10 +337,7 @@ struct VLCPlayerOverlayView: View {
Capsule().foregroundColor(.purple)) Capsule().foregroundColor(.purple))
.background(Capsule().foregroundColor(Color.gray.opacity(0.25))) .background(Capsule().foregroundColor(Color.gray.opacity(0.25)))
.frame(height: 4), .frame(height: 4),
thumb: Circle().foregroundColor(.purple) thumb: Circle().foregroundColor(.purple),
.onLongPressGesture(perform: {
print("got it here")
}),
thumbSize: CGSize.Circle(radius: viewModel.sliderIsScrubbing ? 20 : 15), thumbSize: CGSize.Circle(radius: viewModel.sliderIsScrubbing ? 20 : 15),
thumbInteractiveSize: CGSize.Circle(radius: 40), thumbInteractiveSize: CGSize.Circle(radius: 40),
options: .defaultOptions)) options: .defaultOptions))

BIN
Translations/en.lproj/Localizable.strings
View File

Binary file not shown.