mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-11-26 02:01:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' of https://github.com/Dimillian/IceCubesApp

Browse source
This commit is contained in:
Thomas Ricouard 2023-02-10 06:40:47 +01:00
commit 595e7b253b
10 changed files with 87 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
IceCubesActionExtension/eu.lproj/InfoPlist.strings
View file

@ -2,8 +2,8 @@
InfoPlist.strings InfoPlist.strings
IceCubesApp IceCubesApp
Created by Thomas Durand on 27/01/2023. Thomas Durand-ek 2023ko urtarrilaren 27an sortua.
*/ */
"CFBundleDisplayName" = "Open in Ice Cubes"; "CFBundleDisplayName" = "Ireki Ice Cubes-en";

4
IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file

@ -50,8 +50,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/kean/Nuke", "location" : "https://github.com/kean/Nuke",
"state" : { "state" : {
"revision" : "2e9337168d08acccf72c039bf9324be24a1cf7d7", "revision" : "67bd45931180f652159e3342575277a7f197b3ab",
"version" : "11.5.3" "version" : "11.6.2"
} }
}, },
{ {

2
IceCubesApp/App/Tabs/Settings/SettingsTab.swift
View file

@ -111,7 +111,7 @@ struct SettingsTabs: View {
Label("settings.general.remote-timelines", systemImage: "dot.radiowaves.right") Label("settings.general.remote-timelines", systemImage: "dot.radiowaves.right")
} }
NavigationLink(destination: ContentSettingsView()) { NavigationLink(destination: ContentSettingsView()) {
Label("settings.general.content", systemImage: "rectangle.fill.on.rectangle.fill") Label("settings.general.content", systemImage: "rectangle.on.rectangle")
} }
Link(destination: URL(string: UIApplication.openSettingsURLString)!) { Link(destination: URL(string: UIApplication.openSettingsURLString)!) {
Label("settings.system", systemImage: "gear") Label("settings.system", systemImage: "gear")

6
IceCubesApp/App/Tabs/Timeline/TimelineTab.swift
View file

@ -112,9 +112,8 @@ struct TimelineTab: View {
} }
} }
if !currentAccount.lists.isEmpty { if !currentAccount.lists.isEmpty {
let sortedLists = currentAccount.lists.sorted { $0.title.lowercased() < $1.title.lowercased() }
Menu("timeline.filter.lists") { Menu("timeline.filter.lists") {
ForEach(sortedLists) { list in ForEach(currentAccount.sortedLists) { list in
Button { Button {
timeline = .list(list: list) timeline = .list(list: list)
} label: { } label: {
@ -125,9 +124,8 @@ struct TimelineTab: View {
} }
if !currentAccount.tags.isEmpty { if !currentAccount.tags.isEmpty {
let sortedTags = currentAccount.tags.sorted { $0.name.lowercased() < $1.name.lowercased() }
Menu("timeline.filter.tags") { Menu("timeline.filter.tags") {
ForEach(sortedTags) { tag in ForEach(currentAccount.sortedTags) { tag in
Button { Button {
timeline = .hashtag(tag: tag.name, accountId: nil) timeline = .hashtag(tag: tag.name, accountId: nil)
} label: { } label: {

8
IceCubesApp/Resources/Localization/Plurals/eu.lproj/Localizable.stringsdict
View file

@ -13,9 +13,9 @@
<key>NSStringFormatValueTypeKey</key> <key>NSStringFormatValueTypeKey</key>
<string>lld</string> <string>lld</string>
<key>one</key> <key>one</key>
<string>%lld new post</string> <string>%bidalketa berri lld</string>
<key>other</key> <key>other</key>
<string>%lld new posts</string> <string>%lld bidalketa berri</string>
</dict> </dict>
</dict> </dict>
<key>notifications-others-count %lld</key> <key>notifications-others-count %lld</key>
@ -29,9 +29,9 @@
<key>NSStringFormatValueTypeKey</key> <key>NSStringFormatValueTypeKey</key>
<string>lld</string> <string>lld</string>
<key>one</key> <key>one</key>
<string> and %lld other </string> <string> eta beste %lld </string>
<key>other</key> <key>other</key>
<string> and %lld others </string> <string> eta beste %lld </string>
</dict> </dict>
</dict> </dict>
</dict> </dict>

111
IceCubesApp/Resources/Localization/eu.lproj/Localizable.strings
View file

@ -20,18 +20,18 @@
"account.add.sign-in" = "Hasi saioa"; "account.add.sign-in" = "Hasi saioa";
// MARK: Enums // MARK: Enums
"enum.avatar-position.leading" = "Leading"; "enum.avatar-position.leading" = "Alboan";
"enum.avatar-position.top" = "Corpusean"; "enum.avatar-position.top" = "Corpusean";
"enum.avatar-shape.circle" = "Biribila"; "enum.avatar-shape.circle" = "Biribila";
"enum.avatar-shape.rounded" = "Biribildutako ertzak"; "enum.avatar-shape.rounded" = "Biribildutako ertzak";
"enum.durations.infinite" = "infinitua"; "enum.durations.infinite" = "betiko";
"enum.durations.fiveMinutes" = "5 minutu"; "enum.durations.fiveMinutes" = "5 minutuz";
"enum.durations.thirtyMinutes" = "30 minutu"; "enum.durations.thirtyMinutes" = "30 minutuz";
"enum.durations.oneHour" = "Ordubete"; "enum.durations.oneHour" = "Ordubetez";
"enum.durations.sixHours" = "6 ordu"; "enum.durations.sixHours" = "6 orduz";
"enum.durations.oneDay" = "Egun 1"; "enum.durations.oneDay" = "Egun batez";
"enum.durations.threeDays" = "3 egun"; "enum.durations.threeDays" = "3 egunez";
"enum.durations.sevenDays" = "7 egun"; "enum.durations.sevenDays" = "7 egunez";
"enum.status-actions-display.all" = "Guztia"; "enum.status-actions-display.all" = "Guztia";
"enum.status-actions-display.no-buttons" = "Botoirik gabe"; "enum.status-actions-display.no-buttons" = "Botoirik gabe";
"enum.status-actions-display.only-buttons" = "Botoiak bakarrik"; "enum.status-actions-display.only-buttons" = "Botoiak bakarrik";
@ -63,13 +63,10 @@
"settings.account.add" = "Gehitu kontua"; "settings.account.add" = "Gehitu kontua";
"settings.app.icon" = "Aplikazioaren ikonoa"; "settings.app.icon" = "Aplikazioaren ikonoa";
"settings.app.icon.navigation-title" = "Ikonoak"; "settings.app.icon.navigation-title" = "Ikonoak";
"settings.app.source" = "Iturburu kodea (GitHub esteka)"; "settings.app.source" = "Iturburu kodea (GitHub-en)";
"settings.app.support" = "Eman babesa aplikazioari"; "settings.app.support" = "Eman babesa aplikazioari";
"settings.app.about" = "Honi buruz"; "settings.app.about" = "Honi buruz";
"settings.display.font" = "Denbora-lerroaren letra tipoa"; "settings.display.example-toot" = "Adibidea";
"settings.display.font.system" = "Sistemak darabilena";
"settings.display.font.custom" = "Norberak ezarritakoa";
"settings.display.font.scaling-%@" = "Letra tipoaren neurria: %@";
"settings.display.avatar.position" = "Avatarearen kokapena"; "settings.display.avatar.position" = "Avatarearen kokapena";
"settings.display.avatar.shape" = "Avatarearen itxura"; "settings.display.avatar.shape" = "Avatarearen itxura";
"settings.display.navigation-title" = "Pantaila ezarpenak"; "settings.display.navigation-title" = "Pantaila ezarpenak";
@ -82,11 +79,11 @@
"settings.display.translate-button" = "Erakutsi itzultzeko botoia"; "settings.display.translate-button" = "Erakutsi itzultzeko botoia";
"settings.display.theme.background" = "Hondoaren kolorea"; "settings.display.theme.background" = "Hondoaren kolorea";
"settings.display.theme.secondary-background" = "Bigarren mailako hondoaren kolorea"; "settings.display.theme.secondary-background" = "Bigarren mailako hondoaren kolorea";
"settings.display.theme.tint" = "Tonu kolorea"; "settings.display.theme.tint" = "Tonua";
"settings.display.theme.systemColor" = "Sistemak darabilena"; "settings.display.theme.systemColor" = "Sistemak darabilena";
"settings.general.browser" = "Nabigatzailea"; "settings.general.browser" = "Nabigatzailea";
"settings.general.browser.in-app" = "Barneko nabigatzailea"; "settings.general.browser.in-app" = "Barneko nabigatzailea";
"settings.general.browser.in-app.readerview" = "Barneko nabigatzailearen Irakurketa bista"; "settings.general.browser.in-app.readerview" = "Barneko nabigatzailearen irakurketa bista";
"settings.general.browser.system" = "Sistemaren nabigatzailea"; "settings.general.browser.system" = "Sistemaren nabigatzailea";
"settings.general.display" = "Pantaila ezarpenak"; "settings.general.display" = "Pantaila ezarpenak";
"settings.general.instance" = "Instantziaren informazioa"; "settings.general.instance" = "Instantziaren informazioa";
@ -101,23 +98,6 @@
"settings.push.navigation-title" = "Push jakinarazpenak"; "settings.push.navigation-title" = "Push jakinarazpenak";
"settings.push.new-posts" = "Bidalketa berriak"; "settings.push.new-posts" = "Bidalketa berriak";
"settings.push.polls" = "Bozketen emaitzak"; "settings.push.polls" = "Bozketen emaitzak";
"settings.general.content" = "Edukiaren ezarpenak";
"settings.system" = "Sistemaren ezarpenak";
"settings.content.boosts" = "Bultzadak";
"settings.content.navigation-title" = "Edukiaren ezarpenak";
"settings.content.use-instance-settings" = "Erabili zerbitzariko ezarpenak";
"settings.content.instance-settings" = "Zerbitzariko edukiaren ezarpenak";
"settings.content.main-toggle.description" = "Erabili zure instantziako ezarpenak";
"settings.content.hide-repeated-boosts" = "Ezkutatu errepikatutako bultzadak";
"settings.content.expand-spoilers" = "Erakutsi beti eduki hunkigarria";
"settings.content.expand-media" = "Multimedia erakusteko hobespenak";
"settings.content.default-sensitive" = "Markatu eduki guztia hunkigarri gisa";
"settings.content.default-visibility" = "Edukiaren irismena";
"settings.content.reading" = "Irakurtzen";
"settings.content.posting" = "Bidaltzen";
"enum.expand-media.show" = "Erakutsi guztia";
"enum.expand-media.hide" = "Ezkutatu guztia";
"enum.expand-media.hide-sensitive" = "Ezkutatu hunkigarria";
"settings.section.accounts" = "Kontuak"; "settings.section.accounts" = "Kontuak";
"settings.section.app" = "Aplikazioa"; "settings.section.app" = "Aplikazioa";
"settings.section.app.footer %@" = "Aplikazioaren bertsioa: %@"; "settings.section.app.footer %@" = "Aplikazioaren bertsioa: %@";
@ -125,7 +105,7 @@
"settings.support.alert.error.message" = "Errorea aplikazio barruko erosketa prozesatzean; saiatu berriro."; "settings.support.alert.error.message" = "Errorea aplikazio barruko erosketa prozesatzean; saiatu berriro.";
"settings.support.alert.message" = "Eskerrik asko eskupekoagatik! Izugarri eskertzen dizut!"; "settings.support.alert.message" = "Eskerrik asko eskupekoagatik! Izugarri eskertzen dizut!";
"settings.support.alert.title" = "Eskerrik asko!"; "settings.support.alert.title" = "Eskerrik asko!";
"settings.support.message-from-dev" = "Kaixo! Thomas dut izena eta izugarri gustatzen zait kode irekiko aplikazioak sortzea. Ice Cubes orain arte harroen egiten nauen proiektua da eta —ez gaitezen engainatu_ lan handiena behar duena ere bada Mastodon eta gizarte-sareen etengabeko aldaketen ondorioz. Ice Cubes erabiltzea gustoko baduzu, agian eskupekoren bat eman zeniezadake. Eguna poztuko didazu (eta aplikazioak arazorik gabe funtzionatzen jarraitzen lagunduko du). 🚀"; "settings.support.message-from-dev" = "Kaixo! Thomas dut izena eta izugarri gustatzen zait kode irekiko aplikazioak sortzea. Ice Cubes orain arte harroen egiten nauen proiektua da eta —ez gaitezen engainatu— lan handiena behar duena ere bada Mastodon eta gizarte-sareen etengabeko aldaketen ondorioz. Ice Cubes erabiltzea gustoko baduzu, agian eskupekoren bat eman zeniezadake. Eguna poztuko didazu (eta aplikazioak arazorik gabe funtzionatzen jarraitzen lagunduko du). 🚀";
"settings.support.navigation-title" = "Eman babesa Ice Cubes-i"; "settings.support.navigation-title" = "Eman babesa Ice Cubes-i";
"settings.support.one.subtitle" = "Txikia, baina moñoñoa, eta zapore goxoa du!"; "settings.support.one.subtitle" = "Txikia, baina moñoñoa, eta zapore goxoa du!";
"settings.support.one.title" = "🍬 Eskupeko txikia"; "settings.support.one.title" = "🍬 Eskupeko txikia";
@ -141,25 +121,49 @@
"settings.rate" = "Baloratu Ice Cubes"; "settings.rate" = "Baloratu Ice Cubes";
"settings.section.other" = "Besteak"; "settings.section.other" = "Besteak";
"settings.other.hide-openai" = "Gaitu 🤖 laguntzailea"; "settings.other.hide-openai" = "Gaitu 🤖 laguntzailea";
"settings.other.social-keyboard" = "Gaitu gizarte-teklatua"; "settings.other.social-keyboard" = "Gaitu teklatu soziala";
"settings.general.content" = "Edukiaren ezarpenak";
"settings.system" = "Sistemaren ezarpenak";
"settings.content.navigation-title" = "Edukiaren ezarpenak";
"settings.content.boosts" = "Bultzadak";
"settings.content.hide-repeated-boosts" = "Ezkutatu errepikatutako bultzadak";
"settings.content.instance-settings" = "Zerbitzariko edukiaren ezarpenak";
"settings.content.use-instance-settings" = "Erabili zerbitzariko ezarpenak";
"settings.content.expand-spoilers" = "Erakutsi beti eduki hunkigarria";
"settings.content.expand-media" = "Multimedia erakusteko hobespenak";
"settings.content.default-sensitive" = "Markatu eduki guztia hunkigarri gisa";
"settings.content.default-visibility" = "Edukiaren irismena";
"settings.content.reading" = "Irakurtzean";
"settings.content.posting" = "Bidaltzean";
"settings.push.duplicate.title" = "Bikoiztutako jakinarazpenen konpontzailea"; "settings.push.duplicate.title" = "Bikoiztutako jakinarazpenen konpontzailea";
"settings.push.duplicate.footer" = "Jakinarazpen bikoitzak jasotzen al dituzu? Sakatu botoi magikoa arazoa konpontzeko"; "settings.push.duplicate.footer" = "Jakinarazpen bikoitzak jasotzen al dituzu? Sakatu botoi magikoa arazoa konpontzeko";
"settings.push.duplicate.button.fix" = "🪄 Konpondu"; "settings.push.duplicate.button.fix" = "🪄 Konpondu";
"settings.other.autoplay-video" = "Abiarazi automatikoki bideoak"; "settings.other.autoplay-video" = "Abiarazi bideoak automatikoki";
"settings.display.font" = "Denbora-lerroaren letra tipoa";
"settings.display.font.system" = "Sistemak darabilena";
"settings.display.font.custom" = "Norberak ezarritakoa";
"settings.display.font.scaling-%@" = "Letra tipoaren neurria: %@";
"settings.about.built-with" = "Ice Cubes ondorengo iturburu irekiko softwarea erabiliz egin da:"; "settings.about.built-with" = "Ice Cubes ondorengo iturburu irekiko softwarea erabiliz egin da:";
"settings.about.title" = "Ice Cubes"; "settings.about.title" = "Ice Cubes";
"settings.account.cached-posts-%@" = "Bidalketak katxean: %@"; "settings.account.cached-posts-%@" = "Bidalketak katxean: %@";
"settings.account.action.delete-cache" = "Garbitu katxea"; "settings.account.action.delete-cache" = "Garbitu katxea";
"settings.general.haptic" = "Erreakzio haptikoak"; "settings.general.haptic" = "Erreakzio haptikoak";
"settings.haptic.navigation-title" = "Ezarpen aaptikoak"; "settings.haptic.navigation-title" = "Ezarpen haptikoak";
"settings.haptic.timeline" = "Denbora-lerroan"; "settings.haptic.timeline" = "Denbora-lerroan";
"settings.haptic.tab-selection" = "Fitxak hautatzean"; "settings.haptic.tab-selection" = "Fitxak hautatzean";
"settings.haptic.buttons" = "Botoiak sakatzean"; "settings.haptic.buttons" = "Botoiak sakatzean";
"settings.display.section.ipad" = "iPada"; "settings.display.section.phone" = "iPhone";
"settings.display.show-tab-label" = "Erakutsi fitxen izena";
"settings.display.section.ipad" = "iPad";
"settings.display.show-ipad-column" = "Gaitu bigarren zutabea"; "settings.display.show-ipad-column" = "Gaitu bigarren zutabea";
"enum.expand-media.show" = "Erakutsi guztia";
"enum.expand-media.hide" = "Ezkutatu guztia";
"enum.expand-media.hide-sensitive" = "Ezkutatu hunkigarria";
// MARK: Tabs // MARK: Tabs
"tab.explore" = "Esploratu"; "tab.explore" = "Esploratu";
"tab.federated" = "Federatua"; "tab.federated" = "Federatua";
@ -173,8 +177,9 @@
// MARK: Timeline // MARK: Timeline
"timeline.%@-is-valid" = "%@ baliozko instantzia da"; "timeline.%@-is-valid" = "%@ baliozko instantzia da";
"timeline.add-remote.title" = "Add remote local timeline"; "timeline.add-remote.title" = "Gehitu denbora-lerro lokal bat";
"timeline.add.action.add" = "Gehitu"; "timeline.add.action.add" = "Gehitu";
"timeline.add.url" = "Instantziaren URLa";
"timeline.filter.add-local" = "Gehitu denbora-lerro lokal bat"; "timeline.filter.add-local" = "Gehitu denbora-lerro lokal bat";
"timeline.filter.lists" = "Zerrendak"; "timeline.filter.lists" = "Zerrendak";
"timeline.filter.local" = "Denbora-lerro lokalak"; "timeline.filter.local" = "Denbora-lerro lokalak";
@ -196,15 +201,13 @@
"account.action.unblock" = "Utzi blokeatzeari"; "account.action.unblock" = "Utzi blokeatzeari";
"account.action.mute" = "Mututu"; "account.action.mute" = "Mututu";
"account.action.unmute" = "Utzi mututzeari"; "account.action.unmute" = "Utzi mututzeari";
"account.action.share" = "Share this account"; "account.action.share" = "Partekatu kontua";
"account.boosted-by" = "Honek bultzatua:"; "account.boosted-by" = "Hauek bultzatua:";
"account.detail.about" = "Honi buruz"; "account.detail.about" = "Honi buruz";
"account.detail.familiar-followers" = "Hauek ere jarraitzen dute:"; "account.detail.familiar-followers" = "Hauek ere jarraitzen dute:";
"account.detail.n-fields %lld" = "%lld eremuak"; "account.edit.about" = "Zure buruari buruz";
"account.detail.featured-tags-n-posts %lld" = "%lld bidalketak";
"account.edit.about" = "Honi buruz";
"account.edit.account-settings.bot" = "Bot kontua"; "account.edit.account-settings.bot" = "Bot kontua";
"account.edit.account-settings.discoverable" = "Discoverable"; "account.edit.account-settings.discoverable" = "Aurki zaitzakete";
"account.edit.account-settings.private" = "Pribatua"; "account.edit.account-settings.private" = "Pribatua";
"account.edit.account-settings.section-title" = "Kontuaren ezarpenak"; "account.edit.account-settings.section-title" = "Kontuaren ezarpenak";
"account.edit.display-name" = "Pantaila izena"; "account.edit.display-name" = "Pantaila izena";
@ -222,7 +225,7 @@
"account.follow-request.reject" = "Baztertu"; "account.follow-request.reject" = "Baztertu";
"account.follow-requests.pending-requests" = "Erabakitzeko eskaerak"; "account.follow-requests.pending-requests" = "Erabakitzeko eskaerak";
"account.follow-requests.instructions" = "Erabiltzaile horiek ez dituzte zure bidalketak ikusiko onartzen ez dituzun arte."; "account.follow-requests.instructions" = "Erabiltzaile horiek ez dituzte zure bidalketak ikusiko onartzen ez dituzun arte.";
"account.followers" = "Jarraitzaileak"; "account.followers" = "Jarraitzaile";
"account.following" = "Jarraitzen"; "account.following" = "Jarraitzen";
"account.list.create" = "Sortu zerrenda berria"; "account.list.create" = "Sortu zerrenda berria";
"account.list.create.confirm" = "Sortu zerrenda"; "account.list.create.confirm" = "Sortu zerrenda";
@ -230,10 +233,11 @@
"account.list.delete" = "Ezabatu zerrenda"; "account.list.delete" = "Ezabatu zerrenda";
"account.list.name" = "Zerrendaren izena"; "account.list.name" = "Zerrendaren izena";
"account.post.pinned" = "Finkatutako bidalketa"; "account.post.pinned" = "Finkatutako bidalketa";
"account.posts" = "Bidalketak"; "account.posts" = "Bidalketa";
"account.relation.follows-you" = "Jarraitzen dizu"; "account.relation.follows-you" = "Jarraitzen dizu";
"account.joined" = "Joined"; "account.joined" = "Bat egin zuen";
"account.action.logout" = "Itxi kontuko saioa"; "account.action.logout" = "Itxi kontuko saioa";
"account.action.edit-filters" = "Editatu iragazkiak";
// MARK: Package: Conversations // MARK: Package: Conversations
"conversations.action.delete" = "Ezabatu"; "conversations.action.delete" = "Ezabatu";
@ -283,7 +287,7 @@
"lists.create.confirm" = "Sortu zerrenda"; "lists.create.confirm" = "Sortu zerrenda";
"lists.edit.users-in-list" = "Zerrenda honetan dauden erabiltzaileak"; "lists.edit.users-in-list" = "Zerrenda honetan dauden erabiltzaileak";
"lists.name" = "Zerrendaren izena"; "lists.name" = "Zerrendaren izena";
"lists.name.message" = "Sartu zerrendaren izena"; "lists.name.message" = "Idatzi zerrendaren izena";
// MARK: Package: Notifications // MARK: Package: Notifications
"notifications.empty.message" = "Jakinarazpenak? Zer jakinarazpen? Jakinarazpenen zerrenda erabat hutsik duzu. Segi zoragarria izaten! 📱😎"; "notifications.empty.message" = "Jakinarazpenak? Zer jakinarazpen? Jakinarazpenen zerrenda erabat hutsik duzu. Segi zoragarria izaten! 📱😎";
@ -317,7 +321,6 @@
"timeline.local" = "Lokala"; "timeline.local" = "Lokala";
"timeline.n-recent-from-n-participants %lld %lld" = "%lld bidalketa berri %lld erabiltzailek eginak"; "timeline.n-recent-from-n-participants %lld %lld" = "%lld bidalketa berri %lld erabiltzailek eginak";
"timeline.trending" = "Joerak"; "timeline.trending" = "Joerak";
"timeline.add.url" = "Instantziaren URLa";
// MARK: Package: Status // MARK: Package: Status
"status.action.translate" = "Itzuli"; "status.action.translate" = "Itzuli";
@ -384,17 +387,18 @@
"status.poll.closes-in" = "Epemuga: "; "status.poll.closes-in" = "Epemuga: ";
"status.poll.duration" = "Bozketaren iraupena"; "status.poll.duration" = "Bozketaren iraupena";
"status.poll.frequency" = "Bozketaren maiztasuna"; "status.poll.frequency" = "Bozketaren maiztasuna";
"status.poll.option-n %lld" = "%lld aukera"; "status.poll.option-n %lld" = "%lld. aukera";
"status.poll.send" = "Bidali";
"status.post-from-%@" = "Bidali %@ kontutik"; "status.post-from-%@" = "Bidali %@ kontutik";
"status.row.was-boosted" = "(e)k bultzatua"; "status.row.was-boosted" = "(e)k bultzatua";
"status.row.was-reply" = "Honi erantzunez:"; "status.row.was-reply" = "Honi erantzunez:";
"status.row.you-boosted" = "Zuk bultzatua"; "status.row.you-boosted" = "Zuk bultzatua";
"status.show-less" = "Ikusi gutxiago"; "status.show-less" = "Ikusi gutxiago";
"status.show-more" = "Ikusi gehiago"; "status.show-more" = "Ikusi gehiago";
"status.summary.at-time" = " — "; "status.summary.at-time" = " • ";
"status.summary.edited-time" = "Azkenekoz editatua: "; "status.summary.edited-time" = "Azkenekoz editatua: ";
"status.summary.n-boosts %lld" = "%lld bultzada"; "status.summary.n-boosts %lld" = "%lld bultzada";
"status.summary.n-favorites %lld" = "%lld gogokotzat"; "status.summary.n-favorites %lld" = "%lld(e)k gogoko";
"status.visibility.direct" = "Aipatutakoak"; "status.visibility.direct" = "Aipatutakoak";
"status.visibility.follower" = "Jarraitzaileak"; "status.visibility.follower" = "Jarraitzaileak";
"status.visibility.public" = "Publikoa"; "status.visibility.public" = "Publikoa";
@ -408,7 +412,6 @@
"filter.edit.keywords.add" = "Gehitu hitz gako berria"; "filter.edit.keywords.add" = "Gehitu hitz gako berria";
"filter.edit.contexts" = "Iragazkiaren testuinguruak"; "filter.edit.contexts" = "Iragazkiaren testuinguruak";
"filter.edit.action" = "Iragazkiaren ekintzak"; "filter.edit.action" = "Iragazkiaren ekintzak";
"account.action.edit-filters" = "EEditatu iragazkiak";
"filter.contexts.home" = "Hasiera eta zerrendak"; "filter.contexts.home" = "Hasiera eta zerrendak";
"filter.contexts.notifications" = "Jakinarazpenak"; "filter.contexts.notifications" = "Jakinarazpenak";
"filter.contexts.public" = "Denbora-lerro lokalak"; "filter.contexts.public" = "Denbora-lerro lokalak";

12
IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings
View file

@ -66,7 +66,7 @@
"settings.app.source" = "源代码（GitHub 链接）"; "settings.app.source" = "源代码（GitHub 链接）";
"settings.app.support" = "支持本应用"; "settings.app.support" = "支持本应用";
"settings.app.about" = "关于"; "settings.app.about" = "关于";
"settings.display.example-toot" = "Example Post"; "settings.display.example-toot" = "样例嘟文";
"settings.display.avatar.position" = "头像位置"; "settings.display.avatar.position" = "头像位置";
"settings.display.avatar.shape" = "头像边框"; "settings.display.avatar.shape" = "头像边框";
"settings.display.navigation-title" = "显示设置"; "settings.display.navigation-title" = "显示设置";
@ -83,7 +83,7 @@
"settings.display.theme.systemColor" = "匹配系统"; "settings.display.theme.systemColor" = "匹配系统";
"settings.general.browser" = "默认浏览器"; "settings.general.browser" = "默认浏览器";
"settings.general.browser.in-app" = "应用内浏览器"; "settings.general.browser.in-app" = "应用内浏览器";
"settings.general.browser.in-app.readerview" = "应用内浏览器阅读器视图"; "settings.general.browser.in-app.readerview" = "应用内浏览器启用阅读器视图";
"settings.general.browser.system" = "系统浏览器"; "settings.general.browser.system" = "系统浏览器";
"settings.general.display" = "显示设置"; "settings.general.display" = "显示设置";
"settings.general.instance" = "服务器设置"; "settings.general.instance" = "服务器设置";
@ -158,7 +158,7 @@
"settings.display.font.scaling-%@" = "字体缩放：%@"; "settings.display.font.scaling-%@" = "字体缩放：%@";
"settings.display.section.phone" = "iPhone"; "settings.display.section.phone" = "iPhone";
"settings.display.show-tab-label" = "Show tab label"; "settings.display.show-tab-label" = "显示 Tab 标签";
"settings.display.section.ipad" = "iPad"; "settings.display.section.ipad" = "iPad";
"settings.display.show-ipad-column" = "启用边栏"; "settings.display.show-ipad-column" = "启用边栏";
@ -331,8 +331,8 @@
"status.action.boost" = "转发"; "status.action.boost" = "转发";
"status.action.copy-text" = "拷贝文本"; "status.action.copy-text" = "拷贝文本";
"status.action.delete" = "删除"; "status.action.delete" = "删除";
"status.action.delete.confirm.title" = "Confirm"; "status.action.delete.confirm.title" = "确定";
"status.action.delete.confirm.message" = "are you sure you want to delete this post?"; "status.action.delete.confirm.message" = "你确定要删除此嘟文吗？";
"status.action.edit" = "编辑"; "status.action.edit" = "编辑";
"status.action.favorite" = "收藏"; "status.action.favorite" = "收藏";
"status.action.mention" = "提及"; "status.action.mention" = "提及";
@ -389,7 +389,7 @@
"status.poll.duration" = "投票持续时间"; "status.poll.duration" = "投票持续时间";
"status.poll.frequency" = "投票频率"; "status.poll.frequency" = "投票频率";
"status.poll.option-n %lld" = "%lld 选项"; "status.poll.option-n %lld" = "%lld 选项";
"status.poll.send" = "Send Vote"; "status.poll.send" = "发送投票";
"status.post-from-%@" = "%@ 的嘟文"; "status.post-from-%@" = "%@ 的嘟文";
"status.row.was-boosted" = "转发"; "status.row.was-boosted" = "转发";
"status.row.was-reply" = "回复到"; "status.row.was-reply" = "回复到";

4
Packages/Account/Sources/Account/AccountDetailView.swift
View file

@ -264,7 +264,7 @@ public struct AccountDetailView: View {
private var tagsListView: some View { private var tagsListView: some View {
Group { Group {
ForEach(currentAccount.tags) { tag in ForEach(currentAccount.sortedTags) { tag in
HStack { HStack {
TagRowView(tag: tag) TagRowView(tag: tag)
Spacer() Spacer()
@ -280,7 +280,7 @@ public struct AccountDetailView: View {
private var listsListView: some View { private var listsListView: some View {
Group { Group {
ForEach(currentAccount.lists) { list in ForEach(currentAccount.sortedLists) { list in
NavigationLink(value: RouterDestinations.list(list: list)) { NavigationLink(value: RouterDestinations.list(list: list)) {
HStack { HStack {
Text(list.title) Text(list.title)

2
Packages/DesignSystem/Package.swift
View file

@ -19,7 +19,7 @@ let package = Package(
.package(name: "Models", path: "../Models"), .package(name: "Models", path: "../Models"),
.package(name: "Env", path: "../Env"), .package(name: "Env", path: "../Env"),
.package(url: "https://github.com/markiv/SwiftUI-Shimmer", exact: "1.1.0"), .package(url: "https://github.com/markiv/SwiftUI-Shimmer", exact: "1.1.0"),
.package(url: "https://github.com/kean/Nuke", from: "11.5.0"), .package(url: "https://github.com/kean/Nuke", from: "11.6.0"),
.package(url: "https://github.com/divadretlaw/EmojiText", from: "1.1.0"), .package(url: "https://github.com/divadretlaw/EmojiText", from: "1.1.0"),
], ],
targets: [ targets: [

8
Packages/Env/Sources/Env/CurrentAccount.swift
View file

@ -16,6 +16,14 @@ public class CurrentAccount: ObservableObject {
public static let shared = CurrentAccount() public static let shared = CurrentAccount()
public var sortedLists: [List] {
lists.sorted { $0.title.lowercased() < $1.title.lowercased() }
}
public var sortedTags: [Tag] {
tags.sorted { $0.name.lowercased() < $1.name.lowercased() }
}
private init() {} private init() {}
public func setClient(client: Client) { public func setClient(client: Client) {