diff --git a/IceCubesApp/Resources/Localization/Plurals/fr.lproj/Localizable.stringsdict b/IceCubesApp/Resources/Localization/Plurals/fr.lproj/Localizable.stringsdict index 243cb5dc..3b766693 100644 --- a/IceCubesApp/Resources/Localization/Plurals/fr.lproj/Localizable.stringsdict +++ b/IceCubesApp/Resources/Localization/Plurals/fr.lproj/Localizable.stringsdict @@ -18,21 +18,85 @@ %lld nouveaux postes - notifications-others-count %lld - - NSStringLocalizedFormatKey - %#@noficationsOthersCount@ - noficationsOthersCount - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - lld - one - et %lld autre - other - et %lld autres - - + notifications-others-count %lld + + NSStringLocalizedFormatKey + %#@noficationsOthersCount@ + noficationsOthersCount + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + lld + one + et %lld autre + other + et %lld autres + + + notifications.label.mention %lld + + NSStringLocalizedFormatKey + %#@count@ + count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + lld + one + vous a mentionné + other + vous ont mentionné + + + notifications.label.follow %lld + + NSStringLocalizedFormatKey + %#@count@ + count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + lld + one + vous suit + other + vous suivent + + + notifications.label.reblog %lld + + NSStringLocalizedFormatKey + %#@count@ + count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + lld + one + a boosté + other + ont boosté + + + notifications.label.favorite %lld + + NSStringLocalizedFormatKey + %#@count@ + count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + lld + one + aime + other + aiment + + diff --git a/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings index 0a699ab8..e7ed1080 100644 --- a/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings @@ -260,12 +260,12 @@ "notifications.empty.title" = "Keine Benachrichtigungen"; "notifications.error.message" = "Beim Laden deiner Benachrichtigungen ist ein Fehler aufgetreten, bitte versuch es erneut."; "notifications.error.title" = "Ein Fehler ist aufgetreten"; -"notifications.label.favorite" = "hat favorisiert"; -"notifications.label.follow" = "folgt dir jetzt"; +"notifications.label.favorite %lld" = "hat favorisiert"; +"notifications.label.follow %lld" = "folgt dir jetzt"; "notifications.label.follow-request" = "möchte dir folgen"; -"notifications.label.mention" = "hat dich erwähnt"; +"notifications.label.mention %lld" = "hat dich erwähnt"; "notifications.label.poll" = "Umfrage beendet"; -"notifications.label.reblog" = "hat geboostet"; +"notifications.label.reblog %lld" = "hat geboostet"; "notifications.label.status" = "hat einen Beitrag gepostet"; "notifications.label.update" = "hat einen Beitrag geändert"; "notifications.menu-title.favorite" = "Favorit"; diff --git a/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings index e2f1a0e7..080d5e33 100644 --- a/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings @@ -258,12 +258,12 @@ "notifications.empty.title" = "No notifications"; "notifications.error.message" = "An error occurred while loading your notifications, please try again."; "notifications.error.title" = "An error occurred"; -"notifications.label.favorite" = "starred"; -"notifications.label.follow" = "followed you"; -"notifications.label.follow-request" = "requested to follow you"; -"notifications.label.mention" = "mentioned you"; +"notifications.label.favorite %lld" = "starred"; +"notifications.label.follow %lld" = "followed you"; +"notifications.label.mention %lld" = "mentioned you"; +"notifications.label.reblog %lld" = "boosted"; "notifications.label.poll" = "poll ended"; -"notifications.label.reblog" = "boosted"; +"notifications.label.follow-request" = "requested to follow you"; "notifications.label.status" = "posted a status"; "notifications.label.update" = "edited a post"; "notifications.menu-title.favorite" = "Favorite"; diff --git a/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings index 44aa3b5e..969e3c87 100644 --- a/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings @@ -258,12 +258,12 @@ "notifications.empty.title" = "No hay notificaciones"; "notifications.error.message" = "Ha ocurrido un error al cargar tus notificaciones, por favor vuelve a intentarlo."; "notifications.error.title" = "Ha ocurrido un error"; -"notifications.label.favorite" = "marcó como favorito"; -"notifications.label.follow" = "te siguió"; +"notifications.label.favorite %lld" = "marcó como favorito"; +"notifications.label.follow %lld" = "te siguió"; "notifications.label.follow-request" = "solicitó seguirte"; -"notifications.label.mention" = "te mencionó"; +"notifications.label.mention %lld" = "te mencionó"; "notifications.label.poll" = "terminó una encuesta"; -"notifications.label.reblog" = "retooteó"; +"notifications.label.reblog %lld" = "retooteó"; "notifications.label.status" = "publicó un estado"; "notifications.label.update" = "editó una publicación"; "notifications.menu-title.favorite" = "Favoritos"; diff --git a/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings index 4f1e9cd4..a5bb2c54 100644 --- a/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings @@ -258,12 +258,8 @@ "notifications.empty.title" = "Aucune notification"; "notifications.error.message" = "Une erreur s'est produite lors du chargement de vos notifications, veuillez réessayer."; "notifications.error.title" = "Une erreur s'est produite"; -"notifications.label.favorite" = "aime"; -"notifications.label.follow" = "vous suive"; "notifications.label.follow-request" = "a demandé à vous suivre"; -"notifications.label.mention" = "vous a mentionné"; "notifications.label.poll" = "sondage terminé"; -"notifications.label.reblog" = "boosté"; "notifications.label.status" = "a posté un statut"; "notifications.label.update" = "a modifié un post"; "notifications.menu-title.favorite" = "Favori"; @@ -347,7 +343,7 @@ "status.poll.frequency" = "Fréquence de sondage"; "status.poll.option-n %lld" = "Option %lld"; "status.post-from-%@" = "Publication de %@"; -"status.row.was-boosted" = "boostée"; +"status.row.was-boosted" = "a boosté"; "status.row.was-reply" = "Répondu à"; "status.row.you-boosted" = "Vous avez boosté"; "status.show-less" = "Afficher moins"; diff --git a/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings index 2d116263..421adcaa 100644 --- a/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings @@ -259,12 +259,12 @@ "notifications.empty.title" = "Nessuna notifica"; "notifications.error.message" = "Si è verificato un errore durante il caricamento delle notifiche, per favore riprova."; "notifications.error.title" = "Si è verificato un errore"; -"notifications.label.favorite" = "ha apprezzato il tuo post"; -"notifications.label.follow" = "ti segue"; +"notifications.label.favorite %lld" = "ha apprezzato il tuo post"; +"notifications.label.follow %lld" = "ti segue"; "notifications.label.follow-request" = "ha chiesto di seguirti"; -"notifications.label.mention" = "ti ha menzionato"; +"notifications.label.mention %lld" = "ti ha menzionato"; "notifications.label.poll" = "votazione conclusa"; -"notifications.label.reblog" = "ha condiviso"; +"notifications.label.reblog %lld" = "ha condiviso"; "notifications.label.status" = "ha pubblicato uno stato"; "notifications.label.update" = "ha modificato un post"; "notifications.menu-title.favorite" = "Preferiti"; diff --git a/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings index 023bf9c3..af08fcc7 100644 --- a/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings @@ -241,12 +241,12 @@ "notifications.empty.title" = "通知無し"; "notifications.error.message" = "通知の読み込み中にエラーが発生しました、もう一度試してください"; "notifications.error.title" = "エラーが発生しました"; -"notifications.label.favorite" = "お気に入り"; -"notifications.label.follow" = "フォローされました"; +"notifications.label.favorite %lld" = "お気に入り"; +"notifications.label.follow %lld" = "フォローされました"; "notifications.label.follow-request" = "フォローリクエストが届いています"; -"notifications.label.mention" = "あなたについて言及されています"; +"notifications.label.mention %lld" = "あなたについて言及されています"; "notifications.label.poll" = "投票終了"; -"notifications.label.reblog" = "ブーストしました"; +"notifications.label.reblog %lld" = "ブーストしました"; "notifications.label.status" = "投稿されたステータス"; "notifications.label.update" = "編集済み"; "notifications.menu-title.favorite" = "お気に入り"; diff --git a/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings index 58e785bf..90678c98 100644 --- a/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings @@ -258,12 +258,12 @@ "notifications.empty.title" = "Ingen varsler"; "notifications.error.message" = "Det oppsto en feil under innlasting av varslene dine. Prøv på nytt."; "notifications.error.title" = "En feil oppstod"; -"notifications.label.favorite" = "stjernet"; -"notifications.label.follow" = "fulgte deg"; +"notifications.label.favorite %lld" = "stjernet"; +"notifications.label.follow %lld" = "fulgte deg"; "notifications.label.follow-request" = "ba om å følge deg"; -"notifications.label.mention" = "nevnte deg"; +"notifications.label.mention %lld" = "nevnte deg"; "notifications.label.poll" = "avstemningen avsluttet"; -"notifications.label.reblog" = "forsterket"; +"notifications.label.reblog %lld" = "forsterket"; "notifications.label.status" = "har lagt ut en status"; "notifications.label.update" = "redigerte et innlegg"; "notifications.menu-title.favorite" = "Favoritt"; diff --git a/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings index 9d77bcb1..de29909a 100644 --- a/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings @@ -256,12 +256,12 @@ "notifications.empty.title" = "Geen notificaties"; "notifications.error.message" = "Er heeft zich een fout voorgedaan tijdens het laden van je notificaties. Probeer het nogmaals."; "notifications.error.title" = "Er heeft zich een fout voorgedaan"; -"notifications.label.favorite" = "gefavoriet"; -"notifications.label.follow" = "volgt jou"; +"notifications.label.favorite %lld" = "gefavoriet"; +"notifications.label.follow %lld" = "volgt jou"; "notifications.label.follow-request" = "wil je volgen"; -"notifications.label.mention" = "heeft jou vermeld"; +"notifications.label.mention %lld" = "heeft jou vermeld"; "notifications.label.poll" = "poll beëindigd"; -"notifications.label.reblog" = "boostte"; +"notifications.label.reblog %lld" = "boostte"; "notifications.label.status" = "nieuwe status"; "notifications.label.update" = "wijzigde een post"; "notifications.menu-title.favorite" = "Favoriet"; diff --git a/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings index da7c2c6a..f8cbd44d 100644 --- a/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings @@ -258,12 +258,12 @@ "notifications.empty.title" = "Brak powiadomień"; "notifications.error.message" = "Podczas ładowania powiadomień wystąpił błąd, proszę spróbować ponownie."; "notifications.error.title" = "Wystąpił błąd"; -"notifications.label.favorite" = "polubiony"; -"notifications.label.follow" = "obserwuje cię"; +"notifications.label.favorite %lld" = "polubiony"; +"notifications.label.follow %lld" = "obserwuje cię"; "notifications.label.follow-request" = "prosił(a) o obserwowanie cię"; -"notifications.label.mention" = "wymienił cię"; +"notifications.label.mention %lld" = "wymienił cię"; "notifications.label.poll" = "sondaż zakończony"; -"notifications.label.reblog" = "podbił"; +"notifications.label.reblog %lld" = "podbił"; "notifications.label.status" = "opublikował status"; "notifications.label.update" = "edytował(a) post"; "notifications.menu-title.favorite" = "Polubione"; diff --git a/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings index cbe3188c..b2969df8 100644 --- a/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings @@ -258,12 +258,12 @@ "notifications.empty.title" = "Sem notificações"; "notifications.error.message" = "Ocorreu um erro enquanto suas notificações eram carregadas, por favor, tente novamente."; "notifications.error.title" = "Ocorreu um erro"; -"notifications.label.favorite" = "favoritou"; -"notifications.label.follow" = "seguiu você"; +"notifications.label.favorite %lld" = "favoritou"; +"notifications.label.follow %lld" = "seguiu você"; "notifications.label.follow-request" = "pediu para te seguir"; -"notifications.label.mention" = "mencionou você"; +"notifications.label.mention %lld" = "mencionou você"; "notifications.label.poll" = "votação encerrada"; -"notifications.label.reblog" = "boosted"; +"notifications.label.reblog %lld" = "boosted"; "notifications.label.status" = "postou um status"; "notifications.label.update" = "editou uma postagem"; "notifications.menu-title.favorite" = "Favorito"; diff --git a/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings index 5be8eb46..c206da98 100644 --- a/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings @@ -240,12 +240,12 @@ "notifications.empty.title" = "Yeni bildirim yok"; "notifications.error.message" = "Bildirimlerinizi yüklerken bir hata oluştu, lütfen tekrar deneyin."; "notifications.error.title" = "Bir hata oluştu"; -"notifications.label.favorite" = "favorilendi"; -"notifications.label.follow" = "seni takip etti"; +"notifications.label.favorite %lld" = "favorilendi"; +"notifications.label.follow %lld" = "seni takip etti"; "notifications.label.follow-request" = "seni takip etmek istiyor"; -"notifications.label.mention" = "senden bahsetti"; +"notifications.label.mention %lld" = "senden bahsetti"; "notifications.label.poll" = "anket sona erdi"; -"notifications.label.reblog" = "yükseltildi"; +"notifications.label.reblog %lld" = "yükseltildi"; "notifications.label.status" = "bir durum paylaştı"; "notifications.label.update" = "bir gönderiyi düzenledi"; "notifications.menu-title.favorite" = "Favori"; diff --git a/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings index 40b2515b..b6755765 100644 --- a/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings @@ -258,12 +258,12 @@ "notifications.empty.title" = "没有更早的通知"; "notifications.error.message" = "加载通知时出错，请重试。"; "notifications.error.title" = "出现了一个错误"; -"notifications.label.favorite" = "星标"; -"notifications.label.follow" = "关注了你"; +"notifications.label.favorite %lld" = "星标"; +"notifications.label.follow %lld" = "关注了你"; "notifications.label.follow-request" = "关注申请"; -"notifications.label.mention" = "提及了你"; +"notifications.label.mention %lld" = "提及了你"; "notifications.label.poll" = "投票结束"; -"notifications.label.reblog" = "已转发"; +"notifications.label.reblog %lld" = "已转发"; "notifications.label.status" = "嘟嘟了一个状态"; "notifications.label.update" = "编辑了一个嘟文"; "notifications.menu-title.favorite" = "收藏"; diff --git a/Packages/Notifications/Sources/Notifications/NotificationRowView.swift b/Packages/Notifications/Sources/Notifications/NotificationRowView.swift index eaf6efa9..cc263912 100644 --- a/Packages/Notifications/Sources/Notifications/NotificationRowView.swift +++ b/Packages/Notifications/Sources/Notifications/NotificationRowView.swift @@ -86,7 +86,7 @@ struct NotificationRowView: View { .font(.scaledSubheadline) .fontWeight(.regular) : Text(" ")) + - Text(type.label()) + Text(type.label(count: notification.accounts.count)) .font(.scaledSubheadline) .fontWeight(.regular) + Text(" ⸱ ") diff --git a/Packages/Notifications/Sources/Notifications/NotificationTypeExt.swift b/Packages/Notifications/Sources/Notifications/NotificationTypeExt.swift index f84d7cea..a40a7209 100644 --- a/Packages/Notifications/Sources/Notifications/NotificationTypeExt.swift +++ b/Packages/Notifications/Sources/Notifications/NotificationTypeExt.swift @@ -2,20 +2,20 @@ import Models import SwiftUI extension Models.Notification.NotificationType { - func label() -> LocalizedStringKey { + func label(count: Int) -> LocalizedStringKey { switch self { case .status: return "notifications.label.status" case .mention: return "" case .reblog: - return "notifications.label.reblog" + return "notifications.label.reblog \(count)" case .follow: - return "notifications.label.follow" + return "notifications.label.follow \(count)" case .follow_request: return "notifications.label.follow-request" case .favourite: - return "notifications.label.favorite" + return "notifications.label.favorite \(count)" case .poll: return "notifications.label.poll" case .update: