Various fixes

This commit is contained in:
Thomas Ricouard 2023-02-05 09:13:28 +01:00
parent c9df421786
commit fedfa1f1c7
15 changed files with 23 additions and 2 deletions

View file

@ -303,6 +303,7 @@
"timeline.local" = "Local";
"timeline.n-recent-from-n-participants %lld %lld" = "%lld publicació recents de %lld participants";
"timeline.trending" = "Tendència";
"timeline.add.url" = "Instance URL";
// MARK: Package: Status
"status.action.translate" = "Tradueix";

View file

@ -221,7 +221,7 @@
"account.posts" = "Posts";
"account.relation.follows-you" = "Follows You";
"account.joined" = "Joined";
"account.action.logout" = "Logout account";
"account.action.logout" = "Log out account";
// MARK: Package: Conversations
"conversations.action.delete" = "Delete";
@ -305,6 +305,7 @@
"timeline.local" = "Local";
"timeline.n-recent-from-n-participants %lld %lld" = "%lld recent posts from %lld participants";
"timeline.trending" = "Trending";
"timeline.add.url" = "Instance URL";
// MARK: Package: Status
"status.action.translate" = "Translate";

View file

@ -305,6 +305,7 @@
"timeline.local" = "Local";
"timeline.n-recent-from-n-participants %lld %lld" = "%lld recent posts from %lld participants";
"timeline.trending" = "Trending";
"timeline.add.url" = "Instance URL";
// MARK: Package: Status
"status.action.translate" = "Translate";

View file

@ -305,6 +305,7 @@
"timeline.local" = "Local";
"timeline.n-recent-from-n-participants %lld %lld" = "%lld publicaciones recientes de %lld participantes";
"timeline.trending" = "Tendencia";
"timeline.add.url" = "Instance URL";
// MARK: Package: Status
"status.action.translate" = "Traducir";

View file

@ -300,6 +300,7 @@
"timeline.local" = "Local";
"timeline.n-recent-from-n-participants %lld %lld" = "%lld publications récentes de %lld participants";
"timeline.trending" = "Tendances";
"timeline.add.url" = "Instance URL";
// MARK: Package: Status
"status.action.translate" = "Traduire";

View file

@ -305,6 +305,7 @@
"timeline.local" = "Locale";
"timeline.n-recent-from-n-participants %lld %lld" = "%lld post recenti da %lld partecipanti";
"timeline.trending" = "Trending";
"timeline.add.url" = "Instance URL";
// MARK: Package: Status
"status.action.translate" = "Traduci";

View file

@ -304,6 +304,7 @@
"timeline.local" = "ローカル";
"timeline.n-recent-from-n-participants %lld %lld" = "%lld トゥートの投稿 %lld 人が投稿している";
"timeline.trending" = "トレンド";
"timeline.add.url" = "Instance URL";
// MARK: Package: Status
"status.action.translate" = "翻訳";

View file

@ -306,6 +306,7 @@
"timeline.local" = "로컬";
"timeline.n-recent-from-n-participants %lld %lld" = "%lld개의 최근 글 (%lld명의 사용자가 이야기 중)";
"timeline.trending" = "뜨고 있는";
"timeline.add.url" = "Instance URL";
// MARK: Package: Status
"status.action.translate" = "번역";

View file

@ -304,6 +304,7 @@
"timeline.local" = "Lokal";
"timeline.n-recent-from-n-participants %lld %lld" = "%lld nylige innlegg fra %lld deltakere";
"timeline.trending" = "Trender";
"timeline.add.url" = "Instance URL";
// MARK: Package: Status
"status.action.translate" = "Oversett";

View file

@ -298,6 +298,7 @@
"timeline.local" = "Lokaal";
"timeline.n-recent-from-n-participants %lld %lld" = "%lld recente posts van %lld deelnemers";
"timeline.trending" = "Trending";
"timeline.add.url" = "Instance URL";
// MARK: Package: Status
"status.action.translate" = "Vertaal";

View file

@ -304,6 +304,7 @@
"timeline.local" = "Linha local";
"timeline.n-recent-from-n-participants %lld %lld" = "%lld postagens recentes de %lld participantes";
"timeline.trending" = "Tendência";
"timeline.add.url" = "Instance URL";
// MARK: Package: Status
"status.action.translate" = "Traduzir";

View file

@ -300,6 +300,7 @@
"timeline.local" = "Yerel";
"timeline.n-recent-from-n-participants %lld %lld" = "%lld katılımcılar tarafından %lld yeni gönderiler";
"timeline.trending" = "Trending";
"timeline.add.url" = "Instance URL";
// MARK: Package: Status
"status.action.translate" = "Tercüme et";

View file

@ -305,6 +305,7 @@
"timeline.local" = "本地";
"timeline.n-recent-from-n-participants %lld %lld" = "最近 %lld 条嘟文来自 %lld 个参与者";
"timeline.trending" = "当下流行";
"timeline.add.url" = "Instance URL";
// MARK: Package: Status
"status.action.translate" = "翻译";

View file

@ -51,6 +51,10 @@ public struct AppAccountView: View {
}
} else {
ProgressView()
Text(viewModel.appAccount.accountName ?? viewModel.acct)
.font(.scaledSubheadline)
.foregroundColor(.gray)
.padding(.leading, 6)
}
VStack(alignment: .leading) {
if let account = viewModel.account {

View file

@ -11,7 +11,11 @@ public class AppAccountViewModel: ObservableObject {
@Published var account: Account?
var acct: String {
"@\(account?.acct ?? "...")@\(appAccount.server)"
if let acct = appAccount.accountName {
return acct
} else {
return "@\(account?.acct ?? "...")@\(appAccount.server)"
}
}
public init(appAccount: AppAccount, isCompact: Bool = false) {