diff --git a/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings index d98341af..de04cde8 100644 --- a/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings @@ -111,7 +111,7 @@ "timeline.add-remote.title" = "Andere lokale Timeline hinzufügen"; "timeline.add.action.add" = "Hinzufügen"; "timeline.filter.add-local" = "Lokale Timeline hinzufügen"; -"timeline.filter.lists" = "Listem"; +"timeline.filter.lists" = "Listen"; "timeline.filter.local" = "Lokale Timelines"; "timeline.filter.tags" = "Gefolgte Hashtags"; @@ -163,7 +163,7 @@ // MARK: Package: Conversations "conversations.action.delete" = "Löschen"; "conversations.action.mark-read" = "Als gelesen markieren"; -"conversations.empty.message" = "Suchst du etwas Liebe auf Social Media? Hier findest du alle deine direkten Nachriten und privaten Erwähnungen. Fröhliches Messaging! 📱❤️"; +"conversations.empty.message" = "Suchst du etwas Liebe auf Social Media? Hier findest du alle deine direkten Nachrichten und privaten Erwähnungen. Fröhliches Messaging! 📱❤️"; "conversations.empty.title" = "Posteingang leer"; "conversations.error.button" = "Wiederholen"; "conversations.error.message" = "Fehler beim Laden deiner Nachrichten"; diff --git a/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings index 326167f2..f0649a66 100644 --- a/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings @@ -76,7 +76,7 @@ "settings.push.main-toggle.description" = "Recibe notificaciones sobre nuevo eventos"; "settings.push.mentions" = "Menciones"; "settings.push.navigation-title" = "Notificaciones"; -"settings.push.new-posts" = "Nueva publicación"; +"settings.push.new-posts" = "Nuevas publicaciones"; "settings.push.polls" = "Resultados de encuestas"; "settings.section.accounts" = "Cuentas"; "settings.section.app" = "App"; @@ -93,7 +93,7 @@ "settings.support.three.title" = "🤯 Propina generosa"; "settings.support.two.subtitle" = "Me encanta el sabor del café de lujo ❤️"; "settings.support.two.title" = "☕️ Buena propina"; -"settings.timeline.add" = "Añadir una cronología local"; +"settings.timeline.add" = "Añadir cronología local"; "settings.title" = "Ajustes"; // MARK: Tabs @@ -108,11 +108,11 @@ // MARK: Timeline "timeline.%@-is-valid" = "%@ es una instancia válida"; -"timeline.add-remote.title" = "Añadir una cronología local remota"; +"timeline.add-remote.title" = "Añadir cronología local remota"; "timeline.add.action.add" = "Añadir"; -"timeline.filter.add-local" = "Añadir una cronología local"; +"timeline.filter.add-local" = "Añadir cronología local"; "timeline.filter.lists" = "Listas"; -"timeline.filter.local" = "Cronologías Locales"; +"timeline.filter.local" = "Cronologías locales"; "timeline.filter.tags" = "Etiquetas que sigues"; // MARK: Package: AppAccount @@ -276,7 +276,7 @@ "status.editor.media.edit-image" = "Editar Imagen"; "status.editor.media.image-description" = "Descripción de la imagen"; "status.editor.mode.edit" = "Editando tu publicación"; -"status.editor.mode.new" = "Nueva Publicación"; +"status.editor.mode.new" = "Nueva publicación"; "status.editor.mode.quote-%@" = "Cita de %@"; "status.editor.mode.reply-%@" = "Respondiendo a %@"; "status.editor.restore-previous" = "Restaurar texto anterior"; @@ -301,7 +301,7 @@ "status.poll.duration" = "Duración de la encuesta"; "status.poll.frequency" = "Frecuencia de la encuesta"; "status.poll.option-n %lld" = "Opción %lld"; -"status.post-from-%@" = "Publicado desde %@"; +"status.post-from-%@" = "Publicado por %@"; "status.row.was-boosted" = "boosteó"; "status.row.was-reply" = "Respuesta a"; "status.row.you-boosted" = "Boosteaste"; diff --git a/Packages/DesignSystem/Sources/DesignSystem/DesignSystem.swift b/Packages/DesignSystem/Sources/DesignSystem/DesignSystem.swift index 534f9ef6..ae0ddc12 100644 --- a/Packages/DesignSystem/Sources/DesignSystem/DesignSystem.swift +++ b/Packages/DesignSystem/Sources/DesignSystem/DesignSystem.swift @@ -6,4 +6,5 @@ public extension CGFloat { static let statusColumnsSpacing: CGFloat = 8 static let maxColumnWidth: CGFloat = 650 static let sidebarWidth: CGFloat = 80 + static let pollBarHeight: CGFloat = 30 } diff --git a/Packages/Status/Sources/Status/Poll/StatusPollView.swift b/Packages/Status/Sources/Status/Poll/StatusPollView.swift index 2559d64c..378166c6 100644 --- a/Packages/Status/Sources/Status/Poll/StatusPollView.swift +++ b/Packages/Status/Sources/Status/Poll/StatusPollView.swift @@ -5,10 +5,6 @@ import Network import SwiftUI public struct StatusPollView: View { - enum Constants { - static let barHeight: CGFloat = 30 - } - @EnvironmentObject private var theme: Theme @EnvironmentObject private var client: Client @EnvironmentObject private var currentInstance: CurrentInstance @@ -53,7 +49,7 @@ public struct StatusPollView: View { makeBarView(for: option) if !viewModel.votes.isEmpty || viewModel.poll.expired || status.account.id == currentAccount.account?.id { Spacer() - Text("\(percentForOption(option: option)) %") + Text("\(percentForOption(option: option))%") .font(.scaledSubheadline) .frame(width: 40) } @@ -110,14 +106,16 @@ public struct StatusPollView: View { let width = widthForOption(option: option, proxy: proxy) Rectangle() .foregroundColor(theme.tintColor) - .frame(height: Constants.barHeight) + .frame(height: .pollBarHeight) .frame(width: width) - Spacer() + if width != proxy.size.width { + Spacer() + } } } } .foregroundColor(theme.tintColor.opacity(0.40)) - .frame(height: Constants.barHeight) + .frame(height: .pollBarHeight) .clipShape(RoundedRectangle(cornerRadius: 8)) HStack { @@ -133,7 +131,7 @@ public struct StatusPollView: View { .padding(.leading, 12) } } - .frame(height: Constants.barHeight) + .frame(height: .pollBarHeight) } } }