diff --git a/.github/scripts/build-release.sh b/.github/scripts/build-release.sh index e3efc59df..069aa673e 100755 --- a/.github/scripts/build-release.sh +++ b/.github/scripts/build-release.sh @@ -36,6 +36,8 @@ BUILD_NUMBER=$(app-store-connect get-latest-testflight-build-number $ENV_APP_ID BUILD_NUMBER=$((BUILD_NUMBER+1)) CURRENT_PROJECT_VERSION=${BUILD_NUMBER:-0} +echo "GITHUB_TAG_NAME=build-$CURRENT_PROJECT_VERSION" >> $GITHUB_ENV + agvtool new-version -all $CURRENT_PROJECT_VERSION xcrun xcodebuild clean \ diff --git a/.github/workflows/develop-build.yml b/.github/workflows/develop-build.yml index c37f00731..ede061098 100644 --- a/.github/workflows/develop-build.yml +++ b/.github/workflows/develop-build.yml @@ -4,6 +4,7 @@ on: push: branches: - develop + - release* - ci-test jobs: @@ -11,16 +12,17 @@ jobs: name: Build runs-on: macOS-12 steps: - - name: checkout + - name: Checkout uses: actions/checkout@v2 - - name: setup + - name: Setup env: NotificationEndpointDebug: ${{ secrets.NotificationEndpointDebug }} NotificationEndpointRelease: ${{ secrets.NotificationEndpointRelease }} run: exec ./.github/scripts/setup.sh - - uses: actions/setup-python@v4 + - name: Install codemagic-cli-tools + uses: actions/setup-python@v4 with: python-version: '3.11' - run: | @@ -43,7 +45,7 @@ jobs: api-key-id: ${{ secrets.APPSTORE_KEY_ID }} api-private-key: ${{ secrets.APPSTORE_PRIVATE_KEY }} - - name: build + - name: Build env: ENV_APP_ID: ${{ secrets.APP_ID }} ENV_ISSUER_ID: ${{ secrets.APPSTORE_ISSUER_ID }} @@ -60,6 +62,12 @@ jobs: api-key-id: ${{ secrets.APPSTORE_KEY_ID }} api-private-key: ${{ secrets.APPSTORE_PRIVATE_KEY }} + - name: Tag commit + uses: tvdias/github-tagger@v0.0.1 + with: + repo-token: "${{ secrets.GITHUB_TOKEN }}" + tag: "${{ env.GITHUB_TAG_NAME }}" + - name: Clean up keychain and provisioning profile if: ${{ always() }} run: | diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 827276208..1c40b6556 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,6 +6,9 @@ on: - master - develop - feature/* + - feature-* + - issue/* + - issue-* pull_request: branches: - develop diff --git a/Documentation/How-it-works.md b/Documentation/How-it-works.md new file mode 100644 index 000000000..6b48159e5 --- /dev/null +++ b/Documentation/How-it-works.md @@ -0,0 +1,96 @@ +# How it works +The app is currently build for iOS and iPadOS. We use the MVVM architecture to construct the whole app. Some design detail may not be the best practice. And any suggestions for improvements are welcome. + +## Data +A typical status timeline fetches results from the database using a predicate that fetch the active account's entities. Then data source dequeues an item then configure the view. Likes many other MVVM applications. The app binds the Core Data entity to view via Combine publisher. Because the RunLoop dispatch drawing on the next loop. So we could return quickly. + +## Layout +A timeline has many posts and each post has many components. For example avatar, name, username, timestamp, content, media, toolbar and e.t.c. The app uses `AutoLayout` with `UIStackView` to place it and control whether it should hide or not. + +## Performance +Although it's easily loading timeline with hundreds of thousands of entities due to the Core Data fault mechanism. Some old devices may have slow performance when I/O bottleneck. There are three potential profile chances for entities: +- preload fulfill +- layout in background +- limit the data fetching + +## SwiftUI +Some view models already migrate to `@Published` annotated output. It's future-proof support for SwiftUI. There are some views already transformed to `SwiftUI` likes `MastodonRegisterView` and `ReportReasonView`. + +# Take it apart +## Targets +The app builds with those targets: + +- Mastodon: the app itself +- NotificationService: E2E push notification service +- ShareActionExtension: iOS share action +- MastodonIntent: Siri shortcuts + +## MastodonSDK +There is a self-hosted Swift Package that contains the common libraries to build this app. + +- CoreDataStack: Core Data model definition and util methods +- MastodonAsset: image and font assets +- MastodonCommon: store App Group ID +- MastodonCore: the logic for the app +- MastodonExtension: system API extension utility +- MastodonLocalization: i18n resources +- MastodonSDK: Mastodon API client +- MastodonUI: App UI components + +#### CoreDataStack +App uses Core Data as the backend to persist all entitles from the server. So the app has the capability to keep the timeline and notifications. Another reason for using a database is it makes the app could respond to entity changes between different sources. For example, a user could skim in the home timeline and then interact with the same post on other pages with favorite or reblog action. Core Data will handle the property modifications and notify the home timeline to update the view. + +To simplify the database operations. There is only one persistent store for all accounts. We use `domain` to identify entity for different servers (a.k.a instance). Do not mix the `domain` with the Mastodon remote server name. For example. The domain is `mastodon.online` whereever the post (e.g. post come from `mstdn.jp`) and friends from for the account sign in `mastodon.online`. Also, do not only rely on `id` because it has conflict potential between different `domain`. The unique predicate is `domain` + `id`. + +The app use "One stack, two context" setup. There is one main managed object context for UI displaying and another background managed context for entities creating and updating. We assert the background context performs in a queue. Also, the app could accept mulitple background context model. Then the flag `-com.apple.CoreData.ConcurrencyDebug 1` will be usful. + +###### How to create a new Entity +First, select the `CoreData.xcdatamodeld` file and in menu `Editor > Add Model Version…` to create a new version. Make sure active the new version in the inspect panel. e.g. `Model Version. Current > "Core Data 5"` + +Then use the `Add Entity` button create new Entity. +1. Give a name in data model inspect panel. +2. Also, set the `Module` to `CoreDataStack`. +3. Set the `Codegen` to `Manual/None`. We use `Sourery` generates the template code. +4. Create the `Entity.swift` file and declear the properties and relationships. + +###### How to add or remove property for Entity +We using the Core Data lightweight migration. Please check the rules detail [here](https://developer.apple.com/documentation/coredata/using_lightweight_migration). And keep in mind that we using two-way relationship. And a relationship could be one-to-one, one-to-many/many-to-one. + +Tip: + +Please check the `Soucery` and use that generates getter and setter for properties and relationships. It's could save you time. To take the benefit from the dynamic property. We can declare a raw value property and then use compute property to construct the struct we want (e.g. `Feed.acct`). Or control the primitive by hand and declare the mirror type for this value (e.g `Status.attachments`). + +###### How to persist the Entity +Please check the `Persistence+Status.swift`. We follow the pattern: migrate the old one if exists. Otherwise, create a new one. (Maybe some improvements could be adopted?) + +#### MastodonAsset +Sourcery powered assets package. + +#### MastodonCommon +Shared code for preference and configuration. + +### MastodonCore +The core logic to drive the app. + +#### MastodonExtension +Utility extension codes for SDK. + +#### MastodonLocalization +Sourcery powered i18n package. + +#### MastodonSDK +Mastodon API wrapper with Combine style API. + +#### MastodonUI +Mastodon app UI components. + +## NotificationService +Mastodon server accepts push notification register and we use the [toot-relay](https://github.com/DagAgren/toot-relay) to pass the server notifications to APNs. The message is E2E encrypted. The app will create an on-device private key for notification and save it into the keychain. + +When the push notification is incoming. iOS will spawn our NotificationService extension to handle the message. At that time the message is decrypted and displayed as a banner or in-app silent notification event when the app is in the foreground. All the notification count and deep-link logic are handled by the main app. + +## ShareActionExtension +The iOS Share Extension allows users to share links or media from other apps. The app uses the same implementation for the main app and the share extension. Then different is less available memoery for extension so maybe some memory bounded task could crash the app. (Plesae file the issue) + +## MastodonIntent +iOS Siri shortcut supports. It allows iOS directly publish posts via Shortcut without app launching. diff --git a/Documentation/Setup.md b/Documentation/Setup.md index ecb518a59..4da3c41ca 100644 --- a/Documentation/Setup.md +++ b/Documentation/Setup.md @@ -12,7 +12,7 @@ Install the latest version of Xcode from the App Store or Apple Developer Downlo This guide may not suit your machine and actually setup procedure may change in the future. Please file the issue or Pull Request if there are any problems. ## CocoaPods -The app use [CocoaPods]() and [Arkana](https://github.com/rogerluan/arkana). Ruby Gems are managed through Bundler. The M1 Mac needs virtual ruby env to workaround compatibility issues. +The app use [CocoaPods]() and [Arkana](https://github.com/rogerluan/arkana). Ruby Gems are managed through Bundler. The M1 Mac needs virtual ruby env to workaround compatibility issues. Make sure you have [Rosetta](https://support.apple.com/en-us/HT211861) installed if you are using the M1 Mac. #### Intel Mac diff --git a/Gemfile.lock b/Gemfile.lock index e0ed91c5b..15d02a8ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -100,7 +100,9 @@ GEM PLATFORMS arm64-darwin-21 + arm64-darwin-22 x86_64-darwin-21 + x86_64-darwin-22 DEPENDENCIES arkana diff --git a/Localization/Localizable.stringsdict b/Localization/Localizable.stringsdict index 051bb50ef..f8964ca5d 100644 --- a/Localization/Localizable.stringsdict +++ b/Localization/Localizable.stringsdict @@ -13,15 +13,15 @@ NSStringFormatValueTypeKey ld zero - no unread notification + no unread notifications one 1 unread notification few %ld unread notifications many - %ld unread notification + %ld unread notifications other - %ld unread notification + %ld unread notifications a11y.plural.count.input_limit_exceeds @@ -68,6 +68,28 @@ %ld characters + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + no characters + one + 1 character + few + %ld characters + many + %ld characters + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/Intents/input/cs.lproj/Intents.strings b/Localization/StringsConvertor/Intents/input/cs.lproj/Intents.strings index 6877490ba..6f29830a1 100644 --- a/Localization/StringsConvertor/Intents/input/cs.lproj/Intents.strings +++ b/Localization/StringsConvertor/Intents/input/cs.lproj/Intents.strings @@ -1,51 +1,51 @@ -"16wxgf" = "Post on Mastodon"; +"16wxgf" = "Příspěvek na Mastodon"; -"751xkl" = "Text Content"; +"751xkl" = "Textový obsah"; -"CsR7G2" = "Post on Mastodon"; +"CsR7G2" = "Příspěvek na Mastodon"; -"HZSGTr" = "What content to post?"; +"HZSGTr" = "Jaký obsah se má přidat?"; -"HdGikU" = "Posting failed"; +"HdGikU" = "Odeslání se nezdařilo"; -"KDNTJ4" = "Failure Reason"; +"KDNTJ4" = "Důvod selhání"; -"RHxKOw" = "Send Post with text content"; +"RHxKOw" = "Odeslat příspěvek s textovým obsahem"; -"RxSqsb" = "Post"; +"RxSqsb" = "Příspěvek"; -"WCIR3D" = "Post ${content} on Mastodon"; +"WCIR3D" = "Zveřejnit ${content} na Mastodon"; -"ZKJSNu" = "Post"; +"ZKJSNu" = "Příspěvek"; "ZS1XaK" = "${content}"; -"ZbSjzC" = "Visibility"; +"ZbSjzC" = "Viditelnost"; -"Zo4jgJ" = "Post Visibility"; +"Zo4jgJ" = "Viditelnost příspěvku"; -"apSxMG-dYQ5NN" = "There are ${count} options matching ‘Public’."; +"apSxMG-dYQ5NN" = "Existuje ${count} možností odpovídajících 'Veřejný'."; -"apSxMG-ehFLjY" = "There are ${count} options matching ‘Followers Only’."; +"apSxMG-ehFLjY" = "Existuje ${count} možností, které odpovídají „jen sledujícím“."; -"ayoYEb-dYQ5NN" = "${content}, Public"; +"ayoYEb-dYQ5NN" = "${content}, veřejné"; -"ayoYEb-ehFLjY" = "${content}, Followers Only"; +"ayoYEb-ehFLjY" = "${content}, pouze sledující"; -"dUyuGg" = "Post on Mastodon"; +"dUyuGg" = "Příspěvek na Mastodon"; -"dYQ5NN" = "Public"; +"dYQ5NN" = "Veřejný"; -"ehFLjY" = "Followers Only"; +"ehFLjY" = "Pouze sledující"; -"gfePDu" = "Posting failed. ${failureReason}"; +"gfePDu" = "Odeslání se nezdařilo. ${failureReason}"; -"k7dbKQ" = "Post was sent successfully."; +"k7dbKQ" = "Příspěvek byl úspěšně odeslán."; -"oGiqmY-dYQ5NN" = "Just to confirm, you wanted ‘Public’?"; +"oGiqmY-dYQ5NN" = "Jen pro kontrolu, chtěli jste „Veřejný“?"; -"oGiqmY-ehFLjY" = "Just to confirm, you wanted ‘Followers Only’?"; +"oGiqmY-ehFLjY" = "Jen pro kontrolu, chtěli jste „Pouze sledující“?"; "rM6dvp" = "URL"; -"ryJLwG" = "Post was sent successfully. "; +"ryJLwG" = "Příspěvek byl úspěšně odeslán. "; diff --git a/Localization/StringsConvertor/Intents/input/cs.lproj/Intents.stringsdict b/Localization/StringsConvertor/Intents/input/cs.lproj/Intents.stringsdict index a739f778f..deea8db12 100644 --- a/Localization/StringsConvertor/Intents/input/cs.lproj/Intents.stringsdict +++ b/Localization/StringsConvertor/Intents/input/cs.lproj/Intents.stringsdict @@ -5,7 +5,7 @@ There are ${count} options matching ‘${content}’. - 2 NSStringLocalizedFormatKey - There are %#@count_option@ matching ‘${content}’. + Existuje %#@count_option@ odpovídající „${content}“. count_option NSStringFormatSpecTypeKey diff --git a/Localization/StringsConvertor/Intents/input/is.lproj/Intents.strings b/Localization/StringsConvertor/Intents/input/is.lproj/Intents.strings new file mode 100644 index 000000000..196c33e70 --- /dev/null +++ b/Localization/StringsConvertor/Intents/input/is.lproj/Intents.strings @@ -0,0 +1,51 @@ +"16wxgf" = "Birta á Mastodon"; + +"751xkl" = "Efni texta"; + +"CsR7G2" = "Birta á Mastodon"; + +"HZSGTr" = "Hvaða efni á að birta?"; + +"HdGikU" = "Birting færslu mistókst"; + +"KDNTJ4" = "Ástæða bilunar"; + +"RHxKOw" = "Senda færslu með textaefni"; + +"RxSqsb" = "Færsla"; + +"WCIR3D" = "Birta ${content} á Mastodon"; + +"ZKJSNu" = "Færsla"; + +"ZS1XaK" = "${content}"; + +"ZbSjzC" = "Sýnileiki"; + +"Zo4jgJ" = "Sýnileiki færslu"; + +"apSxMG-dYQ5NN" = "Það eru ${count} valkostir sem samsvara ‘Opinbert’."; + +"apSxMG-ehFLjY" = "Það eru ${count} valkostir sem samsvara ‘Einungis fylgjendur’."; + +"ayoYEb-dYQ5NN" = "${content}, opinbert"; + +"ayoYEb-ehFLjY" = "${content}, einungis fylgjendur"; + +"dUyuGg" = "Birta á Mastodon"; + +"dYQ5NN" = "Opinbert"; + +"ehFLjY" = "Einungis fylgjendur"; + +"gfePDu" = "Birting færslu mistókst. ${failureReason}"; + +"k7dbKQ" = "Það tókst að senda færsluna."; + +"oGiqmY-dYQ5NN" = "Bara til að staðfesta, þú vildir 'Opinbert'?"; + +"oGiqmY-ehFLjY" = "Bara til að staðfesta, þú vildir ''Einungis fylgjendur'?"; + +"rM6dvp" = "URL-slóð"; + +"ryJLwG" = "Það tókst að senda færsluna. "; diff --git a/Localization/StringsConvertor/Intents/input/is.lproj/Intents.stringsdict b/Localization/StringsConvertor/Intents/input/is.lproj/Intents.stringsdict new file mode 100644 index 000000000..fe12c972a --- /dev/null +++ b/Localization/StringsConvertor/Intents/input/is.lproj/Intents.stringsdict @@ -0,0 +1,38 @@ + + + + + There are ${count} options matching ‘${content}’. - 2 + + NSStringLocalizedFormatKey + Það eru %#@count_option@ sem samsvara ‘${content}’. + count_option + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + %ld + one + 1 valkostur + other + %ld valkostir + + + There are ${count} options matching ‘${visibility}’. + + NSStringLocalizedFormatKey + Það eru %#@count_option@ sem samsvara ‘${visibility}’. + count_option + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + %ld + one + 1 valkostur + other + %ld valkostir + + + + diff --git a/Localization/StringsConvertor/Intents/input/kab.lproj/Intents.stringsdict b/Localization/StringsConvertor/Intents/input/kab.lproj/Intents.stringsdict index a8aeeaaf1..6cead6f34 100644 --- a/Localization/StringsConvertor/Intents/input/kab.lproj/Intents.stringsdict +++ b/Localization/StringsConvertor/Intents/input/kab.lproj/Intents.stringsdict @@ -29,9 +29,9 @@ NSStringFormatValueTypeKey %ld one - 1 uɣewwaṛ + %ld n uɣewwaṛ other - %ld iɣewwaṛen + %ld n iɣewwaṛen diff --git a/Localization/StringsConvertor/Intents/input/pt-BR.lproj/Intents.strings b/Localization/StringsConvertor/Intents/input/pt-BR.lproj/Intents.strings index 6877490ba..3e6806953 100644 --- a/Localization/StringsConvertor/Intents/input/pt-BR.lproj/Intents.strings +++ b/Localization/StringsConvertor/Intents/input/pt-BR.lproj/Intents.strings @@ -1,51 +1,51 @@ -"16wxgf" = "Post on Mastodon"; +"16wxgf" = "Postar no Mastodon"; -"751xkl" = "Text Content"; +"751xkl" = "Conteúdo do texto"; -"CsR7G2" = "Post on Mastodon"; +"CsR7G2" = "Postar no Mastodon"; -"HZSGTr" = "What content to post?"; +"HZSGTr" = "Qual conteúdo a publicar?"; -"HdGikU" = "Posting failed"; +"HdGikU" = "Falha na publicação"; -"KDNTJ4" = "Failure Reason"; +"KDNTJ4" = "Motivo da falha"; -"RHxKOw" = "Send Post with text content"; +"RHxKOw" = "Enviar postagem com conteúdo de texto"; -"RxSqsb" = "Post"; +"RxSqsb" = "Postagem"; -"WCIR3D" = "Post ${content} on Mastodon"; +"WCIR3D" = "Postar ${content} no Mastodon"; -"ZKJSNu" = "Post"; +"ZKJSNu" = "Postar"; "ZS1XaK" = "${content}"; -"ZbSjzC" = "Visibility"; +"ZbSjzC" = "Visibilidade"; -"Zo4jgJ" = "Post Visibility"; +"Zo4jgJ" = "Visibilidade da publicação"; -"apSxMG-dYQ5NN" = "There are ${count} options matching ‘Public’."; +"apSxMG-dYQ5NN" = "Existem ${count} opções correspondentes a ‘Público’."; -"apSxMG-ehFLjY" = "There are ${count} options matching ‘Followers Only’."; +"apSxMG-ehFLjY" = "Existem ${count} opções correspondentes a ‘Apenas para seguidores’."; -"ayoYEb-dYQ5NN" = "${content}, Public"; +"ayoYEb-dYQ5NN" = "${content}, Público"; -"ayoYEb-ehFLjY" = "${content}, Followers Only"; +"ayoYEb-ehFLjY" = "${content}, Apenas para seguidores"; -"dUyuGg" = "Post on Mastodon"; +"dUyuGg" = "Postar no Mastodon"; -"dYQ5NN" = "Public"; +"dYQ5NN" = "Público"; -"ehFLjY" = "Followers Only"; +"ehFLjY" = "Apenas para seguidores"; -"gfePDu" = "Posting failed. ${failureReason}"; +"gfePDu" = "Falha na publicação. ${failureReason}"; -"k7dbKQ" = "Post was sent successfully."; +"k7dbKQ" = "Publicação enviada com sucesso."; -"oGiqmY-dYQ5NN" = "Just to confirm, you wanted ‘Public’?"; +"oGiqmY-dYQ5NN" = "Só para confirmar, você queria ‘Público’?"; -"oGiqmY-ehFLjY" = "Just to confirm, you wanted ‘Followers Only’?"; +"oGiqmY-ehFLjY" = "Só para confirmar, você queria ‘Apenas para seguidores’?"; "rM6dvp" = "URL"; -"ryJLwG" = "Post was sent successfully. "; +"ryJLwG" = "Publicação enviada com sucesso. "; diff --git a/Localization/StringsConvertor/Intents/input/pt-BR.lproj/Intents.stringsdict b/Localization/StringsConvertor/Intents/input/pt-BR.lproj/Intents.stringsdict index 18422c772..a48559b4a 100644 --- a/Localization/StringsConvertor/Intents/input/pt-BR.lproj/Intents.stringsdict +++ b/Localization/StringsConvertor/Intents/input/pt-BR.lproj/Intents.stringsdict @@ -5,7 +5,7 @@ There are ${count} options matching ‘${content}’. - 2 NSStringLocalizedFormatKey - There are %#@count_option@ matching ‘${content}’. + Existem %#@count_option@ opções correspondentes a ‘${content}’. count_option NSStringFormatSpecTypeKey @@ -13,15 +13,15 @@ NSStringFormatValueTypeKey %ld one - 1 option + 1 opção other - %ld options + %ld opções There are ${count} options matching ‘${visibility}’. NSStringLocalizedFormatKey - There are %#@count_option@ matching ‘${visibility}’. + Existem %#@count_option@ opções correspondentes a ‘${visibility}’. count_option NSStringFormatSpecTypeKey @@ -29,9 +29,9 @@ NSStringFormatValueTypeKey %ld one - 1 option + 1 opção other - %ld options + %ld opções diff --git a/Localization/StringsConvertor/Sources/StringsConvertor/main.swift b/Localization/StringsConvertor/Sources/StringsConvertor/main.swift index 76dc722f6..665161e2c 100644 --- a/Localization/StringsConvertor/Sources/StringsConvertor/main.swift +++ b/Localization/StringsConvertor/Sources/StringsConvertor/main.swift @@ -47,11 +47,13 @@ private func convert(from inputDirectoryURL: URL, to outputDirectory: URL) { private func map(language: String) -> String? { switch language { + case "Base.lproj": return "Base" case "ar.lproj": return "ar" // Arabic case "eu.lproj": return "eu" // Basque case "ca.lproj": return "ca" // Catalan case "zh-Hans.lproj": return "zh-Hans" // Chinese Simplified case "zh-Hant.lproj": return "zh-Hant" // Chinese Traditional + case "cs.lproj": return "cs" // Czech case "nl.lproj": return "nl" // Dutch case "en.lproj": return "en" case "fi.lproj": return "fi" // Finnish @@ -64,6 +66,7 @@ private func map(language: String) -> String? { case "kmr.lproj": return "ku" // Kurmanji (Kurdish) [intent mapping] case "ru.lproj": return "ru" // Russian case "gd.lproj": return "gd" // Scottish Gaelic + case "sl.lproj": return "sl" // Slovenian case "ckb.lproj": return "ckb" // Sorani (Kurdish) case "es.lproj": return "es" // Spanish case "es_AR.lproj": return "es-AR" // Spanish, Argentina diff --git a/Localization/StringsConvertor/input/Base.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/Base.lproj/Localizable.stringsdict new file mode 100644 index 000000000..f8964ca5d --- /dev/null +++ b/Localization/StringsConvertor/input/Base.lproj/Localizable.stringsdict @@ -0,0 +1,631 @@ + + + + + a11y.plural.count.unread.notification + + NSStringLocalizedFormatKey + %#@notification_count_unread_notification@ + notification_count_unread_notification + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + no unread notifications + one + 1 unread notification + few + %ld unread notifications + many + %ld unread notifications + other + %ld unread notifications + + + a11y.plural.count.input_limit_exceeds + + NSStringLocalizedFormatKey + Input limit exceeds %#@character_count@ + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 characters + one + 1 character + few + %ld characters + many + %ld characters + other + %ld characters + + + a11y.plural.count.input_limit_remains + + NSStringLocalizedFormatKey + Input limit remains %#@character_count@ + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 characters + one + 1 character + few + %ld characters + many + %ld characters + other + %ld characters + + + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + no characters + one + 1 character + few + %ld characters + many + %ld characters + other + %ld characters + + + plural.count.followed_by_and_mutual + + NSStringLocalizedFormatKey + %#@names@%#@count_mutual@ + names + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + other + + + count_mutual + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + Followed by %1$@ + one + Followed by %1$@, and another mutual + few + Followed by %1$@, and %ld mutuals + many + Followed by %1$@, and %ld mutuals + other + Followed by %1$@, and %ld mutuals + + + plural.count.metric_formatted.post + + NSStringLocalizedFormatKey + %@ %#@post_count@ + post_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + posts + one + post + few + posts + many + posts + other + posts + + + plural.count.media + + NSStringLocalizedFormatKey + %#@media_count@ + media_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 media + one + 1 media + few + %ld media + many + %ld media + other + %ld media + + + plural.count.post + + NSStringLocalizedFormatKey + %#@post_count@ + post_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 posts + one + 1 post + few + %ld posts + many + %ld posts + other + %ld posts + + + plural.count.favorite + + NSStringLocalizedFormatKey + %#@favorite_count@ + favorite_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 favorites + one + 1 favorite + few + %ld favorites + many + %ld favorites + other + %ld favorites + + + plural.count.reblog + + NSStringLocalizedFormatKey + %#@reblog_count@ + reblog_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 reblogs + one + 1 reblog + few + %ld reblogs + many + %ld reblogs + other + %ld reblogs + + + plural.count.reply + + NSStringLocalizedFormatKey + %#@reply_count@ + reply_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 replies + one + 1 reply + few + %ld replies + many + %ld replies + other + %ld replies + + + plural.count.vote + + NSStringLocalizedFormatKey + %#@vote_count@ + vote_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 votes + one + 1 vote + few + %ld votes + many + %ld votes + other + %ld votes + + + plural.count.voter + + NSStringLocalizedFormatKey + %#@voter_count@ + voter_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 voters + one + 1 voter + few + %ld voters + many + %ld voters + other + %ld voters + + + plural.people_talking + + NSStringLocalizedFormatKey + %#@count_people_talking@ + count_people_talking + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 people talking + one + 1 people talking + few + %ld people talking + many + %ld people talking + other + %ld people talking + + + plural.count.following + + NSStringLocalizedFormatKey + %#@count_following@ + count_following + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 following + one + 1 following + few + %ld following + many + %ld following + other + %ld following + + + plural.count.follower + + NSStringLocalizedFormatKey + %#@count_follower@ + count_follower + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 followers + one + 1 follower + few + %ld followers + many + %ld followers + other + %ld followers + + + date.year.left + + NSStringLocalizedFormatKey + %#@count_year_left@ + count_year_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 years left + one + 1 year left + few + %ld years left + many + %ld years left + other + %ld years left + + + date.month.left + + NSStringLocalizedFormatKey + %#@count_month_left@ + count_month_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 months left + one + 1 months left + few + %ld months left + many + %ld months left + other + %ld months left + + + date.day.left + + NSStringLocalizedFormatKey + %#@count_day_left@ + count_day_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 days left + one + 1 day left + few + %ld days left + many + %ld days left + other + %ld days left + + + date.hour.left + + NSStringLocalizedFormatKey + %#@count_hour_left@ + count_hour_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 hours left + one + 1 hour left + few + %ld hours left + many + %ld hours left + other + %ld hours left + + + date.minute.left + + NSStringLocalizedFormatKey + %#@count_minute_left@ + count_minute_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 minutes left + one + 1 minute left + few + %ld minutes left + many + %ld minutes left + other + %ld minutes left + + + date.second.left + + NSStringLocalizedFormatKey + %#@count_second_left@ + count_second_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 seconds left + one + 1 second left + few + %ld seconds left + many + %ld seconds left + other + %ld seconds left + + + date.year.ago.abbr + + NSStringLocalizedFormatKey + %#@count_year_ago_abbr@ + count_year_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0y ago + one + 1y ago + few + %ldy ago + many + %ldy ago + other + %ldy ago + + + date.month.ago.abbr + + NSStringLocalizedFormatKey + %#@count_month_ago_abbr@ + count_month_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0M ago + one + 1M ago + few + %ldM ago + many + %ldM ago + other + %ldM ago + + + date.day.ago.abbr + + NSStringLocalizedFormatKey + %#@count_day_ago_abbr@ + count_day_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0d ago + one + 1d ago + few + %ldd ago + many + %ldd ago + other + %ldd ago + + + date.hour.ago.abbr + + NSStringLocalizedFormatKey + %#@count_hour_ago_abbr@ + count_hour_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0h ago + one + 1h ago + few + %ldh ago + many + %ldh ago + other + %ldh ago + + + date.minute.ago.abbr + + NSStringLocalizedFormatKey + %#@count_minute_ago_abbr@ + count_minute_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0m ago + one + 1m ago + few + %ldm ago + many + %ldm ago + other + %ldm ago + + + date.second.ago.abbr + + NSStringLocalizedFormatKey + %#@count_second_ago_abbr@ + count_second_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0s ago + one + 1s ago + few + %lds ago + many + %lds ago + other + %lds ago + + + + diff --git a/Localization/StringsConvertor/input/Base.lproj/app.json b/Localization/StringsConvertor/input/Base.lproj/app.json new file mode 100644 index 000000000..ea046bfbc --- /dev/null +++ b/Localization/StringsConvertor/input/Base.lproj/app.json @@ -0,0 +1,727 @@ +{ + "common": { + "alerts": { + "common": { + "please_try_again": "Please try again.", + "please_try_again_later": "Please try again later." + }, + "sign_up_failure": { + "title": "Sign Up Failure" + }, + "server_error": { + "title": "Server Error" + }, + "vote_failure": { + "title": "Vote Failure", + "poll_ended": "The poll has ended" + }, + "discard_post_content": { + "title": "Discard Draft", + "message": "Confirm to discard composed post content." + }, + "publish_post_failure": { + "title": "Publish Failure", + "message": "Failed to publish the post.\nPlease check your internet connection.", + "attachments_message": { + "video_attach_with_photo": "Cannot attach a video to a post that already contains images.", + "more_than_one_video": "Cannot attach more than one video." + } + }, + "edit_profile_failure": { + "title": "Edit Profile Error", + "message": "Cannot edit profile. Please try again." + }, + "sign_out": { + "title": "Sign Out", + "message": "Are you sure you want to sign out?", + "confirm": "Sign Out" + }, + "block_domain": { + "title": "Are you really, really sure you want to block the entire %s? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain and any of your followers from that domain will be removed.", + "block_entire_domain": "Block Domain" + }, + "save_photo_failure": { + "title": "Save Photo Failure", + "message": "Please enable the photo library access permission to save the photo." + }, + "delete_post": { + "title": "Delete Post", + "message": "Are you sure you want to delete this post?" + }, + "clean_cache": { + "title": "Clean Cache", + "message": "Successfully cleaned %s cache." + } + }, + "controls": { + "actions": { + "back": "Back", + "next": "Next", + "previous": "Previous", + "open": "Open", + "add": "Add", + "remove": "Remove", + "edit": "Edit", + "save": "Save", + "ok": "OK", + "done": "Done", + "confirm": "Confirm", + "continue": "Continue", + "compose": "Compose", + "cancel": "Cancel", + "discard": "Discard", + "try_again": "Try Again", + "take_photo": "Take Photo", + "save_photo": "Save Photo", + "copy_photo": "Copy Photo", + "sign_in": "Log in", + "sign_up": "Create account", + "see_more": "See More", + "preview": "Preview", + "share": "Share", + "share_user": "Share %s", + "share_post": "Share Post", + "open_in_safari": "Open in Safari", + "open_in_browser": "Open in Browser", + "find_people": "Find people to follow", + "manually_search": "Manually search instead", + "skip": "Skip", + "reply": "Reply", + "report_user": "Report %s", + "block_domain": "Block %s", + "unblock_domain": "Unblock %s", + "settings": "Settings", + "delete": "Delete" + }, + "tabs": { + "home": "Home", + "search": "Search", + "notifications": "Notifications", + "profile": "Profile" + }, + "keyboard": { + "common": { + "switch_to_tab": "Switch to %s", + "compose_new_post": "Compose New Post", + "show_favorites": "Show Favorites", + "open_settings": "Open Settings" + }, + "timeline": { + "previous_status": "Previous Post", + "next_status": "Next Post", + "open_status": "Open Post", + "open_author_profile": "Open Author's Profile", + "open_reblogger_profile": "Open Reblogger's Profile", + "reply_status": "Reply to Post", + "toggle_reblog": "Toggle Reblog on Post", + "toggle_favorite": "Toggle Favorite on Post", + "toggle_content_warning": "Toggle Content Warning", + "preview_image": "Preview Image" + }, + "segmented_control": { + "previous_section": "Previous Section", + "next_section": "Next Section" + } + }, + "status": { + "user_reblogged": "%s reblogged", + "user_replied_to": "Replied to %s", + "show_post": "Show Post", + "show_user_profile": "Show user profile", + "content_warning": "Content Warning", + "sensitive_content": "Sensitive Content", + "media_content_warning": "Tap anywhere to reveal", + "tap_to_reveal": "Tap to reveal", + "poll": { + "vote": "Vote", + "closed": "Closed" + }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Show Profile: %s", + "email": "Email address: %s" + }, + "actions": { + "reply": "Reply", + "reblog": "Reblog", + "unreblog": "Undo reblog", + "favorite": "Favorite", + "unfavorite": "Unfavorite", + "menu": "Menu", + "hide": "Hide", + "show_image": "Show image", + "show_gif": "Show GIF", + "show_video_player": "Show video player", + "tap_then_hold_to_show_menu": "Tap then hold to show menu" + }, + "tag": { + "url": "URL", + "mention": "Mention", + "link": "Link", + "hashtag": "Hashtag", + "email": "Email", + "emoji": "Emoji" + }, + "visibility": { + "unlisted": "Everyone can see this post but not display in the public timeline.", + "private": "Only their followers can see this post.", + "private_from_me": "Only my followers can see this post.", + "direct": "Only mentioned user can see this post." + } + }, + "friendship": { + "follow": "Follow", + "following": "Following", + "request": "Request", + "pending": "Pending", + "block": "Block", + "block_user": "Block %s", + "block_domain": "Block %s", + "unblock": "Unblock", + "unblock_user": "Unblock %s", + "blocked": "Blocked", + "mute": "Mute", + "mute_user": "Mute %s", + "unmute": "Unmute", + "unmute_user": "Unmute %s", + "muted": "Muted", + "edit_info": "Edit Info", + "show_reblogs": "Show Reblogs", + "hide_reblogs": "Hide Reblogs" + }, + "timeline": { + "filtered": "Filtered", + "timestamp": { + "now": "Now" + }, + "loader": { + "load_missing_posts": "Load missing posts", + "loading_missing_posts": "Loading missing posts...", + "show_more_replies": "Show more replies" + }, + "header": { + "no_status_found": "No Post Found", + "blocking_warning": "You can’t view this user's profile\nuntil you unblock them.\nYour profile looks like this to them.", + "user_blocking_warning": "You can’t view %s’s profile\nuntil you unblock them.\nYour profile looks like this to them.", + "blocked_warning": "You can’t view this user’s profile\nuntil they unblock you.", + "user_blocked_warning": "You can’t view %s’s profile\nuntil they unblock you.", + "suspended_warning": "This user has been suspended.", + "user_suspended_warning": "%s’s account has been suspended." + } + } + } + }, + "scene": { + "welcome": { + "slogan": "Social networking\nback in your hands.", + "get_started": "Get Started", + "log_in": "Log In" + }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, + "server_picker": { + "title": "Mastodon is made of users in different servers.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", + "button": { + "category": { + "all": "All", + "all_accessiblity_description": "Category: All", + "academia": "academia", + "activism": "activism", + "food": "food", + "furry": "furry", + "games": "games", + "general": "general", + "journalism": "journalism", + "lgbt": "lgbt", + "regional": "regional", + "art": "art", + "music": "music", + "tech": "tech" + }, + "see_less": "See Less", + "see_more": "See More" + }, + "label": { + "language": "LANGUAGE", + "users": "USERS", + "category": "CATEGORY" + }, + "input": { + "search_servers_or_enter_url": "Search communities or enter URL" + }, + "empty_state": { + "finding_servers": "Finding available servers...", + "bad_network": "Something went wrong while loading the data. Check your internet connection.", + "no_results": "No results" + } + }, + "register": { + "title": "Let’s get you set up on %s", + "lets_get_you_set_up_on_domain": "Let’s get you set up on %s", + "input": { + "avatar": { + "delete": "Delete" + }, + "username": { + "placeholder": "username", + "duplicate_prompt": "This username is taken." + }, + "display_name": { + "placeholder": "display name" + }, + "email": { + "placeholder": "email" + }, + "password": { + "placeholder": "password", + "require": "Your password needs at least:", + "character_limit": "8 characters", + "accessibility": { + "checked": "checked", + "unchecked": "unchecked" + }, + "hint": "Your password needs at least eight characters" + }, + "invite": { + "registration_user_invite_request": "Why do you want to join?" + } + }, + "error": { + "item": { + "username": "Username", + "email": "Email", + "password": "Password", + "agreement": "Agreement", + "locale": "Locale", + "reason": "Reason" + }, + "reason": { + "blocked": "%s contains a disallowed email provider", + "unreachable": "%s does not seem to exist", + "taken": "%s is already in use", + "reserved": "%s is a reserved keyword", + "accepted": "%s must be accepted", + "blank": "%s is required", + "invalid": "%s is invalid", + "too_long": "%s is too long", + "too_short": "%s is too short", + "inclusion": "%s is not a supported value" + }, + "special": { + "username_invalid": "Username must only contain alphanumeric characters and underscores", + "username_too_long": "Username is too long (can’t be longer than 30 characters)", + "email_invalid": "This is not a valid email address", + "password_too_short": "Password is too short (must be at least 8 characters)" + } + } + }, + "server_rules": { + "title": "Some ground rules.", + "subtitle": "These are set and enforced by the %s moderators.", + "prompt": "By continuing, you’re subject to the terms of service and privacy policy for %s.", + "terms_of_service": "terms of service", + "privacy_policy": "privacy policy", + "button": { + "confirm": "I Agree" + } + }, + "confirm_email": { + "title": "One last thing.", + "subtitle": "Tap the link we emailed to you to verify your account.", + "tap_the_link_we_emailed_to_you_to_verify_your_account": "Tap the link we emailed to you to verify your account", + "button": { + "open_email_app": "Open Email App", + "resend": "Resend" + }, + "dont_receive_email": { + "title": "Check your email", + "description": "Check if your email address is correct as well as your junk folder if you haven’t.", + "resend_email": "Resend Email" + }, + "open_email_app": { + "title": "Check your inbox.", + "description": "We just sent you an email. Check your junk folder if you haven’t.", + "mail": "Mail", + "open_email_client": "Open Email Client" + } + }, + "home_timeline": { + "title": "Home", + "navigation_bar_state": { + "offline": "Offline", + "new_posts": "See new posts", + "published": "Published!", + "Publishing": "Publishing post...", + "accessibility": { + "logo_label": "Logo Button", + "logo_hint": "Tap to scroll to top and tap again to previous location" + } + } + }, + "suggestion_account": { + "title": "Find People to Follow", + "follow_explain": "When you follow someone, you’ll see their posts in your home feed." + }, + "compose": { + "title": { + "new_post": "New Post", + "new_reply": "New Reply" + }, + "media_selection": { + "camera": "Take Photo", + "photo_library": "Photo Library", + "browse": "Browse" + }, + "content_input_placeholder": "Type or paste what’s on your mind", + "compose_action": "Publish", + "replying_to_user": "replying to %s", + "attachment": { + "photo": "photo", + "video": "video", + "attachment_broken": "This %s is broken and can’t be\nuploaded to Mastodon.", + "description_photo": "Describe the photo for the visually-impaired...", + "description_video": "Describe the video for the visually-impaired...", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." + }, + "poll": { + "duration_time": "Duration: %s", + "thirty_minutes": "30 minutes", + "one_hour": "1 Hour", + "six_hours": "6 Hours", + "one_day": "1 Day", + "three_days": "3 Days", + "seven_days": "7 Days", + "option_number": "Option %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" + }, + "content_warning": { + "placeholder": "Write an accurate warning here..." + }, + "visibility": { + "public": "Public", + "unlisted": "Unlisted", + "private": "Followers only", + "direct": "Only people I mention" + }, + "auto_complete": { + "space_to_add": "Space to add" + }, + "accessibility": { + "append_attachment": "Add Attachment", + "append_poll": "Add Poll", + "remove_poll": "Remove Poll", + "custom_emoji_picker": "Custom Emoji Picker", + "enable_content_warning": "Enable Content Warning", + "disable_content_warning": "Disable Content Warning", + "post_visibility_menu": "Post Visibility Menu", + "post_options": "Post Options", + "posting_as": "Posting as %s" + }, + "keyboard": { + "discard_post": "Discard Post", + "publish_post": "Publish Post", + "toggle_poll": "Toggle Poll", + "toggle_content_warning": "Toggle Content Warning", + "append_attachment_entry": "Add Attachment - %s", + "select_visibility_entry": "Select Visibility - %s" + } + }, + "profile": { + "header": { + "follows_you": "Follows You" + }, + "dashboard": { + "posts": "posts", + "following": "following", + "followers": "followers" + }, + "fields": { + "add_row": "Add Row", + "placeholder": { + "label": "Label", + "content": "Content" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" + } + }, + "segmented_control": { + "posts": "Posts", + "replies": "Replies", + "posts_and_replies": "Posts and Replies", + "media": "Media", + "about": "About" + }, + "relationship_action_alert": { + "confirm_mute_user": { + "title": "Mute Account", + "message": "Confirm to mute %s" + }, + "confirm_unmute_user": { + "title": "Unmute Account", + "message": "Confirm to unmute %s" + }, + "confirm_block_user": { + "title": "Block Account", + "message": "Confirm to block %s" + }, + "confirm_unblock_user": { + "title": "Unblock Account", + "message": "Confirm to unblock %s" + }, + "confirm_show_reblogs": { + "title": "Show Reblogs", + "message": "Confirm to show reblogs" + }, + "confirm_hide_reblogs": { + "title": "Hide Reblogs", + "message": "Confirm to hide reblogs" + } + }, + "accessibility": { + "show_avatar_image": "Show avatar image", + "edit_avatar_image": "Edit avatar image", + "show_banner_image": "Show banner image", + "double_tap_to_open_the_list": "Double tap to open the list" + } + }, + "follower": { + "title": "follower", + "footer": "Followers from other servers are not displayed." + }, + "following": { + "title": "following", + "footer": "Follows from other servers are not displayed." + }, + "familiarFollowers": { + "title": "Followers you familiar", + "followed_by_names": "Followed by %s" + }, + "favorited_by": { + "title": "Favorited By" + }, + "reblogged_by": { + "title": "Reblogged By" + }, + "search": { + "title": "Search", + "search_bar": { + "placeholder": "Search hashtags and users", + "cancel": "Cancel" + }, + "recommend": { + "button_text": "See All", + "hash_tag": { + "title": "Trending on Mastodon", + "description": "Hashtags that are getting quite a bit of attention", + "people_talking": "%s people are talking" + }, + "accounts": { + "title": "Accounts you might like", + "description": "You may like to follow these accounts", + "follow": "Follow" + } + }, + "searching": { + "segment": { + "all": "All", + "people": "People", + "hashtags": "Hashtags", + "posts": "Posts" + }, + "empty_state": { + "no_results": "No results" + }, + "recent_search": "Recent searches", + "clear": "Clear" + } + }, + "discovery": { + "tabs": { + "posts": "Posts", + "hashtags": "Hashtags", + "news": "News", + "community": "Community", + "for_you": "For You" + }, + "intro": "These are the posts gaining traction in your corner of Mastodon." + }, + "favorite": { + "title": "Your Favorites" + }, + "notification": { + "title": { + "Everything": "Everything", + "Mentions": "Mentions" + }, + "notification_description": { + "followed_you": "followed you", + "favorited_your_post": "favorited your post", + "reblogged_your_post": "reblogged your post", + "mentioned_you": "mentioned you", + "request_to_follow_you": "request to follow you", + "poll_has_ended": "poll has ended" + }, + "keyobard": { + "show_everything": "Show Everything", + "show_mentions": "Show Mentions" + }, + "follow_request": { + "accept": "Accept", + "accepted": "Accepted", + "reject": "reject", + "rejected": "Rejected" + } + }, + "thread": { + "back_title": "Post", + "title": "Post from %s" + }, + "settings": { + "title": "Settings", + "section": { + "appearance": { + "title": "Appearance", + "automatic": "Automatic", + "light": "Always Light", + "dark": "Always Dark" + }, + "look_and_feel": { + "title": "Look and Feel", + "use_system": "Use System", + "really_dark": "Really Dark", + "sorta_dark": "Sorta Dark", + "light": "Light" + }, + "notifications": { + "title": "Notifications", + "favorites": "Favorites my post", + "follows": "Follows me", + "boosts": "Reblogs my post", + "mentions": "Mentions me", + "trigger": { + "anyone": "anyone", + "follower": "a follower", + "follow": "anyone I follow", + "noone": "no one", + "title": "Notify me when" + } + }, + "preference": { + "title": "Preferences", + "true_black_dark_mode": "True black dark mode", + "disable_avatar_animation": "Disable animated avatars", + "disable_emoji_animation": "Disable animated emojis", + "using_default_browser": "Use default browser to open links", + "open_links_in_mastodon": "Open links in Mastodon" + }, + "boring_zone": { + "title": "The Boring Zone", + "account_settings": "Account Settings", + "terms": "Terms of Service", + "privacy": "Privacy Policy" + }, + "spicy_zone": { + "title": "The Spicy Zone", + "clear": "Clear Media Cache", + "signout": "Sign Out" + } + }, + "footer": { + "mastodon_description": "Mastodon is open source software. You can report issues on GitHub at %s (%s)" + }, + "keyboard": { + "close_settings_window": "Close Settings Window" + } + }, + "report": { + "title_report": "Report", + "title": "Report %s", + "step1": "Step 1 of 2", + "step2": "Step 2 of 2", + "content1": "Are there any other posts you’d like to add to the report?", + "content2": "Is there anything the moderators should know about this report?", + "report_sent_title": "Thanks for reporting, we’ll look into this.", + "send": "Send Report", + "skip_to_send": "Send without comment", + "text_placeholder": "Type or paste additional comments", + "reported": "REPORTED", + "step_one": { + "step_1_of_4": "Step 1 of 4", + "whats_wrong_with_this_post": "What's wrong with this post?", + "whats_wrong_with_this_account": "What's wrong with this account?", + "whats_wrong_with_this_username": "What's wrong with %s?", + "select_the_best_match": "Select the best match", + "i_dont_like_it": "I don’t like it", + "it_is_not_something_you_want_to_see": "It is not something you want to see", + "its_spam": "It’s spam", + "malicious_links_fake_engagement_or_repetetive_replies": "Malicious links, fake engagement, or repetetive replies", + "it_violates_server_rules": "It violates server rules", + "you_are_aware_that_it_breaks_specific_rules": "You are aware that it breaks specific rules", + "its_something_else": "It’s something else", + "the_issue_does_not_fit_into_other_categories": "The issue does not fit into other categories" + }, + "step_two": { + "step_2_of_4": "Step 2 of 4", + "which_rules_are_being_violated": "Which rules are being violated?", + "select_all_that_apply": "Select all that apply", + "i_just_don’t_like_it": "I just don’t like it" + }, + "step_three": { + "step_3_of_4": "Step 3 of 4", + "are_there_any_posts_that_back_up_this_report": "Are there any posts that back up this report?", + "select_all_that_apply": "Select all that apply" + }, + "step_four": { + "step_4_of_4": "Step 4 of 4", + "is_there_anything_else_we_should_know": "Is there anything else we should know?" + }, + "step_final": { + "dont_want_to_see_this": "Don’t want to see this?", + "when_you_see_something_you_dont_like_on_mastodon_you_can_remove_the_person_from_your_experience.": "When you see something you don’t like on Mastodon, you can remove the person from your experience.", + "unfollow": "Unfollow", + "unfollowed": "Unfollowed", + "unfollow_user": "Unfollow %s", + "mute_user": "Mute %s", + "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "You won’t see their posts or reblogs in your home feed. They won’t know they’ve been muted.", + "block_user": "Block %s", + "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked.", + "while_we_review_this_you_can_take_action_against_user": "While we review this, you can take action against %s" + } + }, + "preview": { + "keyboard": { + "close_preview": "Close Preview", + "show_next": "Show Next", + "show_previous": "Show Previous" + } + }, + "account_list": { + "tab_bar_hint": "Current selected profile: %s. Double tap then hold to show account switcher", + "dismiss_account_switcher": "Dismiss Account Switcher", + "add_account": "Add Account" + }, + "wizard": { + "new_in_mastodon": "New in Mastodon", + "multiple_account_switch_intro_description": "Switch between multiple accounts by holding the profile button.", + "accessibility_hint": "Double tap to dismiss this wizard" + }, + "bookmark": { + "title": "Bookmarks" + } + } +} diff --git a/Localization/StringsConvertor/input/Base.lproj/ios-infoPlist.json b/Localization/StringsConvertor/input/Base.lproj/ios-infoPlist.json new file mode 100644 index 000000000..c6db73de0 --- /dev/null +++ b/Localization/StringsConvertor/input/Base.lproj/ios-infoPlist.json @@ -0,0 +1,6 @@ +{ + "NSCameraUsageDescription": "Used to take photo for post status", + "NSPhotoLibraryAddUsageDescription": "Used to save photo into the Photo Library", + "NewPostShortcutItemTitle": "New Post", + "SearchShortcutItemTitle": "Search" +} diff --git a/Localization/StringsConvertor/input/ar.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/ar.lproj/Localizable.stringsdict index 862d98184..91368a4fb 100644 --- a/Localization/StringsConvertor/input/ar.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/ar.lproj/Localizable.stringsdict @@ -74,6 +74,30 @@ %ld حَرف + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + لَا حَرف + one + حَرفٌ واحِد + two + حَرفانِ اِثنان + few + %ld characters + many + %ld characters + other + %ld حَرف + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/ar.lproj/app.json b/Localization/StringsConvertor/input/ar.lproj/app.json index ce68229ac..bf4bf454e 100644 --- a/Localization/StringsConvertor/input/ar.lproj/app.json +++ b/Localization/StringsConvertor/input/ar.lproj/app.json @@ -74,8 +74,8 @@ "take_photo": "اِلتِقاطُ صُورَة", "save_photo": "حفظ الصورة", "copy_photo": "نسخ الصورة", - "sign_in": "تسجيل الدخول", - "sign_up": "إنشاء حِساب", + "sign_in": "تسجيلُ الدخول", + "sign_up": "Create account", "see_more": "عرض المزيد", "preview": "مُعاينة", "share": "المُشارك", @@ -136,6 +136,12 @@ "vote": "صَوِّت", "closed": "انتهى" }, + "meta_entity": { + "url": "رابِط: %s", + "hashtag": "وَسْم: %s", + "mention": "إظهار المِلف التعريفي: %s", + "email": "عُنوان البريد الإلكتُروني: %s" + }, "actions": { "reply": "الرَّد", "reblog": "إعادة النشر", @@ -181,8 +187,8 @@ "unmute_user": "رفع الكتم عن %s", "muted": "مكتوم", "edit_info": "تَحريرُ المَعلُومات", - "show_reblogs": "Show Reblogs", - "hide_reblogs": "Hide Reblogs" + "show_reblogs": "إظهار إعادات التدوين", + "hide_reblogs": "إخفاء إعادات التدوين" }, "timeline": { "filtered": "مُصفَّى", @@ -212,10 +218,16 @@ "get_started": "ابدأ الآن", "log_in": "تسجيلُ الدخول" }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, "server_picker": { "title": "اِختر خادِم،\nأيًّا مِنهُم.", - "subtitle": "اختر مجتمعًا بناءً على اهتماماتك، منطقتك أو يمكنك حتى اختيارُ مجتمعٍ ذي غرضٍ عام.", - "subtitle_extend": "اختر مجتمعًا بناءً على اهتماماتك، منطقتك أو يمكنك حتى اختيارُ مجتمعٍ ذي غرضٍ عام. تُشغَّل جميعُ المجتمعِ مِن قِبَلِ مُنظمَةٍ أو فردٍ مُستقلٍ تمامًا.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "الكُل", @@ -242,8 +254,7 @@ "category": "الفئة" }, "input": { - "placeholder": "اِبحَث عن خادِم أو انضم إلى آخر خاص بك...", - "search_servers_or_enter_url": "اِبحَث فِي الخَوادِم أو أدخِل رابِط" + "search_servers_or_enter_url": "Search communities or enter URL" }, "empty_state": { "finding_servers": "يجري إيجاد خوادم متوفِّرَة...", @@ -376,7 +387,13 @@ "video": "مقطع مرئي", "attachment_broken": "هذا ال%s مُعطَّل\nويتعذَّرُ رفعُه إلى ماستودون.", "description_photo": "صِف الصورة للمَكفوفين...", - "description_video": "صِف المقطع المرئي للمَكفوفين..." + "description_video": "صِف المقطع المرئي للمَكفوفين...", + "load_failed": "فَشَلَ التَّحميل", + "upload_failed": "فَشَلَ الرَّفع", + "can_not_recognize_this_media_attachment": "يتعذَّرُ التعرُّفُ على وسائِطِ هذا المُرفَق", + "attachment_too_large": "المُرفَق كَبيرٌ جِدًّا", + "compressing_state": "يجري الضغط...", + "server_processing_state": "مُعالجة الخادم جارِيَة..." }, "poll": { "duration_time": "المُدَّة: %s", @@ -386,7 +403,9 @@ "one_day": "يومٌ واحِد", "three_days": "ثلاثةُ أيام", "seven_days": "سبعةُ أيام", - "option_number": "الخيار %ld" + "option_number": "الخيار %ld", + "the_poll_is_invalid": "الاِستِطلاعُ غيرُ صالِح", + "the_poll_has_empty_option": "يوجَدُ خِيارٌ فارِغٌ فِي الاِستِطلاع" }, "content_warning": { "placeholder": "اكتب تَحذيرًا دَقيقًا هُنا..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "منتقي الرموز التعبيرية المُخصَّص", "enable_content_warning": "تفعيل تحذير المُحتَوى", "disable_content_warning": "تعطيل تحذير المُحتَوى", - "post_visibility_menu": "قائمة ظهور المنشور" + "post_visibility_menu": "قائمة ظهور المنشور", + "post_options": "Post Options", + "posting_as": "نَشر كَـ %s" }, "keyboard": { "discard_post": "تجاهُل المنشور", @@ -432,6 +453,10 @@ "placeholder": { "label": "التسمية", "content": "المُحتَوى" + }, + "verified": { + "short": "تمَّ التَّحقق بِتاريخ %s", + "long": "تمَّ التَّحقق مِن مِلكية هذا الرابِطِ بِتاريخ %s" } }, "segmented_control": { @@ -459,12 +484,12 @@ "message": "تأكيدُ رَفع الحَظرِ عَن %s" }, "confirm_show_reblogs": { - "title": "Show Reblogs", - "message": "Confirm to show reblogs" + "title": "إظهار إعادات التدوين", + "message": "التأكيد لِإظهار إعادات التدوين" }, "confirm_hide_reblogs": { - "title": "Hide Reblogs", - "message": "Confirm to hide reblogs" + "title": "إخفاء إعادات التدوين", + "message": "التأكيد لِإخفاء إعادات التدوين" } }, "accessibility": { @@ -696,7 +721,7 @@ "accessibility_hint": "انقر نقرًا مزدوجًا لتجاهُل النافذة المنبثقة" }, "bookmark": { - "title": "Bookmarks" + "title": "العَلاماتُ المَرجعيَّة" } } } diff --git a/Localization/StringsConvertor/input/ca.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/ca.lproj/Localizable.stringsdict index cc28edbc6..947597417 100644 --- a/Localization/StringsConvertor/input/ca.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/ca.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld caràcters + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + resten %#@character_count@ + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 caràcter + other + %ld caràcters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/ca.lproj/app.json b/Localization/StringsConvertor/input/ca.lproj/app.json index 4766eb31b..52bb67c77 100644 --- a/Localization/StringsConvertor/input/ca.lproj/app.json +++ b/Localization/StringsConvertor/input/ca.lproj/app.json @@ -75,7 +75,7 @@ "save_photo": "Desa la foto", "copy_photo": "Copia la foto", "sign_in": "Iniciar sessió", - "sign_up": "Registre", + "sign_up": "Crea un compte", "see_more": "Veure més", "preview": "Vista prèvia", "share": "Comparteix", @@ -136,6 +136,12 @@ "vote": "Vota", "closed": "Finalitzada" }, + "meta_entity": { + "url": "Enllaç: %s", + "hashtag": "Etiqueta %s", + "mention": "Mostra el Perfil: %s", + "email": "Correu electrònic: %s" + }, "actions": { "reply": "Respon", "reblog": "Impuls", @@ -212,10 +218,16 @@ "get_started": "Comença", "log_in": "Inicia sessió" }, + "login": { + "title": "Ben tornat", + "subtitle": "T'inicia sessió en el servidor on has creat el teu compte.", + "server_search_field": { + "placeholder": "Insereix la URL o cerca el teu servidor" + } + }, "server_picker": { "title": "Mastodon està fet d'usuaris en diferents comunitats.", - "subtitle": "Tria una comunitat segons els teus interessos, regió o una de propòsit general.", - "subtitle_extend": "Tria una comunitat segons els teus interessos, regió o una de propòsit general. Cada comunitat és operada per una organització totalment independent o individualment.", + "subtitle": "Tria un servidor en funció de la teva regió, interessos o un de propòsit general. Seguiràs podent connectar amb tothom a Mastodon, independentment del servidor.", "button": { "category": { "all": "Totes", @@ -242,8 +254,7 @@ "category": "CATEGORIA" }, "input": { - "placeholder": "Cerca servidors", - "search_servers_or_enter_url": "Cerca servidors o introdueix l'enllaç" + "search_servers_or_enter_url": "Cerca comunitats o introdueix l'URL" }, "empty_state": { "finding_servers": "Cercant els servidors disponibles...", @@ -376,7 +387,13 @@ "video": "vídeo", "attachment_broken": "Aquest %s està trencat i no pot ser\ncarregat a Mastodon.", "description_photo": "Descriu la foto per als disminuïts visuals...", - "description_video": "Descriu el vídeo per als disminuïts visuals..." + "description_video": "Descriu el vídeo per als disminuïts visuals...", + "load_failed": "Ha fallat la càrrega", + "upload_failed": "Pujada fallida", + "can_not_recognize_this_media_attachment": "No es pot reconèixer aquest adjunt multimèdia", + "attachment_too_large": "El fitxer adjunt és massa gran", + "compressing_state": "Comprimint...", + "server_processing_state": "Servidor processant..." }, "poll": { "duration_time": "Durada: %s", @@ -386,7 +403,9 @@ "one_day": "1 Dia", "three_days": "3 Dies", "seven_days": "7 Dies", - "option_number": "Opció %ld" + "option_number": "Opció %ld", + "the_poll_is_invalid": "L'enquesta no és vàlida", + "the_poll_has_empty_option": "L'enquesta té una opció buida" }, "content_warning": { "placeholder": "Escriu un advertiment precís aquí..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Selector d'Emoji Personalitzat", "enable_content_warning": "Activa l'Avís de Contingut", "disable_content_warning": "Desactiva l'Avís de Contingut", - "post_visibility_menu": "Menú de Visibilitat de Publicació" + "post_visibility_menu": "Menú de Visibilitat de Publicació", + "post_options": "Opcions del tut", + "posting_as": "Publicant com a %s" }, "keyboard": { "discard_post": "Descarta la Publicació", @@ -432,6 +453,10 @@ "placeholder": { "label": "Etiqueta", "content": "Contingut" + }, + "verified": { + "short": "Verificat a %s", + "long": "La propietat d'aquest enllaç es va verificar el dia %s" } }, "segmented_control": { @@ -696,7 +721,7 @@ "accessibility_hint": "Toca dues vegades per descartar l'assistent" }, "bookmark": { - "title": "Bookmarks" + "title": "Marcadors" } } } diff --git a/Localization/StringsConvertor/input/ckb.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/ckb.lproj/Localizable.stringsdict index 001a8a608..8116226ec 100644 --- a/Localization/StringsConvertor/input/ckb.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/ckb.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld نووسە + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/ckb.lproj/app.json b/Localization/StringsConvertor/input/ckb.lproj/app.json index 49f72d7a3..787bbea36 100644 --- a/Localization/StringsConvertor/input/ckb.lproj/app.json +++ b/Localization/StringsConvertor/input/ckb.lproj/app.json @@ -74,8 +74,8 @@ "take_photo": "وێنە بگرە", "save_photo": "هەڵی بگرە", "copy_photo": "لەبەری بگرەوە", - "sign_in": "بچۆ ژوورەوە", - "sign_up": "خۆت تۆمار بکە", + "sign_in": "Log in", + "sign_up": "Create account", "see_more": "زیاتر ببینە", "preview": "پێشبینین", "share": "هاوبەشی بکە", @@ -136,6 +136,12 @@ "vote": "دەنگ بدە", "closed": "داخراوە" }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Show Profile: %s", + "email": "Email address: %s" + }, "actions": { "reply": "وەڵامی بدەوە", "reblog": "پۆستی بکەوە", @@ -212,10 +218,16 @@ "get_started": "دەست پێ بکە", "log_in": "بچۆ ژوورەوە" }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, "server_picker": { "title": "ماستۆدۆن لە چەندان بەکارهێنەر پێک دێت کە لە ڕاژەکاری جیاواز دان.", - "subtitle": "ڕاژەکارێکێکی گشتی یان دانەیەک لەسەر بنەمای حەزەکانت و هەرێمەکەت هەڵبژێرە.", - "subtitle_extend": "ڕاژەکارێکێکی گشتی یان دانەیەک لەسەر بنەمای حەزەکانت و هەرێمەکەت هەڵبژێرە. هەر ڕاژەکارێک لەلایەن ڕێکخراوێک یان تاکەکەسێک بەڕێوە دەبرێت.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "هەموو", @@ -242,8 +254,7 @@ "category": "بەش" }, "input": { - "placeholder": "بگەڕێ", - "search_servers_or_enter_url": "Search servers or enter URL" + "search_servers_or_enter_url": "Search communities or enter URL" }, "empty_state": { "finding_servers": "ڕاژەکار دەدۆزرێتەوە...", @@ -376,7 +387,13 @@ "video": "ڤیدیۆ", "attachment_broken": "ئەم %sـە تێک چووە و ناتوانیت بەرزی بکەیتەوە.", "description_photo": "وێنەکەت بۆ نابیناکان باس بکە...", - "description_video": "ڤیدیۆکەت بۆ نابیناکان باس بکە..." + "description_video": "ڤیدیۆکەت بۆ نابیناکان باس بکە...", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "کات:‌ %s", @@ -386,7 +403,9 @@ "one_day": "1 ڕۆژ", "three_days": "3 ڕۆژ", "seven_days": "7 ڕۆژ", - "option_number": "بژاردەی %ld" + "option_number": "بژاردەی %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "ئاگادارییەکەت لێرە بنووسە..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "هەڵبژێری ئیمۆجی", "enable_content_warning": "ئاگاداریی ناوەڕۆک چالاک بکە", "disable_content_warning": "ئاگاداریی ناوەڕۆک ناچالاک بکە", - "post_visibility_menu": "پێڕستی شێوازی دەرکەوتنی پۆست" + "post_visibility_menu": "پێڕستی شێوازی دەرکەوتنی پۆست", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "پۆستەکە هەڵوەشێنەوە", @@ -432,6 +453,10 @@ "placeholder": { "label": "ناونیشان", "content": "ناوەڕۆک" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Localization/StringsConvertor/input/cs.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/cs.lproj/Localizable.stringsdict index cdf35477e..6e44e9f0a 100644 --- a/Localization/StringsConvertor/input/cs.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/cs.lproj/Localizable.stringsdict @@ -13,19 +13,19 @@ NSStringFormatValueTypeKey ld one - 1 unread notification + 1 nepřečtené oznámení few - %ld unread notification + %ld nepřečtené oznámení many - %ld unread notification + %ld nepřečtených oznámení other - %ld unread notification + %ld nepřečtených oznámení a11y.plural.count.input_limit_exceeds NSStringLocalizedFormatKey - Input limit exceeds %#@character_count@ + Vstupní limit přesahuje %#@character_count@ character_count NSStringFormatSpecTypeKey @@ -33,19 +33,19 @@ NSStringFormatValueTypeKey ld one - 1 character + 1 znak few - %ld characters + %ld znaky many - %ld characters + %ld znaků other - %ld characters + %ld znaků a11y.plural.count.input_limit_remains NSStringLocalizedFormatKey - Input limit remains %#@character_count@ + Vstupní limit zůstává %#@character_count@ character_count NSStringFormatSpecTypeKey @@ -53,13 +53,33 @@ NSStringFormatValueTypeKey ld one - 1 character + 1 znak few - %ld characters + %ld znaky many - %ld characters + %ld znaků other - %ld characters + %ld znaků + + + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 znak + few + %ld znaky + many + %ld znaků + other + %ld znaků plural.count.followed_by_and_mutual @@ -108,13 +128,13 @@ NSStringFormatValueTypeKey ld one - post + příspěvek few - posts + příspěvky many - posts + příspěvků other - posts + příspěvků plural.count.media @@ -128,13 +148,13 @@ NSStringFormatValueTypeKey ld one - 1 media + 1 médium few - %ld media + %ld média many - %ld media + %ld médií other - %ld media + %ld médií plural.count.post @@ -148,13 +168,13 @@ NSStringFormatValueTypeKey ld one - 1 post + 1 příspěvek few - %ld posts + %ld příspěvky many - %ld posts + %ld příspěvků other - %ld posts + %ld příspěvků plural.count.favorite @@ -168,7 +188,7 @@ NSStringFormatValueTypeKey ld one - 1 favorite + 1 oblíbený few %ld favorites many @@ -208,13 +228,13 @@ NSStringFormatValueTypeKey ld one - 1 reply + 1 odpověď few - %ld replies + %ld odpovědi many - %ld replies + %ld odpovědí other - %ld replies + %ld odpovědí plural.count.vote @@ -228,13 +248,13 @@ NSStringFormatValueTypeKey ld one - 1 vote + 1 hlas few - %ld votes + %ld hlasy many - %ld votes + %ld hlasů other - %ld votes + %ld hlasů plural.count.voter @@ -248,13 +268,13 @@ NSStringFormatValueTypeKey ld one - 1 voter + 1 hlasující few - %ld voters + %ld hlasující many - %ld voters + %ld hlasujících other - %ld voters + %ld hlasujících plural.people_talking @@ -288,13 +308,13 @@ NSStringFormatValueTypeKey ld one - 1 following + 1 sledující few - %ld following + %ld sledující many - %ld following + %ld sledujících other - %ld following + %ld sledujících plural.count.follower @@ -328,13 +348,13 @@ NSStringFormatValueTypeKey ld one - 1 year left + Zbývá 1 rok few - %ld years left + Zbývají %ld roky many - %ld years left + Zbývá %ld roků other - %ld years left + Zbývá %ld roků date.month.left @@ -348,7 +368,7 @@ NSStringFormatValueTypeKey ld one - 1 months left + Zbývá 1 měsíc few %ld months left many diff --git a/Localization/StringsConvertor/input/cs.lproj/app.json b/Localization/StringsConvertor/input/cs.lproj/app.json index 550f71808..680eb01bb 100644 --- a/Localization/StringsConvertor/input/cs.lproj/app.json +++ b/Localization/StringsConvertor/input/cs.lproj/app.json @@ -37,12 +37,12 @@ "confirm": "Odhlásit se" }, "block_domain": { - "title": "Are you really, really sure you want to block the entire %s? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain and any of your followers from that domain will be removed.", + "title": "Opravdu chcete blokovat celou doménu %s? Ve většině případů stačí zablokovat nebo skrýt pár konkrétních uživatelů, což také doporučujeme. Z této domény neuvidíte obsah v žádné veřejné časové ose ani v oznámeních. Vaši sledující z této domény budou odstraněni.", "block_entire_domain": "Blokovat doménu" }, "save_photo_failure": { "title": "Uložení fotografie se nezdařilo", - "message": "Please enable the photo library access permission to save the photo." + "message": "Pro uložení fotografie povolte přístup k knihovně fotografií." }, "delete_post": { "title": "Odstranit příspěvek", @@ -75,11 +75,11 @@ "save_photo": "Uložit fotku", "copy_photo": "Kopírovat fotografii", "sign_in": "Přihlásit se", - "sign_up": "Zaregistrovat se", + "sign_up": "Vytvořit účet", "see_more": "Zobrazit více", "preview": "Náhled", "share": "Sdílet", - "share_user": "Share %s", + "share_user": "Sdílet %s", "share_post": "Sdílet příspěvek", "open_in_safari": "Otevřít v Safari", "open_in_browser": "Otevřít v prohlížeči", @@ -125,7 +125,7 @@ }, "status": { "user_reblogged": "%s reblogged", - "user_replied_to": "Replied to %s", + "user_replied_to": "Odpověděl %s", "show_post": "Zobrazit příspěvek", "show_user_profile": "Zobrazit profil uživatele", "content_warning": "Varování o obsahu", @@ -136,18 +136,24 @@ "vote": "Hlasovat", "closed": "Uzavřeno" }, + "meta_entity": { + "url": "Odkaz: %s", + "hashtag": "Hashtag: %s", + "mention": "Zobrazit profil: %s", + "email": "E-mailová adresa: %s" + }, "actions": { "reply": "Odpovědět", "reblog": "Boostnout", "unreblog": "Undo reblog", - "favorite": "Favorite", + "favorite": "Oblíbit", "unfavorite": "Odebrat z oblízených", "menu": "Nabídka", "hide": "Skrýt", "show_image": "Zobrazit obrázek", "show_gif": "Zobrazit GIF", "show_video_player": "Zobrazit video přehrávač", - "tap_then_hold_to_show_menu": "Tap then hold to show menu" + "tap_then_hold_to_show_menu": "Klepnutím podržte pro zobrazení nabídky" }, "tag": { "url": "URL", @@ -159,22 +165,22 @@ }, "visibility": { "unlisted": "Každý může vidět tento příspěvek, ale nezobrazovat ve veřejné časové ose.", - "private": "Only their followers can see this post.", - "private_from_me": "Only my followers can see this post.", - "direct": "Only mentioned user can see this post." + "private": "Pouze jejich sledující mohou vidět tento příspěvek.", + "private_from_me": "Pouze moji sledující mohou vidět tento příspěvek.", + "direct": "Pouze zmíněný uživatel může vidět tento příspěvek." } }, "friendship": { "follow": "Sledovat", - "following": "Following", - "request": "Request", + "following": "Sleduji", + "request": "Požadavek", "pending": "Čekající", "block": "Blokovat", "block_user": "Blokovat %s", "block_domain": "Blokovat %s", "unblock": "Odblokovat", "unblock_user": "Odblokovat %s", - "blocked": "Blocked", + "blocked": "Blokovaný", "mute": "Skrýt", "mute_user": "Skrýt %s", "unmute": "Odkrýt", @@ -185,7 +191,7 @@ "hide_reblogs": "Hide Reblogs" }, "timeline": { - "filtered": "Filtered", + "filtered": "Filtrováno", "timestamp": { "now": "Nyní" }, @@ -196,26 +202,32 @@ }, "header": { "no_status_found": "Nebyl nalezen žádný příspěvek", - "blocking_warning": "You can’t view this user's profile\nuntil you unblock them.\nYour profile looks like this to them.", - "user_blocking_warning": "You can’t view %s’s profile\nuntil you unblock them.\nYour profile looks like this to them.", - "blocked_warning": "You can’t view this user’s profile\nuntil they unblock you.", - "user_blocked_warning": "You can’t view %s’s profile\nuntil they unblock you.", - "suspended_warning": "This user has been suspended.", - "user_suspended_warning": "%s’s account has been suspended." + "blocking_warning": "Nemůžete zobrazit profil tohoto uživatele, dokud ho neodblokujete.\nVáš profil pro něj vypadá takto.", + "user_blocking_warning": "Nemůžete zobrazit profil %s, dokud ho neodblokujete.\nVáš profil pro něj vypadá takto.", + "blocked_warning": "Nemůžeš zobrazit profil tohoto uživatele, dokud tě neodblokují.", + "user_blocked_warning": "Nemůžete zobrazit profil %s, dokud vás neodblokuje.", + "suspended_warning": "Tento uživatel byl pozastaven.", + "user_suspended_warning": "Účet %s byl pozastaven." } } } }, "scene": { "welcome": { - "slogan": "Social networking\nback in your hands.", + "slogan": "Sociální sítě opět ve vašich rukou.", "get_started": "Začínáme", "log_in": "Přihlásit se" }, + "login": { + "title": "Vítejte zpět", + "subtitle": "Přihlaste se na serveru, na kterém jste si vytvořili účet.", + "server_search_field": { + "placeholder": "Zadejte URL nebo vyhledávejte váš server" + } + }, "server_picker": { "title": "Mastodon tvoří uživatelé z různých serverů.", - "subtitle": "Pick a server based on your interests, region, or a general purpose one.", - "subtitle_extend": "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual.", + "subtitle": "Vyberte server založený ve vašem regionu, podle zájmů nebo podle obecného účelu. Stále můžete chatovat s kýmkoli na Mastodonu bez ohledu na vaše servery.", "button": { "category": { "all": "Vše", @@ -224,7 +236,7 @@ "activism": "aktivismus", "food": "jídlo", "furry": "furry", - "games": "games", + "games": "hry", "general": "obecné", "journalism": "žurnalistika", "lgbt": "lgbt", @@ -242,8 +254,7 @@ "category": "KATEGORIE" }, "input": { - "placeholder": "Hledat servery", - "search_servers_or_enter_url": "Hledat servery nebo zadat URL" + "search_servers_or_enter_url": "Hledejte komunity nebo zadejte URL" }, "empty_state": { "finding_servers": "Hledání dostupných serverů...", @@ -252,8 +263,8 @@ } }, "register": { - "title": "Let’s get you set up on %s", - "lets_get_you_set_up_on_domain": "Let’s get you set up on %s", + "title": "Pojďme si nastavit %s", + "lets_get_you_set_up_on_domain": "Pojďme si nastavit %s", "input": { "avatar": { "delete": "Smazat" @@ -292,51 +303,51 @@ "reason": "Důvod" }, "reason": { - "blocked": "%s contains a disallowed email provider", - "unreachable": "%s does not seem to exist", + "blocked": "%s používá zakázanou e-mailovou službu", + "unreachable": "%s pravděpodobně neexistuje", "taken": "%s se již používá", "reserved": "%s je rezervované klíčové slovo", "accepted": "%s musí být přijato", "blank": "%s je vyžadováno", - "invalid": "%s is invalid", - "too_long": "%s is too long", - "too_short": "%s is too short", - "inclusion": "%s is not a supported value" + "invalid": "%s je neplatné", + "too_long": "%s je příliš dlouhé", + "too_short": "%s je příliš krátké", + "inclusion": "%s není podporovaná hodnota" }, "special": { - "username_invalid": "Username must only contain alphanumeric characters and underscores", - "username_too_long": "Username is too long (can’t be longer than 30 characters)", + "username_invalid": "Uživatelské jméno musí obsahovat pouze alfanumerické znaky a podtržítka", + "username_too_long": "Uživatelské jméno je příliš dlouhé (nemůže být delší než 30 znaků)", "email_invalid": "Toto není platná e-mailová adresa", - "password_too_short": "Password is too short (must be at least 8 characters)" + "password_too_short": "Heslo je příliš krátké (musí mít alespoň 8 znaků)" } } }, "server_rules": { - "title": "Some ground rules.", - "subtitle": "These are set and enforced by the %s moderators.", - "prompt": "By continuing, you’re subject to the terms of service and privacy policy for %s.", - "terms_of_service": "terms of service", - "privacy_policy": "privacy policy", + "title": "Některá základní pravidla.", + "subtitle": "Ty nastavují a prosazují moderátoři %s.", + "prompt": "Pokračováním budete podléhat podmínkám služby a zásad ochrany osobních údajů pro uživatele %s.", + "terms_of_service": "podmínky služby", + "privacy_policy": "zásady ochrany osobních údajů", "button": { - "confirm": "I Agree" + "confirm": "Souhlasím" } }, "confirm_email": { - "title": "One last thing.", - "subtitle": "Tap the link we emailed to you to verify your account.", - "tap_the_link_we_emailed_to_you_to_verify_your_account": "Tap the link we emailed to you to verify your account", + "title": "Ještě jedna věc.", + "subtitle": "Klepněte na odkaz, který jsme vám poslali e-mailem, abyste ověřili Váš účet.", + "tap_the_link_we_emailed_to_you_to_verify_your_account": "Klepněte na odkaz, který jsme vám poslali e-mailem, abyste ověřili Váš účet", "button": { - "open_email_app": "Open Email App", - "resend": "Resend" + "open_email_app": "Otevřít e-mailovou aplikaci", + "resend": "Poslat znovu" }, "dont_receive_email": { - "title": "Check your email", - "description": "Check if your email address is correct as well as your junk folder if you haven’t.", - "resend_email": "Resend Email" + "title": "Zkontrolujte svůj e-mail", + "description": "Zkontrolujte, zda je vaše e-mailová adresa správná, stejně jako složka nevyžádané pošty, pokud ji máte.", + "resend_email": "Znovu odeslat e-mail" }, "open_email_app": { - "title": "Check your inbox.", - "description": "We just sent you an email. Check your junk folder if you haven’t.", + "title": "Zkontrolujte doručenou poštu.", + "description": "Právě jsme vám poslali e-mail. Zkontrolujte složku nevyžádané zprávy, pokud ji máte.", "mail": "Pošta", "open_email_client": "Otevřít e-mailového klienta" } @@ -349,47 +360,55 @@ "published": "Publikováno!", "Publishing": "Publikování příspěvku...", "accessibility": { - "logo_label": "Logo Button", - "logo_hint": "Tap to scroll to top and tap again to previous location" + "logo_label": "Tlačítko s logem", + "logo_hint": "Klepnutím přejdete nahoru a znovu klepněte na předchozí místo" } } }, "suggestion_account": { - "title": "Find People to Follow", - "follow_explain": "When you follow someone, you’ll see their posts in your home feed." + "title": "Najít lidi pro sledování", + "follow_explain": "Když někoho sledujete, uvidíte jejich příspěvky ve vašem domovském kanálu." }, "compose": { "title": { "new_post": "Nový příspěvek", - "new_reply": "New Reply" + "new_reply": "Nová odpověď" }, "media_selection": { - "camera": "Take Photo", - "photo_library": "Photo Library", - "browse": "Browse" + "camera": "Vyfotit", + "photo_library": "Knihovna fotografií", + "browse": "Procházet" }, - "content_input_placeholder": "Type or paste what’s on your mind", - "compose_action": "Publish", - "replying_to_user": "replying to %s", + "content_input_placeholder": "Napište nebo vložte, co je na mysli", + "compose_action": "Zveřejnit", + "replying_to_user": "odpovídá na %s", "attachment": { - "photo": "photo", + "photo": "fotka", "video": "video", - "attachment_broken": "This %s is broken and can’t be\nuploaded to Mastodon.", - "description_photo": "Describe the photo for the visually-impaired...", - "description_video": "Describe the video for the visually-impaired..." + "attachment_broken": "Tento %s je poškozený a nemůže být\nnahrán do Mastodonu.", + "description_photo": "Popište fotografii pro zrakově postižené osoby...", + "description_video": "Popište video pro zrakově postižené...", + "load_failed": "Načtení se nezdařilo", + "upload_failed": "Nahrání selhalo", + "can_not_recognize_this_media_attachment": "Nelze rozpoznat toto medium přílohy", + "attachment_too_large": "Příloha je příliš velká", + "compressing_state": "Probíhá komprese...", + "server_processing_state": "Zpracování serveru..." }, "poll": { - "duration_time": "Duration: %s", + "duration_time": "Doba trvání: %s", "thirty_minutes": "30 minut", "one_hour": "1 hodina", "six_hours": "6 hodin", "one_day": "1 den", "three_days": "3 dny", "seven_days": "7 dní", - "option_number": "Možnost %ld" + "option_number": "Možnost %ld", + "the_poll_is_invalid": "Anketa je neplatná", + "the_poll_has_empty_option": "Anketa má prázdnou možnost" }, "content_warning": { - "placeholder": "Write an accurate warning here..." + "placeholder": "Zde napište přesné varování..." }, "visibility": { "public": "Veřejný", @@ -398,7 +417,7 @@ "direct": "Pouze lidé, které zmíním" }, "auto_complete": { - "space_to_add": "Space to add" + "space_to_add": "Mezera k přidání" }, "accessibility": { "append_attachment": "Přidat přílohu", @@ -407,13 +426,15 @@ "custom_emoji_picker": "Vlastní výběr Emoji", "enable_content_warning": "Povolit upozornění na obsah", "disable_content_warning": "Vypnout upozornění na obsah", - "post_visibility_menu": "Menu viditelnosti příspěvku" + "post_visibility_menu": "Menu viditelnosti příspěvku", + "post_options": "Možnosti příspěvku", + "posting_as": "Odesílání jako %s" }, "keyboard": { "discard_post": "Zahodit příspěvek", "publish_post": "Publikovat příspěvek", "toggle_poll": "Přepnout anketu", - "toggle_content_warning": "Toggle Content Warning", + "toggle_content_warning": "Přepnout varování obsahu", "append_attachment_entry": "Přidat přílohu - %s", "select_visibility_entry": "Vyberte viditelnost - %s" } @@ -424,14 +445,18 @@ }, "dashboard": { "posts": "příspěvky", - "following": "following", + "following": "sledování", "followers": "sledující" }, "fields": { "add_row": "Přidat řádek", "placeholder": { - "label": "Label", + "label": "Označení", "content": "Obsah" + }, + "verified": { + "short": "Ověřeno na %s", + "long": "Vlastnictví tohoto odkazu bylo zkontrolováno na %s" } }, "segmented_control": { @@ -439,7 +464,7 @@ "replies": "Odpovědí", "posts_and_replies": "Příspěvky a odpovědi", "media": "Média", - "about": "About" + "about": "O uživateli" }, "relationship_action_alert": { "confirm_mute_user": { @@ -448,7 +473,7 @@ }, "confirm_unmute_user": { "title": "Zrušit skrytí účtu", - "message": "Confirm to unmute %s" + "message": "Potvrďte zrušení ztlumení %s" }, "confirm_block_user": { "title": "Blokovat účet", @@ -456,7 +481,7 @@ }, "confirm_unblock_user": { "title": "Odblokovat účet", - "message": "Confirm to unblock %s" + "message": "Potvrďte odblokování %s" }, "confirm_show_reblogs": { "title": "Show Reblogs", @@ -468,235 +493,235 @@ } }, "accessibility": { - "show_avatar_image": "Show avatar image", - "edit_avatar_image": "Edit avatar image", - "show_banner_image": "Show banner image", - "double_tap_to_open_the_list": "Double tap to open the list" + "show_avatar_image": "Zobrazit obrázek avataru", + "edit_avatar_image": "Upravit obrázek avataru", + "show_banner_image": "Zobrazit obrázek banneru", + "double_tap_to_open_the_list": "Dvojitým poklepáním otevřete seznam" } }, "follower": { - "title": "follower", - "footer": "Followers from other servers are not displayed." + "title": "sledující", + "footer": "Sledující z jiných serverů nejsou zobrazeni." }, "following": { - "title": "following", - "footer": "Follows from other servers are not displayed." + "title": "sledování", + "footer": "Sledování z jiných serverů není zobrazeno." }, "familiarFollowers": { - "title": "Followers you familiar", - "followed_by_names": "Followed by %s" + "title": "Sledující, které znáte", + "followed_by_names": "Sledován od %s" }, "favorited_by": { - "title": "Favorited By" + "title": "Oblíben" }, "reblogged_by": { "title": "Reblogged By" }, "search": { - "title": "Search", + "title": "Hledat", "search_bar": { - "placeholder": "Search hashtags and users", - "cancel": "Cancel" + "placeholder": "Hledat hashtagy a uživatele", + "cancel": "Zrušit" }, "recommend": { - "button_text": "See All", + "button_text": "Zobrazit vše", "hash_tag": { - "title": "Trending on Mastodon", - "description": "Hashtags that are getting quite a bit of attention", - "people_talking": "%s people are talking" + "title": "Populární na Mastodonu", + "description": "Hashtagy, kterým se dostává dosti pozornosti", + "people_talking": "%s lidí mluví" }, "accounts": { - "title": "Accounts you might like", - "description": "You may like to follow these accounts", - "follow": "Follow" + "title": "Účty, které by se vám mohly líbit", + "description": "Možná budete chtít sledovat tyto účty", + "follow": "Sledovat" } }, "searching": { "segment": { - "all": "All", - "people": "People", - "hashtags": "Hashtags", - "posts": "Posts" + "all": "Vše", + "people": "Lidé", + "hashtags": "Hashtagy", + "posts": "Příspěvky" }, "empty_state": { - "no_results": "No results" + "no_results": "Žádné výsledky" }, - "recent_search": "Recent searches", - "clear": "Clear" + "recent_search": "Nedávná hledání", + "clear": "Vymazat" } }, "discovery": { "tabs": { - "posts": "Posts", - "hashtags": "Hashtags", - "news": "News", - "community": "Community", - "for_you": "For You" + "posts": "Příspěvky", + "hashtags": "Hashtagy", + "news": "Zprávy", + "community": "Komunita", + "for_you": "Pro vás" }, - "intro": "These are the posts gaining traction in your corner of Mastodon." + "intro": "Toto jsou příspěvky, které získávají pozornost ve vašem koutu Mastodonu." }, "favorite": { - "title": "Your Favorites" + "title": "Vaše oblíbené" }, "notification": { "title": { - "Everything": "Everything", - "Mentions": "Mentions" + "Everything": "Všechno", + "Mentions": "Zmínky" }, "notification_description": { - "followed_you": "followed you", - "favorited_your_post": "favorited your post", - "reblogged_your_post": "reblogged your post", - "mentioned_you": "mentioned you", - "request_to_follow_you": "request to follow you", - "poll_has_ended": "poll has ended" + "followed_you": "vás sleduje", + "favorited_your_post": "si oblíbil váš příspěvek", + "reblogged_your_post": "boostnul váš příspěvek", + "mentioned_you": "vás zmínil/a", + "request_to_follow_you": "požádat vás o sledování", + "poll_has_ended": "anketa skončila" }, "keyobard": { - "show_everything": "Show Everything", - "show_mentions": "Show Mentions" + "show_everything": "Zobrazit vše", + "show_mentions": "Zobrazit zmínky" }, "follow_request": { - "accept": "Accept", - "accepted": "Accepted", - "reject": "reject", - "rejected": "Rejected" + "accept": "Přijmout", + "accepted": "Přijato", + "reject": "odmítnout", + "rejected": "Zamítnuto" } }, "thread": { - "back_title": "Post", - "title": "Post from %s" + "back_title": "Příspěvek", + "title": "Příspěvek od %s" }, "settings": { - "title": "Settings", + "title": "Nastavení", "section": { "appearance": { - "title": "Appearance", - "automatic": "Automatic", - "light": "Always Light", - "dark": "Always Dark" + "title": "Vzhled", + "automatic": "Automaticky", + "light": "Vždy světlý", + "dark": "Vždy tmavý" }, "look_and_feel": { - "title": "Look and Feel", - "use_system": "Use System", - "really_dark": "Really Dark", + "title": "Vzhled a chování", + "use_system": "Použít systém", + "really_dark": "Skutečně tmavý", "sorta_dark": "Sorta Dark", - "light": "Light" + "light": "Světlý" }, "notifications": { - "title": "Notifications", - "favorites": "Favorites my post", - "follows": "Follows me", - "boosts": "Reblogs my post", - "mentions": "Mentions me", + "title": "Upozornění", + "favorites": "Oblíbil si můj příspěvek", + "follows": "Sleduje mě", + "boosts": "Boostnul můj příspěvek", + "mentions": "Zmiňuje mě", "trigger": { - "anyone": "anyone", - "follower": "a follower", - "follow": "anyone I follow", - "noone": "no one", - "title": "Notify me when" + "anyone": "kdokoliv", + "follower": "sledující", + "follow": "kdokoli, koho sleduji", + "noone": "nikdo", + "title": "Upozornit, když" } }, "preference": { - "title": "Preferences", - "true_black_dark_mode": "True black dark mode", - "disable_avatar_animation": "Disable animated avatars", - "disable_emoji_animation": "Disable animated emojis", - "using_default_browser": "Use default browser to open links", - "open_links_in_mastodon": "Open links in Mastodon" + "title": "Předvolby", + "true_black_dark_mode": "Skutečný černý tmavý režim", + "disable_avatar_animation": "Zakázat animované avatary", + "disable_emoji_animation": "Zakázat animované emoji", + "using_default_browser": "Použít výchozí prohlížeč pro otevírání odkazů", + "open_links_in_mastodon": "Otevřít odkazy v Mastodonu" }, "boring_zone": { - "title": "The Boring Zone", - "account_settings": "Account Settings", - "terms": "Terms of Service", - "privacy": "Privacy Policy" + "title": "Nudná část", + "account_settings": "Nastavení účtu", + "terms": "Podmínky služby", + "privacy": "Zásady ochrany osobních údajů" }, "spicy_zone": { - "title": "The Spicy Zone", - "clear": "Clear Media Cache", - "signout": "Sign Out" + "title": "Ostrá část", + "clear": "Vymazat mezipaměť médií", + "signout": "Odhlásit se" } }, "footer": { - "mastodon_description": "Mastodon is open source software. You can report issues on GitHub at %s (%s)" + "mastodon_description": "Mastodon je open source software. Na GitHub můžete nahlásit problémy na %s (%s)" }, "keyboard": { - "close_settings_window": "Close Settings Window" + "close_settings_window": "Zavřít okno nastavení" } }, "report": { - "title_report": "Report", - "title": "Report %s", - "step1": "Step 1 of 2", - "step2": "Step 2 of 2", - "content1": "Are there any other posts you’d like to add to the report?", - "content2": "Is there anything the moderators should know about this report?", - "report_sent_title": "Thanks for reporting, we’ll look into this.", - "send": "Send Report", - "skip_to_send": "Send without comment", - "text_placeholder": "Type or paste additional comments", - "reported": "REPORTED", + "title_report": "Nahlásit", + "title": "Nahlásit %s", + "step1": "Krok 1 ze 2", + "step2": "Krok 2 ze 2", + "content1": "Existují nějaké další příspěvky, které byste chtěli přidat do zprávy?", + "content2": "Je o tomto hlášení něco, co by měli vědět moderátoři?", + "report_sent_title": "Děkujeme za nahlášení, podíváme se na to.", + "send": "Odeslat hlášení", + "skip_to_send": "Odeslat bez komentáře", + "text_placeholder": "Napište nebo vložte další komentáře", + "reported": "NAHLÁŠEN", "step_one": { - "step_1_of_4": "Step 1 of 4", - "whats_wrong_with_this_post": "What's wrong with this post?", - "whats_wrong_with_this_account": "What's wrong with this account?", - "whats_wrong_with_this_username": "What's wrong with %s?", - "select_the_best_match": "Select the best match", - "i_dont_like_it": "I don’t like it", - "it_is_not_something_you_want_to_see": "It is not something you want to see", - "its_spam": "It’s spam", - "malicious_links_fake_engagement_or_repetetive_replies": "Malicious links, fake engagement, or repetetive replies", - "it_violates_server_rules": "It violates server rules", - "you_are_aware_that_it_breaks_specific_rules": "You are aware that it breaks specific rules", - "its_something_else": "It’s something else", - "the_issue_does_not_fit_into_other_categories": "The issue does not fit into other categories" + "step_1_of_4": "Krok 1 ze 4", + "whats_wrong_with_this_post": "Co je na tomto příspěvku špatně?", + "whats_wrong_with_this_account": "Co je špatně s tímto účtem?", + "whats_wrong_with_this_username": "Co je špatně na %s?", + "select_the_best_match": "Vyberte nejbližší možnost", + "i_dont_like_it": "Nelíbí se mi", + "it_is_not_something_you_want_to_see": "Není to něco, co chcete vidět", + "its_spam": "Je to spam", + "malicious_links_fake_engagement_or_repetetive_replies": "Škodlivé odkazy, falešné zapojení nebo opakující se odpovědi", + "it_violates_server_rules": "Porušuje pravidla serveru", + "you_are_aware_that_it_breaks_specific_rules": "Máte za to, že porušuje konkrétní pravidla", + "its_something_else": "Jde o něco jiného", + "the_issue_does_not_fit_into_other_categories": "Problém neodpovídá ostatním kategoriím" }, "step_two": { - "step_2_of_4": "Step 2 of 4", - "which_rules_are_being_violated": "Which rules are being violated?", - "select_all_that_apply": "Select all that apply", - "i_just_don’t_like_it": "I just don’t like it" + "step_2_of_4": "Krok 2 ze 4", + "which_rules_are_being_violated": "Jaká pravidla jsou porušována?", + "select_all_that_apply": "Vyberte všechna relevantní", + "i_just_don’t_like_it": "Jen se mi to nelíbí" }, "step_three": { - "step_3_of_4": "Step 3 of 4", - "are_there_any_posts_that_back_up_this_report": "Are there any posts that back up this report?", - "select_all_that_apply": "Select all that apply" + "step_3_of_4": "Krok 3 ze 4", + "are_there_any_posts_that_back_up_this_report": "Existují příspěvky dokládající toto hlášení?", + "select_all_that_apply": "Vyberte všechna relevantní" }, "step_four": { - "step_4_of_4": "Step 4 of 4", - "is_there_anything_else_we_should_know": "Is there anything else we should know?" + "step_4_of_4": "Krok 4 ze 4", + "is_there_anything_else_we_should_know": "Je ještě něco jiného, co bychom měli vědět?" }, "step_final": { - "dont_want_to_see_this": "Don’t want to see this?", - "when_you_see_something_you_dont_like_on_mastodon_you_can_remove_the_person_from_your_experience.": "When you see something you don’t like on Mastodon, you can remove the person from your experience.", - "unfollow": "Unfollow", - "unfollowed": "Unfollowed", - "unfollow_user": "Unfollow %s", - "mute_user": "Mute %s", - "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "You won’t see their posts or reblogs in your home feed. They won’t know they’ve been muted.", - "block_user": "Block %s", - "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked.", - "while_we_review_this_you_can_take_action_against_user": "While we review this, you can take action against %s" + "dont_want_to_see_this": "Nechcete to vidět?", + "when_you_see_something_you_dont_like_on_mastodon_you_can_remove_the_person_from_your_experience.": "Když uvidíte něco, co se vám nelíbí na Mastodonu, můžete odstranit tuto osobu ze svého zážitku.", + "unfollow": "Přestat sledovat", + "unfollowed": "Už nesledujete", + "unfollow_user": "Přestat sledovat %s", + "mute_user": "Skrýt %s", + "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "Neuvidíte jejich příspěvky nebo boostnutí v domovském kanálu. Nebudou vědět, že jsou skrytí.", + "block_user": "Blokovat %s", + "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "Už nebudou moci sledovat nebo vidět vaše příspěvky, ale mohou vidět, zda byly zablokovány.", + "while_we_review_this_you_can_take_action_against_user": "Zatímco to posuzujeme, můžete podniknout kroky proti %s" } }, "preview": { "keyboard": { - "close_preview": "Close Preview", - "show_next": "Show Next", - "show_previous": "Show Previous" + "close_preview": "Zavřít náhled", + "show_next": "Zobrazit další", + "show_previous": "Zobrazit předchozí" } }, "account_list": { - "tab_bar_hint": "Current selected profile: %s. Double tap then hold to show account switcher", - "dismiss_account_switcher": "Dismiss Account Switcher", - "add_account": "Add Account" + "tab_bar_hint": "Aktuální vybraný profil: %s. Dvojitým poklepáním zobrazíte přepínač účtů", + "dismiss_account_switcher": "Zrušit přepínač účtů", + "add_account": "Přidat účet" }, "wizard": { - "new_in_mastodon": "New in Mastodon", - "multiple_account_switch_intro_description": "Switch between multiple accounts by holding the profile button.", - "accessibility_hint": "Double tap to dismiss this wizard" + "new_in_mastodon": "Nový v Mastodonu", + "multiple_account_switch_intro_description": "Přepínání mezi více účty podržením tlačítka profilu.", + "accessibility_hint": "Dvojitým poklepáním tohoto průvodce odmítnete" }, "bookmark": { - "title": "Bookmarks" + "title": "Záložky" } } } diff --git a/Localization/StringsConvertor/input/cs.lproj/ios-infoPlist.json b/Localization/StringsConvertor/input/cs.lproj/ios-infoPlist.json index c6db73de0..88bbb346a 100644 --- a/Localization/StringsConvertor/input/cs.lproj/ios-infoPlist.json +++ b/Localization/StringsConvertor/input/cs.lproj/ios-infoPlist.json @@ -1,6 +1,6 @@ { - "NSCameraUsageDescription": "Used to take photo for post status", - "NSPhotoLibraryAddUsageDescription": "Used to save photo into the Photo Library", - "NewPostShortcutItemTitle": "New Post", - "SearchShortcutItemTitle": "Search" + "NSCameraUsageDescription": "Slouží k pořízení fotografie pro příspěvek", + "NSPhotoLibraryAddUsageDescription": "Slouží k uložení fotografie do knihovny fotografií", + "NewPostShortcutItemTitle": "Nový příspěvek", + "SearchShortcutItemTitle": "Hledat" } diff --git a/Localization/StringsConvertor/input/cy.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/cy.lproj/Localizable.stringsdict index 038eaffda..9e4c09959 100644 --- a/Localization/StringsConvertor/input/cy.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/cy.lproj/Localizable.stringsdict @@ -74,6 +74,30 @@ %ld characters + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + %ld characters + one + 1 character + two + %ld characters + few + %ld characters + many + %ld characters + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/cy.lproj/app.json b/Localization/StringsConvertor/input/cy.lproj/app.json index bc7f75d96..fec3197be 100644 --- a/Localization/StringsConvertor/input/cy.lproj/app.json +++ b/Localization/StringsConvertor/input/cy.lproj/app.json @@ -74,8 +74,8 @@ "take_photo": "Take Photo", "save_photo": "Save Photo", "copy_photo": "Copy Photo", - "sign_in": "Sign In", - "sign_up": "Sign Up", + "sign_in": "Log in", + "sign_up": "Create account", "see_more": "See More", "preview": "Preview", "share": "Share", @@ -136,6 +136,12 @@ "vote": "Vote", "closed": "Closed" }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Show Profile: %s", + "email": "Email address: %s" + }, "actions": { "reply": "Reply", "reblog": "Hybwch", @@ -212,10 +218,16 @@ "get_started": "Get Started", "log_in": "Log In" }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, "server_picker": { "title": "Mastodon is made of users in different servers.", - "subtitle": "Pick a server based on your interests, region, or a general purpose one.", - "subtitle_extend": "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "All", @@ -242,8 +254,7 @@ "category": "CATEGORY" }, "input": { - "placeholder": "Search servers", - "search_servers_or_enter_url": "Search servers or enter URL" + "search_servers_or_enter_url": "Search communities or enter URL" }, "empty_state": { "finding_servers": "Finding available servers...", @@ -376,7 +387,13 @@ "video": "video", "attachment_broken": "This %s is broken and can’t be\nuploaded to Mastodon.", "description_photo": "Describe the photo for the visually-impaired...", - "description_video": "Describe the video for the visually-impaired..." + "description_video": "Describe the video for the visually-impaired...", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "Duration: %s", @@ -386,7 +403,9 @@ "one_day": "1 Day", "three_days": "3 Days", "seven_days": "7 Days", - "option_number": "Option %ld" + "option_number": "Option %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "Write an accurate warning here..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Custom Emoji Picker", "enable_content_warning": "Enable Content Warning", "disable_content_warning": "Disable Content Warning", - "post_visibility_menu": "Post Visibility Menu" + "post_visibility_menu": "Post Visibility Menu", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "Discard Post", @@ -432,6 +453,10 @@ "placeholder": { "label": "Label", "content": "Content" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Localization/StringsConvertor/input/da.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/da.lproj/Localizable.stringsdict index bdcae6ac9..eabdc3c32 100644 --- a/Localization/StringsConvertor/input/da.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/da.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld characters + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/da.lproj/app.json b/Localization/StringsConvertor/input/da.lproj/app.json index 80b0882d9..3113ada74 100644 --- a/Localization/StringsConvertor/input/da.lproj/app.json +++ b/Localization/StringsConvertor/input/da.lproj/app.json @@ -74,8 +74,8 @@ "take_photo": "Take Photo", "save_photo": "Save Photo", "copy_photo": "Copy Photo", - "sign_in": "Sign In", - "sign_up": "Sign Up", + "sign_in": "Log in", + "sign_up": "Create account", "see_more": "See More", "preview": "Preview", "share": "Share", @@ -136,6 +136,12 @@ "vote": "Vote", "closed": "Closed" }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Show Profile: %s", + "email": "Email address: %s" + }, "actions": { "reply": "Reply", "reblog": "Reblog", @@ -212,10 +218,16 @@ "get_started": "Get Started", "log_in": "Log In" }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, "server_picker": { "title": "Mastodon is made of users in different servers.", - "subtitle": "Pick a server based on your interests, region, or a general purpose one.", - "subtitle_extend": "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "All", @@ -242,8 +254,7 @@ "category": "CATEGORY" }, "input": { - "placeholder": "Search servers", - "search_servers_or_enter_url": "Search servers or enter URL" + "search_servers_or_enter_url": "Search communities or enter URL" }, "empty_state": { "finding_servers": "Finding available servers...", @@ -376,7 +387,13 @@ "video": "video", "attachment_broken": "This %s is broken and can’t be\nuploaded to Mastodon.", "description_photo": "Describe the photo for the visually-impaired...", - "description_video": "Describe the video for the visually-impaired..." + "description_video": "Describe the video for the visually-impaired...", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "Duration: %s", @@ -386,7 +403,9 @@ "one_day": "1 Day", "three_days": "3 Days", "seven_days": "7 Days", - "option_number": "Option %ld" + "option_number": "Option %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "Write an accurate warning here..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Custom Emoji Picker", "enable_content_warning": "Enable Content Warning", "disable_content_warning": "Disable Content Warning", - "post_visibility_menu": "Post Visibility Menu" + "post_visibility_menu": "Post Visibility Menu", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "Discard Post", @@ -432,6 +453,10 @@ "placeholder": { "label": "Label", "content": "Content" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Localization/StringsConvertor/input/de.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/de.lproj/Localizable.stringsdict index c6a8a4297..1965fd02b 100644 --- a/Localization/StringsConvertor/input/de.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/de.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld Zeichen + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey @@ -248,9 +264,9 @@ NSStringFormatValueTypeKey ld one - 1 Follower + 1 Folgender other - %ld Follower + %ld Folgende date.year.left diff --git a/Localization/StringsConvertor/input/de.lproj/app.json b/Localization/StringsConvertor/input/de.lproj/app.json index 355bfcc1b..894a0245e 100644 --- a/Localization/StringsConvertor/input/de.lproj/app.json +++ b/Localization/StringsConvertor/input/de.lproj/app.json @@ -75,7 +75,7 @@ "save_photo": "Foto speichern", "copy_photo": "Foto kopieren", "sign_in": "Anmelden", - "sign_up": "Registrieren", + "sign_up": "Konto erstellen", "see_more": "Mehr anzeigen", "preview": "Vorschau", "share": "Teilen", @@ -136,6 +136,12 @@ "vote": "Abstimmen", "closed": "Beendet" }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Show Profile: %s", + "email": "Email address: %s" + }, "actions": { "reply": "Antworten", "reblog": "Teilen", @@ -212,10 +218,16 @@ "get_started": "Registrieren", "log_in": "Anmelden" }, + "login": { + "title": "Willkommen zurück", + "subtitle": "Melden Sie sich auf dem Server an, auf dem Sie Ihr Konto erstellt haben.", + "server_search_field": { + "placeholder": "URL eingeben oder nach Server suchen" + } + }, "server_picker": { "title": "Wähle einen Server,\nbeliebigen Server.", - "subtitle": "Wähle eine Gemeinschaft, die auf deinen Interessen, Region oder einem allgemeinen Zweck basiert.", - "subtitle_extend": "Wähle eine Gemeinschaft basierend auf deinen Interessen, deiner Region oder einem allgemeinen Zweck. Jede Gemeinschaft wird von einer völlig unabhängigen Organisation oder Einzelperson betrieben.", + "subtitle": "Wähle einen Server basierend auf deinen Interessen oder deiner Region – oder einfach einen allgemeinen. Du kannst trotzdem mit jedem interagieren, egal auf welchem Server.", "button": { "category": { "all": "Alle", @@ -242,8 +254,7 @@ "category": "KATEGORIE" }, "input": { - "placeholder": "Nach Server suchen oder URL eingeben", - "search_servers_or_enter_url": "Nach Server suchen oder URL eingeben" + "search_servers_or_enter_url": "Suche nach einer Community oder gib eine URL ein" }, "empty_state": { "finding_servers": "Verfügbare Server werden gesucht...", @@ -376,7 +387,13 @@ "video": "Video", "attachment_broken": "Dieses %s scheint defekt zu sein und\nkann nicht auf Mastodon hochgeladen werden.", "description_photo": "Für Menschen mit Sehbehinderung beschreiben...", - "description_video": "Für Menschen mit Sehbehinderung beschreiben..." + "description_video": "Für Menschen mit Sehbehinderung beschreiben...", + "load_failed": "Laden fehlgeschlagen", + "upload_failed": "Upload fehlgeschlagen", + "can_not_recognize_this_media_attachment": "Medienanhang wurde nicht erkannt", + "attachment_too_large": "Anhang zu groß", + "compressing_state": "Komprimieren...", + "server_processing_state": "Serververarbeitung..." }, "poll": { "duration_time": "Dauer: %s", @@ -386,7 +403,9 @@ "one_day": "1 Tag", "three_days": "3 Tage", "seven_days": "7 Tage", - "option_number": "Auswahlmöglichkeit %ld" + "option_number": "Auswahlmöglichkeit %ld", + "the_poll_is_invalid": "Die Umfrage ist ungültig", + "the_poll_has_empty_option": "Die Umfrage hat eine leere Option" }, "content_warning": { "placeholder": "Schreibe eine Inhaltswarnung hier..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Benutzerdefinierter Emojiwähler", "enable_content_warning": "Inhaltswarnung einschalten", "disable_content_warning": "Inhaltswarnung ausschalten", - "post_visibility_menu": "Sichtbarkeitsmenü" + "post_visibility_menu": "Sichtbarkeitsmenü", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "Beitrag verwerfen", @@ -425,13 +446,17 @@ "dashboard": { "posts": "Beiträge", "following": "Gefolgte", - "followers": "Folger" + "followers": "Folgende" }, "fields": { "add_row": "Zeile hinzufügen", "placeholder": { "label": "Bezeichnung", "content": "Inhalt" + }, + "verified": { + "short": "Überprüft am %s", + "long": "Besitz des Links wurde überprüft am %s" } }, "segmented_control": { @@ -460,7 +485,7 @@ }, "confirm_show_reblogs": { "title": "Reblogs anzeigen", - "message": "Confirm to show reblogs" + "message": "Bestätigen um Reblogs anzuzeigen" }, "confirm_hide_reblogs": { "title": "Reblogs ausblenden", @@ -476,11 +501,11 @@ }, "follower": { "title": "Follower", - "footer": "Follower von anderen Servern werden nicht angezeigt." + "footer": "Folger, die nicht auf deinem Server registriert sind, werden nicht angezeigt." }, "following": { "title": "Folgende", - "footer": "Wem das Konto folgt wird von anderen Servern werden nicht angezeigt." + "footer": "Gefolgte, die nicht auf deinem Server registriert sind, werden nicht angezeigt." }, "familiarFollowers": { "title": "Follower, die dir bekannt vorkommen", @@ -590,7 +615,7 @@ "mentions": "Mich erwähnt", "trigger": { "anyone": "jeder", - "follower": "ein Folger", + "follower": "ein Folgender", "follow": "ein von mir Gefolgter", "noone": "niemand", "title": "Benachrichtige mich, wenn" @@ -696,7 +721,7 @@ "accessibility_hint": "Doppeltippen, um diesen Assistenten zu schließen" }, "bookmark": { - "title": "Bookmarks" + "title": "Lesezeichen" } } } diff --git a/Localization/StringsConvertor/input/de.lproj/ios-infoPlist.json b/Localization/StringsConvertor/input/de.lproj/ios-infoPlist.json index fe8fe1c1a..a571fba1c 100644 --- a/Localization/StringsConvertor/input/de.lproj/ios-infoPlist.json +++ b/Localization/StringsConvertor/input/de.lproj/ios-infoPlist.json @@ -1,6 +1,6 @@ { - "NSCameraUsageDescription": "Verwendet um Fotos für neue Beiträge aufzunehmen", - "NSPhotoLibraryAddUsageDescription": "Verwendet um Fotos zu speichern", + "NSCameraUsageDescription": "Wird verwendet, um Fotos für neue Beiträge aufzunehmen", + "NSPhotoLibraryAddUsageDescription": "Wird verwendet, um Foto in der Foto-Mediathek zu speichern", "NewPostShortcutItemTitle": "Neuer Beitrag", - "SearchShortcutItemTitle": "Suche" + "SearchShortcutItemTitle": "Suchen" } diff --git a/Localization/StringsConvertor/input/en-US.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/en-US.lproj/Localizable.stringsdict index bdcae6ac9..eabdc3c32 100644 --- a/Localization/StringsConvertor/input/en-US.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/en-US.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld characters + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/en-US.lproj/app.json b/Localization/StringsConvertor/input/en-US.lproj/app.json index 80b0882d9..3113ada74 100644 --- a/Localization/StringsConvertor/input/en-US.lproj/app.json +++ b/Localization/StringsConvertor/input/en-US.lproj/app.json @@ -74,8 +74,8 @@ "take_photo": "Take Photo", "save_photo": "Save Photo", "copy_photo": "Copy Photo", - "sign_in": "Sign In", - "sign_up": "Sign Up", + "sign_in": "Log in", + "sign_up": "Create account", "see_more": "See More", "preview": "Preview", "share": "Share", @@ -136,6 +136,12 @@ "vote": "Vote", "closed": "Closed" }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Show Profile: %s", + "email": "Email address: %s" + }, "actions": { "reply": "Reply", "reblog": "Reblog", @@ -212,10 +218,16 @@ "get_started": "Get Started", "log_in": "Log In" }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, "server_picker": { "title": "Mastodon is made of users in different servers.", - "subtitle": "Pick a server based on your interests, region, or a general purpose one.", - "subtitle_extend": "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "All", @@ -242,8 +254,7 @@ "category": "CATEGORY" }, "input": { - "placeholder": "Search servers", - "search_servers_or_enter_url": "Search servers or enter URL" + "search_servers_or_enter_url": "Search communities or enter URL" }, "empty_state": { "finding_servers": "Finding available servers...", @@ -376,7 +387,13 @@ "video": "video", "attachment_broken": "This %s is broken and can’t be\nuploaded to Mastodon.", "description_photo": "Describe the photo for the visually-impaired...", - "description_video": "Describe the video for the visually-impaired..." + "description_video": "Describe the video for the visually-impaired...", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "Duration: %s", @@ -386,7 +403,9 @@ "one_day": "1 Day", "three_days": "3 Days", "seven_days": "7 Days", - "option_number": "Option %ld" + "option_number": "Option %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "Write an accurate warning here..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Custom Emoji Picker", "enable_content_warning": "Enable Content Warning", "disable_content_warning": "Disable Content Warning", - "post_visibility_menu": "Post Visibility Menu" + "post_visibility_menu": "Post Visibility Menu", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "Discard Post", @@ -432,6 +453,10 @@ "placeholder": { "label": "Label", "content": "Content" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Localization/StringsConvertor/input/en.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/en.lproj/Localizable.stringsdict index bdcae6ac9..297e6675a 100644 --- a/Localization/StringsConvertor/input/en.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/en.lproj/Localizable.stringsdict @@ -50,6 +50,28 @@ %ld characters + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + no characters + one + 1 character + few + %ld characters + many + %ld characters + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/en.lproj/app.json b/Localization/StringsConvertor/input/en.lproj/app.json index 8867385e2..3113ada74 100644 --- a/Localization/StringsConvertor/input/en.lproj/app.json +++ b/Localization/StringsConvertor/input/en.lproj/app.json @@ -74,8 +74,8 @@ "take_photo": "Take Photo", "save_photo": "Save Photo", "copy_photo": "Copy Photo", - "sign_in": "Sign In", - "sign_up": "Sign Up", + "sign_in": "Log in", + "sign_up": "Create account", "see_more": "See More", "preview": "Preview", "share": "Share", @@ -138,7 +138,7 @@ }, "meta_entity": { "url": "Link: %s", - "hashtag": "Hastag %s", + "hashtag": "Hashtag: %s", "mention": "Show Profile: %s", "email": "Email address: %s" }, @@ -218,10 +218,16 @@ "get_started": "Get Started", "log_in": "Log In" }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, "server_picker": { "title": "Mastodon is made of users in different servers.", - "subtitle": "Pick a server based on your interests, region, or a general purpose one.", - "subtitle_extend": "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "All", @@ -248,8 +254,7 @@ "category": "CATEGORY" }, "input": { - "placeholder": "Search servers", - "search_servers_or_enter_url": "Search servers or enter URL" + "search_servers_or_enter_url": "Search communities or enter URL" }, "empty_state": { "finding_servers": "Finding available servers...", @@ -382,7 +387,13 @@ "video": "video", "attachment_broken": "This %s is broken and can’t be\nuploaded to Mastodon.", "description_photo": "Describe the photo for the visually-impaired...", - "description_video": "Describe the video for the visually-impaired..." + "description_video": "Describe the video for the visually-impaired...", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "Duration: %s", @@ -392,7 +403,9 @@ "one_day": "1 Day", "three_days": "3 Days", "seven_days": "7 Days", - "option_number": "Option %ld" + "option_number": "Option %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "Write an accurate warning here..." @@ -413,7 +426,9 @@ "custom_emoji_picker": "Custom Emoji Picker", "enable_content_warning": "Enable Content Warning", "disable_content_warning": "Disable Content Warning", - "post_visibility_menu": "Post Visibility Menu" + "post_visibility_menu": "Post Visibility Menu", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "Discard Post", @@ -438,6 +453,10 @@ "placeholder": { "label": "Label", "content": "Content" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Localization/StringsConvertor/input/es-AR.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/es-AR.lproj/Localizable.stringsdict index 2bd66395a..fb939a040 100644 --- a/Localization/StringsConvertor/input/es-AR.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/es-AR.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld caracteres + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + Quedan %#@character_count@ + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 caracter + other + %ld caracteres + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/es-AR.lproj/app.json b/Localization/StringsConvertor/input/es-AR.lproj/app.json index 62d439a3c..5be543f98 100644 --- a/Localization/StringsConvertor/input/es-AR.lproj/app.json +++ b/Localization/StringsConvertor/input/es-AR.lproj/app.json @@ -75,7 +75,7 @@ "save_photo": "Guardar foto", "copy_photo": "Copiar foto", "sign_in": "Iniciar sesión", - "sign_up": "Registrarse", + "sign_up": "Crear cuenta", "see_more": "Ver más", "preview": "Previsualización", "share": "Compartir", @@ -136,6 +136,12 @@ "vote": "Votar", "closed": "Cerrada" }, + "meta_entity": { + "url": "Enlace: %s", + "hashtag": "Etiqueta: %s", + "mention": "Mostrar perfil: %s", + "email": "Dirección de correo electrónico: %s" + }, "actions": { "reply": "Responder", "reblog": "Adherir", @@ -212,10 +218,16 @@ "get_started": "Comenzá", "log_in": "Iniciar sesión" }, + "login": { + "title": "Hola de nuevo", + "subtitle": "Iniciá sesión en el servidor en donde creaste tu cuenta.", + "server_search_field": { + "placeholder": "Ingresá la dirección web o buscá tu servidor" + } + }, "server_picker": { "title": "Mastodon está compuesto de cuentas en diferentes servidores.", - "subtitle": "Elegí un servidor basado en tus intereses, región, o de propósitos generales.", - "subtitle_extend": "Elegí un servidor basado en tus intereses, región, o de propósitos generales. Cada servidor es operado por una organización o individuo totalmente independientes.", + "subtitle": "Elegí un servidor basado en tu región, en tus intereses o uno de propósitos generales. Vas a poder interactuar con cualquier cuenta de Mastodon, independientemente del servidor.", "button": { "category": { "all": "Todas", @@ -242,8 +254,7 @@ "category": "CATEGORÍA" }, "input": { - "placeholder": "Buscar servidores", - "search_servers_or_enter_url": "Buscar servidores o introducir dirección web" + "search_servers_or_enter_url": "Buscá comunidades o ingresá la dirección web" }, "empty_state": { "finding_servers": "Buscando servidores disponibles…", @@ -376,7 +387,13 @@ "video": "video", "attachment_broken": "Este archivo de %s está roto\ny no se puede subir a Mastodon.", "description_photo": "Describí la imagen para personas con dificultades visuales…", - "description_video": "Describí el video para personas con dificultades visuales…" + "description_video": "Describí el video para personas con dificultades visuales…", + "load_failed": "Falló la descarga", + "upload_failed": "Falló la subida", + "can_not_recognize_this_media_attachment": "No se pudo reconocer este archivo adjunto", + "attachment_too_large": "Adjunto demasiado grande", + "compressing_state": "Comprimiendo…", + "server_processing_state": "Servidor procesando…" }, "poll": { "duration_time": "Duración: %s", @@ -386,7 +403,9 @@ "one_day": "1 día", "three_days": "3 días", "seven_days": "7 días", - "option_number": "Opción %ld" + "option_number": "Opción %ld", + "the_poll_is_invalid": "La encuesta no es válida", + "the_poll_has_empty_option": "La encuesta tiene opción vacía" }, "content_warning": { "placeholder": "Escribí una advertencia precisa acá…" @@ -407,7 +426,9 @@ "custom_emoji_picker": "Selector de emoji personalizado", "enable_content_warning": "Habilitar advertencia de contenido", "disable_content_warning": "Deshabilitar advertencia de contenido", - "post_visibility_menu": "Menú de visibilidad del mensaje" + "post_visibility_menu": "Menú de visibilidad del mensaje", + "post_options": "Opciones de mensaje", + "posting_as": "Enviar como %s" }, "keyboard": { "discard_post": "Descartar mensaje", @@ -432,6 +453,10 @@ "placeholder": { "label": "Nombre de campo", "content": "Valor de campo" + }, + "verified": { + "short": "Verificado en %s", + "long": "La propiedad de este enlace fue verificada el %s" } }, "segmented_control": { @@ -696,7 +721,7 @@ "accessibility_hint": "Tocá dos veces para descartar este asistente" }, "bookmark": { - "title": "Bookmarks" + "title": "Marcadores" } } } diff --git a/Localization/StringsConvertor/input/es.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/es.lproj/Localizable.stringsdict index def3d7bba..ca07b6b28 100644 --- a/Localization/StringsConvertor/input/es.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/es.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld caracteres + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/es.lproj/app.json b/Localization/StringsConvertor/input/es.lproj/app.json index 39e0f37d1..1b90bfa10 100644 --- a/Localization/StringsConvertor/input/es.lproj/app.json +++ b/Localization/StringsConvertor/input/es.lproj/app.json @@ -74,8 +74,8 @@ "take_photo": "Tomar foto", "save_photo": "Guardar foto", "copy_photo": "Copiar foto", - "sign_in": "Iniciar sesión", - "sign_up": "Regístrate", + "sign_in": "Log in", + "sign_up": "Create account", "see_more": "Ver más", "preview": "Vista previa", "share": "Compartir", @@ -136,6 +136,12 @@ "vote": "Vota", "closed": "Cerrado" }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Show Profile: %s", + "email": "Email address: %s" + }, "actions": { "reply": "Responder", "reblog": "Rebloguear", @@ -212,10 +218,16 @@ "get_started": "Empezar", "log_in": "Iniciar sesión" }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, "server_picker": { "title": "Elige un servidor,\ncualquier servidor.", - "subtitle": "Elige una comunidad relacionada con tus intereses, con tu región o una más genérica.", - "subtitle_extend": "Elige una comunidad relacionada con tus intereses, con tu región o una más genérica. Cada comunidad está operada por una organización o individuo completamente independiente.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "Todas", @@ -242,8 +254,7 @@ "category": "CATEGORÍA" }, "input": { - "placeholder": "Encuentra un servidor o únete al tuyo propio...", - "search_servers_or_enter_url": "Buscar servidores o introducir la URL" + "search_servers_or_enter_url": "Search communities or enter URL" }, "empty_state": { "finding_servers": "Encontrando servidores disponibles...", @@ -376,7 +387,13 @@ "video": "vídeo", "attachment_broken": "Este %s está roto y no puede\nsubirse a Mastodon.", "description_photo": "Describe la foto para los usuarios con dificultad visual...", - "description_video": "Describe el vídeo para los usuarios con dificultad visual..." + "description_video": "Describe el vídeo para los usuarios con dificultad visual...", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "Duración: %s", @@ -386,7 +403,9 @@ "one_day": "1 Día", "three_days": "4 Días", "seven_days": "7 Días", - "option_number": "Opción %ld" + "option_number": "Opción %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "Escribe una advertencia precisa aquí..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Selector de Emojis Personalizados", "enable_content_warning": "Activar Advertencia de Contenido", "disable_content_warning": "Desactivar Advertencia de Contenido", - "post_visibility_menu": "Menú de Visibilidad de la Publicación" + "post_visibility_menu": "Menú de Visibilidad de la Publicación", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "Descartar Publicación", @@ -432,6 +453,10 @@ "placeholder": { "label": "Nombre para el campo", "content": "Contenido" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Localization/StringsConvertor/input/eu.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/eu.lproj/Localizable.stringsdict index 0159a7da9..057ca4010 100644 --- a/Localization/StringsConvertor/input/eu.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/eu.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld karaktere + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/eu.lproj/app.json b/Localization/StringsConvertor/input/eu.lproj/app.json index 5c2e16601..3da0d6a00 100644 --- a/Localization/StringsConvertor/input/eu.lproj/app.json +++ b/Localization/StringsConvertor/input/eu.lproj/app.json @@ -74,8 +74,8 @@ "take_photo": "Atera argazkia", "save_photo": "Gorde argazkia", "copy_photo": "Kopiatu argazkia", - "sign_in": "Hasi saioa", - "sign_up": "Eman Izena", + "sign_in": "Log in", + "sign_up": "Create account", "see_more": "Ikusi gehiago", "preview": "Aurrebista", "share": "Partekatu", @@ -136,6 +136,12 @@ "vote": "Bozkatu", "closed": "Itxita" }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Show Profile: %s", + "email": "Email address: %s" + }, "actions": { "reply": "Erantzun", "reblog": "Bultzada", @@ -212,10 +218,16 @@ "get_started": "Nola hasi", "log_in": "Hasi saioa" }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, "server_picker": { "title": "Aukeratu zerbitzari bat,\nedozein zerbitzari.", - "subtitle": "Aukeratu komunitate bat zure interes edo lurraldearen arabera, edo erabilera orokorreko bat.", - "subtitle_extend": "Aukeratu komunitate bat zure interes edo lurraldearen arabera, edo erabilera orokorreko bat. Komunitate bakoitza erakunde edo norbanako independente batek kudeatzen du.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "Guztiak", @@ -242,8 +254,7 @@ "category": "KATEGORIA" }, "input": { - "placeholder": "Bilatu zerbitzari bat edo sortu zurea...", - "search_servers_or_enter_url": "Search servers or enter URL" + "search_servers_or_enter_url": "Search communities or enter URL" }, "empty_state": { "finding_servers": "Erabilgarri dauden zerbitzariak bilatzen...", @@ -376,7 +387,13 @@ "video": "bideoa", "attachment_broken": "%s hondatuta dago eta ezin da\nMastodonera igo.", "description_photo": "Deskribatu argazkia ikusmen arazoak dituztenentzat...", - "description_video": "Deskribatu bideoa ikusmen arazoak dituztenentzat..." + "description_video": "Deskribatu bideoa ikusmen arazoak dituztenentzat...", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "Iraupena: %s", @@ -386,7 +403,9 @@ "one_day": "Egun 1", "three_days": "3 egun", "seven_days": "7 egun", - "option_number": "%ld aukera" + "option_number": "%ld aukera", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "Idatzi abisu zehatz bat hemen..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Emoji pertsonalizatuen hautatzailea", "enable_content_warning": "Gaitu edukiaren abisua", "disable_content_warning": "Desgaitu edukiaren abisua", - "post_visibility_menu": "Bidalketaren ikusgaitasunaren menua" + "post_visibility_menu": "Bidalketaren ikusgaitasunaren menua", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "Baztertu bidalketa", @@ -432,6 +453,10 @@ "placeholder": { "label": "Etiketa", "content": "Edukia" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Localization/StringsConvertor/input/fi.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/fi.lproj/Localizable.stringsdict index 8048edf2d..ccfee35c9 100644 --- a/Localization/StringsConvertor/input/fi.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/fi.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld merkkiä + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/fi.lproj/app.json b/Localization/StringsConvertor/input/fi.lproj/app.json index d6210c4d5..7dafe7fd1 100644 --- a/Localization/StringsConvertor/input/fi.lproj/app.json +++ b/Localization/StringsConvertor/input/fi.lproj/app.json @@ -74,8 +74,8 @@ "take_photo": "Ota kuva", "save_photo": "Tallenna kuva", "copy_photo": "Kopioi kuva", - "sign_in": "Kirjaudu sisään", - "sign_up": "Rekisteröidy", + "sign_in": "Log in", + "sign_up": "Create account", "see_more": "Näytä lisää", "preview": "Esikatselu", "share": "Jaa", @@ -136,6 +136,12 @@ "vote": "Vote", "closed": "Suljettu" }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Show Profile: %s", + "email": "Email address: %s" + }, "actions": { "reply": "Vastaa", "reblog": "Jaa edelleen", @@ -212,10 +218,16 @@ "get_started": "Get Started", "log_in": "Log In" }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, "server_picker": { "title": "Valitse palvelin,\nmikä tahansa palvelin.", - "subtitle": "Pick a server based on your interests, region, or a general purpose one.", - "subtitle_extend": "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "Kaikki", @@ -242,8 +254,7 @@ "category": "KATEGORIA" }, "input": { - "placeholder": "Etsi palvelin tai liity omaan...", - "search_servers_or_enter_url": "Search servers or enter URL" + "search_servers_or_enter_url": "Search communities or enter URL" }, "empty_state": { "finding_servers": "Etsistään saatavilla olevia palvelimia...", @@ -376,7 +387,13 @@ "video": "video", "attachment_broken": "This %s is broken and can’t be\nuploaded to Mastodon.", "description_photo": "Kuvaile kuva näkövammaisille...", - "description_video": "Kuvaile video näkövammaisille..." + "description_video": "Kuvaile video näkövammaisille...", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "Kesto: %s", @@ -386,7 +403,9 @@ "one_day": "1 päivä", "three_days": "3 päivää", "seven_days": "7 päivää", - "option_number": "Vaihtoehto %ld" + "option_number": "Vaihtoehto %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "Kirjoita tarkka varoitus tähän..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Mukautettu emojivalitsin", "enable_content_warning": "Ota sisältövaroitus käyttöön", "disable_content_warning": "Poista sisältövaroitus käytöstä", - "post_visibility_menu": "Julkaisun näkyvyysvalikko" + "post_visibility_menu": "Julkaisun näkyvyysvalikko", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "Hylkää julkaisu", @@ -432,6 +453,10 @@ "placeholder": { "label": "Nimi", "content": "Sisältö" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Localization/StringsConvertor/input/fr.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/fr.lproj/Localizable.stringsdict index d9d860a47..4eb068697 100644 --- a/Localization/StringsConvertor/input/fr.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/fr.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld caractères + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ restants + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 caractère + other + %ld caractères + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/fr.lproj/app.json b/Localization/StringsConvertor/input/fr.lproj/app.json index ed53d1096..fc8fd0e7a 100644 --- a/Localization/StringsConvertor/input/fr.lproj/app.json +++ b/Localization/StringsConvertor/input/fr.lproj/app.json @@ -136,6 +136,12 @@ "vote": "Voter", "closed": "Fermé" }, + "meta_entity": { + "url": "Lien : %s", + "hashtag": "Hashtag : %s", + "mention": "Afficher le profile : %s", + "email": "Adresse e-mail : %s" + }, "actions": { "reply": "Répondre", "reblog": "Rebloguer", @@ -212,10 +218,16 @@ "get_started": "Prise en main", "log_in": "Se connecter" }, + "login": { + "title": "Content de vous revoir", + "subtitle": "Connectez-vous sur le serveur sur lequel vous avez créé votre compte.", + "server_search_field": { + "placeholder": "Entrez l'URL ou recherchez votre serveur" + } + }, "server_picker": { "title": "Choisissez un serveur,\nn'importe quel serveur.", - "subtitle": "Choisissez une communauté en fonction de vos intérêts, de votre région ou de votre objectif général.", - "subtitle_extend": "Choisissez une communauté basée sur vos intérêts, votre région ou un but général. Chaque communauté est gérée par une organisation ou un individu entièrement indépendant.", + "subtitle": "Choisissez un serveur basé sur votre région, vos intérêts ou un généraliste. Vous pouvez toujours discuter avec n'importe qui sur Mastodon, indépendamment de vos serveurs.", "button": { "category": { "all": "Tout", @@ -242,8 +254,7 @@ "category": "CATÉGORIE" }, "input": { - "placeholder": "Trouvez un serveur ou rejoignez le vôtre...", - "search_servers_or_enter_url": "Rechercher des serveurs ou entrer une URL" + "search_servers_or_enter_url": "Rechercher parmi les communautés ou renseigner une URL" }, "empty_state": { "finding_servers": "Recherche des serveurs disponibles...", @@ -376,7 +387,13 @@ "video": "vidéo", "attachment_broken": "Ce %s est brisé et ne peut pas être\ntéléversé sur Mastodon.", "description_photo": "Décrire cette photo pour les personnes malvoyantes...", - "description_video": "Décrire cette vidéo pour les personnes malvoyantes..." + "description_video": "Décrire cette vidéo pour les personnes malvoyantes...", + "load_failed": "Échec du chargement", + "upload_failed": "Échec de l’envoi", + "can_not_recognize_this_media_attachment": "Impossible de reconnaître cette pièce jointe", + "attachment_too_large": "La pièce jointe est trop volumineuse", + "compressing_state": "Compression...", + "server_processing_state": "Traitement du serveur..." }, "poll": { "duration_time": "Durée: %s", @@ -386,7 +403,9 @@ "one_day": "1 Jour", "three_days": "3 jour", "seven_days": "7 jour", - "option_number": "Option %ld" + "option_number": "Option %ld", + "the_poll_is_invalid": "Le sondage est invalide", + "the_poll_has_empty_option": "Le sondage n'a pas d'options" }, "content_warning": { "placeholder": "Écrivez un avertissement précis ici..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Sélecteur d’émojis personnalisés", "enable_content_warning": "Basculer l’avertissement de contenu", "disable_content_warning": "Désactiver l'avertissement de contenu", - "post_visibility_menu": "Menu de Visibilité de la publication" + "post_visibility_menu": "Menu de Visibilité de la publication", + "post_options": "Options de publication", + "posting_as": "Publié en tant que %s" }, "keyboard": { "discard_post": "Rejeter la publication", @@ -432,6 +453,10 @@ "placeholder": { "label": "Étiquette", "content": "Contenu" + }, + "verified": { + "short": "Vérifié le %s", + "long": "La propriété de ce lien a été vérifiée le %s" } }, "segmented_control": { @@ -696,7 +721,7 @@ "accessibility_hint": "Tapotez deux fois pour fermer cet assistant" }, "bookmark": { - "title": "Bookmarks" + "title": "Favoris" } } } diff --git a/Localization/StringsConvertor/input/gd.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/gd.lproj/Localizable.stringsdict index d0ccb5f41..9b3e69ea7 100644 --- a/Localization/StringsConvertor/input/gd.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/gd.lproj/Localizable.stringsdict @@ -62,6 +62,26 @@ %ld caractar + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ air fhàgail + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + %ld charactar + two + %ld charactar + few + %ld caractaran + other + %ld caractar + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/gd.lproj/app.json b/Localization/StringsConvertor/input/gd.lproj/app.json index a2062a89b..74666cb0c 100644 --- a/Localization/StringsConvertor/input/gd.lproj/app.json +++ b/Localization/StringsConvertor/input/gd.lproj/app.json @@ -75,7 +75,7 @@ "save_photo": "Sàbhail an dealbh", "copy_photo": "Dèan lethbhreac dhen dealbh", "sign_in": "Clàraich a-steach", - "sign_up": "Clàraich leinn", + "sign_up": "Cruthaich cunntas", "see_more": "Seall a bharrachd", "preview": "Ro-sheall", "share": "Co-roinn", @@ -136,6 +136,12 @@ "vote": "Cuir bhòt", "closed": "Dùinte" }, + "meta_entity": { + "url": "Ceangal: %s", + "hashtag": "Taga hais: %s", + "mention": "Seall a’ phròifil: %s", + "email": "Seòladh puist-d: %s" + }, "actions": { "reply": "Freagair", "reblog": "Brosnaich", @@ -181,8 +187,8 @@ "unmute_user": "Dì-mhùch %s", "muted": "’Ga mhùchadh", "edit_info": "Deasaich", - "show_reblogs": "Show Reblogs", - "hide_reblogs": "Hide Reblogs" + "show_reblogs": "Seall na brosnachaidhean", + "hide_reblogs": "Falaich na brosnachaidhean" }, "timeline": { "filtered": "Criathraichte", @@ -212,10 +218,16 @@ "get_started": "Dèan toiseach-tòiseachaidh", "log_in": "Clàraich a-steach" }, + "login": { + "title": "Fàilte air ais", + "subtitle": "Clàraich a-steach air an fhrithealaiche far an do chruthaich thu an cunntas agad.", + "server_search_field": { + "placeholder": "Cuir a-steach URL an fhrithealaiche agad" + } + }, "server_picker": { "title": "Tha cleachdaichean Mhastodon air iomadh frithealaiche eadar-dhealaichte.", - "subtitle": "Tagh frithealaiche stèidhichte air d’ ùidhean, air far a bheil thu no fear coitcheann.", - "subtitle_extend": "Tagh frithealaiche stèidhichte air d’ ùidhean, air far a bheil thu no fear coitcheann. Tha gach frithealaiche fo stiùireadh buidhinn no neach neo-eisimeilich fa leth.", + "subtitle": "Tagh frithealaiche stèidhichte air na sgìre agad, d’ ùidhean, air far a bheil thu no fear coitcheann. ’S urrainn dhut fhathast conaltradh le duine sam bith air Mastodon ge b’ e na frithealaichean agaibh-se.", "button": { "category": { "all": "Na h-uile", @@ -242,8 +254,7 @@ "category": "ROINN-SEÒRSA" }, "input": { - "placeholder": "Lorg frithealaiche", - "search_servers_or_enter_url": "Lorg frithealaiche no cuir a-steach URL" + "search_servers_or_enter_url": "Lorg coimhearsnachd no cuir a-steach URL" }, "empty_state": { "finding_servers": "A’ lorg nam frithealaichean ri am faighinn…", @@ -376,7 +387,13 @@ "video": "video", "attachment_broken": "Seo %s a tha briste is cha ghabh\na luchdadh suas gu Mastodon.", "description_photo": "Mìnich an dealbh dhan fheadhainn air a bheil cion-lèirsinne…", - "description_video": "Mìnich a’ video dhan fheadhainn air a bheil cion-lèirsinne…" + "description_video": "Mìnich a’ video dhan fheadhainn air a bheil cion-lèirsinne…", + "load_failed": "Dh’fhàillig leis an luchdadh", + "upload_failed": "Dh’fhàillig leis an luchdadh suas", + "can_not_recognize_this_media_attachment": "Cha do dh’aithnich sinn an ceanglachan meadhain seo", + "attachment_too_large": "Tha an ceanglachan ro mhòr", + "compressing_state": "’Ga dhùmhlachadh…", + "server_processing_state": "Tha am frithealaiche ’ga phròiseasadh…" }, "poll": { "duration_time": "Faide: %s", @@ -386,7 +403,9 @@ "one_day": "Latha", "three_days": "3 làithean", "seven_days": "Seachdain", - "option_number": "Roghainn %ld" + "option_number": "Roghainn %ld", + "the_poll_is_invalid": "Tha an cunntas-bheachd mì-dhligheach", + "the_poll_has_empty_option": "Tha roghainn fhalamh aig a’ chunntas-bheachd" }, "content_warning": { "placeholder": "Sgrìobh rabhadh pongail an-seo…" @@ -407,7 +426,9 @@ "custom_emoji_picker": "Roghnaichear nan Emoji gnàthaichte", "enable_content_warning": "Cuir rabhadh susbainte an comas", "disable_content_warning": "Cuir rabhadh susbainte à comas", - "post_visibility_menu": "Clàr-taice faicsinneachd a’ phuist" + "post_visibility_menu": "Clàr-taice faicsinneachd a’ phuist", + "post_options": "Roghainnean postaidh", + "posting_as": "A’ postadh mar %s" }, "keyboard": { "discard_post": "Tilg air falbh am post", @@ -432,6 +453,10 @@ "placeholder": { "label": "Leubail", "content": "Susbaint" + }, + "verified": { + "short": "Air a dhearbhadh %s", + "long": "Chaidh dearbhadh cò leis a tha an ceangal seo %s" } }, "segmented_control": { @@ -459,12 +484,12 @@ "message": "Dearbh dì-bhacadh %s" }, "confirm_show_reblogs": { - "title": "Show Reblogs", - "message": "Confirm to show reblogs" + "title": "Seall na brosnachaidhean", + "message": "Dearbh sealladh nam brosnachaidhean" }, "confirm_hide_reblogs": { - "title": "Hide Reblogs", - "message": "Confirm to hide reblogs" + "title": "Falaich na brosnachaidhean", + "message": "Dearbh falach nam brosnachaidhean" } }, "accessibility": { @@ -696,7 +721,7 @@ "accessibility_hint": "Thoir gnogag dhùbailte a’ leigeil seachad an draoidh seo" }, "bookmark": { - "title": "Bookmarks" + "title": "Comharran-lìn" } } } diff --git a/Localization/StringsConvertor/input/gl.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/gl.lproj/Localizable.stringsdict index ff9d87c18..51b146ed4 100644 --- a/Localization/StringsConvertor/input/gl.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/gl.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld caracteres + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ restantes + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 caracter + other + %ld caracteres + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/gl.lproj/app.json b/Localization/StringsConvertor/input/gl.lproj/app.json index 513573f79..15c7a612a 100644 --- a/Localization/StringsConvertor/input/gl.lproj/app.json +++ b/Localization/StringsConvertor/input/gl.lproj/app.json @@ -75,7 +75,7 @@ "save_photo": "Gardar foto", "copy_photo": "Copiar foto", "sign_in": "Acceder", - "sign_up": "Inscribirse", + "sign_up": "Crear conta", "see_more": "Ver máis", "preview": "Vista previa", "share": "Compartir", @@ -136,6 +136,12 @@ "vote": "Votar", "closed": "Pechada" }, + "meta_entity": { + "url": "Ligazón: %s", + "hashtag": "Cancelo: %s", + "mention": "Mostrar Perfil: %s", + "email": "Enderezo de email: %s" + }, "actions": { "reply": "Responder", "reblog": "Promover", @@ -181,8 +187,8 @@ "unmute_user": "Deixar de acalar a @%s", "muted": "Acalada", "edit_info": "Editar info", - "show_reblogs": "Show Reblogs", - "hide_reblogs": "Hide Reblogs" + "show_reblogs": "Mostrar Promocións", + "hide_reblogs": "Agochar Promocións" }, "timeline": { "filtered": "Filtrado", @@ -212,10 +218,16 @@ "get_started": "Crear conta", "log_in": "Acceder" }, + "login": { + "title": "Benvido outra vez", + "subtitle": "Conéctate ao servidor no que creaches a conta.", + "server_search_field": { + "placeholder": "Escribe o URL ou busca o teu servidor" + } + }, "server_picker": { "title": "Mastodon fórmano as persoas das diferentes comunidades.", - "subtitle": "Elixe unha comunidade en función dos teus intereses, rexión ou unha de propósito xeral.", - "subtitle_extend": "Elixe unha comunidade en función dos teus intereses, rexión ou unha de propósito xeral. Cada comunidade está xestionada por unha organización totalmente independente ou unha única persoa.", + "subtitle": "Elixe un servidor en función dos teus intereses, rexión o un de propósito xeral. Poderás conversar con calquera en Mastodon, independentemente do servidor que elixas.", "button": { "category": { "all": "Todo", @@ -242,8 +254,7 @@ "category": "CATEGORÍA" }, "input": { - "placeholder": "Buscar comunidades", - "search_servers_or_enter_url": "Busca un servidor ou escribe URL" + "search_servers_or_enter_url": "Busca comunidades ou escribe URL" }, "empty_state": { "finding_servers": "Buscando servidores dispoñibles...", @@ -376,7 +387,13 @@ "video": "vídeo", "attachment_broken": "Este %s está estragado e non pode\nser subido a Mastodon.", "description_photo": "Describe a foto para persoas con problemas visuais...", - "description_video": "Describe o vídeo para persoas con problemas visuais..." + "description_video": "Describe o vídeo para persoas con problemas visuais...", + "load_failed": "Fallou a carga", + "upload_failed": "Erro na subida", + "can_not_recognize_this_media_attachment": "Non se recoñece o tipo de multimedia", + "attachment_too_large": "Adxunto demasiado grande", + "compressing_state": "Comprimindo...", + "server_processing_state": "Procesando no servidor..." }, "poll": { "duration_time": "Duración: %s", @@ -386,7 +403,9 @@ "one_day": "1 Día", "three_days": "3 Días", "seven_days": "7 Días", - "option_number": "Opción %ld" + "option_number": "Opción %ld", + "the_poll_is_invalid": "A enquisa non é válida", + "the_poll_has_empty_option": "A enquisa ten unha opción baleira" }, "content_warning": { "placeholder": "Escribe o teu aviso aquí..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Selector emoji personalizado", "enable_content_warning": "Marcar con Aviso sobre o contido", "disable_content_warning": "Retirar Aviso sobre o contido", - "post_visibility_menu": "Visibilidade da publicación" + "post_visibility_menu": "Visibilidade da publicación", + "post_options": "Opcións da publicación", + "posting_as": "Publicando como %s" }, "keyboard": { "discard_post": "Descartar publicación", @@ -432,6 +453,10 @@ "placeholder": { "label": "Etiqueta", "content": "Contido" + }, + "verified": { + "short": "Verificada en %s", + "long": "A propiedade desta ligazón foi verificada o %s" } }, "segmented_control": { @@ -459,12 +484,12 @@ "message": "Confirma o desbloqueo de %s" }, "confirm_show_reblogs": { - "title": "Show Reblogs", - "message": "Confirm to show reblogs" + "title": "Mostrar Promocións", + "message": "Confirma para ver promocións" }, "confirm_hide_reblogs": { - "title": "Hide Reblogs", - "message": "Confirm to hide reblogs" + "title": "Agochar Promocións", + "message": "Confirma para agochar promocións" } }, "accessibility": { @@ -696,7 +721,7 @@ "accessibility_hint": "Dobre toque para desbotar este asistente" }, "bookmark": { - "title": "Bookmarks" + "title": "Marcadores" } } } diff --git a/Localization/StringsConvertor/input/hi.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/hi.lproj/Localizable.stringsdict index bdcae6ac9..eabdc3c32 100644 --- a/Localization/StringsConvertor/input/hi.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/hi.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld characters + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/hi.lproj/app.json b/Localization/StringsConvertor/input/hi.lproj/app.json index d9ef32b3a..f9414b6c0 100644 --- a/Localization/StringsConvertor/input/hi.lproj/app.json +++ b/Localization/StringsConvertor/input/hi.lproj/app.json @@ -74,8 +74,8 @@ "take_photo": "Take Photo", "save_photo": "Save Photo", "copy_photo": "Copy Photo", - "sign_in": "Sign In", - "sign_up": "Sign Up", + "sign_in": "Log in", + "sign_up": "Create account", "see_more": "See More", "preview": "Preview", "share": "Share", @@ -136,6 +136,12 @@ "vote": "Vote", "closed": "Closed" }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Show Profile: %s", + "email": "Email address: %s" + }, "actions": { "reply": "Reply", "reblog": "Reblog", @@ -212,10 +218,16 @@ "get_started": "Get Started", "log_in": "Log In" }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, "server_picker": { "title": "Mastodon is made of users in different servers.", - "subtitle": "Pick a server based on your interests, region, or a general purpose one.", - "subtitle_extend": "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "All", @@ -242,8 +254,7 @@ "category": "CATEGORY" }, "input": { - "placeholder": "Search servers", - "search_servers_or_enter_url": "Search servers or enter URL" + "search_servers_or_enter_url": "Search communities or enter URL" }, "empty_state": { "finding_servers": "Finding available servers...", @@ -376,7 +387,13 @@ "video": "video", "attachment_broken": "This %s is broken and can’t be\nuploaded to Mastodon.", "description_photo": "Describe the photo for the visually-impaired...", - "description_video": "Describe the video for the visually-impaired..." + "description_video": "Describe the video for the visually-impaired...", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "Duration: %s", @@ -386,7 +403,9 @@ "one_day": "1 Day", "three_days": "3 Days", "seven_days": "7 Days", - "option_number": "Option %ld" + "option_number": "Option %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "Write an accurate warning here..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Custom Emoji Picker", "enable_content_warning": "Enable Content Warning", "disable_content_warning": "Disable Content Warning", - "post_visibility_menu": "Post Visibility Menu" + "post_visibility_menu": "Post Visibility Menu", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "Discard Post", @@ -432,6 +453,10 @@ "placeholder": { "label": "Label", "content": "Content" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Localization/StringsConvertor/input/id.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/id.lproj/Localizable.stringsdict index 2635defb8..9b8aca01c 100644 --- a/Localization/StringsConvertor/input/id.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/id.lproj/Localizable.stringsdict @@ -44,6 +44,20 @@ %ld karakter + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/id.lproj/app.json b/Localization/StringsConvertor/input/id.lproj/app.json index 607e9a638..4f2050792 100644 --- a/Localization/StringsConvertor/input/id.lproj/app.json +++ b/Localization/StringsConvertor/input/id.lproj/app.json @@ -6,29 +6,29 @@ "please_try_again_later": "Silakan coba lagi nanti." }, "sign_up_failure": { - "title": "Sign Up Failure" + "title": "Gagal Mendaftar" }, "server_error": { "title": "Kesalahan Server" }, "vote_failure": { - "title": "Vote Failure", + "title": "Gagal Voting", "poll_ended": "Japat telah berakhir" }, "discard_post_content": { "title": "Hapus Draf", - "message": "Confirm to discard composed post content." + "message": "Konfirmasi untuk mengabaikan postingan yang dibuat." }, "publish_post_failure": { - "title": "Publish Failure", - "message": "Failed to publish the post.\nPlease check your internet connection.", + "title": "Gagal Mempublikasikan", + "message": "Gagal mempublikasikan postingan.\nMohon periksa koneksi Internet Anda.", "attachments_message": { "video_attach_with_photo": "Tidak dapat melampirkan video di postingan yang sudah mengandung gambar.", "more_than_one_video": "Tidak dapat melampirkan lebih dari satu video." } }, "edit_profile_failure": { - "title": "Edit Profile Error", + "title": "Masalah dalam mengubah profil", "message": "Tidak dapat menyunting profil. Harap coba lagi." }, "sign_out": { @@ -37,16 +37,16 @@ "confirm": "Keluar" }, "block_domain": { - "title": "Are you really, really sure you want to block the entire %s? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain and any of your followers from that domain will be removed.", + "title": "Apakah Anda benar, benar yakin ingin memblokir keseluruhan %s? Dalam kebanyakan kasus, beberapa pemblokiran atau pembisuan yang ditargetkan sudah cukup dan lebih disukai. Anda tidak akan melihat konten dari domain tersebut dan semua pengikut Anda dari domain itu akan dihapus.", "block_entire_domain": "Blokir Domain" }, "save_photo_failure": { - "title": "Save Photo Failure", - "message": "Please enable the photo library access permission to save the photo." + "title": "Gagal Menyimpan Foto", + "message": "Mohon aktifkan izin akses pustaka foto untuk menyimpan foto." }, "delete_post": { "title": "Apakah Anda yakin ingin menghapus postingan ini?", - "message": "Are you sure you want to delete this post?" + "message": "Apakah Anda yakin untuk menghapus kiriman ini?" }, "clean_cache": { "title": "Bersihkan Cache", @@ -67,24 +67,24 @@ "done": "Selesai", "confirm": "Konfirmasi", "continue": "Lanjut", - "compose": "Compose", + "compose": "Tulis", "cancel": "Batal", - "discard": "Discard", + "discard": "Buang", "try_again": "Coba Lagi", - "take_photo": "Take Photo", + "take_photo": "Ambil Foto", "save_photo": "Simpan Foto", "copy_photo": "Salin Foto", "sign_in": "Masuk", - "sign_up": "Daftar", + "sign_up": "Buat akun", "see_more": "Lihat lebih banyak", "preview": "Pratinjau", "share": "Bagikan", "share_user": "Bagikan %s", "share_post": "Bagikan Postingan", "open_in_safari": "Buka di Safari", - "open_in_browser": "Open in Browser", + "open_in_browser": "Buka di Peramban", "find_people": "Cari orang untuk diikuti", - "manually_search": "Manually search instead", + "manually_search": "Cari secara manual saja", "skip": "Lewati", "reply": "Balas", "report_user": "Laporkan %s", @@ -111,16 +111,16 @@ "next_status": "Postingan Selanjutnya", "open_status": "Buka Postingan", "open_author_profile": "Buka Profil Penulis", - "open_reblogger_profile": "Open Reblogger's Profile", + "open_reblogger_profile": "Buka Profil Reblogger", "reply_status": "Balas Postingan", - "toggle_reblog": "Toggle Reblog on Post", - "toggle_favorite": "Toggle Favorite on Post", - "toggle_content_warning": "Toggle Content Warning", - "preview_image": "Preview Image" + "toggle_reblog": "Nyalakan Reblog pada Postingan", + "toggle_favorite": "Nyalakan Favorit pada Postingan", + "toggle_content_warning": "Nyalakan Peringatan Konten", + "preview_image": "Pratinjau Gambar" }, "segmented_control": { - "previous_section": "Previous Section", - "next_section": "Next Section" + "previous_section": "Bagian Sebelumnya", + "next_section": "Bagian Selanjutnya" } }, "status": { @@ -129,25 +129,31 @@ "show_post": "Tampilkan Postingan", "show_user_profile": "Tampilkan Profil Pengguna", "content_warning": "Peringatan Konten", - "sensitive_content": "Sensitive Content", + "sensitive_content": "Konten Sensitif", "media_content_warning": "Ketuk di mana saja untuk melihat", - "tap_to_reveal": "Tap to reveal", + "tap_to_reveal": "Ketuk untuk mengungkap", "poll": { - "vote": "Vote", + "vote": "Pilih", "closed": "Ditutup" }, + "meta_entity": { + "url": "Tautan: %s", + "hashtag": "Tagar: %s", + "mention": "Tampilkan Profile: %s", + "email": "Alamat email: %s" + }, "actions": { "reply": "Balas", "reblog": "Reblog", - "unreblog": "Undo reblog", + "unreblog": "Batalkan reblog", "favorite": "Favorit", - "unfavorite": "Unfavorite", + "unfavorite": "Batalkan favorit", "menu": "Menu", - "hide": "Hide", - "show_image": "Show image", - "show_gif": "Show GIF", - "show_video_player": "Show video player", - "tap_then_hold_to_show_menu": "Tap then hold to show menu" + "hide": "Sembunyikan", + "show_image": "Tampilkan gambar", + "show_gif": "Tampilkan GIF", + "show_video_player": "Tampilkan pemutar video", + "tap_then_hold_to_show_menu": "Ketuk lalu tahan untuk menampilkan menu" }, "tag": { "url": "URL", @@ -159,16 +165,16 @@ }, "visibility": { "unlisted": "Everyone can see this post but not display in the public timeline.", - "private": "Only their followers can see this post.", - "private_from_me": "Only my followers can see this post.", - "direct": "Only mentioned user can see this post." + "private": "Hanya pengikut mereka yang dapat melihat postingan ini.", + "private_from_me": "Hanya pengikut saya yang dapat melihat postingan ini.", + "direct": "Hanya pengguna yang disebut yang dapat melihat postingan ini." } }, "friendship": { "follow": "Ikuti", "following": "Mengikuti", - "request": "Request", - "pending": "Pending", + "request": "Minta", + "pending": "Tertunda", "block": "Blokir", "block_user": "Blokir %s", "block_domain": "Blokir %s", @@ -181,8 +187,8 @@ "unmute_user": "Berhenti membisukan %s", "muted": "Dibisukan", "edit_info": "Sunting Info", - "show_reblogs": "Show Reblogs", - "hide_reblogs": "Hide Reblogs" + "show_reblogs": "Tampilkan Reblog", + "hide_reblogs": "Sembunyikan Reblog" }, "timeline": { "filtered": "Tersaring", @@ -190,32 +196,38 @@ "now": "Sekarang" }, "loader": { - "load_missing_posts": "Load missing posts", - "loading_missing_posts": "Loading missing posts...", + "load_missing_posts": "Muat postingan yang hilang", + "loading_missing_posts": "Memuat postingan yang hilang...", "show_more_replies": "Tampilkan lebih banyak balasan" }, "header": { - "no_status_found": "No Post Found", - "blocking_warning": "You can’t view this user's profile\nuntil you unblock them.\nYour profile looks like this to them.", - "user_blocking_warning": "You can’t view %s’s profile\nuntil you unblock them.\nYour profile looks like this to them.", - "blocked_warning": "You can’t view this user’s profile\nuntil they unblock you.", - "user_blocked_warning": "You can’t view %s’s profile\nuntil they unblock you.", - "suspended_warning": "This user has been suspended.", - "user_suspended_warning": "%s’s account has been suspended." + "no_status_found": "Tidak Ditemukan Postingan", + "blocking_warning": "Anda tidak dapat melihat profil pengguna ini sampai Anda membuka blokir mereka.\nProfil Anda terlihat seperti ini bagi mereka.", + "user_blocking_warning": "Anda tidak dapat melihat profil %s sampai Anda membuka blokir mereka.\nProfil Anda terlihat seperti ini bagi mereka.", + "blocked_warning": "Anda tidak dapat melihat profil pengguna ini sampai mereka membuka blokir Anda.", + "user_blocked_warning": "Anda tidak dapat melihat profil %s sampai mereka membuka blokir Anda.", + "suspended_warning": "Pengguna ini telah ditangguhkan.", + "user_suspended_warning": "Akun %s telah ditangguhkan." } } } }, "scene": { "welcome": { - "slogan": "Social networking\nback in your hands.", - "get_started": "Get Started", - "log_in": "Log In" + "slogan": "Jejaring sosial dalam genggaman Anda.", + "get_started": "Mulai", + "log_in": "Login" + }, + "login": { + "title": "Selamat datang kembali", + "subtitle": "Masuklah pada server yang Anda buat di mana akun Anda berada.", + "server_search_field": { + "placeholder": "Masukkan URL atau pencarian di server Anda" + } }, "server_picker": { "title": "Pilih sebuah server,\nserver manapun.", - "subtitle": "Pick a server based on your interests, region, or a general purpose one.", - "subtitle_extend": "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual.", + "subtitle": "Pilih server berdasarkan agamamu, minat, atau subjek umum lainnya. Kamu masih bisa berkomunikasi dengan semua orang di Mastodon, tanpa memperdulikan server Anda.", "button": { "category": { "all": "Semua", @@ -242,8 +254,7 @@ "category": "KATEGORI" }, "input": { - "placeholder": "Search servers", - "search_servers_or_enter_url": "Search servers or enter URL" + "search_servers_or_enter_url": "Cari komunitas atau masukkan URL" }, "empty_state": { "finding_servers": "Mencari server yang tersedia...", @@ -253,7 +264,7 @@ }, "register": { "title": "Beritahu kami tentang diri Anda.", - "lets_get_you_set_up_on_domain": "Let’s get you set up on %s", + "lets_get_you_set_up_on_domain": "Mari kita siapkan Anda di %s", "input": { "avatar": { "delete": "Hapus" @@ -263,18 +274,18 @@ "duplicate_prompt": "Nama pengguna ini sudah diambil." }, "display_name": { - "placeholder": "display name" + "placeholder": "nama yang ditampilkan" }, "email": { "placeholder": "surel" }, "password": { "placeholder": "kata sandi", - "require": "Your password needs at least:", - "character_limit": "8 characters", + "require": "Kata sandi Anda harus memiliki setidaknya:", + "character_limit": "8 karakter", "accessibility": { - "checked": "checked", - "unchecked": "unchecked" + "checked": "dicentang", + "unchecked": "tidak dicentang" }, "hint": "Kata sandi Anda harus memiliki sekurang-kurangnya delapan karakter" }, @@ -288,7 +299,7 @@ "email": "Surel", "password": "Kata sandi", "agreement": "Persetujuan", - "locale": "Locale", + "locale": "Lokal", "reason": "Alasan" }, "reason": { @@ -304,7 +315,7 @@ "inclusion": "%s is not a supported value" }, "special": { - "username_invalid": "Username must only contain alphanumeric characters and underscores", + "username_invalid": "Nama pengguna hanya berisi angka karakter dan garis bawah", "username_too_long": "Nama pengguna terlalu panjang (tidak boleh lebih dari 30 karakter)", "email_invalid": "Ini bukan alamat surel yang valid", "password_too_short": "Kata sandi terlalu pendek (harus sekurang-kurangnya 8 karakter)" @@ -361,12 +372,12 @@ "compose": { "title": { "new_post": "Postingan Baru", - "new_reply": "New Reply" + "new_reply": "Pesan Baru" }, "media_selection": { - "camera": "Take Photo", + "camera": "Ambil Foto", "photo_library": "Photo Library", - "browse": "Browse" + "browse": "Telusuri" }, "content_input_placeholder": "Ketik atau tempel apa yang Anda pada pikiran Anda", "compose_action": "Publikasikan", @@ -376,7 +387,13 @@ "video": "video", "attachment_broken": "%s ini rusak dan tidak dapat diunggah ke Mastodon.", "description_photo": "Jelaskan fotonya untuk mereka yang tidak dapat melihat dengan jelas...", - "description_video": "Jelaskan videonya untuk mereka yang tidak dapat melihat dengan jelas..." + "description_video": "Jelaskan videonya untuk mereka yang tidak dapat melihat dengan jelas...", + "load_failed": "Gagal Memuat", + "upload_failed": "Gagal Mengunggah", + "can_not_recognize_this_media_attachment": "Tidak dapat mengenali lampiran media ini", + "attachment_too_large": "Lampiran terlalu besar", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "Durasi: %s", @@ -386,14 +403,16 @@ "one_day": "1 Hari", "three_days": "3 Hari", "seven_days": "7 Hari", - "option_number": "Option %ld" + "option_number": "Option %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "Tulis peringatan yang akurat di sini..." }, "visibility": { "public": "Publik", - "unlisted": "Unlisted", + "unlisted": "Tidak terdaftar", "private": "Pengikut saja", "direct": "Hanya orang yang saya sebut" }, @@ -407,7 +426,9 @@ "custom_emoji_picker": "Custom Emoji Picker", "enable_content_warning": "Aktifkan Peringatan Konten", "disable_content_warning": "Nonaktifkan Peringatan Konten", - "post_visibility_menu": "Post Visibility Menu" + "post_visibility_menu": "Post Visibility Menu", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "Discard Post", @@ -432,6 +453,10 @@ "placeholder": { "label": "Label", "content": "Isi" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Localization/StringsConvertor/input/is.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/is.lproj/Localizable.stringsdict new file mode 100644 index 000000000..03b29f09b --- /dev/null +++ b/Localization/StringsConvertor/input/is.lproj/Localizable.stringsdict @@ -0,0 +1,465 @@ + + + + + a11y.plural.count.unread.notification + + NSStringLocalizedFormatKey + %#@notification_count_unread_notification@ + notification_count_unread_notification + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 ólesin tilkynning + other + %ld ólesnar tilkynningar + + + a11y.plural.count.input_limit_exceeds + + NSStringLocalizedFormatKey + Inntak fer fram úr takmörkunum %#@character_count@ + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 stafur + other + %ld stafir + + + a11y.plural.count.input_limit_remains + + NSStringLocalizedFormatKey + Inntakstakmörk haldast %#@character_count@ + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 stafur + other + %ld stafir + + + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ eftir + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 stafur + other + %ld stafir + + + plural.count.followed_by_and_mutual + + NSStringLocalizedFormatKey + %#@names@%#@count_mutual@ + names + + one + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + other + + + count_mutual + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + Fylgt af %1$@ og öðrum sameiginlegum + other + Fylgt af %1$@ og %ld sameiginlegum + + + plural.count.metric_formatted.post + + NSStringLocalizedFormatKey + %@ %#@post_count@ + post_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + færsla + other + færslur + + + plural.count.media + + NSStringLocalizedFormatKey + %#@media_count@ + media_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 gagnamiðill + other + %ld gagnamiðlar + + + plural.count.post + + NSStringLocalizedFormatKey + %#@post_count@ + post_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 færsla + other + %ld færslur + + + plural.count.favorite + + NSStringLocalizedFormatKey + %#@favorite_count@ + favorite_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 eftirlæti + other + %ld eftirlæti + + + plural.count.reblog + + NSStringLocalizedFormatKey + %#@reblog_count@ + reblog_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 endurbirting + other + %ld endurbirtingar + + + plural.count.reply + + NSStringLocalizedFormatKey + %#@reply_count@ + reply_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 svar + other + %ld svör + + + plural.count.vote + + NSStringLocalizedFormatKey + %#@vote_count@ + vote_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 atkvæði + other + %ld atkvæði + + + plural.count.voter + + NSStringLocalizedFormatKey + %#@voter_count@ + voter_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 kjósandi + other + %ld kjósendur + + + plural.people_talking + + NSStringLocalizedFormatKey + %#@count_people_talking@ + count_people_talking + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 aðili að spjalla + other + %ld aðilar að spjalla + + + plural.count.following + + NSStringLocalizedFormatKey + %#@count_following@ + count_following + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 fylgist með + other + %ld fylgjast með + + + plural.count.follower + + NSStringLocalizedFormatKey + %#@count_follower@ + count_follower + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 fylgjandi + other + %ld fylgjendur + + + date.year.left + + NSStringLocalizedFormatKey + %#@count_year_left@ + count_year_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 ár eftir + other + %ld ár eftir + + + date.month.left + + NSStringLocalizedFormatKey + %#@count_month_left@ + count_month_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 mánuður eftir + other + %ld mánuðir eftir + + + date.day.left + + NSStringLocalizedFormatKey + %#@count_day_left@ + count_day_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 dagur eftir + other + %ld dagar eftir + + + date.hour.left + + NSStringLocalizedFormatKey + %#@count_hour_left@ + count_hour_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 klukkustund eftir + other + %ld klukkustundir eftir + + + date.minute.left + + NSStringLocalizedFormatKey + %#@count_minute_left@ + count_minute_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 mínúta eftir + other + %ld mínútur eftir + + + date.second.left + + NSStringLocalizedFormatKey + %#@count_second_left@ + count_second_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 sekúnda eftir + other + %ld sekúndur eftir + + + date.year.ago.abbr + + NSStringLocalizedFormatKey + %#@count_year_ago_abbr@ + count_year_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + Fyrir 1 ári síðan + other + Fyrir %ld árum síðan + + + date.month.ago.abbr + + NSStringLocalizedFormatKey + %#@count_month_ago_abbr@ + count_month_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + Fyrir 1mín síðan + other + Fyrir %ldmín síðan + + + date.day.ago.abbr + + NSStringLocalizedFormatKey + %#@count_day_ago_abbr@ + count_day_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + Fyrir 1 degi síðan + other + Fyrir %ld dögum síðan + + + date.hour.ago.abbr + + NSStringLocalizedFormatKey + %#@count_hour_ago_abbr@ + count_hour_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1klst síðan + other + %ldklst síðan + + + date.minute.ago.abbr + + NSStringLocalizedFormatKey + %#@count_minute_ago_abbr@ + count_minute_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1m síðan + other + %ldm síðan + + + date.second.ago.abbr + + NSStringLocalizedFormatKey + %#@count_second_ago_abbr@ + count_second_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1s síðan + other + %lds síðan + + + + diff --git a/Localization/StringsConvertor/input/is.lproj/app.json b/Localization/StringsConvertor/input/is.lproj/app.json new file mode 100644 index 000000000..191a670ed --- /dev/null +++ b/Localization/StringsConvertor/input/is.lproj/app.json @@ -0,0 +1,727 @@ +{ + "common": { + "alerts": { + "common": { + "please_try_again": "Endilega reyndu aftur.", + "please_try_again_later": "Reyndu aftur síðar." + }, + "sign_up_failure": { + "title": "Innskráning mistókst" + }, + "server_error": { + "title": "Villa á þjóni" + }, + "vote_failure": { + "title": "Greiðsla atkvæðis mistókst", + "poll_ended": "Könnuninni er lokið" + }, + "discard_post_content": { + "title": "Henda drögum", + "message": "Staðfestu til að henda efni úr saminni færslu." + }, + "publish_post_failure": { + "title": "Mistókst að birta", + "message": "Mistókst að birta færsluna.\nAthugaðu nettenginguna þína.", + "attachments_message": { + "video_attach_with_photo": "Ekki er hægt að hengja myndskeið við færslu sem þegar inniheldur myndir.", + "more_than_one_video": "Ekki er hægt að hengja við fleiri en eitt myndskeið." + } + }, + "edit_profile_failure": { + "title": "Villa við breytingu á notandasniði", + "message": "Mistókst að breyta notandasniði. Endilega reyndu aftur." + }, + "sign_out": { + "title": "Skrá út", + "message": "Ertu viss um að þú viljir skrá þig út?", + "confirm": "Skrá út" + }, + "block_domain": { + "title": "Ertu alveg algjörlega viss um að þú viljir loka á allt %s? Í flestum tilfellum er vænlegra að nota færri en markvissari útilokanir eða að þagga niður tiltekna aðila. Þú munt ekki sjá neitt efni frá þessu léni og fylgjendur þínir frá þessu léni verða fjarlægðir.", + "block_entire_domain": "Útiloka lén" + }, + "save_photo_failure": { + "title": "Mistókst að vista mynd", + "message": "Virkjaðu heimild til aðgangs að ljósmyndasafninu til að vista myndina." + }, + "delete_post": { + "title": "Eyða færslu", + "message": "Ertu viss um að þú viljir eyða þessari færslu?" + }, + "clean_cache": { + "title": "Hreinsa skyndiminni", + "message": "Tókst að hreinsa %s skyndiminni." + } + }, + "controls": { + "actions": { + "back": "Til baka", + "next": "Næsta", + "previous": "Fyrri", + "open": "Opna", + "add": "Bæta við", + "remove": "Fjarlægja", + "edit": "Breyta", + "save": "Vista", + "ok": "Í lagi", + "done": "Lokið", + "confirm": "Staðfesta", + "continue": "Halda áfram", + "compose": "Skrifa", + "cancel": "Hætta við", + "discard": "Henda", + "try_again": "Reyna aftur", + "take_photo": "Taka ljósmynd", + "save_photo": "Vista mynd", + "copy_photo": "Afrita mynd", + "sign_in": "Skrá inn", + "sign_up": "Stofna notandaaðgang", + "see_more": "Sjá fleira", + "preview": "Forskoða", + "share": "Deila", + "share_user": "Deila %s", + "share_post": "Deila færslu", + "open_in_safari": "Opna í Safari", + "open_in_browser": "Opna í vafra", + "find_people": "Finna fólk til að fylgjast með", + "manually_search": "Leita handvirkt í staðinn", + "skip": "Sleppa", + "reply": "Svara", + "report_user": "Kæra %s", + "block_domain": "Útiloka %s", + "unblock_domain": "Opna á %s", + "settings": "Stillingar", + "delete": "Eyða" + }, + "tabs": { + "home": "Heim", + "search": "Leita", + "notification": "Tilkynning", + "profile": "Notandasnið" + }, + "keyboard": { + "common": { + "switch_to_tab": "Skipta yfir í %s", + "compose_new_post": "Semja nýja færslu", + "show_favorites": "Birta eftirlæti", + "open_settings": "Opna stillingar" + }, + "timeline": { + "previous_status": "Fyrri færsla", + "next_status": "Næsta færsla", + "open_status": "Opna færslu", + "open_author_profile": "Opna notandasnið höfundar", + "open_reblogger_profile": "Opna notandasnið þess sem endurbirtir", + "reply_status": "Svara færslu", + "toggle_reblog": "Víxla endurbirtingu færslu af/á", + "toggle_favorite": "Víxla eftirlæti færslu af/á", + "toggle_content_warning": "Víxla af/á viðvörun vegna efnis", + "preview_image": "Forskoða mynd" + }, + "segmented_control": { + "previous_section": "Fyrri hluti", + "next_section": "Næsti hluti" + } + }, + "status": { + "user_reblogged": "%s endurbirti", + "user_replied_to": "Svaraði %s", + "show_post": "Sýna færslu", + "show_user_profile": "Birta notandasnið", + "content_warning": "Viðvörun vegna efnis", + "sensitive_content": "Viðkvæmt efni", + "media_content_warning": "Ýttu hvar sem er til að birta", + "tap_to_reveal": "Ýttu til að birta", + "poll": { + "vote": "Greiða atkvæði", + "closed": "Lokið" + }, + "meta_entity": { + "url": "Tengill: %s", + "hashtag": "Myllumerki: %s", + "mention": "Sýna notandasnið: %s", + "email": "Tölvupóstfang: %s" + }, + "actions": { + "reply": "Svara", + "reblog": "Endurbirta", + "unreblog": "Afturkalla endurbirtingu", + "favorite": "Eftirlæti", + "unfavorite": "Taka úr eftirlætum", + "menu": "Valmynd", + "hide": "Fela", + "show_image": "Sýna mynd", + "show_gif": "Birta GIF-myndir", + "show_video_player": "Sýna myndspilara", + "tap_then_hold_to_show_menu": "Ýttu og haltu til að sýna valmynd" + }, + "tag": { + "url": "URL-slóð", + "mention": "Minnst á", + "link": "Tengill", + "hashtag": "Myllumerki", + "email": "Tölvupóstur", + "emoji": "Tjáningartákn" + }, + "visibility": { + "unlisted": "Allir geta skoðað þessa færslu, en er ekki birt á opinberum tímalínum.", + "private": "Einungis fylgjendur þeirra geta séð þessa færslu.", + "private_from_me": "Einungis fylgjendur mínir geta séð þessa færslu.", + "direct": "Einungis notendur sem minnst er á geta séð þessa færslu." + } + }, + "friendship": { + "follow": "Fylgja", + "following": "Fylgist með", + "request": "Beiðni", + "pending": "Í bið", + "block": "Útilokun", + "block_user": "Útiloka %s", + "block_domain": "Útiloka %s", + "unblock": "Aflétta útilokun", + "unblock_user": "Opna á %s", + "blocked": "Útilokað", + "mute": "Þagga niður", + "mute_user": "Þagga niður í %s", + "unmute": "Afþagga", + "unmute_user": "Afþagga %s", + "muted": "Þaggað", + "edit_info": "Breyta upplýsingum", + "show_reblogs": "Sýna endurbirtingar", + "hide_reblogs": "Fela endurbirtingar" + }, + "timeline": { + "filtered": "Síað", + "timestamp": { + "now": "Núna" + }, + "loader": { + "load_missing_posts": "Hlaða inn færslum sem vantar", + "loading_missing_posts": "Hleð inn færslum sem vantar...", + "show_more_replies": "Birta fleiri svör" + }, + "header": { + "no_status_found": "Engar færslur fundust", + "blocking_warning": "Þú getur ekki séð snið þessa notanda\nfyrr en þú hættir að útiloka hann.\nSniðið þitt lítur svona út hjá honum.", + "user_blocking_warning": "Þú getur ekki séð sniðið hjá %s\nfyrr en þú hættir að útiloka hann.\nSniðið þitt lítur svona út hjá honum.", + "blocked_warning": "Þú getur ekki séð sniðið hjá þessum notanda\nfyrr en hann hættir að útiloka þig.", + "user_blocked_warning": "Þú getur ekki séð sniðið hjá %s\nfyrr en hann hættir að útiloka þig.", + "suspended_warning": "Þessi notandi hefur verið settur í bið.", + "user_suspended_warning": "Notandaaðgangurinn %s hefur verið settur í bið." + } + } + } + }, + "scene": { + "welcome": { + "slogan": "Samfélagsmiðlar\naftur í þínar hendur.", + "get_started": "Komast í gang", + "log_in": "Skrá inn" + }, + "login": { + "title": "Velkomin aftur", + "subtitle": "Skráðu þig inn á netþjóninum þar sem þú útbjóst aðganginn þinn.", + "server_search_field": { + "placeholder": "Settu inn slóð eða leitaðu að þjóninum þínum" + } + }, + "server_picker": { + "title": "Mastodon samanstendur af notendum á mismunandi netþjónum.", + "subtitle": "Veldu netþjón út frá svæðinu þínu, áhugamálum, nú eða einhvern almennan. Þú getur samt spjallað við hvern sem er á Mastodon, burtséð frá á hvaða netþjóni þú ert.", + "button": { + "category": { + "all": "Allt", + "all_accessiblity_description": "Flokkur: Allt", + "academia": "akademískt", + "activism": "aðgerðasinnar", + "food": "matur", + "furry": "loðið", + "games": "leikir", + "general": "almennt", + "journalism": "blaðamennska", + "lgbt": "lgbt", + "regional": "svæðisbundið", + "art": "listir", + "music": "tónlist", + "tech": "tækni" + }, + "see_less": "Sjá minna", + "see_more": "Sjá meira" + }, + "label": { + "language": "TUNGUMÁL", + "users": "NOTENDUR", + "category": "FLOKKUR" + }, + "input": { + "search_servers_or_enter_url": "Leitaðu að samfélögum eða settu inn slóð" + }, + "empty_state": { + "finding_servers": "Finn tiltæka netþjóna...", + "bad_network": "Eitthvað fór úrskeiðis við að hlaða inn gögnunum. Athugaðu nettenginguna þína.", + "no_results": "Engar niðurstöður" + } + }, + "register": { + "title": "Við skulum koma þér í gang á %s", + "lets_get_you_set_up_on_domain": "Við skulum koma þér í gang á %s", + "input": { + "avatar": { + "delete": "Eyða" + }, + "username": { + "placeholder": "notandanafn", + "duplicate_prompt": "Þetta notandanafn er þegar í notkun." + }, + "display_name": { + "placeholder": "birtingarnafn" + }, + "email": { + "placeholder": "tölvupóstur" + }, + "password": { + "placeholder": "lykilorð", + "require": "Lykilorðið þitt þarf að minnsta kosti:", + "character_limit": "8 stafi", + "accessibility": { + "checked": "merkt", + "unchecked": "ekki merkt" + }, + "hint": "Lykilorðið þitt verður að vera að minnsta kosti 8 stafa langt" + }, + "invite": { + "registration_user_invite_request": "Hvers vegna vilt þú taka þátt?" + } + }, + "error": { + "item": { + "username": "Notandanafn", + "email": "Tölvupóstur", + "password": "Lykilorð", + "agreement": "Notkunarskilmálar", + "locale": "Staðfærsla", + "reason": "Ástæða" + }, + "reason": { + "blocked": "%s notar óleyfilega tölvupóstþjónustu", + "unreachable": "%s virðist ekki vera til", + "taken": "%s er þegar í notkun", + "reserved": "%s er frátekið stikkorð", + "accepted": "%s verður að samþykkja", + "blank": "%s ier nauðsynlegt", + "invalid": "%s er ógilt", + "too_long": "%s er of langt", + "too_short": "%s er of stutt", + "inclusion": "%s er ekki stutt gildi" + }, + "special": { + "username_invalid": "Notendanöfn geta einungis innihaldið bókstafi og undirstrikun", + "username_too_long": "Notandanafnið er of langt (má ekki vera lengra en 30 stafir)", + "email_invalid": "Þetta lítur ekki út eins og löglegt tölvupóstfang", + "password_too_short": "Lykilorð er of stutt (verður að hafa minnst 8 stafi)" + } + } + }, + "server_rules": { + "title": "Nokkrar grunnreglur.", + "subtitle": "Þær eru settar og séð um að þeim sé fylgt af umsjónarmönnum %s.", + "prompt": "Með því að halda áfram samþykkir þú þjónustuskilmála og persónuverndarstefnu %s.", + "terms_of_service": "þjónustuskilmálar", + "privacy_policy": "persónuverndarstefna", + "button": { + "confirm": "Ég samþykki" + } + }, + "confirm_email": { + "title": "Eitt að lokum.", + "subtitle": "Ýttu á tengilinn sem við sendum þér til að staðfesta tölvupóstfangið þitt.", + "tap_the_link_we_emailed_to_you_to_verify_your_account": "Ýttu á tengilinn sem við sendum þér til að staðfesta tölvupóstfangið þitt", + "button": { + "open_email_app": "Opna tölvupóstforrit", + "resend": "Endursenda" + }, + "dont_receive_email": { + "title": "Athugaðu tölvupóstinn þinn", + "description": "Athugaðu hvort tölvupóstfangið þitt sé rétt auk þess að skoða í ruslpóstmöppuna þína ef þú hefur ekki gert það.", + "resend_email": "Endursenda tölvupóst" + }, + "open_email_app": { + "title": "Athugaðu pósthólfið þitt.", + "description": "Við vorum að senda þér tölvupóst. Skoðaðu í ruslpóstmöppuna þína ef þú hefur ekki gert það.", + "mail": "Tölvupóstur", + "open_email_client": "Opna tölvupóstforrit" + } + }, + "home_timeline": { + "title": "Heim", + "navigation_bar_state": { + "offline": "Ónettengt", + "new_posts": "Skoða nýjar færslur", + "published": "Birt!", + "Publishing": "Birti færslu...", + "accessibility": { + "logo_label": "Hnappur með táknmerki", + "logo_hint": "Ýttu til að skruna efst og ýttu aftur til að fara aftur á fyrri staðsetningu" + } + } + }, + "suggestion_account": { + "title": "Finndu fólk til að fylgjast með", + "follow_explain": "Þegar þú fylgist með einhverjum, muntu sjá færslur frá viðkomandi á streyminu þínu." + }, + "compose": { + "title": { + "new_post": "Ný færsla", + "new_reply": "Nýtt svar" + }, + "media_selection": { + "camera": "Taktu mynd", + "photo_library": "Myndasafn", + "browse": "Flakka" + }, + "content_input_placeholder": "Skrifaðu eða límdu það sem þér liggur á hjarta", + "compose_action": "Birta", + "replying_to_user": "svarar til @%s", + "attachment": { + "photo": "ljósmynd", + "video": "myndskeið", + "attachment_broken": "Þetta %s er skemmt og því ekki\nhægt að senda inn á Mastodon.", + "description_photo": "Lýstu myndinni fyrir sjónskerta...", + "description_video": "Lýstu myndskeiðinu fyrir sjónskerta...", + "load_failed": "Hleðsla mistókst", + "upload_failed": "Innsending mistókst", + "can_not_recognize_this_media_attachment": "Þekki ekki þetta myndviðhengi", + "attachment_too_large": "Viðhengi of stórt", + "compressing_state": "Þjappa...", + "server_processing_state": "Netþjónn er að vinna..." + }, + "poll": { + "duration_time": "Tímalengd: %s", + "thirty_minutes": "30 mínútur", + "one_hour": "1 klukkustund", + "six_hours": "6 klukkustundir", + "one_day": "1 dagur", + "three_days": "3 dagar", + "seven_days": "7 dagar", + "option_number": "Valkostur %ld", + "the_poll_is_invalid": "Könnunin er ógild", + "the_poll_has_empty_option": "Könnunin er með auðan valkost" + }, + "content_warning": { + "placeholder": "Skrifaðu nákvæma aðvörun hér..." + }, + "visibility": { + "public": "Opinbert", + "unlisted": "Óskráð", + "private": "Einungis fylgjendur", + "direct": "Einungis fólk sem ég minnist á" + }, + "auto_complete": { + "space_to_add": "Bil sem á að bæta við" + }, + "accessibility": { + "append_attachment": "Bæta við viðhengi", + "append_poll": "Bæta við könnun", + "remove_poll": "Fjarlægja könnun", + "custom_emoji_picker": "Sérsniðið emoji-tánmyndaval", + "enable_content_warning": "Virkja viðvörun vegna efnis", + "disable_content_warning": "Gera viðvörun vegna efnis óvirka", + "post_visibility_menu": "Sýnileikavalmynd færslu", + "post_options": "Valkostir færslu", + "posting_as": "Birti sem %s" + }, + "keyboard": { + "discard_post": "Henda færslu", + "publish_post": "Birta færslu", + "toggle_poll": "Víxla könnun af/á", + "toggle_content_warning": "Víxla af/á viðvörun vegna efnis", + "append_attachment_entry": "Bæta við viðhengi - %s", + "select_visibility_entry": "Veldu sýnileika - %s" + } + }, + "profile": { + "header": { + "follows_you": "Fylgist með þér" + }, + "dashboard": { + "posts": "færslur", + "following": "fylgist með", + "followers": "fylgjendur" + }, + "fields": { + "add_row": "Bæta við röð", + "placeholder": { + "label": "Skýring", + "content": "Efni" + }, + "verified": { + "short": "Sannreynt þann %s", + "long": "Eignarhald á þessum tengli var athugað þann %s" + } + }, + "segmented_control": { + "posts": "Færslur", + "replies": "Svör", + "posts_and_replies": "Færslur og svör", + "media": "Gagnamiðlar", + "about": "Um hugbúnaðinn" + }, + "relationship_action_alert": { + "confirm_mute_user": { + "title": "Þagga niður í aðgangi", + "message": "Staðfestu til að þagga niður í %s" + }, + "confirm_unmute_user": { + "title": "Hætta að þagga niður í aðgangi", + "message": "Staðfestu til hætta að að þagga niður í %s" + }, + "confirm_block_user": { + "title": "Útiloka notandaaðgang", + "message": "Staðfestu til að útiloka %s" + }, + "confirm_unblock_user": { + "title": "Aflétta útilokun aðgangs", + "message": "Staðfestu til að hætta að útiloka %s" + }, + "confirm_show_reblogs": { + "title": "Sýna endurbirtingar", + "message": "Staðfestu til að sýna endurbirtingar" + }, + "confirm_hide_reblogs": { + "title": "Fela endurbirtingar", + "message": "Staðfestu til að fela endurbirtingar" + } + }, + "accessibility": { + "show_avatar_image": "Sýna auðkennismynd", + "edit_avatar_image": "Breyta auðkennismynd", + "show_banner_image": "Sýna myndborða", + "double_tap_to_open_the_list": "Tvípikkaðu til að opna listann" + } + }, + "follower": { + "title": "fylgjandi", + "footer": "Fylgjendur af öðrum netþjónum birtast ekki." + }, + "following": { + "title": "fylgist með", + "footer": "Fylgjendur af öðrum netþjónum birtast ekki." + }, + "familiarFollowers": { + "title": "Fylgjendur sem þú kannast við", + "followed_by_names": "Fylgt af %s" + }, + "favorited_by": { + "title": "Sett í eftirlæti af" + }, + "reblogged_by": { + "title": "Endurbirt af" + }, + "search": { + "title": "Leita", + "search_bar": { + "placeholder": "Leita að myllumerkjum og notendum", + "cancel": "Hætta við" + }, + "recommend": { + "button_text": "Sjá allt", + "hash_tag": { + "title": "Vinsælt á Mastodon", + "description": "Myllumerki sem eru að fá þónokkra athygli", + "people_talking": "%s manns eru að spjalla" + }, + "accounts": { + "title": "Notandaaðgangar sem þú gætir haft áhuga á", + "description": "Þú gætir viljað fylgjast með þessum aðgöngum", + "follow": "Fylgjast með" + } + }, + "searching": { + "segment": { + "all": "Allt", + "people": "Fólk", + "hashtags": "Myllumerki", + "posts": "Færslur" + }, + "empty_state": { + "no_results": "Engar niðurstöður" + }, + "recent_search": "Nýlegar leitir", + "clear": "Hreinsa" + } + }, + "discovery": { + "tabs": { + "posts": "Færslur", + "hashtags": "Myllumerki", + "news": "Fréttir", + "community": "Samfélag", + "for_you": "Fyrir þig" + }, + "intro": "Þetta eru færslurnar sem eru að fá aukna athygli í þínu horni á Mastodon." + }, + "favorite": { + "title": "Eftirlætin þín" + }, + "notification": { + "title": { + "Everything": "Allt", + "Mentions": "Minnst á" + }, + "notification_description": { + "followed_you": "fylgdi þér", + "favorited_your_post": "setti færslu frá þér í eftirlæti", + "reblogged_your_post": "endurbirti færsluna þína", + "mentioned_you": "minntist á þig", + "request_to_follow_you": "bað um að fylgjast með þér", + "poll_has_ended": "könnun er lokið" + }, + "keyobard": { + "show_everything": "Sýna allt", + "show_mentions": "Sýna þegar minnst er á" + }, + "follow_request": { + "accept": "Samþykkja", + "accepted": "Samþykkt", + "reject": "hafna", + "rejected": "Hafnað" + } + }, + "thread": { + "back_title": "Færsla", + "title": "Færsla frá %s" + }, + "settings": { + "title": "Stillingar", + "section": { + "appearance": { + "title": "Útlit", + "automatic": "Sjálfvirkt", + "light": "Alltaf ljóst", + "dark": "Alltaf dökkt" + }, + "look_and_feel": { + "title": "Útlit og viðmót", + "use_system": "Nota stillingar kerfis", + "really_dark": "Mjög dökkt", + "sorta_dark": "Nokkuð dökkt", + "light": "Ljóst" + }, + "notifications": { + "title": "Tilkynningar", + "favorites": "Setur færsluna mína í eftirlæti", + "follows": "Fylgist með mér", + "boosts": "Endurbirtir færsluna mína", + "mentions": "Minnist á mig", + "trigger": { + "anyone": "hver sem er", + "follower": "fylgjandi", + "follow": "hverjum sá sem ég fylgi", + "noone": "enginn", + "title": "Tilkynna mér þegar" + } + }, + "preference": { + "title": "Kjörstillingar", + "true_black_dark_mode": "Sannur svartur dökkur hamur", + "disable_avatar_animation": "Gera auðkennismyndir með hreyfingu óvirkar", + "disable_emoji_animation": "Gera tjáningartákn með hreyfingu óvirkar", + "using_default_browser": "Nota sjálfgefinn vafra til að opna tengla", + "open_links_in_mastodon": "Opna tengla í Mastodon" + }, + "boring_zone": { + "title": "Óhressa svæðið", + "account_settings": "Stillingar aðgangs", + "terms": "Þjónustuskilmálar", + "privacy": "Meðferð persónuupplýsinga" + }, + "spicy_zone": { + "title": "Kryddaða svæðið", + "clear": "Hreinsa skyndiminni margmiðlunarefnis", + "signout": "Skrá út" + } + }, + "footer": { + "mastodon_description": "Mastodon er frjáls hugbúnaður með opinn grunnkóða. Þú getur tilkynnt vandamál í gegnum GitHub á %s (%s)" + }, + "keyboard": { + "close_settings_window": "Loka stillingaglugga" + } + }, + "report": { + "title_report": "Kæra", + "title": "Kæra %s", + "step1": "Skref 1 af 2", + "step2": "Skref 2 af 2", + "content1": "Eru einhverjar færslur sem þú myndir vilja bæta við kæruna?", + "content2": "Er eitthvað fleira sem umsjónarmenn ættu að vita varðandi þessa kæru?", + "report_sent_title": "Takk fyrir tilkynninguna, við munum skoða málið.", + "send": "Senda kæru", + "skip_to_send": "Senda án athugasemdar", + "text_placeholder": "Skrifaðu eða límdu aðrar athugasemdir", + "reported": "TILKYNNT", + "step_one": { + "step_1_of_4": "Skref 1 af 4", + "whats_wrong_with_this_post": "Hvað er athugavert við þessa færslu?", + "whats_wrong_with_this_account": "Hvað er athugavert við þennan notandaaðgang?", + "whats_wrong_with_this_username": "Hvað er athugavert við %s?", + "select_the_best_match": "Velja bestu samsvörun", + "i_dont_like_it": "Mér líkar það ekki", + "it_is_not_something_you_want_to_see": "Þetta er ekki eitthvað sem þið viljið sjá", + "its_spam": "Þetta er ruslpóstur", + "malicious_links_fake_engagement_or_repetetive_replies": "Slæmir tenglar, fölsk samskipti eða endurtekin svör", + "it_violates_server_rules": "Það gengur þvert á reglur fyrir netþjóninn", + "you_are_aware_that_it_breaks_specific_rules": "Þið eruð meðvituð um að þetta brýtur sértækar reglur", + "its_something_else": "Það er eitthvað annað", + "the_issue_does_not_fit_into_other_categories": "Vandamálið fellur ekki í aðra flokka" + }, + "step_two": { + "step_2_of_4": "Skref 2 af 4", + "which_rules_are_being_violated": "Hvaða reglur eru brotnar?", + "select_all_that_apply": "Veldu allt sem á við", + "i_just_don’t_like_it": "Mér bara líkar það ekki" + }, + "step_three": { + "step_3_of_4": "Skref 3 af 4", + "are_there_any_posts_that_back_up_this_report": "Eru einhverjar færslur sem styðja þessa kæru?", + "select_all_that_apply": "Veldu allt sem á við" + }, + "step_four": { + "step_4_of_4": "Skref 4 af 4", + "is_there_anything_else_we_should_know": "Er eitthvað fleira sem við ættum að vita?" + }, + "step_final": { + "dont_want_to_see_this": "Langar þig ekki að sjá þetta?", + "when_you_see_something_you_dont_like_on_mastodon_you_can_remove_the_person_from_your_experience.": "Þegar þú sér eitthvað á Mastodon sem þér líkar ekki, þá geturðu fjarlægt viðkomandi eintakling úr umhverfinu þínu.", + "unfollow": "Hætta að fylgjast með", + "unfollowed": "Hætti að fylgjast með", + "unfollow_user": "Hætta að fylgjast með %s", + "mute_user": "Þagga niður í %s", + "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "Þú munt ekki sjá færslur eða endurbirtingar frá viðkomandi á streyminu þínu. Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.", + "block_user": "Útiloka %s", + "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "Viðkomandi mun ekki lengur geta fylgst með eða séð færslurnar þínar, en munu sjá ef viðkomandi hefur verið útilokaður.", + "while_we_review_this_you_can_take_action_against_user": "Á meðan við yfirförum þetta, geturðu tekið til aðgerða gegn %s" + } + }, + "preview": { + "keyboard": { + "close_preview": "Loka forskoðun", + "show_next": "Sýna næsta", + "show_previous": "Sýna fyrri" + } + }, + "account_list": { + "tab_bar_hint": "Fyrirliggjandi valið notandasnið: %s. Tvípikkaðu og haltu niðri til að birta aðgangaskiptinn", + "dismiss_account_switcher": "Loka aðgangaskipti", + "add_account": "Bæta við notandaaðgangi" + }, + "wizard": { + "new_in_mastodon": "Nýtt í Mastodon", + "multiple_account_switch_intro_description": "Skiptu milli notandaaðganga með því að halda niðri notandasniðshnappnum.", + "accessibility_hint": "Tvípikkaðu til að loka þessum leiðarvísi" + }, + "bookmark": { + "title": "Bókamerki" + } + } +} diff --git a/Localization/StringsConvertor/input/is.lproj/ios-infoPlist.json b/Localization/StringsConvertor/input/is.lproj/ios-infoPlist.json new file mode 100644 index 000000000..24af18431 --- /dev/null +++ b/Localization/StringsConvertor/input/is.lproj/ios-infoPlist.json @@ -0,0 +1,6 @@ +{ + "NSCameraUsageDescription": "Notað til að taka mynd fyrir stöðufærslu", + "NSPhotoLibraryAddUsageDescription": "Notað til að vista mynd inn í ljósmyndasafnið", + "NewPostShortcutItemTitle": "Ný færsla", + "SearchShortcutItemTitle": "Leita" +} diff --git a/Localization/StringsConvertor/input/it.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/it.lproj/Localizable.stringsdict index 38f986521..3a8549914 100644 --- a/Localization/StringsConvertor/input/it.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/it.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld caratteri + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ rimanenti + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 carattere + other + %ld caratteri + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/it.lproj/app.json b/Localization/StringsConvertor/input/it.lproj/app.json index 269d299ec..f4f21762b 100644 --- a/Localization/StringsConvertor/input/it.lproj/app.json +++ b/Localization/StringsConvertor/input/it.lproj/app.json @@ -75,7 +75,7 @@ "save_photo": "Salva foto", "copy_photo": "Copia foto", "sign_in": "Accedi", - "sign_up": "Registrati", + "sign_up": "Crea un account", "see_more": "Visualizza altro", "preview": "Anteprima", "share": "Condividi", @@ -136,6 +136,12 @@ "vote": "Vota", "closed": "Chiuso" }, + "meta_entity": { + "url": "Collegamento: %s", + "hashtag": "Hashtag: %s", + "mention": "Mostra il profilo: %s", + "email": "Indirizzo email: %s" + }, "actions": { "reply": "Rispondi", "reblog": "Condivisione", @@ -212,10 +218,16 @@ "get_started": "Inizia", "log_in": "Accedi" }, + "login": { + "title": "Bentornato/a", + "subtitle": "Accedi al server sul quale hai creato il tuo account.", + "server_search_field": { + "placeholder": "Inserisci l'URL o cerca il tuo server" + } + }, "server_picker": { "title": "Mastodon è fatto di utenti in diverse comunità.", - "subtitle": "Scegli una comunità basata sui tuoi interessi, regione o uno scopo generale.", - "subtitle_extend": "Scegli una comunità basata sui tuoi interessi, regione o uno scopo generale. Ogni comunità è gestita da un'organizzazione completamente indipendente o individuale.", + "subtitle": "Scegli un server in base alla tua regione, ai tuoi interessi o uno generico. Puoi comunque chattare con chiunque su Mastodon, indipendentemente dai tuoi server.", "button": { "category": { "all": "Tutti", @@ -242,8 +254,7 @@ "category": "CATEGORIA" }, "input": { - "placeholder": "Cerca comunità", - "search_servers_or_enter_url": "Cerca i server o inserisci l'URL" + "search_servers_or_enter_url": "Cerca le comunità o inserisci l'URL" }, "empty_state": { "finding_servers": "Ricerca server disponibili...", @@ -376,7 +387,13 @@ "video": "filmato", "attachment_broken": "Questo %s è rotto e non può essere\ncaricato su Mastodon.", "description_photo": "Descrivi la foto per gli utenti ipovedenti...", - "description_video": "Descrivi il filmato per gli utenti ipovedenti..." + "description_video": "Descrivi il filmato per gli utenti ipovedenti...", + "load_failed": "Caricamento fallito", + "upload_failed": "Caricamento fallito", + "can_not_recognize_this_media_attachment": "Impossibile riconoscere questo allegato multimediale", + "attachment_too_large": "Allegato troppo grande", + "compressing_state": "Compressione in corso...", + "server_processing_state": "Elaborazione del server in corso..." }, "poll": { "duration_time": "Durata: %s", @@ -386,7 +403,9 @@ "one_day": "1 giorno", "three_days": "3 giorni", "seven_days": "7 giorni", - "option_number": "Opzione %ld" + "option_number": "Opzione %ld", + "the_poll_is_invalid": "Il sondaggio non è valido", + "the_poll_has_empty_option": "Il sondaggio ha un'opzione vuota" }, "content_warning": { "placeholder": "Scrivi un avviso accurato qui..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Selettore Emoji personalizzato", "enable_content_warning": "Abilita avvertimento contenuti", "disable_content_warning": "Disabilita avviso di contenuti", - "post_visibility_menu": "Menu di visibilità del post" + "post_visibility_menu": "Menu di visibilità del post", + "post_options": "Opzioni del messaggio", + "posting_as": "Pubblicazione come %s" }, "keyboard": { "discard_post": "Scarta post", @@ -432,6 +453,10 @@ "placeholder": { "label": "Etichetta", "content": "Contenuto" + }, + "verified": { + "short": "Verificato il %s", + "long": "La proprietà di questo collegamento è stata verificata il %s" } }, "segmented_control": { @@ -696,7 +721,7 @@ "accessibility_hint": "Doppio tocco per eliminare questa procedura guidata" }, "bookmark": { - "title": "Bookmarks" + "title": "Segnalibri" } } } diff --git a/Localization/StringsConvertor/input/ja.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/ja.lproj/Localizable.stringsdict index cbc999738..795a971b7 100644 --- a/Localization/StringsConvertor/input/ja.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/ja.lproj/Localizable.stringsdict @@ -44,6 +44,20 @@ %ld 文字 + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/ja.lproj/app.json b/Localization/StringsConvertor/input/ja.lproj/app.json index b7615abf3..f73faabd4 100644 --- a/Localization/StringsConvertor/input/ja.lproj/app.json +++ b/Localization/StringsConvertor/input/ja.lproj/app.json @@ -74,8 +74,8 @@ "take_photo": "写真を撮る", "save_photo": "写真を撮る", "copy_photo": "写真をコピー", - "sign_in": "サインイン", - "sign_up": "サインアップ", + "sign_in": "Log in", + "sign_up": "Create account", "see_more": "もっと見る", "preview": "プレビュー", "share": "共有", @@ -136,6 +136,12 @@ "vote": "投票", "closed": "終了" }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Show Profile: %s", + "email": "Email address: %s" + }, "actions": { "reply": "返信", "reblog": "ブースト", @@ -212,10 +218,16 @@ "get_started": "はじめる", "log_in": "ログイン" }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, "server_picker": { "title": "サーバーを選択", - "subtitle": "あなたの興味分野・地域に合ったコミュニティや、汎用のものを選択してください。", - "subtitle_extend": "あなたの興味分野・地域に合ったコミュニティや、汎用のものを選択してください。各コミュニティはそれぞれ完全に独立した組織や個人によって運営されています。", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "すべて", @@ -242,8 +254,7 @@ "category": "カテゴリー" }, "input": { - "placeholder": "サーバーを探す", - "search_servers_or_enter_url": "サーバーを検索またはURLを入力" + "search_servers_or_enter_url": "Search communities or enter URL" }, "empty_state": { "finding_servers": "利用可能なサーバーの検索...", @@ -376,7 +387,13 @@ "video": "動画", "attachment_broken": "%sは壊れていてMastodonにアップロードできません。", "description_photo": "閲覧が難しいユーザーへの画像説明", - "description_video": "閲覧が難しいユーザーへの映像説明" + "description_video": "閲覧が難しいユーザーへの映像説明", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "期間: %s", @@ -386,7 +403,9 @@ "one_day": "1日", "three_days": "3日", "seven_days": "7日", - "option_number": "オプション %ld" + "option_number": "オプション %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "ここに警告を書いてください..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "カスタム絵文字ピッカー", "enable_content_warning": "閲覧注意を有効にする", "disable_content_warning": "閲覧注意を無効にする", - "post_visibility_menu": "投稿の表示メニュー" + "post_visibility_menu": "投稿の表示メニュー", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "投稿を破棄", @@ -432,6 +453,10 @@ "placeholder": { "label": "ラベル", "content": "コンテンツ" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Localization/StringsConvertor/input/kab.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/kab.lproj/Localizable.stringsdict index 7fc6a50bb..f18a906c0 100644 --- a/Localization/StringsConvertor/input/kab.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/kab.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld yisekkilen + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 n usekkil + other + %ld n isekkilen + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey @@ -120,7 +136,7 @@ NSStringFormatValueTypeKey ld one - 1 tsuffeɣt + 1 n tsuffeɣt other %ld n tsuffaɣ @@ -296,9 +312,9 @@ NSStringFormatValueTypeKey ld one - Yeqqim-d 1 wass + Yeqqim-d 1 n wass other - Qqimen-d %ld wussan + Qqimen-d %ld n wussan date.hour.left @@ -312,9 +328,9 @@ NSStringFormatValueTypeKey ld one - Yeqqim-d 1 usrag + Yeqqim-d 1 n wesrag other - Qqimen-d %ld yisragen + Qqimen-d %ld n yisragen date.minute.left @@ -328,9 +344,9 @@ NSStringFormatValueTypeKey ld one - 1 tesdat i d-yeqqimen + 1 n tesdat i d-yeqqimen other - %ld tesdatin i d-yeqqimen + %ld n tesdatin i d-yeqqimen date.second.left @@ -344,9 +360,9 @@ NSStringFormatValueTypeKey ld one - 1 tasint i d-yeqqimen + 1 n tasint i d-yeqqimen other - %ld tsinin i d-yeqqimen + %ld n tasinin i d-yeqqimen date.year.ago.abbr @@ -360,9 +376,9 @@ NSStringFormatValueTypeKey ld one - 1 useggas aya + %ld n useggas aya other - %ld yiseggasen aya + %ld n yiseggasen aya date.month.ago.abbr @@ -376,9 +392,9 @@ NSStringFormatValueTypeKey ld one - 1 wayyur aya + %ld n wayyur aya other - %ld wayyuren aya + %ld n wayyuren aya date.day.ago.abbr @@ -392,9 +408,9 @@ NSStringFormatValueTypeKey ld one - 1 wass aya + %ld n wass aya other - %ld wussan aya + %ld n wussan aya date.hour.ago.abbr @@ -408,9 +424,9 @@ NSStringFormatValueTypeKey ld one - 1 usrag aya + %ld n wesrag aya other - %ld yisragen aya + %ld n yisragen aya date.minute.ago.abbr @@ -424,9 +440,9 @@ NSStringFormatValueTypeKey ld one - 1 tesdat aya + %ld n tesdat aya other - %ld tesdatin aya + %ld n tesdatin aya date.second.ago.abbr @@ -440,9 +456,9 @@ NSStringFormatValueTypeKey ld one - 1 tasint aya + %ld n tasint aya other - %ld tsinin aya + %ld n tasinin aya diff --git a/Localization/StringsConvertor/input/kab.lproj/app.json b/Localization/StringsConvertor/input/kab.lproj/app.json index 2cff3d68d..62cea8780 100644 --- a/Localization/StringsConvertor/input/kab.lproj/app.json +++ b/Localization/StringsConvertor/input/kab.lproj/app.json @@ -75,7 +75,7 @@ "save_photo": "Sekles tawlaft", "copy_photo": "Nɣel tawlaft", "sign_in": "Qqen", - "sign_up": "Jerred amiḍan", + "sign_up": "Snulfu-d amiḍan", "see_more": "Wali ugar", "preview": "Taskant", "share": "Bḍu", @@ -136,6 +136,12 @@ "vote": "Dɣeṛ", "closed": "Ifukk" }, + "meta_entity": { + "url": "Asaɣ : %s", + "hashtag": "Ahacṭag : %s", + "mention": "Sken-d amaɣnu : %s", + "email": "Tansa imayl : %s" + }, "actions": { "reply": "Err", "reblog": "Aɛiwed n usuffeɣ", @@ -212,10 +218,16 @@ "get_started": "Aha bdu tura", "log_in": "Qqen" }, + "login": { + "title": "Ansuf yess·ek·em", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Sekcem URL neɣ nadi ɣef uqeddac-ik·im" + } + }, "server_picker": { "title": "Mastodon yettwaxdem i yiseqdacen deg waṭas n temɣiwnin.", - "subtitle": "Fren tamɣiwent almend n wayen tḥemmleḍ, n tmurt-ik neɣ n yiswi-inek amatu.", - "subtitle_extend": "Fren tamɣiwent almend n wayen tḥemmleḍ, n tmurt-ik neɣ n yiswi-inek amatu. Yal tamɣiwent tsedday-itt tkebbanit neɣ amdan ilelliyen.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "Akk", @@ -242,7 +254,6 @@ "category": "TAGGAYT" }, "input": { - "placeholder": "Nadi timɣiwnin", "search_servers_or_enter_url": "Nadi timɣiwnin neɣ sekcem URL" }, "empty_state": { @@ -346,8 +357,8 @@ "navigation_bar_state": { "offline": "Beṛṛa n tuqqna", "new_posts": "Tissufaɣ timaynutin", - "published": "Yettwasuffeɣ!", - "Publishing": "Asuffeɣ tasuffeɣt...", + "published": "Tettwasuffeɣ!", + "Publishing": "Asuffeɣ n tasuffeɣt...", "accessibility": { "logo_label": "Taqeffalt n ulugu", "logo_hint": "Sit i wakken ad tɛeddiḍ i usawen, sit tikkelt-nniḍen i wakken ad tɛeddiḍ ɣer wadig yezrin" @@ -376,7 +387,13 @@ "video": "tavidyutt", "attachment_broken": "%s-a yerreẓ, ur yezmir ara\nAd d-yettwasali ɣef Mastodon.", "description_photo": "Glem-d tawlaft i wid yesɛan ugur deg yiẓri...", - "description_video": "Glem-d tavidyut i wid yesɛan ugur deg yiẓri..." + "description_video": "Glem-d tavidyut i wid yesɛan ugur deg yiẓri...", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "Tangazt: %s", @@ -386,7 +403,9 @@ "one_day": "1 n wass", "three_days": "3 n wussan", "seven_days": "7 n wussan", - "option_number": "Taxtiṛt %ld" + "option_number": "Taxtiṛt %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "Aru alɣu-inek s telqeyt da..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Amefran n yimujiten udmawanen", "enable_content_warning": "Rmed alɣu n ugbur", "disable_content_warning": "Sens alɣu n ugbur", - "post_visibility_menu": "Umuɣ n ubani n tsuffeɣt" + "post_visibility_menu": "Umuɣ n ubani n tsuffeɣt", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "Sefsex tasuffeɣt", @@ -432,6 +453,10 @@ "placeholder": { "label": "Tabzimt", "content": "Agbur" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { @@ -646,7 +671,7 @@ "its_spam": "D aspam", "malicious_links_fake_engagement_or_repetetive_replies": "Yir iseɣwan, yir agman d tririyin i d-yettuɣalen", "it_violates_server_rules": "Truẓi n yilugan n uqeddac", - "you_are_aware_that_it_breaks_specific_rules": "Teẓriḍ y•tettruẓu kra n yilugan", + "you_are_aware_that_it_breaks_specific_rules": "Teẓriḍ y·tettruẓu kra n yilugan", "its_something_else": "Ɣef ssebba-nniḍen", "the_issue_does_not_fit_into_other_categories": "Ugur ur yemṣada ara akk d taggayin-nniḍen" }, diff --git a/Localization/StringsConvertor/input/kmr.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/kmr.lproj/Localizable.stringsdict index 77571439f..c904186d8 100644 --- a/Localization/StringsConvertor/input/kmr.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/kmr.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld tîp + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ maye + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 peyv + other + %ld peyv + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/kmr.lproj/app.json b/Localization/StringsConvertor/input/kmr.lproj/app.json index d48edf3ae..eb553885c 100644 --- a/Localization/StringsConvertor/input/kmr.lproj/app.json +++ b/Localization/StringsConvertor/input/kmr.lproj/app.json @@ -75,7 +75,7 @@ "save_photo": "Wêneyê tomar bike", "copy_photo": "Wêneyê jê bigire", "sign_in": "Têkeve", - "sign_up": "Tomar bibe", + "sign_up": "Ajimêr biafirîne", "see_more": "Bêtir bibîne", "preview": "Pêşdîtin", "share": "Parve bike", @@ -136,6 +136,12 @@ "vote": "Deng bide", "closed": "Girtî" }, + "meta_entity": { + "url": "Girêdan: %s", + "hashtag": "Hashtagê: %s", + "mention": "Profîlê nîşan bide: %s", + "email": "Navnîşanên e-nameyê: %s" + }, "actions": { "reply": "Bersivê bide", "reblog": "Ji nû ve nivîsandin", @@ -181,8 +187,8 @@ "unmute_user": "%s bêdeng neke", "muted": "Bêdengkirî", "edit_info": "Zanyariyan serrast bike", - "show_reblogs": "Show Reblogs", - "hide_reblogs": "Hide Reblogs" + "show_reblogs": "Bilindkirinan nîşan bide", + "hide_reblogs": "Bilindkirinan veşêre" }, "timeline": { "filtered": "Parzûnkirî", @@ -212,10 +218,16 @@ "get_started": "Dest pê bike", "log_in": "Têkeve" }, + "login": { + "title": "Dîsa bi xêr hatî", + "subtitle": "Têketinê bike ser rajekarê ku te ajimêrê xwe tê de çê kiriye.", + "server_search_field": { + "placeholder": "Girêdanê têxe an jî li rajekarê xwe bigere" + } + }, "server_picker": { "title": "Mastodon ji bikarhênerên di civakên cuda de pêk tê.", - "subtitle": "Li gorî berjewendî, herêm, an jî armancek gelemperî civakekê hilbijêre.", - "subtitle_extend": "Li gorî berjewendî, herêm, an jî armancek gelemperî civakekê hilbijêre. Her civakek ji hêla rêxistinek an kesek bi tevahî serbixwe ve tê xebitandin.", + "subtitle": "Li gorî herêm, berjewendî, an jî armanceke giştî rajekarekê hilbijêre. Tu hîn jî dikarî li ser Mastodon bi her kesî re biaxivî, her rajekarê te çi be.", "button": { "category": { "all": "Hemû", @@ -242,8 +254,7 @@ "category": "BEŞ" }, "input": { - "placeholder": "Li rajekaran bigere", - "search_servers_or_enter_url": "Li rajekaran bigere an jî girêdanê têxe" + "search_servers_or_enter_url": "Li civakan bigere an jî girêdanê têxe" }, "empty_state": { "finding_servers": "Peydakirina rajekarên berdest...", @@ -376,7 +387,13 @@ "video": "vîdyo", "attachment_broken": "Ev %s naxebite û nayê barkirin\n li ser Mastodon.", "description_photo": "Wêneyê ji bo kêmbînên dîtbar bide nasîn...", - "description_video": "Vîdyoyê ji bo kêmbînên dîtbar bide nasîn..." + "description_video": "Vîdyoyê ji bo kêmbînên dîtbar bide nasîn...", + "load_failed": "Barkirin têk çû", + "upload_failed": "Barkirin têk çû", + "can_not_recognize_this_media_attachment": "Nikare ev pêveka medyayê nas bike", + "attachment_too_large": "Pêvek pir mezin e", + "compressing_state": "Tê guvaştin...", + "server_processing_state": "Pêvajoya rajekar pêş de diçe..." }, "poll": { "duration_time": "Dirêjî: %s", @@ -386,7 +403,9 @@ "one_day": "1 Roj", "three_days": "3 Roj", "seven_days": "7 Roj", - "option_number": "Vebijêrk %ld" + "option_number": "Vebijêrk %ld", + "the_poll_is_invalid": "Ev dengdayîn ne derbasdar e", + "the_poll_has_empty_option": "Vebijêrkên vê dengdayînê vala ne" }, "content_warning": { "placeholder": "Li vir hişyariyek hûrgilî binivîsine..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Hilbijêrê emojî yên kesanekirî", "enable_content_warning": "Hişyariya naverokê çalak bike", "disable_content_warning": "Hişyariya naverokê neçalak bike", - "post_visibility_menu": "Kulîna xuyabûna şandiyê" + "post_visibility_menu": "Kulîna xuyabûna şandiyê", + "post_options": "Vebijêrkên şandiyê", + "posting_as": "Biweşîne wekî %s" }, "keyboard": { "discard_post": "Şandî paşguh bike", @@ -432,6 +453,10 @@ "placeholder": { "label": "Nîşan", "content": "Naverok" + }, + "verified": { + "short": "Hate piştrastkirin li ser %s", + "long": "Xwedaniya li vê girêdanê di %s de hatiye kontrolkirin" } }, "segmented_control": { @@ -459,12 +484,12 @@ "message": "Ji bo rakirina astengkirinê %s bipejirîne" }, "confirm_show_reblogs": { - "title": "Show Reblogs", - "message": "Confirm to show reblogs" + "title": "Bilindkirinan nîşan bide", + "message": "Bo nîşandana bilindkirinan bipejirîne" }, "confirm_hide_reblogs": { - "title": "Hide Reblogs", - "message": "Confirm to hide reblogs" + "title": "Bilindkirinan veşêre", + "message": "Bo veşartina bilindkirinan bipejirîne" } }, "accessibility": { @@ -696,7 +721,7 @@ "accessibility_hint": "Du caran bitikîne da ku çarçoveyahilpekok ji holê rakî" }, "bookmark": { - "title": "Bookmarks" + "title": "Şûnpel" } } } diff --git a/Localization/StringsConvertor/input/ko.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/ko.lproj/Localizable.stringsdict index 9628be614..77aac5569 100644 --- a/Localization/StringsConvertor/input/ko.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/ko.lproj/Localizable.stringsdict @@ -44,6 +44,20 @@ %ld 글자 + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ 글자 남음 + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + other + %ld 글자 + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/ko.lproj/app.json b/Localization/StringsConvertor/input/ko.lproj/app.json index bbb4d1dea..070386bf9 100644 --- a/Localization/StringsConvertor/input/ko.lproj/app.json +++ b/Localization/StringsConvertor/input/ko.lproj/app.json @@ -75,7 +75,7 @@ "save_photo": "사진 저장", "copy_photo": "사진 복사", "sign_in": "로그인", - "sign_up": "회원가입", + "sign_up": "계정 생성", "see_more": "더 보기", "preview": "미리보기", "share": "공유", @@ -129,13 +129,19 @@ "show_post": "게시물 보기", "show_user_profile": "사용자 프로필 보기", "content_warning": "열람 주의", - "sensitive_content": "Sensitive Content", + "sensitive_content": "민감한 콘텐츠", "media_content_warning": "아무 곳이나 눌러서 보기", "tap_to_reveal": "눌러서 확인", "poll": { "vote": "투표", "closed": "마감" }, + "meta_entity": { + "url": "링크: %s", + "hashtag": "해시태그: %s", + "mention": "프로필 보기: %s", + "email": "이메일 주소: %s" + }, "actions": { "reply": "답글", "reblog": "리블로그", @@ -212,10 +218,16 @@ "get_started": "시작하기", "log_in": "로그인" }, + "login": { + "title": "돌아오신 것을 환영합니다", + "subtitle": "계정을 만든 서버에 로그인.", + "server_search_field": { + "placeholder": "URL을 입력하거나 서버를 검색" + } + }, "server_picker": { "title": "서버를 고르세요,\n아무 서버나 좋습니다.", - "subtitle": "Pick a server based on your interests, region, or a general purpose one.", - "subtitle_extend": "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual.", + "subtitle": "당신의 지역이나, 관심사에 따라, 혹은 그냥 일반적인 목적의 서버를 고르세요. 어떤 서버를 고르더라도 마스토돈의 다른 모두와 소통할 수 있습니다.", "button": { "category": { "all": "모두", @@ -242,8 +254,7 @@ "category": "분류" }, "input": { - "placeholder": "서버 검색", - "search_servers_or_enter_url": "서버를 검색하거나 URL을 입력하세요" + "search_servers_or_enter_url": "커뮤니티를 검색하거나 URL을 입력" }, "empty_state": { "finding_servers": "사용 가능한 서버를 찾는 중입니다...", @@ -376,7 +387,13 @@ "video": "동영상", "attachment_broken": "This %s is broken and can’t be\nuploaded to Mastodon.", "description_photo": "시각장애인을 위한 사진 설명…", - "description_video": "시각장애인을 위한 영상 설명…" + "description_video": "시각장애인을 위한 영상 설명…", + "load_failed": "불러오기 실패", + "upload_failed": "업로드 실패", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "첨부파일이 너무 큽니다", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "기간: %s", @@ -386,7 +403,9 @@ "one_day": "1일", "three_days": "3일", "seven_days": "7일", - "option_number": "옵션 %ld" + "option_number": "옵션 %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "정확한 경고 문구를 여기에 작성하세요…" @@ -407,7 +426,9 @@ "custom_emoji_picker": "커스텀 에모지 선택기", "enable_content_warning": "열람 주의 설정", "disable_content_warning": "열람 주의 해제", - "post_visibility_menu": "게시물 공개범위 메뉴" + "post_visibility_menu": "게시물 공개범위 메뉴", + "post_options": "게시물 옵션", + "posting_as": "%s로 게시" }, "keyboard": { "discard_post": "글 버리기", @@ -432,6 +453,10 @@ "placeholder": { "label": "라벨", "content": "내용" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Localization/StringsConvertor/input/lv.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/lv.lproj/Localizable.stringsdict index 25f32c98d..ac30b4f8b 100644 --- a/Localization/StringsConvertor/input/lv.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/lv.lproj/Localizable.stringsdict @@ -56,6 +56,24 @@ %ld characters + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + %ld characters + one + 1 character + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/lv.lproj/app.json b/Localization/StringsConvertor/input/lv.lproj/app.json index 0051383db..1ca18400b 100644 --- a/Localization/StringsConvertor/input/lv.lproj/app.json +++ b/Localization/StringsConvertor/input/lv.lproj/app.json @@ -74,8 +74,8 @@ "take_photo": "Uzņemt bildi", "save_photo": "Saglabāt bildi", "copy_photo": "Kopēt bildi", - "sign_in": "Pieteikties", - "sign_up": "Reģistrēties", + "sign_in": "Log in", + "sign_up": "Create account", "see_more": "Skatīt vairāk", "preview": "Priekšskatījums", "share": "Dalīties", @@ -136,6 +136,12 @@ "vote": "Balsot", "closed": "Aizvērts" }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Show Profile: %s", + "email": "Email address: %s" + }, "actions": { "reply": "Atbildēt", "reblog": "Reblogot", @@ -212,10 +218,16 @@ "get_started": "Get Started", "log_in": "Pieteikties" }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, "server_picker": { "title": "Mastodon is made of users in different servers.", - "subtitle": "Pick a server based on your interests, region, or a general purpose one.", - "subtitle_extend": "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "Visi", @@ -242,8 +254,7 @@ "category": "KATEGORIJA" }, "input": { - "placeholder": "Meklēt serverus", - "search_servers_or_enter_url": "Search servers or enter URL" + "search_servers_or_enter_url": "Search communities or enter URL" }, "empty_state": { "finding_servers": "Finding available servers...", @@ -376,7 +387,13 @@ "video": "video", "attachment_broken": "This %s is broken and can’t be\nuploaded to Mastodon.", "description_photo": "Describe the photo for the visually-impaired...", - "description_video": "Describe the video for the visually-impaired..." + "description_video": "Describe the video for the visually-impaired...", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "Duration: %s", @@ -386,7 +403,9 @@ "one_day": "1 Diena", "three_days": "3 Dienas", "seven_days": "7 Dienas", - "option_number": "Option %ld" + "option_number": "Option %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "Write an accurate warning here..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Custom Emoji Picker", "enable_content_warning": "Enable Content Warning", "disable_content_warning": "Disable Content Warning", - "post_visibility_menu": "Post Visibility Menu" + "post_visibility_menu": "Post Visibility Menu", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "Discard Post", @@ -432,6 +453,10 @@ "placeholder": { "label": "Label", "content": "Saturs" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Localization/StringsConvertor/input/nl.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/nl.lproj/Localizable.stringsdict index 314600ff7..84769b0c1 100644 --- a/Localization/StringsConvertor/input/nl.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/nl.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld tekens + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/nl.lproj/app.json b/Localization/StringsConvertor/input/nl.lproj/app.json index 649fe5064..589c51d2d 100644 --- a/Localization/StringsConvertor/input/nl.lproj/app.json +++ b/Localization/StringsConvertor/input/nl.lproj/app.json @@ -74,8 +74,8 @@ "take_photo": "Maak foto", "save_photo": "Bewaar foto", "copy_photo": "Kopieer foto", - "sign_in": "Aanmelden", - "sign_up": "Registreren", + "sign_in": "Log in", + "sign_up": "Create account", "see_more": "Meer", "preview": "Voorvertoning", "share": "Deel", @@ -136,6 +136,12 @@ "vote": "Stemmen", "closed": "Gesloten" }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Show Profile: %s", + "email": "Email address: %s" + }, "actions": { "reply": "Reageren", "reblog": "Delen", @@ -212,10 +218,16 @@ "get_started": "Aan de slag", "log_in": "Log in" }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, "server_picker": { "title": "Kies een server, welke dan ook.", - "subtitle": "Kies een gemeenschap gebaseerd op jouw interesses, regio of een algemeen doel.", - "subtitle_extend": "Kies een gemeenschap gebaseerd op jouw interesses, regio, of een algemeen doel. Elke gemeenschap wordt beheerd door een volledig onafhankelijke organisatie of individu.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "Alles", @@ -242,8 +254,7 @@ "category": "CATEGORIE" }, "input": { - "placeholder": "Zoek uw server of sluit u bij een nieuwe server aan...", - "search_servers_or_enter_url": "Search servers or enter URL" + "search_servers_or_enter_url": "Search communities or enter URL" }, "empty_state": { "finding_servers": "Beschikbare servers zoeken...", @@ -376,7 +387,13 @@ "video": "video", "attachment_broken": "Deze %s is corrupt en kan niet geüpload worden naar Mastodon.", "description_photo": "Omschrijf de foto voor mensen met een visuele beperking...", - "description_video": "Omschrijf de video voor mensen met een visuele beperking..." + "description_video": "Omschrijf de video voor mensen met een visuele beperking...", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "Duur: %s", @@ -386,7 +403,9 @@ "one_day": "1 Dag", "three_days": "3 Dagen", "seven_days": "7 Dagen", - "option_number": "Optie %ld" + "option_number": "Optie %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "Schrijf hier een nauwkeurige waarschuwing..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Eigen Emojikiezer", "enable_content_warning": "Inhoudswaarschuwing inschakelen", "disable_content_warning": "Inhoudswaarschuwing Uitschakelen", - "post_visibility_menu": "Berichtzichtbaarheidsmenu" + "post_visibility_menu": "Berichtzichtbaarheidsmenu", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "Bericht Verwijderen", @@ -432,6 +453,10 @@ "placeholder": { "label": "Etiket", "content": "Inhoud" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Localization/StringsConvertor/input/pt-BR.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/pt-BR.lproj/Localizable.stringsdict index ba1532740..02fbf2d20 100644 --- a/Localization/StringsConvertor/input/pt-BR.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/pt-BR.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld caracteres + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ restantes + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 carácter + other + %ld carácteres + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey @@ -72,9 +88,9 @@ NSStringFormatValueTypeKey ld one - Followed by %1$@, and another mutual + Seguido por %1$@, e outro em comum other - Followed by %1$@, and %ld mutuals + Seguido por %1$@, e %ld em comum plural.count.metric_formatted.post @@ -104,9 +120,9 @@ NSStringFormatValueTypeKey ld one - 1 media + 1 mídia other - %ld media + %ld mídias plural.count.post diff --git a/Localization/StringsConvertor/input/pt-BR.lproj/app.json b/Localization/StringsConvertor/input/pt-BR.lproj/app.json index 063ed346c..60d858235 100644 --- a/Localization/StringsConvertor/input/pt-BR.lproj/app.json +++ b/Localization/StringsConvertor/input/pt-BR.lproj/app.json @@ -2,11 +2,11 @@ "common": { "alerts": { "common": { - "please_try_again": "Por favor tente novamente.", + "please_try_again": "Por favor, tente novamente.", "please_try_again_later": "Tente novamente mais tarde." }, "sign_up_failure": { - "title": "Sign Up Failure" + "title": "Falha no cadastro" }, "server_error": { "title": "Erro do servidor" @@ -17,7 +17,7 @@ }, "discard_post_content": { "title": "Deletar Rascunho", - "message": "Confirm to discard composed post content." + "message": "Confirme para descartar o conteúdo da publicação composta." }, "publish_post_failure": { "title": "Falha ao publicar", @@ -42,7 +42,7 @@ }, "save_photo_failure": { "title": "Falha ao salvar foto", - "message": "Please enable the photo library access permission to save the photo." + "message": "Por favor, ative a permissão de acesso à galeria para salvar a foto." }, "delete_post": { "title": "Deletar Toot", @@ -71,632 +71,657 @@ "cancel": "Cancelar", "discard": "Descartar", "try_again": "Tente novamente", - "take_photo": "Take Photo", + "take_photo": "Tirar foto", "save_photo": "Salvar foto", "copy_photo": "Copiar foto", - "sign_in": "Sign In", - "sign_up": "Sign Up", - "see_more": "See More", - "preview": "Preview", + "sign_in": "Entrar", + "sign_up": "Criar conta", + "see_more": "Ver mais", + "preview": "Pré-visualização", "share": "Compartilhar", "share_user": "Compartilhar %s", - "share_post": "Share Post", - "open_in_safari": "Open in Safari", - "open_in_browser": "Open in Browser", - "find_people": "Find people to follow", - "manually_search": "Manually search instead", - "skip": "Skip", - "reply": "Reply", - "report_user": "Report %s", - "block_domain": "Block %s", - "unblock_domain": "Unblock %s", - "settings": "Settings", - "delete": "Delete" + "share_post": "Compartilhar postagem", + "open_in_safari": "Abrir no Safari", + "open_in_browser": "Abrir no navegador", + "find_people": "Encontre pessoas para seguir", + "manually_search": "Procure manualmente em vez disso", + "skip": "Pular", + "reply": "Responder", + "report_user": "Denunciar %s", + "block_domain": "Bloquear %s", + "unblock_domain": "Desbloquear %s", + "settings": "Configurações", + "delete": "Excluir" }, "tabs": { - "home": "Home", - "search": "Search", - "notification": "Notification", - "profile": "Profile" + "home": "Início", + "search": "Buscar", + "notification": "Notificação", + "profile": "Perfil" }, "keyboard": { "common": { - "switch_to_tab": "Switch to %s", - "compose_new_post": "Compose New Post", - "show_favorites": "Show Favorites", - "open_settings": "Open Settings" + "switch_to_tab": "Mudar para %s", + "compose_new_post": "Compor novo toot", + "show_favorites": "Mostrar favoritos", + "open_settings": "Abrir configurações" }, "timeline": { - "previous_status": "Previous Post", - "next_status": "Next Post", - "open_status": "Open Post", - "open_author_profile": "Open Author's Profile", - "open_reblogger_profile": "Open Reblogger's Profile", - "reply_status": "Reply to Post", - "toggle_reblog": "Toggle Reblog on Post", - "toggle_favorite": "Toggle Favorite on Post", - "toggle_content_warning": "Toggle Content Warning", - "preview_image": "Preview Image" + "previous_status": "Postagem anterior", + "next_status": "Próxima postagem", + "open_status": "Abrir toot", + "open_author_profile": "Abrir perfil do autor", + "open_reblogger_profile": "Abrir perfil do reblogger", + "reply_status": "Responder toot", + "toggle_reblog": "Ativar/desativar Reblog na postagem", + "toggle_favorite": "Ativar/desativar Favorito na postagem", + "toggle_content_warning": "Ativar/desativar Aviso de Conteúdo", + "preview_image": "Pré-visualizar imagem" }, "segmented_control": { - "previous_section": "Previous Section", - "next_section": "Next Section" + "previous_section": "Seção anterior", + "next_section": "Próxima seção" } }, "status": { - "user_reblogged": "%s reblogged", - "user_replied_to": "Replied to %s", - "show_post": "Show Post", - "show_user_profile": "Show user profile", - "content_warning": "Content Warning", - "sensitive_content": "Sensitive Content", - "media_content_warning": "Tap anywhere to reveal", - "tap_to_reveal": "Tap to reveal", + "user_reblogged": "%s reblogou", + "user_replied_to": "Em resposta a %s", + "show_post": "Mostrar postagem", + "show_user_profile": "Mostrar perfil de usuário", + "content_warning": "Aviso de Conteúdo", + "sensitive_content": "Conteúdo sensível", + "media_content_warning": "Toque em qualquer lugar para revelar", + "tap_to_reveal": "Toque para revelar", "poll": { - "vote": "Vote", - "closed": "Closed" + "vote": "Votar", + "closed": "Fechado" + }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Mostrar perfil: %s", + "email": "Endereço de e-mail: %s" }, "actions": { "reply": "Responder", - "reblog": "Reblog", - "unreblog": "Undo reblog", - "favorite": "Favorite", - "unfavorite": "Unfavorite", + "reblog": "Reblogar", + "unreblog": "Desfazer reblog", + "favorite": "Favoritar", + "unfavorite": "Remover favorito", "menu": "Menu", - "hide": "Hide", - "show_image": "Show image", - "show_gif": "Show GIF", - "show_video_player": "Show video player", - "tap_then_hold_to_show_menu": "Tap then hold to show menu" + "hide": "Ocultar", + "show_image": "Exibir imagem", + "show_gif": "Exibir GIF", + "show_video_player": "Mostrar reprodutor de vídeo", + "tap_then_hold_to_show_menu": "Toque e em seguida segure para exibir o menu" }, "tag": { "url": "URL", - "mention": "Mention", + "mention": "Mencionar", "link": "Link", "hashtag": "Hashtag", - "email": "Email", + "email": "E-mail", "emoji": "Emoji" }, "visibility": { - "unlisted": "Everyone can see this post but not display in the public timeline.", - "private": "Only their followers can see this post.", - "private_from_me": "Only my followers can see this post.", - "direct": "Only mentioned user can see this post." + "unlisted": "Todos podem ver esta postagem, mas não são exibidos na linha do tempo pública.", + "private": "Somente seus seguidores podem ver essa postagem.", + "private_from_me": "Somente meus seguidores podem ver essa postagem.", + "direct": "Somente o usuário mencionado pode ver essa postagem." } }, "friendship": { - "follow": "Follow", - "following": "Following", - "request": "Request", - "pending": "Pending", - "block": "Block", - "block_user": "Block %s", - "block_domain": "Block %s", - "unblock": "Unblock", - "unblock_user": "Unblock %s", - "blocked": "Blocked", - "mute": "Mute", - "mute_user": "Mute %s", - "unmute": "Unmute", - "unmute_user": "Unmute %s", - "muted": "Muted", - "edit_info": "Edit Info", - "show_reblogs": "Show Reblogs", - "hide_reblogs": "Hide Reblogs" + "follow": "Seguir", + "following": "Seguindo", + "request": "Solicitação", + "pending": "Pendente", + "block": "Bloquear", + "block_user": "Bloquear %s", + "block_domain": "Bloquear %s", + "unblock": "Desbloquear", + "unblock_user": "Desbloquear %s", + "blocked": "Bloqueado", + "mute": "Silenciar", + "mute_user": "Silenciar %s", + "unmute": "Remover silenciado", + "unmute_user": "Remover silenciado %s", + "muted": "Silenciado", + "edit_info": "Editar informação", + "show_reblogs": "Mostrar Reblogs", + "hide_reblogs": "Ocultar Reblogs" }, "timeline": { - "filtered": "Filtered", + "filtered": "Filtrado", "timestamp": { - "now": "Now" + "now": "Agora" }, "loader": { - "load_missing_posts": "Load missing posts", - "loading_missing_posts": "Loading missing posts...", - "show_more_replies": "Show more replies" + "load_missing_posts": "Carregar postagens em falta", + "loading_missing_posts": "Carregando postagens em falta...", + "show_more_replies": "Exibir mais respostas" }, "header": { - "no_status_found": "No Post Found", - "blocking_warning": "You can’t view this user's profile\nuntil you unblock them.\nYour profile looks like this to them.", - "user_blocking_warning": "You can’t view %s’s profile\nuntil you unblock them.\nYour profile looks like this to them.", - "blocked_warning": "You can’t view this user’s profile\nuntil they unblock you.", - "user_blocked_warning": "You can’t view %s’s profile\nuntil they unblock you.", - "suspended_warning": "This user has been suspended.", - "user_suspended_warning": "%s’s account has been suspended." + "no_status_found": "Nenhuma postagem encontrada", + "blocking_warning": "Você não pode ver o perfil deste usuário até desbloqueá-lo.\nSeu perfil aparece assim para esse usuário.", + "user_blocking_warning": "Você não pode ver o perfil de %s até desbloqueá-lo.\nSeu perfil aparece assim para esse usuário.", + "blocked_warning": "Você não pode ver o perfil desse usuário até que ele o desbloqueie.", + "user_blocked_warning": "Você não pode ver o perfil de %s até que ele o desbloqueie.", + "suspended_warning": "Esse usuário foi suspenso.", + "user_suspended_warning": "A conta de %s foi suspensa." } } } }, "scene": { "welcome": { - "slogan": "Social networking\nback in your hands.", - "get_started": "Get Started", - "log_in": "Log In" + "slogan": "Você no controle de sua rede social.", + "get_started": "Comece já", + "log_in": "Entrar" + }, + "login": { + "title": "Bem-vindo de volta", + "subtitle": "Logado na instância em que você criou a sua conta.", + "server_search_field": { + "placeholder": "Insira a URL ou procure pela sua instância" + } }, "server_picker": { - "title": "Mastodon is made of users in different servers.", - "subtitle": "Pick a server based on your interests, region, or a general purpose one.", - "subtitle_extend": "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual.", + "title": "Mastodon é feito de usuários em instâncias diferentes.", + "subtitle": "Escolha uma instância baseada na sua região, interesses, ou uma de uso geral. Você ainda poderá conversar com qualquer um no Mastodon, independente da instância.", "button": { "category": { - "all": "All", - "all_accessiblity_description": "Category: All", - "academia": "academia", - "activism": "activism", - "food": "food", + "all": "Todos", + "all_accessiblity_description": "Categoria: Todos", + "academia": "acadêmico", + "activism": "ativismo", + "food": "comida", "furry": "furry", - "games": "games", - "general": "general", - "journalism": "journalism", + "games": "jogos", + "general": "geral", + "journalism": "jornalismo", "lgbt": "lgbt", "regional": "regional", - "art": "art", - "music": "music", - "tech": "tech" + "art": "arte", + "music": "música", + "tech": "tecnologia" }, - "see_less": "See Less", - "see_more": "See More" + "see_less": "Ver menos", + "see_more": "Ver mais" }, "label": { - "language": "LANGUAGE", - "users": "USERS", - "category": "CATEGORY" + "language": "Idioma", + "users": "Usuários", + "category": "Categoria" }, "input": { - "placeholder": "Search servers", - "search_servers_or_enter_url": "Search servers or enter URL" + "search_servers_or_enter_url": "Procurar comunidades ou inserir URL" }, "empty_state": { - "finding_servers": "Finding available servers...", - "bad_network": "Something went wrong while loading the data. Check your internet connection.", - "no_results": "No results" + "finding_servers": "Procurando instâncias disponíveis...", + "bad_network": "Algo deu errado ao carregar os dados. Verifique sua conexão com a internet.", + "no_results": "Sem resultados" } }, "register": { - "title": "Let’s get you set up on %s", - "lets_get_you_set_up_on_domain": "Let’s get you set up on %s", + "title": "Vamos configurar você em %s", + "lets_get_you_set_up_on_domain": "Vamos configurar você em %s", "input": { "avatar": { - "delete": "Delete" + "delete": "Excluir" }, "username": { - "placeholder": "username", - "duplicate_prompt": "This username is taken." + "placeholder": "nome de usuário", + "duplicate_prompt": "Esse nome de usuário já está sendo usado." }, "display_name": { - "placeholder": "display name" + "placeholder": "nome de exibição" }, "email": { - "placeholder": "email" + "placeholder": "e-mail" }, "password": { - "placeholder": "password", - "require": "Your password needs at least:", - "character_limit": "8 characters", + "placeholder": "senha", + "require": "Sua senha deve ter pelo menos:", + "character_limit": "8 carácteres", "accessibility": { - "checked": "checked", - "unchecked": "unchecked" + "checked": "marcado", + "unchecked": "desmarcado" }, - "hint": "Your password needs at least eight characters" + "hint": "Sua senha precisa ter pelo menos oito carácteres" }, "invite": { - "registration_user_invite_request": "Why do you want to join?" + "registration_user_invite_request": "Por que você deseja se inscrever?" } }, "error": { "item": { - "username": "Username", - "email": "Email", - "password": "Password", - "agreement": "Agreement", - "locale": "Locale", - "reason": "Reason" + "username": "Nome de usuário", + "email": "E-mail", + "password": "Senha", + "agreement": "Termos de uso", + "locale": "Localidade", + "reason": "Motivo" }, "reason": { - "blocked": "%s contains a disallowed email provider", - "unreachable": "%s does not seem to exist", - "taken": "%s is already in use", - "reserved": "%s is a reserved keyword", - "accepted": "%s must be accepted", - "blank": "%s is required", - "invalid": "%s is invalid", - "too_long": "%s is too long", - "too_short": "%s is too short", - "inclusion": "%s is not a supported value" + "blocked": "%s contém um provedor de e-mail não permitido", + "unreachable": "%s parece não existir", + "taken": "%s já está em uso", + "reserved": "%s é uma palavra-chave reservada", + "accepted": "%s deve ser aceite", + "blank": "%s é obrigatório", + "invalid": "%s é inválido", + "too_long": "%s é muito longo", + "too_short": "%s é muito curto", + "inclusion": "%s não é um valor suportado" }, "special": { - "username_invalid": "Username must only contain alphanumeric characters and underscores", - "username_too_long": "Username is too long (can’t be longer than 30 characters)", - "email_invalid": "This is not a valid email address", - "password_too_short": "Password is too short (must be at least 8 characters)" + "username_invalid": "O nome de usuário só pode conter caracteres alfanuméricos e underlines (_)", + "username_too_long": "Nome de usuário é muito longo (não pode ter mais de 30 caracteres)", + "email_invalid": "Este não é um endereço de e-mail válido", + "password_too_short": "A senha é muito curta (deve ter pelo menos 8 caracteres)" } } }, "server_rules": { - "title": "Some ground rules.", - "subtitle": "These are set and enforced by the %s moderators.", - "prompt": "By continuing, you’re subject to the terms of service and privacy policy for %s.", - "terms_of_service": "terms of service", - "privacy_policy": "privacy policy", + "title": "Algumas regras básicas.", + "subtitle": "Estes são definidos e aplicados pelos moderadores da %s.", + "prompt": "Ao continuar, você estará sujeito aos termos de serviço e política de privacidade para %s.", + "terms_of_service": "termos de serviço", + "privacy_policy": "política de privacidade", "button": { - "confirm": "I Agree" + "confirm": "Eu concordo" } }, "confirm_email": { - "title": "One last thing.", - "subtitle": "Tap the link we emailed to you to verify your account.", - "tap_the_link_we_emailed_to_you_to_verify_your_account": "Tap the link we emailed to you to verify your account", + "title": "Uma última coisa.", + "subtitle": "Clique no link que te enviamos por e-mail para verificar a sua conta.", + "tap_the_link_we_emailed_to_you_to_verify_your_account": "Clique no link que te enviamos por e-mail para verificar a sua conta", "button": { - "open_email_app": "Open Email App", - "resend": "Resend" + "open_email_app": "Abrir aplicativo de e-mail", + "resend": "Reenviar" }, "dont_receive_email": { - "title": "Check your email", - "description": "Check if your email address is correct as well as your junk folder if you haven’t.", - "resend_email": "Resend Email" + "title": "Verifique o seu e-mail", + "description": "Verifique se o seu endereço de e-mail está correto, e também a sua pasta de spam caso não tenha verificado.", + "resend_email": "Reenviar e-mail" }, "open_email_app": { - "title": "Check your inbox.", - "description": "We just sent you an email. Check your junk folder if you haven’t.", - "mail": "Mail", - "open_email_client": "Open Email Client" + "title": "Verifique sua caixa de entrada.", + "description": "Enviamos um e-mail para você. Verifique sua pasta de spam caso ainda tenha verificado.", + "mail": "Correio", + "open_email_client": "Abrir Cliente de Email" } }, "home_timeline": { - "title": "Home", + "title": "Início", "navigation_bar_state": { - "offline": "Offline", - "new_posts": "See new posts", - "published": "Published!", - "Publishing": "Publishing post...", + "offline": "Desconectado", + "new_posts": "Ver novas postagens", + "published": "Publicado!", + "Publishing": "Publicando toot...", "accessibility": { - "logo_label": "Logo Button", - "logo_hint": "Tap to scroll to top and tap again to previous location" + "logo_label": "Botão do logotipo", + "logo_hint": "Toque para rolar para o topo e toque novamente para a localização anterior" } } }, "suggestion_account": { - "title": "Find People to Follow", - "follow_explain": "When you follow someone, you’ll see their posts in your home feed." + "title": "Encontre pessoas para seguir", + "follow_explain": "Ao seguir alguém, você verá as publicações dessa pessoa na sua página inicial." }, "compose": { "title": { - "new_post": "New Post", - "new_reply": "New Reply" + "new_post": "Novo toot", + "new_reply": "Nova resposta" }, "media_selection": { - "camera": "Take Photo", - "photo_library": "Photo Library", - "browse": "Browse" + "camera": "Tirar foto", + "photo_library": "Galeria", + "browse": "Navegar" }, - "content_input_placeholder": "Type or paste what’s on your mind", - "compose_action": "Publish", - "replying_to_user": "replying to %s", + "content_input_placeholder": "Digite ou cole o que está na sua mente", + "compose_action": "Publicar", + "replying_to_user": "em resposta a %s", "attachment": { - "photo": "photo", - "video": "video", - "attachment_broken": "This %s is broken and can’t be\nuploaded to Mastodon.", - "description_photo": "Describe the photo for the visually-impaired...", - "description_video": "Describe the video for the visually-impaired..." + "photo": "foto", + "video": "vídeo", + "attachment_broken": "Este %s está quebrado e não pode ser\nenviado para o Mastodon.", + "description_photo": "Descreva a foto para deficientes visuais...", + "description_video": "Descreva o vídeo para os deficientes visuais...", + "load_failed": "Falha ao carregar", + "upload_failed": "Falha no carregamento", + "can_not_recognize_this_media_attachment": "Não é possível reconhecer este anexo de mídia", + "attachment_too_large": "O anexo é muito grande", + "compressing_state": "Compactando...", + "server_processing_state": "Servidor processando..." }, "poll": { - "duration_time": "Duration: %s", - "thirty_minutes": "30 minutes", - "one_hour": "1 Hour", - "six_hours": "6 Hours", - "one_day": "1 Day", - "three_days": "3 Days", - "seven_days": "7 Days", - "option_number": "Option %ld" + "duration_time": "Duração: %s", + "thirty_minutes": "30 minutos", + "one_hour": "1 hora", + "six_hours": "6 horas", + "one_day": "1 dia", + "three_days": "3 dias", + "seven_days": "7 dias", + "option_number": "Opção %ld", + "the_poll_is_invalid": "A enquete é inválida", + "the_poll_has_empty_option": "A enquete tem uma opção vazia" }, "content_warning": { - "placeholder": "Write an accurate warning here..." + "placeholder": "Escreva um aviso de conteúdo preciso aqui..." }, "visibility": { - "public": "Public", - "unlisted": "Unlisted", - "private": "Followers only", - "direct": "Only people I mention" + "public": "Público", + "unlisted": "Não listado", + "private": "Apenas seguidores", + "direct": "Apenas pessoas que menciono" }, "auto_complete": { - "space_to_add": "Space to add" + "space_to_add": "Espaço a adicionar" }, "accessibility": { - "append_attachment": "Add Attachment", - "append_poll": "Add Poll", - "remove_poll": "Remove Poll", - "custom_emoji_picker": "Custom Emoji Picker", - "enable_content_warning": "Enable Content Warning", - "disable_content_warning": "Disable Content Warning", - "post_visibility_menu": "Post Visibility Menu" + "append_attachment": "Adicionar anexo", + "append_poll": "Adicionar enquete", + "remove_poll": "Remover enquete", + "custom_emoji_picker": "Seletor de emoji personalizado", + "enable_content_warning": "Ativar Aviso de Conteúdo", + "disable_content_warning": "Desativar Aviso de Conteúdo", + "post_visibility_menu": "Menu de Visibilidade do Post", + "post_options": "Opções de postagem", + "posting_as": "Publicando como %s" }, "keyboard": { - "discard_post": "Discard Post", - "publish_post": "Publish Post", - "toggle_poll": "Toggle Poll", - "toggle_content_warning": "Toggle Content Warning", - "append_attachment_entry": "Add Attachment - %s", - "select_visibility_entry": "Select Visibility - %s" + "discard_post": "Descartar postagem", + "publish_post": "Publicar postagem", + "toggle_poll": "Alternar enquete", + "toggle_content_warning": "Ativar/desativar Aviso de Conteúdo", + "append_attachment_entry": "Adicionar Anexo - %s", + "select_visibility_entry": "Selecionar Visibilidade - %s" } }, "profile": { "header": { - "follows_you": "Follows You" + "follows_you": "Segue você" }, "dashboard": { - "posts": "posts", - "following": "following", - "followers": "followers" + "posts": "toots", + "following": "seguindo", + "followers": "seguidores" }, "fields": { - "add_row": "Add Row", + "add_row": "Adicionar linha", "placeholder": { - "label": "Label", - "content": "Content" + "label": "Descrição", + "content": "Conteúdo" + }, + "verified": { + "short": "Verificado em %s", + "long": "O link foi verificado em %s" } }, "segmented_control": { - "posts": "Posts", - "replies": "Replies", - "posts_and_replies": "Posts and Replies", - "media": "Media", - "about": "About" + "posts": "Toots", + "replies": "Respostas", + "posts_and_replies": "Toots e respostas", + "media": "Mídia", + "about": "Sobre" }, "relationship_action_alert": { "confirm_mute_user": { - "title": "Mute Account", - "message": "Confirm to mute %s" + "title": "Silenciar conta", + "message": "Confirme para silenciar %s" }, "confirm_unmute_user": { - "title": "Unmute Account", - "message": "Confirm to unmute %s" + "title": "Tirar conta do silenciado", + "message": "Confirme para tirar %s do silenciado" }, "confirm_block_user": { - "title": "Block Account", - "message": "Confirm to block %s" + "title": "Bloquear conta", + "message": "Confirme para bloquear %s" }, "confirm_unblock_user": { - "title": "Unblock Account", - "message": "Confirm to unblock %s" + "title": "Desbloquear conta", + "message": "Confirme para desbloquear %s" }, "confirm_show_reblogs": { - "title": "Show Reblogs", - "message": "Confirm to show reblogs" + "title": "Mostrar reblogs", + "message": "Confirmar para mostrar reblogs" }, "confirm_hide_reblogs": { - "title": "Hide Reblogs", - "message": "Confirm to hide reblogs" + "title": "Ocultar reblogs", + "message": "Confirmar para ocultar reblogs" } }, "accessibility": { - "show_avatar_image": "Show avatar image", - "edit_avatar_image": "Edit avatar image", - "show_banner_image": "Show banner image", - "double_tap_to_open_the_list": "Double tap to open the list" + "show_avatar_image": "Mostrar foto de perfil", + "edit_avatar_image": "Editar foto de perfil", + "show_banner_image": "Mostrar foto de capa", + "double_tap_to_open_the_list": "Toque duas vezes para abrir a lista" } }, "follower": { - "title": "follower", - "footer": "Followers from other servers are not displayed." + "title": "seguidor", + "footer": "Seguidores de outras instâncias não são exibidos." }, "following": { - "title": "following", - "footer": "Follows from other servers are not displayed." + "title": "seguindo", + "footer": "Contas que você segue de outras instâncias não são exibidas." }, "familiarFollowers": { - "title": "Followers you familiar", - "followed_by_names": "Followed by %s" + "title": "Seguidores que você conhece", + "followed_by_names": "Seguido por %s" }, "favorited_by": { - "title": "Favorited By" + "title": "Favoritado por" }, "reblogged_by": { - "title": "Reblogged By" + "title": "Reblogado por" }, "search": { - "title": "Search", + "title": "Buscar", "search_bar": { - "placeholder": "Search hashtags and users", - "cancel": "Cancel" + "placeholder": "Buscar hashtags e usuários", + "cancel": "Cancelar" }, "recommend": { - "button_text": "See All", + "button_text": "Ver tudo", "hash_tag": { - "title": "Trending on Mastodon", - "description": "Hashtags that are getting quite a bit of attention", - "people_talking": "%s people are talking" + "title": "Em tendência no Mastodon", + "description": "Hashtags que estão recebendo bastante atenção", + "people_talking": "%s pessoas estão falando" }, "accounts": { - "title": "Accounts you might like", - "description": "You may like to follow these accounts", - "follow": "Follow" + "title": "Contas que você deve gostar", + "description": "Você pode gostar de seguir estas contas", + "follow": "Seguir" } }, "searching": { "segment": { - "all": "All", - "people": "People", + "all": "Todos", + "people": "Pessoas", "hashtags": "Hashtags", - "posts": "Posts" + "posts": "Toots" }, "empty_state": { - "no_results": "No results" + "no_results": "Sem resultados" }, - "recent_search": "Recent searches", - "clear": "Clear" + "recent_search": "Pesquisas recentes", + "clear": "Limpar" } }, "discovery": { "tabs": { - "posts": "Posts", + "posts": "Toots", "hashtags": "Hashtags", - "news": "News", - "community": "Community", - "for_you": "For You" + "news": "Notícias", + "community": "Comunidade", + "for_you": "Para você" }, - "intro": "These are the posts gaining traction in your corner of Mastodon." + "intro": "Esses são os posts que estão ganhando força no seu canto do Mastodon." }, "favorite": { - "title": "Your Favorites" + "title": "Seus favoritos" }, "notification": { "title": { - "Everything": "Everything", - "Mentions": "Mentions" + "Everything": "Tudo", + "Mentions": "Menções" }, "notification_description": { - "followed_you": "followed you", - "favorited_your_post": "favorited your post", - "reblogged_your_post": "reblogged your post", - "mentioned_you": "mentioned you", - "request_to_follow_you": "request to follow you", - "poll_has_ended": "poll has ended" + "followed_you": "seguiu você", + "favorited_your_post": "favoritou seu toot", + "reblogged_your_post": "reblogou seu toot", + "mentioned_you": "te mencionou", + "request_to_follow_you": "solicitação para te seguir", + "poll_has_ended": "enquete encerrada" }, "keyobard": { - "show_everything": "Show Everything", - "show_mentions": "Show Mentions" + "show_everything": "Mostrar tudo", + "show_mentions": "Mostrar menções" }, "follow_request": { - "accept": "Accept", - "accepted": "Accepted", - "reject": "reject", - "rejected": "Rejected" + "accept": "Aceitar", + "accepted": "Aceito", + "reject": "rejeitar", + "rejected": "Rejeitado" } }, "thread": { - "back_title": "Post", - "title": "Post from %s" + "back_title": "Toot", + "title": "Publicação de %s" }, "settings": { - "title": "Settings", + "title": "Configurações", "section": { "appearance": { - "title": "Appearance", - "automatic": "Automatic", - "light": "Always Light", - "dark": "Always Dark" + "title": "Aparência", + "automatic": "Automático", + "light": "Sempre Claro", + "dark": "Sempre Escuro" }, "look_and_feel": { - "title": "Look and Feel", - "use_system": "Use System", - "really_dark": "Really Dark", - "sorta_dark": "Sorta Dark", - "light": "Light" + "title": "Aparência e Comportamento", + "use_system": "Usar configuração do sistema", + "really_dark": "Bem escuro", + "sorta_dark": "Meio escuro", + "light": "Claro" }, "notifications": { - "title": "Notifications", - "favorites": "Favorites my post", - "follows": "Follows me", - "boosts": "Reblogs my post", - "mentions": "Mentions me", + "title": "Notificações", + "favorites": "Favoritaram minha publicação", + "follows": "Me segue", + "boosts": "Rebloga minha publicação", + "mentions": "Me menciona", "trigger": { - "anyone": "anyone", - "follower": "a follower", - "follow": "anyone I follow", - "noone": "no one", - "title": "Notify me when" + "anyone": "qualquer pessoa", + "follower": "um seguidor", + "follow": "qualquer um que eu siga", + "noone": "ninguém", + "title": "Me notificar quando" } }, "preference": { - "title": "Preferences", - "true_black_dark_mode": "True black dark mode", - "disable_avatar_animation": "Disable animated avatars", - "disable_emoji_animation": "Disable animated emojis", - "using_default_browser": "Use default browser to open links", - "open_links_in_mastodon": "Open links in Mastodon" + "title": "Preferências", + "true_black_dark_mode": "Modo preto", + "disable_avatar_animation": "Desativar fotos animadas", + "disable_emoji_animation": "Desativar emojis animados", + "using_default_browser": "Usar o navegador padrão pra abrir links", + "open_links_in_mastodon": "Abrir links no Mastodon" }, "boring_zone": { - "title": "The Boring Zone", - "account_settings": "Account Settings", - "terms": "Terms of Service", - "privacy": "Privacy Policy" + "title": "A zona chata", + "account_settings": "Configurações da conta", + "terms": "Termos de serviço", + "privacy": "Política de privacidade" }, "spicy_zone": { - "title": "The Spicy Zone", - "clear": "Clear Media Cache", - "signout": "Sign Out" + "title": "A zona apimentada", + "clear": "Limpar cachê de mídia", + "signout": "Sair" } }, "footer": { - "mastodon_description": "Mastodon is open source software. You can report issues on GitHub at %s (%s)" + "mastodon_description": "Mastodon é um software de código aberto. Você pode reportar problemas no GitHub em %s (%s)" }, "keyboard": { - "close_settings_window": "Close Settings Window" + "close_settings_window": "Fechar janela de configurações" } }, "report": { - "title_report": "Report", - "title": "Report %s", - "step1": "Step 1 of 2", - "step2": "Step 2 of 2", - "content1": "Are there any other posts you’d like to add to the report?", - "content2": "Is there anything the moderators should know about this report?", - "report_sent_title": "Thanks for reporting, we’ll look into this.", - "send": "Send Report", - "skip_to_send": "Send without comment", - "text_placeholder": "Type or paste additional comments", - "reported": "REPORTED", + "title_report": "Denunciar", + "title": "Denunciar %s", + "step1": "Passo 1 de 2", + "step2": "Passo 2 de 2", + "content1": "Há outras postagens que você gostaria de adicionar na denúncia?", + "content2": "Há algo que os moderadores deveriam saber sobre esta denúncia?", + "report_sent_title": "Obrigado por denunciar, iremos analisar.", + "send": "Enviar denúncia", + "skip_to_send": "Enviar sem comentário", + "text_placeholder": "Digite ou cole comentários adicionais", + "reported": "DENUNCIADO", "step_one": { - "step_1_of_4": "Step 1 of 4", - "whats_wrong_with_this_post": "What's wrong with this post?", - "whats_wrong_with_this_account": "What's wrong with this account?", - "whats_wrong_with_this_username": "What's wrong with %s?", - "select_the_best_match": "Select the best match", - "i_dont_like_it": "I don’t like it", - "it_is_not_something_you_want_to_see": "It is not something you want to see", - "its_spam": "It’s spam", - "malicious_links_fake_engagement_or_repetetive_replies": "Malicious links, fake engagement, or repetetive replies", - "it_violates_server_rules": "It violates server rules", - "you_are_aware_that_it_breaks_specific_rules": "You are aware that it breaks specific rules", - "its_something_else": "It’s something else", - "the_issue_does_not_fit_into_other_categories": "The issue does not fit into other categories" + "step_1_of_4": "Passo 1 de 4", + "whats_wrong_with_this_post": "O que há de errado com essa publicação?", + "whats_wrong_with_this_account": "O que há de errado com essa conta?", + "whats_wrong_with_this_username": "O que há de errado com %s?", + "select_the_best_match": "Selecione a melhor alternativa", + "i_dont_like_it": "Eu não gosto disso", + "it_is_not_something_you_want_to_see": "Não é algo que você gostaria de ver", + "its_spam": "É spam", + "malicious_links_fake_engagement_or_repetetive_replies": "Links maliciosos, engajamento falso, ou respostas repetitivas", + "it_violates_server_rules": "Isso viola as regras do servidor", + "you_are_aware_that_it_breaks_specific_rules": "Você está ciente que isso quebra regras específicas", + "its_something_else": "É outra coisa", + "the_issue_does_not_fit_into_other_categories": "O problema não se encaixa em outras categorias" }, "step_two": { - "step_2_of_4": "Step 2 of 4", - "which_rules_are_being_violated": "Which rules are being violated?", - "select_all_that_apply": "Select all that apply", - "i_just_don’t_like_it": "I just don’t like it" + "step_2_of_4": "Passo 2 de 4", + "which_rules_are_being_violated": "Quais regras estão sendo violadas?", + "select_all_that_apply": "Selecione todas que se aplicam", + "i_just_don’t_like_it": "Simplesmente não gosto" }, "step_three": { - "step_3_of_4": "Step 3 of 4", - "are_there_any_posts_that_back_up_this_report": "Are there any posts that back up this report?", - "select_all_that_apply": "Select all that apply" + "step_3_of_4": "Passo 3 de 4", + "are_there_any_posts_that_back_up_this_report": "Existem postagens que apoiam essa denúncia?", + "select_all_that_apply": "Selecione todos que se aplicam" }, "step_four": { - "step_4_of_4": "Step 4 of 4", - "is_there_anything_else_we_should_know": "Is there anything else we should know?" + "step_4_of_4": "Passo 4 de 4", + "is_there_anything_else_we_should_know": "Há algo a mais que deveríamos saber?" }, "step_final": { - "dont_want_to_see_this": "Don’t want to see this?", - "when_you_see_something_you_dont_like_on_mastodon_you_can_remove_the_person_from_your_experience.": "When you see something you don’t like on Mastodon, you can remove the person from your experience.", - "unfollow": "Unfollow", - "unfollowed": "Unfollowed", - "unfollow_user": "Unfollow %s", - "mute_user": "Mute %s", - "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "You won’t see their posts or reblogs in your home feed. They won’t know they’ve been muted.", - "block_user": "Block %s", - "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked.", - "while_we_review_this_you_can_take_action_against_user": "While we review this, you can take action against %s" + "dont_want_to_see_this": "Não quer ver isso?", + "when_you_see_something_you_dont_like_on_mastodon_you_can_remove_the_person_from_your_experience.": "Quando você vê algo que não gosta no Mastodon, você pode remover essa pessoa da sua experiência.", + "unfollow": "Deixar de seguir", + "unfollowed": "Deixou de seguir", + "unfollow_user": "Deixar de seguir %s", + "mute_user": "Silenciar %s", + "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "Você não verá as postagens ou reblogs dessa conta na sua pagina inicial. Essa pessoa não saberá que foi silenciada.", + "block_user": "Bloquear %s", + "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "Essa conta não poderá mais te seguir ou ver suas postagens, mas ela poderá ver que foi bloqueada.", + "while_we_review_this_you_can_take_action_against_user": "Enquanto revisamos isso, você pode tomar medidas contra %s" } }, "preview": { "keyboard": { - "close_preview": "Close Preview", - "show_next": "Show Next", - "show_previous": "Show Previous" + "close_preview": "Fechar prévia", + "show_next": "Mostrar a próxima", + "show_previous": "Mostrar a anterior" } }, "account_list": { - "tab_bar_hint": "Current selected profile: %s. Double tap then hold to show account switcher", - "dismiss_account_switcher": "Dismiss Account Switcher", - "add_account": "Add Account" + "tab_bar_hint": "Perfil selecionado nesse momento: %s. Toque duas vezes e segure para mostrar o alternador de conta", + "dismiss_account_switcher": "Descartar alternador de conta", + "add_account": "Adicionar conta" }, "wizard": { - "new_in_mastodon": "New in Mastodon", - "multiple_account_switch_intro_description": "Switch between multiple accounts by holding the profile button.", - "accessibility_hint": "Double tap to dismiss this wizard" + "new_in_mastodon": "Novo no Mastodon", + "multiple_account_switch_intro_description": "Alterne entre múltiplas contas segurando o botão de perfil.", + "accessibility_hint": "Toque duas vezes para descartar este assistente" }, "bookmark": { - "title": "Bookmarks" + "title": "Marcados" } } } diff --git a/Localization/StringsConvertor/input/pt-BR.lproj/ios-infoPlist.json b/Localization/StringsConvertor/input/pt-BR.lproj/ios-infoPlist.json index c6db73de0..04b53a160 100644 --- a/Localization/StringsConvertor/input/pt-BR.lproj/ios-infoPlist.json +++ b/Localization/StringsConvertor/input/pt-BR.lproj/ios-infoPlist.json @@ -1,6 +1,6 @@ { - "NSCameraUsageDescription": "Used to take photo for post status", - "NSPhotoLibraryAddUsageDescription": "Used to save photo into the Photo Library", - "NewPostShortcutItemTitle": "New Post", - "SearchShortcutItemTitle": "Search" + "NSCameraUsageDescription": "Usado para tirar uma foto para postagem", + "NSPhotoLibraryAddUsageDescription": "Usado para salvar foto na Galeria", + "NewPostShortcutItemTitle": "Novo Toot", + "SearchShortcutItemTitle": "Buscar" } diff --git a/Localization/StringsConvertor/input/pt.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/pt.lproj/Localizable.stringsdict index bdcae6ac9..eabdc3c32 100644 --- a/Localization/StringsConvertor/input/pt.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/pt.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld characters + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/pt.lproj/app.json b/Localization/StringsConvertor/input/pt.lproj/app.json index 80b0882d9..3113ada74 100644 --- a/Localization/StringsConvertor/input/pt.lproj/app.json +++ b/Localization/StringsConvertor/input/pt.lproj/app.json @@ -74,8 +74,8 @@ "take_photo": "Take Photo", "save_photo": "Save Photo", "copy_photo": "Copy Photo", - "sign_in": "Sign In", - "sign_up": "Sign Up", + "sign_in": "Log in", + "sign_up": "Create account", "see_more": "See More", "preview": "Preview", "share": "Share", @@ -136,6 +136,12 @@ "vote": "Vote", "closed": "Closed" }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Show Profile: %s", + "email": "Email address: %s" + }, "actions": { "reply": "Reply", "reblog": "Reblog", @@ -212,10 +218,16 @@ "get_started": "Get Started", "log_in": "Log In" }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, "server_picker": { "title": "Mastodon is made of users in different servers.", - "subtitle": "Pick a server based on your interests, region, or a general purpose one.", - "subtitle_extend": "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "All", @@ -242,8 +254,7 @@ "category": "CATEGORY" }, "input": { - "placeholder": "Search servers", - "search_servers_or_enter_url": "Search servers or enter URL" + "search_servers_or_enter_url": "Search communities or enter URL" }, "empty_state": { "finding_servers": "Finding available servers...", @@ -376,7 +387,13 @@ "video": "video", "attachment_broken": "This %s is broken and can’t be\nuploaded to Mastodon.", "description_photo": "Describe the photo for the visually-impaired...", - "description_video": "Describe the video for the visually-impaired..." + "description_video": "Describe the video for the visually-impaired...", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "Duration: %s", @@ -386,7 +403,9 @@ "one_day": "1 Day", "three_days": "3 Days", "seven_days": "7 Days", - "option_number": "Option %ld" + "option_number": "Option %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "Write an accurate warning here..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Custom Emoji Picker", "enable_content_warning": "Enable Content Warning", "disable_content_warning": "Disable Content Warning", - "post_visibility_menu": "Post Visibility Menu" + "post_visibility_menu": "Post Visibility Menu", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "Discard Post", @@ -432,6 +453,10 @@ "placeholder": { "label": "Label", "content": "Content" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Localization/StringsConvertor/input/ro.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/ro.lproj/Localizable.stringsdict index 7ae5a1c79..9df2162b0 100644 --- a/Localization/StringsConvertor/input/ro.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/ro.lproj/Localizable.stringsdict @@ -56,6 +56,24 @@ %ld characters + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + few + %ld characters + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/ro.lproj/app.json b/Localization/StringsConvertor/input/ro.lproj/app.json index 8b9da0903..75a77184c 100644 --- a/Localization/StringsConvertor/input/ro.lproj/app.json +++ b/Localization/StringsConvertor/input/ro.lproj/app.json @@ -32,9 +32,9 @@ "message": "Nu se poate edita profilul. Vă rugăm să încercaţi din nou." }, "sign_out": { - "title": "Deconectați-vă", + "title": "Deconectare", "message": "Sigur doriți să vă deconectați?", - "confirm": "Deconectați-vă" + "confirm": "Deconectare" }, "block_domain": { "title": "Are you really, really sure you want to block the entire %s? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain and any of your followers from that domain will be removed.", @@ -74,8 +74,8 @@ "take_photo": "Take Photo", "save_photo": "Save Photo", "copy_photo": "Copy Photo", - "sign_in": "Sign In", - "sign_up": "Sign Up", + "sign_in": "Log in", + "sign_up": "Create account", "see_more": "See More", "preview": "Preview", "share": "Share", @@ -136,6 +136,12 @@ "vote": "Vote", "closed": "Closed" }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Show Profile: %s", + "email": "Email address: %s" + }, "actions": { "reply": "Reply", "reblog": "Reblog", @@ -212,10 +218,16 @@ "get_started": "Get Started", "log_in": "Log In" }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, "server_picker": { "title": "Mastodon is made of users in different servers.", - "subtitle": "Pick a server based on your interests, region, or a general purpose one.", - "subtitle_extend": "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "All", @@ -242,8 +254,7 @@ "category": "CATEGORY" }, "input": { - "placeholder": "Search servers", - "search_servers_or_enter_url": "Search servers or enter URL" + "search_servers_or_enter_url": "Search communities or enter URL" }, "empty_state": { "finding_servers": "Finding available servers...", @@ -376,7 +387,13 @@ "video": "video", "attachment_broken": "This %s is broken and can’t be\nuploaded to Mastodon.", "description_photo": "Describe the photo for the visually-impaired...", - "description_video": "Describe the video for the visually-impaired..." + "description_video": "Describe the video for the visually-impaired...", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "Duration: %s", @@ -386,7 +403,9 @@ "one_day": "1 Day", "three_days": "3 Days", "seven_days": "7 Days", - "option_number": "Option %ld" + "option_number": "Option %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "Write an accurate warning here..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Custom Emoji Picker", "enable_content_warning": "Enable Content Warning", "disable_content_warning": "Disable Content Warning", - "post_visibility_menu": "Post Visibility Menu" + "post_visibility_menu": "Post Visibility Menu", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "Discard Post", @@ -432,6 +453,10 @@ "placeholder": { "label": "Label", "content": "Content" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Localization/StringsConvertor/input/ru.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/ru.lproj/Localizable.stringsdict index afb29a6aa..c9552a9e4 100644 --- a/Localization/StringsConvertor/input/ru.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/ru.lproj/Localizable.stringsdict @@ -62,6 +62,26 @@ %ld символа осталось + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + few + %ld characters + many + %ld characters + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/ru.lproj/app.json b/Localization/StringsConvertor/input/ru.lproj/app.json index 7a4833554..25314102a 100644 --- a/Localization/StringsConvertor/input/ru.lproj/app.json +++ b/Localization/StringsConvertor/input/ru.lproj/app.json @@ -74,8 +74,8 @@ "take_photo": "Сделать фото", "save_photo": "Сохранить изображение", "copy_photo": "Скопировать изображение", - "sign_in": "Войти", - "sign_up": "Зарегистрироваться", + "sign_in": "Log in", + "sign_up": "Create account", "see_more": "Ещё", "preview": "Предпросмотр", "share": "Поделиться", @@ -136,6 +136,12 @@ "vote": "Проголосовать", "closed": "Завершён" }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Show Profile: %s", + "email": "Email address: %s" + }, "actions": { "reply": "Ответить", "reblog": "Продвинуть", @@ -212,10 +218,16 @@ "get_started": "Присоединиться", "log_in": "Вход" }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, "server_picker": { "title": "Выберите сервер,\nлюбой сервер.", - "subtitle": "Выберите сообщество на основе своих интересов, региона или общей тематики.", - "subtitle_extend": "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "Все", @@ -242,8 +254,7 @@ "category": "КАТЕГОРИЯ" }, "input": { - "placeholder": "Найдите сервер или присоединитесь к своему...", - "search_servers_or_enter_url": "Поиск по серверам или ссылке" + "search_servers_or_enter_url": "Search communities or enter URL" }, "empty_state": { "finding_servers": "Ищем доступные сервера...", @@ -376,7 +387,13 @@ "video": "видео", "attachment_broken": "Это %s повреждено и не может\nбыть отправлено в Mastodon.", "description_photo": "Опишите фото для людей с нарушениями зрения...", - "description_video": "Опишите видео для людей с нарушениями зрения..." + "description_video": "Опишите видео для людей с нарушениями зрения...", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "Продолжительность: %s", @@ -386,7 +403,9 @@ "one_day": "1 день", "three_days": "3 дня", "seven_days": "7 дней", - "option_number": "Вариант %ld" + "option_number": "Вариант %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "Напишите предупреждение здесь..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Меню пользовательских эмодзи", "enable_content_warning": "Добавить предупреждение о содержании", "disable_content_warning": "Убрать предупреждение о содержании", - "post_visibility_menu": "Меню видимости поста" + "post_visibility_menu": "Меню видимости поста", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "Удалить пост", @@ -432,6 +453,10 @@ "placeholder": { "label": "Ярлык", "content": "Содержимое" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Localization/StringsConvertor/input/si.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/si.lproj/Localizable.stringsdict index bdcae6ac9..eabdc3c32 100644 --- a/Localization/StringsConvertor/input/si.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/si.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld characters + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/si.lproj/app.json b/Localization/StringsConvertor/input/si.lproj/app.json index f42e91ae1..a4542b9e9 100644 --- a/Localization/StringsConvertor/input/si.lproj/app.json +++ b/Localization/StringsConvertor/input/si.lproj/app.json @@ -74,8 +74,8 @@ "take_photo": "Take Photo", "save_photo": "Save Photo", "copy_photo": "Copy Photo", - "sign_in": "පිවිසෙන්න", - "sign_up": "ලියාපදිංචිය", + "sign_in": "Log in", + "sign_up": "Create account", "see_more": "තව බලන්න", "preview": "පෙරදසුන", "share": "බෙදාගන්න", @@ -136,6 +136,12 @@ "vote": "ඡන්දය", "closed": "වසා ඇත" }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Show Profile: %s", + "email": "Email address: %s" + }, "actions": { "reply": "පිළිතුරු", "reblog": "Reblog", @@ -212,10 +218,16 @@ "get_started": "පටන් ගන්න", "log_in": "පිවිසෙන්න" }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, "server_picker": { "title": "Mastodon is made of users in different servers.", - "subtitle": "Pick a server based on your interests, region, or a general purpose one.", - "subtitle_extend": "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "සියල්ල", @@ -242,8 +254,7 @@ "category": "CATEGORY" }, "input": { - "placeholder": "Search servers", - "search_servers_or_enter_url": "Search servers or enter URL" + "search_servers_or_enter_url": "Search communities or enter URL" }, "empty_state": { "finding_servers": "Finding available servers...", @@ -376,7 +387,13 @@ "video": "video", "attachment_broken": "This %s is broken and can’t be\nuploaded to Mastodon.", "description_photo": "Describe the photo for the visually-impaired...", - "description_video": "Describe the video for the visually-impaired..." + "description_video": "Describe the video for the visually-impaired...", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "Duration: %s", @@ -386,7 +403,9 @@ "one_day": "1 Day", "three_days": "3 Days", "seven_days": "7 Days", - "option_number": "Option %ld" + "option_number": "Option %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "Write an accurate warning here..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Custom Emoji Picker", "enable_content_warning": "Enable Content Warning", "disable_content_warning": "Disable Content Warning", - "post_visibility_menu": "Post Visibility Menu" + "post_visibility_menu": "Post Visibility Menu", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "Discard Post", @@ -432,6 +453,10 @@ "placeholder": { "label": "නම්පත", "content": "අන්තර්ගතය" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Localization/StringsConvertor/input/sl.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/sl.lproj/Localizable.stringsdict index 8f0bcb42b..87cc42142 100644 --- a/Localization/StringsConvertor/input/sl.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/sl.lproj/Localizable.stringsdict @@ -62,6 +62,26 @@ %ld znakov + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + preostaja %#@character_count@ + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + %ld znak + two + %ld znaka + few + %ld znaki + other + %ld znakov + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/sl.lproj/app.json b/Localization/StringsConvertor/input/sl.lproj/app.json index 99a823feb..0aed7bc15 100644 --- a/Localization/StringsConvertor/input/sl.lproj/app.json +++ b/Localization/StringsConvertor/input/sl.lproj/app.json @@ -75,7 +75,7 @@ "save_photo": "Shrani fotografijo", "copy_photo": "Kopiraj fotografijo", "sign_in": "Prijava", - "sign_up": "Registracija", + "sign_up": "Ustvari račun", "see_more": "Pokaži več", "preview": "Predogled", "share": "Deli", @@ -136,6 +136,12 @@ "vote": "Glasuj", "closed": "Zaprto" }, + "meta_entity": { + "url": "Povezava: %s", + "hashtag": "Ključnik: %s", + "mention": "Pokaži profil: %s", + "email": "E-naslov: %s" + }, "actions": { "reply": "Odgovori", "reblog": "Poobjavi", @@ -212,10 +218,16 @@ "get_started": "Začnite", "log_in": "Prijava" }, + "login": { + "title": "Dobrodošli nazaj", + "subtitle": "Prijavite se na strežniku, na katerem ste ustvarili račun.", + "server_search_field": { + "placeholder": "Vnesite URL ali poiščite svoj strežnik" + } + }, "server_picker": { "title": "Mastodon tvorijo uporabniki z različnih strežnikov.", - "subtitle": "Strežnik izberite glede na svoje interese, regijo ali pa izberite splošnega.", - "subtitle_extend": "Strežnik izberite glede na svoje interese, regijo ali pa izberite splošnega. Z vsakim strežnikom upravlja povsem neodvisna organizacija ali posameznik.", + "subtitle": "Strežnik izberite glede na svojo regijo, zanimanje ali pa kar splošno. Še vedno lahko klepetate s komer koli na Mastodonu, ne glede na strežnik.", "button": { "category": { "all": "Vse", @@ -242,8 +254,7 @@ "category": "KATEGORIJA" }, "input": { - "placeholder": "Išči strežnike", - "search_servers_or_enter_url": "Iščite strežnike ali vnesite URL" + "search_servers_or_enter_url": "Iščite po skupnostih ali vnesite URL" }, "empty_state": { "finding_servers": "Iskanje razpoložljivih strežnikov ...", @@ -376,7 +387,13 @@ "video": "video", "attachment_broken": "To %s je okvarjeno in ga ni\nmožno naložiti v Mastodon.", "description_photo": "Opiši fotografijo za slabovidne in osebe z okvaro vida ...", - "description_video": "Opiši video za slabovidne in osebe z okvaro vida ..." + "description_video": "Opiši video za slabovidne in osebe z okvaro vida ...", + "load_failed": "Nalaganje ni uspelo", + "upload_failed": "Nalaganje na strežnik ni uspelo", + "can_not_recognize_this_media_attachment": "Te medijske priponke ni mogoče prepoznati", + "attachment_too_large": "Priponka je prevelika", + "compressing_state": "Stiskanje ...", + "server_processing_state": "Obdelovanje na strežniku ..." }, "poll": { "duration_time": "Trajanje: %s", @@ -386,7 +403,9 @@ "one_day": "1 dan", "three_days": "3 dni", "seven_days": "7 dni", - "option_number": "Možnost %ld" + "option_number": "Možnost %ld", + "the_poll_is_invalid": "Anketa je neveljavna", + "the_poll_has_empty_option": "Anketa ima prazno izbiro" }, "content_warning": { "placeholder": "Tukaj zapišite opozorilo ..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Izbirnik čustvenčkov po meri", "enable_content_warning": "Omogoči opozorilo o vsebini", "disable_content_warning": "Onemogoči opozorilo o vsebini", - "post_visibility_menu": "Meni vidnosti objave" + "post_visibility_menu": "Meni vidnosti objave", + "post_options": "Možnosti objave", + "posting_as": "Objavljate kot %s" }, "keyboard": { "discard_post": "Opusti objavo", @@ -432,6 +453,10 @@ "placeholder": { "label": "Oznaka", "content": "Vsebina" + }, + "verified": { + "short": "Preverjeno %s", + "long": "Lastništvo te povezave je bilo preverjeno %s" } }, "segmented_control": { @@ -696,7 +721,7 @@ "accessibility_hint": "Dvakrat tapnite, da zapustite tega čarovnika" }, "bookmark": { - "title": "Bookmarks" + "title": "Zaznamki" } } } diff --git a/Localization/StringsConvertor/input/sv.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/sv.lproj/Localizable.stringsdict index 048af4732..3cbfeae6d 100644 --- a/Localization/StringsConvertor/input/sv.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/sv.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld tecken + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ kvar + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + %ld tecken + other + %ld tecken + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey @@ -152,9 +168,9 @@ NSStringFormatValueTypeKey ld one - %ld puff + %ld boost other - %ld puffar + %ld boostar plural.count.reply diff --git a/Localization/StringsConvertor/input/sv.lproj/app.json b/Localization/StringsConvertor/input/sv.lproj/app.json index 85f243b03..7951e1958 100644 --- a/Localization/StringsConvertor/input/sv.lproj/app.json +++ b/Localization/StringsConvertor/input/sv.lproj/app.json @@ -75,7 +75,7 @@ "save_photo": "Spara foto", "copy_photo": "Kopiera foto", "sign_in": "Logga in", - "sign_up": "Registrera dig", + "sign_up": "Skapa konto", "see_more": "Visa mer", "preview": "Förhandsvisa", "share": "Dela", @@ -111,9 +111,9 @@ "next_status": "Nästa inlägg", "open_status": "Öppna inlägg", "open_author_profile": "Öppna författarens profil", - "open_reblogger_profile": "Öppna ompostarens profil", + "open_reblogger_profile": "Öppna boostarens profil", "reply_status": "Svara på inlägg", - "toggle_reblog": "Växla puff på inlägg", + "toggle_reblog": "Växla boost på inlägg", "toggle_favorite": "Växla favorit på inlägg", "toggle_content_warning": "Växla innehållsvarning", "preview_image": "Förhandsgranska bild" @@ -124,7 +124,7 @@ } }, "status": { - "user_reblogged": "%s puffade", + "user_reblogged": "%s boostade", "user_replied_to": "Svarade på %s", "show_post": "Visa inlägg", "show_user_profile": "Visa användarprofil", @@ -136,10 +136,16 @@ "vote": "Rösta", "closed": "Stängd" }, + "meta_entity": { + "url": "Länk: %s", + "hashtag": "Hashtag: %s", + "mention": "Visa profil: %s", + "email": "E-postadress: %s" + }, "actions": { "reply": "Svara", - "reblog": "Puffa", - "unreblog": "Ångra puff", + "reblog": "Boosta", + "unreblog": "Ångra boost", "favorite": "Favorit", "unfavorite": "Ta bort favorit", "menu": "Meny", @@ -181,8 +187,8 @@ "unmute_user": "Avtysta %s", "muted": "Tystad", "edit_info": "Redigera info", - "show_reblogs": "Visa knuffar", - "hide_reblogs": "Dölj puffar" + "show_reblogs": "Visa boostar", + "hide_reblogs": "Dölj boostar" }, "timeline": { "filtered": "Filtrerat", @@ -212,10 +218,16 @@ "get_started": "Kom igång", "log_in": "Logga in" }, + "login": { + "title": "Välkommen tillbaka", + "subtitle": "Logga in på servern där du skapade ditt konto.", + "server_search_field": { + "placeholder": "Ange URL eller sök efter din server" + } + }, "server_picker": { "title": "Mastodon utgörs av användare på olika servrar.", - "subtitle": "Välj en server baserat på dina intressen, region eller ett allmänt syfte.", - "subtitle_extend": "Välj en server baserat på dina intressen, region eller ett allmänt syfte. Varje server drivs av en helt oberoende organisation eller individ.", + "subtitle": "Välj en server baserat på dina intressen, region eller en allmän server. Du kan fortfarande nå alla, oavsett server.", "button": { "category": { "all": "Alla", @@ -242,8 +254,7 @@ "category": "KATEGORI" }, "input": { - "placeholder": "Sök gemenskaper", - "search_servers_or_enter_url": "Sök servrar eller ange URL" + "search_servers_or_enter_url": "Sök gemenskaper eller ange URL" }, "empty_state": { "finding_servers": "Söker tillgängliga servrar...", @@ -376,7 +387,13 @@ "video": "video", "attachment_broken": "Denna %s är trasig och kan inte\nladdas upp till Mastodon.", "description_photo": "Beskriv fotot för synskadade...", - "description_video": "Beskriv videon för de synskadade..." + "description_video": "Beskriv videon för de synskadade...", + "load_failed": "Det gick inte att läsa in", + "upload_failed": "Uppladdning misslyckades", + "can_not_recognize_this_media_attachment": "Känner inte igen mediebilagan", + "attachment_too_large": "Bilagan är för stor", + "compressing_state": "Komprimerar...", + "server_processing_state": "Behandlas av servern..." }, "poll": { "duration_time": "Längd: %s", @@ -386,7 +403,9 @@ "one_day": "1 dag", "three_days": "3 dagar", "seven_days": "7 dagar", - "option_number": "Alternativ %ld" + "option_number": "Alternativ %ld", + "the_poll_is_invalid": "Undersökningen är ogiltig", + "the_poll_has_empty_option": "Undersökningen har ett tomt alternativ" }, "content_warning": { "placeholder": "Skriv en noggrann varning här..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Anpassad emoji-väljare", "enable_content_warning": "Aktivera innehållsvarning", "disable_content_warning": "Inaktivera innehållsvarning", - "post_visibility_menu": "Inläggssynlighetsmeny" + "post_visibility_menu": "Inläggssynlighetsmeny", + "post_options": "Inläggsalternativ", + "posting_as": "Postar som %s" }, "keyboard": { "discard_post": "Släng inlägget", @@ -432,6 +453,10 @@ "placeholder": { "label": "Etikett", "content": "Innehåll" + }, + "verified": { + "short": "Verifierad på %s", + "long": "Ägarskap för denna länk kontrollerades den %s" } }, "segmented_control": { @@ -459,12 +484,12 @@ "message": "Bekräfta för att avblockera %s" }, "confirm_show_reblogs": { - "title": "Visa puffar", - "message": "Bekräfta för att visa puffar" + "title": "Visa boostar", + "message": "Bekräfta för att visa boostar" }, "confirm_hide_reblogs": { - "title": "Dölj puffar", - "message": "Bekräfta för att dölja puffar" + "title": "Dölj boostar", + "message": "Bekräfta för att dölja boostar" } }, "accessibility": { @@ -490,7 +515,7 @@ "title": "Favoriserad av" }, "reblogged_by": { - "title": "Puffat av" + "title": "Boostat av" }, "search": { "title": "Sök", @@ -546,7 +571,7 @@ "notification_description": { "followed_you": "följde dig", "favorited_your_post": "favoriserade ditt inlägg", - "reblogged_your_post": "puffade ditt inlägg", + "reblogged_your_post": "boostade ditt inlägg", "mentioned_you": "nämnde dig", "request_to_follow_you": "begär att följa dig", "poll_has_ended": "omröstningen har avslutats" @@ -586,7 +611,7 @@ "title": "Notiser", "favorites": "Favoriserar mitt inlägg", "follows": "Följer mig", - "boosts": "Ompostar mitt inlägg", + "boosts": "Boostar mitt inlägg", "mentions": "Nämner mig", "trigger": { "anyone": "alla", @@ -672,7 +697,7 @@ "unfollowed": "Slutade följa", "unfollow_user": "Avfölj %s", "mute_user": "Tysta %s", - "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "Du kommer inte att se deras inlägg eller ompostningar i ditt hemflöde. De kommer inte att veta att de har blivit tystade.", + "you_wont_see_their_posts_or_reblogs_in_your_home_feed_they_wont_know_they_ve_been_muted": "Du kommer inte att se deras inlägg eller boostar i ditt hemflöde. De kommer inte att veta att de har blivit tystade.", "block_user": "Blockera %s", "they_will_no_longer_be_able_to_follow_or_see_your_posts_but_they_can_see_if_theyve_been_blocked": "De kommer inte längre att kunna följa eller se dina inlägg, men de kan se om de har blockerats.", "while_we_review_this_you_can_take_action_against_user": "Medan vi granskar detta kan du vidta åtgärder mot %s" @@ -696,7 +721,7 @@ "accessibility_hint": "Dubbeltryck för att avvisa den här guiden" }, "bookmark": { - "title": "Bookmarks" + "title": "Bokmärken" } } } diff --git a/Localization/StringsConvertor/input/th.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/th.lproj/Localizable.stringsdict index 897d07eca..f25561ad6 100644 --- a/Localization/StringsConvertor/input/th.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/th.lproj/Localizable.stringsdict @@ -44,6 +44,20 @@ %ld ตัวอักษร + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + เหลืออีก %#@character_count@ + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + other + %ld ตัวอักษร + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/th.lproj/app.json b/Localization/StringsConvertor/input/th.lproj/app.json index 763b827cd..7b1a3d08e 100644 --- a/Localization/StringsConvertor/input/th.lproj/app.json +++ b/Localization/StringsConvertor/input/th.lproj/app.json @@ -74,8 +74,8 @@ "take_photo": "ถ่ายรูป", "save_photo": "บันทึกรูปภาพ", "copy_photo": "คัดลอกรูปภาพ", - "sign_in": "ลงชื่อเข้า", - "sign_up": "ลงทะเบียน", + "sign_in": "เข้าสู่ระบบ", + "sign_up": "สร้างบัญชี", "see_more": "ดูเพิ่มเติม", "preview": "แสดงตัวอย่าง", "share": "แบ่งปัน", @@ -136,6 +136,12 @@ "vote": "ลงคะแนน", "closed": "ปิดแล้ว" }, + "meta_entity": { + "url": "ลิงก์: %s", + "hashtag": "แฮชแท็ก: %s", + "mention": "โปรไฟล์ที่แสดง: %s", + "email": "ที่อยู่อีเมล: %s" + }, "actions": { "reply": "ตอบกลับ", "reblog": "ดัน", @@ -181,8 +187,8 @@ "unmute_user": "เลิกซ่อน %s", "muted": "ซ่อนอยู่", "edit_info": "แก้ไขข้อมูล", - "show_reblogs": "Show Reblogs", - "hide_reblogs": "Hide Reblogs" + "show_reblogs": "แสดงการดัน", + "hide_reblogs": "ซ่อนการดัน" }, "timeline": { "filtered": "กรองอยู่", @@ -212,10 +218,16 @@ "get_started": "เริ่มต้นใช้งาน", "log_in": "เข้าสู่ระบบ" }, + "login": { + "title": "ยินดีต้อนรับกลับมา", + "subtitle": "นำคุณเข้าสู่ระบบในเซิร์ฟเวอร์ที่คุณได้สร้างบัญชีของคุณไว้ใน", + "server_search_field": { + "placeholder": "ป้อน URL หรือค้นหาสำหรับเซิร์ฟเวอร์ของคุณ" + } + }, "server_picker": { "title": "Mastodon ประกอบด้วยผู้ใช้ในเซิร์ฟเวอร์ต่าง ๆ", - "subtitle": "เลือกเซิร์ฟเวอร์ตามความสนใจ, ภูมิภาค หรือวัตถุประสงค์ทั่วไปของคุณ", - "subtitle_extend": "เลือกเซิร์ฟเวอร์ตามความสนใจ, ภูมิภาค หรือวัตถุประสงค์ทั่วไปของคุณ แต่ละเซิร์ฟเวอร์ดำเนินการโดยองค์กรหรือบุคคลที่เป็นอิสระโดยสิ้นเชิง", + "subtitle": "เลือกเซิร์ฟเวอร์ตามภูมิภาค, ความสนใจ หรือวัตถุประสงค์ทั่วไปของคุณ คุณยังคงสามารถแชทกับใครก็ตามใน Mastodon โดยไม่คำนึงถึงเซิร์ฟเวอร์ของคุณ", "button": { "category": { "all": "ทั้งหมด", @@ -242,8 +254,7 @@ "category": "หมวดหมู่" }, "input": { - "placeholder": "ค้นหาเซิร์ฟเวอร์", - "search_servers_or_enter_url": "ค้นหาเซิร์ฟเวอร์หรือป้อน URL" + "search_servers_or_enter_url": "ค้นหาชุมชนหรือป้อน URL" }, "empty_state": { "finding_servers": "กำลังค้นหาเซิร์ฟเวอร์ที่พร้อมใช้งาน...", @@ -293,7 +304,7 @@ }, "reason": { "blocked": "%s มีผู้ให้บริการอีเมลที่ไม่ได้รับอนุญาต", - "unreachable": "ดูเหมือนว่า %s จะไม่มีอยู่", + "unreachable": "ดูเหมือนว่าจะไม่มี %s อยู่", "taken": "%s ถูกใช้งานแล้ว", "reserved": "%s เป็นคำสงวน", "accepted": "ต้องยอมรับ %s", @@ -331,12 +342,12 @@ }, "dont_receive_email": { "title": "ตรวจสอบอีเมลของคุณ", - "description": "หากคุณยังไม่ได้รับอีเมล ตรวจสอบว่าที่อยู่อีเมลของคุณถูกต้อง รวมถึงโฟลเดอร์อีเมลขยะของคุณ", + "description": "ตรวจสอบว่าที่อยู่อีเมลของคุณถูกต้องเช่นเดียวกับโฟลเดอร์อีเมลขยะหากคุณยังไม่ได้ทำ", "resend_email": "ส่งอีเมลใหม่" }, "open_email_app": { "title": "ตรวจสอบกล่องขาเข้าของคุณ", - "description": "เราเพิ่งส่งอีเมลหาคุณ หากคุณยังไม่ได้รับอีเมล โปรดตรวจสอบโฟลเดอร์อีเมลขยะ", + "description": "เราเพิ่งส่งอีเมลถึงคุณ ตรวจสอบโฟลเดอร์อีเมลขยะของคุณหากคุณยังไม่ได้ทำ", "mail": "จดหมาย", "open_email_client": "เปิดไคลเอ็นต์อีเมล" } @@ -376,7 +387,13 @@ "video": "วิดีโอ", "attachment_broken": "%s นี้เสียหายและไม่สามารถ\nอัปโหลดไปยัง Mastodon", "description_photo": "อธิบายรูปภาพสำหรับผู้บกพร่องทางการมองเห็น...", - "description_video": "อธิบายวิดีโอสำหรับผู้บกพร่องทางการมองเห็น..." + "description_video": "อธิบายวิดีโอสำหรับผู้บกพร่องทางการมองเห็น...", + "load_failed": "การโหลดล้มเหลว", + "upload_failed": "การอัปโหลดล้มเหลว", + "can_not_recognize_this_media_attachment": "ไม่สามารถระบุไฟล์แนบสื่อนี้", + "attachment_too_large": "ไฟล์แนบใหญ่เกินไป", + "compressing_state": "กำลังบีบอัด...", + "server_processing_state": "เซิร์ฟเวอร์กำลังประมวลผล..." }, "poll": { "duration_time": "ระยะเวลา: %s", @@ -386,7 +403,9 @@ "one_day": "1 วัน", "three_days": "3 วัน", "seven_days": "7 วัน", - "option_number": "ตัวเลือก %ld" + "option_number": "ตัวเลือก %ld", + "the_poll_is_invalid": "การสำรวจความคิดเห็นไม่ถูกต้อง", + "the_poll_has_empty_option": "การสำรวจความคิดเห็นมีตัวเลือกที่ว่างเปล่า" }, "content_warning": { "placeholder": "เขียนคำเตือนที่ถูกต้องที่นี่..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "ตัวเลือกอีโมจิที่กำหนดเอง", "enable_content_warning": "เปิดใช้งานคำเตือนเนื้อหา", "disable_content_warning": "ปิดใช้งานคำเตือนเนื้อหา", - "post_visibility_menu": "เมนูการมองเห็นโพสต์" + "post_visibility_menu": "เมนูการมองเห็นโพสต์", + "post_options": "ตัวเลือกโพสต์", + "posting_as": "กำลังโพสต์เป็น %s" }, "keyboard": { "discard_post": "ละทิ้งโพสต์", @@ -432,6 +453,10 @@ "placeholder": { "label": "ป้ายชื่อ", "content": "เนื้อหา" + }, + "verified": { + "short": "ตรวจสอบเมื่อ %s", + "long": "ตรวจสอบความเป็นเจ้าของของลิงก์นี้เมื่อ %s" } }, "segmented_control": { @@ -459,12 +484,12 @@ "message": "ยืนยันเพื่อเลิกปิดกั้น %s" }, "confirm_show_reblogs": { - "title": "Show Reblogs", - "message": "Confirm to show reblogs" + "title": "แสดงการดัน", + "message": "ยืนยันเพื่อแสดงการดัน" }, "confirm_hide_reblogs": { - "title": "Hide Reblogs", - "message": "Confirm to hide reblogs" + "title": "ซ่อนการดัน", + "message": "ยืนยันเพื่อซ่อนการดัน" } }, "accessibility": { @@ -696,7 +721,7 @@ "accessibility_hint": "แตะสองครั้งเพื่อปิดตัวช่วยสร้างนี้" }, "bookmark": { - "title": "Bookmarks" + "title": "ที่คั่นหน้า" } } } diff --git a/Localization/StringsConvertor/input/tr.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/tr.lproj/Localizable.stringsdict index 29df92c2b..6ef7f4c75 100644 --- a/Localization/StringsConvertor/input/tr.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/tr.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld karakter + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/tr.lproj/app.json b/Localization/StringsConvertor/input/tr.lproj/app.json index cef7fd7f4..37325cf05 100644 --- a/Localization/StringsConvertor/input/tr.lproj/app.json +++ b/Localization/StringsConvertor/input/tr.lproj/app.json @@ -74,8 +74,8 @@ "take_photo": "Fotoğraf Çek", "save_photo": "Fotoğrafı Kaydet", "copy_photo": "Fotoğrafı Kopyala", - "sign_in": "Giriş Yap", - "sign_up": "Kaydol", + "sign_in": "Log in", + "sign_up": "Create account", "see_more": "Daha Fazla Gör", "preview": "Önizleme", "share": "Paylaş", @@ -136,6 +136,12 @@ "vote": "Oy ver", "closed": "Kapandı" }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Show Profile: %s", + "email": "Email address: %s" + }, "actions": { "reply": "Yanıtla", "reblog": "Yeniden paylaş", @@ -212,10 +218,16 @@ "get_started": "Başlayın", "log_in": "Oturum Aç" }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, "server_picker": { "title": "Mastodon, farklı topluluklardaki kullanıcılardan oluşur.", - "subtitle": "İlgi alanlarınıza, bölgenize veya genel amaçlı bir topluluk seçin.", - "subtitle_extend": "İlgi alanlarınıza, bölgenize veya genel amaçlı bir topluluk seçin. Her topluluk tamamen bağımsız bir kuruluş veya kişi tarafından işletilmektedir.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "Tümü", @@ -242,8 +254,7 @@ "category": "KATEGORİ" }, "input": { - "placeholder": "Toplulukları ara", - "search_servers_or_enter_url": "Sunucuları ara ya da bir bağlantı gir" + "search_servers_or_enter_url": "Search communities or enter URL" }, "empty_state": { "finding_servers": "Mevcut sunucular aranıyor...", @@ -376,7 +387,13 @@ "video": "video", "attachment_broken": "Bu %s bozuk ve Mastodon'a\nyüklenemiyor.", "description_photo": "Görme engelliler için fotoğrafı tarif edin...", - "description_video": "Görme engelliler için videoyu tarif edin..." + "description_video": "Görme engelliler için videoyu tarif edin...", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "Süre: %s", @@ -386,7 +403,9 @@ "one_day": "1 Gün", "three_days": "3 Gün", "seven_days": "7 Gün", - "option_number": "Seçenek %ld" + "option_number": "Seçenek %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "Buraya kesin bir uyarı yazın..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Özel Emoji Seçici", "enable_content_warning": "İçerik Uyarısını Etkinleştir", "disable_content_warning": "İçerik Uyarısını Kapat", - "post_visibility_menu": "Gönderi Görünürlüğü Menüsü" + "post_visibility_menu": "Gönderi Görünürlüğü Menüsü", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "Gönderiyi İptal Et", @@ -432,6 +453,10 @@ "placeholder": { "label": "Etiket", "content": "İçerik" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Localization/StringsConvertor/input/uk.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/uk.lproj/Localizable.stringsdict index cdf35477e..32e4cf9aa 100644 --- a/Localization/StringsConvertor/input/uk.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/uk.lproj/Localizable.stringsdict @@ -62,6 +62,26 @@ %ld characters + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + few + %ld characters + many + %ld characters + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/uk.lproj/app.json b/Localization/StringsConvertor/input/uk.lproj/app.json index 80b0882d9..3113ada74 100644 --- a/Localization/StringsConvertor/input/uk.lproj/app.json +++ b/Localization/StringsConvertor/input/uk.lproj/app.json @@ -74,8 +74,8 @@ "take_photo": "Take Photo", "save_photo": "Save Photo", "copy_photo": "Copy Photo", - "sign_in": "Sign In", - "sign_up": "Sign Up", + "sign_in": "Log in", + "sign_up": "Create account", "see_more": "See More", "preview": "Preview", "share": "Share", @@ -136,6 +136,12 @@ "vote": "Vote", "closed": "Closed" }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Show Profile: %s", + "email": "Email address: %s" + }, "actions": { "reply": "Reply", "reblog": "Reblog", @@ -212,10 +218,16 @@ "get_started": "Get Started", "log_in": "Log In" }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, "server_picker": { "title": "Mastodon is made of users in different servers.", - "subtitle": "Pick a server based on your interests, region, or a general purpose one.", - "subtitle_extend": "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "All", @@ -242,8 +254,7 @@ "category": "CATEGORY" }, "input": { - "placeholder": "Search servers", - "search_servers_or_enter_url": "Search servers or enter URL" + "search_servers_or_enter_url": "Search communities or enter URL" }, "empty_state": { "finding_servers": "Finding available servers...", @@ -376,7 +387,13 @@ "video": "video", "attachment_broken": "This %s is broken and can’t be\nuploaded to Mastodon.", "description_photo": "Describe the photo for the visually-impaired...", - "description_video": "Describe the video for the visually-impaired..." + "description_video": "Describe the video for the visually-impaired...", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "Duration: %s", @@ -386,7 +403,9 @@ "one_day": "1 Day", "three_days": "3 Days", "seven_days": "7 Days", - "option_number": "Option %ld" + "option_number": "Option %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "Write an accurate warning here..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Custom Emoji Picker", "enable_content_warning": "Enable Content Warning", "disable_content_warning": "Disable Content Warning", - "post_visibility_menu": "Post Visibility Menu" + "post_visibility_menu": "Post Visibility Menu", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "Discard Post", @@ -432,6 +453,10 @@ "placeholder": { "label": "Label", "content": "Content" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Localization/StringsConvertor/input/vi.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/vi.lproj/Localizable.stringsdict index 6905b240e..4c772f014 100644 --- a/Localization/StringsConvertor/input/vi.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/vi.lproj/Localizable.stringsdict @@ -44,6 +44,20 @@ %ld ký tự + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ còn lại + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + other + %ld ký tự + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/vi.lproj/app.json b/Localization/StringsConvertor/input/vi.lproj/app.json index b857399b3..963be39c9 100644 --- a/Localization/StringsConvertor/input/vi.lproj/app.json +++ b/Localization/StringsConvertor/input/vi.lproj/app.json @@ -75,7 +75,7 @@ "save_photo": "Lưu ảnh", "copy_photo": "Sao chép ảnh", "sign_in": "Đăng nhập", - "sign_up": "Đăng ký", + "sign_up": "Tạo tài khoản", "see_more": "Xem thêm", "preview": "Xem trước", "share": "Chia sẻ", @@ -136,6 +136,12 @@ "vote": "Bình chọn", "closed": "Kết thúc" }, + "meta_entity": { + "url": "Link: %s", + "hashtag": "Hashtag: %s", + "mention": "Hiện hồ sơ: %s", + "email": "Email: %s" + }, "actions": { "reply": "Trả lời", "reblog": "Đăng lại", @@ -212,10 +218,16 @@ "get_started": "Bắt đầu", "log_in": "Đăng nhập" }, + "login": { + "title": "Chào mừng trở lại!", + "subtitle": "Đăng nhập vào máy chủ mà bạn đã tạo tài khoản.", + "server_search_field": { + "placeholder": "Nhập URL hoặc tìm máy chủ" + } + }, "server_picker": { "title": "Mastodon gồm nhiều máy chủ với thành viên riêng.", - "subtitle": "Chọn một máy chủ dựa theo sở thích, tôn giáo, hoặc ý muốn của bạn.", - "subtitle_extend": "Chọn một máy chủ dựa theo sở thích, tôn giáo, hoặc ý muốn của bạn. Mỗi máy chủ có thể được vận hành bởi một cá nhân hoặc một tổ chức.", + "subtitle": "Chọn một máy chủ dựa theo sở thích, tôn giáo, hoặc ý muốn của bạn. Bạn vẫn có thể giao tiếp với bất cứ ai mà không phụ thuộc vào máy chủ của họ.", "button": { "category": { "all": "Toàn bộ", @@ -242,8 +254,7 @@ "category": "PHÂN LOẠI" }, "input": { - "placeholder": "Tìm máy chủ", - "search_servers_or_enter_url": "Tìm máy chủ hoặc nhập URL" + "search_servers_or_enter_url": "Tìm một máy chủ hoặc nhập URL" }, "empty_state": { "finding_servers": "Đang tìm máy chủ hoạt động...", @@ -376,7 +387,13 @@ "video": "video", "attachment_broken": "%s này bị lỗi và không thể\ntải lên Mastodon.", "description_photo": "Mô tả hình ảnh cho người khiếm thị...", - "description_video": "Mô tả video cho người khiếm thị..." + "description_video": "Mô tả video cho người khiếm thị...", + "load_failed": "Tải thất bại", + "upload_failed": "Tải lên thất bại", + "can_not_recognize_this_media_attachment": "Không xem được tập tin đính kèm", + "attachment_too_large": "Tập tin đính kèm quá lớn", + "compressing_state": "Đang nén...", + "server_processing_state": "Máy chủ đang xử lý..." }, "poll": { "duration_time": "Thời hạn: %s", @@ -386,7 +403,9 @@ "one_day": "1 ngày", "three_days": "3 ngày", "seven_days": "7 ngày", - "option_number": "Lựa chọn %ld" + "option_number": "Lựa chọn %ld", + "the_poll_is_invalid": "Bình chọn không hợp lệ", + "the_poll_has_empty_option": "Thiếu lựa chọn" }, "content_warning": { "placeholder": "Viết nội dung ẩn của bạn ở đây..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "Chọn emoji", "enable_content_warning": "Bật nội dung ẩn", "disable_content_warning": "Tắt nội dung ẩn", - "post_visibility_menu": "Menu hiển thị tút" + "post_visibility_menu": "Menu hiển thị tút", + "post_options": "Tùy chọn đăng", + "posting_as": "Đăng dưới dạng %s" }, "keyboard": { "discard_post": "Hủy đăng tút", @@ -432,6 +453,10 @@ "placeholder": { "label": "Nhãn", "content": "Nội dung" + }, + "verified": { + "short": "Đã xác minh %s", + "long": "Liên kết này đã được xác minh trên %s" } }, "segmented_control": { @@ -696,7 +721,7 @@ "accessibility_hint": "Nhấn hai lần để bỏ qua" }, "bookmark": { - "title": "Bookmarks" + "title": "Tút đã lưu" } } } diff --git a/Localization/StringsConvertor/input/zh-Hans.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/zh-Hans.lproj/Localizable.stringsdict index 5a7af3752..362d55c4f 100644 --- a/Localization/StringsConvertor/input/zh-Hans.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/zh-Hans.lproj/Localizable.stringsdict @@ -44,6 +44,20 @@ %ld 个字符 + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ 剩余 + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + other + %ld 个字符 + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/zh-Hans.lproj/app.json b/Localization/StringsConvertor/input/zh-Hans.lproj/app.json index 7f3703b8a..c503c5186 100644 --- a/Localization/StringsConvertor/input/zh-Hans.lproj/app.json +++ b/Localization/StringsConvertor/input/zh-Hans.lproj/app.json @@ -75,7 +75,7 @@ "save_photo": "保存照片", "copy_photo": "拷贝照片", "sign_in": "登录", - "sign_up": "注册", + "sign_up": "创建账户", "see_more": "查看更多", "preview": "预览", "share": "分享", @@ -136,6 +136,12 @@ "vote": "投票", "closed": "已关闭" }, + "meta_entity": { + "url": "链接：%s", + "hashtag": "话题：%s", + "mention": "显示用户资料：%s", + "email": "邮箱地址：%s" + }, "actions": { "reply": "回复", "reblog": "转发", @@ -181,8 +187,8 @@ "unmute_user": "取消静音 %s", "muted": "已静音", "edit_info": "编辑", - "show_reblogs": "Show Reblogs", - "hide_reblogs": "Hide Reblogs" + "show_reblogs": "显示转发", + "hide_reblogs": "隐藏转发" }, "timeline": { "filtered": "已过滤", @@ -212,10 +218,16 @@ "get_started": "开始使用", "log_in": "登录" }, + "login": { + "title": "欢迎回来", + "subtitle": "登入您账户所在的服务器。", + "server_search_field": { + "placeholder": "输入网址或搜索您的服务器" + } + }, "server_picker": { "title": "挑选一个服务器，\n任意服务器。", - "subtitle": "根据你的兴趣、区域或一般目的选择一个社区。", - "subtitle_extend": "根据你的兴趣、区域或一般目的选择一个社区。每个社区都由完全独立的组织或个人管理。", + "subtitle": "根据你的地区、兴趣挑选一个服务器。无论你选择哪个服务器，你都可以跟其他服务器的任何人一起聊天。", "button": { "category": { "all": "全部", @@ -242,8 +254,7 @@ "category": "类别" }, "input": { - "placeholder": "查找或加入你自己的服务器...", - "search_servers_or_enter_url": "搜索服务器或输入 URL" + "search_servers_or_enter_url": "搜索社区或输入 URL" }, "empty_state": { "finding_servers": "正在查找可用的服务器...", @@ -376,7 +387,13 @@ "video": "视频", "attachment_broken": "%s已损坏\n无法上传到 Mastodon", "description_photo": "为视觉障碍人士添加照片的文字说明...", - "description_video": "为视觉障碍人士添加视频的文字说明..." + "description_video": "为视觉障碍人士添加视频的文字说明...", + "load_failed": "加载失败", + "upload_failed": "上传失败", + "can_not_recognize_this_media_attachment": "无法识别此媒体", + "attachment_too_large": "附件太大", + "compressing_state": "压缩中...", + "server_processing_state": "服务器正在处理..." }, "poll": { "duration_time": "时长：%s", @@ -386,7 +403,9 @@ "one_day": "1 天", "three_days": "3 天", "seven_days": "7 天", - "option_number": "选项 %ld" + "option_number": "选项 %ld", + "the_poll_is_invalid": "投票无效", + "the_poll_has_empty_option": "投票含有空选项" }, "content_warning": { "placeholder": "在这里写下内容的警告消息..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "自定义表情选择器", "enable_content_warning": "启用内容警告", "disable_content_warning": "关闭内容警告", - "post_visibility_menu": "帖子可见性" + "post_visibility_menu": "帖子可见性", + "post_options": "帖子选项", + "posting_as": "以 %s 身份发布" }, "keyboard": { "discard_post": "丢弃帖子", @@ -432,6 +453,10 @@ "placeholder": { "label": "标签", "content": "内容" + }, + "verified": { + "short": "验证于 %s", + "long": "此链接的所有权已在 %s 上检查通过" } }, "segmented_control": { @@ -459,12 +484,12 @@ "message": "确认取消屏蔽 %s" }, "confirm_show_reblogs": { - "title": "Show Reblogs", - "message": "Confirm to show reblogs" + "title": "显示转发", + "message": "确认显示转发" }, "confirm_hide_reblogs": { - "title": "Hide Reblogs", - "message": "Confirm to hide reblogs" + "title": "隐藏转发", + "message": "确认隐藏转发" } }, "accessibility": { @@ -696,7 +721,7 @@ "accessibility_hint": "双击关闭此向导" }, "bookmark": { - "title": "Bookmarks" + "title": "书签" } } } diff --git a/Localization/StringsConvertor/input/zh-Hant.lproj/Localizable.stringsdict b/Localization/StringsConvertor/input/zh-Hant.lproj/Localizable.stringsdict index c0ce0f9a2..d545fd6a4 100644 --- a/Localization/StringsConvertor/input/zh-Hant.lproj/Localizable.stringsdict +++ b/Localization/StringsConvertor/input/zh-Hant.lproj/Localizable.stringsdict @@ -44,6 +44,20 @@ %ld 個字 + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + 剩餘 %#@character_count@ 字 + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + other + %ld 個字 + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/Localization/StringsConvertor/input/zh-Hant.lproj/app.json b/Localization/StringsConvertor/input/zh-Hant.lproj/app.json index ae497109e..e2dfaad64 100644 --- a/Localization/StringsConvertor/input/zh-Hant.lproj/app.json +++ b/Localization/StringsConvertor/input/zh-Hant.lproj/app.json @@ -75,7 +75,7 @@ "save_photo": "儲存照片", "copy_photo": "複製照片", "sign_in": "登入", - "sign_up": "註冊", + "sign_up": "新增帳號", "see_more": "檢視更多", "preview": "預覽", "share": "分享", @@ -136,6 +136,12 @@ "vote": "投票", "closed": "已關閉" }, + "meta_entity": { + "url": "連結：%s", + "hashtag": "主題標籤： %s", + "mention": "顯示個人檔案：%s", + "email": "電子郵件地址：%s" + }, "actions": { "reply": "回覆", "reblog": "轉嘟", @@ -212,10 +218,16 @@ "get_started": "新手上路", "log_in": "登入" }, + "login": { + "title": "歡迎回來", + "subtitle": "登入您新增帳號之伺服器", + "server_search_field": { + "placeholder": "請輸入 URL 或搜尋您的伺服器" + } + }, "server_picker": { "title": "Mastodon 由不同伺服器的使用者組成。", - "subtitle": "基於您的興趣、地區、或一般用途選定一個伺服器。", - "subtitle_extend": "基於您的興趣、地區、或一般用途選定一個伺服器。每個伺服器是由完全獨立的組織或個人營運。", + "subtitle": "基於您的興趣、地區、或一般用途選定一個伺服器。您仍會與任何伺服器中的每個人連結。", "button": { "category": { "all": "全部", @@ -242,8 +254,7 @@ "category": "分類" }, "input": { - "placeholder": "搜尋伺服器", - "search_servers_or_enter_url": "搜尋伺服器或輸入網址" + "search_servers_or_enter_url": "搜尋社群或輸入 URL 地址" }, "empty_state": { "finding_servers": "尋找可用的伺服器...", @@ -376,7 +387,13 @@ "video": "影片", "attachment_broken": "此 %s 已損毀，並無法被上傳至 Mastodon。", "description_photo": "為視障人士提供圖片說明...", - "description_video": "為視障人士提供影片說明..." + "description_video": "為視障人士提供影片說明...", + "load_failed": "讀取失敗", + "upload_failed": "上傳失敗", + "can_not_recognize_this_media_attachment": "無法識別此媒體附加檔案", + "attachment_too_large": "附加檔案大小過大", + "compressing_state": "正在壓縮...", + "server_processing_state": "伺服器處理中..." }, "poll": { "duration_time": "持續時間：%s", @@ -386,7 +403,9 @@ "one_day": "一天", "three_days": "三天", "seven_days": "七天", - "option_number": "選項 %ld" + "option_number": "選項 %ld", + "the_poll_is_invalid": "此投票是無效的", + "the_poll_has_empty_option": "此投票有空白選項" }, "content_warning": { "placeholder": "請於此處寫下精準的警告..." @@ -407,7 +426,9 @@ "custom_emoji_picker": "自訂 emoji 選擇器", "enable_content_warning": "啟用內容警告", "disable_content_warning": "停用內容警告", - "post_visibility_menu": "嘟文可見性選單" + "post_visibility_menu": "嘟文可見性選單", + "post_options": "嘟文選項", + "posting_as": "以 %s 發嘟" }, "keyboard": { "discard_post": "捨棄嘟文", @@ -432,6 +453,10 @@ "placeholder": { "label": "標籤", "content": "內容" + }, + "verified": { + "short": "於 %s 上已驗證", + "long": "已在 %s 檢查此連結的擁有者權限" } }, "segmented_control": { @@ -696,7 +721,7 @@ "accessibility_hint": "點兩下以關閉此設定精靈" }, "bookmark": { - "title": "Bookmarks" + "title": "書籤" } } } diff --git a/Localization/app.json b/Localization/app.json index c5a3dac74..ea046bfbc 100644 --- a/Localization/app.json +++ b/Localization/app.json @@ -74,8 +74,8 @@ "take_photo": "Take Photo", "save_photo": "Save Photo", "copy_photo": "Copy Photo", - "sign_in": "Sign In", - "sign_up": "Sign Up", + "sign_in": "Log in", + "sign_up": "Create account", "see_more": "See More", "preview": "Preview", "share": "Share", @@ -96,7 +96,7 @@ "tabs": { "home": "Home", "search": "Search", - "notification": "Notification", + "notifications": "Notifications", "profile": "Profile" }, "keyboard": { @@ -218,10 +218,16 @@ "get_started": "Get Started", "log_in": "Log In" }, + "login": { + "title": "Welcome back", + "subtitle": "Log you in on the server you created your account on.", + "server_search_field": { + "placeholder": "Enter URL or search for your server" + } + }, "server_picker": { "title": "Mastodon is made of users in different servers.", - "subtitle": "Pick a server based on your interests, region, or a general purpose one.", - "subtitle_extend": "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual.", + "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", "button": { "category": { "all": "All", @@ -248,8 +254,7 @@ "category": "CATEGORY" }, "input": { - "placeholder": "Search servers", - "search_servers_or_enter_url": "Search servers or enter URL" + "search_servers_or_enter_url": "Search communities or enter URL" }, "empty_state": { "finding_servers": "Finding available servers...", @@ -382,7 +387,13 @@ "video": "video", "attachment_broken": "This %s is broken and can’t be\nuploaded to Mastodon.", "description_photo": "Describe the photo for the visually-impaired...", - "description_video": "Describe the video for the visually-impaired..." + "description_video": "Describe the video for the visually-impaired...", + "load_failed": "Load Failed", + "upload_failed": "Upload Failed", + "can_not_recognize_this_media_attachment": "Can not recognize this media attachment", + "attachment_too_large": "Attachment too large", + "compressing_state": "Compressing...", + "server_processing_state": "Server Processing..." }, "poll": { "duration_time": "Duration: %s", @@ -392,7 +403,9 @@ "one_day": "1 Day", "three_days": "3 Days", "seven_days": "7 Days", - "option_number": "Option %ld" + "option_number": "Option %ld", + "the_poll_is_invalid": "The poll is invalid", + "the_poll_has_empty_option": "The poll has empty option" }, "content_warning": { "placeholder": "Write an accurate warning here..." @@ -413,7 +426,9 @@ "custom_emoji_picker": "Custom Emoji Picker", "enable_content_warning": "Enable Content Warning", "disable_content_warning": "Disable Content Warning", - "post_visibility_menu": "Post Visibility Menu" + "post_visibility_menu": "Post Visibility Menu", + "post_options": "Post Options", + "posting_as": "Posting as %s" }, "keyboard": { "discard_post": "Discard Post", @@ -438,6 +453,10 @@ "placeholder": { "label": "Label", "content": "Content" + }, + "verified": { + "short": "Verified on %s", + "long": "Ownership of this link was checked on %s" } }, "segmented_control": { diff --git a/Mastodon.xcodeproj/project.pbxproj b/Mastodon.xcodeproj/project.pbxproj index 2085c8901..0c43b71df 100644 --- a/Mastodon.xcodeproj/project.pbxproj +++ b/Mastodon.xcodeproj/project.pbxproj @@ -23,6 +23,8 @@ 0FB3D33825E6401400AAD544 /* PickServerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0FB3D33725E6401400AAD544 /* PickServerCell.swift */; }; 164F0EBC267D4FE400249499 /* BoopSound.caf in Resources */ = {isa = PBXBuildFile; fileRef = 164F0EBB267D4FE400249499 /* BoopSound.caf */; }; 18BC7629F65E6DB12CB8416D /* Pods_Mastodon_MastodonUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C030226D3C73DCC23D67452 /* Pods_Mastodon_MastodonUITests.framework */; }; + 2A82294F29262EE000D2A1F7 /* AppContext+NextAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A82294E29262EE000D2A1F7 /* AppContext+NextAccount.swift */; }; + 2AE244482927831100BDBF7C /* UIImage+SFSymbols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE244472927831100BDBF7C /* UIImage+SFSymbols.swift */; }; 2D198643261BF09500F0B013 /* SearchResultItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D198642261BF09500F0B013 /* SearchResultItem.swift */; }; 2D198649261C0B8500F0B013 /* SearchResultSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D198648261C0B8500F0B013 /* SearchResultSection.swift */; }; 2D206B8625F5FB0900143C56 /* Double.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D206B8525F5FB0900143C56 /* Double.swift */; }; @@ -87,6 +89,12 @@ 62FD27D32893707B00B205C5 /* BookmarkViewController+DataSourceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62FD27D22893707B00B205C5 /* BookmarkViewController+DataSourceProvider.swift */; }; 62FD27D52893708A00B205C5 /* BookmarkViewModel+Diffable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62FD27D42893708A00B205C5 /* BookmarkViewModel+Diffable.swift */; }; 87FFDA5D898A5C42ADCB35E7 /* Pods_Mastodon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A4ABE34829701A4496C5BB64 /* Pods_Mastodon.framework */; }; + C24C97032922F30500BAE8CB /* RefreshControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = C24C97022922F30500BAE8CB /* RefreshControl.swift */; }; + D87BFC8B291D5C6B00FEE264 /* MastodonLoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D87BFC8A291D5C6B00FEE264 /* MastodonLoginView.swift */; }; + D87BFC8D291EB81200FEE264 /* MastodonLoginViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D87BFC8C291EB81200FEE264 /* MastodonLoginViewModel.swift */; }; + D87BFC8F291EC26A00FEE264 /* MastodonLoginServerTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D87BFC8E291EC26A00FEE264 /* MastodonLoginServerTableViewCell.swift */; }; + D8916DC029211BE500124085 /* ContentSizedTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8916DBF29211BE500124085 /* ContentSizedTableView.swift */; }; + D8A6AB6C291C5136003AB663 /* MastodonLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8A6AB6B291C5136003AB663 /* MastodonLoginViewController.swift */; }; DB0009A626AEE5DC009B9D2D /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = DB0009A926AEE5DC009B9D2D /* Intents.intentdefinition */; settings = {ATTRIBUTES = (codegen, ); }; }; DB0009A726AEE5DC009B9D2D /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = DB0009A926AEE5DC009B9D2D /* Intents.intentdefinition */; }; DB0140CF25C42AEE00F9F3CF /* OSLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB0140CE25C42AEE00F9F3CF /* OSLog.swift */; }; @@ -151,7 +159,6 @@ DB1FD44425F26CCC004CFCFC /* PickServerSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB1FD44325F26CCC004CFCFC /* PickServerSection.swift */; }; DB1FD45025F26FA1004CFCFC /* MastodonPickServerViewModel+Diffable.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB1FD44F25F26FA1004CFCFC /* MastodonPickServerViewModel+Diffable.swift */; }; DB1FD45A25F27898004CFCFC /* CategoryPickerItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB1FD45925F27898004CFCFC /* CategoryPickerItem.swift */; }; - DB221B16260C395900AEFE46 /* CustomEmojiPickerInputViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB221B15260C395900AEFE46 /* CustomEmojiPickerInputViewModel.swift */; }; DB22C92228E700A10082A9E9 /* MastodonSDK in Frameworks */ = {isa = PBXBuildFile; productRef = DB22C92128E700A10082A9E9 /* MastodonSDK */; }; DB22C92428E700A80082A9E9 /* MastodonSDK in Frameworks */ = {isa = PBXBuildFile; productRef = DB22C92328E700A80082A9E9 /* MastodonSDK */; }; DB22C92628E700AF0082A9E9 /* MastodonSDK in Frameworks */ = {isa = PBXBuildFile; productRef = DB22C92528E700AF0082A9E9 /* MastodonSDK */; }; @@ -185,9 +192,6 @@ DB427DED25BAA00100D1B89D /* MastodonTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB427DEC25BAA00100D1B89D /* MastodonTests.swift */; }; DB427DF825BAA00100D1B89D /* MastodonUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB427DF725BAA00100D1B89D /* MastodonUITests.swift */; }; DB443CD42694627B00159B29 /* AppearanceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB443CD32694627B00159B29 /* AppearanceView.swift */; }; - DB44767B260B3B8C00B66B82 /* CustomEmojiPickerInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB44767A260B3B8C00B66B82 /* CustomEmojiPickerInputView.swift */; }; - DB447691260B406600B66B82 /* CustomEmojiPickerItemCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB447690260B406600B66B82 /* CustomEmojiPickerItemCollectionViewCell.swift */; }; - DB447697260B439000B66B82 /* CustomEmojiPickerHeaderCollectionReusableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB447696260B439000B66B82 /* CustomEmojiPickerHeaderCollectionReusableView.swift */; }; DB4481B925EE289600BEFB67 /* UITableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB4481B825EE289600BEFB67 /* UITableView.swift */; }; DB45FAB625CA5485005A8AC7 /* UIAlertController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB45FAB525CA5485005A8AC7 /* UIAlertController.swift */; }; DB45FAD725CA6C76005A8AC7 /* UIBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB45FAD625CA6C76005A8AC7 /* UIBarButtonItem.swift */; }; @@ -257,7 +261,6 @@ DB64BA452851F23000ADF1B7 /* MastodonAuthentication+Fetch.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB64BA442851F23000ADF1B7 /* MastodonAuthentication+Fetch.swift */; }; DB64BA482851F29300ADF1B7 /* Account+Fetch.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB64BA472851F29300ADF1B7 /* Account+Fetch.swift */; }; DB65C63727A2AF6C008BAC2E /* ReportItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB65C63627A2AF6C008BAC2E /* ReportItem.swift */; }; - DB66728C25F9F8DC00D60309 /* ComposeViewModel+DataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB66728B25F9F8DC00D60309 /* ComposeViewModel+DataSource.swift */; }; DB6746EB278ED8B0008A6B94 /* PollOptionView+Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB6746EA278ED8B0008A6B94 /* PollOptionView+Configuration.swift */; }; DB6746ED278F45F0008A6B94 /* AutoGenerateProtocolRelayDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB6746EC278F45F0008A6B94 /* AutoGenerateProtocolRelayDelegate.swift */; }; DB6746F0278F463B008A6B94 /* AutoGenerateProtocolDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB6746EF278F463B008A6B94 /* AutoGenerateProtocolDelegate.swift */; }; @@ -337,7 +340,6 @@ DB98EB6927B21A7C0082E365 /* ReportResultActionTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB98EB6827B21A7C0082E365 /* ReportResultActionTableViewCell.swift */; }; DB98EB6B27B243470082E365 /* SettingsAppearanceTableViewCell+ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB98EB6A27B243470082E365 /* SettingsAppearanceTableViewCell+ViewModel.swift */; }; DB9A486C26032AC1008B817C /* AttachmentContainerView+EmptyStateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB9A486B26032AC1008B817C /* AttachmentContainerView+EmptyStateView.swift */; }; - DB9A488A26034D40008B817C /* ComposeViewModel+PublishState.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB9A488926034D40008B817C /* ComposeViewModel+PublishState.swift */; }; DB9D6BE925E4F5340051B173 /* SearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB9D6BE825E4F5340051B173 /* SearchViewController.swift */; }; DB9D6BF825E4F5690051B173 /* NotificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB9D6BF725E4F5690051B173 /* NotificationViewController.swift */; }; DB9D6BFF25E4F5940051B173 /* ProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB9D6BFE25E4F5940051B173 /* ProfileViewController.swift */; }; @@ -376,12 +378,11 @@ DBB8AB4626AECDE200F6D281 /* SendPostIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBB8AB4526AECDE200F6D281 /* SendPostIntentHandler.swift */; }; DBB8AB4F26AED13F00F6D281 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DB427DDE25BAA00100D1B89D /* Assets.xcassets */; }; DBB9759C262462E1004620BD /* ThreadMetaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBB9759B262462E1004620BD /* ThreadMetaView.swift */; }; - DBBC24DC26A54BCB00398BB9 /* MastodonRegex.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBBC24D626A54BCB00398BB9 /* MastodonRegex.swift */; }; DBBE1B4525F3474B0081417A /* MastodonPickServerAppearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBBE1B4425F3474B0081417A /* MastodonPickServerAppearance.swift */; }; - DBC6461526A170AB00B0E31B /* ComposeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBC6461426A170AB00B0E31B /* ComposeViewController.swift */; }; + DBC3872429214121001EC0FD /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBC3872329214121001EC0FD /* ShareViewController.swift */; }; DBC6461826A170AB00B0E31B /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DBC6461626A170AB00B0E31B /* MainInterface.storyboard */; }; DBC6461C26A170AB00B0E31B /* ShareActionExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = DBC6461226A170AB00B0E31B /* ShareActionExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - DBC6462326A1712000B0E31B /* ComposeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBC6462226A1712000B0E31B /* ComposeViewModel.swift */; }; + DBC6462326A1712000B0E31B /* ShareViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBC6462226A1712000B0E31B /* ShareViewModel.swift */; }; DBC6462826A1736300B0E31B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DB427DDE25BAA00100D1B89D /* Assets.xcassets */; }; DBC7A672260C897100E57475 /* StatusContentWarningEditorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBC7A671260C897100E57475 /* StatusContentWarningEditorView.swift */; }; DBCA0EBC282BB38A0029E2B0 /* PageboyNavigateable.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBCA0EBB282BB38A0029E2B0 /* PageboyNavigateable.swift */; }; @@ -519,6 +520,8 @@ 0FB3D33725E6401400AAD544 /* PickServerCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PickServerCell.swift; sourceTree = ""; }; 164F0EBB267D4FE400249499 /* BoopSound.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = BoopSound.caf; sourceTree = ""; }; 1D6D967E77A5357E2C6110D9 /* Pods-Mastodon.asdk - debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mastodon.asdk - debug.xcconfig"; path = "Target Support Files/Pods-Mastodon/Pods-Mastodon.asdk - debug.xcconfig"; sourceTree = ""; }; + 2A82294E29262EE000D2A1F7 /* AppContext+NextAccount.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppContext+NextAccount.swift"; sourceTree = ""; }; + 2AE244472927831100BDBF7C /* UIImage+SFSymbols.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+SFSymbols.swift"; sourceTree = ""; }; 2D198642261BF09500F0B013 /* SearchResultItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultItem.swift; sourceTree = ""; }; 2D198648261C0B8500F0B013 /* SearchResultSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultSection.swift; sourceTree = ""; }; 2D206B8525F5FB0900143C56 /* Double.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Double.swift; sourceTree = ""; }; @@ -610,9 +613,15 @@ B44342AC2B6585F8295F1DDF /* Pods-Mastodon-NotificationService.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mastodon-NotificationService.release.xcconfig"; path = "Target Support Files/Pods-Mastodon-NotificationService/Pods-Mastodon-NotificationService.release.xcconfig"; sourceTree = ""; }; BB482D32A7B9825BF5327C4F /* Pods-Mastodon-MastodonUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mastodon-MastodonUITests.release.xcconfig"; path = "Target Support Files/Pods-Mastodon-MastodonUITests/Pods-Mastodon-MastodonUITests.release.xcconfig"; sourceTree = ""; }; BD7598A87F4497045EDEF252 /* Pods-Mastodon.asdk - release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mastodon.asdk - release.xcconfig"; path = "Target Support Files/Pods-Mastodon/Pods-Mastodon.asdk - release.xcconfig"; sourceTree = ""; }; + C24C97022922F30500BAE8CB /* RefreshControl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RefreshControl.swift; sourceTree = ""; }; C3789232A52F43529CA67E95 /* Pods-MastodonIntent.asdk - debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MastodonIntent.asdk - debug.xcconfig"; path = "Target Support Files/Pods-MastodonIntent/Pods-MastodonIntent.asdk - debug.xcconfig"; sourceTree = ""; }; CD92E0F10BDE4FE7C4B999F2 /* Pods_MastodonTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MastodonTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D7D7CF93E262178800077512 /* Pods-Mastodon-AppShared.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mastodon-AppShared.debug.xcconfig"; path = "Target Support Files/Pods-Mastodon-AppShared/Pods-Mastodon-AppShared.debug.xcconfig"; sourceTree = ""; }; + D87BFC8A291D5C6B00FEE264 /* MastodonLoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonLoginView.swift; sourceTree = ""; }; + D87BFC8C291EB81200FEE264 /* MastodonLoginViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonLoginViewModel.swift; sourceTree = ""; }; + D87BFC8E291EC26A00FEE264 /* MastodonLoginServerTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonLoginServerTableViewCell.swift; sourceTree = ""; }; + D8916DBF29211BE500124085 /* ContentSizedTableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentSizedTableView.swift; sourceTree = ""; }; + D8A6AB6B291C5136003AB663 /* MastodonLoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonLoginViewController.swift; sourceTree = ""; }; DB0009A826AEE5DC009B9D2D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; name = Base; path = Base.lproj/Intents.intentdefinition; sourceTree = ""; }; DB0009AD26AEE5E4009B9D2D /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Intents.strings; sourceTree = ""; }; DB0140CE25C42AEE00F9F3CF /* OSLog.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OSLog.swift; sourceTree = ""; }; @@ -637,7 +646,6 @@ DB0618022785A7100030EE79 /* RegisterSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterSection.swift; sourceTree = ""; }; DB0618042785A73D0030EE79 /* RegisterItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterItem.swift; sourceTree = ""; }; DB0618062785A8880030EE79 /* MastodonRegisterViewModel+Diffable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MastodonRegisterViewModel+Diffable.swift"; sourceTree = ""; }; - DB0618092785B2AB0030EE79 /* MastodonRegisterAvatarTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonRegisterAvatarTableViewCell.swift; sourceTree = ""; }; DB0A322D280EE9FD001729D2 /* DiscoveryIntroBannerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiscoveryIntroBannerView.swift; sourceTree = ""; }; DB0C947626A7FE840088FB11 /* NotificationAvatarButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationAvatarButton.swift; sourceTree = ""; }; DB0EF72A26FDB1D200347686 /* SidebarListCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SidebarListCollectionViewCell.swift; sourceTree = ""; }; @@ -681,7 +689,6 @@ DB1FD44F25F26FA1004CFCFC /* MastodonPickServerViewModel+Diffable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MastodonPickServerViewModel+Diffable.swift"; sourceTree = ""; }; DB1FD45925F27898004CFCFC /* CategoryPickerItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CategoryPickerItem.swift; sourceTree = ""; }; DB1FD45F25F278AF004CFCFC /* CategoryPickerSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CategoryPickerSection.swift; sourceTree = ""; }; - DB221B15260C395900AEFE46 /* CustomEmojiPickerInputViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomEmojiPickerInputViewModel.swift; sourceTree = ""; }; DB2B3ABD25E37E15007045F9 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; DB2F073325E8ECF000957B2D /* AuthenticationViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthenticationViewModel.swift; sourceTree = ""; }; DB2FF50F260B113300ADA9FE /* ComposeStatusPollExpiresOptionCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeStatusPollExpiresOptionCollectionViewCell.swift; sourceTree = ""; }; @@ -718,9 +725,6 @@ DB427DF725BAA00100D1B89D /* MastodonUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonUITests.swift; sourceTree = ""; }; DB427DF925BAA00100D1B89D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; DB443CD32694627B00159B29 /* AppearanceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppearanceView.swift; sourceTree = ""; }; - DB44767A260B3B8C00B66B82 /* CustomEmojiPickerInputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomEmojiPickerInputView.swift; sourceTree = ""; }; - DB447690260B406600B66B82 /* CustomEmojiPickerItemCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomEmojiPickerItemCollectionViewCell.swift; sourceTree = ""; }; - DB447696260B439000B66B82 /* CustomEmojiPickerHeaderCollectionReusableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomEmojiPickerHeaderCollectionReusableView.swift; sourceTree = ""; }; DB4481B825EE289600BEFB67 /* UITableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UITableView.swift; sourceTree = ""; }; DB45FAB525CA5485005A8AC7 /* UIAlertController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIAlertController.swift; sourceTree = ""; }; DB45FAD625CA6C76005A8AC7 /* UIBarButtonItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIBarButtonItem.swift; sourceTree = ""; }; @@ -820,7 +824,6 @@ DB64BA442851F23000ADF1B7 /* MastodonAuthentication+Fetch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MastodonAuthentication+Fetch.swift"; sourceTree = ""; }; DB64BA472851F29300ADF1B7 /* Account+Fetch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Account+Fetch.swift"; sourceTree = ""; }; DB65C63627A2AF6C008BAC2E /* ReportItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportItem.swift; sourceTree = ""; }; - DB66728B25F9F8DC00D60309 /* ComposeViewModel+DataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ComposeViewModel+DataSource.swift"; sourceTree = ""; }; DB6746EA278ED8B0008A6B94 /* PollOptionView+Configuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PollOptionView+Configuration.swift"; sourceTree = ""; }; DB6746EC278F45F0008A6B94 /* AutoGenerateProtocolRelayDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoGenerateProtocolRelayDelegate.swift; sourceTree = ""; }; DB6746EF278F463B008A6B94 /* AutoGenerateProtocolDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoGenerateProtocolDelegate.swift; sourceTree = ""; }; @@ -865,8 +868,6 @@ DB7A9F922818F33C0016AF98 /* MastodonServerRulesViewController+Debug.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MastodonServerRulesViewController+Debug.swift"; sourceTree = ""; }; DB7F48442620241000796008 /* ProfileHeaderViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileHeaderViewModel.swift; sourceTree = ""; }; DB8190C52601FF0400020C08 /* AttachmentContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachmentContainerView.swift; sourceTree = ""; }; - DB8481142788121200BBEABA /* MastodonRegisterTextFieldTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonRegisterTextFieldTableViewCell.swift; sourceTree = ""; }; - DB84811627883C2600BBEABA /* MastodonRegisterPasswordHintTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonRegisterPasswordHintTableViewCell.swift; sourceTree = ""; }; DB848E32282B62A800A302CC /* ReportResultView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportResultView.swift; sourceTree = ""; }; DB852D1826FAEB6B00FC9D81 /* SidebarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SidebarViewController.swift; sourceTree = ""; }; DB852D1B26FB021500FC9D81 /* RootSplitViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootSplitViewController.swift; sourceTree = ""; }; @@ -898,6 +899,12 @@ DB938F0826240F3C00E5B6C1 /* RemoteThreadViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteThreadViewModel.swift; sourceTree = ""; }; DB938F0E2624119800E5B6C1 /* ThreadViewModel+LoadThreadState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ThreadViewModel+LoadThreadState.swift"; sourceTree = ""; }; DB938F1E2624382F00E5B6C1 /* ThreadViewModel+Diffable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ThreadViewModel+Diffable.swift"; sourceTree = ""; }; + DB96C25D292505FE00F3B85D /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Intents.strings; sourceTree = ""; }; + DB96C25E292505FF00F3B85D /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/InfoPlist.strings; sourceTree = ""; }; + DB96C25F292505FF00F3B85D /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = cs; path = cs.lproj/Intents.stringsdict; sourceTree = ""; }; + DB96C260292506D600F3B85D /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/Intents.strings; sourceTree = ""; }; + DB96C261292506D700F3B85D /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/InfoPlist.strings; sourceTree = ""; }; + DB96C262292506D700F3B85D /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = sl; path = sl.lproj/Intents.stringsdict; sourceTree = ""; }; DB98EB4627B0DFAA0082E365 /* ReportStatusViewModel+State.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ReportStatusViewModel+State.swift"; sourceTree = ""; }; DB98EB4827B0F0CD0082E365 /* ReportStatusTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportStatusTableViewCell.swift; sourceTree = ""; }; DB98EB4B27B0F2BC0082E365 /* ReportStatusTableViewCell+ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ReportStatusTableViewCell+ViewModel.swift"; sourceTree = ""; }; @@ -912,7 +919,6 @@ DB98EB6827B21A7C0082E365 /* ReportResultActionTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportResultActionTableViewCell.swift; sourceTree = ""; }; DB98EB6A27B243470082E365 /* SettingsAppearanceTableViewCell+ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SettingsAppearanceTableViewCell+ViewModel.swift"; sourceTree = ""; }; DB9A486B26032AC1008B817C /* AttachmentContainerView+EmptyStateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AttachmentContainerView+EmptyStateView.swift"; sourceTree = ""; }; - DB9A488926034D40008B817C /* ComposeViewModel+PublishState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ComposeViewModel+PublishState.swift"; sourceTree = ""; }; DB9D6BE825E4F5340051B173 /* SearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchViewController.swift; sourceTree = ""; }; DB9D6BF725E4F5690051B173 /* NotificationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationViewController.swift; sourceTree = ""; }; DB9D6BFE25E4F5940051B173 /* ProfileViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewController.swift; sourceTree = ""; }; @@ -961,14 +967,12 @@ DBB525632612C988002F1F29 /* MeProfileViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeProfileViewModel.swift; sourceTree = ""; }; DBB8AB4526AECDE200F6D281 /* SendPostIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendPostIntentHandler.swift; sourceTree = ""; }; DBB9759B262462E1004620BD /* ThreadMetaView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadMetaView.swift; sourceTree = ""; }; - DBBC24A726A52F9000398BB9 /* ComposeToolbarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeToolbarView.swift; sourceTree = ""; }; - DBBC24D626A54BCB00398BB9 /* MastodonRegex.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MastodonRegex.swift; sourceTree = ""; }; DBBE1B4425F3474B0081417A /* MastodonPickServerAppearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonPickServerAppearance.swift; sourceTree = ""; }; + DBC3872329214121001EC0FD /* ShareViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareViewController.swift; sourceTree = ""; }; DBC6461226A170AB00B0E31B /* ShareActionExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = ShareActionExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; - DBC6461426A170AB00B0E31B /* ComposeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeViewController.swift; sourceTree = ""; }; DBC6461726A170AB00B0E31B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainInterface.storyboard; sourceTree = ""; }; DBC6461926A170AB00B0E31B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - DBC6462226A1712000B0E31B /* ComposeViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ComposeViewModel.swift; sourceTree = ""; }; + DBC6462226A1712000B0E31B /* ShareViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShareViewModel.swift; sourceTree = ""; }; DBC7A671260C897100E57475 /* StatusContentWarningEditorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusContentWarningEditorView.swift; sourceTree = ""; }; DBC9E3A3282E13BB0063A4D9 /* eu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = eu; path = eu.lproj/Intents.strings; sourceTree = ""; }; DBC9E3A4282E13BB0063A4D9 /* eu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = eu; path = eu.lproj/InfoPlist.strings; sourceTree = ""; }; @@ -1042,15 +1046,7 @@ DBFEEC98279BDCDE004F81DD /* ProfileAboutViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileAboutViewModel.swift; sourceTree = ""; }; DBFEEC9A279BDDD9004F81DD /* ProfileAboutViewModel+Diffable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ProfileAboutViewModel+Diffable.swift"; sourceTree = ""; }; DBFEEC9C279C12C1004F81DD /* ProfileFieldEditCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileFieldEditCollectionViewCell.swift; sourceTree = ""; }; - DBFEF05526A576EE006D7ED1 /* StatusEditorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusEditorView.swift; sourceTree = ""; }; - DBFEF05626A576EE006D7ED1 /* ComposeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeView.swift; sourceTree = ""; }; - DBFEF05726A576EE006D7ED1 /* ComposeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeViewModel.swift; sourceTree = ""; }; - DBFEF05826A576EE006D7ED1 /* ContentWarningEditorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentWarningEditorView.swift; sourceTree = ""; }; - DBFEF05926A576EE006D7ED1 /* StatusAuthorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusAuthorView.swift; sourceTree = ""; }; - DBFEF05A26A576EE006D7ED1 /* StatusAttachmentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusAttachmentView.swift; sourceTree = ""; }; - DBFEF06226A577F2006D7ED1 /* StatusAttachmentViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusAttachmentViewModel.swift; sourceTree = ""; }; DBFEF06726A58D07006D7ED1 /* ShareActionExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ShareActionExtension.entitlements; sourceTree = ""; }; - DBFEF06C26A67FB7006D7ED1 /* StatusAttachmentViewModel+UploadState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "StatusAttachmentViewModel+UploadState.swift"; sourceTree = ""; }; DDB1B139FA8EA26F510D58B6 /* Pods-AppShared.asdk - release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AppShared.asdk - release.xcconfig"; path = "Target Support Files/Pods-AppShared/Pods-AppShared.asdk - release.xcconfig"; sourceTree = ""; }; DF65937EC1FF64462BC002EE /* Pods-MastodonTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MastodonTests.profile.xcconfig"; path = "Target Support Files/Pods-MastodonTests/Pods-MastodonTests.profile.xcconfig"; sourceTree = ""; }; E5C7236E58D14A0322FE00F2 /* Pods-Mastodon-MastodonUITests.asdk - debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mastodon-MastodonUITests.asdk - debug.xcconfig"; path = "Target Support Files/Pods-Mastodon-MastodonUITests/Pods-Mastodon-MastodonUITests.asdk - debug.xcconfig"; sourceTree = ""; }; @@ -1518,9 +1514,22 @@ path = Bookmark; sourceTree = ""; }; + D8A6AB68291C50F3003AB663 /* Login */ = { + isa = PBXGroup; + children = ( + D8A6AB6B291C5136003AB663 /* MastodonLoginViewController.swift */, + D87BFC8A291D5C6B00FEE264 /* MastodonLoginView.swift */, + D87BFC8C291EB81200FEE264 /* MastodonLoginViewModel.swift */, + D87BFC8E291EC26A00FEE264 /* MastodonLoginServerTableViewCell.swift */, + D8916DBF29211BE500124085 /* ContentSizedTableView.swift */, + ); + path = Login; + sourceTree = ""; + }; DB01409B25C40BB600F9F3CF /* Onboarding */ = { isa = PBXGroup; children = ( + D8A6AB68291C50F3003AB663 /* Login */, DB68A03825E900CC00CFDF14 /* Share */, 0FAA0FDD25E0B5700017CCDE /* Welcome */, 0FAA102525E1125D0017CCDE /* PickServer */, @@ -1585,16 +1594,6 @@ path = Cell; sourceTree = ""; }; - DB06180B2785B2AF0030EE79 /* Cell */ = { - isa = PBXGroup; - children = ( - DB0618092785B2AB0030EE79 /* MastodonRegisterAvatarTableViewCell.swift */, - DB8481142788121200BBEABA /* MastodonRegisterTextFieldTableViewCell.swift */, - DB84811627883C2600BBEABA /* MastodonRegisterPasswordHintTableViewCell.swift */, - ); - path = Cell; - sourceTree = ""; - }; DB0A322F280EEA00001729D2 /* View */ = { isa = PBXGroup; children = ( @@ -1878,8 +1877,6 @@ DBA0A11225FB3FC10079C110 /* ComposeToolbarView.swift */, DB8190C52601FF0400020C08 /* AttachmentContainerView.swift */, DB9A486B26032AC1008B817C /* AttachmentContainerView+EmptyStateView.swift */, - DB44767A260B3B8C00B66B82 /* CustomEmojiPickerInputView.swift */, - DB221B15260C395900AEFE46 /* CustomEmojiPickerInputViewModel.swift */, DBC7A671260C897100E57475 /* StatusContentWarningEditorView.swift */, ); path = View; @@ -2146,8 +2143,6 @@ DB789A2125F9F76D0071ACA0 /* CollectionViewCell */, DB789A0A25F9F2950071ACA0 /* ComposeViewController.swift */, DB789A1125F9F2CC0071ACA0 /* ComposeViewModel.swift */, - DB66728B25F9F8DC00D60309 /* ComposeViewModel+DataSource.swift */, - DB9A488926034D40008B817C /* ComposeViewModel+PublishState.swift */, ); path = Compose; sourceTree = ""; @@ -2159,8 +2154,6 @@ DB87D4442609BE0500D12C0D /* ComposeStatusPollOptionCollectionViewCell.swift */, DB87D4502609CF1E00D12C0D /* ComposeStatusPollOptionAppendEntryCollectionViewCell.swift */, DB2FF50F260B113300ADA9FE /* ComposeStatusPollExpiresOptionCollectionViewCell.swift */, - DB447690260B406600B66B82 /* CustomEmojiPickerItemCollectionViewCell.swift */, - DB447696260B439000B66B82 /* CustomEmojiPickerHeaderCollectionReusableView.swift */, ); path = CollectionViewCell; sourceTree = ""; @@ -2233,6 +2226,7 @@ isa = PBXGroup; children = ( 2DF123A625C3B0210020F248 /* ActiveLabel.swift */, + 2A82294E29262EE000D2A1F7 /* AppContext+NextAccount.swift */, 5DF1056325F887CB00D6C0D4 /* AVPlayer.swift */, 2D206B8525F5FB0900143C56 /* Double.swift */, DBB3BA2926A81C020004F2D4 /* FLAnimatedImageView.swift */, @@ -2252,6 +2246,7 @@ 2D3F9E0325DFA133004262D9 /* UITapGestureRecognizer.swift */, 2D84350425FF858100EECE90 /* UIScrollView.swift */, DB9E0D6E25EE008500CFDD76 /* UIInterpolatingMotionEffect.swift */, + 2AE244472927831100BDBF7C /* UIImage+SFSymbols.swift */, DBCC3B2F261440A50045B23D /* UITabBarController.swift */, DB73BF4827140BA300781945 /* UICollectionViewDiffableDataSource.swift */, DB73BF4A27140C0800781945 /* UITableViewDiffableDataSource.swift */, @@ -2452,6 +2447,7 @@ isa = PBXGroup; children = ( DB02CDBE2625AE5000D0A2AF /* AdaptiveUserInterfaceStyleBarButtonItem.swift */, + C24C97022922F30500BAE8CB /* RefreshControl.swift */, ); path = Control; sourceTree = ""; @@ -2520,7 +2516,6 @@ DBBC24D526A54BCB00398BB9 /* Helper */ = { isa = PBXGroup; children = ( - DBBC24D626A54BCB00398BB9 /* MastodonRegex.swift */, DBF3B7402733EB9400E21627 /* MastodonLocalCode.swift */, ); path = Helper; @@ -2567,7 +2562,6 @@ DBE0821A25CD382900FD6BBD /* Register */ = { isa = PBXGroup; children = ( - DB06180B2785B2AF0030EE79 /* Cell */, DBE0821425CD382600FD6BBD /* MastodonRegisterViewController.swift */, 2D939AE725EE1CF80076FA61 /* MastodonRegisterViewController+Avatar.swift */, DBE0822325CD3F1E00FD6BBD /* MastodonRegisterViewModel.swift */, @@ -2687,28 +2681,11 @@ path = Cell; sourceTree = ""; }; - DBFEF05426A576EE006D7ED1 /* View */ = { - isa = PBXGroup; - children = ( - DBBC24A726A52F9000398BB9 /* ComposeToolbarView.swift */, - DBFEF05526A576EE006D7ED1 /* StatusEditorView.swift */, - DBFEF05626A576EE006D7ED1 /* ComposeView.swift */, - DBFEF05726A576EE006D7ED1 /* ComposeViewModel.swift */, - DBFEF05826A576EE006D7ED1 /* ContentWarningEditorView.swift */, - DBFEF05926A576EE006D7ED1 /* StatusAuthorView.swift */, - DBFEF05A26A576EE006D7ED1 /* StatusAttachmentView.swift */, - DBFEF06226A577F2006D7ED1 /* StatusAttachmentViewModel.swift */, - DBFEF06C26A67FB7006D7ED1 /* StatusAttachmentViewModel+UploadState.swift */, - ); - path = View; - sourceTree = ""; - }; DBFEF06126A57721006D7ED1 /* Scene */ = { isa = PBXGroup; children = ( - DBFEF05426A576EE006D7ED1 /* View */, - DBC6462226A1712000B0E31B /* ComposeViewModel.swift */, - DBC6461426A170AB00B0E31B /* ComposeViewController.swift */, + DBC6462226A1712000B0E31B /* ShareViewModel.swift */, + DBC3872329214121001EC0FD /* ShareViewController.swift */, ); path = Scene; sourceTree = ""; @@ -2727,9 +2704,9 @@ DB427DCF25BAA00100D1B89D /* Frameworks */, DB89BA0825C10FD0008580ED /* Embed Frameworks */, DBF8AE1B263293E400C9C23C /* Embed Foundation Extensions */, - DB3D100425BAA71500EAA174 /* ShellScript */, - DB025B8E278D6448002F581E /* ShellScript */, - DB697DD2278F48D5004EF2F7 /* ShellScript */, + DB3D100425BAA71500EAA174 /* Run SwiftGen */, + DB025B8E278D6448002F581E /* Run Sourcery: Core Data */, + DB697DD2278F48D5004EF2F7 /* Run Sourcery */, ); buildRules = ( ); @@ -2907,6 +2884,8 @@ gd, "es-AR", fi, + cs, + sl, ); mainGroup = DB427DC925BAA00100D1B89D; packageReferences = ( @@ -3045,7 +3024,7 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - DB025B8E278D6448002F581E /* ShellScript */ = { + DB025B8E278D6448002F581E /* Run Sourcery: Core Data */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 12; @@ -3055,6 +3034,7 @@ ); inputPaths = ( ); + name = "Run Sourcery: Core Data"; outputFileListPaths = ( ); outputPaths = ( @@ -3063,7 +3043,7 @@ shellPath = /bin/sh; shellScript = "if [[ -f \"${PODS_ROOT}/Sourcery/bin/sourcery\" ]]; then\n \"${PODS_ROOT}/Sourcery/bin/sourcery\" --config ./MastodonSDK/Sources/CoreDataStack\nelse\n echo \"warning: Sourcery is not installed. Run 'pod install --repo-update' to install it.\"\nfi\n"; }; - DB3D100425BAA71500EAA174 /* ShellScript */ = { + DB3D100425BAA71500EAA174 /* Run SwiftGen */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 12; @@ -3073,6 +3053,7 @@ ); inputPaths = ( ); + name = "Run SwiftGen"; outputFileListPaths = ( ); outputPaths = ( @@ -3081,7 +3062,7 @@ shellPath = /bin/sh; shellScript = "if [[ -f \"${PODS_ROOT}/SwiftGen/bin/swiftgen\" ]]; then\n \"${PODS_ROOT}/SwiftGen/bin/swiftgen\" \nelse\n echo \"warning: SwiftGen is not installed. Run 'pod install --repo-update' to install it.\"\nfi\n"; }; - DB697DD2278F48D5004EF2F7 /* ShellScript */ = { + DB697DD2278F48D5004EF2F7 /* Run Sourcery */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 12; @@ -3091,6 +3072,7 @@ ); inputPaths = ( ); + name = "Run Sourcery"; outputFileListPaths = ( ); outputPaths = ( @@ -3198,7 +3180,6 @@ 0F1E2D0B2615C39400C38565 /* DoubleTitleLabelNavigationBarTitleView.swift in Sources */, DBDFF1902805543100557A48 /* DiscoveryPostsViewController.swift in Sources */, DB697DD9278F4CED004EF2F7 /* HomeTimelineViewController+DataSourceProvider.swift in Sources */, - DB9A488A26034D40008B817C /* ComposeViewModel+PublishState.swift in Sources */, DB45FAD725CA6C76005A8AC7 /* UIBarButtonItem.swift in Sources */, 2D8434F525FF465D00EECE90 /* HomeTimelineNavigationBarTitleViewModel.swift in Sources */, DB938F0F2624119800E5B6C1 /* ThreadViewModel+LoadThreadState.swift in Sources */, @@ -3230,6 +3211,7 @@ DB5B54A32833BD1A00DEF8B2 /* UserListViewModel.swift in Sources */, DBF156DF2701B17600EC00B7 /* SidebarAddAccountCollectionViewCell.swift in Sources */, DB0617F1278413D00030EE79 /* PickServerServerSectionTableHeaderView.swift in Sources */, + D87BFC8F291EC26A00FEE264 /* MastodonLoginServerTableViewCell.swift in Sources */, DB0FCB7E27958957006C02E2 /* StatusThreadRootTableViewCell+ViewModel.swift in Sources */, DB789A0B25F9F2950071ACA0 /* ComposeViewController.swift in Sources */, DB938F0926240F3C00E5B6C1 /* RemoteThreadViewModel.swift in Sources */, @@ -3246,7 +3228,6 @@ DBFEEC9D279C12C1004F81DD /* ProfileFieldEditCollectionViewCell.swift in Sources */, DB3E6FEC2806D7F100B035AE /* DiscoveryNewsViewController.swift in Sources */, DB2FF510260B113300ADA9FE /* ComposeStatusPollExpiresOptionCollectionViewCell.swift in Sources */, - DBBC24DC26A54BCB00398BB9 /* MastodonRegex.swift in Sources */, DBCBED1726132DB500B49291 /* UserTimelineViewModel+Diffable.swift in Sources */, 2DE0FACE2615F7AD00CDF649 /* RecommendAccountSection.swift in Sources */, 2DAC9E3E262FC2400062E1A6 /* SuggestionAccountViewModel.swift in Sources */, @@ -3298,10 +3279,10 @@ DB73BF4927140BA300781945 /* UICollectionViewDiffableDataSource.swift in Sources */, DBA5E7AB263BD3F5004598BB /* TimelineTableViewCellContextMenuConfiguration.swift in Sources */, DB73B490261F030A002E9E9F /* SafariActivity.swift in Sources */, + 2AE244482927831100BDBF7C /* UIImage+SFSymbols.swift in Sources */, DB63F7492799126300455B82 /* FollowerListViewController+DataSourceProvider.swift in Sources */, 2D198643261BF09500F0B013 /* SearchResultItem.swift in Sources */, 2DAC9E38262FC2320062E1A6 /* SuggestionAccountViewController.swift in Sources */, - DB66728C25F9F8DC00D60309 /* ComposeViewModel+DataSource.swift in Sources */, DB6180E02639194B0018D199 /* MediaPreviewPagingViewController.swift in Sources */, DBE0822425CD3F1E00FD6BBD /* MastodonRegisterViewModel.swift in Sources */, 5B90C45E262599800002E742 /* SettingsViewModel.swift in Sources */, @@ -3339,7 +3320,6 @@ DB98EB6227B215EB0082E365 /* ReportResultViewController.swift in Sources */, DB6B74F4272FBAE700C70B6E /* FollowerListViewModel+Diffable.swift in Sources */, DB6B74F2272FB67600C70B6E /* FollowerListViewModel.swift in Sources */, - DB44767B260B3B8C00B66B82 /* CustomEmojiPickerInputView.swift in Sources */, 0F20222D261457EE000C64BF /* HashtagTimelineViewModel+State.swift in Sources */, DB0009A626AEE5DC009B9D2D /* Intents.intentdefinition in Sources */, 5B90C462262599800002E742 /* SettingsSectionHeader.swift in Sources */, @@ -3352,10 +3332,11 @@ DB63F769279A5EBB00455B82 /* NotificationTimelineViewModel+Diffable.swift in Sources */, DBFEEC9B279BDDD9004F81DD /* ProfileAboutViewModel+Diffable.swift in Sources */, DBB525562611EDCA002F1F29 /* UserTimelineViewModel.swift in Sources */, + D8916DC029211BE500124085 /* ContentSizedTableView.swift in Sources */, DB0618012785732C0030EE79 /* ServerRulesTableViewCell.swift in Sources */, - DB221B16260C395900AEFE46 /* CustomEmojiPickerInputViewModel.swift in Sources */, DB98EB5C27B10A730082E365 /* ReportSupplementaryViewModel.swift in Sources */, DB0617EF277F12720030EE79 /* NavigationActionView.swift in Sources */, + D87BFC8D291EB81200FEE264 /* MastodonLoginViewModel.swift in Sources */, DB1FD43625F26899004CFCFC /* MastodonPickServerViewModel+LoadIndexedServerState.swift in Sources */, 2D939AE825EE1CF80076FA61 /* MastodonRegisterViewController+Avatar.swift in Sources */, DB1D186C25EF5BA7003F1F23 /* PollTableView.swift in Sources */, @@ -3424,6 +3405,7 @@ DBCC3B8F26148F7B0045B23D /* CachedProfileViewModel.swift in Sources */, DB4F097526A037F500D62E92 /* SearchHistoryViewModel.swift in Sources */, DB3EA8E9281B7A3700598866 /* DiscoveryCommunityViewModel.swift in Sources */, + D87BFC8B291D5C6B00FEE264 /* MastodonLoginView.swift in Sources */, DB6180F826391D660018D199 /* MediaPreviewingViewController.swift in Sources */, DBEFCD71282A12B200C0ABEA /* ReportReasonViewController.swift in Sources */, DB0140CF25C42AEE00F9F3CF /* OSLog.swift in Sources */, @@ -3437,7 +3419,6 @@ 2D35237A26256D920031AF25 /* NotificationSection.swift in Sources */, 2D4AD89C263165B500613EFC /* SuggestionAccountCollectionViewCell.swift in Sources */, DB98EB6927B21A7C0082E365 /* ReportResultActionTableViewCell.swift in Sources */, - DB447691260B406600B66B82 /* CustomEmojiPickerItemCollectionViewCell.swift in Sources */, DB9282B225F3222800823B15 /* PickServerEmptyStateView.swift in Sources */, DB697DDF278F524F004EF2F7 /* DataSourceFacade+Profile.swift in Sources */, DB1FD45025F26FA1004CFCFC /* MastodonPickServerViewModel+Diffable.swift in Sources */, @@ -3461,7 +3442,6 @@ DB63F74D27993F5B00455B82 /* SearchHistoryUserCollectionViewCell.swift in Sources */, DB8AF54425C13647002E6C99 /* SceneCoordinator.swift in Sources */, DB1D84382657B275000346B3 /* SegmentedControlNavigateable.swift in Sources */, - DB447697260B439000B66B82 /* CustomEmojiPickerHeaderCollectionReusableView.swift in Sources */, 0F20220726134DA4000C64BF /* HashtagTimelineViewModel+Diffable.swift in Sources */, DB7A9F932818F33C0016AF98 /* MastodonServerRulesViewController+Debug.swift in Sources */, 2D5A3D2825CF8BC9002347D6 /* HomeTimelineViewModel+Diffable.swift in Sources */, @@ -3487,6 +3467,7 @@ DB697DDB278F4DE3004EF2F7 /* DataSourceProvider+StatusTableViewCellDelegate.swift in Sources */, DB87D4512609CF1E00D12C0D /* ComposeStatusPollOptionAppendEntryCollectionViewCell.swift in Sources */, DBB45B5627B39FC9002DC5A7 /* MediaPreviewVideoViewController.swift in Sources */, + D8A6AB6C291C5136003AB663 /* MastodonLoginViewController.swift in Sources */, DB0FCB8027968F70006C02E2 /* MastodonStatusThreadViewModel.swift in Sources */, DB67D08627312E67006A36CF /* WizardViewController.swift in Sources */, DB6746EB278ED8B0008A6B94 /* PollOptionView+Configuration.swift in Sources */, @@ -3494,6 +3475,7 @@ DBFEEC99279BDCDE004F81DD /* ProfileAboutViewModel.swift in Sources */, 2D198649261C0B8500F0B013 /* SearchResultSection.swift in Sources */, DB4F097B26A039FF00D62E92 /* SearchHistorySection.swift in Sources */, + 2A82294F29262EE000D2A1F7 /* AppContext+NextAccount.swift in Sources */, DBB525302611EBF3002F1F29 /* ProfilePagingViewModel.swift in Sources */, DB9F58EC26EF435000E7BBE9 /* AccountViewController.swift in Sources */, 2D5A3D6225CFD9CB002347D6 /* HomeTimelineViewController+DebugAction.swift in Sources */, @@ -3520,6 +3502,7 @@ 5BB04FF5262F0E6D0043BFF6 /* ReportSection.swift in Sources */, DBEFCD82282A2AB100C0ABEA /* ReportServerRulesView.swift in Sources */, DBA94436265CBB7400C537E1 /* ProfileFieldItem.swift in Sources */, + C24C97032922F30500BAE8CB /* RefreshControl.swift in Sources */, DB023D2A27A0FE5C005AC798 /* DataSourceProvider+NotificationTableViewCellDelegate.swift in Sources */, DB98EB6027B10E150082E365 /* ReportCommentTableViewCell.swift in Sources */, DB0FCB962797E6C2006C02E2 /* SearchResultViewController+DataSourceProvider.swift in Sources */, @@ -3567,9 +3550,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - DBC6462326A1712000B0E31B /* ComposeViewModel.swift in Sources */, + DBC6462326A1712000B0E31B /* ShareViewModel.swift in Sources */, DBB3BA2B26A81D060004F2D4 /* FLAnimatedImageView.swift in Sources */, - DBC6461526A170AB00B0E31B /* ComposeViewController.swift in Sources */, + DBC3872429214121001EC0FD /* ShareViewController.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3643,6 +3626,8 @@ DBC9E3A6282E15190063A4D9 /* gd */, DBC9E3A9282E17DF0063A4D9 /* es-AR */, DB8F40042835EE5E006E7513 /* fi */, + DB96C25D292505FE00F3B85D /* cs */, + DB96C260292506D600F3B85D /* sl */, ); name = Intents.intentdefinition; sourceTree = ""; @@ -3674,6 +3659,8 @@ DBC9E3A7282E15190063A4D9 /* gd */, DBC9E3AA282E17DF0063A4D9 /* es-AR */, DB8F40052835EE5E006E7513 /* fi */, + DB96C25E292505FF00F3B85D /* cs */, + DB96C261292506D700F3B85D /* sl */, ); name = InfoPlist.strings; sourceTree = ""; @@ -3721,6 +3708,8 @@ DBC9E3A8282E15190063A4D9 /* gd */, DBC9E3AB282E17DF0063A4D9 /* es-AR */, DB8F40062835EE5E006E7513 /* fi */, + DB96C25F292505FF00F3B85D /* cs */, + DB96C262292506D700F3B85D /* sl */, ); name = Intents.stringsdict; sourceTree = ""; @@ -3875,7 +3864,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.4.7; + MARKETING_VERSION = 1.4.8; PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -3904,7 +3893,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.4.7; + MARKETING_VERSION = 1.4.8; PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -4077,7 +4066,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.4.7; + MARKETING_VERSION = 1.4.8; PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -4360,7 +4349,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.4.7; + MARKETING_VERSION = 1.4.8; PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist b/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist index 979c8c0e6..b2b5b312a 100644 --- a/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist @@ -117,12 +117,12 @@ NotificationService.xcscheme_^#shared#^_ orderHint - 18 + 17 ShareActionExtension.xcscheme_^#shared#^_ orderHint - 17 + 16 SuppressBuildableAutocreation diff --git a/Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved index 64dc691bb..409b8820d 100644 --- a/Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -90,6 +90,15 @@ "version" : "2.2.5" } }, + { + "identity" : "nextlevelsessionexporter", + "kind" : "remoteSourceControl", + "location" : "https://github.com/NextLevel/NextLevelSessionExporter.git", + "state" : { + "revision" : "b6c0cce1aa37fe1547d694f958fac3c3524b74da", + "version" : "0.4.6" + } + }, { "identity" : "nuke", "kind" : "remoteSourceControl", diff --git a/Mastodon/Activity/SafariActivity.swift b/Mastodon/Activity/SafariActivity.swift index 62a193eaf..e20a9f815 100644 --- a/Mastodon/Activity/SafariActivity.swift +++ b/Mastodon/Activity/SafariActivity.swift @@ -58,7 +58,7 @@ final class SafariActivity: UIActivity { } Task { - await sceneCoordinator?.present(scene: .safari(url: url as URL), from: nil, transition: .safariPresent(animated: true, completion: nil)) + _ = await sceneCoordinator?.present(scene: .safari(url: url as URL), from: nil, transition: .safariPresent(animated: true, completion: nil)) activityDidFinish(true) } } diff --git a/Mastodon/Coordinator/SceneCoordinator.swift b/Mastodon/Coordinator/SceneCoordinator.swift index 8a0825969..c3019010a 100644 --- a/Mastodon/Coordinator/SceneCoordinator.swift +++ b/Mastodon/Coordinator/SceneCoordinator.swift @@ -71,8 +71,8 @@ final public class SceneCoordinator { self.setup() try await Task.sleep(nanoseconds: .second * 1) - // redirect to notification tab - self.switchToTabBar(tab: .notification) + // redirect to notifications tab + self.switchToTabBar(tab: .notifications) // Delay in next run loop DispatchQueue.main.async { [weak self] in @@ -149,6 +149,7 @@ extension SceneCoordinator { case mastodonConfirmEmail(viewModel: MastodonConfirmEmailViewModel) case mastodonResendEmail(viewModel: MastodonResendEmailViewModel) case mastodonWebView(viewModel: WebViewModel) + case mastodonLogin // search case searchDetail(viewModel: SearchDetailViewModel) @@ -199,6 +200,7 @@ extension SceneCoordinator { case .welcome, .mastodonPickServer, .mastodonRegister, + .mastodonLogin, .mastodonServerRules, .mastodonConfirmEmail, .mastodonResendEmail: @@ -339,7 +341,7 @@ extension SceneCoordinator { case .custom(let transitioningDelegate): viewController.modalPresentationStyle = .custom viewController.transitioningDelegate = transitioningDelegate - // viewController.modalPresentationCapturesStatusBarAppearance = true + viewController.modalPresentationCapturesStatusBarAppearance = true (splitViewController ?? presentingViewController)?.present(viewController, animated: true, completion: nil) case .customPush(let animated): @@ -403,6 +405,13 @@ private extension SceneCoordinator { let _viewController = MastodonConfirmEmailViewController() _viewController.viewModel = viewModel viewController = _viewController + case .mastodonLogin: + let loginViewController = MastodonLoginViewController(appContext: appContext, + authenticationViewModel: AuthenticationViewModel(context: appContext, coordinator: self, isAuthenticationExist: false), + sceneCoordinator: self) + loginViewController.delegate = self + + viewController = loginViewController case .mastodonResendEmail(let viewModel): let _viewController = MastodonResendEmailViewController() _viewController.viewModel = viewModel @@ -529,5 +538,16 @@ private extension SceneCoordinator { needs?.context = appContext needs?.coordinator = self } - +} + +//MARK: - MastodonLoginViewControllerDelegate + +extension SceneCoordinator: MastodonLoginViewControllerDelegate { + func backButtonPressed(_ viewController: MastodonLoginViewController) { + viewController.navigationController?.popViewController(animated: true) + } + + func nextButtonPressed(_ viewController: MastodonLoginViewController) { + viewController.login() + } } diff --git a/Mastodon/Diffable/Onboarding/CategoryPickerSection.swift b/Mastodon/Diffable/Onboarding/CategoryPickerSection.swift index b53b378d6..191d4d166 100644 --- a/Mastodon/Diffable/Onboarding/CategoryPickerSection.swift +++ b/Mastodon/Diffable/Onboarding/CategoryPickerSection.swift @@ -21,7 +21,6 @@ extension CategoryPickerSection { UICollectionViewDiffableDataSource(collectionView: collectionView) { [weak dependency] collectionView, indexPath, item -> UICollectionViewCell? in guard let _ = dependency else { return nil } let cell = collectionView.dequeueReusableCell(withReuseIdentifier: String(describing: PickServerCategoryCollectionViewCell.self), for: indexPath) as! PickServerCategoryCollectionViewCell - cell.categoryView.emojiLabel.text = item.emoji cell.categoryView.titleLabel.text = item.title cell.observe(\.isSelected, options: [.initial, .new]) { cell, _ in cell.categoryView.highlightedIndicatorView.alpha = cell.isSelected ? 1 : 0 diff --git a/Mastodon/Diffable/Onboarding/PickServerSection.swift b/Mastodon/Diffable/Onboarding/PickServerSection.swift index 01a31f6f6..ef7ca5972 100644 --- a/Mastodon/Diffable/Onboarding/PickServerSection.swift +++ b/Mastodon/Diffable/Onboarding/PickServerSection.swift @@ -18,16 +18,14 @@ enum PickServerSection: Equatable, Hashable { extension PickServerSection { static func tableViewDiffableDataSource( for tableView: UITableView, - dependency: NeedsDependency, - pickServerCellDelegate: PickServerCellDelegate + dependency: NeedsDependency ) -> UITableViewDiffableDataSource { tableView.register(OnboardingHeadlineTableViewCell.self, forCellReuseIdentifier: String(describing: OnboardingHeadlineTableViewCell.self)) tableView.register(PickServerCell.self, forCellReuseIdentifier: String(describing: PickServerCell.self)) tableView.register(PickServerLoaderTableViewCell.self, forCellReuseIdentifier: String(describing: PickServerLoaderTableViewCell.self)) return UITableViewDiffableDataSource(tableView: tableView) { [ - weak dependency, - weak pickServerCellDelegate + weak dependency ] tableView, indexPath, item -> UITableViewCell? in guard let _ = dependency else { return nil } switch item { @@ -37,7 +35,6 @@ extension PickServerSection { case .server(let server, let attribute): let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: PickServerCell.self), for: indexPath) as! PickServerCell PickServerSection.configure(cell: cell, server: server, attribute: attribute) - cell.delegate = pickServerCellDelegate return cell case .loader(let attribute): let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: PickServerLoaderTableViewCell.self), for: indexPath) as! PickServerLoaderTableViewCell diff --git a/Mastodon/Diffable/Profile/ProfileFieldItem.swift b/Mastodon/Diffable/Profile/ProfileFieldItem.swift index 47848cc01..e33a2f883 100644 --- a/Mastodon/Diffable/Profile/ProfileFieldItem.swift +++ b/Mastodon/Diffable/Profile/ProfileFieldItem.swift @@ -23,6 +23,7 @@ extension ProfileFieldItem { var name: CurrentValueSubject var value: CurrentValueSubject + var verifiedAt: CurrentValueSubject let emojiMeta: MastodonContent.Emojis @@ -30,11 +31,13 @@ extension ProfileFieldItem { id: UUID = UUID(), name: String, value: String, + verifiedAt: Date?, emojiMeta: MastodonContent.Emojis ) { self.id = id self.name = CurrentValueSubject(name) self.value = CurrentValueSubject(value) + self.verifiedAt = CurrentValueSubject(verifiedAt) self.emojiMeta = emojiMeta } @@ -45,6 +48,7 @@ extension ProfileFieldItem { return lhs.id == rhs.id && lhs.name.value == rhs.name.value && lhs.value.value == rhs.value.value + && lhs.verifiedAt.value == rhs.verifiedAt.value && lhs.emojiMeta == rhs.emojiMeta } diff --git a/Mastodon/Diffable/Profile/ProfileFieldSection.swift b/Mastodon/Diffable/Profile/ProfileFieldSection.swift index 19771b5db..6e57e6af9 100644 --- a/Mastodon/Diffable/Profile/ProfileFieldSection.swift +++ b/Mastodon/Diffable/Profile/ProfileFieldSection.swift @@ -8,6 +8,7 @@ import os import UIKit import Combine +import MastodonAsset import MastodonCore import MastodonMeta import MastodonLocalization @@ -48,6 +49,10 @@ extension ProfileFieldSection { do { let mastodonContent = MastodonContent(content: field.value.value, emojis: field.emojiMeta) let metaContent = try MastodonMetaContent.convert(document: mastodonContent) + cell.valueMetaLabel.linkAttributes[.foregroundColor] = Asset.Colors.brand.color + if field.verifiedAt.value != nil { + cell.valueMetaLabel.linkAttributes[.foregroundColor] = Asset.Scene.Profile.About.bioAboutFieldVerifiedLink.color + } cell.valueMetaLabel.configure(content: metaContent) } catch { let content = PlaintextMetaContent(string: field.value.value) @@ -57,7 +62,23 @@ extension ProfileFieldSection { // set background var backgroundConfiguration = UIBackgroundConfiguration.listPlainCell() backgroundConfiguration.backgroundColor = UIColor.secondarySystemBackground + if (field.verifiedAt.value != nil) { + backgroundConfiguration.backgroundColor = Asset.Scene.Profile.About.bioAboutFieldVerifiedBackground.color + } cell.backgroundConfiguration = backgroundConfiguration + + // set checkmark and edit menu label + cell.checkmark.isHidden = true + cell.checkmarkPopoverString = nil + if let verifiedAt = field.verifiedAt.value { + cell.checkmark.isHidden = false + let formatter = DateFormatter() + formatter.dateStyle = .medium + formatter.timeStyle = .short + let dateString = formatter.string(from: verifiedAt) + cell.checkmark.accessibilityLabel = L10n.Scene.Profile.Fields.Verified.long(dateString) + cell.checkmarkPopoverString = L10n.Scene.Profile.Fields.Verified.short(dateString) + } cell.delegate = configuration.profileFieldCollectionViewCellDelegate } diff --git a/Mastodon/Extension/AppContext+NextAccount.swift b/Mastodon/Extension/AppContext+NextAccount.swift new file mode 100644 index 000000000..a8eae1e13 --- /dev/null +++ b/Mastodon/Extension/AppContext+NextAccount.swift @@ -0,0 +1,47 @@ +// +// AppContext+NextAccount.swift +// Mastodon +// +// Created by Marcus Kida on 17.11.22. +// + +import CoreData +import CoreDataStack +import MastodonCore +import MastodonSDK + +extension AppContext { + func nextAccount(in authContext: AuthContext) -> MastodonAuthentication? { + let request = MastodonAuthentication.sortedFetchRequest + guard + let accounts = try? managedObjectContext.fetch(request), + accounts.count > 1 + else { return nil } + + let nextSelectedAccountIndex: Int? = { + for (index, account) in accounts.enumerated() { + guard account == authContext.mastodonAuthenticationBox + .authenticationRecord + .object(in: managedObjectContext) + else { continue } + + let nextAccountIndex = index + 1 + + if accounts.count > nextAccountIndex { + return nextAccountIndex + } else { + return 0 + } + } + + return nil + }() + + guard + let nextSelectedAccountIndex = nextSelectedAccountIndex, + accounts.count > nextSelectedAccountIndex + else { return nil } + + return accounts[nextSelectedAccountIndex] + } +} diff --git a/Mastodon/Extension/String.swift b/Mastodon/Extension/String.swift index bf70c8937..0aa8acb3a 100644 --- a/Mastodon/Extension/String.swift +++ b/Mastodon/Extension/String.swift @@ -15,6 +15,8 @@ extension String { mutating func capitalizeFirstLetter() { self = self.capitalizingFirstLetter() } + + static let empty = "" } extension String { diff --git a/Mastodon/Extension/UIImage+SFSymbols.swift b/Mastodon/Extension/UIImage+SFSymbols.swift new file mode 100644 index 000000000..cf20055ea --- /dev/null +++ b/Mastodon/Extension/UIImage+SFSymbols.swift @@ -0,0 +1,12 @@ +// +// UIImage+SFSymbols.swift +// Mastodon +// +// Created by Marcus Kida on 18.11.22. +// + +import UIKit + +extension UIImage { + static let chevronUpChevronDown = UIImage(systemName: "chevron.up.chevron.down") +} diff --git a/Mastodon/Protocol/Provider/DataSourceFacade+Follow.swift b/Mastodon/Protocol/Provider/DataSourceFacade+Follow.swift index b3812f198..a85de703a 100644 --- a/Mastodon/Protocol/Provider/DataSourceFacade+Follow.swift +++ b/Mastodon/Protocol/Provider/DataSourceFacade+Follow.swift @@ -94,7 +94,7 @@ extension DataSourceFacade { let alertController = await UIAlertController(for: error, title: nil, preferredStyle: .alert) let okAction = await UIAlertAction(title: L10n.Common.Controls.Actions.ok, style: .default) await alertController.addAction(okAction) - await dependency.coordinator.present( + _ = await dependency.coordinator.present( scene: .alertController(alertController: alertController), from: nil, transition: .alertController(animated: true, completion: nil) diff --git a/Mastodon/Protocol/Provider/DataSourceFacade+Hashtag.swift b/Mastodon/Protocol/Provider/DataSourceFacade+Hashtag.swift index 43d6b954b..6135c904a 100644 --- a/Mastodon/Protocol/Provider/DataSourceFacade+Hashtag.swift +++ b/Mastodon/Protocol/Provider/DataSourceFacade+Hashtag.swift @@ -35,7 +35,7 @@ extension DataSourceFacade { hashtag: tag.name ) - provider.coordinator.present( + _ = provider.coordinator.present( scene: .hashtagTimeline(viewModel: hashtagTimelineViewModel), from: provider, transition: .show @@ -61,7 +61,7 @@ extension DataSourceFacade { hashtag: name ) - provider.coordinator.present( + _ = provider.coordinator.present( scene: .hashtagTimeline(viewModel: hashtagTimelineViewModel), from: provider, transition: .show diff --git a/Mastodon/Protocol/Provider/DataSourceFacade+Media.swift b/Mastodon/Protocol/Provider/DataSourceFacade+Media.swift index 3e767f2d3..9dd97f38a 100644 --- a/Mastodon/Protocol/Provider/DataSourceFacade+Media.swift +++ b/Mastodon/Protocol/Provider/DataSourceFacade+Media.swift @@ -24,7 +24,7 @@ extension DataSourceFacade { item: mediaPreviewItem, transitionItem: mediaPreviewTransitionItem ) - dependency.coordinator.present( + _ = dependency.coordinator.present( scene: .mediaPreview(viewModel: mediaPreviewViewModel), from: dependency, transition: .custom(transitioningDelegate: dependency.mediaPreviewTransitionController) diff --git a/Mastodon/Protocol/Provider/DataSourceFacade+Meta.swift b/Mastodon/Protocol/Provider/DataSourceFacade+Meta.swift index 7e0ed37fc..dd3c4903a 100644 --- a/Mastodon/Protocol/Provider/DataSourceFacade+Meta.swift +++ b/Mastodon/Protocol/Provider/DataSourceFacade+Meta.swift @@ -56,13 +56,13 @@ extension DataSourceFacade { url.pathComponents[2] == "statuses" { let statusID = url.pathComponents[3] let threadViewModel = RemoteThreadViewModel(context: provider.context, authContext: provider.authContext, statusID: statusID) - await provider.coordinator.present(scene: .thread(viewModel: threadViewModel), from: nil, transition: .show) + _ = await provider.coordinator.present(scene: .thread(viewModel: threadViewModel), from: nil, transition: .show) } else { - await provider.coordinator.present(scene: .safari(url: url), from: nil, transition: .safariPresent(animated: true, completion: nil)) + _ = await provider.coordinator.present(scene: .safari(url: url), from: nil, transition: .safariPresent(animated: true, completion: nil)) } case .hashtag(_, let hashtag, _): let hashtagTimelineViewModel = HashtagTimelineViewModel(context: provider.context, authContext: provider.authContext, hashtag: hashtag) - await provider.coordinator.present(scene: .hashtagTimeline(viewModel: hashtagTimelineViewModel), from: provider, transition: .show) + _ = await provider.coordinator.present(scene: .hashtagTimeline(viewModel: hashtagTimelineViewModel), from: provider, transition: .show) case .mention(_, let mention, let userInfo): await coordinateToProfileScene( provider: provider, diff --git a/Mastodon/Protocol/Provider/DataSourceFacade+Profile.swift b/Mastodon/Protocol/Provider/DataSourceFacade+Profile.swift index ef01b8394..3c0509d2c 100644 --- a/Mastodon/Protocol/Provider/DataSourceFacade+Profile.swift +++ b/Mastodon/Protocol/Provider/DataSourceFacade+Profile.swift @@ -47,7 +47,7 @@ extension DataSourceFacade { mastodonUser: user ) - provider.coordinator.present( + _ = provider.coordinator.present( scene: .profile(viewModel: profileViewModel), from: provider, transition: .show @@ -75,7 +75,7 @@ extension DataSourceFacade { } guard let mention = mentions?.first(where: { $0.username == mention }) else { - await provider.coordinator.present( + _ = await provider.coordinator.present( scene: .safari(url: url), from: provider, transition: .safariPresent(animated: true, completion: nil) @@ -102,7 +102,7 @@ extension DataSourceFacade { } }() - await provider.coordinator.present( + _ = await provider.coordinator.present( scene: .profile(viewModel: profileViewModel), from: provider, transition: .show diff --git a/Mastodon/Protocol/Provider/DataSourceFacade+Status.swift b/Mastodon/Protocol/Provider/DataSourceFacade+Status.swift index 332ed75e4..ac9da6e81 100644 --- a/Mastodon/Protocol/Provider/DataSourceFacade+Status.swift +++ b/Mastodon/Protocol/Provider/DataSourceFacade+Status.swift @@ -43,7 +43,7 @@ extension DataSourceFacade { dependency: provider, status: status ) - provider.coordinator.present( + _ = provider.coordinator.present( scene: .activityViewController( activityViewController: activityViewController, sourceView: button, @@ -84,7 +84,7 @@ extension DataSourceFacade { self.url = url self.metadata = LPLinkMetadata() metadata.url = url - metadata.title = "\(status.author.displayName) (@\(status.author.username)@\(status.author.domain))" + metadata.title = "\(status.author.displayName) (@\(status.author.acctWithDomain))" metadata.iconProvider = NSItemProvider(object: IconProvider(url: status.author.avatarImageURLWithFallback(domain: status.author.domain))) } @@ -358,7 +358,8 @@ extension DataSourceFacade { dependency: dependency, status: status ) - await dependency.coordinator.present( + + _ = dependency.coordinator.present( scene: .activityViewController( activityViewController: activityViewController, sourceView: menuContext.button, diff --git a/Mastodon/Protocol/Provider/DataSourceProvider+StatusTableViewCellDelegate.swift b/Mastodon/Protocol/Provider/DataSourceProvider+StatusTableViewCellDelegate.swift index 82c25d040..c157b7086 100644 --- a/Mastodon/Protocol/Provider/DataSourceProvider+StatusTableViewCellDelegate.swift +++ b/Mastodon/Protocol/Provider/DataSourceProvider+StatusTableViewCellDelegate.swift @@ -487,7 +487,7 @@ extension StatusTableViewCellDelegate where Self: DataSourceProvider & AuthConte authContext: authContext, kind: .rebloggedBy(status: status) ) - await coordinator.present( + _ = await coordinator.present( scene: .rebloggedBy(viewModel: userListViewModel), from: self, transition: .show @@ -511,7 +511,7 @@ extension StatusTableViewCellDelegate where Self: DataSourceProvider & AuthConte authContext: authContext, kind: .favoritedBy(status: status) ) - await coordinator.present( + _ = await coordinator.present( scene: .favoritedBy(viewModel: userListViewModel), from: self, transition: .show diff --git a/Mastodon/Protocol/Provider/DataSourceProvider+UITableViewDelegate.swift b/Mastodon/Protocol/Provider/DataSourceProvider+UITableViewDelegate.swift index 3a71e5346..6ced42601 100644 --- a/Mastodon/Protocol/Provider/DataSourceProvider+UITableViewDelegate.swift +++ b/Mastodon/Protocol/Provider/DataSourceProvider+UITableViewDelegate.swift @@ -143,7 +143,7 @@ extension UITableViewDelegate where Self: DataSourceProvider & MediaPreviewableV title: L10n.Common.Alerts.SavePhotoFailure.title, message: L10n.Common.Alerts.SavePhotoFailure.message ) - self.coordinator.present( + _ = self.coordinator.present( scene: .alertController(alertController: alertController), from: self, transition: .alertController(animated: true, completion: nil) diff --git a/Mastodon/Resources/Base.lproj/infoPlist.strings b/Mastodon/Resources/Base.lproj/infoPlist.strings new file mode 100644 index 000000000..710865573 --- /dev/null +++ b/Mastodon/Resources/Base.lproj/infoPlist.strings @@ -0,0 +1,4 @@ +"NSCameraUsageDescription" = "Used to take photo for post status"; +"NSPhotoLibraryAddUsageDescription" = "Used to save photo into the Photo Library"; +"NewPostShortcutItemTitle" = "New Post"; +"SearchShortcutItemTitle" = "Search"; \ No newline at end of file diff --git a/Mastodon/Resources/ar.lproj/InfoPlist.strings b/Mastodon/Resources/ar.lproj/InfoPlist.strings index c3b26f14a..ecb81ddd4 100644 --- a/Mastodon/Resources/ar.lproj/InfoPlist.strings +++ b/Mastodon/Resources/ar.lproj/InfoPlist.strings @@ -1,4 +1,4 @@ "NSCameraUsageDescription" = "يُستخدم لالتقاط الصورة عِندَ نشر الحالات"; "NSPhotoLibraryAddUsageDescription" = "يُستخدم لحِفظ الصورة في مكتبة الصور"; -"NewPostShortcutItemTitle" = "منشور جديد"; +"NewPostShortcutItemTitle" = "مَنشُورٌ جَديد"; "SearchShortcutItemTitle" = "البحث"; \ No newline at end of file diff --git a/Mastodon/Resources/ckb.lproj/InfoPlist.strings b/Mastodon/Resources/ckb.lproj/InfoPlist.strings index 710865573..8c4946d2d 100644 --- a/Mastodon/Resources/ckb.lproj/InfoPlist.strings +++ b/Mastodon/Resources/ckb.lproj/InfoPlist.strings @@ -1,4 +1,4 @@ -"NSCameraUsageDescription" = "Used to take photo for post status"; -"NSPhotoLibraryAddUsageDescription" = "Used to save photo into the Photo Library"; -"NewPostShortcutItemTitle" = "New Post"; -"SearchShortcutItemTitle" = "Search"; \ No newline at end of file +"NSCameraUsageDescription" = "بەکار دێت بۆ گرتنی وێنەیەک بۆ پۆستەکە"; +"NSPhotoLibraryAddUsageDescription" = "بەکار دێت بۆ هەڵگرتنی وێنە"; +"NewPostShortcutItemTitle" = "پۆستی نوێ"; +"SearchShortcutItemTitle" = "بگەڕێ"; \ No newline at end of file diff --git a/Mastodon/Resources/cs.lproj/InfoPlist.strings b/Mastodon/Resources/cs.lproj/InfoPlist.strings new file mode 100644 index 000000000..6989cfcb1 --- /dev/null +++ b/Mastodon/Resources/cs.lproj/InfoPlist.strings @@ -0,0 +1,4 @@ +"NSCameraUsageDescription" = "Slouží k pořízení fotografie pro příspěvek"; +"NSPhotoLibraryAddUsageDescription" = "Slouží k uložení fotografie do knihovny fotografií"; +"NewPostShortcutItemTitle" = "Nový příspěvek"; +"SearchShortcutItemTitle" = "Hledat"; \ No newline at end of file diff --git a/Mastodon/Resources/de.lproj/infoPlist.strings b/Mastodon/Resources/de.lproj/infoPlist.strings index 9c5feae53..9c8438653 100644 --- a/Mastodon/Resources/de.lproj/infoPlist.strings +++ b/Mastodon/Resources/de.lproj/infoPlist.strings @@ -1,4 +1,4 @@ -"NSCameraUsageDescription" = "Verwendet um Fotos für neue Beiträge aufzunehmen"; -"NSPhotoLibraryAddUsageDescription" = "Verwendet um Fotos zu speichern"; +"NSCameraUsageDescription" = "Wird verwendet, um Fotos für neue Beiträge aufzunehmen"; +"NSPhotoLibraryAddUsageDescription" = "Wird verwendet, um Foto in der Foto-Mediathek zu speichern"; "NewPostShortcutItemTitle" = "Neuer Beitrag"; -"SearchShortcutItemTitle" = "Suche"; \ No newline at end of file +"SearchShortcutItemTitle" = "Suchen"; \ No newline at end of file diff --git a/Mastodon/Resources/eu.lproj/InfoPlist.strings b/Mastodon/Resources/eu.lproj/InfoPlist.strings index 710865573..e9d36a901 100644 --- a/Mastodon/Resources/eu.lproj/InfoPlist.strings +++ b/Mastodon/Resources/eu.lproj/InfoPlist.strings @@ -1,4 +1,4 @@ -"NSCameraUsageDescription" = "Used to take photo for post status"; -"NSPhotoLibraryAddUsageDescription" = "Used to save photo into the Photo Library"; -"NewPostShortcutItemTitle" = "New Post"; -"SearchShortcutItemTitle" = "Search"; \ No newline at end of file +"NSCameraUsageDescription" = "Bidalketetarako argazkiak ateratzeko erabiltzen da"; +"NSPhotoLibraryAddUsageDescription" = "Argazkiak Argazki-liburutegian gordetzeko erabiltzen da"; +"NewPostShortcutItemTitle" = "Bidalketa berria"; +"SearchShortcutItemTitle" = "Bilatu"; \ No newline at end of file diff --git a/Mastodon/Resources/fi.lproj/InfoPlist.strings b/Mastodon/Resources/fi.lproj/InfoPlist.strings index 710865573..040b25d69 100644 --- a/Mastodon/Resources/fi.lproj/InfoPlist.strings +++ b/Mastodon/Resources/fi.lproj/InfoPlist.strings @@ -1,4 +1,4 @@ -"NSCameraUsageDescription" = "Used to take photo for post status"; -"NSPhotoLibraryAddUsageDescription" = "Used to save photo into the Photo Library"; -"NewPostShortcutItemTitle" = "New Post"; -"SearchShortcutItemTitle" = "Search"; \ No newline at end of file +"NSCameraUsageDescription" = "Käytetään kuvan ottamiseen julkaisua varten"; +"NSPhotoLibraryAddUsageDescription" = "Käytetään kuvan tallentamiseen kuvakirjastoon"; +"NewPostShortcutItemTitle" = "Uusi julkaisu"; +"SearchShortcutItemTitle" = "Haku"; \ No newline at end of file diff --git a/Mastodon/Resources/gd.lproj/InfoPlist.strings b/Mastodon/Resources/gd.lproj/InfoPlist.strings index 710865573..ccb39b44e 100644 --- a/Mastodon/Resources/gd.lproj/InfoPlist.strings +++ b/Mastodon/Resources/gd.lproj/InfoPlist.strings @@ -1,4 +1,4 @@ -"NSCameraUsageDescription" = "Used to take photo for post status"; -"NSPhotoLibraryAddUsageDescription" = "Used to save photo into the Photo Library"; -"NewPostShortcutItemTitle" = "New Post"; -"SearchShortcutItemTitle" = "Search"; \ No newline at end of file +"NSCameraUsageDescription" = "’Ga chleachdadh airson dealbh a thogail do staid puist"; +"NSPhotoLibraryAddUsageDescription" = "’Ga chleachdadh airson dealbh a shàbhaladh ann an tasg-lann nan dealbhan"; +"NewPostShortcutItemTitle" = "Post ùr"; +"SearchShortcutItemTitle" = "Lorg"; \ No newline at end of file diff --git a/Mastodon/Resources/gl.lproj/InfoPlist.strings b/Mastodon/Resources/gl.lproj/InfoPlist.strings index 710865573..3d6df3f0f 100644 --- a/Mastodon/Resources/gl.lproj/InfoPlist.strings +++ b/Mastodon/Resources/gl.lproj/InfoPlist.strings @@ -1,4 +1,4 @@ -"NSCameraUsageDescription" = "Used to take photo for post status"; -"NSPhotoLibraryAddUsageDescription" = "Used to save photo into the Photo Library"; -"NewPostShortcutItemTitle" = "New Post"; -"SearchShortcutItemTitle" = "Search"; \ No newline at end of file +"NSCameraUsageDescription" = "Utilizado para facer foto e publicar estado"; +"NSPhotoLibraryAddUsageDescription" = "Utilizado para gardar a foto na Biblioteca"; +"NewPostShortcutItemTitle" = "Nova publicación"; +"SearchShortcutItemTitle" = "Buscar"; \ No newline at end of file diff --git a/Mastodon/Resources/it.lproj/InfoPlist.strings b/Mastodon/Resources/it.lproj/InfoPlist.strings index 710865573..0da468639 100644 --- a/Mastodon/Resources/it.lproj/InfoPlist.strings +++ b/Mastodon/Resources/it.lproj/InfoPlist.strings @@ -1,4 +1,4 @@ -"NSCameraUsageDescription" = "Used to take photo for post status"; -"NSPhotoLibraryAddUsageDescription" = "Used to save photo into the Photo Library"; -"NewPostShortcutItemTitle" = "New Post"; -"SearchShortcutItemTitle" = "Search"; \ No newline at end of file +"NSCameraUsageDescription" = "Usato per scattare foto per lo stato del post"; +"NSPhotoLibraryAddUsageDescription" = "Utilizzato per salvare la foto nella galleria immagini"; +"NewPostShortcutItemTitle" = "Nuovo post"; +"SearchShortcutItemTitle" = "Cerca"; \ No newline at end of file diff --git a/Mastodon/Resources/kab.lproj/InfoPlist.strings b/Mastodon/Resources/kab.lproj/InfoPlist.strings index 710865573..42adc4cfc 100644 --- a/Mastodon/Resources/kab.lproj/InfoPlist.strings +++ b/Mastodon/Resources/kab.lproj/InfoPlist.strings @@ -1,4 +1,4 @@ -"NSCameraUsageDescription" = "Used to take photo for post status"; -"NSPhotoLibraryAddUsageDescription" = "Used to save photo into the Photo Library"; -"NewPostShortcutItemTitle" = "New Post"; -"SearchShortcutItemTitle" = "Search"; \ No newline at end of file +"NSCameraUsageDescription" = "Yettwaseqdac i tuṭṭfa n tewlafin deg usuffeɣ n waddaden"; +"NSPhotoLibraryAddUsageDescription" = "Yettwaseqdac i usekles n tewlafin deg temkarḍit n tewlafin"; +"NewPostShortcutItemTitle" = "Tasuffeɣt tamaynut"; +"SearchShortcutItemTitle" = "Nadi"; \ No newline at end of file diff --git a/Mastodon/Resources/ku.lproj/InfoPlist.strings b/Mastodon/Resources/ku.lproj/InfoPlist.strings index 710865573..669ecfacf 100644 --- a/Mastodon/Resources/ku.lproj/InfoPlist.strings +++ b/Mastodon/Resources/ku.lproj/InfoPlist.strings @@ -1,4 +1,4 @@ -"NSCameraUsageDescription" = "Used to take photo for post status"; -"NSPhotoLibraryAddUsageDescription" = "Used to save photo into the Photo Library"; -"NewPostShortcutItemTitle" = "New Post"; -"SearchShortcutItemTitle" = "Search"; \ No newline at end of file +"NSCameraUsageDescription" = "Bo kişandina wêneyê ji bo rewşa şandiyan tê bikaranîn"; +"NSPhotoLibraryAddUsageDescription" = "Ji bo tomarkirina wêneyê di pirtûkxaneya wêneyan de tê bikaranîn"; +"NewPostShortcutItemTitle" = "Şandiya nû"; +"SearchShortcutItemTitle" = "Bigere"; \ No newline at end of file diff --git a/Mastodon/Resources/nl.lproj/InfoPlist.strings b/Mastodon/Resources/nl.lproj/InfoPlist.strings index a45991068..36b6e9802 100644 --- a/Mastodon/Resources/nl.lproj/InfoPlist.strings +++ b/Mastodon/Resources/nl.lproj/InfoPlist.strings @@ -1,4 +1,4 @@ "NSCameraUsageDescription" = "Gebruikt om foto's te nemen voor je berichten"; "NSPhotoLibraryAddUsageDescription" = "Gebruikt om foto's op te slaan in de fotobibliotheek"; "NewPostShortcutItemTitle" = "Nieuw Bericht"; -"SearchShortcutItemTitle" = "Zoeken"; \ No newline at end of file +"SearchShortcutItemTitle" = "Zoek"; \ No newline at end of file diff --git a/Mastodon/Resources/sl.lproj/InfoPlist.strings b/Mastodon/Resources/sl.lproj/InfoPlist.strings new file mode 100644 index 000000000..57c8319f5 --- /dev/null +++ b/Mastodon/Resources/sl.lproj/InfoPlist.strings @@ -0,0 +1,4 @@ +"NSCameraUsageDescription" = "Uporabljeno za zajem fotografij za stanje objave"; +"NSPhotoLibraryAddUsageDescription" = "Uporabljeno za shranjevanje fotografije v knjižnico fotografij"; +"NewPostShortcutItemTitle" = "Nova objava"; +"SearchShortcutItemTitle" = "Iskanje"; \ No newline at end of file diff --git a/Mastodon/Resources/sv.lproj/InfoPlist.strings b/Mastodon/Resources/sv.lproj/InfoPlist.strings index 710865573..e0facc1d2 100644 --- a/Mastodon/Resources/sv.lproj/InfoPlist.strings +++ b/Mastodon/Resources/sv.lproj/InfoPlist.strings @@ -1,4 +1,4 @@ -"NSCameraUsageDescription" = "Used to take photo for post status"; -"NSPhotoLibraryAddUsageDescription" = "Used to save photo into the Photo Library"; -"NewPostShortcutItemTitle" = "New Post"; -"SearchShortcutItemTitle" = "Search"; \ No newline at end of file +"NSCameraUsageDescription" = "Används för att ta foto till inlägg"; +"NSPhotoLibraryAddUsageDescription" = "Används för att spara foto till bildbiblioteket"; +"NewPostShortcutItemTitle" = "Nytt inlägg"; +"SearchShortcutItemTitle" = "Sök"; \ No newline at end of file diff --git a/Mastodon/Resources/tr.lproj/InfoPlist.strings b/Mastodon/Resources/tr.lproj/InfoPlist.strings index 710865573..1c4e05659 100644 --- a/Mastodon/Resources/tr.lproj/InfoPlist.strings +++ b/Mastodon/Resources/tr.lproj/InfoPlist.strings @@ -1,4 +1,4 @@ -"NSCameraUsageDescription" = "Used to take photo for post status"; -"NSPhotoLibraryAddUsageDescription" = "Used to save photo into the Photo Library"; -"NewPostShortcutItemTitle" = "New Post"; -"SearchShortcutItemTitle" = "Search"; \ No newline at end of file +"NSCameraUsageDescription" = "Fotoğraf çekerek durum paylaşmak için kullanılır"; +"NSPhotoLibraryAddUsageDescription" = "Fotoğraf Albümü'ne fotoğraf kaydetmek için kullanılır"; +"NewPostShortcutItemTitle" = "Yeni Gönderi"; +"SearchShortcutItemTitle" = "Arama"; \ No newline at end of file diff --git a/Mastodon/Resources/vi.lproj/InfoPlist.strings b/Mastodon/Resources/vi.lproj/InfoPlist.strings index 710865573..5dd27b7bc 100644 --- a/Mastodon/Resources/vi.lproj/InfoPlist.strings +++ b/Mastodon/Resources/vi.lproj/InfoPlist.strings @@ -1,4 +1,4 @@ -"NSCameraUsageDescription" = "Used to take photo for post status"; -"NSPhotoLibraryAddUsageDescription" = "Used to save photo into the Photo Library"; -"NewPostShortcutItemTitle" = "New Post"; -"SearchShortcutItemTitle" = "Search"; \ No newline at end of file +"NSCameraUsageDescription" = "Được sử dụng để chụp ảnh cho tút"; +"NSPhotoLibraryAddUsageDescription" = "Được sử dụng để lưu ảnh vào Thư viện ảnh"; +"NewPostShortcutItemTitle" = "Viết tút"; +"SearchShortcutItemTitle" = "Tìm kiếm"; \ No newline at end of file diff --git a/Mastodon/Resources/zh-Hant.lproj/InfoPlist.strings b/Mastodon/Resources/zh-Hant.lproj/InfoPlist.strings index 710865573..737d2f857 100644 --- a/Mastodon/Resources/zh-Hant.lproj/InfoPlist.strings +++ b/Mastodon/Resources/zh-Hant.lproj/InfoPlist.strings @@ -1,4 +1,4 @@ -"NSCameraUsageDescription" = "Used to take photo for post status"; -"NSPhotoLibraryAddUsageDescription" = "Used to save photo into the Photo Library"; -"NewPostShortcutItemTitle" = "New Post"; -"SearchShortcutItemTitle" = "Search"; \ No newline at end of file +"NSCameraUsageDescription" = "用來拍照發嘟文"; +"NSPhotoLibraryAddUsageDescription" = "用來儲存照片到圖片庫"; +"NewPostShortcutItemTitle" = "新增嘟文"; +"SearchShortcutItemTitle" = "搜尋"; \ No newline at end of file diff --git a/Mastodon/Scene/Account/AccountListViewModel.swift b/Mastodon/Scene/Account/AccountListViewModel.swift index e0aaf97fc..2b8c75b8d 100644 --- a/Mastodon/Scene/Account/AccountListViewModel.swift +++ b/Mastodon/Scene/Account/AccountListViewModel.swift @@ -52,7 +52,7 @@ final class AccountListViewModel: NSObject { mastodonAuthenticationFetchedResultsController.delegate = self do { try mastodonAuthenticationFetchedResultsController.performFetch() - authentications = mastodonAuthenticationFetchedResultsController.fetchedObjects?.compactMap { $0.asRecrod } ?? [] + authentications = mastodonAuthenticationFetchedResultsController.fetchedObjects?.compactMap { $0.asRecord } ?? [] } catch { assertionFailure(error.localizedDescription) } @@ -166,7 +166,7 @@ extension AccountListViewModel { cell.badgeButton.accessibilityLabel ] .compactMap { $0 } - .joined(separator: " ") + .joined(separator: ", ") } } @@ -183,7 +183,7 @@ extension AccountListViewModel: NSFetchedResultsControllerDelegate { return } - authentications = mastodonAuthenticationFetchedResultsController.fetchedObjects?.compactMap { $0.asRecrod } ?? [] + authentications = mastodonAuthenticationFetchedResultsController.fetchedObjects?.compactMap { $0.asRecord } ?? [] } } diff --git a/Mastodon/Scene/Account/AccountViewController.swift b/Mastodon/Scene/Account/AccountViewController.swift index e25c75b01..7a0e529cc 100644 --- a/Mastodon/Scene/Account/AccountViewController.swift +++ b/Mastodon/Scene/Account/AccountViewController.swift @@ -34,7 +34,9 @@ final class AccountListViewController: UIViewController, NeedsDependency { return barButtonItem }() - let dragIndicatorView = DragIndicatorView() + lazy var dragIndicatorView = DragIndicatorView { [weak self] in + self?.dismiss(animated: true, completion: nil) + } var hasLoaded = false private(set) lazy var tableView: UITableView = { @@ -130,14 +132,6 @@ extension AccountListViewController { self.panModalTransition(to: .shortForm) } .store(in: &disposeBag) - - if UIAccessibility.isVoiceOverRunning { - let dragIndicatorTapGestureRecognizer = UITapGestureRecognizer.singleTapGestureRecognizer - dragIndicatorView.addGestureRecognizer(dragIndicatorTapGestureRecognizer) - dragIndicatorTapGestureRecognizer.addTarget(self, action: #selector(AccountListViewController.dragIndicatorTapGestureRecognizerHandler(_:))) - dragIndicatorView.isAccessibilityElement = true - dragIndicatorView.accessibilityLabel = L10n.Scene.AccountList.dismissAccountSwitcher - } } private func setupBackgroundColor(theme: Theme) { @@ -160,10 +154,11 @@ extension AccountListViewController { logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public)") _ = coordinator.present(scene: .welcome, from: self, transition: .modal(animated: true, completion: nil)) } - - @objc private func dragIndicatorTapGestureRecognizerHandler(_ sender: UITapGestureRecognizer) { + + override func accessibilityPerformEscape() -> Bool { logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public)") dismiss(animated: true, completion: nil) + return true } } diff --git a/Mastodon/Scene/Account/Cell/AccountListTableViewCell.swift b/Mastodon/Scene/Account/Cell/AccountListTableViewCell.swift index 66f49efe8..cd214f2c7 100644 --- a/Mastodon/Scene/Account/Cell/AccountListTableViewCell.swift +++ b/Mastodon/Scene/Account/Cell/AccountListTableViewCell.swift @@ -69,6 +69,7 @@ extension AccountListTableViewCell { ]) avatarButton.setContentHuggingPriority(.defaultLow, for: .horizontal) avatarButton.setContentHuggingPriority(.defaultLow, for: .vertical) + avatarButton.isAccessibilityElement = false let labelContainerStackView = UIStackView() labelContainerStackView.axis = .vertical @@ -124,6 +125,8 @@ extension AccountListTableViewCell { badgeButton.setBadge(number: 0) checkmarkImageView.isHidden = true + + accessibilityTraits.insert(.button) } } diff --git a/Mastodon/Scene/Account/Cell/AddAccountTableViewCell.swift b/Mastodon/Scene/Account/Cell/AddAccountTableViewCell.swift index 3ff3066a2..bc47aef43 100644 --- a/Mastodon/Scene/Account/Cell/AddAccountTableViewCell.swift +++ b/Mastodon/Scene/Account/Cell/AddAccountTableViewCell.swift @@ -108,6 +108,8 @@ extension AddAccountTableViewCell { separatorLine.bottomAnchor.constraint(equalTo: contentView.bottomAnchor), separatorLine.heightAnchor.constraint(equalToConstant: UIView.separatorLineHeight(of: contentView)), ]) + + accessibilityTraits.insert(.button) } } diff --git a/Mastodon/Scene/Account/View/DragIndicatorView.swift b/Mastodon/Scene/Account/View/DragIndicatorView.swift index 9e0ab77d5..a04d9cd8c 100644 --- a/Mastodon/Scene/Account/View/DragIndicatorView.swift +++ b/Mastodon/Scene/Account/View/DragIndicatorView.swift @@ -15,17 +15,17 @@ final class DragIndicatorView: UIView { let barView = UIView() let separatorLine = UIView.separatorLine + let onDismiss: () -> Void - override init(frame: CGRect) { - super.init(frame: frame) + init(onDismiss: @escaping () -> Void) { + self.onDismiss = onDismiss + super.init(frame: .zero) _init() } required init?(coder: NSCoder) { - super.init(coder: coder) - _init() + fatalError("init(coder:) is not supported") } - } extension DragIndicatorView { @@ -52,6 +52,14 @@ extension DragIndicatorView { separatorLine.bottomAnchor.constraint(equalTo: bottomAnchor), separatorLine.heightAnchor.constraint(equalToConstant: UIView.separatorLineHeight(of: self)), ]) + + isAccessibilityElement = true + accessibilityTraits = .button + accessibilityLabel = L10n.Scene.AccountList.dismissAccountSwitcher } + override func accessibilityActivate() -> Bool { + self.onDismiss() + return true + } } diff --git a/Mastodon/Scene/Compose/ComposeViewController.swift b/Mastodon/Scene/Compose/ComposeViewController.swift index bf9145d6c..ca33487ab 100644 --- a/Mastodon/Scene/Compose/ComposeViewController.swift +++ b/Mastodon/Scene/Compose/ComposeViewController.swift @@ -44,18 +44,6 @@ final class ComposeViewController: UIViewController, NeedsDependency { }() private(set) lazy var cancelBarButtonItem = UIBarButtonItem(title: L10n.Common.Controls.Actions.cancel, style: .plain, target: self, action: #selector(ComposeViewController.cancelBarButtonItemPressed(_:))) - let characterCountLabel: UILabel = { - let label = UILabel() - label.font = .systemFont(ofSize: 15, weight: .regular) - label.text = "500" - label.textColor = Asset.Colors.Label.secondary.color - label.accessibilityLabel = L10n.A11y.Plural.Count.inputLimitRemains(500) - return label - }() - private(set) lazy var characterCountBarButtonItem: UIBarButtonItem = { - let barButtonItem = UIBarButtonItem(customView: characterCountLabel) - return barButtonItem - }() let publishButton: UIButton = { let button = RoundedEdgesButton(type: .custom) @@ -70,12 +58,7 @@ final class ComposeViewController: UIViewController, NeedsDependency { let shadowBackgroundContainer = ShadowBackgroundContainer() publishButton.translatesAutoresizingMaskIntoConstraints = false shadowBackgroundContainer.addSubview(publishButton) - NSLayoutConstraint.activate([ - publishButton.topAnchor.constraint(equalTo: shadowBackgroundContainer.topAnchor), - publishButton.leadingAnchor.constraint(equalTo: shadowBackgroundContainer.leadingAnchor), - publishButton.trailingAnchor.constraint(equalTo: shadowBackgroundContainer.trailingAnchor), - publishButton.bottomAnchor.constraint(equalTo: shadowBackgroundContainer.bottomAnchor), - ]) + publishButton.pinToParent() let barButtonItem = UIBarButtonItem(customView: shadowBackgroundContainer) return barButtonItem }() @@ -86,54 +69,13 @@ final class ComposeViewController: UIViewController, NeedsDependency { publishButton.setBackgroundImage(.placeholder(color: Asset.Colors.Button.disabled.color), for: .disabled) publishButton.setTitleColor(Asset.Colors.Label.primaryReverse.color, for: .normal) } - -// var systemKeyboardHeight: CGFloat = .zero { -// didSet { -// // note: some system AutoLayout warning here -// let height = max(300, systemKeyboardHeight) -// customEmojiPickerInputView.frame.size.height = height -// } -// } -// -// // CustomEmojiPickerView -// let customEmojiPickerInputView: CustomEmojiPickerInputView = { -// let view = CustomEmojiPickerInputView(frame: CGRect(x: 0, y: 0, width: 0, height: 300), inputViewStyle: .keyboard) -// return view -// }() -// -// let composeToolbarView = ComposeToolbarView() -// var composeToolbarViewBottomLayoutConstraint: NSLayoutConstraint! -// let composeToolbarBackgroundView = UIView() -// -// -// private(set) lazy var autoCompleteViewController: AutoCompleteViewController = { -// let viewController = AutoCompleteViewController() -// viewController.viewModel = AutoCompleteViewModel(context: context, authContext: viewModel.authContext) -// viewController.delegate = self -// viewController.viewModel.customEmojiViewModel.value = viewModel.customEmojiViewModel -// return viewController -// }() - + deinit { os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) } } -extension ComposeViewController { - private static func createLayout() -> UICollectionViewLayout { - let itemSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1.0), heightDimension: .estimated(44)) - let item = NSCollectionLayoutItem(layoutSize: itemSize) - let groupSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1.0), heightDimension: .estimated(44)) - let group = NSCollectionLayoutGroup.vertical(layoutSize: groupSize, subitems: [item]) - let section = NSCollectionLayoutSection(group: group) - section.contentInsetsReference = .readableContent - // section.interGroupSpacing = 10 - // section.contentInsets = NSDirectionalEdgeInsets(top: 10, leading: 10, bottom: 10, trailing: 10) - return UICollectionViewCompositionalLayout(section: section) - } -} - extension ComposeViewController { override func viewDidLoad() { @@ -146,10 +88,7 @@ extension ComposeViewController { .sink { [weak self] _ in guard let self = self else { return } guard self.traitCollection.userInterfaceIdiom == .pad else { return } - var items = [self.publishBarButtonItem] - if self.traitCollection.horizontalSizeClass == .regular { - items.append(self.characterCountBarButtonItem) - } + let items = [self.publishBarButtonItem] self.navigationItem.rightBarButtonItems = items } .store(in: &disposeBag) @@ -158,466 +97,74 @@ extension ComposeViewController { addChild(composeContentViewController) composeContentViewController.view.translatesAutoresizingMaskIntoConstraints = false view.addSubview(composeContentViewController.view) - NSLayoutConstraint.activate([ - composeContentViewController.view.topAnchor.constraint(equalTo: view.topAnchor), - composeContentViewController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor), - composeContentViewController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor), - composeContentViewController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + composeContentViewController.view.pinToParent() composeContentViewController.didMove(toParent: self) -// configureNavigationBarTitleStyle() -// viewModel.traitCollectionDidChangePublisher -// .receive(on: DispatchQueue.main) -// .sink { [weak self] _ in -// guard let self = self else { return } -// self.configureNavigationBarTitleStyle() -// } -// .store(in: &disposeBag) -// -// viewModel.$title -// .receive(on: DispatchQueue.main) -// .sink { [weak self] title in -// guard let self = self else { return } -// self.title = title -// } -// .store(in: &disposeBag) -// -// composeToolbarView.translatesAutoresizingMaskIntoConstraints = false -// view.addSubview(composeToolbarView) -// composeToolbarViewBottomLayoutConstraint = view.bottomAnchor.constraint(equalTo: composeToolbarView.bottomAnchor) -// NSLayoutConstraint.activate([ -// composeToolbarView.leadingAnchor.constraint(equalTo: view.leadingAnchor), -// composeToolbarView.trailingAnchor.constraint(equalTo: view.trailingAnchor), -// composeToolbarViewBottomLayoutConstraint, -// composeToolbarView.heightAnchor.constraint(equalToConstant: ComposeToolbarView.toolbarHeight), -// ]) -// composeToolbarView.preservesSuperviewLayoutMargins = true -// composeToolbarView.delegate = self -// -// composeToolbarBackgroundView.translatesAutoresizingMaskIntoConstraints = false -// view.insertSubview(composeToolbarBackgroundView, belowSubview: composeToolbarView) -// NSLayoutConstraint.activate([ -// composeToolbarBackgroundView.topAnchor.constraint(equalTo: composeToolbarView.topAnchor), -// composeToolbarBackgroundView.leadingAnchor.constraint(equalTo: composeToolbarView.leadingAnchor), -// composeToolbarBackgroundView.trailingAnchor.constraint(equalTo: composeToolbarView.trailingAnchor), -// view.bottomAnchor.constraint(equalTo: composeToolbarBackgroundView.bottomAnchor), -// ]) + // bind title + viewModel.$title + .receive(on: DispatchQueue.main) + .sink { [weak self] title in + guard let self = self else { return } + self.title = title + } + .store(in: &disposeBag) -// tableView.delegate = self -// viewModel.setupDataSource( -// tableView: tableView, -// metaTextDelegate: self, -// metaTextViewDelegate: self, -// customEmojiPickerInputViewModel: viewModel.customEmojiPickerInputViewModel, -// composeStatusAttachmentCollectionViewCellDelegate: self, -// composeStatusPollOptionCollectionViewCellDelegate: self, -// composeStatusPollOptionAppendEntryCollectionViewCellDelegate: self, -// composeStatusPollExpiresOptionCollectionViewCellDelegate: self -// ) - -// viewModel.composeStatusAttribute.$composeContent -// .removeDuplicates() -// .receive(on: DispatchQueue.main) -// .sink { [weak self] _ in -// guard let self = self else { return } -// guard self.view.window != nil else { return } -// UIView.performWithoutAnimation { -// self.tableView.beginUpdates() -// self.tableView.setNeedsLayout() -// self.tableView.layoutIfNeeded() -// self.tableView.endUpdates() -// } -// } -// .store(in: &disposeBag) - -// customEmojiPickerInputView.collectionView.delegate = self -// viewModel.customEmojiPickerInputViewModel.customEmojiPickerInputView = customEmojiPickerInputView -// viewModel.setupCustomEmojiPickerDiffableDataSource( -// for: customEmojiPickerInputView.collectionView, -// dependency: self -// ) - -// viewModel.composeStatusContentTableViewCell.delegate = self -// -// // update layout when keyboard show/dismiss -// view.layoutIfNeeded() -// - -// -// // bind auto-complete -// viewModel.$autoCompleteInfo -// .receive(on: DispatchQueue.main) -// .sink { [weak self] info in -// guard let self = self else { return } -// let textEditorView = self.textEditorView -// if self.autoCompleteViewController.view.superview == nil { -// self.autoCompleteViewController.view.frame = self.view.bounds -// // add to container view. seealso: `viewDidLayoutSubviews()` -// self.viewModel.composeStatusContentTableViewCell.textEditorViewContainerView.addSubview(self.autoCompleteViewController.view) -// self.addChild(self.autoCompleteViewController) -// self.autoCompleteViewController.didMove(toParent: self) -// self.autoCompleteViewController.view.isHidden = true -// self.tableView.autoCompleteViewController = self.autoCompleteViewController -// } -// self.updateAutoCompleteViewControllerLayout() -// self.autoCompleteViewController.view.isHidden = info == nil -// guard let info = info else { return } -// let symbolBoundingRectInContainer = textEditorView.textView.convert(info.symbolBoundingRect, to: self.autoCompleteViewController.chevronView) -// self.autoCompleteViewController.view.frame.origin.y = info.textBoundingRect.maxY -// self.autoCompleteViewController.viewModel.symbolBoundingRect.value = symbolBoundingRectInContainer -// self.autoCompleteViewController.viewModel.inputText.value = String(info.inputText) -// } -// .store(in: &disposeBag) -// -// // bind publish bar button state -// viewModel.$isPublishBarButtonItemEnabled -// .receive(on: DispatchQueue.main) -// .assign(to: \.isEnabled, on: publishButton) -// .store(in: &disposeBag) -// -// // bind media button toolbar state -// viewModel.$isMediaToolbarButtonEnabled -// .receive(on: DispatchQueue.main) -// .sink { [weak self] isMediaToolbarButtonEnabled in -// guard let self = self else { return } -// self.composeToolbarView.mediaBarButtonItem.isEnabled = isMediaToolbarButtonEnabled -// self.composeToolbarView.mediaButton.isEnabled = isMediaToolbarButtonEnabled -// } -// .store(in: &disposeBag) -// -// // bind poll button toolbar state -// viewModel.$isPollToolbarButtonEnabled -// .receive(on: DispatchQueue.main) -// .sink { [weak self] isPollToolbarButtonEnabled in -// guard let self = self else { return } -// self.composeToolbarView.pollBarButtonItem.isEnabled = isPollToolbarButtonEnabled -// self.composeToolbarView.pollButton.isEnabled = isPollToolbarButtonEnabled -// } -// .store(in: &disposeBag) -// -// Publishers.CombineLatest( -// viewModel.$isPollComposing, -// viewModel.$isPollToolbarButtonEnabled -// ) -// .receive(on: DispatchQueue.main) -// .sink { [weak self] isPollComposing, isPollToolbarButtonEnabled in -// guard let self = self else { return } -// guard isPollToolbarButtonEnabled else { -// let accessibilityLabel = L10n.Scene.Compose.Accessibility.appendPoll -// self.composeToolbarView.pollBarButtonItem.accessibilityLabel = accessibilityLabel -// self.composeToolbarView.pollButton.accessibilityLabel = accessibilityLabel -// return -// } -// let accessibilityLabel = isPollComposing ? L10n.Scene.Compose.Accessibility.removePoll : L10n.Scene.Compose.Accessibility.appendPoll -// self.composeToolbarView.pollBarButtonItem.accessibilityLabel = accessibilityLabel -// self.composeToolbarView.pollButton.accessibilityLabel = accessibilityLabel -// } -// .store(in: &disposeBag) -// -// // bind image picker toolbar state -// viewModel.$attachmentServices -// .receive(on: DispatchQueue.main) -// .sink { [weak self] attachmentServices in -// guard let self = self else { return } -// let isEnabled = attachmentServices.count < self.viewModel.maxMediaAttachments -// self.composeToolbarView.mediaBarButtonItem.isEnabled = isEnabled -// self.composeToolbarView.mediaButton.isEnabled = isEnabled -// self.resetImagePicker() -// } -// .store(in: &disposeBag) -// -// // bind content warning button state -// viewModel.$isContentWarningComposing -// .receive(on: DispatchQueue.main) -// .sink { [weak self] isContentWarningComposing in -// guard let self = self else { return } -// let accessibilityLabel = isContentWarningComposing ? L10n.Scene.Compose.Accessibility.disableContentWarning : L10n.Scene.Compose.Accessibility.enableContentWarning -// self.composeToolbarView.contentWarningBarButtonItem.accessibilityLabel = accessibilityLabel -// self.composeToolbarView.contentWarningButton.accessibilityLabel = accessibilityLabel -// } -// .store(in: &disposeBag) -// -// // bind visibility toolbar UI -// Publishers.CombineLatest( -// viewModel.$selectedStatusVisibility, -// viewModel.traitCollectionDidChangePublisher -// ) -// .receive(on: DispatchQueue.main) -// .sink { [weak self] type, _ in -// guard let self = self else { return } -// let image = type.image(interfaceStyle: self.traitCollection.userInterfaceStyle) -// self.composeToolbarView.visibilityBarButtonItem.image = image -// self.composeToolbarView.visibilityButton.setImage(image, for: .normal) -// self.composeToolbarView.activeVisibilityType.value = type -// } -// .store(in: &disposeBag) -// -// viewModel.$characterCount -// .receive(on: DispatchQueue.main) -// .sink { [weak self] characterCount in -// guard let self = self else { return } -// let count = self.viewModel.composeContentLimit - characterCount -// self.composeToolbarView.characterCountLabel.text = "\(count)" -// self.characterCountLabel.text = "\(count)" -// let font: UIFont -// let textColor: UIColor -// let accessibilityLabel: String -// switch count { -// case _ where count < 0: -// font = .monospacedDigitSystemFont(ofSize: 24, weight: .bold) -// textColor = Asset.Colors.danger.color -// accessibilityLabel = L10n.A11y.Plural.Count.inputLimitExceeds(abs(count)) -// default: -// font = .monospacedDigitSystemFont(ofSize: 15, weight: .regular) -// textColor = Asset.Colors.Label.secondary.color -// accessibilityLabel = L10n.A11y.Plural.Count.inputLimitRemains(count) -// } -// self.composeToolbarView.characterCountLabel.font = font -// self.composeToolbarView.characterCountLabel.textColor = textColor -// self.composeToolbarView.characterCountLabel.accessibilityLabel = accessibilityLabel -// self.characterCountLabel.font = font -// self.characterCountLabel.textColor = textColor -// self.characterCountLabel.accessibilityLabel = accessibilityLabel -// self.characterCountLabel.sizeToFit() -// } -// .store(in: &disposeBag) -// -// // bind custom emoji picker UI -// viewModel.customEmojiViewModel?.emojis -// .receive(on: DispatchQueue.main) -// .sink(receiveValue: { [weak self] emojis in -// guard let self = self else { return } -// if emojis.isEmpty { -// self.customEmojiPickerInputView.activityIndicatorView.startAnimating() -// } else { -// self.customEmojiPickerInputView.activityIndicatorView.stopAnimating() -// } -// }) -// .store(in: &disposeBag) -// -// configureToolbarDisplay(keyboardHasShortcutBar: keyboardHasShortcutBar.value) -// Publishers.CombineLatest( -// keyboardHasShortcutBar, -// viewModel.traitCollectionDidChangePublisher -// ) -// .receive(on: DispatchQueue.main) -// .sink { [weak self] keyboardHasShortcutBar, _ in -// guard let self = self else { return } -// self.configureToolbarDisplay(keyboardHasShortcutBar: keyboardHasShortcutBar) -// } -// .store(in: &disposeBag) - } - - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - -// // update MetaText without trigger call underlaying `UITextStorage.processEditing` -// _ = textEditorView.processEditing(textEditorView.textStorage) - -// markTextEditorViewBecomeFirstResponser() - } - - override func viewDidAppear(_ animated: Bool) { - super.viewDidAppear(animated) - -// viewModel.isViewAppeared = true + // bind publish bar button state + composeContentViewModel.$isPublishBarButtonItemEnabled + .receive(on: DispatchQueue.main) + .assign(to: \.isEnabled, on: publishButton) + .store(in: &disposeBag) } override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { super.traitCollectionDidChange(previousTraitCollection) -// configurePublishButtonApperance() -// viewModel.traitCollectionDidChangePublisher.send() - } - - override func viewDidLayoutSubviews() { - super.viewDidLayoutSubviews() - - updateAutoCompleteViewControllerLayout() - } - - private func updateAutoCompleteViewControllerLayout() { - // pin autoCompleteViewController frame to current view -// if let containerView = autoCompleteViewController.view.superview { -// let viewFrameInWindow = containerView.convert(autoCompleteViewController.view.frame, to: view) -// if viewFrameInWindow.origin.x != 0 { -// autoCompleteViewController.view.frame.origin.x = -viewFrameInWindow.origin.x -// } -// autoCompleteViewController.view.frame.size.width = view.frame.width -// } + configurePublishButtonApperance() + viewModel.traitCollectionDidChangePublisher.send() } } -//extension ComposeViewController { -// -// private var textEditorView: MetaText { -// return viewModel.composeStatusContentTableViewCell.metaText -// } -// -// private func markTextEditorViewBecomeFirstResponser() { -// textEditorView.textView.becomeFirstResponder() -// } -// -// private func contentWarningEditorTextView() -> UITextView? { -// viewModel.composeStatusContentTableViewCell.statusContentWarningEditorView.textView -// } -// -// private func pollOptionCollectionViewCell(of item: ComposeStatusPollItem) -> ComposeStatusPollOptionCollectionViewCell? { -// guard case .pollOption = item else { return nil } -// guard let dataSource = viewModel.composeStatusPollTableViewCell.dataSource else { return nil } -// guard let indexPath = dataSource.indexPath(for: item), -// let cell = viewModel.composeStatusPollTableViewCell.collectionView.cellForItem(at: indexPath) as? ComposeStatusPollOptionCollectionViewCell else { -// return nil -// } -// -// return cell -// } -// -// private func firstPollOptionCollectionViewCell() -> ComposeStatusPollOptionCollectionViewCell? { -// guard let dataSource = viewModel.composeStatusPollTableViewCell.dataSource else { return nil } -// let items = dataSource.snapshot().itemIdentifiers(inSection: .main) -// let firstPollItem = items.first { item -> Bool in -// guard case .pollOption = item else { return false } -// return true -// } -// -// guard let item = firstPollItem else { -// return nil -// } -// -// return pollOptionCollectionViewCell(of: item) -// } -// -// private func lastPollOptionCollectionViewCell() -> ComposeStatusPollOptionCollectionViewCell? { -// guard let dataSource = viewModel.composeStatusPollTableViewCell.dataSource else { return nil } -// let items = dataSource.snapshot().itemIdentifiers(inSection: .main) -// let lastPollItem = items.last { item -> Bool in -// guard case .pollOption = item else { return false } -// return true -// } -// -// guard let item = lastPollItem else { -// return nil -// } -// -// return pollOptionCollectionViewCell(of: item) -// } -// -// private func markFirstPollOptionCollectionViewCellBecomeFirstResponser() { -// guard let cell = firstPollOptionCollectionViewCell() else { return } -// cell.pollOptionView.optionTextField.becomeFirstResponder() -// } -// -// private func markLastPollOptionCollectionViewCellBecomeFirstResponser() { -// guard let cell = lastPollOptionCollectionViewCell() else { return } -// cell.pollOptionView.optionTextField.becomeFirstResponder() -// } -// -// private func showDismissConfirmAlertController() { -// let alertController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet) -// let discardAction = UIAlertAction(title: L10n.Common.Controls.Actions.discard, style: .destructive) { [weak self] _ in -// guard let self = self else { return } -// self.dismiss(animated: true, completion: nil) -// } -// alertController.addAction(discardAction) -// let cancelAction = UIAlertAction(title: L10n.Common.Controls.Actions.cancel, style: .cancel) -// alertController.addAction(cancelAction) -// alertController.popoverPresentationController?.barButtonItem = cancelBarButtonItem -// present(alertController, animated: true, completion: nil) -// } -// -// private func resetImagePicker() { -// let selectionLimit = max(1, viewModel.maxMediaAttachments - viewModel.attachmentServices.count) -// let configuration = ComposeViewController.createPhotoLibraryPickerConfiguration(selectionLimit: selectionLimit) -// photoLibraryPicker = createImagePicker(configuration: configuration) -// } -// -// private func createImagePicker(configuration: PHPickerConfiguration) -> PHPickerViewController { -// let imagePicker = PHPickerViewController(configuration: configuration) -// imagePicker.delegate = self -// return imagePicker -// } -// -// private func setupBackgroundColor(theme: Theme) { -// let backgroundColor = UIColor(dynamicProvider: { traitCollection in -// switch traitCollection.userInterfaceStyle { -// case .light: -// return .systemBackground -// default: -// return theme.systemElevatedBackgroundColor -// } -// }) -// view.backgroundColor = backgroundColor -//// tableView.backgroundColor = backgroundColor -//// composeToolbarBackgroundView.backgroundColor = theme.composeToolbarBackgroundColor -// } -// -// // keyboard shortcutBar -// private func setupInputAssistantItem(item: UITextInputAssistantItem) { -// let barButtonItems = [ -// composeToolbarView.mediaBarButtonItem, -// composeToolbarView.pollBarButtonItem, -// composeToolbarView.contentWarningBarButtonItem, -// composeToolbarView.visibilityBarButtonItem, -// ] -// let group = UIBarButtonItemGroup(barButtonItems: barButtonItems, representativeItem: nil) -// -// item.trailingBarButtonGroups = [group] -// } -// -// private func configureToolbarDisplay(keyboardHasShortcutBar: Bool) { -// switch self.traitCollection.userInterfaceIdiom { -// case .pad: -// let shouldHideToolbar = keyboardHasShortcutBar && self.traitCollection.horizontalSizeClass == .regular -// self.composeToolbarView.alpha = shouldHideToolbar ? 0 : 1 -// self.composeToolbarBackgroundView.alpha = shouldHideToolbar ? 0 : 1 -// default: -// break -// } -// } -// -// private func configureNavigationBarTitleStyle() { -// switch traitCollection.userInterfaceIdiom { -// case .pad: -// navigationController?.navigationBar.prefersLargeTitles = traitCollection.horizontalSizeClass == .regular -// default: -// break -// } -// } -// -//} -// +extension ComposeViewController { + + private func showDismissConfirmAlertController() { + let alertController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet) + let discardAction = UIAlertAction(title: L10n.Common.Controls.Actions.discard, style: .destructive) { [weak self] _ in + guard let self = self else { return } + self.dismiss(animated: true, completion: nil) + } + alertController.addAction(discardAction) + let cancelAction = UIAlertAction(title: L10n.Common.Controls.Actions.cancel, style: .cancel) + alertController.addAction(cancelAction) + alertController.popoverPresentationController?.barButtonItem = cancelBarButtonItem + present(alertController, animated: true, completion: nil) + } + +} + extension ComposeViewController { @objc private func cancelBarButtonItemPressed(_ sender: UIBarButtonItem) { logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public)") -// guard viewModel.shouldDismiss else { -// showDismissConfirmAlertController() -// return -// } + guard composeContentViewModel.shouldDismiss else { + showDismissConfirmAlertController() + return + } dismiss(animated: true, completion: nil) } @objc private func publishBarButtonItemPressed(_ sender: UIBarButtonItem) { os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) -// do { -// try viewModel.checkAttachmentPrecondition() -// } catch { -// let alertController = UIAlertController(for: error, title: nil, preferredStyle: .alert) -// let okAction = UIAlertAction(title: L10n.Common.Controls.Actions.ok, style: .default, handler: nil) -// alertController.addAction(okAction) -// coordinator.present(scene: .alertController(alertController: alertController), from: nil, transition: .alertController(animated: true, completion: nil)) -// return -// } -// guard viewModel.publishStateMachine.enter(ComposeViewModel.PublishState.Publishing.self) else { -// // TODO: handle error -// return -// } - - // context.statusPublishService.publish(composeViewModel: viewModel) + do { + try composeContentViewModel.checkAttachmentPrecondition() + } catch { + let alertController = UIAlertController(for: error, title: nil, preferredStyle: .alert) + let okAction = UIAlertAction(title: L10n.Common.Controls.Actions.ok, style: .default, handler: nil) + alertController.addAction(okAction) + _ = coordinator.present(scene: .alertController(alertController: alertController), from: nil, transition: .alertController(animated: true, completion: nil)) + return + } do { let statusPublisher = try composeContentViewModel.statusPublisher() @@ -640,249 +187,35 @@ extension ComposeViewController { } -//// MARK: - MetaTextDelegate -//extension ComposeViewController: MetaTextDelegate { -// func metaText(_ metaText: MetaText, processEditing textStorage: MetaTextStorage) -> MetaContent? { -// let string = metaText.textStorage.string -// let content = MastodonContent( -// content: string, -// emojis: viewModel.customEmojiViewModel?.emojiMapping.value ?? [:] -// ) -// let metaContent = MastodonMetaContent.convert(text: content) -// return metaContent -// } -//} -// -//// MARK: - UITextViewDelegate -//extension ComposeViewController: UITextViewDelegate { -// -// func textViewShouldBeginEditing(_ textView: UITextView) -> Bool { -// setupInputAssistantItem(item: textView.inputAssistantItem) -// return true -// } -// -// func textViewDidChange(_ textView: UITextView) { -// switch textView { -// case textEditorView.textView: -// // update model -// let metaText = self.textEditorView -// let backedString = metaText.backedString -// viewModel.composeStatusAttribute.composeContent = backedString -// logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): \(backedString)") -// -// // configure auto completion -// setupAutoComplete(for: textView) -// default: -// assertionFailure() -// } -// } -// -// struct AutoCompleteInfo { -// // model -// let inputText: Substring -// // range -// let symbolRange: Range -// let symbolString: Substring -// let toCursorRange: Range -// let toCursorString: Substring -// let toHighlightEndRange: Range -// let toHighlightEndString: Substring -// // geometry -// var textBoundingRect: CGRect = .zero -// var symbolBoundingRect: CGRect = .zero -// } -// -// private func setupAutoComplete(for textView: UITextView) { -// guard var autoCompletion = ComposeViewController.scanAutoCompleteInfo(textView: textView) else { -// viewModel.autoCompleteInfo = nil -// return -// } -// os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: auto complete %s (%s)", ((#file as NSString).lastPathComponent), #line, #function, String(autoCompletion.toHighlightEndString), String(autoCompletion.toCursorString)) -// -// // get layout text bounding rect -// var glyphRange = NSRange() -// textView.layoutManager.characterRange(forGlyphRange: NSRange(autoCompletion.toCursorRange, in: textView.text), actualGlyphRange: &glyphRange) -// let textContainer = textView.layoutManager.textContainers[0] -// let textBoundingRect = textView.layoutManager.boundingRect(forGlyphRange: glyphRange, in: textContainer) -// -// let retryLayoutTimes = viewModel.autoCompleteRetryLayoutTimes -// guard textBoundingRect.size != .zero else { -// viewModel.autoCompleteRetryLayoutTimes += 1 -// // avoid infinite loop -// guard retryLayoutTimes < 3 else { return } -// // needs retry calculate layout when the rect position changing -// DispatchQueue.main.async { -// self.setupAutoComplete(for: textView) -// } -// return -// } -// viewModel.autoCompleteRetryLayoutTimes = 0 -// -// // get symbol bounding rect -// textView.layoutManager.characterRange(forGlyphRange: NSRange(autoCompletion.symbolRange, in: textView.text), actualGlyphRange: &glyphRange) -// let symbolBoundingRect = textView.layoutManager.boundingRect(forGlyphRange: glyphRange, in: textContainer) -// -// // set bounding rect and trigger layout -// autoCompletion.textBoundingRect = textBoundingRect -// autoCompletion.symbolBoundingRect = symbolBoundingRect -// viewModel.autoCompleteInfo = autoCompletion -// } -// -// private static func scanAutoCompleteInfo(textView: UITextView) -> AutoCompleteInfo? { -// guard let text = textView.text, -// textView.selectedRange.location > 0, !text.isEmpty, -// let selectedRange = Range(textView.selectedRange, in: text) else { -// return nil -// } -// let cursorIndex = selectedRange.upperBound -// let _highlightStartIndex: String.Index? = { -// var index = text.index(before: cursorIndex) -// while index > text.startIndex { -// let char = text[index] -// if char == "@" || char == "#" || char == ":" { -// return index -// } -// index = text.index(before: index) -// } -// assert(index == text.startIndex) -// let char = text[index] -// if char == "@" || char == "#" || char == ":" { -// return index -// } else { -// return nil -// } -// }() -// -// guard let highlightStartIndex = _highlightStartIndex else { return nil } -// let scanRange = NSRange(highlightStartIndex..= cursorIndex else { return nil } -// let symbolRange = highlightStartIndex.. Bool { -// switch textView { -// case textEditorView.textView: -// return false -// default: -// return true -// } -// } -// -// func textView(_ textView: UITextView, shouldInteractWith textAttachment: NSTextAttachment, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool { -// switch textView { -// case textEditorView.textView: -// return false -// default: -// return true -// } -// } -// -//} -// -//// MARK: - ComposeToolbarViewDelegate -//extension ComposeViewController: ComposeToolbarViewDelegate { +extension ComposeViewController { + public override func canPerformAction(_ action: Selector, withSender sender: Any?) -> Bool { + + // Enable pasting images + if (action == #selector(UIResponderStandardEditActions.paste(_:))) { + return UIPasteboard.general.hasStrings || UIPasteboard.general.hasImages; + } -// func composeToolbarView(_ composeToolbarView: ComposeToolbarView, pollButtonDidPressed sender: Any) { -// // toggle poll composing state -// viewModel.isPollComposing.toggle() -// -// // cancel custom picker input -// viewModel.isCustomEmojiComposing = false -// -// // setup initial poll option if needs -// if viewModel.isPollComposing, viewModel.pollOptionAttributes.isEmpty { -// viewModel.pollOptionAttributes = [ComposeStatusPollItem.PollOptionAttribute(), ComposeStatusPollItem.PollOptionAttribute()] -// } -// -// if viewModel.isPollComposing { -// // Magic RunLoop -// DispatchQueue.main.async { -// self.markFirstPollOptionCollectionViewCellBecomeFirstResponser() -// } -// } else { -// markTextEditorViewBecomeFirstResponser() -// } -// } -// -// func composeToolbarView(_ composeToolbarView: ComposeToolbarView, emojiButtonDidPressed sender: Any) { -// viewModel.isCustomEmojiComposing.toggle() -// } -// -// func composeToolbarView(_ composeToolbarView: ComposeToolbarView, contentWarningButtonDidPressed sender: Any) { -// // cancel custom picker input -// viewModel.isCustomEmojiComposing = false -// -// // restore first responder for text editor when content warning dismiss -// if viewModel.isContentWarningComposing { -// if contentWarningEditorTextView()?.isFirstResponder == true { -// markTextEditorViewBecomeFirstResponser() -// } -// } -// -// // toggle composing status -// viewModel.isContentWarningComposing.toggle() -// -// // active content warning after toggled -// if viewModel.isContentWarningComposing { -// contentWarningEditorTextView()?.becomeFirstResponder() -// } -// } -// -// func composeToolbarView(_ composeToolbarView: ComposeToolbarView, visibilityButtonDidPressed sender: Any, visibilitySelectionType type: ComposeToolbarView.VisibilitySelectionType) { -// viewModel.selectedStatusVisibility = type -// } -// -//} + return super.canPerformAction(action, withSender: sender); + } + + override func paste(_ sender: Any?) { + logger.debug("Paste event received") -//// MARK: - UITableViewDelegate -//extension ComposeViewController: UITableViewDelegate { } -// -//// MARK: - UICollectionViewDelegate -//extension ComposeViewController: UICollectionViewDelegate { -// -// func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { -// os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: select %s", ((#file as NSString).lastPathComponent), #line, #function, indexPath.debugDescription) -// -// if collectionView === customEmojiPickerInputView.collectionView { -// guard let diffableDataSource = viewModel.customEmojiPickerDiffableDataSource else { return } -// let item = diffableDataSource.itemIdentifier(for: indexPath) -// guard case let .emoji(attribute) = item else { return } -// let emoji = attribute.emoji -// -// // make click sound -// UIDevice.current.playInputClick() -// -// // retrieve active text input and insert emoji -// // the trailing space is REQUIRED to make regex happy -// _ = viewModel.customEmojiPickerInputViewModel.insertText(":\(emoji.shortcode): ") -// } else { -// // do nothing -// } -// } -//} + // Look for images on the clipboard + if UIPasteboard.general.hasImages, let images = UIPasteboard.general.images { + logger.warning("Got image paste event, however attachments are not yet re-implemented."); + let attachmentViewModels = images.map { image in + return AttachmentViewModel( + api: viewModel.context.apiService, + authContext: viewModel.authContext, + input: .image(image), + delegate: composeContentViewModel + ) + } + composeContentViewModel.attachmentViewModels += attachmentViewModels + } + } +} // MARK: - UIAdaptivePresentationControllerDelegate extension ComposeViewController: UIAdaptivePresentationControllerDelegate { @@ -895,15 +228,15 @@ extension ComposeViewController: UIAdaptivePresentationControllerDelegate { return .pageSheet } } - -// func presentationControllerShouldDismiss(_ presentationController: UIPresentationController) -> Bool { -// return viewModel.shouldDismiss -// } -// func presentationControllerDidAttemptToDismiss(_ presentationController: UIPresentationController) { -// os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) -// showDismissConfirmAlertController() -// } + func presentationControllerShouldDismiss(_ presentationController: UIPresentationController) -> Bool { + return composeContentViewModel.shouldDismiss + } + + func presentationControllerDidAttemptToDismiss(_ presentationController: UIPresentationController) { + os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) + showDismissConfirmAlertController() + } func presentationControllerDidDismiss(_ presentationController: UIPresentationController) { os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) @@ -911,304 +244,137 @@ extension ComposeViewController: UIAdaptivePresentationControllerDelegate { } -//// MARK: - ComposeStatusAttachmentTableViewCellDelegate -//extension ComposeViewController: ComposeStatusAttachmentCollectionViewCellDelegate { -// -// func composeStatusAttachmentCollectionViewCell(_ cell: ComposeStatusAttachmentCollectionViewCell, removeButtonDidPressed button: UIButton) { -// guard let diffableDataSource = viewModel.composeStatusAttachmentTableViewCell.dataSource else { return } -// guard let indexPath = viewModel.composeStatusAttachmentTableViewCell.collectionView.indexPath(for: cell) else { return } -// guard let item = diffableDataSource.itemIdentifier(for: indexPath) else { return } -// guard case let .attachment(attachmentService) = item else { return } -// -// var attachmentServices = viewModel.attachmentServices -// guard let index = attachmentServices.firstIndex(of: attachmentService) else { return } -// let removedItem = attachmentServices[index] -// attachmentServices.remove(at: index) -// viewModel.attachmentServices = attachmentServices -// -// // cancel task -// removedItem.disposeBag.removeAll() -// } -// -//} -// -//// MARK: - ComposeStatusPollOptionCollectionViewCellDelegate -//extension ComposeViewController: ComposeStatusPollOptionCollectionViewCellDelegate { -// -// func composeStatusPollOptionCollectionViewCell(_ cell: ComposeStatusPollOptionCollectionViewCell, textFieldDidBeginEditing textField: UITextField) { -// -// setupInputAssistantItem(item: textField.inputAssistantItem) -// -// // FIXME: make poll section visible -// // DispatchQueue.main.async { -// // self.collectionView.scroll(to: .bottom, animated: true) -// // } -// } -// -// -// // handle delete backward event for poll option input -// func composeStatusPollOptionCollectionViewCell(_ cell: ComposeStatusPollOptionCollectionViewCell, textBeforeDeleteBackward text: String?) { -// guard (text ?? "").isEmpty else { return } -// guard let dataSource = viewModel.composeStatusPollTableViewCell.dataSource else { return } -// guard let indexPath = viewModel.composeStatusPollTableViewCell.collectionView.indexPath(for: cell) else { return } -// guard let item = dataSource.itemIdentifier(for: indexPath) else { return } -// guard case let .pollOption(attribute) = item else { return } -// -// var pollAttributes = viewModel.pollOptionAttributes -// guard let index = pollAttributes.firstIndex(of: attribute) else { return } -// -// // mark previous (fallback to next) item of removed middle poll option become first responder -// let pollItems = dataSource.snapshot().itemIdentifiers(inSection: .main) -// if let indexOfItem = pollItems.firstIndex(of: item), index > 0 { -// func cellBeforeRemoved() -> ComposeStatusPollOptionCollectionViewCell? { -// guard index > 0 else { return nil } -// let indexBeforeRemoved = pollItems.index(before: indexOfItem) -// let itemBeforeRemoved = pollItems[indexBeforeRemoved] -// return pollOptionCollectionViewCell(of: itemBeforeRemoved) -// } -// -// func cellAfterRemoved() -> ComposeStatusPollOptionCollectionViewCell? { -// guard index < pollItems.count - 1 else { return nil } -// let indexAfterRemoved = pollItems.index(after: index) -// let itemAfterRemoved = pollItems[indexAfterRemoved] -// return pollOptionCollectionViewCell(of: itemAfterRemoved) -// } -// -// var cell: ComposeStatusPollOptionCollectionViewCell? = cellBeforeRemoved() -// if cell == nil { -// cell = cellAfterRemoved() -// } -// cell?.pollOptionView.optionTextField.becomeFirstResponder() -// } -// -// guard pollAttributes.count > 2 else { -// return -// } -// pollAttributes.remove(at: index) -// -// // update data source -// viewModel.pollOptionAttributes = pollAttributes -// } -// -// // handle keyboard return event for poll option input -// func composeStatusPollOptionCollectionViewCell(_ cell: ComposeStatusPollOptionCollectionViewCell, pollOptionTextFieldDidReturn: UITextField) { -// guard let dataSource = viewModel.composeStatusPollTableViewCell.dataSource else { return } -// guard let indexPath = viewModel.composeStatusPollTableViewCell.collectionView.indexPath(for: cell) else { return } -// let pollItems = dataSource.snapshot().itemIdentifiers(inSection: .main).filter { item in -// guard case .pollOption = item else { return false } -// return true -// } -// guard let item = dataSource.itemIdentifier(for: indexPath) else { return } -// guard let index = pollItems.firstIndex(of: item) else { return } -// -// if index == pollItems.count - 1 { -// // is the last -// viewModel.createNewPollOptionIfPossible() -// DispatchQueue.main.async { -// self.markLastPollOptionCollectionViewCellBecomeFirstResponser() -// } -// } else { -// // not the last -// let indexAfter = pollItems.index(after: index) -// let itemAfter = pollItems[indexAfter] -// let cell = pollOptionCollectionViewCell(of: itemAfter) -// cell?.pollOptionView.optionTextField.becomeFirstResponder() -// } -// } -// -//} -// -//// MARK: - ComposeStatusPollOptionAppendEntryCollectionViewCellDelegate -//extension ComposeViewController: ComposeStatusPollOptionAppendEntryCollectionViewCellDelegate { -// func composeStatusPollOptionAppendEntryCollectionViewCellDidPressed(_ cell: ComposeStatusPollOptionAppendEntryCollectionViewCell) { -// viewModel.createNewPollOptionIfPossible() -// DispatchQueue.main.async { -// self.markLastPollOptionCollectionViewCellBecomeFirstResponser() -// } -// } -//} -// -//// MARK: - ComposeStatusPollExpiresOptionCollectionViewCellDelegate -//extension ComposeViewController: ComposeStatusPollExpiresOptionCollectionViewCellDelegate { -// func composeStatusPollExpiresOptionCollectionViewCell(_ cell: ComposeStatusPollExpiresOptionCollectionViewCell, didSelectExpiresOption expiresOption: ComposeStatusPollItem.PollExpiresOptionAttribute.ExpiresOption) { -// viewModel.pollExpiresOptionAttribute.expiresOption.value = expiresOption -// } -//} -// -//// MARK: - ComposeStatusContentTableViewCellDelegate -//extension ComposeViewController: ComposeStatusContentTableViewCellDelegate { -// func composeStatusContentTableViewCell(_ cell: ComposeStatusContentTableViewCell, textViewShouldBeginEditing textView: UITextView) -> Bool { -// setupInputAssistantItem(item: textView.inputAssistantItem) -// return true -// } -//} -// -//// MARK: - AutoCompleteViewControllerDelegate -//extension ComposeViewController: AutoCompleteViewControllerDelegate { -// func autoCompleteViewController(_ viewController: AutoCompleteViewController, didSelectItem item: AutoCompleteItem) { -// guard let info = viewModel.autoCompleteInfo else { return } -// let _replacedText: String? = { -// var text: String -// switch item { -// case .hashtag(let hashtag): -// text = "#" + hashtag.name -// case .hashtagV1(let hashtagName): -// text = "#" + hashtagName -// case .account(let account): -// text = "@" + account.acct -// case .emoji(let emoji): -// text = ":" + emoji.shortcode + ":" -// case .bottomLoader: -// return nil -// } -// return text -// }() -// guard let replacedText = _replacedText else { return } -// guard let text = textEditorView.textView.text else { return } -// -// let range = NSRange(info.toHighlightEndRange, in: text) -// textEditorView.textStorage.replaceCharacters(in: range, with: replacedText) -// DispatchQueue.main.async { -// self.textEditorView.textView.insertText(" ") // trigger textView delegate update -// } -// viewModel.autoCompleteInfo = nil -// -// switch item { -// case .emoji, .bottomLoader: -// break -// default: -// // set selected range except emoji -// let newRange = NSRange(location: range.location + (replacedText as NSString).length, length: 0) -// guard textEditorView.textStorage.length <= newRange.location else { return } -// textEditorView.textView.selectedRange = newRange -// } -// } -//} -// -//extension ComposeViewController { -// override var keyCommands: [UIKeyCommand]? { -// composeKeyCommands -// } -//} -// -//extension ComposeViewController { -// -// enum ComposeKeyCommand: String, CaseIterable { -// case discardPost -// case publishPost -// case mediaBrowse -// case mediaPhotoLibrary -// case mediaCamera -// case togglePoll -// case toggleContentWarning -// case selectVisibilityPublic -// // TODO: remove selectVisibilityUnlisted from codebase -// // case selectVisibilityUnlisted -// case selectVisibilityPrivate -// case selectVisibilityDirect -// -// var title: String { -// switch self { -// case .discardPost: return L10n.Scene.Compose.Keyboard.discardPost -// case .publishPost: return L10n.Scene.Compose.Keyboard.publishPost -// case .mediaBrowse: return L10n.Scene.Compose.Keyboard.appendAttachmentEntry(L10n.Scene.Compose.MediaSelection.browse) -// case .mediaPhotoLibrary: return L10n.Scene.Compose.Keyboard.appendAttachmentEntry(L10n.Scene.Compose.MediaSelection.photoLibrary) -// case .mediaCamera: return L10n.Scene.Compose.Keyboard.appendAttachmentEntry(L10n.Scene.Compose.MediaSelection.camera) -// case .togglePoll: return L10n.Scene.Compose.Keyboard.togglePoll -// case .toggleContentWarning: return L10n.Scene.Compose.Keyboard.toggleContentWarning -// case .selectVisibilityPublic: return L10n.Scene.Compose.Keyboard.selectVisibilityEntry(L10n.Scene.Compose.Visibility.public) -// // case .selectVisibilityUnlisted: return L10n.Scene.Compose.Keyboard.selectVisibilityEntry(L10n.Scene.Compose.Visibility.unlisted) -// case .selectVisibilityPrivate: return L10n.Scene.Compose.Keyboard.selectVisibilityEntry(L10n.Scene.Compose.Visibility.private) -// case .selectVisibilityDirect: return L10n.Scene.Compose.Keyboard.selectVisibilityEntry(L10n.Scene.Compose.Visibility.direct) -// } -// } -// -// // UIKeyCommand input -// var input: String { -// switch self { -// case .discardPost: return "w" // + command -// case .publishPost: return "\r" // (enter) + command -// case .mediaBrowse: return "b" // + option + command -// case .mediaPhotoLibrary: return "p" // + option + command -// case .mediaCamera: return "c" // + option + command -// case .togglePoll: return "p" // + shift + command -// case .toggleContentWarning: return "c" // + shift + command -// case .selectVisibilityPublic: return "1" // + command -// // case .selectVisibilityUnlisted: return "2" // + command -// case .selectVisibilityPrivate: return "2" // + command -// case .selectVisibilityDirect: return "3" // + command -// } -// } -// -// var modifierFlags: UIKeyModifierFlags { -// switch self { -// case .discardPost: return [.command] -// case .publishPost: return [.command] -// case .mediaBrowse: return [.alternate, .command] -// case .mediaPhotoLibrary: return [.alternate, .command] -// case .mediaCamera: return [.alternate, .command] -// case .togglePoll: return [.shift, .command] -// case .toggleContentWarning: return [.shift, .command] -// case .selectVisibilityPublic: return [.command] -// // case .selectVisibilityUnlisted: return [.command] -// case .selectVisibilityPrivate: return [.command] -// case .selectVisibilityDirect: return [.command] -// } -// } -// -// var propertyList: Any { -// return rawValue -// } -// } -// -// var composeKeyCommands: [UIKeyCommand]? { -// ComposeKeyCommand.allCases.map { command in -// UIKeyCommand( -// title: command.title, -// image: nil, -// action: #selector(Self.composeKeyCommandHandler(_:)), -// input: command.input, -// modifierFlags: command.modifierFlags, -// propertyList: command.propertyList, -// alternates: [], -// discoverabilityTitle: nil, -// attributes: [], -// state: .off -// ) -// } -// } -// -// @objc private func composeKeyCommandHandler(_ sender: UIKeyCommand) { -// guard let rawValue = sender.propertyList as? String, -// let command = ComposeKeyCommand(rawValue: rawValue) else { return } -// -// switch command { -// case .discardPost: -// cancelBarButtonItemPressed(cancelBarButtonItem) -// case .publishPost: -// publishBarButtonItemPressed(publishBarButtonItem) -// case .mediaBrowse: -// present(documentPickerController, animated: true, completion: nil) -// case .mediaPhotoLibrary: -// present(photoLibraryPicker, animated: true, completion: nil) -// case .mediaCamera: -// guard UIImagePickerController.isSourceTypeAvailable(.camera) else { -// return -// } -// present(imagePickerController, animated: true, completion: nil) -// case .togglePoll: -// composeToolbarView.pollButton.sendActions(for: .touchUpInside) -// case .toggleContentWarning: -// composeToolbarView.contentWarningButton.sendActions(for: .touchUpInside) -// case .selectVisibilityPublic: -// viewModel.selectedStatusVisibility = .public -// // case .selectVisibilityUnlisted: -// // viewModel.selectedStatusVisibility.value = .unlisted -// case .selectVisibilityPrivate: -// viewModel.selectedStatusVisibility = .private -// case .selectVisibilityDirect: -// viewModel.selectedStatusVisibility = .direct -// } -// } -// -//} +extension ComposeViewController { + override var keyCommands: [UIKeyCommand]? { + composeKeyCommands + } +} + +extension ComposeViewController { + + enum ComposeKeyCommand: String, CaseIterable { + case discardPost + case publishPost + case mediaBrowse + case mediaPhotoLibrary + case mediaCamera + case togglePoll + case toggleContentWarning + case selectVisibilityPublic + // TODO: remove selectVisibilityUnlisted from codebase + // case selectVisibilityUnlisted + case selectVisibilityPrivate + case selectVisibilityDirect + + var title: String { + switch self { + case .discardPost: return L10n.Scene.Compose.Keyboard.discardPost + case .publishPost: return L10n.Scene.Compose.Keyboard.publishPost + case .mediaBrowse: return L10n.Scene.Compose.Keyboard.appendAttachmentEntry(L10n.Scene.Compose.MediaSelection.browse) + case .mediaPhotoLibrary: return L10n.Scene.Compose.Keyboard.appendAttachmentEntry(L10n.Scene.Compose.MediaSelection.photoLibrary) + case .mediaCamera: return L10n.Scene.Compose.Keyboard.appendAttachmentEntry(L10n.Scene.Compose.MediaSelection.camera) + case .togglePoll: return L10n.Scene.Compose.Keyboard.togglePoll + case .toggleContentWarning: return L10n.Scene.Compose.Keyboard.toggleContentWarning + case .selectVisibilityPublic: return L10n.Scene.Compose.Keyboard.selectVisibilityEntry(L10n.Scene.Compose.Visibility.public) + // case .selectVisibilityUnlisted: return L10n.Scene.Compose.Keyboard.selectVisibilityEntry(L10n.Scene.Compose.Visibility.unlisted) + case .selectVisibilityPrivate: return L10n.Scene.Compose.Keyboard.selectVisibilityEntry(L10n.Scene.Compose.Visibility.private) + case .selectVisibilityDirect: return L10n.Scene.Compose.Keyboard.selectVisibilityEntry(L10n.Scene.Compose.Visibility.direct) + } + } + + // UIKeyCommand input + var input: String { + switch self { + case .discardPost: return "w" // + command + case .publishPost: return "\r" // (enter) + command + case .mediaBrowse: return "b" // + option + command + case .mediaPhotoLibrary: return "p" // + option + command + case .mediaCamera: return "c" // + option + command + case .togglePoll: return "p" // + shift + command + case .toggleContentWarning: return "c" // + shift + command + case .selectVisibilityPublic: return "1" // + command + // case .selectVisibilityUnlisted: return "2" // + command + case .selectVisibilityPrivate: return "2" // + command + case .selectVisibilityDirect: return "3" // + command + } + } + + var modifierFlags: UIKeyModifierFlags { + switch self { + case .discardPost: return [.command] + case .publishPost: return [.command] + case .mediaBrowse: return [.alternate, .command] + case .mediaPhotoLibrary: return [.alternate, .command] + case .mediaCamera: return [.alternate, .command] + case .togglePoll: return [.shift, .command] + case .toggleContentWarning: return [.shift, .command] + case .selectVisibilityPublic: return [.command] + // case .selectVisibilityUnlisted: return [.command] + case .selectVisibilityPrivate: return [.command] + case .selectVisibilityDirect: return [.command] + } + } + + var propertyList: Any { + return rawValue + } + } + + var composeKeyCommands: [UIKeyCommand]? { + ComposeKeyCommand.allCases.map { command in + UIKeyCommand( + title: command.title, + image: nil, + action: #selector(Self.composeKeyCommandHandler(_:)), + input: command.input, + modifierFlags: command.modifierFlags, + propertyList: command.propertyList, + alternates: [], + discoverabilityTitle: nil, + attributes: [], + state: .off + ) + } + } + + @objc private func composeKeyCommandHandler(_ sender: UIKeyCommand) { + guard let rawValue = sender.propertyList as? String, + let command = ComposeKeyCommand(rawValue: rawValue) else { return } + + switch command { + case .discardPost: + cancelBarButtonItemPressed(cancelBarButtonItem) + case .publishPost: + publishBarButtonItemPressed(publishBarButtonItem) + case .mediaBrowse: + guard !isViewControllerIsAlreadyModal(composeContentViewController.documentPickerController) else { return } + present(composeContentViewController.documentPickerController, animated: true, completion: nil) + case .mediaPhotoLibrary: + guard !isViewControllerIsAlreadyModal(composeContentViewController.photoLibraryPicker) else { return } + present(composeContentViewController.photoLibraryPicker, animated: true, completion: nil) + case .mediaCamera: + guard UIImagePickerController.isSourceTypeAvailable(.camera) else { + return + } + guard !isViewControllerIsAlreadyModal(composeContentViewController.imagePickerController) else { return } + present(composeContentViewController.imagePickerController, animated: true, completion: nil) + case .togglePoll: + composeContentViewModel.isPollActive.toggle() + case .toggleContentWarning: + composeContentViewModel.isContentWarningActive.toggle() + case .selectVisibilityPublic: + composeContentViewModel.visibility = .public + // case .selectVisibilityUnlisted: + // viewModel.selectedStatusVisibility.value = .unlisted + case .selectVisibilityPrivate: + composeContentViewModel.visibility = .private + case .selectVisibilityDirect: + composeContentViewModel.visibility = .direct + } + } + + private func isViewControllerIsAlreadyModal(_ viewController: UIViewController) -> Bool { + return viewController.presentingViewController != nil + } + +} diff --git a/Mastodon/Scene/Compose/ComposeViewModel+DataSource.swift b/Mastodon/Scene/Compose/ComposeViewModel+DataSource.swift deleted file mode 100644 index b3d8f52dc..000000000 --- a/Mastodon/Scene/Compose/ComposeViewModel+DataSource.swift +++ /dev/null @@ -1,490 +0,0 @@ -// -// ComposeViewModel+Diffable.swift -// Mastodon -// -// Created by MainasuK Cirno on 2021-3-11. -// - -import os.log -import UIKit -import Combine -import CoreDataStack -import MetaTextKit -import MastodonMeta -import MastodonAsset -import MastodonCore -import MastodonLocalization -import MastodonSDK - -extension ComposeViewModel { - -// func setupDataSource( -// tableView: UITableView, -// metaTextDelegate: MetaTextDelegate, -// metaTextViewDelegate: UITextViewDelegate, -// customEmojiPickerInputViewModel: CustomEmojiPickerInputViewModel, -// composeStatusAttachmentCollectionViewCellDelegate: ComposeStatusAttachmentCollectionViewCellDelegate, -// composeStatusPollOptionCollectionViewCellDelegate: ComposeStatusPollOptionCollectionViewCellDelegate, -// composeStatusPollOptionAppendEntryCollectionViewCellDelegate: ComposeStatusPollOptionAppendEntryCollectionViewCellDelegate, -// composeStatusPollExpiresOptionCollectionViewCellDelegate: ComposeStatusPollExpiresOptionCollectionViewCellDelegate -// ) { -// // UI -// bind() -// -// // content -// bind(cell: composeStatusContentTableViewCell, tableView: tableView) -// composeStatusContentTableViewCell.metaText.delegate = metaTextDelegate -// composeStatusContentTableViewCell.metaText.textView.delegate = metaTextViewDelegate -// -// // attachment -// bind(cell: composeStatusAttachmentTableViewCell, tableView: tableView) -// composeStatusAttachmentTableViewCell.composeStatusAttachmentCollectionViewCellDelegate = composeStatusAttachmentCollectionViewCellDelegate -// -// // poll -// bind(cell: composeStatusPollTableViewCell, tableView: tableView) -// composeStatusPollTableViewCell.delegate = self -// composeStatusPollTableViewCell.customEmojiPickerInputViewModel = customEmojiPickerInputViewModel -// composeStatusPollTableViewCell.composeStatusPollOptionCollectionViewCellDelegate = composeStatusPollOptionCollectionViewCellDelegate -// composeStatusPollTableViewCell.composeStatusPollOptionAppendEntryCollectionViewCellDelegate = composeStatusPollOptionAppendEntryCollectionViewCellDelegate -// composeStatusPollTableViewCell.composeStatusPollExpiresOptionCollectionViewCellDelegate = composeStatusPollExpiresOptionCollectionViewCellDelegate -// -// // setup data source -// tableView.dataSource = self -// } -// -// func setupCustomEmojiPickerDiffableDataSource( -// for collectionView: UICollectionView, -// dependency: NeedsDependency -// ) { -// let diffableDataSource = CustomEmojiPickerSection.collectionViewDiffableDataSource( -// for: collectionView, -// dependency: dependency -// ) -// self.customEmojiPickerDiffableDataSource = diffableDataSource -// -// let _domain = customEmojiViewModel?.domain -// customEmojiViewModel?.emojis -// .receive(on: DispatchQueue.main) -// .sink { [weak self, weak diffableDataSource] emojis in -// guard let _ = self else { return } -// guard let diffableDataSource = diffableDataSource else { return } -// -// var snapshot = NSDiffableDataSourceSnapshot() -// let domain = _domain?.uppercased() ?? " " -// let customEmojiSection = CustomEmojiPickerSection.emoji(name: domain) -// snapshot.appendSections([customEmojiSection]) -// let items: [CustomEmojiPickerItem] = { -// var items = [CustomEmojiPickerItem]() -// for emoji in emojis where emoji.visibleInPicker { -// let attribute = CustomEmojiPickerItem.CustomEmojiAttribute(emoji: emoji) -// let item = CustomEmojiPickerItem.emoji(attribute: attribute) -// items.append(item) -// } -// return items -// }() -// snapshot.appendItems(items, toSection: customEmojiSection) -// -// diffableDataSource.apply(snapshot) -// } -// .store(in: &disposeBag) -// } - -} - -//// MARK: - UITableViewDataSource -//extension ComposeViewModel: UITableViewDataSource { - -// func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { -// switch Section.allCases[indexPath.section] { -// case .repliedTo: -// let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: ComposeRepliedToStatusContentTableViewCell.self), for: indexPath) as! ComposeRepliedToStatusContentTableViewCell -// guard case let .reply(record) = composeKind else { return cell } -// -// // bind frame publisher -// cell.framePublisher -// .receive(on: DispatchQueue.main) -// .assign(to: \.repliedToCellFrame, on: self) -// .store(in: &cell.disposeBag) -// -// // set initial width -// if cell.statusView.frame.width == .zero { -// cell.statusView.frame.size.width = tableView.frame.width -// } -// -// // configure status -// context.managedObjectContext.performAndWait { -// guard let replyTo = record.object(in: context.managedObjectContext) else { return } -// cell.statusView.configure(status: replyTo) -// } -// -// return cell -// case .status: -// return composeStatusContentTableViewCell -// case .attachment: -// return composeStatusAttachmentTableViewCell -// case .poll: -// return composeStatusPollTableViewCell -// } -// } -//} - -//// MARK: - ComposeStatusPollTableViewCellDelegate -//extension ComposeViewModel: ComposeStatusPollTableViewCellDelegate { -// func composeStatusPollTableViewCell(_ cell: ComposeStatusPollTableViewCell, pollOptionAttributesDidReorder options: [ComposeStatusPollItem.PollOptionAttribute]) { -// os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) -// -// self.pollOptionAttributes = options -// } -//} -// -//extension ComposeViewModel { -// private func bind() { -// $isCustomEmojiComposing -// .assign(to: \.value, on: customEmojiPickerInputViewModel.isCustomEmojiComposing) -// .store(in: &disposeBag) -// -// $isContentWarningComposing -// .assign(to: \.isContentWarningComposing, on: composeStatusAttribute) -// .store(in: &disposeBag) -// -// // bind compose toolbar UI state -// Publishers.CombineLatest( -// $isPollComposing, -// $attachmentServices -// ) -// .receive(on: DispatchQueue.main) -// .sink(receiveValue: { [weak self] isPollComposing, attachmentServices in -// guard let self = self else { return } -// let shouldMediaDisable = isPollComposing || attachmentServices.count >= self.maxMediaAttachments -// let shouldPollDisable = attachmentServices.count > 0 -// -// self.isMediaToolbarButtonEnabled = !shouldMediaDisable -// self.isPollToolbarButtonEnabled = !shouldPollDisable -// }) -// .store(in: &disposeBag) -// -// // calculate `Idempotency-Key` -// let content = Publishers.CombineLatest3( -// composeStatusAttribute.$isContentWarningComposing, -// composeStatusAttribute.$contentWarningContent, -// composeStatusAttribute.$composeContent -// ) -// .map { isContentWarningComposing, contentWarningContent, composeContent -> String in -// if isContentWarningComposing { -// return contentWarningContent + (composeContent ?? "") -// } else { -// return composeContent ?? "" -// } -// } -// let attachmentIDs = $attachmentServices.map { attachments -> String in -// let attachmentIDs = attachments.compactMap { $0.attachment.value?.id } -// return attachmentIDs.joined(separator: ",") -// } -// let pollOptionsAndDuration = Publishers.CombineLatest3( -// $isPollComposing, -// $pollOptionAttributes, -// pollExpiresOptionAttribute.expiresOption -// ) -// .map { isPollComposing, pollOptionAttributes, expiresOption -> String in -// guard isPollComposing else { -// return "" -// } -// -// let pollOptions = pollOptionAttributes.map { $0.option.value }.joined(separator: ",") -// return pollOptions + expiresOption.rawValue -// } -// -// Publishers.CombineLatest4( -// content, -// attachmentIDs, -// pollOptionsAndDuration, -// $selectedStatusVisibility -// ) -// .map { content, attachmentIDs, pollOptionsAndDuration, selectedStatusVisibility -> String in -// var hasher = Hasher() -// hasher.combine(content) -// hasher.combine(attachmentIDs) -// hasher.combine(pollOptionsAndDuration) -// hasher.combine(selectedStatusVisibility.visibility.rawValue) -// let hashValue = hasher.finalize() -// return "\(hashValue)" -// } -// .assign(to: \.value, on: idempotencyKey) -// .store(in: &disposeBag) -// -// // bind modal dismiss state -// composeStatusAttribute.$composeContent -// .receive(on: DispatchQueue.main) -// .map { [weak self] content in -// let content = content ?? "" -// if content.isEmpty { -// return true -// } -// // if preInsertedContent plus a space is equal to the content, simply dismiss the modal -// if let preInsertedContent = self?.preInsertedContent { -// return content == preInsertedContent -// } -// return false -// } -// .assign(to: &$shouldDismiss) -// -// // bind compose bar button item UI state -// let isComposeContentEmpty = composeStatusAttribute.$composeContent -// .map { ($0 ?? "").isEmpty } -// let isComposeContentValid = $characterCount -// .compactMap { [weak self] characterCount -> Bool in -// guard let self = self else { return characterCount <= 500 } -// return characterCount <= self.composeContentLimit -// } -// let isMediaEmpty = $attachmentServices -// .map { $0.isEmpty } -// let isMediaUploadAllSuccess = $attachmentServices -// .map { services in -// services.allSatisfy { $0.uploadStateMachineSubject.value is MastodonAttachmentService.UploadState.Finish } -// } -// let isPollAttributeAllValid = $pollOptionAttributes -// .map { pollAttributes in -// pollAttributes.allSatisfy { attribute -> Bool in -// !attribute.option.value.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty -// } -// } -// -// let isPublishBarButtonItemEnabledPrecondition1 = Publishers.CombineLatest4( -// isComposeContentEmpty, -// isComposeContentValid, -// isMediaEmpty, -// isMediaUploadAllSuccess -// ) -// .map { isComposeContentEmpty, isComposeContentValid, isMediaEmpty, isMediaUploadAllSuccess -> Bool in -// if isMediaEmpty { -// return isComposeContentValid && !isComposeContentEmpty -// } else { -// return isComposeContentValid && isMediaUploadAllSuccess -// } -// } -// .eraseToAnyPublisher() -// -// let isPublishBarButtonItemEnabledPrecondition2 = Publishers.CombineLatest4( -// isComposeContentEmpty, -// isComposeContentValid, -// $isPollComposing, -// isPollAttributeAllValid -// ) -// .map { isComposeContentEmpty, isComposeContentValid, isPollComposing, isPollAttributeAllValid -> Bool in -// if isPollComposing { -// return isComposeContentValid && !isComposeContentEmpty && isPollAttributeAllValid -// } else { -// return isComposeContentValid && !isComposeContentEmpty -// } -// } -// .eraseToAnyPublisher() -// -// Publishers.CombineLatest( -// isPublishBarButtonItemEnabledPrecondition1, -// isPublishBarButtonItemEnabledPrecondition2 -// ) -// .map { $0 && $1 } -// .assign(to: &$isPublishBarButtonItemEnabled) -// } -//} -// -//extension ComposeViewModel { -// private func bind( -// cell: ComposeStatusContentTableViewCell, -// tableView: UITableView -// ) { -// // bind status content character count -// Publishers.CombineLatest3( -// composeStatusAttribute.$composeContent, -// composeStatusAttribute.$isContentWarningComposing, -// composeStatusAttribute.$contentWarningContent -// ) -// .map { composeContent, isContentWarningComposing, contentWarningContent -> Int in -// let composeContent = composeContent ?? "" -// var count = composeContent.count -// if isContentWarningComposing { -// count += contentWarningContent.count -// } -// return count -// } -// .assign(to: &$characterCount) -// -// // bind content warning -// composeStatusAttribute.$isContentWarningComposing -// .receive(on: DispatchQueue.main) -// .sink { [weak cell, weak tableView] isContentWarningComposing in -// guard let cell = cell else { return } -// guard let tableView = tableView else { return } -// -// // self size input cell -// cell.statusContentWarningEditorView.isHidden = !isContentWarningComposing -// cell.statusContentWarningEditorView.alpha = 0 -// UIView.animate(withDuration: 0.33, delay: 0, options: [.curveEaseOut]) { -// cell.statusContentWarningEditorView.alpha = 1 -// tableView.beginUpdates() -// tableView.endUpdates() -// } completion: { _ in -// // do nothing -// } -// } -// .store(in: &disposeBag) -// -// cell.contentWarningContent -// .removeDuplicates() -// .receive(on: DispatchQueue.main) -// .sink { [weak tableView, weak self] text in -// guard let self = self else { return } -// // bind input data -// self.composeStatusAttribute.contentWarningContent = text -// -// // self size input cell -// guard let tableView = tableView else { return } -// UIView.performWithoutAnimation { -// tableView.beginUpdates() -// tableView.endUpdates() -// } -// } -// .store(in: &cell.disposeBag) -// -// // configure custom emoji picker -// ComposeStatusSection.configureCustomEmojiPicker( -// viewModel: customEmojiPickerInputViewModel, -// customEmojiReplaceableTextInput: cell.metaText.textView, -// disposeBag: &disposeBag -// ) -// ComposeStatusSection.configureCustomEmojiPicker( -// viewModel: customEmojiPickerInputViewModel, -// customEmojiReplaceableTextInput: cell.statusContentWarningEditorView.textView, -// disposeBag: &disposeBag -// ) -// } -//} -// -//extension ComposeViewModel { -// private func bind( -// cell: ComposeStatusPollTableViewCell, -// tableView: UITableView -// ) { -// Publishers.CombineLatest( -// $isPollComposing, -// $pollOptionAttributes -// ) -// .receive(on: DispatchQueue.main) -// .sink { [weak self] isPollComposing, pollOptionAttributes in -// guard let self = self else { return } -// guard self.isViewAppeared else { return } -// -// let cell = self.composeStatusPollTableViewCell -// guard let dataSource = cell.dataSource else { return } -// -// var snapshot = NSDiffableDataSourceSnapshot() -// snapshot.appendSections([.main]) -// var items: [ComposeStatusPollItem] = [] -// if isPollComposing { -// for attribute in pollOptionAttributes { -// items.append(.pollOption(attribute: attribute)) -// } -// if pollOptionAttributes.count < self.maxPollOptions { -// items.append(.pollOptionAppendEntry) -// } -// items.append(.pollExpiresOption(attribute: self.pollExpiresOptionAttribute)) -// } -// snapshot.appendItems(items, toSection: .main) -// -// tableView.performBatchUpdates { -// if #available(iOS 15.0, *) { -// dataSource.apply(snapshot, animatingDifferences: false) -// } else { -// dataSource.apply(snapshot, animatingDifferences: true) -// } -// } -// } -// .store(in: &disposeBag) -// -// // bind delegate -// $pollOptionAttributes -// .sink { [weak self] pollAttributes in -// guard let self = self else { return } -// pollAttributes.forEach { $0.delegate = self } -// } -// .store(in: &disposeBag) -// } -//} -// -//extension ComposeViewModel { -// private func bind( -// cell: ComposeStatusAttachmentTableViewCell, -// tableView: UITableView -// ) { -// cell.collectionViewHeightDidUpdate -// .receive(on: DispatchQueue.main) -// .sink { [weak self] _ in -// guard let _ = self else { return } -// tableView.beginUpdates() -// tableView.endUpdates() -// } -// .store(in: &disposeBag) -// -// $attachmentServices -// .removeDuplicates() -// .receive(on: DispatchQueue.main) -// .sink { [weak self] attachmentServices in -// guard let self = self else { return } -// guard self.isViewAppeared else { return } -// -// let cell = self.composeStatusAttachmentTableViewCell -// guard let dataSource = cell.dataSource else { return } -// -// var snapshot = NSDiffableDataSourceSnapshot() -// snapshot.appendSections([.main]) -// let items = attachmentServices.map { ComposeStatusAttachmentItem.attachment(attachmentService: $0) } -// snapshot.appendItems(items, toSection: .main) -// -// if #available(iOS 15.0, *) { -// dataSource.applySnapshotUsingReloadData(snapshot) -// } else { -// dataSource.apply(snapshot, animatingDifferences: false) -// } -// } -// .store(in: &disposeBag) -// -// // setup attribute updater -// $attachmentServices -// .receive(on: DispatchQueue.main) -// .debounce(for: 0.3, scheduler: DispatchQueue.main) -// .sink { attachmentServices in -// // drive service upload state -// // make image upload in the queue -// for attachmentService in attachmentServices { -// // skip when prefix N task when task finish OR fail OR uploading -// guard let currentState = attachmentService.uploadStateMachine.currentState else { break } -// if currentState is MastodonAttachmentService.UploadState.Fail { -// continue -// } -// if currentState is MastodonAttachmentService.UploadState.Finish { -// continue -// } -// if currentState is MastodonAttachmentService.UploadState.Processing { -// continue -// } -// if currentState is MastodonAttachmentService.UploadState.Uploading { -// break -// } -// // trigger uploading one by one -// if currentState is MastodonAttachmentService.UploadState.Initial { -// attachmentService.uploadStateMachine.enter(MastodonAttachmentService.UploadState.Uploading.self) -// break -// } -// } -// } -// .store(in: &disposeBag) -// -// // bind delegate -// $attachmentServices -// .sink { [weak self] attachmentServices in -// guard let self = self else { return } -// attachmentServices.forEach { $0.delegate = self } -// } -// .store(in: &disposeBag) -// } -//} diff --git a/Mastodon/Scene/Compose/ComposeViewModel+PublishState.swift b/Mastodon/Scene/Compose/ComposeViewModel+PublishState.swift deleted file mode 100644 index b9ed18c45..000000000 --- a/Mastodon/Scene/Compose/ComposeViewModel+PublishState.swift +++ /dev/null @@ -1,164 +0,0 @@ -// -// ComposeViewModel+PublishState.swift -// Mastodon -// -// Created by MainasuK Cirno on 2021-3-18. -// - -import os.log -import Foundation -import Combine -import CoreDataStack -import GameplayKit -import MastodonSDK - -//extension ComposeViewModel { -// class PublishState: GKState { -// weak var viewModel: ComposeViewModel? -// -// init(viewModel: ComposeViewModel) { -// self.viewModel = viewModel -// } -// -// override func didEnter(from previousState: GKState?) { -// os_log("%{public}s[%{public}ld], %{public}s: enter %s, previous: %s", ((#file as NSString).lastPathComponent), #line, #function, self.debugDescription, previousState.debugDescription) -// viewModel?.publishStateMachinePublisher.value = self -// } -// } -//} - -//extension ComposeViewModel.PublishState { -// class Initial: ComposeViewModel.PublishState { -// override func isValidNextState(_ stateClass: AnyClass) -> Bool { -// return stateClass == Publishing.self -// } -// } -// -// class Publishing: ComposeViewModel.PublishState { -// -// var publishingSubscription: AnyCancellable? -// -// override func isValidNextState(_ stateClass: AnyClass) -> Bool { -// return stateClass == Fail.self || stateClass == Finish.self -// } -// -// override func didEnter(from previousState: GKState?) { -// super.didEnter(from: previousState) -// guard let viewModel = viewModel, let stateMachine = stateMachine else { return } -// -// viewModel.updatePublishDate() -// -// let authenticationBox = viewModel.authenticationBox -// let domain = authenticationBox.domain -// let attachmentServices = viewModel.attachmentServices -// let mediaIDs = attachmentServices.compactMap { attachmentService in -// attachmentService.attachment.value?.id -// } -// let pollOptions: [String]? = { -// guard viewModel.isPollComposing else { return nil } -// return viewModel.pollOptionAttributes.map { attribute in attribute.option.value } -// }() -// let pollExpiresIn: Int? = { -// guard viewModel.isPollComposing else { return nil } -// return viewModel.pollExpiresOptionAttribute.expiresOption.value.seconds -// }() -// let inReplyToID: Mastodon.Entity.Status.ID? = { -// guard case let .reply(status) = viewModel.composeKind else { return nil } -// var id: Mastodon.Entity.Status.ID? -// viewModel.context.managedObjectContext.performAndWait { -// guard let replyTo = status.object(in: viewModel.context.managedObjectContext) else { return } -// id = replyTo.id -// } -// return id -// }() -// let sensitive: Bool = viewModel.isContentWarningComposing -// let spoilerText: String? = { -// let text = viewModel.composeStatusAttribute.contentWarningContent.trimmingCharacters(in: .whitespacesAndNewlines) -// guard !text.isEmpty else { -// return nil -// } -// return text -// }() -// let visibility = viewModel.selectedStatusVisibility.visibility -// -// let updateMediaQuerySubscriptions: [AnyPublisher, Error>] = { -// var subscriptions: [AnyPublisher, Error>] = [] -// for attachmentService in attachmentServices { -// guard let attachmentID = attachmentService.attachment.value?.id else { continue } -// let description = attachmentService.description.value?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "" -// guard !description.isEmpty else { continue } -// let query = Mastodon.API.Media.UpdateMediaQuery( -// file: nil, -// thumbnail: nil, -// description: description, -// focus: nil -// ) -// let subscription = viewModel.context.apiService.updateMedia( -// domain: domain, -// attachmentID: attachmentID, -// query: query, -// mastodonAuthenticationBox: authenticationBox -// ) -// subscriptions.append(subscription) -// } -// return subscriptions -// }() -// -// let idempotencyKey = viewModel.idempotencyKey.value -// -// publishingSubscription = Publishers.MergeMany(updateMediaQuerySubscriptions) -// .collect() -// .asyncMap { attachments -> Mastodon.Response.Content in -// let query = Mastodon.API.Statuses.PublishStatusQuery( -// status: viewModel.composeStatusAttribute.composeContent, -// mediaIDs: mediaIDs.isEmpty ? nil : mediaIDs, -// pollOptions: pollOptions, -// pollExpiresIn: pollExpiresIn, -// inReplyToID: inReplyToID, -// sensitive: sensitive, -// spoilerText: spoilerText, -// visibility: visibility -// ) -// return try await viewModel.context.apiService.publishStatus( -// domain: domain, -// idempotencyKey: idempotencyKey, -// query: query, -// authenticationBox: authenticationBox -// ) -// } -// .receive(on: DispatchQueue.main) -// .sink { completion in -// switch completion { -// case .failure(let error): -// os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: publish status %s", ((#file as NSString).lastPathComponent), #line, #function, error.localizedDescription) -// stateMachine.enter(Fail.self) -// case .finished: -// os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: publish status success", ((#file as NSString).lastPathComponent), #line, #function) -// stateMachine.enter(Finish.self) -// } -// } receiveValue: { response in -// os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: status %s published: %s", ((#file as NSString).lastPathComponent), #line, #function, response.value.id, response.value.uri) -// } -// } -// } -// -// class Fail: ComposeViewModel.PublishState { -// override func isValidNextState(_ stateClass: AnyClass) -> Bool { -// // allow discard publishing -// return stateClass == Publishing.self || stateClass == Discard.self -// } -// } -// -// class Discard: ComposeViewModel.PublishState { -// override func isValidNextState(_ stateClass: AnyClass) -> Bool { -// return false -// } -// } -// -// class Finish: ComposeViewModel.PublishState { -// override func isValidNextState(_ stateClass: AnyClass) -> Bool { -// return false -// } -// } -// -//} diff --git a/Mastodon/Scene/Compose/ComposeViewModel.swift b/Mastodon/Scene/Compose/ComposeViewModel.swift index 45c9f1e93..bf234b095 100644 --- a/Mastodon/Scene/Compose/ComposeViewModel.swift +++ b/Mastodon/Scene/Compose/ComposeViewModel.swift @@ -18,7 +18,7 @@ import MastodonLocalization import MastodonMeta import MastodonUI -final class ComposeViewModel: NSObject { +final class ComposeViewModel { let logger = Logger(subsystem: "ComposeViewModel", category: "ViewModel") @@ -30,91 +30,13 @@ final class ComposeViewModel: NSObject { let context: AppContext let authContext: AuthContext let kind: ComposeContentViewModel.Kind - -// var authenticationBox: MastodonAuthenticationBox { -// authContext.mastodonAuthenticationBox -// } -// -// @Published var isPollComposing = false -// @Published var isCustomEmojiComposing = false -// @Published var isContentWarningComposing = false -// -// @Published var selectedStatusVisibility: ComposeToolbarView.VisibilitySelectionType -// @Published var repliedToCellFrame: CGRect = .zero -// @Published var autoCompleteRetryLayoutTimes = 0 -// @Published var autoCompleteInfo: ComposeViewController.AutoCompleteInfo? = nil let traitCollectionDidChangePublisher = CurrentValueSubject(Void()) // use CurrentValueSubject to make initial event emit -// var isViewAppeared = false // output -// let instanceConfiguration: Mastodon.Entity.Instance.Configuration? -// var composeContentLimit: Int { -// guard let maxCharacters = instanceConfiguration?.statuses?.maxCharacters else { return 500 } -// return max(1, maxCharacters) -// } -// var maxMediaAttachments: Int { -// guard let maxMediaAttachments = instanceConfiguration?.statuses?.maxMediaAttachments else { -// return 4 -// } -// // FIXME: update timeline media preview UI -// return min(4, max(1, maxMediaAttachments)) -// // return max(1, maxMediaAttachments) -// } -// var maxPollOptions: Int { -// guard let maxOptions = instanceConfiguration?.polls?.maxOptions else { return 4 } -// return max(2, maxOptions) -// } -// -// let composeStatusAttribute = ComposeStatusItem.ComposeStatusAttribute() -// let composeStatusContentTableViewCell = ComposeStatusContentTableViewCell() -// let composeStatusAttachmentTableViewCell = ComposeStatusAttachmentTableViewCell() -// let composeStatusPollTableViewCell = ComposeStatusPollTableViewCell() -// -// // var dataSource: UITableViewDiffableDataSource? -// var customEmojiPickerDiffableDataSource: UICollectionViewDiffableDataSource? -// private(set) lazy var publishStateMachine: GKStateMachine = { -// // exclude timeline middle fetcher state -// let stateMachine = GKStateMachine(states: [ -// PublishState.Initial(viewModel: self), -// PublishState.Publishing(viewModel: self), -// PublishState.Fail(viewModel: self), -// PublishState.Discard(viewModel: self), -// PublishState.Finish(viewModel: self), -// ]) -// stateMachine.enter(PublishState.Initial.self) -// return stateMachine -// }() -// private(set) lazy var publishStateMachinePublisher = CurrentValueSubject(nil) -// private(set) var publishDate = Date() // update it when enter Publishing state -// -// // TODO: group post material into Hashable class -// var idempotencyKey = CurrentValueSubject(UUID().uuidString) -// -// // UI & UX -// @Published var title: String -// @Published var shouldDismiss = true -// @Published var isPublishBarButtonItemEnabled = false -// @Published var isMediaToolbarButtonEnabled = true -// @Published var isPollToolbarButtonEnabled = true -// @Published var characterCount = 0 -// @Published var collectionViewState: CollectionViewState = .fold -// -// // for hashtag: "# " -// // for mention: "@ " -// var preInsertedContent: String? -// -// // custom emojis -// let customEmojiViewModel: EmojiService.CustomEmojiViewModel? -// let customEmojiPickerInputViewModel = CustomEmojiPickerInputViewModel() -// @Published var isLoadingCustomEmoji = false -// -// // attachment -// @Published var attachmentServices: [MastodonAttachmentService] = [] -// -// // polls -// @Published var pollOptionAttributes: [ComposeStatusPollItem.PollOptionAttribute] = [] -// let pollExpiresOptionAttribute = ComposeStatusPollItem.PollExpiresOptionAttribute() + + // UI & UX + @Published var title: String init( context: AppContext, @@ -124,63 +46,14 @@ final class ComposeViewModel: NSObject { self.context = context self.authContext = authContext self.kind = kind + // end init -// self.title = { -// switch composeKind { -// case .post, .hashtag, .mention: return L10n.Scene.Compose.Title.newPost -// case .reply: return L10n.Scene.Compose.Title.newReply -// } -// }() -// self.selectedStatusVisibility = { -// // default private when user locked -// var visibility: ComposeToolbarView.VisibilitySelectionType = { -// guard let author = authContext.mastodonAuthenticationBox.authenticationRecord.object(in: context.managedObjectContext)?.user -// else { -// return .public -// } -// return author.locked ? .private : .public -// }() -// // set visibility for reply post -// switch composeKind { -// case .reply(let record): -// context.managedObjectContext.performAndWait { -// guard let status = record.object(in: context.managedObjectContext) else { -// assertionFailure() -// return -// } -// let repliedStatusVisibility = status.visibility -// switch repliedStatusVisibility { -// case .public, .unlisted: -// // keep default -// break -// case .private: -// visibility = .private -// case .direct: -// visibility = .direct -// case ._other: -// assertionFailure() -// break -// } -// } -// default: -// break -// } -// return visibility -// }() -// // set limit -// self.instanceConfiguration = { -// var configuration: Mastodon.Entity.Instance.Configuration? = nil -// context.managedObjectContext.performAndWait { -// guard let authentication = authContext.mastodonAuthenticationBox.authenticationRecord.object(in: context.managedObjectContext) else { return } -// configuration = authentication.instance?.configuration -// } -// return configuration -// }() -// self.customEmojiViewModel = context.emojiService.dequeueCustomEmojiViewModel(for: authContext.mastodonAuthenticationBox.domain) -// super.init() -// // end init -// -// setup(cell: composeStatusContentTableViewCell) + self.title = { + switch kind { + case .post, .hashtag, .mention: return L10n.Scene.Compose.Title.newPost + case .reply: return L10n.Scene.Compose.Title.newReply + } + }() } deinit { @@ -188,194 +61,3 @@ final class ComposeViewModel: NSObject { } } - -extension ComposeViewModel { -// func createNewPollOptionIfPossible() { -// guard pollOptionAttributes.count < maxPollOptions else { return } -// -// let attribute = ComposeStatusPollItem.PollOptionAttribute() -// pollOptionAttributes = pollOptionAttributes + [attribute] -// } -// -// func updatePublishDate() { -// publishDate = Date() -// } -} - -//extension ComposeViewModel { -// -// enum AttachmentPrecondition: Error, LocalizedError { -// case videoAttachWithPhoto -// case moreThanOneVideo -// -// var errorDescription: String? { -// return L10n.Common.Alerts.PublishPostFailure.title -// } -// -// var failureReason: String? { -// switch self { -// case .videoAttachWithPhoto: -// return L10n.Common.Alerts.PublishPostFailure.AttachmentsMessage.videoAttachWithPhoto -// case .moreThanOneVideo: -// return L10n.Common.Alerts.PublishPostFailure.AttachmentsMessage.moreThanOneVideo -// } -// } -// } -// -// // check exclusive limit: -// // - up to 1 video -// // - up to N photos -// func checkAttachmentPrecondition() throws { -// let attachmentServices = self.attachmentServices -// guard !attachmentServices.isEmpty else { return } -// var photoAttachmentServices: [MastodonAttachmentService] = [] -// var videoAttachmentServices: [MastodonAttachmentService] = [] -// attachmentServices.forEach { service in -// guard let file = service.file.value else { -// assertionFailure() -// return -// } -// switch file { -// case .jpeg, .png, .gif: -// photoAttachmentServices.append(service) -// case .other: -// videoAttachmentServices.append(service) -// } -// } -// -// if !videoAttachmentServices.isEmpty { -// guard videoAttachmentServices.count == 1 else { -// throw AttachmentPrecondition.moreThanOneVideo -// } -// guard photoAttachmentServices.isEmpty else { -// throw AttachmentPrecondition.videoAttachWithPhoto -// } -// } -// } -// -//} -// -//// MARK: - MastodonAttachmentServiceDelegate -//extension ComposeViewModel: MastodonAttachmentServiceDelegate { -// func mastodonAttachmentService(_ service: MastodonAttachmentService, uploadStateDidChange state: MastodonAttachmentService.UploadState?) { -// // trigger new output event -// attachmentServices = attachmentServices -// } -//} -// -//// MARK: - ComposePollAttributeDelegate -//extension ComposeViewModel: ComposePollAttributeDelegate { -// func composePollAttribute(_ attribute: ComposeStatusPollItem.PollOptionAttribute, pollOptionDidChange: String?) { -// // trigger update -// pollOptionAttributes = pollOptionAttributes -// } -//} -// -//extension ComposeViewModel { -// private func setup( -// cell: ComposeStatusContentTableViewCell -// ) { -// setupStatusHeader(cell: cell) -// setupStatusAuthor(cell: cell) -// setupStatusContent(cell: cell) -// } -// -// private func setupStatusHeader( -// cell: ComposeStatusContentTableViewCell -// ) { -// // configure header -// let managedObjectContext = context.managedObjectContext -// managedObjectContext.performAndWait { -// guard case let .reply(record) = self.composeKind, -// let replyTo = record.object(in: managedObjectContext) -// else { -// cell.statusView.viewModel.header = .none -// return -// } -// -// let info: StatusView.ViewModel.Header.ReplyInfo -// do { -// let content = MastodonContent( -// content: replyTo.author.displayNameWithFallback, -// emojis: replyTo.author.emojis.asDictionary -// ) -// let metaContent = try MastodonMetaContent.convert(document: content) -// info = .init(header: metaContent) -// } catch { -// let metaContent = PlaintextMetaContent(string: replyTo.author.displayNameWithFallback) -// info = .init(header: metaContent) -// } -// cell.statusView.viewModel.header = .reply(info: info) -// } -// } -// -// private func setupStatusAuthor( -// cell: ComposeStatusContentTableViewCell -// ) { -// self.context.managedObjectContext.performAndWait { -// guard let author = authenticationBox.authenticationRecord.object(in: self.context.managedObjectContext)?.user else { return } -// cell.statusView.configureAuthor(author: author) -// } -// } -// -// private func setupStatusContent( -// cell: ComposeStatusContentTableViewCell -// ) { -// switch composeKind { -// case .reply(let record): -// context.managedObjectContext.performAndWait { -// guard let status = record.object(in: context.managedObjectContext) else { return } -// let author = self.authenticationBox.authenticationRecord.object(in: context.managedObjectContext)?.user -// -// var mentionAccts: [String] = [] -// if author?.id != status.author.id { -// mentionAccts.append("@" + status.author.acct) -// } -// let mentions = status.mentions -// .filter { author?.id != $0.id } -// for mention in mentions { -// let acct = "@" + mention.acct -// guard !mentionAccts.contains(acct) else { continue } -// mentionAccts.append(acct) -// } -// for acct in mentionAccts { -// UITextChecker.learnWord(acct) -// } -// if let spoilerText = status.spoilerText, !spoilerText.isEmpty { -// self.isContentWarningComposing = true -// self.composeStatusAttribute.contentWarningContent = spoilerText -// } -// -// let initialComposeContent = mentionAccts.joined(separator: " ") -// let preInsertedContent: String? = initialComposeContent.isEmpty ? nil : initialComposeContent + " " -// self.preInsertedContent = preInsertedContent -// self.composeStatusAttribute.composeContent = preInsertedContent -// } -// case .hashtag(let hashtag): -// let initialComposeContent = "#" + hashtag -// UITextChecker.learnWord(initialComposeContent) -// let preInsertedContent = initialComposeContent + " " -// self.preInsertedContent = preInsertedContent -// self.composeStatusAttribute.composeContent = preInsertedContent -// case .mention(let record): -// context.managedObjectContext.performAndWait { -// guard let user = record.object(in: context.managedObjectContext) else { return } -// let initialComposeContent = "@" + user.acct -// UITextChecker.learnWord(initialComposeContent) -// let preInsertedContent = initialComposeContent + " " -// self.preInsertedContent = preInsertedContent -// self.composeStatusAttribute.composeContent = preInsertedContent -// } -// case .post: -// self.preInsertedContent = nil -// } -// -// // configure content warning -// if let composeContent = composeStatusAttribute.composeContent { -// cell.metaText.textView.text = composeContent -// } -// -// // configure content warning -// cell.statusContentWarningEditorView.textView.text = composeStatusAttribute.contentWarningContent -// } -//} diff --git a/Mastodon/Scene/Discovery/Community/DiscoveryCommunityViewController.swift b/Mastodon/Scene/Discovery/Community/DiscoveryCommunityViewController.swift index d592c3033..870bfc72a 100644 --- a/Mastodon/Scene/Discovery/Community/DiscoveryCommunityViewController.swift +++ b/Mastodon/Scene/Discovery/Community/DiscoveryCommunityViewController.swift @@ -33,7 +33,7 @@ final class DiscoveryCommunityViewController: UIViewController, NeedsDependency, return tableView }() - let refreshControl = UIRefreshControl() + let refreshControl = RefreshControl() deinit { os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) @@ -57,12 +57,7 @@ extension DiscoveryCommunityViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() tableView.refreshControl = refreshControl refreshControl.addTarget(self, action: #selector(DiscoveryCommunityViewController.refreshControlValueChanged(_:)), for: .valueChanged) @@ -108,7 +103,7 @@ extension DiscoveryCommunityViewController { extension DiscoveryCommunityViewController { - @objc private func refreshControlValueChanged(_ sender: UIRefreshControl) { + @objc private func refreshControlValueChanged(_ sender: RefreshControl) { if !viewModel.stateMachine.enter(DiscoveryCommunityViewModel.State.Reloading.self) { refreshControl.endRefreshing() } diff --git a/Mastodon/Scene/Discovery/Community/DiscoveryCommunityViewModel+State.swift b/Mastodon/Scene/Discovery/Community/DiscoveryCommunityViewModel+State.swift index 476832b69..5045e825a 100644 --- a/Mastodon/Scene/Discovery/Community/DiscoveryCommunityViewModel+State.swift +++ b/Mastodon/Scene/Discovery/Community/DiscoveryCommunityViewModel+State.swift @@ -125,7 +125,7 @@ extension DiscoveryCommunityViewModel.State { override func didEnter(from previousState: GKState?) { super.didEnter(from: previousState) - guard let viewModel = viewModel, let stateMachine = stateMachine else { return } + guard let viewModel else { return } switch previousState { case is Reloading: diff --git a/Mastodon/Scene/Discovery/ForYou/DiscoveryForYouViewController.swift b/Mastodon/Scene/Discovery/ForYou/DiscoveryForYouViewController.swift index ce1aadbb4..dec1d9c72 100644 --- a/Mastodon/Scene/Discovery/ForYou/DiscoveryForYouViewController.swift +++ b/Mastodon/Scene/Discovery/ForYou/DiscoveryForYouViewController.swift @@ -32,7 +32,7 @@ final class DiscoveryForYouViewController: UIViewController, NeedsDependency, Me return tableView }() - let refreshControl = UIRefreshControl() + let refreshControl = RefreshControl() deinit { os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) @@ -56,12 +56,7 @@ extension DiscoveryForYouViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() tableView.delegate = self viewModel.setupDiffableDataSource( @@ -93,7 +88,7 @@ extension DiscoveryForYouViewController { extension DiscoveryForYouViewController { - @objc private func refreshControlValueChanged(_ sender: UIRefreshControl) { + @objc private func refreshControlValueChanged(_ sender: RefreshControl) { Task { try await viewModel.fetch() } diff --git a/Mastodon/Scene/Discovery/Hashtags/DiscoveryHashtagsViewController.swift b/Mastodon/Scene/Discovery/Hashtags/DiscoveryHashtagsViewController.swift index e315f04ee..64d1231fe 100644 --- a/Mastodon/Scene/Discovery/Hashtags/DiscoveryHashtagsViewController.swift +++ b/Mastodon/Scene/Discovery/Hashtags/DiscoveryHashtagsViewController.swift @@ -32,7 +32,7 @@ final class DiscoveryHashtagsViewController: UIViewController, NeedsDependency, return tableView }() - let refreshControl = UIRefreshControl() + let refreshControl = RefreshControl() deinit { os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) @@ -56,12 +56,7 @@ extension DiscoveryHashtagsViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() tableView.refreshControl = refreshControl refreshControl.addTarget(self, action: #selector(DiscoveryHashtagsViewController.refreshControlValueChanged(_:)), for: .valueChanged) @@ -88,7 +83,7 @@ extension DiscoveryHashtagsViewController { extension DiscoveryHashtagsViewController { - @objc private func refreshControlValueChanged(_ sender: UIRefreshControl) { + @objc private func refreshControlValueChanged(_ sender: RefreshControl) { Task { @MainActor in do { try await viewModel.fetch() @@ -108,7 +103,7 @@ extension DiscoveryHashtagsViewController: UITableViewDelegate { logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): \(indexPath)") guard case let .hashtag(tag) = viewModel.diffableDataSource?.itemIdentifier(for: indexPath) else { return } let hashtagTimelineViewModel = HashtagTimelineViewModel(context: context, authContext: viewModel.authContext, hashtag: tag.name) - coordinator.present( + _ = coordinator.present( scene: .hashtagTimeline(viewModel: hashtagTimelineViewModel), from: self, transition: .show @@ -218,7 +213,7 @@ extension DiscoveryHashtagsViewController: TableViewControllerNavigateable { guard case let .hashtag(tag) = item else { return } let hashtagTimelineViewModel = HashtagTimelineViewModel(context: context, authContext: viewModel.authContext, hashtag: tag.name) - coordinator.present( + _ = coordinator.present( scene: .hashtagTimeline(viewModel: hashtagTimelineViewModel), from: self, transition: .show diff --git a/Mastodon/Scene/Discovery/News/DiscoveryNewsViewController.swift b/Mastodon/Scene/Discovery/News/DiscoveryNewsViewController.swift index 7f9efb0d9..4884aafac 100644 --- a/Mastodon/Scene/Discovery/News/DiscoveryNewsViewController.swift +++ b/Mastodon/Scene/Discovery/News/DiscoveryNewsViewController.swift @@ -32,7 +32,7 @@ final class DiscoveryNewsViewController: UIViewController, NeedsDependency, Medi return tableView }() - let refreshControl = UIRefreshControl() + let refreshControl = RefreshControl() deinit { os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) @@ -56,12 +56,7 @@ extension DiscoveryNewsViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() tableView.delegate = self viewModel.setupDiffableDataSource( @@ -101,7 +96,7 @@ extension DiscoveryNewsViewController { extension DiscoveryNewsViewController { - @objc private func refreshControlValueChanged(_ sender: UIRefreshControl) { + @objc private func refreshControlValueChanged(_ sender: RefreshControl) { guard viewModel.stateMachine.enter(DiscoveryNewsViewModel.State.Reloading.self) else { sender.endRefreshing() return @@ -117,7 +112,7 @@ extension DiscoveryNewsViewController: UITableViewDelegate { logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): \(indexPath)") guard case let .link(link) = viewModel.diffableDataSource?.itemIdentifier(for: indexPath) else { return } guard let url = URL(string: link.url) else { return } - coordinator.present( + _ = coordinator.present( scene: .safari(url: url), from: self, transition: .safariPresent(animated: true, completion: nil) @@ -214,7 +209,7 @@ extension DiscoveryNewsViewController: TableViewControllerNavigateable { guard case let .link(link) = item else { return } guard let url = URL(string: link.url) else { return } - coordinator.present( + _ = coordinator.present( scene: .safari(url: url), from: self, transition: .safariPresent(animated: true, completion: nil) diff --git a/Mastodon/Scene/Discovery/News/DiscoveryNewsViewModel+State.swift b/Mastodon/Scene/Discovery/News/DiscoveryNewsViewModel+State.swift index 7c802cde3..8170d5b1c 100644 --- a/Mastodon/Scene/Discovery/News/DiscoveryNewsViewModel+State.swift +++ b/Mastodon/Scene/Discovery/News/DiscoveryNewsViewModel+State.swift @@ -125,8 +125,7 @@ extension DiscoveryNewsViewModel.State { override func didEnter(from previousState: GKState?) { super.didEnter(from: previousState) - guard let viewModel = viewModel, let stateMachine = stateMachine else { return } - + guard let viewModel else { return } switch previousState { case is Reloading: diff --git a/Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewController.swift b/Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewController.swift index ee3538885..9d772a27e 100644 --- a/Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewController.swift +++ b/Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewController.swift @@ -32,7 +32,7 @@ final class DiscoveryPostsViewController: UIViewController, NeedsDependency, Med return tableView }() - let refreshControl = UIRefreshControl() + let refreshControl = RefreshControl() let discoveryIntroBannerView = DiscoveryIntroBannerView() @@ -58,12 +58,7 @@ extension DiscoveryPostsViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() discoveryIntroBannerView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(discoveryIntroBannerView) @@ -119,7 +114,7 @@ extension DiscoveryPostsViewController { extension DiscoveryPostsViewController { - @objc private func refreshControlValueChanged(_ sender: UIRefreshControl) { + @objc private func refreshControlValueChanged(_ sender: RefreshControl) { guard viewModel.stateMachine.enter(DiscoveryPostsViewModel.State.Reloading.self) else { sender.endRefreshing() return diff --git a/Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewModel+State.swift b/Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewModel+State.swift index 3ed245e99..fd413927e 100644 --- a/Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewModel+State.swift +++ b/Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewModel+State.swift @@ -126,7 +126,7 @@ extension DiscoveryPostsViewModel.State { override func didEnter(from previousState: GKState?) { super.didEnter(from: previousState) - guard let viewModel = viewModel, let stateMachine = stateMachine else { return } + guard let viewModel else { return } switch previousState { case is Reloading: diff --git a/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewController.swift b/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewController.swift index 42079a91e..4a0be3816 100644 --- a/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewController.swift +++ b/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewController.swift @@ -48,7 +48,7 @@ final class HashtagTimelineViewController: UIViewController, NeedsDependency, Me return tableView }() - let refreshControl = UIRefreshControl() + let refreshControl = RefreshControl() deinit { os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s:", ((#file as NSString).lastPathComponent), #line, #function) @@ -80,12 +80,7 @@ extension HashtagTimelineViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() tableView.delegate = self viewModel.setupDiffableDataSource( @@ -158,7 +153,7 @@ extension HashtagTimelineViewController { extension HashtagTimelineViewController { - @objc private func refreshControlValueChanged(_ sender: UIRefreshControl) { + @objc private func refreshControlValueChanged(_ sender: RefreshControl) { guard viewModel.stateMachine.enter(HashtagTimelineViewModel.State.Reloading.self) else { sender.endRefreshing() return diff --git a/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewModel+State.swift b/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewModel+State.swift index deb9de0a2..c35715f1e 100644 --- a/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewModel+State.swift +++ b/Mastodon/Scene/HashtagTimeline/HashtagTimelineViewModel+State.swift @@ -70,7 +70,7 @@ extension HashtagTimelineViewModel.State { override func didEnter(from previousState: GKState?) { super.didEnter(from: previousState) - guard let viewModel = viewModel, let stateMachine = stateMachine else { return } + guard let stateMachine = stateMachine else { return } stateMachine.enter(Loading.self) } @@ -127,7 +127,7 @@ extension HashtagTimelineViewModel.State { override func didEnter(from previousState: GKState?) { super.didEnter(from: previousState) - guard let viewModel = viewModel, let stateMachine = stateMachine else { return } + guard let viewModel else { return } switch previousState { case is Reloading: diff --git a/Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift b/Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift index d057c0376..ff90775ff 100644 --- a/Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift +++ b/Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift @@ -300,7 +300,7 @@ extension HomeTimelineViewController { } @objc private func showWelcomeAction(_ sender: UIAction) { - coordinator.present(scene: .welcome, from: self, transition: .modal(animated: true, completion: nil)) + _ = coordinator.present(scene: .welcome, from: self, transition: .modal(animated: true, completion: nil)) } @objc private func showRegisterAction(_ sender: UIAction) { @@ -332,12 +332,12 @@ extension HomeTimelineViewController { @objc private func showConfirmEmail(_ sender: UIAction) { let mastodonConfirmEmailViewModel = MastodonConfirmEmailViewModel() - coordinator.present(scene: .mastodonConfirmEmail(viewModel: mastodonConfirmEmailViewModel), from: nil, transition: .modal(animated: true, completion: nil)) + _ = coordinator.present(scene: .mastodonConfirmEmail(viewModel: mastodonConfirmEmailViewModel), from: nil, transition: .modal(animated: true, completion: nil)) } @objc private func showAccountList(_ sender: UIAction) { let accountListViewModel = AccountListViewModel(context: context, authContext: viewModel.authContext) - coordinator.present(scene: .accountList(viewModel: accountListViewModel), from: self, transition: .modal(animated: true, completion: nil)) + _ = coordinator.present(scene: .accountList(viewModel: accountListViewModel), from: self, transition: .modal(animated: true, completion: nil)) } @objc private func showProfileAction(_ sender: UIAction) { @@ -347,12 +347,12 @@ extension HomeTimelineViewController { guard let self = self else { return } guard let textField = alertController?.textFields?.first else { return } let profileViewModel = RemoteProfileViewModel(context: self.context, authContext: self.viewModel.authContext, userID: textField.text ?? "") - self.coordinator.present(scene: .profile(viewModel: profileViewModel), from: self, transition: .show) + _ = self.coordinator.present(scene: .profile(viewModel: profileViewModel), from: self, transition: .show) } alertController.addAction(showAction) let cancelAction = UIAlertAction(title: "Cancel", style: .cancel, handler: nil) alertController.addAction(cancelAction) - coordinator.present(scene: .alertController(alertController: alertController), from: self, transition: .alertController(animated: true, completion: nil)) + _ = coordinator.present(scene: .alertController(alertController: alertController), from: self, transition: .alertController(animated: true, completion: nil)) } @objc private func showThreadAction(_ sender: UIAction) { @@ -362,12 +362,12 @@ extension HomeTimelineViewController { guard let self = self else { return } guard let textField = alertController?.textFields?.first else { return } let threadViewModel = RemoteThreadViewModel(context: self.context, authContext: self.viewModel.authContext, statusID: textField.text ?? "") - self.coordinator.present(scene: .thread(viewModel: threadViewModel), from: self, transition: .show) + _ = self.coordinator.present(scene: .thread(viewModel: threadViewModel), from: self, transition: .show) } alertController.addAction(showAction) let cancelAction = UIAlertAction(title: "Cancel", style: .cancel, handler: nil) alertController.addAction(cancelAction) - coordinator.present(scene: .alertController(alertController: alertController), from: self, transition: .alertController(animated: true, completion: nil)) + _ = coordinator.present(scene: .alertController(alertController: alertController), from: self, transition: .alertController(animated: true, completion: nil)) } private func showNotification(_ sender: UIAction, notificationType: Mastodon.Entity.Notification.NotificationType) { @@ -436,7 +436,7 @@ extension HomeTimelineViewController { authContext: viewModel.authContext, setting: currentSetting ) - coordinator.present( + _ = coordinator.present( scene: .settings(viewModel: settingsViewModel), from: self, transition: .modal(animated: true, completion: nil) diff --git a/Mastodon/Scene/HomeTimeline/HomeTimelineViewController.swift b/Mastodon/Scene/HomeTimeline/HomeTimelineViewController.swift index 3efcd5cbe..3caafef3d 100644 --- a/Mastodon/Scene/HomeTimeline/HomeTimelineViewController.swift +++ b/Mastodon/Scene/HomeTimeline/HomeTimelineViewController.swift @@ -74,7 +74,7 @@ final class HomeTimelineViewController: UIViewController, NeedsDependency, Media return progressView }() - let refreshControl = UIRefreshControl() + let refreshControl = RefreshControl() deinit { os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s:", ((#file as NSString).lastPathComponent), #line, #function) @@ -158,12 +158,7 @@ extension HomeTimelineViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() // // layout publish progress publishProgressView.translatesAutoresizingMaskIntoConstraints = false @@ -388,17 +383,17 @@ extension HomeTimelineViewController { @objc private func manuallySearchButtonPressed(_ sender: UIButton) { os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) let searchDetailViewModel = SearchDetailViewModel(authContext: viewModel.authContext) - coordinator.present(scene: .searchDetail(viewModel: searchDetailViewModel), from: self, transition: .modal(animated: true, completion: nil)) + _ = coordinator.present(scene: .searchDetail(viewModel: searchDetailViewModel), from: self, transition: .modal(animated: true, completion: nil)) } @objc private func settingBarButtonItemPressed(_ sender: UIBarButtonItem) { os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) guard let setting = context.settingService.currentSetting.value else { return } let settingsViewModel = SettingsViewModel(context: context, authContext: viewModel.authContext, setting: setting) - coordinator.present(scene: .settings(viewModel: settingsViewModel), from: self, transition: .modal(animated: true, completion: nil)) + _ = coordinator.present(scene: .settings(viewModel: settingsViewModel), from: self, transition: .modal(animated: true, completion: nil)) } - @objc private func refreshControlValueChanged(_ sender: UIRefreshControl) { + @objc private func refreshControlValueChanged(_ sender: RefreshControl) { guard viewModel.loadLatestStateMachine.enter(HomeTimelineViewModel.LoadLatestState.Loading.self) else { sender.endRefreshing() return diff --git a/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadLatestState.swift b/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadLatestState.swift index 41cea6b58..8bf1421b1 100644 --- a/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadLatestState.swift +++ b/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadLatestState.swift @@ -62,7 +62,7 @@ extension HomeTimelineViewModel.LoadLatestState { override func didEnter(from previousState: GKState?) { super.didEnter(from: previousState) - guard let viewModel = viewModel, let stateMachine = stateMachine else { return } + guard let viewModel else { return } let latestFeedRecords = viewModel.fetchedResultsController.records.prefix(APIService.onceRequestStatusMaxCount) let parentManagedObjectContext = viewModel.fetchedResultsController.fetchedResultsController.managedObjectContext diff --git a/Mastodon/Scene/HomeTimeline/View/HomeTimelineNavigationBarTitleView.swift b/Mastodon/Scene/HomeTimeline/View/HomeTimelineNavigationBarTitleView.swift index 400b4ee98..38b80fe28 100644 --- a/Mastodon/Scene/HomeTimeline/View/HomeTimelineNavigationBarTitleView.swift +++ b/Mastodon/Scene/HomeTimeline/View/HomeTimelineNavigationBarTitleView.swift @@ -47,12 +47,7 @@ extension HomeTimelineNavigationBarTitleView { private func _init() { containerView.translatesAutoresizingMaskIntoConstraints = false addSubview(containerView) - NSLayoutConstraint.activate([ - containerView.topAnchor.constraint(equalTo: topAnchor), - containerView.leadingAnchor.constraint(equalTo: leadingAnchor), - containerView.trailingAnchor.constraint(equalTo: trailingAnchor), - containerView.bottomAnchor.constraint(equalTo: bottomAnchor), - ]) + containerView.pinToParent() containerView.addArrangedSubview(logoButton) button.translatesAutoresizingMaskIntoConstraints = false diff --git a/Mastodon/Scene/MediaPreview/Image/MediaPreviewImageView.swift b/Mastodon/Scene/MediaPreview/Image/MediaPreviewImageView.swift index 05f2ce70f..7df8861b0 100644 --- a/Mastodon/Scene/MediaPreview/Image/MediaPreviewImageView.swift +++ b/Mastodon/Scene/MediaPreview/Image/MediaPreviewImageView.swift @@ -9,6 +9,7 @@ import os.log import func AVFoundation.AVMakeRect import UIKit import FLAnimatedImage +import VisionKit final class MediaPreviewImageView: UIScrollView { @@ -28,9 +29,21 @@ final class MediaPreviewImageView: UIScrollView { tapGestureRecognizer.numberOfTapsRequired = 2 return tapGestureRecognizer }() - + private var containerFrame: CGRect? - + + private var _interaction: UIInteraction? = { + if #available(iOS 16.0, *) { + return ImageAnalysisInteraction() + } else { + return nil + } + }() + @available(iOS 16.0, *) + var liveTextInteraction: ImageAnalysisInteraction { + _interaction as! ImageAnalysisInteraction + } + override init(frame: CGRect) { super.init(frame: frame) _init() @@ -55,10 +68,13 @@ extension MediaPreviewImageView { maximumZoomScale = 4.0 addSubview(imageView) - + doubleTapGestureRecognizer.addTarget(self, action: #selector(MediaPreviewImageView.doubleTapGestureRecognizerHandler(_:))) imageView.addGestureRecognizer(doubleTapGestureRecognizer) - + if #available(iOS 16.0, *) { + imageView.addInteraction(liveTextInteraction) + } + delegate = self } @@ -112,23 +128,30 @@ extension MediaPreviewImageView { // reset to normal zoomScale = minimumZoomScale - let imageViewSize = AVMakeRect(aspectRatio: image.size, insideRect: container.bounds).size - let imageContentInset: UIEdgeInsets = { - if imageViewSize.width == container.bounds.width { - return UIEdgeInsets(top: 0.5 * (container.bounds.height - imageViewSize.height), left: 0, bottom: 0, right: 0) - } else { - return UIEdgeInsets(top: 0, left: 0.5 * (container.bounds.width - imageViewSize.width), bottom: 0, right: 0) - } - }() + let imageViewSize = AVMakeRect(aspectRatio: image.size, insideRect: container.bounds.inset(by: container.safeAreaInsets)).size imageView.frame = CGRect(origin: .zero, size: imageViewSize) if imageView.image == nil { imageView.image = image } contentSize = imageViewSize - contentInset = imageContentInset centerScrollViewContents() - contentOffset = CGPoint(x: -contentInset.left, y: -contentInset.top) + + if #available(iOS 16.0, *) { + Task.detached(priority: .userInitiated) { + do { + let analysis = try await ImageAnalyzer.shared.analyze(image, configuration: ImageAnalyzer.Configuration([.text, .machineReadableCode])) + await MainActor.run { + self.liveTextInteraction.analysis = analysis + self.liveTextInteraction.preferredInteractionTypes = .automatic + } + } catch { + await MainActor.run { + self.liveTextInteraction.preferredInteractionTypes = [] + } + } + } + } os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: setup image for container %s", ((#file as NSString).lastPathComponent), #line, #function, container.frame.debugDescription) } @@ -192,10 +215,7 @@ extension MediaPreviewImageView { frame.size = realImageSize imageView.frame = frame - let screenSize = self.frame.size - let offsetX = screenSize.width > realImageSize.width ? (screenSize.width - realImageSize.width) / 2 : 0 - let offsetY = screenSize.height > realImageSize.height ? (screenSize.height - realImageSize.height) / 2 : 0 - contentInset = UIEdgeInsets(top: offsetY, left: offsetX, bottom: offsetY, right: offsetX) + contentInset = self.safeAreaInsets // The scroll view has zoomed, so you need to re-center the contents let scrollViewSize = scrollViewVisibleSize diff --git a/Mastodon/Scene/MediaPreview/Image/MediaPreviewImageViewController.swift b/Mastodon/Scene/MediaPreview/Image/MediaPreviewImageViewController.swift index 127c4c0c0..513110d29 100644 --- a/Mastodon/Scene/MediaPreview/Image/MediaPreviewImageViewController.swift +++ b/Mastodon/Scene/MediaPreview/Image/MediaPreviewImageViewController.swift @@ -11,6 +11,7 @@ import Combine import MastodonAsset import MastodonLocalization import FLAnimatedImage +import VisionKit protocol MediaPreviewImageViewControllerDelegate: AnyObject { func mediaPreviewImageViewController(_ viewController: MediaPreviewImageViewController, tapGestureRecognizerDidTrigger tapGestureRecognizer: UITapGestureRecognizer) @@ -31,7 +32,7 @@ final class MediaPreviewImageViewController: UIViewController { let tapGestureRecognizer = UITapGestureRecognizer.singleTapGestureRecognizer let longPressGestureRecognizer = UILongPressGestureRecognizer() - + deinit { os_log("%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) previewImageView.imageView.af.cancelImageRequest() @@ -42,7 +43,10 @@ extension MediaPreviewImageViewController { override func viewDidLoad() { super.viewDidLoad() - + + if #available(iOS 16.0, *) { + previewImageView.liveTextInteraction.delegate = self + } previewImageView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(previewImageView) NSLayoutConstraint.activate([ @@ -53,7 +57,9 @@ extension MediaPreviewImageViewController { ]) tapGestureRecognizer.addTarget(self, action: #selector(MediaPreviewImageViewController.tapGestureRecognizerHandler(_:))) + tapGestureRecognizer.delegate = self longPressGestureRecognizer.addTarget(self, action: #selector(MediaPreviewImageViewController.longPressGestureRecognizerHandler(_:))) + longPressGestureRecognizer.delegate = self tapGestureRecognizer.require(toFail: previewImageView.doubleTapGestureRecognizer) tapGestureRecognizer.require(toFail: longPressGestureRecognizer) previewImageView.addGestureRecognizer(tapGestureRecognizer) @@ -105,10 +111,54 @@ extension MediaPreviewImageViewController { } +extension MediaPreviewImageViewController: MediaPreviewPage { + func setShowingChrome(_ showingChrome: Bool) { + if #available(iOS 16.0, *) { + UIView.animate(withDuration: 0.3) { + self.previewImageView.liveTextInteraction.setSupplementaryInterfaceHidden(!showingChrome, animated: true) + } + } + } +} + +// MARK: - ImageAnalysisInteractionDelegate +@available(iOS 16.0, *) +extension MediaPreviewImageViewController: ImageAnalysisInteractionDelegate { + func presentingViewController(for interaction: ImageAnalysisInteraction) -> UIViewController? { + self + } +} + +// MARK: - UIGestureRecognizerDelegate +extension MediaPreviewImageViewController: UIGestureRecognizerDelegate { + func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool { + if #available(iOS 16.0, *) { + let location = touch.location(in: previewImageView.imageView) + // for tap gestures, only items that can be tapped are relevant + if gestureRecognizer is UITapGestureRecognizer { + return !previewImageView.liveTextInteraction.hasSupplementaryInterface(at: location) + && !previewImageView.liveTextInteraction.hasDataDetector(at: location) + } else { + // for long press, block out everything + return !previewImageView.liveTextInteraction.hasInteractiveItem(at: location) + } + } else { + return true + } + } +} + // MARK: - UIContextMenuInteractionDelegate extension MediaPreviewImageViewController: UIContextMenuInteractionDelegate { func contextMenuInteraction(_ interaction: UIContextMenuInteraction, configurationForMenuAtLocation location: CGPoint) -> UIContextMenuConfiguration? { os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) + + if #available(iOS 16.0, *) { + if previewImageView.liveTextInteraction.hasInteractiveItem(at: previewImageView.imageView.convert(location, from: previewImageView)) { + return nil + } + } + let previewProvider: UIContextMenuContentPreviewProvider = { () -> UIViewController? in return nil diff --git a/Mastodon/Scene/MediaPreview/MediaPreviewViewController.swift b/Mastodon/Scene/MediaPreview/MediaPreviewViewController.swift index c6552bcba..dee6c00ea 100644 --- a/Mastodon/Scene/MediaPreview/MediaPreviewViewController.swift +++ b/Mastodon/Scene/MediaPreview/MediaPreviewViewController.swift @@ -65,12 +65,7 @@ extension MediaPreviewViewController { pagingViewController.view.translatesAutoresizingMaskIntoConstraints = false addChild(pagingViewController) visualEffectView.contentView.addSubview(pagingViewController.view) - NSLayoutConstraint.activate([ - visualEffectView.topAnchor.constraint(equalTo: pagingViewController.view.topAnchor), - visualEffectView.bottomAnchor.constraint(equalTo: pagingViewController.view.bottomAnchor), - visualEffectView.leadingAnchor.constraint(equalTo: pagingViewController.view.leadingAnchor), - visualEffectView.trailingAnchor.constraint(equalTo: pagingViewController.view.trailingAnchor), - ]) + visualEffectView.pinTo(to: pagingViewController.view) pagingViewController.didMove(toParent: self) closeButtonBackground.translatesAutoresizingMaskIntoConstraints = false @@ -137,6 +132,17 @@ extension MediaPreviewViewController { } } .store(in: &disposeBag) + + viewModel.$showingChrome + .receive(on: DispatchQueue.main) + .removeDuplicates() + .sink { [weak self] showingChrome in + UIView.animate(withDuration: 0.3) { + self?.setNeedsStatusBarAppearanceUpdate() + self?.closeButtonBackground.alpha = showingChrome ? 1 : 0 + } + } + .store(in: &disposeBag) // viewModel.$isPoping // .receive(on: DispatchQueue.main) @@ -153,6 +159,14 @@ extension MediaPreviewViewController { } +extension MediaPreviewViewController { + + override var prefersStatusBarHidden: Bool { + !viewModel.showingChrome + } + +} + extension MediaPreviewViewController { @objc private func closeButtonPressed(_ sender: UIButton) { @@ -239,8 +253,11 @@ extension MediaPreviewViewController: MediaPreviewImageViewControllerDelegate { let location = tapGestureRecognizer.location(in: viewController.previewImageView.imageView) let isContainsTap = viewController.previewImageView.imageView.frame.contains(location) - guard !isContainsTap else { return } - dismiss(animated: true, completion: nil) + if isContainsTap { + self.viewModel.showingChrome.toggle() + } else { + dismiss(animated: true, completion: nil) + } } func mediaPreviewImageViewController(_ viewController: MediaPreviewImageViewController, longPressGestureRecognizerDidTrigger longPressGestureRecognizer: UILongPressGestureRecognizer) { @@ -276,7 +293,7 @@ extension MediaPreviewViewController: MediaPreviewImageViewControllerDelegate { title: L10n.Common.Alerts.SavePhotoFailure.title, message: L10n.Common.Alerts.SavePhotoFailure.message ) - self.coordinator.present( + _ = self.coordinator.present( scene: .alertController(alertController: alertController), from: self, transition: .alertController(animated: true, completion: nil) diff --git a/Mastodon/Scene/MediaPreview/MediaPreviewViewModel.swift b/Mastodon/Scene/MediaPreview/MediaPreviewViewModel.swift index c43d24945..3f60b19e5 100644 --- a/Mastodon/Scene/MediaPreview/MediaPreviewViewModel.swift +++ b/Mastodon/Scene/MediaPreview/MediaPreviewViewModel.swift @@ -12,6 +12,10 @@ import CoreDataStack import Pageboy import MastodonCore +protocol MediaPreviewPage: UIViewController { + func setShowingChrome(_ showingChrome: Bool) +} + final class MediaPreviewViewModel: NSObject { weak var mediaPreviewImageViewControllerDelegate: MediaPreviewImageViewControllerDelegate? @@ -22,9 +26,12 @@ final class MediaPreviewViewModel: NSObject { let transitionItem: MediaPreviewTransitionItem @Published var currentPage: Int + @Published var showingChrome = true // output let viewControllers: [UIViewController] + + private var disposeBag: Set = [] init( context: AppContext, @@ -34,7 +41,7 @@ final class MediaPreviewViewModel: NSObject { self.context = context self.item = item var currentPage = 0 - var viewControllers: [UIViewController] = [] + var viewControllers: [MediaPreviewPage] = [] switch item { case .attachment(let previewContext): currentPage = previewContext.initialIndex @@ -106,6 +113,14 @@ final class MediaPreviewViewModel: NSObject { self.currentPage = currentPage self.transitionItem = transitionItem super.init() + + for viewController in viewControllers { + self.$showingChrome + .sink { [weak viewController] showingChrome in + viewController?.setShowingChrome(showingChrome) + } + .store(in: &disposeBag) + } } } diff --git a/Mastodon/Scene/MediaPreview/Video/MediaPreviewVideoViewController.swift b/Mastodon/Scene/MediaPreview/Video/MediaPreviewVideoViewController.swift index 7bdbbfed2..e924f38d4 100644 --- a/Mastodon/Scene/MediaPreview/Video/MediaPreviewVideoViewController.swift +++ b/Mastodon/Scene/MediaPreview/Video/MediaPreviewVideoViewController.swift @@ -39,23 +39,13 @@ extension MediaPreviewVideoViewController { addChild(playerViewController) playerViewController.view.translatesAutoresizingMaskIntoConstraints = false view.addSubview(playerViewController.view) - NSLayoutConstraint.activate([ - playerViewController.view.centerXAnchor.constraint(equalTo: view.centerXAnchor), - playerViewController.view.centerYAnchor.constraint(equalTo: view.centerYAnchor), - playerViewController.view.widthAnchor.constraint(equalTo: view.widthAnchor), - playerViewController.view.heightAnchor.constraint(equalTo: view.heightAnchor), - ]) + playerViewController.view.pinToParent() playerViewController.didMove(toParent: self) if let contentOverlayView = playerViewController.contentOverlayView { previewImageView.translatesAutoresizingMaskIntoConstraints = false contentOverlayView.addSubview(previewImageView) - NSLayoutConstraint.activate([ - previewImageView.topAnchor.constraint(equalTo: contentOverlayView.topAnchor), - previewImageView.leadingAnchor.constraint(equalTo: contentOverlayView.leadingAnchor), - previewImageView.trailingAnchor.constraint(equalTo: contentOverlayView.trailingAnchor), - previewImageView.bottomAnchor.constraint(equalTo: contentOverlayView.bottomAnchor), - ]) + previewImageView.pinToParent() } playerViewController.delegate = self @@ -90,6 +80,12 @@ extension MediaPreviewVideoViewController { } } + override func viewDidLayoutSubviews() { + super.viewDidLayoutSubviews() + + playerViewController.didMove(toParent: self) + } + } // MARK: - ShareActivityProvider @@ -111,6 +107,12 @@ extension MediaPreviewVideoViewController { // } //} +extension MediaPreviewVideoViewController: MediaPreviewPage { + func setShowingChrome(_ showingChrome: Bool) { + // TODO: does this do anything? + } +} + // MARK: - AVPlayerViewControllerDelegate extension MediaPreviewVideoViewController: AVPlayerViewControllerDelegate { diff --git a/Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewController.swift b/Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewController.swift index 00e2a9fc8..9b7416afc 100644 --- a/Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewController.swift +++ b/Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewController.swift @@ -26,8 +26,8 @@ final class NotificationTimelineViewController: UIViewController, NeedsDependenc var viewModel: NotificationTimelineViewModel! - private(set) lazy var refreshControl: UIRefreshControl = { - let refreshControl = UIRefreshControl() + private(set) lazy var refreshControl: RefreshControl = { + let refreshControl = RefreshControl() refreshControl.addTarget(self, action: #selector(NotificationTimelineViewController.refreshControlValueChanged(_:)), for: .valueChanged) return refreshControl }() @@ -55,12 +55,7 @@ extension NotificationTimelineViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() tableView.delegate = self viewModel.setupDiffableDataSource( @@ -137,7 +132,7 @@ extension NotificationTimelineViewController: CellFrameCacheContainer { extension NotificationTimelineViewController { - @objc private func refreshControlValueChanged(_ sender: UIRefreshControl) { + @objc private func refreshControlValueChanged(_ sender: RefreshControl) { logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public)") Task { diff --git a/Mastodon/Scene/Onboarding/ConfirmEmail/MastodonConfirmEmailViewController.swift b/Mastodon/Scene/Onboarding/ConfirmEmail/MastodonConfirmEmailViewController.swift index a90da1e81..ae8a4933e 100644 --- a/Mastodon/Scene/Onboarding/ConfirmEmail/MastodonConfirmEmailViewController.swift +++ b/Mastodon/Scene/Onboarding/ConfirmEmail/MastodonConfirmEmailViewController.swift @@ -189,7 +189,7 @@ extension MastodonConfirmEmailViewController { alertController.addAction(openEmailAction) alertController.addAction(cancelAction) alertController.preferredAction = openEmailAction - self.coordinator.present(scene: .alertController(alertController: alertController), from: self, transition: .alertController(animated: true, completion: nil)) + _ = self.coordinator.present(scene: .alertController(alertController: alertController), from: self, transition: .alertController(animated: true, completion: nil)) } @objc private func resendButtonPressed(_ sender: UIButton) { @@ -197,18 +197,17 @@ extension MastodonConfirmEmailViewController { let resendAction = UIAlertAction(title: L10n.Scene.ConfirmEmail.DontReceiveEmail.resendEmail, style: .default) { _ in let url = Mastodon.API.resendEmailURL(domain: self.viewModel.authenticateInfo.domain) let viewModel = MastodonResendEmailViewModel(resendEmailURL: url, email: self.viewModel.email) - self.coordinator.present(scene: .mastodonResendEmail(viewModel: viewModel), from: self, transition: .modal(animated: true, completion: nil)) + _ = self.coordinator.present(scene: .mastodonResendEmail(viewModel: viewModel), from: self, transition: .modal(animated: true, completion: nil)) } let okAction = UIAlertAction(title: L10n.Common.Controls.Actions.ok, style: .default) { _ in } alertController.addAction(resendAction) alertController.addAction(okAction) - self.coordinator.present(scene: .alertController(alertController: alertController), from: self, transition: .alertController(animated: true, completion: nil)) + _ = self.coordinator.present(scene: .alertController(alertController: alertController), from: self, transition: .alertController(animated: true, completion: nil)) } func showEmailAppAlert() { let clients = ThirdPartyMailClient.clients - let application = UIApplication.shared let availableClients = clients.filter { client -> Bool in ThirdPartyMailer.isMailClientAvailable(client) } @@ -220,14 +219,14 @@ extension MastodonConfirmEmailViewController { alertController.addAction(alertAction) _ = availableClients.compactMap { client -> UIAlertAction in let alertAction = UIAlertAction(title: client.name, style: .default) { _ in - _ = ThirdPartyMailer.open(client, completionHandler: nil) + ThirdPartyMailer.open(client, completionHandler: nil) } alertController.addAction(alertAction) return alertAction } let cancelAction = UIAlertAction(title: L10n.Common.Controls.Actions.cancel, style: .cancel, handler: nil) alertController.addAction(cancelAction) - self.coordinator.present(scene: .alertController(alertController: alertController), from: self, transition: .alertController(animated: true, completion: nil)) + _ = self.coordinator.present(scene: .alertController(alertController: alertController), from: self, transition: .alertController(animated: true, completion: nil)) } } diff --git a/Mastodon/Scene/Onboarding/Login/ContentSizedTableView.swift b/Mastodon/Scene/Onboarding/Login/ContentSizedTableView.swift new file mode 100644 index 000000000..e0c8a9228 --- /dev/null +++ b/Mastodon/Scene/Onboarding/Login/ContentSizedTableView.swift @@ -0,0 +1,22 @@ +// +// MastodonLoginTableView.swift +// Mastodon +// +// Created by Nathan Mattes on 13.11.22. +// + +import UIKit + +// Source: https://stackoverflow.com/a/48623673 +final class ContentSizedTableView: UITableView { + override var contentSize:CGSize { + didSet { + invalidateIntrinsicContentSize() + } + } + + override var intrinsicContentSize: CGSize { + layoutIfNeeded() + return CGSize(width: UIView.noIntrinsicMetric, height: contentSize.height) + } +} diff --git a/Mastodon/Scene/Onboarding/Login/MastodonLoginServerTableViewCell.swift b/Mastodon/Scene/Onboarding/Login/MastodonLoginServerTableViewCell.swift new file mode 100644 index 000000000..2fb599015 --- /dev/null +++ b/Mastodon/Scene/Onboarding/Login/MastodonLoginServerTableViewCell.swift @@ -0,0 +1,12 @@ +// +// MastodonLoginServerTableViewCell.swift +// Mastodon +// +// Created by Nathan Mattes on 11.11.22. +// + +import UIKit + +class MastodonLoginServerTableViewCell: UITableViewCell { + static let reuseIdentifier = "MastodonLoginServerTableViewCell" +} diff --git a/Mastodon/Scene/Onboarding/Login/MastodonLoginView.swift b/Mastodon/Scene/Onboarding/Login/MastodonLoginView.swift new file mode 100644 index 000000000..d5f8b51d4 --- /dev/null +++ b/Mastodon/Scene/Onboarding/Login/MastodonLoginView.swift @@ -0,0 +1,151 @@ +// +// MastodonLoginView.swift +// Mastodon +// +// Created by Nathan Mattes on 10.11.22. +// + +import UIKit +import MastodonAsset +import MastodonLocalization + +class MastodonLoginView: UIView { + + // List with (filtered) domains + + let titleLabel: UILabel + let subtitleLabel: UILabel + private let headerStackView: UIStackView + + let searchTextField: UITextField + private let searchTextFieldLeftView: UIView + private let searchTextFieldMagnifyingGlass: UIImageView + private let searchContainerLeftPaddingView: UIView + + let tableView: UITableView + let navigationActionView: NavigationActionView + var bottomConstraint: NSLayoutConstraint? + + override init(frame: CGRect) { + + titleLabel = UILabel() + titleLabel.font = MastodonLoginViewController.largeTitleFont + titleLabel.textColor = MastodonLoginViewController.largeTitleTextColor + titleLabel.text = L10n.Scene.Login.title + titleLabel.numberOfLines = 0 + + subtitleLabel = UILabel() + subtitleLabel.font = MastodonLoginViewController.subTitleFont + subtitleLabel.textColor = MastodonLoginViewController.subTitleTextColor + subtitleLabel.text = L10n.Scene.Login.subtitle + subtitleLabel.numberOfLines = 0 + + headerStackView = UIStackView(arrangedSubviews: [titleLabel, subtitleLabel]) + headerStackView.axis = .vertical + headerStackView.spacing = 16 + headerStackView.translatesAutoresizingMaskIntoConstraints = false + + searchTextFieldMagnifyingGlass = UIImageView(image: UIImage( + systemName: "magnifyingglass", + withConfiguration: UIImage.SymbolConfiguration(pointSize: 15, weight: .regular) + )) + searchTextFieldMagnifyingGlass.tintColor = Asset.Colors.Label.secondary.color.withAlphaComponent(0.6) + searchTextFieldMagnifyingGlass.translatesAutoresizingMaskIntoConstraints = false + + searchContainerLeftPaddingView = UIView() + searchContainerLeftPaddingView.translatesAutoresizingMaskIntoConstraints = false + + searchTextFieldLeftView = UIView() + searchTextFieldLeftView.addSubview(searchTextFieldMagnifyingGlass) + searchTextFieldLeftView.addSubview(searchContainerLeftPaddingView) + + searchTextField = UITextField() + searchTextField.translatesAutoresizingMaskIntoConstraints = false + searchTextField.backgroundColor = Asset.Scene.Onboarding.searchBarBackground.color + searchTextField.placeholder = L10n.Scene.Login.ServerSearchField.placeholder + searchTextField.leftView = searchTextFieldLeftView + searchTextField.leftViewMode = .always + searchTextField.layer.cornerRadius = 10 + searchTextField.keyboardType = .URL + searchTextField.autocorrectionType = .no + searchTextField.autocapitalizationType = .none + + tableView = ContentSizedTableView() + tableView.translatesAutoresizingMaskIntoConstraints = false + tableView.backgroundColor = Asset.Scene.Onboarding.textFieldBackground.color + tableView.keyboardDismissMode = .onDrag + tableView.layer.cornerRadius = 10 + + navigationActionView = NavigationActionView() + navigationActionView.translatesAutoresizingMaskIntoConstraints = false + + super.init(frame: frame) + + addSubview(headerStackView) + addSubview(searchTextField) + addSubview(tableView) + addSubview(navigationActionView) + backgroundColor = Asset.Scene.Onboarding.background.color + + setupConstraints() + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + private func setupConstraints() { + + let bottomConstraint = safeAreaLayoutGuide.bottomAnchor.constraint(equalTo: navigationActionView.bottomAnchor) + + let constraints = [ + + headerStackView.topAnchor.constraint(equalTo: safeAreaLayoutGuide.topAnchor), + headerStackView.leadingAnchor.constraint(equalTo: readableContentGuide.leadingAnchor), + headerStackView.trailingAnchor.constraint(equalTo: readableContentGuide.trailingAnchor), + + searchTextField.topAnchor.constraint(equalTo: headerStackView.bottomAnchor, constant: 32), + searchTextField.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 16), + searchTextField.heightAnchor.constraint(equalToConstant: 55), + trailingAnchor.constraint(equalTo: searchTextField.trailingAnchor, constant: 16), + + searchTextFieldMagnifyingGlass.topAnchor.constraint(equalTo: searchTextFieldLeftView.topAnchor), + searchTextFieldMagnifyingGlass.leadingAnchor.constraint(equalTo: searchTextFieldLeftView.leadingAnchor, constant: 8), + searchTextFieldMagnifyingGlass.bottomAnchor.constraint(equalTo: searchTextFieldLeftView.bottomAnchor), + + searchContainerLeftPaddingView.topAnchor.constraint(equalTo: searchTextFieldLeftView.topAnchor), + searchContainerLeftPaddingView.leadingAnchor.constraint(equalTo: searchTextFieldMagnifyingGlass.trailingAnchor), + searchContainerLeftPaddingView.trailingAnchor.constraint(equalTo: searchTextFieldLeftView.trailingAnchor), + searchContainerLeftPaddingView.bottomAnchor.constraint(equalTo: searchTextFieldLeftView.bottomAnchor), + searchContainerLeftPaddingView.widthAnchor.constraint(equalToConstant: 4).priority(.defaultHigh), + + tableView.topAnchor.constraint(equalTo: searchTextField.bottomAnchor, constant: 2), + tableView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 16), + trailingAnchor.constraint(equalTo: tableView.trailingAnchor, constant: 16), + tableView.bottomAnchor.constraint(lessThanOrEqualTo: navigationActionView.topAnchor), + + navigationActionView.leadingAnchor.constraint(equalTo: leadingAnchor), + navigationActionView.trailingAnchor.constraint(equalTo: trailingAnchor), + bottomConstraint, + ] + + self.bottomConstraint = bottomConstraint + NSLayoutConstraint.activate(constraints) + } + + func updateCorners(numberOfResults: Int = 0) { + + tableView.isHidden = (numberOfResults == 0) + tableView.layer.maskedCorners = [.layerMinXMaxYCorner, .layerMaxXMaxYCorner] + + let maskedCorners: CACornerMask + + if numberOfResults == 0 { + maskedCorners = [.layerMinXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMinYCorner, .layerMaxXMaxYCorner] + } else { + maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner] + } + + searchTextField.layer.maskedCorners = maskedCorners + } +} diff --git a/Mastodon/Scene/Onboarding/Login/MastodonLoginViewController.swift b/Mastodon/Scene/Onboarding/Login/MastodonLoginViewController.swift new file mode 100644 index 000000000..e9965fdde --- /dev/null +++ b/Mastodon/Scene/Onboarding/Login/MastodonLoginViewController.swift @@ -0,0 +1,288 @@ +// +// MastodonLoginViewController.swift +// Mastodon +// +// Created by Nathan Mattes on 09.11.22. +// + +import UIKit +import MastodonSDK +import MastodonCore +import MastodonAsset +import Combine +import AuthenticationServices + +protocol MastodonLoginViewControllerDelegate: AnyObject { + func backButtonPressed(_ viewController: MastodonLoginViewController) + func nextButtonPressed(_ viewController: MastodonLoginViewController) +} + +enum MastodonLoginViewSection: Hashable { + case servers +} + +class MastodonLoginViewController: UIViewController, NeedsDependency { + + weak var delegate: MastodonLoginViewControllerDelegate? + var dataSource: UITableViewDiffableDataSource? + let viewModel: MastodonLoginViewModel + let authenticationViewModel: AuthenticationViewModel + var mastodonAuthenticationController: MastodonAuthenticationController? + + weak var context: AppContext! + weak var coordinator: SceneCoordinator! + + var disposeBag = Set() + + var contentView: MastodonLoginView { + view as! MastodonLoginView + } + + init(appContext: AppContext, authenticationViewModel: AuthenticationViewModel, sceneCoordinator: SceneCoordinator) { + + viewModel = MastodonLoginViewModel(appContext: appContext) + self.authenticationViewModel = authenticationViewModel + self.context = appContext + self.coordinator = sceneCoordinator + + super.init(nibName: nil, bundle: nil) + viewModel.delegate = self + + navigationItem.hidesBackButton = true + } + + required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") } + + override func loadView() { + let loginView = MastodonLoginView() + + loginView.navigationActionView.nextButton.addTarget(self, action: #selector(MastodonLoginViewController.nextButtonPressed(_:)), for: .touchUpInside) + loginView.navigationActionView.backButton.addTarget(self, action: #selector(MastodonLoginViewController.backButtonPressed(_:)), for: .touchUpInside) + loginView.searchTextField.addTarget(self, action: #selector(MastodonLoginViewController.textfieldDidChange(_:)), for: .editingChanged) + loginView.tableView.delegate = self + loginView.tableView.register(MastodonLoginServerTableViewCell.self, forCellReuseIdentifier: MastodonLoginServerTableViewCell.reuseIdentifier) + loginView.navigationActionView.nextButton.isEnabled = false + + view = loginView + } + + override func viewDidLoad() { + super.viewDidLoad() + + NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShowNotification(_:)), name: UIResponder.keyboardWillShowNotification, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHideNotification(_:)), name: UIResponder.keyboardWillHideNotification, object: nil) + + let dataSource = UITableViewDiffableDataSource(tableView: contentView.tableView) { [weak self] tableView, indexPath, itemIdentifier in + guard let cell = tableView.dequeueReusableCell(withIdentifier: MastodonLoginServerTableViewCell.reuseIdentifier, for: indexPath) as? MastodonLoginServerTableViewCell, + let self = self else { + fatalError("Wrong cell") + } + + let server = self.viewModel.filteredServers[indexPath.row] + var configuration = cell.defaultContentConfiguration() + configuration.text = server.domain + + cell.contentConfiguration = configuration + cell.accessoryType = .disclosureIndicator + + cell.backgroundColor = Asset.Scene.Onboarding.textFieldBackground.color + + return cell + } + + contentView.tableView.dataSource = dataSource + self.dataSource = dataSource + + contentView.updateCorners() + + defer { setupNavigationBarBackgroundView() } + setupOnboardingAppearance() + } + + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + + viewModel.updateServers() + } + + override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + + contentView.searchTextField.becomeFirstResponder() + } + + //MARK: - Actions + + @objc func backButtonPressed(_ sender: Any) { + contentView.searchTextField.resignFirstResponder() + delegate?.backButtonPressed(self) + } + + @objc func nextButtonPressed(_ sender: Any) { + contentView.searchTextField.resignFirstResponder() + delegate?.nextButtonPressed(self) + } + + @objc func login() { + guard let server = viewModel.selectedServer else { return } + + authenticationViewModel + .authenticated + .asyncMap { domain, user -> Result in + do { + let result = try await self.context.authenticationService.activeMastodonUser(domain: domain, userID: user.id) + return .success(result) + } catch { + return .failure(error) + } + } + .receive(on: DispatchQueue.main) + .sink { [weak self] result in + guard let self = self else { return } + switch result { + case .failure(let error): + assertionFailure(error.localizedDescription) + case .success(let isActived): + assert(isActived) + self.coordinator.setup() + } + } + .store(in: &disposeBag) + + authenticationViewModel.isAuthenticating.send(true) + context.apiService.createApplication(domain: server.domain) + .tryMap { response -> AuthenticationViewModel.AuthenticateInfo in + let application = response.value + guard let info = AuthenticationViewModel.AuthenticateInfo( + domain: server.domain, + application: application, + redirectURI: response.value.redirectURI ?? APIService.oauthCallbackURL + ) else { + throw APIService.APIError.explicit(.badResponse) + } + return info + } + .receive(on: DispatchQueue.main) + .sink { [weak self] completion in + guard let self = self else { return } + self.authenticationViewModel.isAuthenticating.send(false) + + switch completion { + case .failure(let error): + let alert = UIAlertController.standardAlert(of: error) + self.present(alert, animated: true) + case .finished: + // do nothing. There's a subscriber above resulting in `coordinator.setup()` + break + } + } receiveValue: { [weak self] info in + guard let self else { return } + let authenticationController = MastodonAuthenticationController( + context: self.context, + authenticateURL: info.authorizeURL + ) + + self.mastodonAuthenticationController = authenticationController + authenticationController.authenticationSession?.presentationContextProvider = self + authenticationController.authenticationSession?.start() + + self.authenticationViewModel.authenticate( + info: info, + pinCodePublisher: authenticationController.pinCodePublisher + ) + } + .store(in: &disposeBag) + } + + @objc func textfieldDidChange(_ textField: UITextField) { + viewModel.filterServers(withText: textField.text) + + + if let text = textField.text, + let domain = AuthenticationViewModel.parseDomain(from: text) { + + viewModel.selectedServer = .init(domain: domain, instance: .init(domain: domain)) + contentView.navigationActionView.nextButton.isEnabled = true + } else { + viewModel.selectedServer = nil + contentView.navigationActionView.nextButton.isEnabled = false + } + } + + // MARK: - Notifications + @objc func keyboardWillShowNotification(_ notification: Notification) { + + guard let userInfo = notification.userInfo, + let keyboardFrameValue = userInfo[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue, + let duration = userInfo[UIResponder.keyboardAnimationDurationUserInfoKey] as? NSNumber + else { return } + + // inspired by https://stackoverflow.com/a/30245044 + let keyboardFrame = keyboardFrameValue.cgRectValue + + let keyboardOrigin = view.convert(keyboardFrame.origin, from: nil) + let intersectionY = CGRectGetMaxY(view.frame) - keyboardOrigin.y; + + if intersectionY >= 0 { + contentView.bottomConstraint?.constant = intersectionY - view.safeAreaInsets.bottom + } + + UIView.animate(withDuration: duration.doubleValue, delay: 0, options: .curveEaseInOut) { + self.view.layoutIfNeeded() + } + } + + @objc func keyboardWillHideNotification(_ notification: Notification) { + + guard let userInfo = notification.userInfo, + let duration = userInfo[UIResponder.keyboardAnimationDurationUserInfoKey] as? NSNumber + else { return } + + contentView.bottomConstraint?.constant = 0 + + UIView.animate(withDuration: duration.doubleValue, delay: 0, options: .curveEaseInOut) { + self.view.layoutIfNeeded() + } + } +} + +// MARK: - OnboardingViewControllerAppearance +extension MastodonLoginViewController: OnboardingViewControllerAppearance { } + +// MARK: - UITableViewDelegate +extension MastodonLoginViewController: UITableViewDelegate { + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + let server = viewModel.filteredServers[indexPath.row] + viewModel.selectedServer = server + + contentView.searchTextField.text = server.domain + viewModel.filterServers(withText: " ") + + contentView.navigationActionView.nextButton.isEnabled = true + tableView.deselectRow(at: indexPath, animated: true) + } +} + +// MARK: - MastodonLoginViewModelDelegate +extension MastodonLoginViewController: MastodonLoginViewModelDelegate { + func serversUpdated(_ viewModel: MastodonLoginViewModel) { + var snapshot = NSDiffableDataSourceSnapshot() + + snapshot.appendSections([MastodonLoginViewSection.servers]) + snapshot.appendItems(viewModel.filteredServers) + + dataSource?.applySnapshot(snapshot, animated: false) + + OperationQueue.main.addOperation { + let numberOfResults = viewModel.filteredServers.count + self.contentView.updateCorners(numberOfResults: numberOfResults) + } + } +} + +// MARK: - ASWebAuthenticationPresentationContextProviding +extension MastodonLoginViewController: ASWebAuthenticationPresentationContextProviding { + func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor { + return view.window! + } +} diff --git a/Mastodon/Scene/Onboarding/Login/MastodonLoginViewModel.swift b/Mastodon/Scene/Onboarding/Login/MastodonLoginViewModel.swift new file mode 100644 index 000000000..61311a1b9 --- /dev/null +++ b/Mastodon/Scene/Onboarding/Login/MastodonLoginViewModel.swift @@ -0,0 +1,57 @@ +// +// MastodonLoginViewModel.swift +// Mastodon +// +// Created by Nathan Mattes on 11.11.22. +// + +import Foundation +import MastodonSDK +import MastodonCore +import Combine + +protocol MastodonLoginViewModelDelegate: AnyObject { + func serversUpdated(_ viewModel: MastodonLoginViewModel) +} + +class MastodonLoginViewModel { + + private var serverList: [Mastodon.Entity.Server] = [] + var selectedServer: Mastodon.Entity.Server? + var filteredServers: [Mastodon.Entity.Server] = [] + + weak var appContext: AppContext? + weak var delegate: MastodonLoginViewModelDelegate? + var disposeBag = Set() + + init(appContext: AppContext) { + self.appContext = appContext + } + + func updateServers() { + appContext?.apiService.servers().sink(receiveCompletion: { [weak self] completion in + switch completion { + case .finished: + guard let self = self else { return } + + self.delegate?.serversUpdated(self) + case .failure(let error): + print(error) + } + }, receiveValue: { content in + let servers = content.value + self.serverList = servers + }).store(in: &disposeBag) + } + + func filterServers(withText query: String?) { + guard let query else { + filteredServers = serverList + delegate?.serversUpdated(self) + return + } + + filteredServers = serverList.filter { $0.domain.lowercased().contains(query) }.sorted {$0.totalUsers > $1.totalUsers } + delegate?.serversUpdated(self) + } +} diff --git a/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift b/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift index eb26f75be..7e832ddca 100644 --- a/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift +++ b/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift @@ -143,8 +143,7 @@ extension MastodonPickServerViewController { viewModel.setupDiffableDataSource( for: tableView, dependency: self, - pickServerServerSectionTableHeaderViewDelegate: self, - pickServerCellDelegate: self + pickServerServerSectionTableHeaderViewDelegate: self ) KeyboardResponderService @@ -172,7 +171,7 @@ extension MastodonPickServerViewController { let alertController = UIAlertController(for: error, title: "Error", preferredStyle: .alert) let okAction = UIAlertAction(title: L10n.Common.Controls.Actions.ok, style: .default, handler: nil) alertController.addAction(okAction) - self.coordinator.present( + _ = self.coordinator.present( scene: .alertController(alertController: alertController), from: nil, transition: .alertController(animated: true, completion: nil) @@ -271,59 +270,6 @@ extension MastodonPickServerViewController { } @objc private func nextButtonDidPressed(_ sender: UIButton) { - switch viewModel.mode { - case .signIn: doSignIn() - case .signUp: doSignUp() - } - } - - private func doSignIn() { - guard let server = viewModel.selectedServer.value else { return } - authenticationViewModel.isAuthenticating.send(true) - context.apiService.createApplication(domain: server.domain) - .tryMap { response -> AuthenticationViewModel.AuthenticateInfo in - let application = response.value - guard let info = AuthenticationViewModel.AuthenticateInfo( - domain: server.domain, - application: application, - redirectURI: response.value.redirectURI ?? APIService.oauthCallbackURL - ) else { - throw APIService.APIError.explicit(.badResponse) - } - return info - } - .receive(on: DispatchQueue.main) - .sink { [weak self] completion in - guard let self = self else { return } - self.authenticationViewModel.isAuthenticating.send(false) - - switch completion { - case .failure(let error): - os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: sign in fail: %s", ((#file as NSString).lastPathComponent), #line, #function, error.localizedDescription) - self.viewModel.error.send(error) - case .finished: - break - } - } receiveValue: { [weak self] info in - guard let self = self else { return } - let authenticationController = MastodonAuthenticationController( - context: self.context, - authenticateURL: info.authorizeURL - ) - - self.mastodonAuthenticationController = authenticationController - authenticationController.authenticationSession?.presentationContextProvider = self - authenticationController.authenticationSession?.start() - - self.authenticationViewModel.authenticate( - info: info, - pinCodePublisher: authenticationController.pinCodePublisher - ) - } - .store(in: &disposeBag) - } - - private func doSignUp() { os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) guard let server = viewModel.selectedServer.value else { return } authenticationViewModel.isAuthenticating.send(true) @@ -394,7 +340,7 @@ extension MastodonPickServerViewController { instance: response.instance.value, applicationToken: response.applicationToken.value ) - self.coordinator.present(scene: .mastodonServerRules(viewModel: mastodonServerRulesViewModel), from: self, transition: .show) + _ = self.coordinator.present(scene: .mastodonServerRules(viewModel: mastodonServerRulesViewModel), from: self, transition: .show) } else { let mastodonRegisterViewModel = MastodonRegisterViewModel( context: self.context, @@ -403,7 +349,7 @@ extension MastodonPickServerViewController { instance: response.instance.value, applicationToken: response.applicationToken.value ) - self.coordinator.present(scene: .mastodonRegister(viewModel: mastodonRegisterViewModel), from: nil, transition: .show) + _ = self.coordinator.present(scene: .mastodonRegister(viewModel: mastodonRegisterViewModel), from: nil, transition: .show) } } .store(in: &disposeBag) @@ -503,17 +449,5 @@ extension MastodonPickServerViewController: PickServerServerSectionTableHeaderVi } } -// MARK: - PickServerCellDelegate -extension MastodonPickServerViewController: PickServerCellDelegate { - -} - // MARK: - OnboardingViewControllerAppearance extension MastodonPickServerViewController: OnboardingViewControllerAppearance { } - -// MARK: - ASWebAuthenticationPresentationContextProviding -extension MastodonPickServerViewController: ASWebAuthenticationPresentationContextProviding { - func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor { - return view.window! - } -} diff --git a/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewModel+Diffable.swift b/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewModel+Diffable.swift index 35de40b8f..7edbfd2ac 100644 --- a/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewModel+Diffable.swift +++ b/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewModel+Diffable.swift @@ -13,8 +13,7 @@ extension MastodonPickServerViewModel { func setupDiffableDataSource( for tableView: UITableView, dependency: NeedsDependency, - pickServerServerSectionTableHeaderViewDelegate: PickServerServerSectionTableHeaderViewDelegate, - pickServerCellDelegate: PickServerCellDelegate + pickServerServerSectionTableHeaderViewDelegate: PickServerServerSectionTableHeaderViewDelegate ) { // set section header serverSectionHeaderView.diffableDataSource = CategoryPickerSection.collectionViewDiffableDataSource( @@ -34,8 +33,7 @@ extension MastodonPickServerViewModel { // set tableView diffableDataSource = PickServerSection.tableViewDiffableDataSource( for: tableView, - dependency: dependency, - pickServerCellDelegate: pickServerCellDelegate + dependency: dependency ) var snapshot = NSDiffableDataSourceSnapshot() diff --git a/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewModel.swift b/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewModel.swift index 50c1d7aac..ebbcfe7fd 100644 --- a/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewModel.swift +++ b/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewModel.swift @@ -17,12 +17,7 @@ import MastodonCore import MastodonUI class MastodonPickServerViewModel: NSObject { - - enum PickServerMode { - case signUp - case signIn - } - + enum EmptyStateViewState { case none case loading @@ -34,7 +29,6 @@ class MastodonPickServerViewModel: NSObject { let serverSectionHeaderView = PickServerServerSectionTableHeaderView() // input - let mode: PickServerMode let context: AppContext var categoryPickerItems: [CategoryPickerItem] = { var items: [CategoryPickerItem] = [] @@ -72,9 +66,8 @@ class MastodonPickServerViewModel: NSObject { let loadingIndexedServersError = CurrentValueSubject(nil) let emptyStateViewState = CurrentValueSubject(.none) - init(context: AppContext, mode: PickServerMode) { + init(context: AppContext) { self.context = context - self.mode = mode super.init() configure() @@ -115,9 +108,7 @@ extension MastodonPickServerViewModel { .map { indexedServers, selectCategoryItem, searchText -> [Mastodon.Entity.Server] in // ignore approval required servers when sign-up var indexedServers = indexedServers - if self.mode == .signUp { - indexedServers = indexedServers.filter { !$0.approvalRequired } - } + indexedServers = indexedServers.filter { !$0.approvalRequired } // Note: // sort by calculate last week users count // and make medium size (~800) server to top diff --git a/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerCell.swift b/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerCell.swift index 669067770..4cbe77b9c 100644 --- a/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerCell.swift +++ b/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerCell.swift @@ -14,14 +14,8 @@ import Kanna import MastodonAsset import MastodonLocalization -protocol PickServerCellDelegate: AnyObject { -// func pickServerCell(_ cell: PickServerCell, expandButtonPressed button: UIButton) -} - class PickServerCell: UITableViewCell { - weak var delegate: PickServerCellDelegate? - var disposeBag = Set() let containerView: UIStackView = { @@ -88,7 +82,7 @@ class PickServerCell: UITableViewCell { label.adjustsFontForContentSizeCategory = true return label }() - + private var collapseConstraints: [NSLayoutConstraint] = [] private var expandConstraints: [NSLayoutConstraint] = [] diff --git a/Mastodon/Scene/Onboarding/PickServer/View/PickServerCategoryView.swift b/Mastodon/Scene/Onboarding/PickServer/View/PickServerCategoryView.swift index 9d6cfc85f..aba5a87dc 100644 --- a/Mastodon/Scene/Onboarding/PickServer/View/PickServerCategoryView.swift +++ b/Mastodon/Scene/Onboarding/PickServer/View/PickServerCategoryView.swift @@ -19,13 +19,6 @@ class PickServerCategoryView: UIView { return view }() - let emojiLabel: UILabel = { - let label = UILabel() - label.textAlignment = .center - label.font = .systemFont(ofSize: 34, weight: .regular) - return label - }() - let titleLabel: UILabel = { let label = UILabel() label.textAlignment = .center @@ -50,23 +43,18 @@ extension PickServerCategoryView { private func configure() { let container = UIStackView() container.axis = .vertical + container.spacing = 2 container.distribution = .fillProportionally container.translatesAutoresizingMaskIntoConstraints = false addSubview(container) - NSLayoutConstraint.activate([ - container.topAnchor.constraint(equalTo: topAnchor), - container.leadingAnchor.constraint(equalTo: leadingAnchor), - container.trailingAnchor.constraint(equalTo: trailingAnchor), - container.bottomAnchor.constraint(equalTo: bottomAnchor), - ]) + container.pinToParent() - container.addArrangedSubview(emojiLabel) container.addArrangedSubview(titleLabel) highlightedIndicatorView.translatesAutoresizingMaskIntoConstraints = false container.addArrangedSubview(highlightedIndicatorView) NSLayoutConstraint.activate([ - highlightedIndicatorView.heightAnchor.constraint(equalToConstant: 3).priority(.required - 1), + highlightedIndicatorView.heightAnchor.constraint(equalToConstant: 3)//.priority(.required - 1), ]) titleLabel.setContentHuggingPriority(.required - 1, for: .vertical) } diff --git a/Mastodon/Scene/Onboarding/PickServer/View/PickServerServerSectionTableHeaderView.swift b/Mastodon/Scene/Onboarding/PickServer/View/PickServerServerSectionTableHeaderView.swift index d50c62afe..ae8c16bb8 100644 --- a/Mastodon/Scene/Onboarding/PickServer/View/PickServerServerSectionTableHeaderView.swift +++ b/Mastodon/Scene/Onboarding/PickServer/View/PickServerServerSectionTableHeaderView.swift @@ -19,7 +19,7 @@ protocol PickServerServerSectionTableHeaderViewDelegate: AnyObject { final class PickServerServerSectionTableHeaderView: UIView { - static let collectionViewHeight: CGFloat = 88 + static let collectionViewHeight: CGFloat = 30 static let searchTextFieldHeight: CGFloat = 38 static let spacing: CGFloat = 11 @@ -177,7 +177,6 @@ extension PickServerServerSectionTableHeaderView { extension PickServerServerSectionTableHeaderView: UICollectionViewDelegate { func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { - os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: indexPath: %s", ((#file as NSString).lastPathComponent), #line, #function, indexPath.debugDescription) collectionView.selectItem(at: indexPath, animated: true, scrollPosition: .centeredHorizontally) delegate?.pickServerServerSectionTableHeaderView(self, collectionView: collectionView, didSelectItemAt: indexPath) } @@ -205,5 +204,5 @@ extension PickServerServerSectionTableHeaderView: UITextFieldDelegate { textField.resignFirstResponder() return false } - + } diff --git a/Mastodon/Scene/Onboarding/Register/Cell/MastodonRegisterAvatarTableViewCell.swift b/Mastodon/Scene/Onboarding/Register/Cell/MastodonRegisterAvatarTableViewCell.swift deleted file mode 100644 index 154385e6a..000000000 --- a/Mastodon/Scene/Onboarding/Register/Cell/MastodonRegisterAvatarTableViewCell.swift +++ /dev/null @@ -1,116 +0,0 @@ -// -// MastodonRegisterAvatarTableViewCell.swift -// Mastodon -// -// Created by MainasuK on 2022-1-5. -// - -import UIKit -import Combine -import MastodonAsset -import MastodonLocalization - -final class MastodonRegisterAvatarTableViewCell: UITableViewCell { - - static let containerSize = CGSize(width: 88, height: 88) - - var disposeBag = Set() - - let containerView: UIView = { - let view = UIView() - view.backgroundColor = .clear - view.layer.masksToBounds = true - view.layer.cornerCurve = .continuous - view.layer.cornerRadius = 22 - return view - }() - - let avatarButton: HighlightDimmableButton = { - let button = HighlightDimmableButton() - button.backgroundColor = Asset.Theme.Mastodon.secondaryGroupedSystemBackground.color - button.setImage(Asset.Scene.Onboarding.avatarPlaceholder.image, for: .normal) - return button - }() - - let editBannerView: UIView = { - let bannerView = UIView() - bannerView.backgroundColor = UIColor.black.withAlphaComponent(0.5) - bannerView.isUserInteractionEnabled = false - - let label: UILabel = { - let label = UILabel() - label.textColor = .white - label.text = L10n.Common.Controls.Actions.edit - label.font = .systemFont(ofSize: 13, weight: .semibold) - label.textAlignment = .center - label.minimumScaleFactor = 0.5 - label.adjustsFontSizeToFitWidth = true - return label - }() - - label.translatesAutoresizingMaskIntoConstraints = false - bannerView.addSubview(label) - NSLayoutConstraint.activate([ - label.topAnchor.constraint(equalTo: bannerView.topAnchor), - label.leadingAnchor.constraint(equalTo: bannerView.leadingAnchor), - label.trailingAnchor.constraint(equalTo: bannerView.trailingAnchor), - label.bottomAnchor.constraint(equalTo: bannerView.bottomAnchor), - ]) - - return bannerView - }() - - override func prepareForReuse() { - super.prepareForReuse() - - disposeBag.removeAll() - } - - override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { - super.init(style: style, reuseIdentifier: reuseIdentifier) - _init() - } - - required init?(coder: NSCoder) { - super.init(coder: coder) - _init() - } - -} - -extension MastodonRegisterAvatarTableViewCell { - - private func _init() { - selectionStyle = .none - backgroundColor = .clear - - containerView.translatesAutoresizingMaskIntoConstraints = false - contentView.addSubview(containerView) - NSLayoutConstraint.activate([ - containerView.topAnchor.constraint(equalTo: contentView.topAnchor, constant: 22), - containerView.centerXAnchor.constraint(equalTo: contentView.centerXAnchor), - contentView.bottomAnchor.constraint(equalTo: containerView.bottomAnchor, constant: 8), - containerView.widthAnchor.constraint(equalToConstant: MastodonRegisterAvatarTableViewCell.containerSize.width).priority(.required - 1), - containerView.heightAnchor.constraint(equalToConstant: MastodonRegisterAvatarTableViewCell.containerSize.height).priority(.required - 1), - ]) - - avatarButton.translatesAutoresizingMaskIntoConstraints = false - containerView.addSubview(avatarButton) - NSLayoutConstraint.activate([ - avatarButton.topAnchor.constraint(equalTo: containerView.topAnchor), - avatarButton.leadingAnchor.constraint(equalTo: containerView.leadingAnchor), - avatarButton.trailingAnchor.constraint(equalTo: containerView.trailingAnchor), - avatarButton.bottomAnchor.constraint(equalTo: containerView.bottomAnchor), - ]) - - editBannerView.translatesAutoresizingMaskIntoConstraints = false - containerView.addSubview(editBannerView) - NSLayoutConstraint.activate([ - editBannerView.leadingAnchor.constraint(equalTo: containerView.leadingAnchor), - editBannerView.trailingAnchor.constraint(equalTo: containerView.trailingAnchor), - editBannerView.bottomAnchor.constraint(equalTo: containerView.bottomAnchor), - editBannerView.heightAnchor.constraint(equalToConstant: 22), - ]) - } - -} diff --git a/Mastodon/Scene/Onboarding/Register/Cell/MastodonRegisterPasswordHintTableViewCell.swift b/Mastodon/Scene/Onboarding/Register/Cell/MastodonRegisterPasswordHintTableViewCell.swift deleted file mode 100644 index 1324c2822..000000000 --- a/Mastodon/Scene/Onboarding/Register/Cell/MastodonRegisterPasswordHintTableViewCell.swift +++ /dev/null @@ -1,50 +0,0 @@ -// -// MastodonRegisterPasswordHintTableViewCell.swift -// Mastodon -// -// Created by MainasuK on 2022-1-7. -// - -import UIKit -import MastodonAsset -import MastodonLocalization - -final class MastodonRegisterPasswordHintTableViewCell: UITableViewCell { - - let passwordRuleLabel: UILabel = { - let label = UILabel() - label.font = .preferredFont(forTextStyle: .footnote) - label.textColor = Asset.Colors.Label.secondary.color - label.text = L10n.Scene.Register.Input.Password.hint - return label - }() - - override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { - super.init(style: style, reuseIdentifier: reuseIdentifier) - _init() - } - - required init?(coder: NSCoder) { - super.init(coder: coder) - _init() - } - -} - -extension MastodonRegisterPasswordHintTableViewCell { - - private func _init() { - selectionStyle = .none - backgroundColor = .clear - - passwordRuleLabel.translatesAutoresizingMaskIntoConstraints = false - contentView.addSubview(passwordRuleLabel) - NSLayoutConstraint.activate([ - passwordRuleLabel.topAnchor.constraint(equalTo: contentView.topAnchor), - passwordRuleLabel.leadingAnchor.constraint(equalTo: contentView.readableContentGuide.leadingAnchor), - passwordRuleLabel.trailingAnchor.constraint(equalTo: contentView.readableContentGuide.trailingAnchor), - passwordRuleLabel.bottomAnchor.constraint(equalTo: contentView.bottomAnchor), - ]) - } - -} diff --git a/Mastodon/Scene/Onboarding/Register/Cell/MastodonRegisterTextFieldTableViewCell.swift b/Mastodon/Scene/Onboarding/Register/Cell/MastodonRegisterTextFieldTableViewCell.swift deleted file mode 100644 index 15f234834..000000000 --- a/Mastodon/Scene/Onboarding/Register/Cell/MastodonRegisterTextFieldTableViewCell.swift +++ /dev/null @@ -1,142 +0,0 @@ -// -// MastodonRegisterTextFieldTableViewCell.swift -// Mastodon -// -// Created by MainasuK on 2022-1-7. -// - -import UIKit -import Combine -import MastodonUI -import MastodonAsset -import MastodonLocalization - -final class MastodonRegisterTextFieldTableViewCell: UITableViewCell { - - static let textFieldHeight: CGFloat = 50 - static let textFieldLabelFont = UIFontMetrics(forTextStyle: .headline).scaledFont(for: .systemFont(ofSize: 17, weight: .semibold), maximumPointSize: 22) - - var disposeBag = Set() - - let textFieldShadowContainer = ShadowBackgroundContainer() - let textField: UITextField = { - let textField = UITextField() - textField.font = MastodonRegisterTextFieldTableViewCell.textFieldLabelFont - textField.backgroundColor = Asset.Scene.Onboarding.textFieldBackground.color - textField.layer.masksToBounds = true - textField.layer.cornerRadius = 10 - textField.layer.cornerCurve = .continuous - return textField - }() - - override func prepareForReuse() { - super.prepareForReuse() - - disposeBag.removeAll() - textFieldShadowContainer.shadowColor = .black - textFieldShadowContainer.shadowAlpha = 0.25 - resetTextField() - } - - override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { - super.init(style: style, reuseIdentifier: reuseIdentifier) - _init() - } - - required init?(coder: NSCoder) { - super.init(coder: coder) - _init() - } - -} - -extension MastodonRegisterTextFieldTableViewCell { - - private func _init() { - selectionStyle = .none - backgroundColor = .clear - - textFieldShadowContainer.translatesAutoresizingMaskIntoConstraints = false - contentView.addSubview(textFieldShadowContainer) - NSLayoutConstraint.activate([ - textFieldShadowContainer.topAnchor.constraint(equalTo: contentView.topAnchor, constant: 6), - textFieldShadowContainer.leadingAnchor.constraint(equalTo: contentView.readableContentGuide.leadingAnchor), - textFieldShadowContainer.trailingAnchor.constraint(equalTo: contentView.readableContentGuide.trailingAnchor), - contentView.bottomAnchor.constraint(equalTo: textFieldShadowContainer.bottomAnchor, constant: 6), - ]) - - textField.translatesAutoresizingMaskIntoConstraints = false - textFieldShadowContainer.addSubview(textField) - NSLayoutConstraint.activate([ - textField.topAnchor.constraint(equalTo: textFieldShadowContainer.topAnchor), - textField.leadingAnchor.constraint(equalTo: textFieldShadowContainer.leadingAnchor), - textField.trailingAnchor.constraint(equalTo: textFieldShadowContainer.trailingAnchor), - textField.bottomAnchor.constraint(equalTo: textFieldShadowContainer.bottomAnchor), - textField.heightAnchor.constraint(equalToConstant: MastodonRegisterTextFieldTableViewCell.textFieldHeight).priority(.required - 1), - ]) - - resetTextField() - } - -} - -extension MastodonRegisterTextFieldTableViewCell { - func resetTextField() { - textField.keyboardType = .default - textField.autocorrectionType = .default - textField.autocapitalizationType = .none - textField.attributedPlaceholder = nil - textField.isSecureTextEntry = false - textField.textAlignment = .natural - textField.semanticContentAttribute = .unspecified - - let paddingRect = CGRect(x: 0, y: 0, width: 16, height: 10) - textField.leftView = UIView(frame: paddingRect) - textField.leftViewMode = .always - textField.rightView = UIView(frame: paddingRect) - textField.rightViewMode = .always - } - - func setupTextViewRightView(text: String) { - textField.rightView = { - let containerView = UIView() - - let paddingView = UIView(frame: CGRect(x: 0, y: 0, width: 8, height: MastodonRegisterTextFieldTableViewCell.textFieldHeight)) - paddingView.translatesAutoresizingMaskIntoConstraints = false - containerView.addSubview(paddingView) - NSLayoutConstraint.activate([ - paddingView.topAnchor.constraint(equalTo: containerView.topAnchor), - paddingView.leadingAnchor.constraint(equalTo: containerView.leadingAnchor), - paddingView.bottomAnchor.constraint(equalTo: containerView.bottomAnchor), - paddingView.widthAnchor.constraint(equalToConstant: 8).priority(.defaultHigh), - ]) - - let label = UILabel() - label.font = MastodonRegisterTextFieldTableViewCell.textFieldLabelFont - label.textColor = Asset.Colors.Label.primary.color - label.text = text - label.lineBreakMode = .byTruncatingMiddle - - label.translatesAutoresizingMaskIntoConstraints = false - containerView.addSubview(label) - NSLayoutConstraint.activate([ - label.topAnchor.constraint(equalTo: containerView.topAnchor), - label.leadingAnchor.constraint(equalTo: paddingView.trailingAnchor), - containerView.trailingAnchor.constraint(equalTo: label.trailingAnchor, constant: 16), - label.bottomAnchor.constraint(equalTo: containerView.bottomAnchor), - label.widthAnchor.constraint(lessThanOrEqualToConstant: 180).priority(.required - 1), - ]) - return containerView - }() - } - - func setupTextViewPlaceholder(text: String) { - textField.attributedPlaceholder = NSAttributedString( - string: text, - attributes: [ - .foregroundColor: Asset.Colors.Label.secondary.color, - .font: MastodonRegisterTextFieldTableViewCell.textFieldLabelFont - ] - ) - } -} diff --git a/Mastodon/Scene/Onboarding/Register/MastodonRegisterView.swift b/Mastodon/Scene/Onboarding/Register/MastodonRegisterView.swift index 2be7c61d7..4f28353b0 100644 --- a/Mastodon/Scene/Onboarding/Register/MastodonRegisterView.swift +++ b/Mastodon/Scene/Onboarding/Register/MastodonRegisterView.swift @@ -168,21 +168,27 @@ struct MastodonRegisterView: View { func body(content: Content) -> some View { ZStack { - let shadowColor: Color = { + let borderColor: Color = { switch validateState { - case .empty: return .black.opacity(0.125) - case .invalid: return Color(Asset.Colors.TextField.invalid.color) - case .valid: return Color(Asset.Colors.TextField.valid.color) + case .empty: return Color(Asset.Scene.Onboarding.textFieldBackground.color) + case .invalid: return Color(Asset.Colors.TextField.invalid.color) + case .valid: return Color(Asset.Scene.Onboarding.textFieldBackground.color) } }() + Color(Asset.Scene.Onboarding.textFieldBackground.color) .cornerRadius(10) - .shadow(color: shadowColor, radius: 1, x: 0, y: 2) - .animation(.easeInOut, value: validateState) + .shadow(color: .black.opacity(0.125), radius: 1, x: 0, y: 2) + content .padding() .background(Color(Asset.Scene.Onboarding.textFieldBackground.color)) .cornerRadius(10) + .overlay( + RoundedRectangle(cornerRadius: 10) + .stroke(borderColor, lineWidth: 1) + .animation(.easeInOut, value: validateState) + ) } } } diff --git a/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewController+Avatar.swift b/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewController+Avatar.swift index 9260f9e21..81924d812 100644 --- a/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewController+Avatar.swift +++ b/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewController+Avatar.swift @@ -49,7 +49,7 @@ extension MastodonRegisterViewController: PHPickerViewControllerDelegate { let alertController = UIAlertController(for: error, title: "", preferredStyle: .alert) let okAction = UIAlertAction(title: L10n.Common.Controls.Actions.ok, style: .default, handler: nil) alertController.addAction(okAction) - self.coordinator.present( + _ = self.coordinator.present( scene: .alertController(alertController: alertController), from: nil, transition: .alertController(animated: true, completion: nil) diff --git a/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewController.swift b/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewController.swift index 9b10bd48e..f239e59b7 100644 --- a/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewController.swift +++ b/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewController.swift @@ -85,12 +85,7 @@ extension MastodonRegisterViewController { addChild(hostingViewController) hostingViewController.view.translatesAutoresizingMaskIntoConstraints = false view.addSubview(hostingViewController.view) - NSLayoutConstraint.activate([ - hostingViewController.view.topAnchor.constraint(equalTo: view.topAnchor), - hostingViewController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor), - hostingViewController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor), - hostingViewController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + hostingViewController.view.pinToParent() navigationActionView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(navigationActionView) @@ -145,7 +140,7 @@ extension MastodonRegisterViewController { let alertController = UIAlertController(for: error, title: "Sign Up Failure", preferredStyle: .alert) let okAction = UIAlertAction(title: L10n.Common.Controls.Actions.ok, style: .default, handler: nil) alertController.addAction(okAction) - self.coordinator.present( + _ = self.coordinator.present( scene: .alertController(alertController: alertController), from: nil, transition: .alertController(animated: true, completion: nil) @@ -322,7 +317,7 @@ extension MastodonRegisterViewController { ) }() let viewModel = MastodonConfirmEmailViewModel(context: self.context, email: email, authenticateInfo: self.viewModel.authenticateInfo, userToken: userToken, updateCredentialQuery: updateCredentialQuery) - self.coordinator.present(scene: .mastodonConfirmEmail(viewModel: viewModel), from: self, transition: .show) + _ = self.coordinator.present(scene: .mastodonConfirmEmail(viewModel: viewModel), from: self, transition: .show) } .store(in: &disposeBag) } diff --git a/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewModel+Diffable.swift b/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewModel+Diffable.swift index dda59843a..b3e2a2cdb 100644 --- a/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewModel+Diffable.swift +++ b/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewModel+Diffable.swift @@ -10,145 +10,6 @@ import Combine import MastodonAsset import MastodonLocalization -extension MastodonRegisterViewModel { - func setupDiffableDataSource( - tableView: UITableView - ) { - tableView.register(OnboardingHeadlineTableViewCell.self, forCellReuseIdentifier: String(describing: OnboardingHeadlineTableViewCell.self)) - tableView.register(MastodonRegisterAvatarTableViewCell.self, forCellReuseIdentifier: String(describing: MastodonRegisterAvatarTableViewCell.self)) - tableView.register(MastodonRegisterTextFieldTableViewCell.self, forCellReuseIdentifier: String(describing: MastodonRegisterTextFieldTableViewCell.self)) - tableView.register(MastodonRegisterPasswordHintTableViewCell.self, forCellReuseIdentifier: String(describing: MastodonRegisterPasswordHintTableViewCell.self)) - - diffableDataSource = UITableViewDiffableDataSource(tableView: tableView) { tableView, indexPath, item in - switch item { - case .header(let domain): - let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: OnboardingHeadlineTableViewCell.self), for: indexPath) as! OnboardingHeadlineTableViewCell - cell.titleLabel.text = L10n.Scene.Register.letsGetYouSetUpOnDomain(domain) - cell.subTitleLabel.isHidden = true - return cell - case .avatar: - let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: MastodonRegisterAvatarTableViewCell.self), for: indexPath) as! MastodonRegisterAvatarTableViewCell - self.configureAvatar(cell: cell) - return cell - case .name: - let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: MastodonRegisterTextFieldTableViewCell.self), for: indexPath) as! MastodonRegisterTextFieldTableViewCell - cell.setupTextViewPlaceholder(text: L10n.Scene.Register.Input.DisplayName.placeholder) - cell.textField.keyboardType = .default - cell.textField.autocapitalizationType = .words - cell.textField.text = self.name - NotificationCenter.default.publisher(for: UITextField.textDidChangeNotification, object: cell.textField) - .receive(on: DispatchQueue.main) - .compactMap { notification in - guard let textField = notification.object as? UITextField else { - assertionFailure() - return nil - } - return textField.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "" - } - .assign(to: \.name, on: self) - .store(in: &cell.disposeBag) - return cell - case .username: - let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: MastodonRegisterTextFieldTableViewCell.self), for: indexPath) as! MastodonRegisterTextFieldTableViewCell - cell.setupTextViewRightView(text: "@" + self.domain) - cell.setupTextViewPlaceholder(text: L10n.Scene.Register.Input.Username.placeholder) - cell.textField.keyboardType = .alphabet - cell.textField.autocorrectionType = .no - cell.textField.text = self.username - cell.textField.textAlignment = .left - cell.textField.semanticContentAttribute = .forceLeftToRight - NotificationCenter.default.publisher(for: UITextField.textDidChangeNotification, object: cell.textField) - .receive(on: DispatchQueue.main) - .compactMap { notification in - guard let textField = notification.object as? UITextField else { - assertionFailure() - return nil - } - return textField.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "" - } - .assign(to: \.username, on: self) - .store(in: &cell.disposeBag) - self.configureTextFieldCell(cell: cell, validateState: self.$usernameValidateState) - return cell - case .email: - let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: MastodonRegisterTextFieldTableViewCell.self), for: indexPath) as! MastodonRegisterTextFieldTableViewCell - cell.setupTextViewPlaceholder(text: L10n.Scene.Register.Input.Email.placeholder) - cell.textField.keyboardType = .emailAddress - cell.textField.autocorrectionType = .no - cell.textField.text = self.email - NotificationCenter.default.publisher(for: UITextField.textDidChangeNotification, object: cell.textField) - .receive(on: DispatchQueue.main) - .compactMap { notification in - guard let textField = notification.object as? UITextField else { - assertionFailure() - return nil - } - return textField.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "" - } - .assign(to: \.email, on: self) - .store(in: &cell.disposeBag) - self.configureTextFieldCell(cell: cell, validateState: self.$emailValidateState) - return cell - case .password: - let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: MastodonRegisterTextFieldTableViewCell.self), for: indexPath) as! MastodonRegisterTextFieldTableViewCell - cell.setupTextViewPlaceholder(text: L10n.Scene.Register.Input.Password.placeholder) - cell.textField.keyboardType = .alphabet - cell.textField.autocorrectionType = .no - cell.textField.isSecureTextEntry = true - cell.textField.text = self.password - cell.textField.textAlignment = .left - cell.textField.semanticContentAttribute = .forceLeftToRight - NotificationCenter.default.publisher(for: UITextField.textDidChangeNotification, object: cell.textField) - .receive(on: DispatchQueue.main) - .compactMap { notification in - guard let textField = notification.object as? UITextField else { - assertionFailure() - return nil - } - return textField.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "" - } - .assign(to: \.password, on: self) - .store(in: &cell.disposeBag) - self.configureTextFieldCell(cell: cell, validateState: self.$passwordValidateState) - return cell - case .hint: - let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: MastodonRegisterPasswordHintTableViewCell.self), for: indexPath) as! MastodonRegisterPasswordHintTableViewCell - return cell - case .reason: - let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: MastodonRegisterTextFieldTableViewCell.self), for: indexPath) as! MastodonRegisterTextFieldTableViewCell - cell.setupTextViewPlaceholder(text: L10n.Scene.Register.Input.Invite.registrationUserInviteRequest) - cell.textField.keyboardType = .default - cell.textField.text = self.reason - NotificationCenter.default.publisher(for: UITextField.textDidChangeNotification, object: cell.textField) - .receive(on: DispatchQueue.main) - .compactMap { notification in - guard let textField = notification.object as? UITextField else { - assertionFailure() - return nil - } - return textField.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "" - } - .assign(to: \.reason, on: self) - .store(in: &cell.disposeBag) - self.configureTextFieldCell(cell: cell, validateState: self.$reasonValidateState) - return cell - default: - assertionFailure() - return UITableViewCell() - } - } - - var snapshot = NSDiffableDataSourceSnapshot() - snapshot.appendSections([.main]) - snapshot.appendItems([.header(domain: domain)], toSection: .main) - snapshot.appendItems([.avatar, .name, .username, .email, .password, .hint], toSection: .main) - if approvalRequired { - snapshot.appendItems([.reason], toSection: .main) - } - diffableDataSource?.applySnapshot(snapshot, animated: false, completion: nil) - } -} - extension MastodonRegisterViewModel { private func configureAvatar(cell: MastodonRegisterAvatarTableViewCell) { self.$avatarImage diff --git a/Mastodon/Scene/Onboarding/ResendEmail/MastodonResendEmailViewController.swift b/Mastodon/Scene/Onboarding/ResendEmail/MastodonResendEmailViewController.swift index 178d489be..d6870785c 100644 --- a/Mastodon/Scene/Onboarding/ResendEmail/MastodonResendEmailViewController.swift +++ b/Mastodon/Scene/Onboarding/ResendEmail/MastodonResendEmailViewController.swift @@ -49,12 +49,7 @@ extension MastodonResendEmailViewController { webView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(webView) - NSLayoutConstraint.activate([ - webView.topAnchor.constraint(equalTo: view.topAnchor), - webView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - webView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - webView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + webView.pinToParent() let request = URLRequest(url: viewModel.resendEmailURL) webView.navigationDelegate = self.viewModel.navigationDelegate diff --git a/Mastodon/Scene/Onboarding/ServerRules/MastodonServerRulesViewController.swift b/Mastodon/Scene/Onboarding/ServerRules/MastodonServerRulesViewController.swift index 0d4e27d98..ea0b58e28 100644 --- a/Mastodon/Scene/Onboarding/ServerRules/MastodonServerRulesViewController.swift +++ b/Mastodon/Scene/Onboarding/ServerRules/MastodonServerRulesViewController.swift @@ -69,12 +69,7 @@ extension MastodonServerRulesViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() navigationActionView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(navigationActionView) @@ -127,7 +122,7 @@ extension MastodonServerRulesViewController { instance: viewModel.instance, applicationToken: viewModel.applicationToken ) - coordinator.present(scene: .mastodonRegister(viewModel: viewModel), from: self, transition: .show) + _ = coordinator.present(scene: .mastodonRegister(viewModel: viewModel), from: self, transition: .show) } } diff --git a/Mastodon/Scene/Onboarding/Share/NavigationActionView.swift b/Mastodon/Scene/Onboarding/Share/NavigationActionView.swift index 47a1afbfc..fce853959 100644 --- a/Mastodon/Scene/Onboarding/Share/NavigationActionView.swift +++ b/Mastodon/Scene/Onboarding/Share/NavigationActionView.swift @@ -88,21 +88,11 @@ extension NavigationActionView { backButton.translatesAutoresizingMaskIntoConstraints = false backButtonShadowContainer.addSubview(backButton) - NSLayoutConstraint.activate([ - backButton.topAnchor.constraint(equalTo: backButtonShadowContainer.topAnchor), - backButton.leadingAnchor.constraint(equalTo: backButtonShadowContainer.leadingAnchor), - backButton.trailingAnchor.constraint(equalTo: backButtonShadowContainer.trailingAnchor), - backButton.bottomAnchor.constraint(equalTo: backButtonShadowContainer.bottomAnchor), - ]) + backButton.pinToParent() nextButton.translatesAutoresizingMaskIntoConstraints = false - nextButtonShadowContainer.addSubview(nextButton) - NSLayoutConstraint.activate([ - nextButton.topAnchor.constraint(equalTo: nextButtonShadowContainer.topAnchor), - nextButton.leadingAnchor.constraint(equalTo: nextButtonShadowContainer.leadingAnchor), - nextButton.trailingAnchor.constraint(equalTo: nextButtonShadowContainer.trailingAnchor), - nextButton.bottomAnchor.constraint(equalTo: nextButtonShadowContainer.bottomAnchor), - ]) + nextButtonShadowContainer.addSubview(nextButton) + nextButton.pinToParent() // We want the back button to be as small as possible, allowing the next button to take up // any remaining space. .defaultLow is "the priority level at which a button hugs its diff --git a/Mastodon/Scene/Onboarding/Share/OnboardingNavigationController.swift b/Mastodon/Scene/Onboarding/Share/OnboardingNavigationController.swift index 537102dc9..ac2e5b171 100644 --- a/Mastodon/Scene/Onboarding/Share/OnboardingNavigationController.swift +++ b/Mastodon/Scene/Onboarding/Share/OnboardingNavigationController.swift @@ -20,12 +20,7 @@ extension OnboardingNavigationController { gradientBorderView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(gradientBorderView) - NSLayoutConstraint.activate([ - gradientBorderView.topAnchor.constraint(equalTo: view.topAnchor), - gradientBorderView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - gradientBorderView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - gradientBorderView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + gradientBorderView.pinToParent() updateBorderViewDisplay() } diff --git a/Mastodon/Scene/Onboarding/Welcome/View/WelcomeIllustrationView.swift b/Mastodon/Scene/Onboarding/Welcome/View/WelcomeIllustrationView.swift index 0530539a2..1fca1afef 100644 --- a/Mastodon/Scene/Onboarding/Welcome/View/WelcomeIllustrationView.swift +++ b/Mastodon/Scene/Onboarding/Welcome/View/WelcomeIllustrationView.swift @@ -96,12 +96,7 @@ extension WelcomeIllustrationView { ].forEach { imageView in imageView.translatesAutoresizingMaskIntoConstraints = false addSubview(imageView) - NSLayoutConstraint.activate([ - imageView.topAnchor.constraint(equalTo: cloudBaseImageView.topAnchor), - imageView.leadingAnchor.constraint(equalTo: cloudBaseImageView.leadingAnchor), - imageView.trailingAnchor.constraint(equalTo: cloudBaseImageView.trailingAnchor), - imageView.bottomAnchor.constraint(equalTo: cloudBaseImageView.bottomAnchor), - ]) + imageView.pinTo(to: cloudBaseImageView) } aspectLayoutConstraint = cloudBaseImageView.widthAnchor.constraint(equalTo: cloudBaseImageView.heightAnchor, multiplier: layout.artworkImageSize.width / layout.artworkImageSize.height) diff --git a/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift b/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift index a7703bfaa..241b1eacc 100644 --- a/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift +++ b/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift @@ -128,22 +128,12 @@ extension WelcomeViewController { signUpButtonShadowView.translatesAutoresizingMaskIntoConstraints = false buttonContainer.addSubview(signUpButtonShadowView) buttonContainer.sendSubviewToBack(signUpButtonShadowView) - NSLayoutConstraint.activate([ - signUpButtonShadowView.topAnchor.constraint(equalTo: signUpButton.topAnchor), - signUpButtonShadowView.leadingAnchor.constraint(equalTo: signUpButton.leadingAnchor), - signUpButtonShadowView.trailingAnchor.constraint(equalTo: signUpButton.trailingAnchor), - signUpButtonShadowView.bottomAnchor.constraint(equalTo: signUpButton.bottomAnchor), - ]) + signUpButtonShadowView.pinTo(to: signUpButton) signInButtonShadowView.translatesAutoresizingMaskIntoConstraints = false buttonContainer.addSubview(signInButtonShadowView) buttonContainer.sendSubviewToBack(signInButtonShadowView) - NSLayoutConstraint.activate([ - signInButtonShadowView.topAnchor.constraint(equalTo: signInButton.topAnchor), - signInButtonShadowView.leadingAnchor.constraint(equalTo: signInButton.leadingAnchor), - signInButtonShadowView.trailingAnchor.constraint(equalTo: signInButton.trailingAnchor), - signInButtonShadowView.bottomAnchor.constraint(equalTo: signInButton.bottomAnchor), - ]) + signInButtonShadowView.pinTo(to: signInButton) signUpButton.addTarget(self, action: #selector(signUpButtonDidClicked(_:)), for: .touchUpInside) signInButton.addTarget(self, action: #selector(signInButtonDidClicked(_:)), for: .touchUpInside) @@ -249,7 +239,7 @@ extension WelcomeViewController { logoImageView.topAnchor.constraint(equalTo: view.layoutMarginsGuide.topAnchor), logoImageView.leadingAnchor.constraint(equalTo: view.readableContentGuide.leadingAnchor, constant: 35), view.readableContentGuide.trailingAnchor.constraint(equalTo: logoImageView.trailingAnchor, constant: 35), - logoImageView.heightAnchor.constraint(equalTo: logoImageView.widthAnchor, multiplier: 65.4/265.1), + logoImageView.heightAnchor.constraint(equalTo: logoImageView.widthAnchor, multiplier: 75.0/269.0), ]) logoImageView.setContentHuggingPriority(.defaultHigh, for: .vertical) } @@ -323,12 +313,12 @@ extension WelcomeViewController { extension WelcomeViewController { @objc private func signUpButtonDidClicked(_ sender: UIButton) { - coordinator.present(scene: .mastodonPickServer(viewMode: MastodonPickServerViewModel(context: context, mode: .signUp)), from: self, transition: .show) + _ = coordinator.present(scene: .mastodonPickServer(viewMode: MastodonPickServerViewModel(context: context)), from: self, transition: .show) } @objc private func signInButtonDidClicked(_ sender: UIButton) { - coordinator.present(scene: .mastodonPickServer(viewMode: MastodonPickServerViewModel(context: context, mode: .signIn)), from: self, transition: .show) + _ = coordinator.present(scene: .mastodonLogin, from: self, transition: .show) } @objc diff --git a/Mastodon/Scene/Profile/About/Cell/ProfileFieldCollectionViewCell.swift b/Mastodon/Scene/Profile/About/Cell/ProfileFieldCollectionViewCell.swift index ed6f68fec..1ed76a485 100644 --- a/Mastodon/Scene/Profile/About/Cell/ProfileFieldCollectionViewCell.swift +++ b/Mastodon/Scene/Profile/About/Cell/ProfileFieldCollectionViewCell.swift @@ -26,6 +26,16 @@ final class ProfileFieldCollectionViewCell: UICollectionViewCell { let keyMetaLabel = MetaLabel(style: .profileFieldName) let valueMetaLabel = MetaLabel(style: .profileFieldValue) + let checkmark = UIImageView(image: Asset.Editing.checkmark.image.withRenderingMode(.alwaysTemplate)) + var checkmarkPopoverString: String? = nil; + let tapGesture = UITapGestureRecognizer(); + private var _editMenuInteraction: Any? = nil + @available(iOS 16, *) + fileprivate var editMenuInteraction: UIEditMenuInteraction { + _editMenuInteraction = _editMenuInteraction ?? UIEditMenuInteraction(delegate: self) + return _editMenuInteraction as! UIEditMenuInteraction + } + override func prepareForReuse() { super.prepareForReuse() @@ -47,6 +57,17 @@ final class ProfileFieldCollectionViewCell: UICollectionViewCell { extension ProfileFieldCollectionViewCell { private func _init() { + // Setup colors + checkmark.tintColor = Asset.Scene.Profile.About.bioAboutFieldVerifiedCheckmark.color; + + // Setup gestures + tapGesture.addTarget(self, action: #selector(ProfileFieldCollectionViewCell.didTapCheckmark(_:))) + checkmark.addGestureRecognizer(tapGesture) + checkmark.isUserInteractionEnabled = true + if #available(iOS 16, *) { + checkmark.addInteraction(editMenuInteraction) + } + // containerStackView: V - [ metaContainer | plainContainer ] let containerStackView = UIStackView() containerStackView.axis = .vertical @@ -63,19 +84,62 @@ extension ProfileFieldCollectionViewCell { bottomAnchor.constraint(equalTo: containerStackView.bottomAnchor, constant: 11), ]) - // metaContainer: V - [ keyMetaLabel | valueMetaLabel ] + // metaContainer: V - [ keyMetaLabel | valueContainer ] let metaContainer = UIStackView() metaContainer.axis = .vertical metaContainer.spacing = 2 containerStackView.addArrangedSubview(metaContainer) + // valueContainer: H - [ valueMetaLabel | checkmark ] + let valueContainer = UIStackView() + valueContainer.axis = .horizontal + valueContainer.spacing = 2 + metaContainer.addArrangedSubview(keyMetaLabel) - metaContainer.addArrangedSubview(valueMetaLabel) + valueContainer.addArrangedSubview(valueMetaLabel) + valueContainer.addArrangedSubview(checkmark) + metaContainer.addArrangedSubview(valueContainer) keyMetaLabel.linkDelegate = self valueMetaLabel.linkDelegate = self } + @objc public func didTapCheckmark(_ recognizer: UITapGestureRecognizer) { + if #available(iOS 16, *) { + editMenuInteraction.presentEditMenu(with: UIEditMenuConfiguration(identifier: nil, sourcePoint: recognizer.location(in: checkmark))) + } else { + guard let editMenuLabel = checkmarkPopoverString else { return } + + self.isUserInteractionEnabled = true + self.becomeFirstResponder() + + UIMenuController.shared.menuItems = [ + UIMenuItem( + title: editMenuLabel, + action: #selector(dismissVerifiedMenu) + ) + ] + UIMenuController.shared.showMenu(from: checkmark, rect: checkmark.bounds) + } + } +} + +// UIMenuController boilerplate +@available(iOS, deprecated: 16, message: "Can be removed when target version is >=16 -- boilerplate to maintain compatibility with UIMenuController") +extension ProfileFieldCollectionViewCell { + override var canBecomeFirstResponder: Bool { true } + + override func canPerformAction(_ action: Selector, withSender sender: Any?) -> Bool { + if action == #selector(dismissVerifiedMenu) { + return true + } + + return super.canPerformAction(action, withSender: sender) + } + + @objc public func dismissVerifiedMenu() { + UIMenuController.shared.hideMenu() + } } // MARK: - MetaLabelDelegate @@ -85,3 +149,16 @@ extension ProfileFieldCollectionViewCell: MetaLabelDelegate { delegate?.profileFieldCollectionViewCell(self, metaLebel: metaLabel, didSelectMeta: meta) } } + +// MARK: UIEditMenuInteractionDelegate +@available(iOS 16.0, *) +extension ProfileFieldCollectionViewCell: UIEditMenuInteractionDelegate { + func editMenuInteraction(_ interaction: UIEditMenuInteraction, menuFor configuration: UIEditMenuConfiguration, suggestedActions: [UIMenuElement]) -> UIMenu? { + guard let editMenuLabel = checkmarkPopoverString else { return UIMenu(children: []) } + return UIMenu(children: [UIAction(title: editMenuLabel) { _ in return }]) + } + + func editMenuInteraction(_ interaction: UIEditMenuInteraction, targetRectFor configuration: UIEditMenuConfiguration) -> CGRect { + return checkmark.frame + } +} diff --git a/Mastodon/Scene/Profile/About/ProfileAboutViewController.swift b/Mastodon/Scene/Profile/About/ProfileAboutViewController.swift index eb1e6b39c..fe92d2ac4 100644 --- a/Mastodon/Scene/Profile/About/ProfileAboutViewController.swift +++ b/Mastodon/Scene/Profile/About/ProfileAboutViewController.swift @@ -60,12 +60,7 @@ extension ProfileAboutViewController { collectionView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(collectionView) - NSLayoutConstraint.activate([ - collectionView.topAnchor.constraint(equalTo: view.topAnchor), - collectionView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - collectionView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + collectionView.pinToParent() collectionView.delegate = self viewModel.setupDiffableDataSource( diff --git a/Mastodon/Scene/Profile/About/ProfileAboutViewModel.swift b/Mastodon/Scene/Profile/About/ProfileAboutViewModel.swift index 68a3d0fea..044894b8a 100644 --- a/Mastodon/Scene/Profile/About/ProfileAboutViewModel.swift +++ b/Mastodon/Scene/Profile/About/ProfileAboutViewModel.swift @@ -52,7 +52,7 @@ final class ProfileAboutViewModel { $emojiMeta ) .map { fields, emojiMeta in - fields.map { ProfileFieldItem.FieldValue(name: $0.name, value: $0.value, emojiMeta: emojiMeta) } + fields.map { ProfileFieldItem.FieldValue(name: $0.name, value: $0.value, verifiedAt: $0.verifiedAt, emojiMeta: emojiMeta) } } .assign(to: &profileInfo.$fields) @@ -72,6 +72,7 @@ final class ProfileAboutViewModel { ProfileFieldItem.FieldValue( name: field.name, value: field.value, + verifiedAt: field.verifiedAt, emojiMeta: [:] // no use for editing ) } ?? [] @@ -92,7 +93,7 @@ extension ProfileAboutViewModel { func appendFieldItem() { var fields = profileInfoEditing.fields guard fields.count < ProfileHeaderViewModel.maxProfileFieldCount else { return } - fields.append(ProfileFieldItem.FieldValue(name: "", value: "", emojiMeta: [:])) + fields.append(ProfileFieldItem.FieldValue(name: "", value: "", verifiedAt: nil, emojiMeta: [:])) profileInfoEditing.fields = fields } @@ -112,7 +113,7 @@ extension ProfileAboutViewModel: ProfileViewModelEditable { let isFieldsEqual: Bool = { let originalFields = self.accountForEdit?.source?.fields?.compactMap { field in - ProfileFieldItem.FieldValue(name: field.name, value: field.value, emojiMeta: [:]) + ProfileFieldItem.FieldValue(name: field.name, value: field.value, verifiedAt: nil, emojiMeta: [:]) } ?? [] let editFields = profileInfoEditing.fields guard editFields.count == originalFields.count else { return false } diff --git a/Mastodon/Scene/Profile/Bookmark/BookmarkViewController.swift b/Mastodon/Scene/Profile/Bookmark/BookmarkViewController.swift index 5edec2618..458c47335 100644 --- a/Mastodon/Scene/Profile/Bookmark/BookmarkViewController.swift +++ b/Mastodon/Scene/Profile/Bookmark/BookmarkViewController.swift @@ -64,12 +64,7 @@ extension BookmarkViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() tableView.delegate = self viewModel.setupDiffableDataSource( diff --git a/Mastodon/Scene/Profile/FamiliarFollowers/FamiliarFollowersViewController.swift b/Mastodon/Scene/Profile/FamiliarFollowers/FamiliarFollowersViewController.swift index b6d6f8313..3595303d9 100644 --- a/Mastodon/Scene/Profile/FamiliarFollowers/FamiliarFollowersViewController.swift +++ b/Mastodon/Scene/Profile/FamiliarFollowers/FamiliarFollowersViewController.swift @@ -53,12 +53,7 @@ extension FamiliarFollowersViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() tableView.delegate = self viewModel.setupDiffableDataSource( diff --git a/Mastodon/Scene/Profile/Favorite/FavoriteViewController.swift b/Mastodon/Scene/Profile/Favorite/FavoriteViewController.swift index c15adcf83..19f25f3ad 100644 --- a/Mastodon/Scene/Profile/Favorite/FavoriteViewController.swift +++ b/Mastodon/Scene/Profile/Favorite/FavoriteViewController.swift @@ -67,12 +67,7 @@ extension FavoriteViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() tableView.delegate = self viewModel.setupDiffableDataSource( diff --git a/Mastodon/Scene/Profile/Favorite/FavoriteViewModel+State.swift b/Mastodon/Scene/Profile/Favorite/FavoriteViewModel+State.swift index 803a9d45e..c2dc27201 100644 --- a/Mastodon/Scene/Profile/Favorite/FavoriteViewModel+State.swift +++ b/Mastodon/Scene/Profile/Favorite/FavoriteViewModel+State.swift @@ -46,7 +46,7 @@ extension FavoriteViewModel { extension FavoriteViewModel.State { class Initial: FavoriteViewModel.State { override func isValidNextState(_ stateClass: AnyClass) -> Bool { - guard let viewModel = viewModel else { return false } + guard viewModel != nil else { return false } switch stateClass { case is Reloading.Type: return true @@ -130,13 +130,12 @@ extension FavoriteViewModel.State { override func didEnter(from previousState: GKState?) { super.didEnter(from: previousState) - guard let viewModel = viewModel, let stateMachine = stateMachine else { return } + guard let viewModel else { return } if previousState is Reloading { maxID = nil } - Task { do { let response = try await viewModel.context.apiService.favoritedStatuses( diff --git a/Mastodon/Scene/Profile/Follower/FollowerListViewController.swift b/Mastodon/Scene/Profile/Follower/FollowerListViewController.swift index 190fa27e5..c111d13d0 100644 --- a/Mastodon/Scene/Profile/Follower/FollowerListViewController.swift +++ b/Mastodon/Scene/Profile/Follower/FollowerListViewController.swift @@ -58,12 +58,7 @@ extension FollowerListViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() tableView.delegate = self viewModel.setupDiffableDataSource( diff --git a/Mastodon/Scene/Profile/Following/FollowingListViewController.swift b/Mastodon/Scene/Profile/Following/FollowingListViewController.swift index e16b600c2..3fa65918a 100644 --- a/Mastodon/Scene/Profile/Following/FollowingListViewController.swift +++ b/Mastodon/Scene/Profile/Following/FollowingListViewController.swift @@ -58,12 +58,7 @@ extension FollowingListViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() tableView.delegate = self viewModel.setupDiffableDataSource( diff --git a/Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift b/Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift index c5dbbecd4..7ca819b41 100644 --- a/Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift +++ b/Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift @@ -60,7 +60,8 @@ final class ProfileHeaderViewController: UIViewController, NeedsDependency, Medi // private var isAdjustBannerImageViewForSafeAreaInset = false private var containerSafeAreaInset: UIEdgeInsets = .zero - + + private var currentImageType = ImageType.avatar private(set) lazy var imagePicker: PHPickerViewController = { var configuration = PHPickerConfiguration() configuration.filter = .images @@ -125,7 +126,9 @@ extension ProfileHeaderViewController { } .store(in: &disposeBag) - profileHeaderView.editAvatarButtonOverlayIndicatorView.menu = createAvatarContextMenu() + profileHeaderView.editBannerButton.menu = createImageContextMenu(.banner) + profileHeaderView.editBannerButton.showsMenuAsPrimaryAction = true + profileHeaderView.editAvatarButtonOverlayIndicatorView.menu = createImageContextMenu(.avatar) profileHeaderView.editAvatarButtonOverlayIndicatorView.showsMenuAsPrimaryAction = true profileHeaderView.delegate = self @@ -156,6 +159,9 @@ extension ProfileHeaderViewController { viewModel.$isUpdating .assign(to: \.isUpdating, on: profileHeaderView.viewModel) .store(in: &disposeBag) + viewModel.profileInfoEditing.$header + .assign(to: \.headerImageEditing, on: profileHeaderView.viewModel) + .store(in: &disposeBag) viewModel.profileInfoEditing.$avatar .assign(to: \.avatarImageEditing, on: profileHeaderView.viewModel) .store(in: &disposeBag) @@ -173,7 +179,7 @@ extension ProfileHeaderViewController { profileHeaderView.viewModel.viewDidAppear.send() // set display after view appear - profileHeaderView.setupAvatarOverlayViews() + profileHeaderView.setupImageOverlayViews() } override func viewDidLayoutSubviews() { @@ -185,11 +191,16 @@ extension ProfileHeaderViewController { } extension ProfileHeaderViewController { - private func createAvatarContextMenu() -> UIMenu { + fileprivate enum ImageType { + case avatar + case banner + } + private func createImageContextMenu(_ type: ImageType) -> UIMenu { var children: [UIMenuElement] = [] let photoLibraryAction = UIAction(title: L10n.Scene.Compose.MediaSelection.photoLibrary, image: UIImage(systemName: "rectangle.on.rectangle"), identifier: nil, discoverabilityTitle: nil, attributes: [], state: .off) { [weak self] _ in guard let self = self else { return } os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: mediaSelectionType: .photoLibaray", ((#file as NSString).lastPathComponent), #line, #function) + self.currentImageType = type self.present(self.imagePicker, animated: true, completion: nil) } children.append(photoLibraryAction) @@ -197,6 +208,7 @@ extension ProfileHeaderViewController { let cameraAction = UIAction(title: L10n.Scene.Compose.MediaSelection.camera, image: UIImage(systemName: "camera"), identifier: nil, discoverabilityTitle: nil, attributes: [], state: .off, handler: { [weak self] _ in guard let self = self else { return } os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: mediaSelectionType: .camera", ((#file as NSString).lastPathComponent), #line, #function) + self.currentImageType = type self.present(self.imagePickerController, animated: true, completion: nil) }) children.append(cameraAction) @@ -204,6 +216,7 @@ extension ProfileHeaderViewController { let browseAction = UIAction(title: L10n.Scene.Compose.MediaSelection.browse, image: UIImage(systemName: "ellipsis"), identifier: nil, discoverabilityTitle: nil, attributes: [], state: .off) { [weak self] _ in guard let self = self else { return } os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: mediaSelectionType: .browse", ((#file as NSString).lastPathComponent), #line, #function) + self.currentImageType = type self.present(self.documentPickerController, animated: true, completion: nil) } children.append(browseAction) @@ -215,7 +228,13 @@ extension ProfileHeaderViewController { DispatchQueue.main.async { let cropController = CropViewController(croppingStyle: .default, image: image) cropController.delegate = self - cropController.setAspectRatioPreset(.presetSquare, animated: true) + switch self.currentImageType { + case .banner: + cropController.customAspectRatio = CGSize(width: 3, height: 1) + cropController.setAspectRatioPreset(.presetCustom, animated: true) + case .avatar: + cropController.setAspectRatioPreset(.presetSquare, animated: true) + } cropController.aspectRatioPickerButtonHidden = true cropController.aspectRatioLockEnabled = true pickerViewController.dismiss(animated: true, completion: { @@ -443,7 +462,12 @@ extension ProfileHeaderViewController: UIDocumentPickerDelegate { // MARK: - CropViewControllerDelegate extension ProfileHeaderViewController: CropViewControllerDelegate { public func cropViewController(_ cropViewController: CropViewController, didCropToImage image: UIImage, withRect cropRect: CGRect, angle: Int) { - viewModel.profileInfoEditing.avatar = image + switch currentImageType { + case .banner: + viewModel.profileInfoEditing.header = image + case .avatar: + viewModel.profileInfoEditing.avatar = image + } cropViewController.dismiss(animated: true, completion: nil) } } diff --git a/Mastodon/Scene/Profile/Header/ProfileHeaderViewModel.swift b/Mastodon/Scene/Profile/Header/ProfileHeaderViewModel.swift index 65f15efa7..c66789cca 100644 --- a/Mastodon/Scene/Profile/Header/ProfileHeaderViewModel.swift +++ b/Mastodon/Scene/Profile/Header/ProfileHeaderViewModel.swift @@ -18,6 +18,7 @@ import MastodonUI final class ProfileHeaderViewModel { static let avatarImageMaxSizeInPixel = CGSize(width: 400, height: 400) + static let bannerImageMaxSizeInPixel = CGSize(width: 1500, height: 500) static let maxProfileFieldCount = 4 var disposeBag = Set() @@ -52,6 +53,9 @@ final class ProfileHeaderViewModel { .sink { [weak self] account in guard let self = self else { return } guard let account = account else { return } + // banner + self.profileInfo.header = nil + self.profileInfoEditing.header = nil // avatar self.profileInfo.avatar = nil self.profileInfoEditing.avatar = nil @@ -72,6 +76,7 @@ final class ProfileHeaderViewModel { extension ProfileHeaderViewModel { class ProfileInfo { // input + @Published var header: UIImage? @Published var avatar: UIImage? @Published var name: String? @Published var note: String? @@ -99,6 +104,7 @@ extension ProfileHeaderViewModel: ProfileViewModelEditable { var isEdited: Bool { guard isEditing else { return false } + guard profileInfoEditing.header == nil else { return true } guard profileInfoEditing.avatar == nil else { return true } guard profileInfo.name == profileInfoEditing.name else { return true } guard profileInfo.note == profileInfoEditing.note else { return true } diff --git a/Mastodon/Scene/Profile/Header/View/ProfileHeaderView+ViewModel.swift b/Mastodon/Scene/Profile/Header/View/ProfileHeaderView+ViewModel.swift index c51ccfab3..5095d7ac0 100644 --- a/Mastodon/Scene/Profile/Header/View/ProfileHeaderView+ViewModel.swift +++ b/Mastodon/Scene/Profile/Header/View/ProfileHeaderView+ViewModel.swift @@ -28,6 +28,7 @@ extension ProfileHeaderView { @Published var emojiMeta: MastodonContent.Emojis = [:] @Published var headerImageURL: URL? + @Published var headerImageEditing: UIImage? @Published var avatarImageURL: URL? @Published var avatarImageEditing: UIImage? @@ -61,14 +62,19 @@ extension ProfileHeaderView.ViewModel { func bind(view: ProfileHeaderView) { // header - Publishers.CombineLatest( + Publishers.CombineLatest4( $headerImageURL, + $headerImageEditing, + $isEditing, viewDidAppear ) - .sink { headerImageURL, _ in + .sink { headerImageURL, headerImageEditing, isEditing, _ in view.bannerImageView.af.cancelImageRequest() - let placeholder = UIImage.placeholder(color: ProfileHeaderView.bannerImageViewPlaceholderColor) - guard let bannerImageURL = headerImageURL else { + let defaultPlaceholder = UIImage.placeholder(color: ProfileHeaderView.bannerImageViewPlaceholderColor) + let placeholder = isEditing ? (headerImageEditing ?? defaultPlaceholder) : defaultPlaceholder + guard let bannerImageURL = headerImageURL, + !isEditing || headerImageEditing == nil + else { view.bannerImageView.image = placeholder return } @@ -262,22 +268,29 @@ extension ProfileHeaderView { animator.addAnimations { self.bannerImageViewOverlayVisualEffectView.backgroundColor = ProfileHeaderView.bannerImageViewOverlayViewBackgroundNormalColor self.nameTextFieldBackgroundView.backgroundColor = .clear + self.editBannerButton.alpha = 0 self.editAvatarBackgroundView.alpha = 0 } animator.addCompletion { _ in + self.editBannerButton.isHidden = true self.editAvatarBackgroundView.isHidden = true + self.bannerImageViewSingleTapGestureRecognizer.isEnabled = true } case .editing: nameMetaText.textView.alpha = 0 nameTextField.isEnabled = true nameTextField.alpha = 1 + editBannerButton.isHidden = false + editBannerButton.alpha = 0 editAvatarBackgroundView.isHidden = false editAvatarBackgroundView.alpha = 0 bioMetaText.textView.backgroundColor = .clear + bannerImageViewSingleTapGestureRecognizer.isEnabled = false animator.addAnimations { self.bannerImageViewOverlayVisualEffectView.backgroundColor = ProfileHeaderView.bannerImageViewOverlayViewBackgroundEditingColor self.nameTextFieldBackgroundView.backgroundColor = Asset.Scene.Profile.Banner.nameEditBackgroundGray.color + self.editBannerButton.alpha = 1 self.editAvatarBackgroundView.alpha = 1 self.bioMetaText.textView.backgroundColor = Asset.Scene.Profile.Banner.bioEditBackgroundGray.color } diff --git a/Mastodon/Scene/Profile/Header/View/ProfileHeaderView.swift b/Mastodon/Scene/Profile/Header/View/ProfileHeaderView.swift index a2194758b..cf2443552 100644 --- a/Mastodon/Scene/Profile/Header/View/ProfileHeaderView.swift +++ b/Mastodon/Scene/Profile/Header/View/ProfileHeaderView.swift @@ -50,6 +50,7 @@ final class ProfileHeaderView: UIView { return viewModel }() + let bannerImageViewSingleTapGestureRecognizer = UITapGestureRecognizer.singleTapGestureRecognizer let bannerContainerView = UIView() let bannerImageView: UIImageView = { let imageView = UIImageView() @@ -101,7 +102,9 @@ final class ProfileHeaderView: UIView { return button }() - func setupAvatarOverlayViews() { + func setupImageOverlayViews() { + editBannerButton.tintColor = .white + editAvatarBackgroundView.backgroundColor = UIColor.black.withAlphaComponent(0.6) editAvatarButtonOverlayIndicatorView.tintColor = .white } @@ -113,6 +116,13 @@ final class ProfileHeaderView: UIView { return visualEffectView }() + let editBannerButton: HighlightDimmableButton = { + let button = HighlightDimmableButton() + button.setImage(UIImage(systemName: "photo", withConfiguration: UIImage.SymbolConfiguration(pointSize: 28)), for: .normal) + button.tintColor = .clear + return button + }() + let editAvatarBackgroundView: UIView = { let view = UIView() view.backgroundColor = .clear // set value after view appeared @@ -265,13 +275,13 @@ extension ProfileHeaderView { bannerImageViewOverlayVisualEffectView.translatesAutoresizingMaskIntoConstraints = false bannerImageView.addSubview(bannerImageViewOverlayVisualEffectView) - NSLayoutConstraint.activate([ - bannerImageViewOverlayVisualEffectView.topAnchor.constraint(equalTo: bannerImageView.topAnchor), - bannerImageViewOverlayVisualEffectView.leadingAnchor.constraint(equalTo: bannerImageView.leadingAnchor), - bannerImageViewOverlayVisualEffectView.trailingAnchor.constraint(equalTo: bannerImageView.trailingAnchor), - bannerImageViewOverlayVisualEffectView.bottomAnchor.constraint(equalTo: bannerImageView.bottomAnchor), - ]) - + bannerImageViewOverlayVisualEffectView.pinToParent() + + editBannerButton.translatesAutoresizingMaskIntoConstraints = false + bannerContainerView.addSubview(editBannerButton) + editBannerButton.pinTo(to: bannerImageView) + bannerContainerView.isUserInteractionEnabled = true + // follows you followsYouBlurEffectView.translatesAutoresizingMaskIntoConstraints = false addSubview(followsYouBlurEffectView) @@ -286,12 +296,7 @@ extension ProfileHeaderView { followsYouVibrantEffectView.translatesAutoresizingMaskIntoConstraints = false followsYouBlurEffectView.contentView.addSubview(followsYouVibrantEffectView) - NSLayoutConstraint.activate([ - followsYouVibrantEffectView.topAnchor.constraint(equalTo: followsYouBlurEffectView.topAnchor), - followsYouVibrantEffectView.leadingAnchor.constraint(equalTo: followsYouBlurEffectView.leadingAnchor), - followsYouVibrantEffectView.trailingAnchor.constraint(equalTo: followsYouBlurEffectView.trailingAnchor), - followsYouVibrantEffectView.bottomAnchor.constraint(equalTo: followsYouBlurEffectView.bottomAnchor), - ]) + followsYouVibrantEffectView.pinTo(to: followsYouBlurEffectView) followsYouLabel.translatesAutoresizingMaskIntoConstraints = false followsYouVibrantEffectView.contentView.addSubview(followsYouLabel) @@ -327,30 +332,15 @@ extension ProfileHeaderView { avatarImageViewOverlayVisualEffectView.translatesAutoresizingMaskIntoConstraints = false avatarImageViewBackgroundView.addSubview(avatarImageViewOverlayVisualEffectView) - NSLayoutConstraint.activate([ - avatarImageViewOverlayVisualEffectView.topAnchor.constraint(equalTo: avatarImageViewBackgroundView.topAnchor), - avatarImageViewOverlayVisualEffectView.leadingAnchor.constraint(equalTo: avatarImageViewBackgroundView.leadingAnchor), - avatarImageViewOverlayVisualEffectView.trailingAnchor.constraint(equalTo: avatarImageViewBackgroundView.trailingAnchor), - avatarImageViewOverlayVisualEffectView.bottomAnchor.constraint(equalTo: avatarImageViewBackgroundView.bottomAnchor), - ]) + avatarImageViewOverlayVisualEffectView.pinToParent() editAvatarBackgroundView.translatesAutoresizingMaskIntoConstraints = false avatarButton.addSubview(editAvatarBackgroundView) - NSLayoutConstraint.activate([ - editAvatarBackgroundView.topAnchor.constraint(equalTo: avatarButton.topAnchor), - editAvatarBackgroundView.leadingAnchor.constraint(equalTo: avatarButton.leadingAnchor), - editAvatarBackgroundView.trailingAnchor.constraint(equalTo: avatarButton.trailingAnchor), - editAvatarBackgroundView.bottomAnchor.constraint(equalTo: avatarButton.bottomAnchor), - ]) + editAvatarBackgroundView.pinToParent() editAvatarButtonOverlayIndicatorView.translatesAutoresizingMaskIntoConstraints = false editAvatarBackgroundView.addSubview(editAvatarButtonOverlayIndicatorView) - NSLayoutConstraint.activate([ - editAvatarButtonOverlayIndicatorView.topAnchor.constraint(equalTo: editAvatarBackgroundView.topAnchor), - editAvatarButtonOverlayIndicatorView.leadingAnchor.constraint(equalTo: editAvatarBackgroundView.leadingAnchor), - editAvatarButtonOverlayIndicatorView.trailingAnchor.constraint(equalTo: editAvatarBackgroundView.trailingAnchor), - editAvatarButtonOverlayIndicatorView.bottomAnchor.constraint(equalTo: editAvatarBackgroundView.bottomAnchor), - ]) + editAvatarButtonOverlayIndicatorView.pinToParent() editAvatarBackgroundView.isUserInteractionEnabled = true avatarButton.isUserInteractionEnabled = true @@ -436,11 +426,8 @@ extension ProfileHeaderView { relationshipActionButton.translatesAutoresizingMaskIntoConstraints = false relationshipActionButtonShadowContainer.addSubview(relationshipActionButton) + relationshipActionButton.pinToParent() NSLayoutConstraint.activate([ - relationshipActionButton.topAnchor.constraint(equalTo: relationshipActionButtonShadowContainer.topAnchor), - relationshipActionButton.leadingAnchor.constraint(equalTo: relationshipActionButtonShadowContainer.leadingAnchor), - relationshipActionButton.trailingAnchor.constraint(equalTo: relationshipActionButtonShadowContainer.trailingAnchor), - relationshipActionButton.bottomAnchor.constraint(equalTo: relationshipActionButtonShadowContainer.bottomAnchor), relationshipActionButton.widthAnchor.constraint(greaterThanOrEqualToConstant: ProfileHeaderView.friendshipActionButtonSize.width).priority(.required - 1), relationshipActionButton.heightAnchor.constraint(equalToConstant: ProfileHeaderView.friendshipActionButtonSize.height).priority(.defaultHigh), ]) @@ -455,8 +442,7 @@ extension ProfileHeaderView { statusDashboardView.delegate = self bioMetaText.textView.delegate = self bioMetaText.textView.linkDelegate = self - - let bannerImageViewSingleTapGestureRecognizer = UITapGestureRecognizer.singleTapGestureRecognizer + bannerImageView.addGestureRecognizer(bannerImageViewSingleTapGestureRecognizer) bannerImageViewSingleTapGestureRecognizer.addTarget(self, action: #selector(ProfileHeaderView.bannerImageViewDidPressed(_:))) diff --git a/Mastodon/Scene/Profile/Paging/ProfilePagingViewController.swift b/Mastodon/Scene/Profile/Paging/ProfilePagingViewController.swift index db92617b7..27c539d18 100644 --- a/Mastodon/Scene/Profile/Paging/ProfilePagingViewController.swift +++ b/Mastodon/Scene/Profile/Paging/ProfilePagingViewController.swift @@ -99,12 +99,7 @@ extension ProfilePagingViewController { if let buttonBarView = self.buttonBarView { buttonBarShadowView.translatesAutoresizingMaskIntoConstraints = false view.insertSubview(buttonBarShadowView, belowSubview: buttonBarView) - NSLayoutConstraint.activate([ - buttonBarShadowView.topAnchor.constraint(equalTo: buttonBarView.topAnchor), - buttonBarShadowView.leadingAnchor.constraint(equalTo: buttonBarView.leadingAnchor), - buttonBarShadowView.trailingAnchor.constraint(equalTo: buttonBarView.trailingAnchor), - buttonBarShadowView.bottomAnchor.constraint(equalTo: buttonBarView.bottomAnchor), - ]) + buttonBarShadowView.pinTo(to: buttonBarView) viewModel.$needsSetupBottomShadow .receive(on: DispatchQueue.main) diff --git a/Mastodon/Scene/Profile/ProfileViewController.swift b/Mastodon/Scene/Profile/ProfileViewController.swift index 3ce1fd33a..1184fb3d7 100644 --- a/Mastodon/Scene/Profile/ProfileViewController.swift +++ b/Mastodon/Scene/Profile/ProfileViewController.swift @@ -51,6 +51,7 @@ final class ProfileViewController: UIViewController, NeedsDependency, MediaPrevi action: #selector(ProfileViewController.settingBarButtonItemPressed(_:)) ) barButtonItem.tintColor = .white + barButtonItem.accessibilityLabel = L10n.Common.Controls.Actions.settings return barButtonItem }() @@ -62,6 +63,7 @@ final class ProfileViewController: UIViewController, NeedsDependency, MediaPrevi action: #selector(ProfileViewController.shareBarButtonItemPressed(_:)) ) barButtonItem.tintColor = .white + barButtonItem.accessibilityLabel = L10n.Common.Controls.Actions.share return barButtonItem }() @@ -73,6 +75,7 @@ final class ProfileViewController: UIViewController, NeedsDependency, MediaPrevi action: #selector(ProfileViewController.favoriteBarButtonItemPressed(_:)) ) barButtonItem.tintColor = .white + barButtonItem.accessibilityLabel = L10n.Scene.Favorite.title return barButtonItem }() @@ -84,23 +87,26 @@ final class ProfileViewController: UIViewController, NeedsDependency, MediaPrevi action: #selector(ProfileViewController.bookmarkBarButtonItemPressed(_:)) ) barButtonItem.tintColor = .white + barButtonItem.accessibilityLabel = L10n.Scene.Bookmark.title return barButtonItem }() private(set) lazy var replyBarButtonItem: UIBarButtonItem = { let barButtonItem = UIBarButtonItem(image: UIImage(systemName: "arrowshape.turn.up.left"), style: .plain, target: self, action: #selector(ProfileViewController.replyBarButtonItemPressed(_:))) barButtonItem.tintColor = .white + barButtonItem.accessibilityLabel = L10n.Common.Controls.Actions.reply return barButtonItem }() let moreMenuBarButtonItem: UIBarButtonItem = { let barButtonItem = UIBarButtonItem(image: UIImage(systemName: "ellipsis.circle"), style: .plain, target: nil, action: nil) barButtonItem.tintColor = .white + barButtonItem.accessibilityLabel = L10n.Common.Controls.Actions.seeMore return barButtonItem }() - let refreshControl: UIRefreshControl = { - let refreshControl = UIRefreshControl() + let refreshControl: RefreshControl = { + let refreshControl = RefreshControl() refreshControl.tintColor = .white return refreshControl }() @@ -253,12 +259,7 @@ extension ProfileViewController { tabBarPagerController.view.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tabBarPagerController.view) tabBarPagerController.didMove(toParent: self) - NSLayoutConstraint.activate([ - tabBarPagerController.view.topAnchor.constraint(equalTo: view.topAnchor), - tabBarPagerController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tabBarPagerController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tabBarPagerController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tabBarPagerController.view.pinToParent() tabBarPagerController.delegate = self tabBarPagerController.dataSource = self @@ -497,7 +498,7 @@ extension ProfileViewController { os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) guard let setting = context.settingService.currentSetting.value else { return } let settingsViewModel = SettingsViewModel(context: context, authContext: viewModel.authContext, setting: setting) - coordinator.present(scene: .settings(viewModel: settingsViewModel), from: self, transition: .modal(animated: true, completion: nil)) + _ = coordinator.present(scene: .settings(viewModel: settingsViewModel), from: self, transition: .modal(animated: true, completion: nil)) } @objc private func shareBarButtonItemPressed(_ sender: UIBarButtonItem) { @@ -540,18 +541,21 @@ extension ProfileViewController { let composeViewModel = ComposeViewModel( context: context, authContext: viewModel.authContext, - kind: .mention(user: mastodonUser.asRecrod) + kind: .mention(user: mastodonUser.asRecord) ) _ = coordinator.present(scene: .compose(viewModel: composeViewModel), from: self, transition: .modal(animated: true, completion: nil)) } - @objc private func refreshControlValueChanged(_ sender: UIRefreshControl) { + @objc private func refreshControlValueChanged(_ sender: RefreshControl) { os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) if let userTimelineViewController = profilePagingViewController.currentViewController as? UserTimelineViewController { userTimelineViewController.viewModel.stateMachine.enter(UserTimelineViewModel.State.Reloading.self) } + // trigger authenticated user account update + viewModel.context.authenticationService.updateActiveUserAccountPublisher.send() + DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { sender.endRefreshing() } diff --git a/Mastodon/Scene/Profile/ProfileViewModel.swift b/Mastodon/Scene/Profile/ProfileViewModel.swift index e23b465d4..5c81c7920 100644 --- a/Mastodon/Scene/Profile/ProfileViewModel.swift +++ b/Mastodon/Scene/Profile/ProfileViewModel.swift @@ -215,8 +215,17 @@ extension ProfileViewModel { let authenticationBox = authContext.mastodonAuthenticationBox let domain = authenticationBox.domain let authorization = authenticationBox.userAuthorization - - let _image: UIImage? = { + + // TODO: constrain size? + let _header: UIImage? = { + guard let image = headerProfileInfo.header else { return nil } + guard image.size.width <= ProfileHeaderViewModel.bannerImageMaxSizeInPixel.width else { + return image.af.imageScaled(to: ProfileHeaderViewModel.bannerImageMaxSizeInPixel) + } + return image + }() + + let _avatar: UIImage? = { guard let image = headerProfileInfo.avatar else { return nil } guard image.size.width <= ProfileHeaderViewModel.avatarImageMaxSizeInPixel.width else { return image.af.imageScaled(to: ProfileHeaderViewModel.avatarImageMaxSizeInPixel) @@ -233,8 +242,8 @@ extension ProfileViewModel { bot: nil, displayName: headerProfileInfo.name, note: headerProfileInfo.note, - avatar: _image.flatMap { Mastodon.Query.MediaAttachment.png($0.pngData()) }, - header: nil, + avatar: _avatar.flatMap { Mastodon.Query.MediaAttachment.png($0.pngData()) }, + header: _header.flatMap { Mastodon.Query.MediaAttachment.png($0.pngData()) }, locked: nil, source: nil, fieldsAttributes: fieldsAttributes diff --git a/Mastodon/Scene/Profile/Timeline/UserTimelineViewController.swift b/Mastodon/Scene/Profile/Timeline/UserTimelineViewController.swift index 8a983da33..6cdd6a594 100644 --- a/Mastodon/Scene/Profile/Timeline/UserTimelineViewController.swift +++ b/Mastodon/Scene/Profile/Timeline/UserTimelineViewController.swift @@ -60,12 +60,7 @@ extension UserTimelineViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() tableView.delegate = self viewModel.setupDiffableDataSource( diff --git a/Mastodon/Scene/Profile/UserLIst/FavoritedBy/FavoritedByViewController.swift b/Mastodon/Scene/Profile/UserLIst/FavoritedBy/FavoritedByViewController.swift index ebce374e7..07316cd3d 100644 --- a/Mastodon/Scene/Profile/UserLIst/FavoritedBy/FavoritedByViewController.swift +++ b/Mastodon/Scene/Profile/UserLIst/FavoritedBy/FavoritedByViewController.swift @@ -61,12 +61,7 @@ extension FavoritedByViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() tableView.delegate = self viewModel.setupDiffableDataSource( diff --git a/Mastodon/Scene/Profile/UserLIst/RebloggedBy/RebloggedByViewController.swift b/Mastodon/Scene/Profile/UserLIst/RebloggedBy/RebloggedByViewController.swift index 0688bcccb..a45c491fc 100644 --- a/Mastodon/Scene/Profile/UserLIst/RebloggedBy/RebloggedByViewController.swift +++ b/Mastodon/Scene/Profile/UserLIst/RebloggedBy/RebloggedByViewController.swift @@ -61,12 +61,7 @@ extension RebloggedByViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() tableView.delegate = self viewModel.setupDiffableDataSource( diff --git a/Mastodon/Scene/Profile/UserLIst/UserListViewModel+State.swift b/Mastodon/Scene/Profile/UserLIst/UserListViewModel+State.swift index c7b3e20cd..d0f7feb88 100644 --- a/Mastodon/Scene/Profile/UserLIst/UserListViewModel+State.swift +++ b/Mastodon/Scene/Profile/UserLIst/UserListViewModel+State.swift @@ -134,7 +134,7 @@ extension UserListViewModel.State { maxID = nil } - guard let viewModel = viewModel, let stateMachine = stateMachine else { return } + guard let viewModel = viewModel else { return } let maxID = self.maxID diff --git a/Mastodon/Scene/Report/Report/ReportViewController.swift b/Mastodon/Scene/Report/Report/ReportViewController.swift index f1418c5a1..fb0417a7f 100644 --- a/Mastodon/Scene/Report/Report/ReportViewController.swift +++ b/Mastodon/Scene/Report/Report/ReportViewController.swift @@ -61,12 +61,7 @@ extension ReportViewController { reportReasonViewController.view.translatesAutoresizingMaskIntoConstraints = false view.addSubview(reportReasonViewController.view) reportReasonViewController.didMove(toParent: self) - NSLayoutConstraint.activate([ - reportReasonViewController.view.topAnchor.constraint(equalTo: view.topAnchor), - reportReasonViewController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor), - reportReasonViewController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor), - reportReasonViewController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + reportReasonViewController.view.pinToParent() } } @@ -126,7 +121,7 @@ extension ReportViewController: ReportServerRulesViewControllerDelegate { return } - coordinator.present( + _ = coordinator.present( scene: .reportStatus(viewModel: viewModel.reportStatusViewModel), from: self, transition: .show diff --git a/Mastodon/Scene/Report/ReportReason/ReportReasonViewController.swift b/Mastodon/Scene/Report/ReportReason/ReportReasonViewController.swift index 2e8e53d18..517873abe 100644 --- a/Mastodon/Scene/Report/ReportReason/ReportReasonViewController.swift +++ b/Mastodon/Scene/Report/ReportReason/ReportReasonViewController.swift @@ -57,12 +57,7 @@ extension ReportReasonViewController { addChild(hostingViewController) hostingViewController.view.translatesAutoresizingMaskIntoConstraints = false view.addSubview(hostingViewController.view) - NSLayoutConstraint.activate([ - hostingViewController.view.topAnchor.constraint(equalTo: view.topAnchor), - hostingViewController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor), - hostingViewController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor), - hostingViewController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + hostingViewController.view.pinToParent() navigationActionView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(navigationActionView) diff --git a/Mastodon/Scene/Report/ReportResult/ReportResultViewController.swift b/Mastodon/Scene/Report/ReportResult/ReportResultViewController.swift index 10dcdf373..1d67ad6c3 100644 --- a/Mastodon/Scene/Report/ReportResult/ReportResultViewController.swift +++ b/Mastodon/Scene/Report/ReportResult/ReportResultViewController.swift @@ -60,12 +60,7 @@ extension ReportResultViewController { addChild(hostingViewController) hostingViewController.view.translatesAutoresizingMaskIntoConstraints = false view.addSubview(hostingViewController.view) - NSLayoutConstraint.activate([ - hostingViewController.view.topAnchor.constraint(equalTo: view.topAnchor), - hostingViewController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor), - hostingViewController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor), - hostingViewController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + hostingViewController.view.pinToParent() navigationActionView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(navigationActionView) diff --git a/Mastodon/Scene/Report/ReportServerRules/ReportServerRulesViewController.swift b/Mastodon/Scene/Report/ReportServerRules/ReportServerRulesViewController.swift index 3f1cdf331..00be4d800 100644 --- a/Mastodon/Scene/Report/ReportServerRules/ReportServerRulesViewController.swift +++ b/Mastodon/Scene/Report/ReportServerRules/ReportServerRulesViewController.swift @@ -63,12 +63,7 @@ extension ReportServerRulesViewController { addChild(hostingViewController) hostingViewController.view.translatesAutoresizingMaskIntoConstraints = false view.addSubview(hostingViewController.view) - NSLayoutConstraint.activate([ - hostingViewController.view.topAnchor.constraint(equalTo: view.topAnchor), - hostingViewController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor), - hostingViewController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor), - hostingViewController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + hostingViewController.view.pinToParent() navigationActionView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(navigationActionView) diff --git a/Mastodon/Scene/Report/ReportStatus/ReportStatusViewController.swift b/Mastodon/Scene/Report/ReportStatus/ReportStatusViewController.swift index d45c196cd..10e1ec3cd 100644 --- a/Mastodon/Scene/Report/ReportStatus/ReportStatusViewController.swift +++ b/Mastodon/Scene/Report/ReportStatus/ReportStatusViewController.swift @@ -80,12 +80,7 @@ extension ReportStatusViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() tableView.delegate = self viewModel.setupDiffableDataSource( @@ -128,6 +123,10 @@ extension ReportStatusViewController { .assign(to: \.isEnabled, on: navigationActionView.nextButton) .store(in: &disposeBag) + if !viewModel.selectStatuses.isEmpty { + navigationActionView.hidesBackButton = true + } + navigationActionView.backButton.addTarget(self, action: #selector(ReportStatusViewController.skipButtonDidPressed(_:)), for: .touchUpInside) navigationActionView.nextButton.addTarget(self, action: #selector(ReportStatusViewController.nextButtonDidPressed(_:)), for: .touchUpInside) } diff --git a/Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel+State.swift b/Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel+State.swift index 01e8715d1..79807cf0f 100644 --- a/Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel+State.swift +++ b/Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel+State.swift @@ -75,7 +75,7 @@ extension ReportStatusViewModel.State { override func didEnter(from previousState: GKState?) { super.didEnter(from: previousState) - guard let viewModel = viewModel, let stateMachine = stateMachine else { return } + guard let viewModel else { return } let maxID = viewModel.statusFetchedResultsController.statusIDs.last diff --git a/Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel.swift b/Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel.swift index 5b80a9f3a..c1c79af48 100644 --- a/Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel.swift +++ b/Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel.swift @@ -71,9 +71,7 @@ class ReportStatusViewModel { } $selectStatuses - .map { statuses -> Bool in - return status == nil ? !statuses.isEmpty : statuses.count > 1 - } + .map { !$0.isEmpty } .assign(to: &$isNextButtonEnabled) } diff --git a/Mastodon/Scene/Report/ReportSupplementary/ReportSupplementaryViewController.swift b/Mastodon/Scene/Report/ReportSupplementary/ReportSupplementaryViewController.swift index e644c29ea..76f312273 100644 --- a/Mastodon/Scene/Report/ReportSupplementary/ReportSupplementaryViewController.swift +++ b/Mastodon/Scene/Report/ReportSupplementary/ReportSupplementaryViewController.swift @@ -93,12 +93,7 @@ extension ReportSupplementaryViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() tableView.delegate = self viewModel.setupDiffableDataSource( diff --git a/Mastodon/Scene/Report/Share/Cell/ReportCommentTableViewCell.swift b/Mastodon/Scene/Report/Share/Cell/ReportCommentTableViewCell.swift index d735a094c..ad6ce252a 100644 --- a/Mastodon/Scene/Report/Share/Cell/ReportCommentTableViewCell.swift +++ b/Mastodon/Scene/Report/Share/Cell/ReportCommentTableViewCell.swift @@ -74,11 +74,8 @@ extension ReportCommentTableViewCell { commentTextView.translatesAutoresizingMaskIntoConstraints = false commentTextViewShadowBackgroundContainer.addSubview(commentTextView) + commentTextView.pinToParent() NSLayoutConstraint.activate([ - commentTextView.topAnchor.constraint(equalTo: commentTextViewShadowBackgroundContainer.topAnchor), - commentTextView.leadingAnchor.constraint(equalTo: commentTextViewShadowBackgroundContainer.leadingAnchor), - commentTextView.trailingAnchor.constraint(equalTo: commentTextViewShadowBackgroundContainer.trailingAnchor), - commentTextView.bottomAnchor.constraint(equalTo: commentTextViewShadowBackgroundContainer.bottomAnchor), commentTextView.heightAnchor.constraint(greaterThanOrEqualToConstant: 100).priority(.defaultHigh), ]) } diff --git a/Mastodon/Scene/Report/Share/Cell/ReportResultActionTableViewCell.swift b/Mastodon/Scene/Report/Share/Cell/ReportResultActionTableViewCell.swift index 9b605a0c7..1828035a6 100644 --- a/Mastodon/Scene/Report/Share/Cell/ReportResultActionTableViewCell.swift +++ b/Mastodon/Scene/Report/Share/Cell/ReportResultActionTableViewCell.swift @@ -103,12 +103,7 @@ extension ReportResultActionTableViewCell { reportBannerLabel.translatesAutoresizingMaskIntoConstraints = false reportBannerShadowContainer.addSubview(reportBannerLabel) - NSLayoutConstraint.activate([ - reportBannerLabel.topAnchor.constraint(equalTo: reportBannerShadowContainer.topAnchor), - reportBannerLabel.leadingAnchor.constraint(equalTo: reportBannerShadowContainer.leadingAnchor), - reportBannerLabel.trailingAnchor.constraint(equalTo: reportBannerShadowContainer.trailingAnchor), - reportBannerLabel.bottomAnchor.constraint(equalTo: reportBannerShadowContainer.bottomAnchor), - ]) + reportBannerLabel.pinToParent() } diff --git a/Mastodon/Scene/Root/ContentSplitViewController.swift b/Mastodon/Scene/Root/ContentSplitViewController.swift index 3f4758e8e..a10f0ed9b 100644 --- a/Mastodon/Scene/Root/ContentSplitViewController.swift +++ b/Mastodon/Scene/Root/ContentSplitViewController.swift @@ -124,4 +124,17 @@ extension ContentSplitViewController: SidebarViewControllerDelegate { accountListViewController.preferredContentSize = CGSize(width: 375, height: 400) } + func sidebarViewController(_ sidebarViewController: SidebarViewController, didDoubleTapItem item: SidebarViewModel.Item, sourceView: UIView) { + guard case let .tab(tab) = item, tab == .me else { return } + guard let authContext = authContext else { return } + assert(Thread.isMainThread) + + guard let nextAccount = context.nextAccount(in: authContext) else { return } + + Task { @MainActor in + let isActive = try await context.authenticationService.activeMastodonUser(domain: nextAccount.domain, userID: nextAccount.userID) + guard isActive else { return } + self.coordinator.setup() + } + } } diff --git a/Mastodon/Scene/Root/MainTab/MainTabBarController.swift b/Mastodon/Scene/Root/MainTab/MainTabBarController.swift index c49dcc1a1..2e5d5ae58 100644 --- a/Mastodon/Scene/Root/MainTab/MainTabBarController.swift +++ b/Mastodon/Scene/Root/MainTab/MainTabBarController.swift @@ -8,6 +8,7 @@ import os.log import UIKit import Combine +import CoreDataStack import SafariServices import MastodonAsset import MastodonCore @@ -42,6 +43,7 @@ class MainTabBarController: UITabBarController { static let avatarButtonSize = CGSize(width: 25, height: 25) let avatarButton = CircleAvatarButton() + let accountSwitcherChevron = UIImageView(image: .chevronUpChevronDown) @Published var currentTab: Tab = .home @@ -49,7 +51,7 @@ class MainTabBarController: UITabBarController { case home case search case compose - case notification + case notifications case me var tag: Int { @@ -61,7 +63,7 @@ class MainTabBarController: UITabBarController { case .home: return L10n.Common.Controls.Tabs.home case .search: return L10n.Common.Controls.Tabs.search case .compose: return L10n.Common.Controls.Actions.compose - case .notification: return L10n.Common.Controls.Tabs.notification + case .notifications: return L10n.Common.Controls.Tabs.notifications case .me: return L10n.Common.Controls.Tabs.profile } } @@ -71,7 +73,7 @@ class MainTabBarController: UITabBarController { case .home: return Asset.ObjectsAndTools.house.image.withRenderingMode(.alwaysTemplate) case .search: return Asset.ObjectsAndTools.magnifyingglass.image.withRenderingMode(.alwaysTemplate) case .compose: return Asset.ObjectsAndTools.squareAndPencil.image.withRenderingMode(.alwaysTemplate) - case .notification: return Asset.ObjectsAndTools.bell.image.withRenderingMode(.alwaysTemplate) + case .notifications: return Asset.ObjectsAndTools.bell.image.withRenderingMode(.alwaysTemplate) case .me: return UIImage(systemName: "person")! } } @@ -81,7 +83,7 @@ class MainTabBarController: UITabBarController { case .home: return Asset.ObjectsAndTools.houseFill.image.withRenderingMode(.alwaysTemplate) case .search: return Asset.ObjectsAndTools.magnifyingglassFill.image.withRenderingMode(.alwaysTemplate) case .compose: return Asset.ObjectsAndTools.squareAndPencil.image.withRenderingMode(.alwaysTemplate) - case .notification: return Asset.ObjectsAndTools.bellFill.image.withRenderingMode(.alwaysTemplate) + case .notifications: return Asset.ObjectsAndTools.bellFill.image.withRenderingMode(.alwaysTemplate) case .me: return UIImage(systemName: "person.fill")! } } @@ -91,7 +93,7 @@ class MainTabBarController: UITabBarController { case .home: return Asset.ObjectsAndTools.house.image.withRenderingMode(.alwaysTemplate).resized(size: CGSize(width: 80, height: 80)) case .search: return Asset.ObjectsAndTools.magnifyingglass.image.withRenderingMode(.alwaysTemplate).resized(size: CGSize(width: 80, height: 80)) case .compose: return Asset.ObjectsAndTools.squareAndPencil.image.withRenderingMode(.alwaysTemplate).resized(size: CGSize(width: 80, height: 80)) - case .notification: return Asset.ObjectsAndTools.bell.image.withRenderingMode(.alwaysTemplate).resized(size: CGSize(width: 80, height: 80)) + case .notifications: return Asset.ObjectsAndTools.bell.image.withRenderingMode(.alwaysTemplate).resized(size: CGSize(width: 80, height: 80)) case .me: return UIImage(systemName: "person", withConfiguration: UIImage.SymbolConfiguration(pointSize: 80))! } } @@ -101,7 +103,7 @@ class MainTabBarController: UITabBarController { case .home: return Asset.ObjectsAndTools.house.image.withRenderingMode(.alwaysTemplate) case .search: return Asset.ObjectsAndTools.magnifyingglass.image.withRenderingMode(.alwaysTemplate) case .compose: return Asset.ObjectsAndTools.squareAndPencil.image.withRenderingMode(.alwaysTemplate) - case .notification: return Asset.ObjectsAndTools.bell.image.withRenderingMode(.alwaysTemplate) + case .notifications: return Asset.ObjectsAndTools.bell.image.withRenderingMode(.alwaysTemplate) case .me: return UIImage(systemName: "person")! } } @@ -127,7 +129,7 @@ class MainTabBarController: UITabBarController { viewController = _viewController case .compose: viewController = UIViewController() - case .notification: + case .notifications: let _viewController = NotificationViewController() _viewController.context = context _viewController.coordinator = coordinator @@ -218,7 +220,7 @@ extension MainTabBarController { let alertController = UIAlertController(for: error, title: nil, preferredStyle: .alert) let okAction = UIAlertAction(title: "OK", style: .default, handler: nil) alertController.addAction(okAction) - coordinator.present( + _ = coordinator.present( scene: .alertController(alertController: alertController), from: nil, transition: .alertController(animated: true, completion: nil) @@ -272,7 +274,7 @@ extension MainTabBarController { } ?? false let image: UIImage = { - if currentTab == .notification { + if currentTab == .notifications { return hasUnreadPushNotification ? Asset.ObjectsAndTools.bellBadgeFill.image.withRenderingMode(.alwaysTemplate) : Asset.ObjectsAndTools.bellFill.image.withRenderingMode(.alwaysTemplate) } else { return hasUnreadPushNotification ? Asset.ObjectsAndTools.bellBadge.image.withRenderingMode(.alwaysTemplate) : Asset.ObjectsAndTools.bell.image.withRenderingMode(.alwaysTemplate) @@ -306,13 +308,17 @@ extension MainTabBarController { guard user.managedObjectContext != nil else { return } self.avatarURL = user.avatarImageURL() } - + // a11y let _profileTabItem = self.tabBar.items?.first { item in item.tag == Tab.me.tag } guard let profileTabItem = _profileTabItem else { return } - let currentUserDisplayName = user.displayNameWithFallback ?? "no user" - profileTabItem.accessibilityHint = L10n.Scene.AccountList.tabBarHint(currentUserDisplayName) - + profileTabItem.accessibilityHint = L10n.Scene.AccountList.tabBarHint(user.displayNameWithFallback) + + context.authenticationService.updateActiveUserAccountPublisher + .sink { [weak self] in + self?.updateUserAccount() + } + .store(in: &disposeBag) } else { self.avatarURLObserver = nil } @@ -320,7 +326,14 @@ extension MainTabBarController { let tabBarLongPressGestureRecognizer = UILongPressGestureRecognizer() tabBarLongPressGestureRecognizer.addTarget(self, action: #selector(MainTabBarController.tabBarLongPressGestureRecognizerHandler(_:))) tabBar.addGestureRecognizer(tabBarLongPressGestureRecognizer) - + + // todo: reconsider the "double tap to change account" feature -> https://github.com/mastodon/mastodon-ios/issues/628 +// let tabBarDoubleTapGestureRecognizer = UITapGestureRecognizer() +// tabBarDoubleTapGestureRecognizer.numberOfTapsRequired = 2 +// tabBarDoubleTapGestureRecognizer.addTarget(self, action: #selector(MainTabBarController.tabBarDoubleTapGestureRecognizerHandler(_:))) +// tabBarDoubleTapGestureRecognizer.delaysTouchesEnded = false +// tabBar.addGestureRecognizer(tabBarDoubleTapGestureRecognizer) + self.isReadyForWizardAvatarButton = authContext != nil $currentTab @@ -371,9 +384,7 @@ extension MainTabBarController { _ = coordinator.present(scene: .compose(viewModel: composeViewModel), from: nil, transition: .modal(animated: true, completion: nil)) } - @objc private func tabBarLongPressGestureRecognizerHandler(_ sender: UILongPressGestureRecognizer) { - guard sender.state == .began else { return } - + private func touchedTab(by sender: UIGestureRecognizer) -> Tab? { var _tab: Tab? let location = sender.location(in: tabBar) for item in tabBar.items ?? [] { @@ -385,7 +396,34 @@ extension MainTabBarController { break } - guard let tab = _tab else { return } + return _tab + } + + @objc private func tabBarDoubleTapGestureRecognizerHandler(_ sender: UITapGestureRecognizer) { + guard sender.state == .ended else { return } + guard let tab = touchedTab(by: sender) else { return } + logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): double tap \(tab.title) tab") + + switch tab { + case .me: + guard let authContext = authContext else { return } + assert(Thread.isMainThread) + + guard let nextAccount = context.nextAccount(in: authContext) else { return } + + Task { @MainActor in + let isActive = try await context.authenticationService.activeMastodonUser(domain: nextAccount.domain, userID: nextAccount.userID) + guard isActive else { return } + self.coordinator.setup() + } + default: + break + } + } + + @objc private func tabBarLongPressGestureRecognizerHandler(_ sender: UILongPressGestureRecognizer) { + guard sender.state == .began else { return } + guard let tab = touchedTab(by: sender) else { return } logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): long press \(tab.title) tab") switch tab { @@ -438,12 +476,7 @@ extension MainTabBarController { composeButton.translatesAutoresizingMaskIntoConstraints = false composeButttonShadowBackgroundContainer.addSubview(composeButton) - NSLayoutConstraint.activate([ - composeButton.topAnchor.constraint(equalTo: composeButttonShadowBackgroundContainer.topAnchor), - composeButton.leadingAnchor.constraint(equalTo: composeButttonShadowBackgroundContainer.leadingAnchor), - composeButton.trailingAnchor.constraint(equalTo: composeButttonShadowBackgroundContainer.trailingAnchor), - composeButton.bottomAnchor.constraint(equalTo: composeButttonShadowBackgroundContainer.bottomAnchor), - ]) + composeButton.pinToParent() composeButton.setContentHuggingPriority(.required - 1, for: .horizontal) composeButton.setContentHuggingPriority(.required - 1, for: .vertical) } @@ -469,13 +502,20 @@ extension MainTabBarController { } anchorImageView.alpha = 0 + accountSwitcherChevron.translatesAutoresizingMaskIntoConstraints = false + view.addSubview(accountSwitcherChevron) + self.avatarButton.translatesAutoresizingMaskIntoConstraints = false view.addSubview(self.avatarButton) NSLayoutConstraint.activate([ - self.avatarButton.centerXAnchor.constraint(equalTo: anchorImageView.centerXAnchor), + self.avatarButton.centerXAnchor.constraint(equalTo: anchorImageView.centerXAnchor, constant: -16), self.avatarButton.centerYAnchor.constraint(equalTo: anchorImageView.centerYAnchor), self.avatarButton.widthAnchor.constraint(equalToConstant: MainTabBarController.avatarButtonSize.width).priority(.required - 1), self.avatarButton.heightAnchor.constraint(equalToConstant: MainTabBarController.avatarButtonSize.height).priority(.required - 1), + accountSwitcherChevron.widthAnchor.constraint(equalToConstant: 10), + accountSwitcherChevron.heightAnchor.constraint(equalToConstant: 18), + accountSwitcherChevron.leadingAnchor.constraint(equalTo: avatarButton.trailingAnchor, constant: 8), + accountSwitcherChevron.centerYAnchor.constraint(equalTo: avatarButton.centerYAnchor) ]) self.avatarButton.setContentHuggingPriority(.required - 1, for: .horizontal) self.avatarButton.setContentHuggingPriority(.required - 1, for: .vertical) @@ -483,10 +523,31 @@ extension MainTabBarController { } private func updateAvatarButtonAppearance() { + accountSwitcherChevron.tintColor = currentTab == .me ? .label : .secondaryLabel avatarButton.borderColor = currentTab == .me ? .label : .systemFill avatarButton.setNeedsLayout() } + private func updateUserAccount() { + guard let authContext = authContext else { return } + + Task { @MainActor in + let profileResponse = try await context.apiService.authenticatedUserInfo( + authenticationBox: authContext.mastodonAuthenticationBox + ) + + if let user = authContext.mastodonAuthenticationBox.authenticationRecord.object( + in: context.managedObjectContext + )?.user { + user.update( + property: .init( + entity: profileResponse.value, + domain: authContext.mastodonAuthenticationBox.domain + ) + ) + } + } + } } extension MainTabBarController { @@ -593,7 +654,7 @@ extension MainTabBarController { let tabs: [Tab] = [ .home, .search, - .notification, + .notifications, .me ] for (i, tab) in tabs.enumerated() { diff --git a/Mastodon/Scene/Root/Sidebar/SidebarViewController.swift b/Mastodon/Scene/Root/Sidebar/SidebarViewController.swift index 70e1239b6..7c76585a6 100644 --- a/Mastodon/Scene/Root/Sidebar/SidebarViewController.swift +++ b/Mastodon/Scene/Root/Sidebar/SidebarViewController.swift @@ -15,6 +15,7 @@ import MastodonUI protocol SidebarViewControllerDelegate: AnyObject { func sidebarViewController(_ sidebarViewController: SidebarViewController, didSelectTab tab: MainTabBarController.Tab) func sidebarViewController(_ sidebarViewController: SidebarViewController, didLongPressItem item: SidebarViewModel.Item, sourceView: UIView) + func sidebarViewController(_ sidebarViewController: SidebarViewController, didDoubleTapItem item: SidebarViewModel.Item, sourceView: UIView) } final class SidebarViewController: UIViewController, NeedsDependency { @@ -101,12 +102,7 @@ extension SidebarViewController { collectionView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(collectionView) - NSLayoutConstraint.activate([ - collectionView.topAnchor.constraint(equalTo: view.topAnchor), - collectionView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - collectionView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + collectionView.pinToParent() secondaryCollectionView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(secondaryCollectionView) @@ -143,6 +139,15 @@ extension SidebarViewController { let sidebarLongPressGestureRecognizer = UILongPressGestureRecognizer() sidebarLongPressGestureRecognizer.addTarget(self, action: #selector(SidebarViewController.sidebarLongPressGestureRecognizerHandler(_:))) collectionView.addGestureRecognizer(sidebarLongPressGestureRecognizer) + + // todo: reconsider the "double tap to change account" feature -> https://github.com/mastodon/mastodon-ios/issues/628 +// let sidebarDoubleTapGestureRecognizer = UITapGestureRecognizer() +// sidebarDoubleTapGestureRecognizer.numberOfTapsRequired = 2 +// sidebarDoubleTapGestureRecognizer.addTarget(self, action: #selector(SidebarViewController.sidebarDoubleTapGestureRecognizerHandler(_:))) +// sidebarDoubleTapGestureRecognizer.delaysTouchesEnded = false +// sidebarDoubleTapGestureRecognizer.cancelsTouchesInView = true +// collectionView.addGestureRecognizer(sidebarDoubleTapGestureRecognizer) + } private func setupBackground(theme: Theme) { @@ -176,6 +181,20 @@ extension SidebarViewController { guard let cell = collectionView.cellForItem(at: indexPath) else { return } delegate?.sidebarViewController(self, didLongPressItem: item, sourceView: cell) } + + @objc private func sidebarDoubleTapGestureRecognizerHandler(_ sender: UITapGestureRecognizer) { + guard sender.state == .ended else { return } + + logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public)") + assert(sender.view === collectionView) + + let position = sender.location(in: collectionView) + guard let indexPath = collectionView.indexPathForItem(at: position) else { return } + guard let diffableDataSource = viewModel.diffableDataSource else { return } + guard let item = diffableDataSource.itemIdentifier(for: indexPath) else { return } + guard let cell = collectionView.cellForItem(at: indexPath) else { return } + delegate?.sidebarViewController(self, didDoubleTapItem: item, sourceView: cell) + } } diff --git a/Mastodon/Scene/Root/Sidebar/SidebarViewModel.swift b/Mastodon/Scene/Root/Sidebar/SidebarViewModel.swift index c3f9e3e36..f6e90dcd9 100644 --- a/Mastodon/Scene/Root/Sidebar/SidebarViewModel.swift +++ b/Mastodon/Scene/Root/Sidebar/SidebarViewModel.swift @@ -16,7 +16,6 @@ import MastodonCore import MastodonLocalization final class SidebarViewModel { - var disposeBag = Set() // input @@ -80,6 +79,7 @@ extension SidebarViewModel { }() cell.item = SidebarListContentView.Item( isActive: false, + accessoryImage: item == .me ? .chevronUpChevronDown : nil, title: item.title, image: item.image, activeImage: item.selectedImage, @@ -100,7 +100,7 @@ extension SidebarViewModel { .store(in: &cell.disposeBag) switch item { - case .notification: + case .notifications: Publishers.CombineLatest( self.context.notificationService.unreadNotificationCountDidUpdate, self.$currentTab @@ -116,7 +116,7 @@ extension SidebarViewModel { }() let image: UIImage = { - if currentTab == .notification { + if currentTab == .notifications { return hasUnreadPushNotification ? Asset.ObjectsAndTools.bellBadgeFill.image.withRenderingMode(.alwaysTemplate) : Asset.ObjectsAndTools.bellFill.image.withRenderingMode(.alwaysTemplate) } else { return hasUnreadPushNotification ? Asset.ObjectsAndTools.bellBadge.image.withRenderingMode(.alwaysTemplate) : Asset.ObjectsAndTools.bell.image.withRenderingMode(.alwaysTemplate) @@ -166,6 +166,7 @@ extension SidebarViewModel { case .compose: let item = SidebarListContentView.Item( isActive: false, + accessoryImage: self.currentTab == .me ? .chevronUpChevronDown : nil, title: L10n.Common.Controls.Actions.compose, image: Asset.ObjectsAndTools.squareAndPencil.image.withRenderingMode(.alwaysTemplate), activeImage: Asset.ObjectsAndTools.squareAndPencil.image.withRenderingMode(.alwaysTemplate), @@ -192,7 +193,7 @@ extension SidebarViewModel { let items: [Item] = [ .tab(.home), .tab(.search), - .tab(.notification), + .tab(.notifications), .tab(.me), .setting, ] diff --git a/Mastodon/Scene/Root/Sidebar/View/SidebarListContentView.swift b/Mastodon/Scene/Root/Sidebar/View/SidebarListContentView.swift index 515988405..c2aa1a4f5 100644 --- a/Mastodon/Scene/Root/Sidebar/View/SidebarListContentView.swift +++ b/Mastodon/Scene/Root/Sidebar/View/SidebarListContentView.swift @@ -23,7 +23,8 @@ final class SidebarListContentView: UIView, UIContentView { button.borderColor = UIColor.label return button }() - + private let accessoryImageView = UIImageView(image: nil) + private var currentConfiguration: ContentConfiguration! var configuration: UIContentConfiguration { get { @@ -60,6 +61,9 @@ extension SidebarListContentView { imageView.widthAnchor.constraint(equalToConstant: 40).priority(.required - 1), imageView.heightAnchor.constraint(equalToConstant: 40).priority(.required - 1), ]) + + accessoryImageView.translatesAutoresizingMaskIntoConstraints = false + addSubview(accessoryImageView) avatarButton.translatesAutoresizingMaskIntoConstraints = false addSubview(avatarButton) @@ -68,6 +72,10 @@ extension SidebarListContentView { avatarButton.centerYAnchor.constraint(equalTo: imageView.centerYAnchor), avatarButton.widthAnchor.constraint(equalTo: imageView.widthAnchor, multiplier: 1.0).priority(.required - 2), avatarButton.heightAnchor.constraint(equalTo: imageView.heightAnchor, multiplier: 1.0).priority(.required - 2), + accessoryImageView.widthAnchor.constraint(equalToConstant: 12), + accessoryImageView.heightAnchor.constraint(equalToConstant: 22), + accessoryImageView.leadingAnchor.constraint(equalTo: avatarButton.trailingAnchor, constant: 4), + accessoryImageView.centerYAnchor.constraint(equalTo: avatarButton.centerYAnchor) ]) avatarButton.setContentHuggingPriority(.defaultLow - 10, for: .vertical) avatarButton.setContentHuggingPriority(.defaultLow - 10, for: .horizontal) @@ -96,6 +104,9 @@ extension SidebarListContentView { imageView.isHidden = item.imageURL != nil avatarButton.isHidden = item.imageURL == nil imageView.image = item.isActive ? item.activeImage.withRenderingMode(.alwaysTemplate) : item.image.withRenderingMode(.alwaysTemplate) + accessoryImageView.image = item.accessoryImage + accessoryImageView.isHidden = item.accessoryImage == nil + accessoryImageView.tintColor = item.isActive ? .label : .secondaryLabel avatarButton.avatarImageView.setImage( url: item.imageURL, placeholder: avatarButton.avatarImageView.image ?? .placeholder(color: .systemFill), // reuse to avoid blink @@ -112,7 +123,8 @@ extension SidebarListContentView { var isSelected: Bool = false var isHighlighted: Bool = false var isActive: Bool - + var accessoryImage: UIImage? = nil + // model let title: String var image: UIImage @@ -124,6 +136,7 @@ extension SidebarListContentView { return lhs.isSelected == rhs.isSelected && lhs.isHighlighted == rhs.isHighlighted && lhs.isActive == rhs.isActive + && lhs.accessoryImage == rhs.accessoryImage && lhs.title == rhs.title && lhs.image == rhs.image && lhs.activeImage == rhs.activeImage @@ -134,6 +147,7 @@ extension SidebarListContentView { hasher.combine(isSelected) hasher.combine(isHighlighted) hasher.combine(isActive) + hasher.combine(accessoryImage) hasher.combine(title) hasher.combine(image) hasher.combine(activeImage) diff --git a/Mastodon/Scene/Search/Search/Cell/TrendCollectionViewCell.swift b/Mastodon/Scene/Search/Search/Cell/TrendCollectionViewCell.swift index 30f618625..4436459fb 100644 --- a/Mastodon/Scene/Search/Search/Cell/TrendCollectionViewCell.swift +++ b/Mastodon/Scene/Search/Search/Cell/TrendCollectionViewCell.swift @@ -48,12 +48,7 @@ extension TrendCollectionViewCell { trendView.translatesAutoresizingMaskIntoConstraints = false contentView.addSubview(trendView) - NSLayoutConstraint.activate([ - trendView.topAnchor.constraint(equalTo: contentView.topAnchor), - trendView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor), - trendView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor), - trendView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor), - ]) + trendView.pinToParent() } override func updateConfiguration(using state: UICellConfigurationState) { diff --git a/Mastodon/Scene/Search/Search/SearchViewController.swift b/Mastodon/Scene/Search/Search/SearchViewController.swift index 7efef2c00..c190a1a4c 100644 --- a/Mastodon/Scene/Search/Search/SearchViewController.swift +++ b/Mastodon/Scene/Search/Search/SearchViewController.swift @@ -23,15 +23,15 @@ final class HeightFixedSearchBar: UISearchBar { final class SearchViewController: UIViewController, NeedsDependency { let logger = Logger(subsystem: "SearchViewController", category: "ViewController") - + weak var context: AppContext! { willSet { precondition(!isViewLoaded) } } weak var coordinator: SceneCoordinator! { willSet { precondition(!isViewLoaded) } } var searchTransitionController = SearchTransitionController() - + var disposeBag = Set() var viewModel: SearchViewModel! - + // use AutoLayout could set search bar margin automatically to // layout alongside with split mode button (on iPad) let titleViewContainer = UIView() @@ -73,19 +73,19 @@ extension SearchViewController { override func viewDidLoad() { super.viewDidLoad() - setupBackgroundColor(theme: ThemeService.shared.currentTheme.value) + setupAppearance(theme: ThemeService.shared.currentTheme.value) ThemeService.shared.currentTheme .receive(on: DispatchQueue.main) .sink { [weak self] theme in guard let self = self else { return } - self.setupBackgroundColor(theme: theme) + self.setupAppearance(theme: theme) } .store(in: &disposeBag) title = L10n.Scene.Search.title setupSearchBar() - + // collectionView.translatesAutoresizingMaskIntoConstraints = false // view.addSubview(collectionView) // NSLayoutConstraint.activate([ @@ -101,25 +101,21 @@ extension SearchViewController { // ) guard let discoveryViewController = self.discoveryViewController else { return } - + addChild(discoveryViewController) discoveryViewController.view.translatesAutoresizingMaskIntoConstraints = false view.addSubview(discoveryViewController.view) - NSLayoutConstraint.activate([ - discoveryViewController.view.topAnchor.constraint(equalTo: view.topAnchor), - discoveryViewController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor), - discoveryViewController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor), - discoveryViewController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) - + discoveryViewController.view.pinToParent() + // discoveryViewController.view.isHidden = true + } override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) viewModel.viewDidAppeared.send() - + // note: // need set alpha because (maybe) SDK forget set alpha back titleViewContainer.alpha = 1 @@ -127,8 +123,22 @@ extension SearchViewController { } extension SearchViewController { - private func setupBackgroundColor(theme: Theme) { + private func setupAppearance(theme: Theme) { view.backgroundColor = theme.systemGroupedBackgroundColor + + // Match the DiscoveryViewController tab color and remove the double separator. + let navigationBarAppearance = UINavigationBarAppearance() + navigationBarAppearance.configureWithOpaqueBackground() + navigationBarAppearance.backgroundColor = theme.systemBackgroundColor + navigationBarAppearance.shadowColor = nil + + navigationItem.standardAppearance = navigationBarAppearance + navigationItem.scrollEdgeAppearance = navigationBarAppearance + navigationItem.compactAppearance = navigationBarAppearance + + if #available(iOS 15, *) { + navigationItem.compactScrollEdgeAppearance = navigationBarAppearance + } } private func setupSearchBar() { @@ -136,12 +146,7 @@ extension SearchViewController { searchBar.delegate = self searchBar.translatesAutoresizingMaskIntoConstraints = false titleViewContainer.addSubview(searchBar) - NSLayoutConstraint.activate([ - searchBar.topAnchor.constraint(equalTo: titleViewContainer.topAnchor), - searchBar.leadingAnchor.constraint(equalTo: titleViewContainer.leadingAnchor), - searchBar.trailingAnchor.constraint(equalTo: titleViewContainer.trailingAnchor), - searchBar.bottomAnchor.constraint(equalTo: titleViewContainer.bottomAnchor), - ]) + searchBar.pinToParent() searchBar.setContentHuggingPriority(.required, for: .horizontal) searchBar.setContentHuggingPriority(.required, for: .vertical) navigationItem.titleView = titleViewContainer @@ -159,7 +164,7 @@ extension SearchViewController { // FIXME: // use `.customPush(animated: false)` false to disable navigation bar animation for searchBar layout // but that should be a fade transition whe fixed size searchBar - self.coordinator.present(scene: .searchDetail(viewModel: searchDetailViewModel), from: self, transition: .customPush(animated: false)) + _ = self.coordinator.present(scene: .searchDetail(viewModel: searchDetailViewModel), from: self, transition: .customPush(animated: false)) } .store(in: &disposeBag) } diff --git a/Mastodon/Scene/Search/Search/View/SearchRecommendCollectionHeader.swift b/Mastodon/Scene/Search/Search/View/SearchRecommendCollectionHeader.swift index 1d4788ac8..0a65c6a25 100644 --- a/Mastodon/Scene/Search/Search/View/SearchRecommendCollectionHeader.swift +++ b/Mastodon/Scene/Search/Search/View/SearchRecommendCollectionHeader.swift @@ -62,12 +62,7 @@ extension SearchRecommendCollectionHeader { containerStackView.isLayoutMarginsRelativeArrangement = true containerStackView.translatesAutoresizingMaskIntoConstraints = false addSubview(containerStackView) - NSLayoutConstraint.activate([ - containerStackView.topAnchor.constraint(equalTo: topAnchor), - containerStackView.leadingAnchor.constraint(equalTo: leadingAnchor), - containerStackView.bottomAnchor.constraint(equalTo: bottomAnchor), - containerStackView.trailingAnchor.constraint(equalTo: trailingAnchor) - ]) + containerStackView.pinToParent() let horizontalStackView = UIStackView() horizontalStackView.spacing = 8 diff --git a/Mastodon/Scene/Search/SearchDetail/SearchDetailViewController.swift b/Mastodon/Scene/Search/SearchDetail/SearchDetailViewController.swift index 62dd1a2cc..4ec9bce31 100644 --- a/Mastodon/Scene/Search/SearchDetail/SearchDetailViewController.swift +++ b/Mastodon/Scene/Search/SearchDetail/SearchDetailViewController.swift @@ -60,7 +60,7 @@ final class SearchDetailViewController: PageboyViewController, NeedsDependency { let searchController: CustomSearchController = { let searchController = CustomSearchController() searchController.automaticallyShowsScopeBar = false - searchController.dimsBackgroundDuringPresentation = false + searchController.obscuresBackgroundDuringPresentation = false return searchController }() private(set) lazy var searchBar: UISearchBar = { @@ -116,12 +116,7 @@ extension SearchDetailViewController { searchHistoryViewController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor), ]) } else { - NSLayoutConstraint.activate([ - searchHistoryViewController.view.topAnchor.constraint(equalTo: view.topAnchor), - searchHistoryViewController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor), - searchHistoryViewController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor), - searchHistoryViewController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + searchHistoryViewController.view.pinToParent() } transition = Transition(style: .fade, duration: 0.1) @@ -289,12 +284,7 @@ extension SearchDetailViewController { navigationBarVisualEffectBackgroundView.translatesAutoresizingMaskIntoConstraints = false view.insertSubview(navigationBarVisualEffectBackgroundView, belowSubview: navigationBarBackgroundView) - NSLayoutConstraint.activate([ - navigationBarVisualEffectBackgroundView.topAnchor.constraint(equalTo: navigationBarBackgroundView.topAnchor), - navigationBarVisualEffectBackgroundView.leadingAnchor.constraint(equalTo: navigationBarBackgroundView.leadingAnchor), - navigationBarVisualEffectBackgroundView.trailingAnchor.constraint(equalTo: navigationBarBackgroundView.trailingAnchor), - navigationBarVisualEffectBackgroundView.bottomAnchor.constraint(equalTo: navigationBarBackgroundView.bottomAnchor), - ]) + navigationBarVisualEffectBackgroundView.pinTo(to: navigationBarBackgroundView) } else { navigationItem.setHidesBackButton(true, animated: false) navigationItem.titleView = nil diff --git a/Mastodon/Scene/Search/SearchDetail/SearchHistory/SearchHistoryViewController.swift b/Mastodon/Scene/Search/SearchDetail/SearchHistory/SearchHistoryViewController.swift index 52d0ffb9c..ac08e7906 100644 --- a/Mastodon/Scene/Search/SearchDetail/SearchHistory/SearchHistoryViewController.swift +++ b/Mastodon/Scene/Search/SearchDetail/SearchHistory/SearchHistoryViewController.swift @@ -47,12 +47,7 @@ extension SearchHistoryViewController { collectionView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(collectionView) - NSLayoutConstraint.activate([ - collectionView.topAnchor.constraint(equalTo: view.topAnchor), - collectionView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - collectionView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + collectionView.pinToParent() collectionView.delegate = self viewModel.setupDiffableDataSource( diff --git a/Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewController.swift b/Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewController.swift index 67de62bf3..6a840f9b5 100644 --- a/Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewController.swift +++ b/Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewController.swift @@ -49,12 +49,7 @@ extension SearchResultViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() tableView.delegate = self // tableView.prefetchDataSource = self diff --git a/Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewModel+Diffable.swift b/Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewModel+Diffable.swift index 7d243b1fa..b9eb5a9ae 100644 --- a/Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewModel+Diffable.swift +++ b/Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewModel+Diffable.swift @@ -33,7 +33,7 @@ extension SearchResultViewModel { userFetchedResultsController.$records, $hashtags ) - .map { statusRecrods, userRecords, hashtags in + .map { statusRecords, userRecords, hashtags in var items: [SearchResultItem] = [] let userItems = userRecords.map { SearchResultItem.user($0) } @@ -42,7 +42,7 @@ extension SearchResultViewModel { let hashtagItems = hashtags.map { SearchResultItem.hashtag(tag: $0) } items.append(contentsOf: hashtagItems) - let statusItems = statusRecrods.map { SearchResultItem.status($0) } + let statusItems = statusRecords.map { SearchResultItem.status($0) } items.append(contentsOf: statusItems) return items diff --git a/Mastodon/Scene/Settings/Cell/SettingsAppearanceTableViewCell.swift b/Mastodon/Scene/Settings/Cell/SettingsAppearanceTableViewCell.swift index 44b6b39c3..efad9693d 100644 --- a/Mastodon/Scene/Settings/Cell/SettingsAppearanceTableViewCell.swift +++ b/Mastodon/Scene/Settings/Cell/SettingsAppearanceTableViewCell.swift @@ -101,12 +101,7 @@ extension SettingsAppearanceTableViewCell { stackView.translatesAutoresizingMaskIntoConstraints = false contentView.addSubview(stackView) - NSLayoutConstraint.activate([ - stackView.topAnchor.constraint(equalTo: contentView.topAnchor), - stackView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor), - stackView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor), - stackView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor), - ]) + stackView.pinToParent() stackView.addArrangedSubview(systemAppearanceView) stackView.addArrangedSubview(darkAppearanceView) diff --git a/Mastodon/Scene/Settings/SettingsViewController.swift b/Mastodon/Scene/Settings/SettingsViewController.swift index 53a856fd0..fa6948ced 100644 --- a/Mastodon/Scene/Settings/SettingsViewController.swift +++ b/Mastodon/Scene/Settings/SettingsViewController.swift @@ -225,12 +225,7 @@ extension SettingsViewController { setupNavigation() view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() setupTableView() updateSectionHeaderStackViewLayout() @@ -401,7 +396,7 @@ extension SettingsViewController: UITableViewDelegate { ) let okAction = UIAlertAction(title: L10n.Common.Controls.Actions.ok, style: .default, handler: nil) alertController.addAction(okAction) - self.coordinator.present(scene: .alertController(alertController: alertController), from: nil, transition: .alertController(animated: true, completion: nil)) + _ = self.coordinator.present(scene: .alertController(alertController: alertController), from: nil, transition: .alertController(animated: true, completion: nil)) } .store(in: &disposeBag) case .signOut: @@ -549,7 +544,7 @@ extension SettingsViewController: MetaLabelDelegate { switch meta { case .url(_, _, let url, _): guard let url = URL(string: url) else { return } - coordinator.present(scene: .safari(url: url), from: self, transition: .safariPresent(animated: true, completion: nil)) + _ = coordinator.present(scene: .safari(url: url), from: self, transition: .safariPresent(animated: true, completion: nil)) default: assertionFailure() } diff --git a/Mastodon/Scene/Settings/View/AppearanceView.swift b/Mastodon/Scene/Settings/View/AppearanceView.swift index cdc29100b..a09401537 100644 --- a/Mastodon/Scene/Settings/View/AppearanceView.swift +++ b/Mastodon/Scene/Settings/View/AppearanceView.swift @@ -85,12 +85,7 @@ extension AppearanceView { private func setupUI() { imageView.translatesAutoresizingMaskIntoConstraints = false imageViewShadowBackgroundContainer.addSubview(imageView) - NSLayoutConstraint.activate([ - imageView.topAnchor.constraint(equalTo: imageViewShadowBackgroundContainer.topAnchor), - imageView.leadingAnchor.constraint(equalTo: imageViewShadowBackgroundContainer.leadingAnchor), - imageView.trailingAnchor.constraint(equalTo: imageViewShadowBackgroundContainer.trailingAnchor), - imageView.bottomAnchor.constraint(equalTo: imageViewShadowBackgroundContainer.bottomAnchor), - ]) + imageView.pinToParent() imageViewShadowBackgroundContainer.cornerRadius = 4 stackView.addArrangedSubview(imageViewShadowBackgroundContainer) @@ -100,11 +95,8 @@ extension AppearanceView { addSubview(stackView) translatesAutoresizingMaskIntoConstraints = false stackView.translatesAutoresizingMaskIntoConstraints = false + stackView.pinToParent() NSLayoutConstraint.activate([ - stackView.topAnchor.constraint(equalTo: self.topAnchor), - stackView.leadingAnchor.constraint(equalTo: self.leadingAnchor), - stackView.bottomAnchor.constraint(equalTo: self.bottomAnchor), - stackView.trailingAnchor.constraint(equalTo: self.trailingAnchor), imageView.heightAnchor.constraint(equalTo: imageView.widthAnchor, multiplier: 121.0 / 100.0), // height / width ]) } diff --git a/Mastodon/Scene/Share/ContextMenu/ImagePreview/ContextMenuImagePreviewViewController.swift b/Mastodon/Scene/Share/ContextMenu/ImagePreview/ContextMenuImagePreviewViewController.swift index 0d3c4f574..12820e627 100644 --- a/Mastodon/Scene/Share/ContextMenu/ImagePreview/ContextMenuImagePreviewViewController.swift +++ b/Mastodon/Scene/Share/ContextMenu/ImagePreview/ContextMenuImagePreviewViewController.swift @@ -31,12 +31,7 @@ extension ContextMenuImagePreviewViewController { imageView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(imageView) - NSLayoutConstraint.activate([ - imageView.topAnchor.constraint(equalTo: view.topAnchor), - imageView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - imageView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - imageView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + imageView.pinToParent() imageView.image = viewModel.thumbnail diff --git a/Mastodon/Scene/Share/NavigationController/AdaptiveStatusBarStyleNavigationController.swift b/Mastodon/Scene/Share/NavigationController/AdaptiveStatusBarStyleNavigationController.swift index 80df8938e..88441f9ad 100644 --- a/Mastodon/Scene/Share/NavigationController/AdaptiveStatusBarStyleNavigationController.swift +++ b/Mastodon/Scene/Share/NavigationController/AdaptiveStatusBarStyleNavigationController.swift @@ -14,7 +14,7 @@ class AdaptiveStatusBarStyleNavigationController: UINavigationController { // Make status bar style adaptive for child view controller // SeeAlso: `modalPresentationCapturesStatusBarAppearance` override var childForStatusBarStyle: UIViewController? { - visibleViewController + topViewController } } diff --git a/Mastodon/Scene/Share/View/Content/ContentWarningOverlayView.swift b/Mastodon/Scene/Share/View/Content/ContentWarningOverlayView.swift index ca46193b6..eb55dc575 100644 --- a/Mastodon/Scene/Share/View/Content/ContentWarningOverlayView.swift +++ b/Mastodon/Scene/Share/View/Content/ContentWarningOverlayView.swift @@ -93,12 +93,7 @@ extension ContentWarningOverlayView { vibrancyVisualEffectView.translatesAutoresizingMaskIntoConstraints = false blurVisualEffectView.contentView.addSubview(vibrancyVisualEffectView) - NSLayoutConstraint.activate([ - vibrancyVisualEffectView.topAnchor.constraint(equalTo: blurVisualEffectView.topAnchor), - vibrancyVisualEffectView.leadingAnchor.constraint(equalTo: blurVisualEffectView.leadingAnchor), - vibrancyVisualEffectView.trailingAnchor.constraint(equalTo: blurVisualEffectView.trailingAnchor), - vibrancyVisualEffectView.bottomAnchor.constraint(equalTo: blurVisualEffectView.bottomAnchor), - ]) + vibrancyVisualEffectView.pinTo(to: blurVisualEffectView) vibrancyContentWarningLabel.translatesAutoresizingMaskIntoConstraints = false vibrancyVisualEffectView.contentView.addSubview(vibrancyContentWarningLabel) @@ -110,12 +105,7 @@ extension ContentWarningOverlayView { blurVisualEffectView.translatesAutoresizingMaskIntoConstraints = false addSubview(blurVisualEffectView) - NSLayoutConstraint.activate([ - blurVisualEffectView.topAnchor.constraint(equalTo: topAnchor), - blurVisualEffectView.leadingAnchor.constraint(equalTo: leadingAnchor), - blurVisualEffectView.trailingAnchor.constraint(equalTo: trailingAnchor), - blurVisualEffectView.bottomAnchor.constraint(equalTo: bottomAnchor), - ]) + blurVisualEffectView.pinToParent() // blur image style contentOverlayView.translatesAutoresizingMaskIntoConstraints = false @@ -134,12 +124,7 @@ extension ContentWarningOverlayView { blurContentWarningLabelContainer.translatesAutoresizingMaskIntoConstraints = false contentOverlayView.addSubview(blurContentWarningLabelContainer) - NSLayoutConstraint.activate([ - blurContentWarningLabelContainer.topAnchor.constraint(equalTo: topAnchor), - blurContentWarningLabelContainer.leadingAnchor.constraint(equalTo: leadingAnchor), - blurContentWarningLabelContainer.trailingAnchor.constraint(equalTo: trailingAnchor), - blurContentWarningLabelContainer.bottomAnchor.constraint(equalTo: bottomAnchor), - ]) + blurContentWarningLabelContainer.pinTo(to: self) let topPaddingView = UIView() let bottomPaddingView = UIView() diff --git a/Mastodon/Scene/Share/View/Content/DoubleTitleLabelNavigationBarTitleView.swift b/Mastodon/Scene/Share/View/Content/DoubleTitleLabelNavigationBarTitleView.swift index 6734b7b77..f5ac0f8ec 100644 --- a/Mastodon/Scene/Share/View/Content/DoubleTitleLabelNavigationBarTitleView.swift +++ b/Mastodon/Scene/Share/View/Content/DoubleTitleLabelNavigationBarTitleView.swift @@ -47,12 +47,7 @@ extension DoubleTitleLabelNavigationBarTitleView { containerView.distribution = .fill containerView.translatesAutoresizingMaskIntoConstraints = false addSubview(containerView) - NSLayoutConstraint.activate([ - containerView.topAnchor.constraint(equalTo: topAnchor), - containerView.leadingAnchor.constraint(equalTo: leadingAnchor), - containerView.trailingAnchor.constraint(equalTo: trailingAnchor), - containerView.bottomAnchor.constraint(equalTo: bottomAnchor), - ]) + containerView.pinToParent() containerView.addArrangedSubview(titleLabel) containerView.addArrangedSubview(subtitleLabel) diff --git a/Mastodon/Scene/Share/View/Content/NotificationView+Configuration.swift b/Mastodon/Scene/Share/View/Content/NotificationView+Configuration.swift index 98d06fd92..018628473 100644 --- a/Mastodon/Scene/Share/View/Content/NotificationView+Configuration.swift +++ b/Mastodon/Scene/Share/View/Content/NotificationView+Configuration.swift @@ -111,6 +111,7 @@ extension NotificationView { self.viewModel.notificationIndicatorText = nil return } + self.viewModel.type = type func createMetaContent(text: String, emojis: MastodonContent.Emojis) -> MetaContent { let content = MastodonContent(content: text, emojis: emojis) @@ -154,7 +155,7 @@ extension NotificationView { ) case .status: self.viewModel.notificationIndicatorText = createMetaContent( - text: L10n.Scene.Notification.NotificationDescription.mentionedYou, + text: .empty, emojis: emojis.asDictionary ) case ._other: diff --git a/Mastodon/Scene/Share/View/Control/RefreshControl.swift b/Mastodon/Scene/Share/View/Control/RefreshControl.swift new file mode 100644 index 000000000..afac5a1a1 --- /dev/null +++ b/Mastodon/Scene/Share/View/Control/RefreshControl.swift @@ -0,0 +1,28 @@ +// +// RefreshControl.swift +// Mastodon +// +// Created by Kyle Bashour on 11/14/22. +// + +import UIKit + +/// RefreshControl subclass that properly displays itself behind table view contents. +class RefreshControl: UIRefreshControl { + override init() { + super.init() + } + + override init(frame: CGRect) { + super.init(frame: frame) + } + + required init?(coder: NSCoder) { + super.init(coder: coder) + } + + override func didMoveToSuperview() { + super.didMoveToSuperview() + layer.zPosition = -1 + } +} diff --git a/Mastodon/Scene/Share/View/TableviewCell/StatusThreadRootTableViewCell.swift b/Mastodon/Scene/Share/View/TableviewCell/StatusThreadRootTableViewCell.swift index 64f3456b5..350bf8660 100644 --- a/Mastodon/Scene/Share/View/TableviewCell/StatusThreadRootTableViewCell.swift +++ b/Mastodon/Scene/Share/View/TableviewCell/StatusThreadRootTableViewCell.swift @@ -96,7 +96,6 @@ extension StatusThreadRootTableViewCell { override var accessibilityElements: [Any]? { get { var elements = [ - statusView.headerContainerView, statusView.authorView, statusView.viewModel.isContentReveal ? statusView.contentMetaText.textView diff --git a/Mastodon/Scene/Share/Webview/WebViewController.swift b/Mastodon/Scene/Share/Webview/WebViewController.swift index cb690de93..209ee483d 100644 --- a/Mastodon/Scene/Share/Webview/WebViewController.swift +++ b/Mastodon/Scene/Share/Webview/WebViewController.swift @@ -49,12 +49,7 @@ extension WebViewController { webView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(webView) - NSLayoutConstraint.activate([ - webView.topAnchor.constraint(equalTo: view.topAnchor), - webView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - webView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - webView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + webView.pinToParent() let request = URLRequest(url: viewModel.url) webView.load(request) diff --git a/Mastodon/Scene/SuggestionAccount/CollectionViewCell/SuggestionAccountCollectionViewCell.swift b/Mastodon/Scene/SuggestionAccount/CollectionViewCell/SuggestionAccountCollectionViewCell.swift index 2fb467fbd..296935521 100644 --- a/Mastodon/Scene/SuggestionAccount/CollectionViewCell/SuggestionAccountCollectionViewCell.swift +++ b/Mastodon/Scene/SuggestionAccount/CollectionViewCell/SuggestionAccountCollectionViewCell.swift @@ -53,11 +53,6 @@ extension SuggestionAccountCollectionViewCell { private func configure() { contentView.addSubview(imageView) imageView.translatesAutoresizingMaskIntoConstraints = false - NSLayoutConstraint.activate([ - imageView.topAnchor.constraint(equalTo: contentView.topAnchor), - imageView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor), - imageView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor), - imageView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor), - ]) + imageView.pinToParent() } } diff --git a/Mastodon/Scene/SuggestionAccount/SuggestionAccountViewController.swift b/Mastodon/Scene/SuggestionAccount/SuggestionAccountViewController.swift index 13c8311c7..7eacdc205 100644 --- a/Mastodon/Scene/SuggestionAccount/SuggestionAccountViewController.swift +++ b/Mastodon/Scene/SuggestionAccount/SuggestionAccountViewController.swift @@ -161,7 +161,7 @@ extension SuggestionAccountViewController: UITableViewDelegate { case .account(let record): guard let account = record.object(in: context.managedObjectContext) else { return } let cachedProfileViewModel = CachedProfileViewModel(context: context, authContext: viewModel.authContext, mastodonUser: account) - coordinator.present( + _ = coordinator.present( scene: .profile(viewModel: cachedProfileViewModel), from: self, transition: .show diff --git a/Mastodon/Scene/SuggestionAccount/TableViewCell/SuggestionAccountTableViewCell.swift b/Mastodon/Scene/SuggestionAccount/TableViewCell/SuggestionAccountTableViewCell.swift index 47bd9d6b3..d259ebed4 100644 --- a/Mastodon/Scene/SuggestionAccount/TableViewCell/SuggestionAccountTableViewCell.swift +++ b/Mastodon/Scene/SuggestionAccount/TableViewCell/SuggestionAccountTableViewCell.swift @@ -97,12 +97,7 @@ extension SuggestionAccountTableViewCell { containerStackView.isLayoutMarginsRelativeArrangement = true containerStackView.translatesAutoresizingMaskIntoConstraints = false contentView.addSubview(containerStackView) - NSLayoutConstraint.activate([ - containerStackView.topAnchor.constraint(equalTo: contentView.topAnchor), - containerStackView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor), - containerStackView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor), - containerStackView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor), - ]) + containerStackView.pinToParent() avatarButton.translatesAutoresizingMaskIntoConstraints = false containerStackView.addArrangedSubview(avatarButton) diff --git a/Mastodon/Scene/Thread/ThreadViewController.swift b/Mastodon/Scene/Thread/ThreadViewController.swift index 5dee182c6..e8e6ce130 100644 --- a/Mastodon/Scene/Thread/ThreadViewController.swift +++ b/Mastodon/Scene/Thread/ThreadViewController.swift @@ -87,12 +87,7 @@ extension ThreadViewController { tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() tableView.delegate = self viewModel.setupDiffableDataSource( diff --git a/Mastodon/Scene/Thread/ThreadViewModel+LoadThreadState.swift b/Mastodon/Scene/Thread/ThreadViewModel+LoadThreadState.swift index 050670be7..1c6c40190 100644 --- a/Mastodon/Scene/Thread/ThreadViewModel+LoadThreadState.swift +++ b/Mastodon/Scene/Thread/ThreadViewModel+LoadThreadState.swift @@ -92,19 +92,27 @@ extension ThreadViewModel.LoadThreadState { from: response.value.ancestors ) ) + // deprecated: Tree mode replies + // viewModel.mastodonStatusThreadViewModel.appendDescendant( + // domain: threadContext.domain, + // nodes: MastodonStatusThreadViewModel.Node.children( + // of: threadContext.statusID, + // from: response.value.descendants + // ) + // ) + + // new: the same order from API viewModel.mastodonStatusThreadViewModel.appendDescendant( domain: threadContext.domain, - nodes: MastodonStatusThreadViewModel.Node.children( - of: threadContext.statusID, - from: response.value.descendants - ) + nodes: response.value.descendants.map { status in + return .init(statusID: status.id, children: []) + } ) } catch { logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): fetch status context for \(threadContext.statusID) fail: \(error.localizedDescription)") await enter(state: Fail.self) } - - } + } // end Task } } diff --git a/Mastodon/Scene/Thread/ThreadViewModel.swift b/Mastodon/Scene/Thread/ThreadViewModel.swift index 735d85cd4..c845ce64c 100644 --- a/Mastodon/Scene/Thread/ThreadViewModel.swift +++ b/Mastodon/Scene/Thread/ThreadViewModel.swift @@ -28,12 +28,6 @@ class ThreadViewModel { let context: AppContext let authContext: AuthContext let mastodonStatusThreadViewModel: MastodonStatusThreadViewModel - -// let cellFrameCache = NSCache() -// let existStatusFetchedResultsController: StatusFetchedResultsController - -// weak var contentOffsetAdjustableTimelineViewControllerDelegate: ContentOffsetAdjustableTimelineViewControllerDelegate? -// weak var tableView: UITableView? // output var diffableDataSource: UITableViewDiffableDataSource? @@ -62,12 +56,6 @@ class ThreadViewModel { self.authContext = authContext self.root = optionalRoot self.mastodonStatusThreadViewModel = MastodonStatusThreadViewModel(context: context) -// self.rootNode = CurrentValueSubject(optionalStatus.flatMap { RootNode(domain: $0.domain, statusID: $0.id, replyToID: $0.inReplyToID) }) -// self.rootItem = CurrentValueSubject(optionalStatus.flatMap { Item.root(statusObjectID: $0.objectID, attribute: Item.StatusAttribute()) }) -// self.existStatusFetchedResultsController = StatusFetchedResultsController(managedObjectContext: context.managedObjectContext, domain: nil, additionalTweetPredicate: nil) -// self.navigationBarTitle = CurrentValueSubject( -// optionalStatus.flatMap { L10n.Scene.Thread.title($0.author.displayNameWithFallback) }) -// self.navigationBarTitleEmojiMeta = CurrentValueSubject(optionalStatus.flatMap { $0.author.emojis.asDictionary } ?? [:]) // end init ManagedObjectObserver.observe(context: context.managedObjectContext) @@ -85,24 +73,6 @@ class ThreadViewModel { }) .store(in: &disposeBag) -// // bind fetcher domain -// context.authenticationService.activeMastodonAuthenticationBox -// .receive(on: RunLoop.main) -// .sink { [weak self] box in -// guard let self = self else { return } -// self.existStatusFetchedResultsController.domain.value = box?.domain -// } -// .store(in: &disposeBag) -// -// rootNode -// .receive(on: DispatchQueue.main) -// .sink { [weak self] rootNode in -// guard let self = self else { return } -// guard rootNode != nil else { return } -// self.loadThreadStateMachine.enter(LoadThreadState.Loading.self) -// } -// .store(in: &disposeBag) - $root .receive(on: DispatchQueue.main) .sink { [weak self] root in @@ -125,102 +95,6 @@ class ThreadViewModel { }() } .store(in: &disposeBag) - -// rootItem -// .receive(on: DispatchQueue.main) -// .sink { [weak self] rootItem in -// guard let self = self else { return } -// guard case let .root(objectID, _) = rootItem else { return } -// self.context.managedObjectContext.perform { -// guard let status = self.context.managedObjectContext.object(with: objectID) as? Status else { -// return -// } -// self.rootItemObserver = ManagedObjectObserver.observe(object: status) -// .receive(on: DispatchQueue.main) -// .sink(receiveCompletion: { _ in -// // do nothing -// }, receiveValue: { [weak self] change in -// guard let self = self else { return } -// switch change.changeType { -// case .delete: -// self.rootItem.value = nil -// default: -// break -// } -// }) -// } -// } -// .store(in: &disposeBag) -// -// ancestorNodes -// .receive(on: DispatchQueue.main) -// .compactMap { [weak self] nodes -> [Item]? in -// guard let self = self else { return nil } -// guard !nodes.isEmpty else { return [] } -// -// guard let diffableDataSource = self.diffableDataSource else { return nil } -// let oldSnapshot = diffableDataSource.snapshot() -// var oldSnapshotAttributeDict: [NSManagedObjectID : Item.StatusAttribute] = [:] -// for item in oldSnapshot.itemIdentifiers { -// switch item { -// case .reply(let objectID, let attribute): -// oldSnapshotAttributeDict[objectID] = attribute -// default: -// break -// } -// } -// -// var items: [Item] = [] -// for node in nodes { -// let attribute = oldSnapshotAttributeDict[node.statusObjectID] ?? Item.StatusAttribute() -// items.append(Item.reply(statusObjectID: node.statusObjectID, attribute: attribute)) -// } -// -// return items.reversed() -// } -// .assign(to: \.value, on: ancestorItems) -// .store(in: &disposeBag) -// -// descendantNodes -// .receive(on: DispatchQueue.main) -// .compactMap { [weak self] nodes -> [Item]? in -// guard let self = self else { return nil } -// guard !nodes.isEmpty else { return [] } -// -// guard let diffableDataSource = self.diffableDataSource else { return nil } -// let oldSnapshot = diffableDataSource.snapshot() -// var oldSnapshotAttributeDict: [NSManagedObjectID : Item.StatusAttribute] = [:] -// for item in oldSnapshot.itemIdentifiers { -// switch item { -// case .leaf(let objectID, let attribute): -// oldSnapshotAttributeDict[objectID] = attribute -// default: -// break -// } -// } -// -// var items: [Item] = [] -// -// func buildThread(node: LeafNode) { -// let attribute = oldSnapshotAttributeDict[node.objectID] ?? Item.StatusAttribute() -// items.append(Item.leaf(statusObjectID: node.objectID, attribute: attribute)) -// // only expand the first child -// if let firstChild = node.children.first { -// if !node.isChildrenExpanded { -// items.append(Item.leafBottomLoader(statusObjectID: node.objectID)) -// } else { -// buildThread(node: firstChild) -// } -// } -// } -// -// for node in nodes { -// buildThread(node: node) -// } -// return items -// } -// .assign(to: \.value, on: descendantItems) -// .store(in: &disposeBag) } deinit { diff --git a/Mastodon/Scene/Transition/MediaPreview/MediaHostToMediaPreviewViewControllerAnimatedTransitioning.swift b/Mastodon/Scene/Transition/MediaPreview/MediaHostToMediaPreviewViewControllerAnimatedTransitioning.swift index 5381feb0d..ace6048c5 100644 --- a/Mastodon/Scene/Transition/MediaPreview/MediaHostToMediaPreviewViewControllerAnimatedTransitioning.swift +++ b/Mastodon/Scene/Transition/MediaPreview/MediaHostToMediaPreviewViewControllerAnimatedTransitioning.swift @@ -65,7 +65,7 @@ extension MediaHostToMediaPreviewViewControllerAnimatedTransitioning { let initialFrame = transitionItem.initialFrame ?? toViewEndFrame let transitionTargetFrame: CGRect = { let aspectRatio = transitionItem.aspectRatio ?? CGSize(width: initialFrame.width, height: initialFrame.height) - return AVMakeRect(aspectRatio: aspectRatio, insideRect: toView.bounds) + return AVMakeRect(aspectRatio: aspectRatio, insideRect: toView.bounds.inset(by: toView.safeAreaInsets)) }() let transitionImageView: UIImageView = { let imageView = UIImageView(frame: transitionContext.containerView.convert(initialFrame, from: nil)) @@ -131,6 +131,12 @@ extension MediaHostToMediaPreviewViewControllerAnimatedTransitioning { } return animator } + + if let toVC = transitionContext.viewController(forKey: .to) { + animator.addCompletion { _ in + toVC.setNeedsStatusBarAppearanceUpdate() + } + } // update close button UIView.animate(withDuration: 0.33, delay: 0, options: [.curveEaseInOut]) { @@ -263,7 +269,7 @@ extension MediaHostToMediaPreviewViewControllerAnimatedTransitioning { }() // FIXME: - let maskLayerToFinalPath = maskLayerToFinalRect.flatMap { UIBezierPath(rect: $0) }?.cgPath + _ = maskLayerToFinalRect.flatMap { UIBezierPath(rect: $0) }?.cgPath if let maskLayerToPath = maskLayerToPath { maskLayer.path = maskLayerToPath diff --git a/Mastodon/Supporting Files/AppDelegate.swift b/Mastodon/Supporting Files/AppDelegate.swift index 3bf38f6da..84b819a5c 100644 --- a/Mastodon/Supporting Files/AppDelegate.swift +++ b/Mastodon/Supporting Files/AppDelegate.swift @@ -65,11 +65,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { extension AppDelegate { func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask { - #if DEBUG - return .all - #else return UIDevice.current.userInterfaceIdiom == .phone ? .portrait : .all - #endif } } diff --git a/Mastodon/Supporting Files/SceneDelegate.swift b/Mastodon/Supporting Files/SceneDelegate.swift index 1e97fb179..4476477fd 100644 --- a/Mastodon/Supporting Files/SceneDelegate.swift +++ b/Mastodon/Supporting Files/SceneDelegate.swift @@ -109,6 +109,9 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { // trigger status filter update AppContext.shared.statusFilterService.filterUpdatePublisher.send() + + // trigger authenticated user account update + AppContext.shared.authenticationService.updateActiveUserAccountPublisher.send() if let shortcutItem = savedShortCutItem { Task { @@ -172,7 +175,7 @@ extension SceneDelegate { return false } - coordinator.switchToTabBar(tab: .notification) + coordinator.switchToTabBar(tab: .notifications) case "org.joinmastodon.app.new-post": if coordinator?.tabBarController.topMost is ComposeViewController { diff --git a/MastodonIntent/cs.lproj/Intents.strings b/MastodonIntent/cs.lproj/Intents.strings new file mode 100644 index 000000000..6f29830a1 --- /dev/null +++ b/MastodonIntent/cs.lproj/Intents.strings @@ -0,0 +1,51 @@ +"16wxgf" = "Příspěvek na Mastodon"; + +"751xkl" = "Textový obsah"; + +"CsR7G2" = "Příspěvek na Mastodon"; + +"HZSGTr" = "Jaký obsah se má přidat?"; + +"HdGikU" = "Odeslání se nezdařilo"; + +"KDNTJ4" = "Důvod selhání"; + +"RHxKOw" = "Odeslat příspěvek s textovým obsahem"; + +"RxSqsb" = "Příspěvek"; + +"WCIR3D" = "Zveřejnit ${content} na Mastodon"; + +"ZKJSNu" = "Příspěvek"; + +"ZS1XaK" = "${content}"; + +"ZbSjzC" = "Viditelnost"; + +"Zo4jgJ" = "Viditelnost příspěvku"; + +"apSxMG-dYQ5NN" = "Existuje ${count} možností odpovídajících 'Veřejný'."; + +"apSxMG-ehFLjY" = "Existuje ${count} možností, které odpovídají „jen sledujícím“."; + +"ayoYEb-dYQ5NN" = "${content}, veřejné"; + +"ayoYEb-ehFLjY" = "${content}, pouze sledující"; + +"dUyuGg" = "Příspěvek na Mastodon"; + +"dYQ5NN" = "Veřejný"; + +"ehFLjY" = "Pouze sledující"; + +"gfePDu" = "Odeslání se nezdařilo. ${failureReason}"; + +"k7dbKQ" = "Příspěvek byl úspěšně odeslán."; + +"oGiqmY-dYQ5NN" = "Jen pro kontrolu, chtěli jste „Veřejný“?"; + +"oGiqmY-ehFLjY" = "Jen pro kontrolu, chtěli jste „Pouze sledující“?"; + +"rM6dvp" = "URL"; + +"ryJLwG" = "Příspěvek byl úspěšně odeslán. "; diff --git a/MastodonIntent/cs.lproj/Intents.stringsdict b/MastodonIntent/cs.lproj/Intents.stringsdict new file mode 100644 index 000000000..5a39d5e64 --- /dev/null +++ b/MastodonIntent/cs.lproj/Intents.stringsdict @@ -0,0 +1,54 @@ + + + + + There are ${count} options matching ‘${content}’. - 2 + + NSStringLocalizedFormatKey + There are %#@count_option@ matching ‘${content}’. + count_option + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + %ld + zero + 0 options + one + 1 option + two + 2 options + few + %ld options + many + %ld options + other + %ld options + + + There are ${count} options matching ‘${visibility}’. + + NSStringLocalizedFormatKey + There are %#@count_option@ matching ‘${visibility}’. + count_option + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + %ld + zero + 0 options + one + 1 option + two + 2 options + few + %ld options + many + %ld options + other + %ld options + + + + diff --git a/MastodonIntent/sl.lproj/Intents.strings b/MastodonIntent/sl.lproj/Intents.strings new file mode 100644 index 000000000..72de87df2 --- /dev/null +++ b/MastodonIntent/sl.lproj/Intents.strings @@ -0,0 +1,51 @@ +"16wxgf" = "Objavi na Mastodonu"; + +"751xkl" = "besedilo"; + +"CsR7G2" = "Objavi na Mastodonu"; + +"HZSGTr" = "Kakšno vsebino želite objaviti?"; + +"HdGikU" = "Objava ni uspela"; + +"KDNTJ4" = "Vzrok za neuspeh"; + +"RHxKOw" = "Pošlji objavo z besedilom"; + +"RxSqsb" = "Objavi"; + +"WCIR3D" = "Objavite ${content} na Mastodonu"; + +"ZKJSNu" = "Objavi"; + +"ZS1XaK" = "${content}"; + +"ZbSjzC" = "Vidnost"; + +"Zo4jgJ" = "Vidnost objave"; + +"apSxMG-dYQ5NN" = "Z \"Javno\" se ujema ${count} možnosti."; + +"apSxMG-ehFLjY" = "S \"Samo sledilci\" se ujema ${count} možnosti."; + +"ayoYEb-dYQ5NN" = "${content}, javno"; + +"ayoYEb-ehFLjY" = "${content}, samo sledilci"; + +"dUyuGg" = "Objavi na Mastodonu"; + +"dYQ5NN" = "Javno"; + +"ehFLjY" = "Samo sledilci"; + +"gfePDu" = "Objava je spodletela. ${failureReason}"; + +"k7dbKQ" = "Uspešno poslana objava."; + +"oGiqmY-dYQ5NN" = "Da ne bo nesporazuma - želeli ste \"Javno\"?"; + +"oGiqmY-ehFLjY" = "Da ne bo nesporazuma - želeli ste \"Samo sledilci\"?"; + +"rM6dvp" = "URL"; + +"ryJLwG" = "Uspešno poslana objava. "; diff --git a/MastodonIntent/sl.lproj/Intents.stringsdict b/MastodonIntent/sl.lproj/Intents.stringsdict new file mode 100644 index 000000000..5a39d5e64 --- /dev/null +++ b/MastodonIntent/sl.lproj/Intents.stringsdict @@ -0,0 +1,54 @@ + + + + + There are ${count} options matching ‘${content}’. - 2 + + NSStringLocalizedFormatKey + There are %#@count_option@ matching ‘${content}’. + count_option + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + %ld + zero + 0 options + one + 1 option + two + 2 options + few + %ld options + many + %ld options + other + %ld options + + + There are ${count} options matching ‘${visibility}’. + + NSStringLocalizedFormatKey + There are %#@count_option@ matching ‘${visibility}’. + count_option + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + %ld + zero + 0 options + one + 1 option + two + 2 options + few + %ld options + many + %ld options + other + %ld options + + + + diff --git a/MastodonSDK/Package.resolved b/MastodonSDK/Package.resolved index 06843faa3..4a4fa51de 100644 --- a/MastodonSDK/Package.resolved +++ b/MastodonSDK/Package.resolved @@ -1,241 +1,257 @@ { - "object": { - "pins": [ - { - "package": "Alamofire", - "repositoryURL": "https://github.com/Alamofire/Alamofire.git", - "state": { - "branch": null, - "revision": "8dd85aee02e39dd280c75eef88ffdb86eed4b07b", - "version": "5.6.2" - } - }, - { - "package": "AlamofireImage", - "repositoryURL": "https://github.com/Alamofire/AlamofireImage.git", - "state": { - "branch": null, - "revision": "98cbb00ce0ec5fc8e52a5b50a6bfc08d3e5aee10", - "version": "4.2.0" - } - }, - { - "package": "CommonOSLog", - "repositoryURL": "https://github.com/MainasuK/CommonOSLog", - "state": { - "branch": null, - "revision": "c121624a30698e9886efe38aebb36ff51c01b6c2", - "version": "0.1.1" - } - }, - { - "package": "FaviconFinder", - "repositoryURL": "https://github.com/will-lumley/FaviconFinder.git", - "state": { - "branch": null, - "revision": "1f74844f77f79b95c0bb0130b3a87d4f340e6d3a", - "version": "3.3.0" - } - }, - { - "package": "FLAnimatedImage", - "repositoryURL": "https://github.com/Flipboard/FLAnimatedImage.git", - "state": { - "branch": null, - "revision": "d4f07b6f164d53c1212c3e54d6460738b1981e9f", - "version": "1.0.17" - } - }, - { - "package": "FPSIndicator", - "repositoryURL": "https://github.com/MainasuK/FPSIndicator.git", - "state": { - "branch": null, - "revision": "e4a5067ccd5293b024c767f09e51056afd4a4796", - "version": "1.1.0" - } - }, - { - "package": "Fuzi", - "repositoryURL": "https://github.com/cezheng/Fuzi.git", - "state": { - "branch": null, - "revision": "f08c8323da21e985f3772610753bcfc652c2103f", - "version": "3.1.3" - } - }, - { - "package": "KeychainAccess", - "repositoryURL": "https://github.com/kishikawakatsumi/KeychainAccess.git", - "state": { - "branch": null, - "revision": "84e546727d66f1adc5439debad16270d0fdd04e7", - "version": "4.2.2" - } - }, - { - "package": "MetaTextKit", - "repositoryURL": "https://github.com/TwidereProject/MetaTextKit.git", - "state": { - "branch": null, - "revision": "dcd5255d6930c2fab408dc8562c577547e477624", - "version": "2.2.5" - } - }, - { - "package": "Nuke", - "repositoryURL": "https://github.com/kean/Nuke.git", - "state": { - "branch": null, - "revision": "a002b7fd786f2df2ed4333fe73a9727499fd9d97", - "version": "10.11.2" - } - }, - { - "package": "NukeFLAnimatedImagePlugin", - "repositoryURL": "https://github.com/kean/Nuke-FLAnimatedImage-Plugin.git", - "state": { - "branch": null, - "revision": "b59c346a7d536336db3b0f12c72c6e53ee709e16", - "version": "8.0.0" - } - }, - { - "package": "Pageboy", - "repositoryURL": "https://github.com/uias/Pageboy", - "state": { - "branch": null, - "revision": "af8fa81788b893205e1ff42ddd88c5b0b315d7c5", - "version": "3.7.0" - } - }, - { - "package": "PanModal", - "repositoryURL": "https://github.com/slackhq/PanModal.git", - "state": { - "branch": null, - "revision": "b012aecb6b67a8e46369227f893c12544846613f", - "version": "1.2.7" - } - }, - { - "package": "SDWebImage", - "repositoryURL": "https://github.com/SDWebImage/SDWebImage.git", - "state": { - "branch": null, - "revision": "9248fe561a2a153916fb9597e3af4434784c6d32", - "version": "5.13.4" - } - }, - { - "package": "swift-collections", - "repositoryURL": "https://github.com/apple/swift-collections.git", - "state": { - "branch": null, - "revision": "f504716c27d2e5d4144fa4794b12129301d17729", - "version": "1.0.3" - } - }, - { - "package": "swift-nio", - "repositoryURL": "https://github.com/apple/swift-nio.git", - "state": { - "branch": null, - "revision": "546610d52b19be3e19935e0880bb06b9c03f5cef", - "version": "1.14.4" - } - }, - { - "package": "swift-nio-zlib-support", - "repositoryURL": "https://github.com/apple/swift-nio-zlib-support.git", - "state": { - "branch": null, - "revision": "37760e9a52030bb9011972c5213c3350fa9d41fd", - "version": "1.0.0" - } - }, - { - "package": "SwiftSoup", - "repositoryURL": "https://github.com/scinfu/SwiftSoup.git", - "state": { - "branch": null, - "revision": "6778575285177365cbad3e5b8a72f2a20583cfec", - "version": "2.4.3" - } - }, - { - "package": "Introspect", - "repositoryURL": "https://github.com/siteline/SwiftUI-Introspect.git", - "state": { - "branch": null, - "revision": "f2616860a41f9d9932da412a8978fec79c06fe24", - "version": "0.1.4" - } - }, - { - "package": "SwiftyJSON", - "repositoryURL": "https://github.com/SwiftyJSON/SwiftyJSON.git", - "state": { - "branch": null, - "revision": "b3dcd7dbd0d488e1a7077cb33b00f2083e382f07", - "version": "5.0.1" - } - }, - { - "package": "TabBarPager", - "repositoryURL": "https://github.com/TwidereProject/TabBarPager.git", - "state": { - "branch": null, - "revision": "488aa66d157a648901b61721212c0dec23d27ee5", - "version": "0.1.0" - } - }, - { - "package": "Tabman", - "repositoryURL": "https://github.com/uias/Tabman", - "state": { - "branch": null, - "revision": "4a4f7c755b875ffd4f9ef10d67a67883669d2465", - "version": "2.13.0" - } - }, - { - "package": "ThirdPartyMailer", - "repositoryURL": "https://github.com/vtourraine/ThirdPartyMailer.git", - "state": { - "branch": null, - "revision": "44c1cfaa6969963f22691aa67f88a69e3b6d651f", - "version": "2.1.0" - } - }, - { - "package": "TOCropViewController", - "repositoryURL": "https://github.com/TimOliver/TOCropViewController.git", - "state": { - "branch": null, - "revision": "d0470491f56e734731bbf77991944c0dfdee3e0e", - "version": "2.6.1" - } - }, - { - "package": "UIHostingConfigurationBackport", - "repositoryURL": "https://github.com/woxtu/UIHostingConfigurationBackport.git", - "state": { - "branch": null, - "revision": "6091f2d38faa4b24fc2ca0389c651e2f666624a3", - "version": "0.1.0" - } - }, - { - "package": "UITextView+Placeholder", - "repositoryURL": "https://github.com/MainasuK/UITextView-Placeholder.git", - "state": { - "branch": null, - "revision": "20f513ded04a040cdf5467f0891849b1763ede3b", - "version": "1.4.1" - } + "pins" : [ + { + "identity" : "alamofire", + "kind" : "remoteSourceControl", + "location" : "https://github.com/Alamofire/Alamofire.git", + "state" : { + "revision" : "8dd85aee02e39dd280c75eef88ffdb86eed4b07b", + "version" : "5.6.2" } - ] - }, - "version": 1 + }, + { + "identity" : "alamofireimage", + "kind" : "remoteSourceControl", + "location" : "https://github.com/Alamofire/AlamofireImage.git", + "state" : { + "revision" : "98cbb00ce0ec5fc8e52a5b50a6bfc08d3e5aee10", + "version" : "4.2.0" + } + }, + { + "identity" : "commonoslog", + "kind" : "remoteSourceControl", + "location" : "https://github.com/MainasuK/CommonOSLog", + "state" : { + "revision" : "c121624a30698e9886efe38aebb36ff51c01b6c2", + "version" : "0.1.1" + } + }, + { + "identity" : "faviconfinder", + "kind" : "remoteSourceControl", + "location" : "https://github.com/will-lumley/FaviconFinder.git", + "state" : { + "revision" : "1f74844f77f79b95c0bb0130b3a87d4f340e6d3a", + "version" : "3.3.0" + } + }, + { + "identity" : "flanimatedimage", + "kind" : "remoteSourceControl", + "location" : "https://github.com/Flipboard/FLAnimatedImage.git", + "state" : { + "revision" : "d4f07b6f164d53c1212c3e54d6460738b1981e9f", + "version" : "1.0.17" + } + }, + { + "identity" : "fpsindicator", + "kind" : "remoteSourceControl", + "location" : "https://github.com/MainasuK/FPSIndicator.git", + "state" : { + "revision" : "e4a5067ccd5293b024c767f09e51056afd4a4796", + "version" : "1.1.0" + } + }, + { + "identity" : "fuzi", + "kind" : "remoteSourceControl", + "location" : "https://github.com/cezheng/Fuzi.git", + "state" : { + "revision" : "f08c8323da21e985f3772610753bcfc652c2103f", + "version" : "3.1.3" + } + }, + { + "identity" : "keychainaccess", + "kind" : "remoteSourceControl", + "location" : "https://github.com/kishikawakatsumi/KeychainAccess.git", + "state" : { + "revision" : "84e546727d66f1adc5439debad16270d0fdd04e7", + "version" : "4.2.2" + } + }, + { + "identity" : "kingfisher", + "kind" : "remoteSourceControl", + "location" : "https://github.com/onevcat/Kingfisher.git", + "state" : { + "revision" : "44e891bdb61426a95e31492a67c7c0dfad1f87c5", + "version" : "7.4.1" + } + }, + { + "identity" : "metatextkit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/TwidereProject/MetaTextKit.git", + "state" : { + "revision" : "dcd5255d6930c2fab408dc8562c577547e477624", + "version" : "2.2.5" + } + }, + { + "identity" : "nextlevelsessionexporter", + "kind" : "remoteSourceControl", + "location" : "https://github.com/NextLevel/NextLevelSessionExporter.git", + "state" : { + "revision" : "b6c0cce1aa37fe1547d694f958fac3c3524b74da", + "version" : "0.4.6" + } + }, + { + "identity" : "nuke", + "kind" : "remoteSourceControl", + "location" : "https://github.com/kean/Nuke.git", + "state" : { + "revision" : "a002b7fd786f2df2ed4333fe73a9727499fd9d97", + "version" : "10.11.2" + } + }, + { + "identity" : "nuke-flanimatedimage-plugin", + "kind" : "remoteSourceControl", + "location" : "https://github.com/kean/Nuke-FLAnimatedImage-Plugin.git", + "state" : { + "revision" : "b59c346a7d536336db3b0f12c72c6e53ee709e16", + "version" : "8.0.0" + } + }, + { + "identity" : "pageboy", + "kind" : "remoteSourceControl", + "location" : "https://github.com/uias/Pageboy", + "state" : { + "revision" : "af8fa81788b893205e1ff42ddd88c5b0b315d7c5", + "version" : "3.7.0" + } + }, + { + "identity" : "panmodal", + "kind" : "remoteSourceControl", + "location" : "https://github.com/slackhq/PanModal.git", + "state" : { + "revision" : "b012aecb6b67a8e46369227f893c12544846613f", + "version" : "1.2.7" + } + }, + { + "identity" : "sdwebimage", + "kind" : "remoteSourceControl", + "location" : "https://github.com/SDWebImage/SDWebImage.git", + "state" : { + "revision" : "9248fe561a2a153916fb9597e3af4434784c6d32", + "version" : "5.13.4" + } + }, + { + "identity" : "stripes", + "kind" : "remoteSourceControl", + "location" : "https://github.com/eneko/Stripes.git", + "state" : { + "revision" : "d533fd44b8043a3abbf523e733599173d6f98c11", + "version" : "0.2.0" + } + }, + { + "identity" : "swift-collections", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-collections.git", + "state" : { + "revision" : "f504716c27d2e5d4144fa4794b12129301d17729", + "version" : "1.0.3" + } + }, + { + "identity" : "swift-nio", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-nio.git", + "state" : { + "revision" : "546610d52b19be3e19935e0880bb06b9c03f5cef", + "version" : "1.14.4" + } + }, + { + "identity" : "swift-nio-zlib-support", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-nio-zlib-support.git", + "state" : { + "revision" : "37760e9a52030bb9011972c5213c3350fa9d41fd", + "version" : "1.0.0" + } + }, + { + "identity" : "swiftsoup", + "kind" : "remoteSourceControl", + "location" : "https://github.com/scinfu/SwiftSoup.git", + "state" : { + "revision" : "6778575285177365cbad3e5b8a72f2a20583cfec", + "version" : "2.4.3" + } + }, + { + "identity" : "swiftui-introspect", + "kind" : "remoteSourceControl", + "location" : "https://github.com/siteline/SwiftUI-Introspect.git", + "state" : { + "revision" : "f2616860a41f9d9932da412a8978fec79c06fe24", + "version" : "0.1.4" + } + }, + { + "identity" : "tabbarpager", + "kind" : "remoteSourceControl", + "location" : "https://github.com/TwidereProject/TabBarPager.git", + "state" : { + "revision" : "488aa66d157a648901b61721212c0dec23d27ee5", + "version" : "0.1.0" + } + }, + { + "identity" : "tabman", + "kind" : "remoteSourceControl", + "location" : "https://github.com/uias/Tabman", + "state" : { + "revision" : "4a4f7c755b875ffd4f9ef10d67a67883669d2465", + "version" : "2.13.0" + } + }, + { + "identity" : "thirdpartymailer", + "kind" : "remoteSourceControl", + "location" : "https://github.com/vtourraine/ThirdPartyMailer.git", + "state" : { + "revision" : "44c1cfaa6969963f22691aa67f88a69e3b6d651f", + "version" : "2.1.0" + } + }, + { + "identity" : "tocropviewcontroller", + "kind" : "remoteSourceControl", + "location" : "https://github.com/TimOliver/TOCropViewController.git", + "state" : { + "revision" : "d0470491f56e734731bbf77991944c0dfdee3e0e", + "version" : "2.6.1" + } + }, + { + "identity" : "uihostingconfigurationbackport", + "kind" : "remoteSourceControl", + "location" : "https://github.com/woxtu/UIHostingConfigurationBackport.git", + "state" : { + "revision" : "6091f2d38faa4b24fc2ca0389c651e2f666624a3", + "version" : "0.1.0" + } + }, + { + "identity" : "uitextview-placeholder", + "kind" : "remoteSourceControl", + "location" : "https://github.com/MainasuK/UITextView-Placeholder.git", + "state" : { + "revision" : "20f513ded04a040cdf5467f0891849b1763ede3b", + "version" : "1.4.1" + } + } + ], + "version" : 2 } diff --git a/MastodonSDK/Package.swift b/MastodonSDK/Package.swift index 8db2a1ca5..1ac22e6a7 100644 --- a/MastodonSDK/Package.swift +++ b/MastodonSDK/Package.swift @@ -32,7 +32,6 @@ let package = Package( .package(url: "https://github.com/Alamofire/AlamofireImage.git", from: "4.1.0"), .package(url: "https://github.com/apple/swift-collections.git", from: "1.0.3"), .package(url: "https://github.com/apple/swift-nio.git", from: "1.0.0"), - .package(url: "https://github.com/cezheng/Fuzi.git", from: "3.1.3"), .package(url: "https://github.com/Flipboard/FLAnimatedImage.git", from: "1.0.0"), .package(url: "https://github.com/kean/Nuke-FLAnimatedImage-Plugin.git", from: "8.0.0"), .package(url: "https://github.com/kean/Nuke.git", from: "10.3.1"), @@ -49,6 +48,7 @@ let package = Package( .package(url: "https://github.com/SDWebImage/SDWebImage.git", from: "5.12.0"), .package(url: "https://github.com/eneko/Stripes.git", from: "0.2.0"), .package(url: "https://github.com/onevcat/Kingfisher.git", from: "7.4.1"), + .package(url: "https://github.com/NextLevel/NextLevelSessionExporter.git", from: "0.4.6"), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. @@ -124,6 +124,7 @@ let package = Package( .product(name: "PanModal", package: "PanModal"), .product(name: "Stripes", package: "Stripes"), .product(name: "Kingfisher", package: "Kingfisher"), + .product(name: "NextLevelSessionExporter", package: "NextLevelSessionExporter"), ] ), .testTarget( diff --git a/MastodonSDK/Sources/CoreDataStack/Entity/Transient/MastodonNotificationType.swift b/MastodonSDK/Sources/CoreDataStack/Entity/Transient/MastodonNotificationType.swift index 9e3029f26..455230d5e 100644 --- a/MastodonSDK/Sources/CoreDataStack/Entity/Transient/MastodonNotificationType.swift +++ b/MastodonSDK/Sources/CoreDataStack/Entity/Transient/MastodonNotificationType.swift @@ -7,7 +7,7 @@ import Foundation -public enum MastodonNotificationType: RawRepresentable { +public enum MastodonNotificationType: RawRepresentable, Equatable { case follow case followRequest case mention diff --git a/MastodonSDK/Sources/CoreDataStack/Utility/ManagedObjectRecord.swift b/MastodonSDK/Sources/CoreDataStack/Utility/ManagedObjectRecord.swift index 4910145cf..88b08fc3c 100644 --- a/MastodonSDK/Sources/CoreDataStack/Utility/ManagedObjectRecord.swift +++ b/MastodonSDK/Sources/CoreDataStack/Utility/ManagedObjectRecord.swift @@ -32,7 +32,7 @@ public class ManagedObjectRecord: Hashable { } extension Managed where Self: NSManagedObject { - public var asRecrod: ManagedObjectRecord { + public var asRecord: ManagedObjectRecord { return .init(objectID: objectID) } } diff --git a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Compose/Attachment/Contents.json b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Compose/Attachment/Contents.json new file mode 100644 index 000000000..6e965652d --- /dev/null +++ b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Compose/Attachment/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Compose/Attachment/indicator.button.background.colorset/Contents.json b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Compose/Attachment/indicator.button.background.colorset/Contents.json new file mode 100644 index 000000000..7a1c8d9e2 --- /dev/null +++ b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Compose/Attachment/indicator.button.background.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.400", + "green" : "0.275", + "red" : "0.275" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.400", + "green" : "0.275", + "red" : "0.275" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Compose/Attachment/retry.imageset/Arrow Clockwise.pdf b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Compose/Attachment/retry.imageset/Arrow Clockwise.pdf new file mode 100644 index 000000000..a15c522d8 --- /dev/null +++ b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Compose/Attachment/retry.imageset/Arrow Clockwise.pdf @@ -0,0 +1,91 @@ +%PDF-1.7 + +1 0 obj + << >> +endobj + +2 0 obj + << /Length 3 0 R >> +stream +/DeviceRGB CS +/DeviceRGB cs +q +1.000000 0.000000 -0.000000 1.000000 2.750000 2.750000 cm +0.000000 0.000000 0.000000 scn +9.250000 16.500000 m +5.245935 16.500000 2.000000 13.254065 2.000000 9.250000 c +2.000000 5.245935 5.245935 2.000000 9.250000 2.000000 c +13.254065 2.000000 16.500000 5.245935 16.500000 9.250000 c +16.500000 9.535608 16.483484 9.817360 16.451357 10.094351 c +16.383255 10.681498 16.809317 11.250000 17.400400 11.250000 c +17.916018 11.250000 18.369314 10.891933 18.431660 10.380100 c +18.476776 10.009713 18.500000 9.632568 18.500000 9.250000 c +18.500000 4.141366 14.358634 0.000000 9.250000 0.000000 c +4.141366 0.000000 0.000000 4.141366 0.000000 9.250000 c +0.000000 14.358634 4.141366 18.500000 9.250000 18.500000 c +11.423139 18.500000 13.421247 17.750608 15.000000 16.496151 c +15.000000 17.000000 l +15.000000 17.552284 15.447716 18.000000 16.000000 18.000000 c +16.552284 18.000000 17.000000 17.552284 17.000000 17.000000 c +17.000000 14.301708 l +17.011232 14.284512 17.022409 14.267276 17.033529 14.250000 c +17.000000 14.250000 l +17.000000 14.000000 l +17.000000 13.447716 16.552284 13.000000 16.000000 13.000000 c +13.000000 13.000000 l +12.447715 13.000000 12.000000 13.447716 12.000000 14.000000 c +12.000000 14.552284 12.447715 15.000000 13.000000 15.000000 c +13.666476 15.000000 l +12.443584 15.940684 10.912110 16.500000 9.250000 16.500000 c +h +f +n +Q + +endstream +endobj + +3 0 obj + 1365 +endobj + +4 0 obj + << /Annots [] + /Type /Page + /MediaBox [ 0.000000 0.000000 24.000000 24.000000 ] + /Resources 1 0 R + /Contents 2 0 R + /Parent 5 0 R + >> +endobj + +5 0 obj + << /Kids [ 4 0 R ] + /Count 1 + /Type /Pages + >> +endobj + +6 0 obj + << /Pages 5 0 R + /Type /Catalog + >> +endobj + +xref +0 7 +0000000000 65535 f +0000000010 00000 n +0000000034 00000 n +0000001455 00000 n +0000001478 00000 n +0000001651 00000 n +0000001725 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 6 0 R + /Size 7 +>> +startxref +1784 +%%EOF \ No newline at end of file diff --git a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.black.large.imageset/Contents.json b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Compose/Attachment/retry.imageset/Contents.json similarity index 52% rename from MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.black.large.imageset/Contents.json rename to MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Compose/Attachment/retry.imageset/Contents.json index fefc19832..92bff3aca 100644 --- a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.black.large.imageset/Contents.json +++ b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Compose/Attachment/retry.imageset/Contents.json @@ -1,12 +1,15 @@ { "images" : [ { - "filename" : "mastodon.logo.black.large.pdf", + "filename" : "Arrow Clockwise.pdf", "idiom" : "universal" } ], "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true } } diff --git a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.black.imageset/Contents.json b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Compose/Attachment/stop.imageset/Contents.json similarity index 54% rename from MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.black.imageset/Contents.json rename to MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Compose/Attachment/stop.imageset/Contents.json index 3018f4b9a..b2b588d4d 100644 --- a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.black.imageset/Contents.json +++ b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Compose/Attachment/stop.imageset/Contents.json @@ -1,12 +1,15 @@ { "images" : [ { - "filename" : "mastodon.logo.black.pdf", + "filename" : "Dismiss.pdf", "idiom" : "universal" } ], "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true } } diff --git a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Compose/Attachment/stop.imageset/Dismiss.pdf b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Compose/Attachment/stop.imageset/Dismiss.pdf new file mode 100644 index 000000000..0616f6275 --- /dev/null +++ b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Compose/Attachment/stop.imageset/Dismiss.pdf @@ -0,0 +1,89 @@ +%PDF-1.7 + +1 0 obj + << >> +endobj + +2 0 obj + << /Length 3 0 R >> +stream +/DeviceRGB CS +/DeviceRGB cs +q +1.000000 0.000000 -0.000000 1.000000 4.000000 3.804749 cm +0.000000 0.000000 0.000000 scn +0.209704 15.808150 m +0.292893 15.902358 l +0.653377 16.262842 1.220608 16.290571 1.612899 15.985547 c +1.707107 15.902358 l +8.000000 9.610251 l +14.292892 15.902358 l +14.683416 16.292883 15.316584 16.292883 15.707108 15.902358 c +16.097631 15.511834 16.097631 14.878669 15.707108 14.488145 c +9.415000 8.195251 l +15.707108 1.902359 l +16.067591 1.541875 16.095320 0.974643 15.790295 0.582352 c +15.707108 0.488144 l +15.346623 0.127661 14.779391 0.099932 14.387100 0.404957 c +14.292892 0.488144 l +8.000000 6.780252 l +1.707107 0.488144 l +1.316582 0.097620 0.683418 0.097620 0.292893 0.488144 c +-0.097631 0.878668 -0.097631 1.511835 0.292893 1.902359 c +6.585000 8.195251 l +0.292893 14.488145 l +-0.067591 14.848629 -0.095320 15.415859 0.209704 15.808150 c +0.292893 15.902358 l +0.209704 15.808150 l +h +f +n +Q + +endstream +endobj + +3 0 obj + 914 +endobj + +4 0 obj + << /Annots [] + /Type /Page + /MediaBox [ 0.000000 0.000000 24.000000 24.000000 ] + /Resources 1 0 R + /Contents 2 0 R + /Parent 5 0 R + >> +endobj + +5 0 obj + << /Kids [ 4 0 R ] + /Count 1 + /Type /Pages + >> +endobj + +6 0 obj + << /Pages 5 0 R + /Type /Catalog + >> +endobj + +xref +0 7 +0000000000 65535 f +0000000010 00000 n +0000000034 00000 n +0000001004 00000 n +0000001026 00000 n +0000001199 00000 n +0000001273 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 6 0 R + /Size 7 +>> +startxref +1332 +%%EOF \ No newline at end of file diff --git a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Profile/About/Contents.json b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Profile/About/Contents.json new file mode 100644 index 000000000..6e965652d --- /dev/null +++ b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Profile/About/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Profile/About/bio.about.field.verified.background.colorset/Contents.json b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Profile/About/bio.about.field.verified.background.colorset/Contents.json new file mode 100644 index 000000000..86944ced3 --- /dev/null +++ b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Profile/About/bio.about.field.verified.background.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.852", + "green" : "0.894", + "red" : "0.835" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.354", + "green" : "0.353", + "red" : "0.268" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Profile/About/bio.about.field.verified.checkmark.colorset/Contents.json b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Profile/About/bio.about.field.verified.checkmark.colorset/Contents.json new file mode 100644 index 000000000..f5112f04f --- /dev/null +++ b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Profile/About/bio.about.field.verified.checkmark.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.371", + "green" : "0.565", + "red" : "0.290" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.603", + "green" : "0.742", + "red" : "0.476" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Profile/About/bio.about.field.verified.link.colorset/Contents.json b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Profile/About/bio.about.field.verified.link.colorset/Contents.json new file mode 100644 index 000000000..f5112f04f --- /dev/null +++ b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Profile/About/bio.about.field.verified.link.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.371", + "green" : "0.565", + "red" : "0.290" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.603", + "green" : "0.742", + "red" : "0.476" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.black.imageset/mastodon.logo.black.pdf b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.black.imageset/mastodon.logo.black.pdf deleted file mode 100644 index 773ed5e77..000000000 --- a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.black.imageset/mastodon.logo.black.pdf +++ /dev/null @@ -1,339 +0,0 @@ -%PDF-1.7 - -1 0 obj - << /BBox [ 0.000000 0.000000 480.000000 119.097778 ] - /Resources << >> - /Subtype /Form - /Length 2 0 R - /Group << /Type /Group - /S /Transparency - >> - /Type /XObject - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.001709 -0.290527 cm -0.188235 0.533333 0.831373 scn -107.682541 47.532677 m -106.063889 39.212074 93.195923 30.106506 78.416977 28.341690 c -70.709908 27.421394 63.121937 26.576881 55.030510 26.946808 c -41.798027 27.553123 31.357124 30.104706 31.357124 30.104706 c -31.357124 28.818085 31.436523 27.591019 31.595320 26.443352 c -33.315022 13.385902 44.544495 12.602745 55.180283 12.238235 c -65.917122 11.870117 75.475624 14.885460 75.475624 14.885460 c -75.917725 5.177185 l -75.917725 5.177185 68.407349 1.147720 55.030510 0.406067 c -47.655472 0.000053 38.495773 0.590118 27.827501 3.414185 c -4.693666 9.538696 0.712913 34.197334 0.106597 59.224106 c --0.079267 66.653275 0.034417 73.660202 0.034417 79.517647 c -0.034417 105.105621 16.798328 112.606972 16.798328 112.606972 c -25.250660 116.488472 39.757122 118.121559 54.837425 118.244263 c -55.207348 118.244263 l -70.287651 118.121559 84.801338 116.488472 93.255470 112.606972 c -93.255470 112.606972 110.019386 105.105621 110.019386 79.517647 c -110.019386 79.517647 110.230507 60.638844 107.682541 47.532677 c -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 23.245789 45.780518 cm -0.121569 0.137255 0.168627 scn -0.000000 39.648720 m -0.000000 43.373230 3.018947 46.392181 6.743458 46.392181 c -10.467969 46.392181 13.486919 43.373230 13.486919 39.648720 c -13.486919 35.924210 10.467969 32.905262 6.743458 32.905262 c -3.018947 32.905262 0.000000 35.924210 0.000000 39.648720 c -h -96.718201 31.461655 m -96.718201 0.478188 l -84.443916 0.478188 l -84.443916 30.553986 l -84.443916 36.893234 81.776840 40.110676 76.440903 40.110676 c -70.541954 40.110676 67.586166 36.292332 67.586166 28.745865 c -67.586166 12.286915 l -55.384064 12.286915 l -55.384064 28.745865 l -55.384064 36.294136 52.426468 40.110676 46.529324 40.110676 c -41.193382 40.110676 38.524509 36.893234 38.524509 30.553986 c -38.524509 0.481804 l -26.252031 0.481804 l -26.252031 31.465263 l -26.252031 37.795486 27.865263 42.828270 31.104361 46.550980 c -34.442707 50.273685 38.816845 52.181053 44.246616 52.181053 c -50.526318 52.181053 55.284817 49.768425 58.430077 44.939552 c -61.486919 39.814735 l -64.543762 44.939552 l -67.689026 49.768425 72.445709 52.182858 78.727219 52.182858 c -84.156990 52.182858 88.529327 50.273685 91.869476 46.552784 c -95.108574 42.828270 96.720009 37.795490 96.720009 31.463459 c -96.718201 31.461655 l -h -139.005112 16.060150 m -141.536835 18.736240 142.758499 22.105263 142.758499 26.170826 c -142.758499 30.236389 141.536835 33.605415 139.005112 36.184063 c -136.565414 38.860153 133.468872 40.148571 129.715500 40.148571 c -125.962112 40.148571 122.867371 38.860153 120.427673 36.184063 c -117.987968 33.605415 116.768120 30.236389 116.768120 26.170826 c -116.768120 22.107067 117.987968 18.736240 120.427673 16.060150 c -122.867371 13.483311 125.962112 12.194881 129.715500 12.194881 c -133.468872 12.194881 136.565414 13.483311 139.005112 16.060150 c -139.005112 16.060150 l -h -142.758499 50.953987 m -154.859543 50.953987 l -154.859543 1.389473 l -142.754898 1.389473 l -142.754898 7.236088 l -139.097153 2.378342 134.030075 -0.000008 127.463463 -0.000008 c -121.176544 -0.000008 115.827965 2.477585 111.323906 7.533829 c -106.915489 12.590069 104.665268 18.835487 104.665268 26.169022 c -104.665268 33.405113 106.915489 39.650528 111.323906 44.706768 c -115.827965 49.763008 121.176544 52.339851 127.463463 52.339851 c -134.030075 52.339851 139.097153 49.959702 142.754898 45.103760 c -142.754898 50.950378 l -142.758499 50.953987 l -h -195.581955 27.062256 m -199.147659 24.387970 200.930527 20.620148 200.836685 15.863457 c -200.836685 10.807217 199.053848 6.840900 195.394302 4.065559 c -191.734756 1.389473 187.326309 0.001801 181.977737 0.001801 c -172.314575 0.001801 165.746170 3.966316 162.274292 11.797894 c -172.783768 18.041504 l -174.191299 13.781052 177.286011 11.599396 181.977737 11.599396 c -186.294128 11.599396 188.452347 12.988873 188.452347 15.863457 c -188.452347 17.944057 185.637283 19.827969 179.913376 21.313084 c -177.755188 21.908573 175.972336 22.504059 174.566620 23.000301 c -172.596085 23.792480 170.907074 24.685715 169.499557 25.775639 c -166.027664 28.451729 164.246628 32.019249 164.246628 36.579250 c -164.246628 41.436996 165.933823 45.302254 169.311874 48.079399 c -172.783752 50.953987 177.004501 52.341656 182.071579 52.341656 c -190.141342 52.341656 196.051117 48.871578 199.898331 41.833984 c -189.578354 35.886318 l -188.076996 39.255341 185.543457 40.940754 182.071579 40.940754 c -178.412018 40.940754 176.630966 39.553085 176.630966 36.876991 c -176.630966 34.796391 179.444214 32.912483 185.168121 31.425564 c -189.578339 30.433083 193.048416 28.947971 195.581955 27.064060 c -195.581955 27.062256 l -h -234.052322 38.661655 m -223.449036 38.661655 l -223.449036 18.043308 l -223.449036 15.563908 224.389175 14.078796 226.170227 13.384060 c -227.483917 12.887817 230.111267 12.788570 234.052322 12.987068 c -234.052322 1.389473 l -225.890518 0.396988 219.978958 1.190971 216.507080 3.868866 c -213.037003 6.445709 211.346176 11.202404 211.346176 18.043308 c -211.346176 38.661655 l -203.184372 38.661655 l -203.184372 50.953987 l -211.346176 50.953987 l -211.346176 60.965416 l -223.449036 64.830681 l -223.449036 50.953987 l -234.052322 50.953987 l -234.052322 38.661655 l -234.052322 38.661655 l -h -272.614716 16.357895 m -275.054413 18.936543 276.274261 22.208122 276.274261 26.172634 c -276.274261 30.137146 275.054413 33.408722 272.614716 35.985565 c -270.176819 38.562408 267.174133 39.850830 263.514587 39.850830 c -259.855011 39.850830 256.854126 38.562408 254.414429 35.985565 c -252.068558 33.309475 250.848709 30.037895 250.848709 26.172634 c -250.848709 22.305565 252.068558 19.033985 254.414429 16.357895 c -256.854126 13.781052 259.855011 12.492626 263.514587 12.492626 c -267.174133 12.492626 270.176819 13.781052 272.614716 16.357895 c -h -245.875488 7.535637 m -241.091721 12.590076 238.745850 18.736240 238.745850 26.172634 c -238.745850 33.507973 241.091721 39.652328 245.875488 44.708572 c -250.661057 49.763008 256.570801 52.341656 263.514587 52.341656 c -270.458344 52.341656 276.368134 49.763008 281.153687 44.708572 c -285.939240 39.652328 288.377136 33.408722 288.377136 26.172634 c -288.377136 18.835491 285.939240 12.590076 281.153687 7.535637 c -276.368134 2.479401 270.552155 0.001801 263.514587 0.001801 c -256.476990 0.001801 250.661057 2.479401 245.875488 7.535637 c -h -328.818054 16.060150 m -331.257751 18.736240 332.475769 22.105263 332.475769 26.170826 c -332.475769 30.236389 331.257751 33.605415 328.818054 36.184063 c -326.378357 38.860153 323.281799 40.148571 319.528412 40.148571 c -315.775024 40.148571 312.680298 38.860153 310.146759 36.184063 c -307.708893 33.605415 306.487213 30.236389 306.487213 26.170826 c -306.487213 22.107067 307.708893 18.736240 310.146759 16.060150 c -312.680298 13.483311 315.870667 12.194881 319.528412 12.194881 c -323.281799 12.194881 326.378357 13.483311 328.818054 16.060150 c -328.818054 16.060150 l -h -332.475769 70.780151 m -344.580475 70.780151 l -344.580475 1.389473 l -332.475769 1.389473 l -332.475769 7.236088 l -328.911865 2.378342 323.844818 -0.000008 317.278198 -0.000008 c -310.991272 -0.000008 305.550690 2.477585 301.046631 7.533829 c -296.636414 12.590069 294.384369 18.835487 294.384369 26.169022 c -294.384369 33.405113 296.636414 39.650528 301.046631 44.706768 c -305.550690 49.763008 310.991272 52.339851 317.278198 52.339851 c -323.844818 52.339851 328.911865 49.959702 332.475769 45.103760 c -332.475769 70.780151 l -332.475769 70.780151 l -h -387.083923 16.357895 m -389.523621 18.936543 390.743469 22.208122 390.743469 26.172634 c -390.743469 30.137146 389.523621 33.408722 387.083923 35.985565 c -384.644226 38.562408 381.643311 39.850830 377.983765 39.850830 c -374.324219 39.850830 371.321503 38.562408 368.881805 35.985565 c -366.535950 33.309475 365.316101 30.037895 365.316101 26.172634 c -365.316101 22.305565 366.535950 19.033985 368.881805 16.357895 c -371.321503 13.781052 374.324219 12.492626 377.983765 12.492626 c -381.643311 12.492626 384.644226 13.781052 387.083923 16.357895 c -387.083923 16.357895 l -h -360.344666 7.535637 m -355.559082 12.590076 353.215027 18.736240 353.215027 26.172634 c -353.215027 33.507973 355.559082 39.652328 360.344666 44.708572 c -365.130219 49.763008 371.040009 52.341656 377.983765 52.341656 c -384.925720 52.341656 390.837280 49.763008 395.622864 44.708572 c -400.408417 39.652328 402.846313 33.408722 402.846313 26.172634 c -402.846313 18.835491 400.408417 12.590076 395.622864 7.535637 c -390.837280 2.479401 385.019562 0.001801 377.983765 0.001801 c -370.946167 0.001801 365.130219 2.479401 360.344666 7.535637 c -360.344666 7.535637 l -h -455.202423 31.822556 m -455.202423 1.389473 l -443.097748 1.389473 l -443.097748 30.236389 l -443.097748 33.507969 442.255035 35.985565 440.566010 37.869476 c -438.970825 39.553085 436.718811 40.446320 433.809937 40.446320 c -426.960022 40.446320 423.489929 36.382557 423.489929 28.153984 c -423.489929 1.389473 l -411.387054 1.389473 l -411.387054 50.953987 l -423.489929 50.953987 l -423.489929 45.403309 l -426.398773 50.060753 430.994904 52.341656 437.469482 52.341656 c -442.630371 52.341656 446.851135 50.556992 450.135345 46.888420 c -453.513397 43.221657 455.202423 38.264664 455.202423 31.820751 c -455.202423 31.822556 l -h -f -n -Q - -endstream -endobj - -2 0 obj - 9224 -endobj - -3 0 obj - << /BBox [ 0.000000 0.000000 480.000000 119.097778 ] - /Resources << >> - /Subtype /Form - /Length 4 0 R - /Group << /Type /Group - /S /Transparency - >> - /Type /XObject - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm -0.000000 0.000000 0.000000 scn -0.000000 119.097778 m -480.000000 119.097778 l -480.000000 0.000031 l -0.000000 0.000031 l -0.000000 119.097778 l -h -f -n -Q - -endstream -endobj - -4 0 obj - 237 -endobj - -5 0 obj - << /XObject << /X1 1 0 R >> - /ExtGState << /E1 << /SMask << /Type /Mask - /G 3 0 R - /S /Alpha - >> - /Type /ExtGState - >> >> - >> -endobj - -6 0 obj - << /Length 7 0 R >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -/E1 gs -/X1 Do -Q - -endstream -endobj - -7 0 obj - 46 -endobj - -8 0 obj - << /Annots [] - /Type /Page - /MediaBox [ 0.000000 0.000000 480.000000 119.097778 ] - /Resources 5 0 R - /Contents 6 0 R - /Parent 9 0 R - >> -endobj - -9 0 obj - << /Kids [ 8 0 R ] - /Count 1 - /Type /Pages - >> -endobj - -10 0 obj - << /Type /Catalog - /Pages 9 0 R - >> -endobj - -xref -0 11 -0000000000 65535 f -0000000010 00000 n -0000009484 00000 n -0000009507 00000 n -0000009994 00000 n -0000010016 00000 n -0000010314 00000 n -0000010416 00000 n -0000010437 00000 n -0000010612 00000 n -0000010686 00000 n -trailer -<< /ID [ (some) (id) ] - /Root 10 0 R - /Size 11 ->> -startxref -10746 -%%EOF \ No newline at end of file diff --git a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.black.large.imageset/mastodon.logo.black.large.pdf b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.black.large.imageset/mastodon.logo.black.large.pdf deleted file mode 100644 index b6244d04e..000000000 --- a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.black.large.imageset/mastodon.logo.black.large.pdf +++ /dev/null @@ -1,339 +0,0 @@ -%PDF-1.7 - -1 0 obj - << /BBox [ 0.000000 0.000000 960.000000 238.195496 ] - /Resources << >> - /Subtype /Form - /Length 2 0 R - /Group << /Type /Group - /S /Transparency - >> - /Type /XObject - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.003357 -0.580933 cm -0.188235 0.533333 0.831373 scn -215.365082 95.065247 m -212.127777 78.424042 186.391846 60.212906 156.833954 56.683273 c -141.419815 54.842682 126.243874 53.153656 110.061020 53.893509 c -83.596054 55.106140 62.714249 60.209290 62.714249 60.209290 c -62.714249 57.636063 62.873047 55.181931 63.190639 52.886597 c -66.630043 26.771698 89.088989 25.205383 110.360565 24.476364 c -131.834244 23.740112 150.951248 29.770813 150.951248 29.770813 c -151.835449 10.354263 l -151.835449 10.354263 136.814697 2.295334 110.061020 0.812027 c -95.310944 0.000000 76.991547 1.180130 55.655003 6.828262 c -9.387332 19.077271 1.425826 68.394562 0.213194 118.448097 c --0.158535 133.306442 0.068834 147.320282 0.068834 159.035172 c -0.068834 210.211121 33.596657 225.213821 33.596657 225.213821 c -50.501320 232.976822 79.514244 236.242996 109.674850 236.488403 c -110.414696 236.488403 l -140.575302 236.242996 169.602676 232.976822 186.510941 225.213821 c -186.510941 225.213821 220.038773 210.211121 220.038773 159.035172 c -220.038773 159.035172 220.461014 121.277573 215.365082 95.065247 c -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 46.491440 91.561096 cm -0.121569 0.137255 0.168627 scn -0.000000 79.297432 m -0.000000 86.746460 6.037893 92.784363 13.486916 92.784363 c -20.935938 92.784363 26.973839 86.746460 26.973839 79.297432 c -26.973839 71.848412 20.935938 65.810516 13.486916 65.810516 c -6.037893 65.810516 0.000000 71.848412 0.000000 79.297432 c -h -193.436401 62.923302 m -193.436401 0.956360 l -168.887833 0.956360 l -168.887833 61.107964 l -168.887833 73.786461 163.553680 80.221344 152.881805 80.221344 c -141.083908 80.221344 135.172333 72.584648 135.172333 57.491714 c -135.172333 24.573814 l -110.768127 24.573814 l -110.768127 57.491714 l -110.768127 72.588257 104.852936 80.221344 93.058647 80.221344 c -82.386765 80.221344 77.049019 73.786461 77.049019 61.107964 c -77.049019 0.963593 l -52.504063 0.963593 l -52.504063 62.930511 l -52.504063 75.590965 55.730526 85.656540 62.208721 93.101944 c -68.885414 100.547363 77.633690 104.362106 88.493233 104.362106 c -101.052635 104.362106 110.569633 99.536835 116.860153 89.879089 c -122.973839 79.629471 l -129.087524 89.879089 l -135.378052 99.536835 144.891418 104.365707 157.454437 104.365707 c -168.313980 104.365707 177.058655 100.547363 183.738953 93.105560 c -190.217148 85.656540 193.440018 75.590973 193.440018 62.926910 c -193.436401 62.923302 l -h -278.010223 32.120285 m -283.073669 37.472473 285.516998 44.210510 285.516998 52.341637 c -285.516998 60.472771 283.073669 67.210823 278.010223 72.368118 c -273.130829 77.720299 266.937744 80.297134 259.431000 80.297134 c -251.924225 80.297134 245.734741 77.720299 240.855347 72.368118 c -235.975937 67.210823 233.536240 60.472771 233.536240 52.341637 c -233.536240 44.214119 235.975937 37.472473 240.855347 32.120285 c -245.734741 26.966606 251.924225 24.389748 259.431000 24.389748 c -266.937744 24.389748 273.130829 26.966606 278.010223 32.120285 c -278.010223 32.120285 l -h -285.516998 101.907967 m -309.719086 101.907967 l -309.719086 2.778915 l -285.509796 2.778915 l -285.509796 14.472160 l -278.194305 4.756668 268.060150 -0.000031 254.926926 -0.000031 c -242.353088 -0.000031 231.655930 4.955154 222.647812 15.067642 c -213.830978 25.180122 209.330536 37.670959 209.330536 52.338036 c -209.330536 66.810219 213.830978 79.301048 222.647812 89.413528 c -231.655930 99.526016 242.353088 104.679695 254.926926 104.679695 c -268.060150 104.679695 278.194305 99.919395 285.509796 90.207512 c -285.509796 101.900742 l -285.516998 101.907967 l -h -391.163910 54.124504 m -398.295319 48.775932 401.861053 41.240288 401.673370 31.726898 c -401.673370 21.614418 398.107697 13.681786 390.788605 8.131104 c -383.469513 2.778931 374.652618 0.003571 363.955475 0.003571 c -344.629150 0.003571 331.492340 7.932617 324.548584 23.595772 c -345.567535 36.082993 l -348.382599 27.562088 354.572021 23.198776 363.955475 23.198776 c -372.588257 23.198776 376.904694 25.977730 376.904694 31.726898 c -376.904694 35.888107 371.274567 39.655930 359.826752 42.626152 c -355.510376 43.817131 351.944672 45.008102 349.133240 46.000587 c -345.192169 47.584946 341.814148 49.371414 338.999115 51.551262 c -332.055328 56.903450 328.493256 64.038490 328.493256 73.158493 c -328.493256 82.873978 331.867645 90.604507 338.623749 96.158791 c -345.567505 101.907967 354.009003 104.683304 364.143158 104.683304 c -380.282684 104.683304 392.102234 97.743149 399.796661 83.667961 c -379.156708 71.772621 l -376.153992 78.510666 371.086914 81.881500 364.143158 81.881500 c -356.824036 81.881500 353.261932 79.106155 353.261932 73.753975 c -353.261932 69.592773 358.888428 65.824951 370.336243 62.851120 c -379.156677 60.866158 386.096832 57.895927 391.163910 54.128113 c -391.163910 54.124504 l -h -468.104645 77.323303 m -446.898071 77.323303 l -446.898071 36.086601 l -446.898071 31.127808 448.778351 28.157578 452.340454 26.768105 c -454.967834 25.775620 460.222534 25.577126 468.104645 25.974121 c -468.104645 2.778915 l -451.781036 0.793961 439.957916 2.381927 433.014160 7.737717 c -426.074005 12.891403 422.692352 22.404793 422.692352 36.086601 c -422.692352 77.323303 l -406.368744 77.323303 l -406.368744 101.907967 l -422.692352 101.907967 l -422.692352 121.930832 l -446.898071 129.661346 l -446.898071 101.907967 l -468.104645 101.907967 l -468.104645 77.323303 l -468.104645 77.323303 l -h -545.229431 32.715775 m -550.108826 37.873070 552.548523 44.416229 552.548523 52.345253 c -552.548523 60.274277 550.108826 66.817436 545.229431 71.971123 c -540.353638 77.124809 534.348267 79.701645 527.029175 79.701645 c -519.710022 79.701645 513.708252 77.124809 508.828857 71.971123 c -504.137115 66.618942 501.697418 60.075783 501.697418 52.345253 c -501.697418 44.611115 504.137115 38.067955 508.828857 32.715775 c -513.708252 27.562088 519.710022 24.985237 527.029175 24.985237 c -534.348267 24.985237 540.353638 27.562088 545.229431 32.715775 c -h -491.750977 15.071259 m -482.183441 25.180138 477.491699 37.472473 477.491699 52.345253 c -477.491699 67.015930 482.183441 79.304657 491.750977 89.417137 c -501.322113 99.526016 513.141602 104.683304 527.029175 104.683304 c -540.916687 104.683304 552.736267 99.526016 562.307373 89.417137 c -571.878479 79.304657 576.754272 66.817436 576.754272 52.345253 c -576.754272 37.670967 571.878479 25.180138 562.307373 15.071259 c -552.736267 4.958771 541.104309 0.003571 527.029175 0.003571 c -512.953979 0.003571 501.322113 4.958771 491.750977 15.071259 c -h -657.636108 32.120285 m -662.515503 37.472473 664.951538 44.210510 664.951538 52.341637 c -664.951538 60.472771 662.515503 67.210823 657.636108 72.368118 c -652.756714 77.720299 646.563599 80.297134 639.056824 80.297134 c -631.550049 80.297134 625.360596 77.720299 620.293518 72.368118 c -615.417786 67.210823 612.974426 60.472771 612.974426 52.341637 c -612.974426 44.214119 615.417786 37.472473 620.293518 32.120285 c -625.360596 26.966606 631.741333 24.389748 639.056824 24.389748 c -646.563599 24.389748 652.756714 26.966606 657.636108 32.120285 c -657.636108 32.120285 l -h -664.951538 141.560303 m -689.160950 141.560303 l -689.160950 2.778915 l -664.951538 2.778915 l -664.951538 14.472160 l -657.823730 4.756668 647.689636 -0.000031 634.556396 -0.000031 c -621.982544 -0.000031 611.101379 4.955154 602.093262 15.067642 c -593.272827 25.180122 588.768738 37.670959 588.768738 52.338036 c -588.768738 66.810219 593.272827 79.301048 602.093262 89.413528 c -611.101379 99.526016 621.982544 104.679695 634.556396 104.679695 c -647.689636 104.679695 657.823730 99.919395 664.951538 90.207512 c -664.951538 141.560303 l -664.951538 141.560303 l -h -774.167847 32.715775 m -779.047241 37.873070 781.486938 44.416229 781.486938 52.345253 c -781.486938 60.274277 779.047241 66.817436 774.167847 71.971123 c -769.288452 77.124809 763.286621 79.701645 755.967529 79.701645 c -748.648438 79.701645 742.643005 77.124809 737.763611 71.971123 c -733.071899 66.618942 730.632202 60.075783 730.632202 52.345253 c -730.632202 44.611115 733.071899 38.067955 737.763611 32.715775 c -742.643005 27.562088 748.648438 24.985237 755.967529 24.985237 c -763.286621 24.985237 769.288452 27.562088 774.167847 32.715775 c -774.167847 32.715775 l -h -720.689331 15.071259 m -711.118164 25.180138 706.430054 37.472473 706.430054 52.345253 c -706.430054 67.015930 711.118164 79.304657 720.689331 89.417137 c -730.260437 99.526016 742.080017 104.683304 755.967529 104.683304 c -769.851440 104.683304 781.674561 99.526016 791.245728 89.417137 c -800.816833 79.304657 805.692627 66.817436 805.692627 52.345253 c -805.692627 37.670967 800.816833 25.180138 791.245728 15.071259 c -781.674561 4.958771 770.039124 0.003571 755.967529 0.003571 c -741.892334 0.003571 730.260437 4.958771 720.689331 15.071259 c -720.689331 15.071259 l -h -910.404846 63.645103 m -910.404846 2.778915 l -886.195496 2.778915 l -886.195496 60.472771 l -886.195496 67.015930 884.510071 71.971123 881.132019 75.738945 c -877.941650 79.106163 873.437622 80.892624 867.619873 80.892624 c -853.920044 80.892624 846.979858 72.765106 846.979858 56.307961 c -846.979858 2.778915 l -822.774109 2.778915 l -822.774109 101.907967 l -846.979858 101.907967 l -846.979858 90.806610 l -852.797546 100.121506 861.989807 104.683304 874.938965 104.683304 c -885.260742 104.683304 893.702271 101.113983 900.270691 93.776840 c -907.026794 86.443298 910.404846 76.529312 910.404846 63.641495 c -910.404846 63.645103 l -h -f -n -Q - -endstream -endobj - -2 0 obj - 9343 -endobj - -3 0 obj - << /BBox [ 0.000000 0.000000 960.000000 238.195496 ] - /Resources << >> - /Subtype /Form - /Length 4 0 R - /Group << /Type /Group - /S /Transparency - >> - /Type /XObject - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm -0.000000 0.000000 0.000000 scn -0.000000 238.195496 m -960.000000 238.195496 l -960.000000 0.000000 l -0.000000 0.000000 l -0.000000 238.195496 l -h -f -n -Q - -endstream -endobj - -4 0 obj - 237 -endobj - -5 0 obj - << /XObject << /X1 1 0 R >> - /ExtGState << /E1 << /SMask << /Type /Mask - /G 3 0 R - /S /Alpha - >> - /Type /ExtGState - >> >> - >> -endobj - -6 0 obj - << /Length 7 0 R >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -/E1 gs -/X1 Do -Q - -endstream -endobj - -7 0 obj - 46 -endobj - -8 0 obj - << /Annots [] - /Type /Page - /MediaBox [ 0.000000 0.000000 960.000000 238.195496 ] - /Resources 5 0 R - /Contents 6 0 R - /Parent 9 0 R - >> -endobj - -9 0 obj - << /Kids [ 8 0 R ] - /Count 1 - /Type /Pages - >> -endobj - -10 0 obj - << /Type /Catalog - /Pages 9 0 R - >> -endobj - -xref -0 11 -0000000000 65535 f -0000000010 00000 n -0000009603 00000 n -0000009626 00000 n -0000010113 00000 n -0000010135 00000 n -0000010433 00000 n -0000010535 00000 n -0000010556 00000 n -0000010731 00000 n -0000010805 00000 n -trailer -<< /ID [ (some) (id) ] - /Root 10 0 R - /Size 11 ->> -startxref -10865 -%%EOF \ No newline at end of file diff --git a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.imageset/Contents.json b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.imageset/Contents.json index 6a0bfc87a..76d42c15e 100644 --- a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.imageset/Contents.json +++ b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "logotypeFull1.pdf", + "filename" : "logo.small.pdf", "idiom" : "universal" } ], diff --git a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.imageset/logo.small.pdf b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.imageset/logo.small.pdf new file mode 100644 index 000000000..581801f38 --- /dev/null +++ b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.imageset/logo.small.pdf @@ -0,0 +1,648 @@ +%PDF-1.7 + +1 0 obj + << /Type /XObject + /Length 2 0 R + /Group << /Type /Group + /S /Transparency + >> + /Subtype /Form + /Resources << >> + /BBox [ 0.000000 0.000000 269.000000 75.000000 ] + >> +stream +/DeviceRGB CS +/DeviceRGB cs +q +1.000000 0.000000 -0.000000 1.000000 4.000000 4.000000 cm +0.000000 0.000000 0.000000 scn +0.000000 67.000000 m +261.000000 67.000000 l +261.000000 0.000000 l +0.000000 0.000000 l +0.000000 67.000000 l +h +f +n +Q + +endstream +endobj + +2 0 obj + 234 +endobj + +3 0 obj + << /Length 4 0 R + /Range [ 0.000000 1.000000 0.000000 1.000000 0.000000 1.000000 ] + /Domain [ 0.000000 1.000000 ] + /FunctionType 4 + >> +stream +{ 0.388235 exch 0.392157 exch 1.000000 exch dup 0.000000 gt { exch pop exch pop exch pop dup 0.000000 sub -0.050980 mul 0.388235 add exch dup 0.000000 sub -0.164706 mul 0.392157 add exch dup 0.000000 sub -0.200000 mul 1.000000 add exch } if dup 1.000000 gt { exch pop exch pop exch pop 0.337255 exch 0.227451 exch 0.800000 exch } if pop } +endstream +endobj + +4 0 obj + 339 +endobj + +5 0 obj + << /Type /XObject + /Length 6 0 R + /Group << /Type /Group + /S /Transparency + >> + /Subtype /Form + /Resources << /Pattern << /P1 << /Matrix [ 0.000000 -65.993195 65.993195 0.000000 -61.993195 70.224548 ] + /Shading << /Coords [ 0.000000 0.000000 1.000000 0.000000 ] + /ColorSpace /DeviceRGB + /Function 3 0 R + /Domain [ 0.000000 1.000000 ] + /ShadingType 2 + /Extend [ true true ] + >> + /PatternType 2 + /Type /Pattern + >> >> >> + /BBox [ 0.000000 0.000000 269.000000 75.000000 ] + >> +stream +/DeviceRGB CS +/DeviceRGB cs +q +1.000000 0.000000 -0.000000 1.000000 4.000000 3.632446 cm +/Pattern cs +/P1 scn +60.826767 51.982300 m +59.885666 59.068882 53.787518 64.663071 46.568073 65.739265 c +45.346546 65.922020 40.730431 66.592102 30.036348 66.592102 c +29.956215 66.592102 l +19.252211 66.592102 16.959164 65.922020 15.737550 65.739265 c +8.708311 64.683380 2.299911 59.667900 0.737860 52.489872 c +-0.003115 48.956699 -0.083220 45.037697 0.056964 41.443653 c +0.257227 36.286026 0.297280 31.148746 0.757885 26.011383 c +1.078305 22.600037 1.629032 19.219128 2.420071 15.889084 c +3.902017 9.736488 9.889900 4.619389 15.757648 2.538147 c +22.035824 0.365425 28.794806 0.000015 35.263187 1.492470 c +35.974140 1.665001 36.675091 1.857872 37.376038 2.081261 c +38.948124 2.588921 40.790466 3.157455 42.152252 4.152424 c +42.172348 4.162594 42.182354 4.182858 42.192364 4.203201 c +42.202370 4.223465 42.212376 4.243816 42.212376 4.274334 c +42.212376 9.249176 l +42.212376 9.249176 42.212376 9.289791 42.192364 9.310051 c +42.192364 9.330315 42.172348 9.350658 42.152252 9.360832 c +42.132240 9.370922 42.112228 9.381180 42.092300 9.391270 c +42.072121 9.391270 42.052189 9.391270 42.032177 9.391270 c +37.886612 8.386127 33.631145 7.878468 29.375511 7.888641 c +22.035824 7.888641 20.063231 11.421898 19.502539 12.883831 c +19.051918 14.152893 18.761566 15.482990 18.641405 16.823097 c +18.641405 16.843441 18.641405 16.863705 18.651411 16.884052 c +18.651411 16.904316 18.671425 16.924664 18.691521 16.934837 c +18.711451 16.944927 18.731462 16.955097 18.751476 16.965271 c +18.821604 16.965271 l +22.896957 15.970303 27.082464 15.462643 31.277977 15.462643 c +32.289371 15.462643 33.290596 15.462646 34.301991 15.493084 c +38.517517 15.614994 42.963440 15.828209 47.118843 16.650486 c +47.218906 16.670830 47.329144 16.691097 47.419201 16.711441 c +53.967884 17.990677 60.196030 21.990898 60.826767 32.123367 c +60.846947 32.519287 60.906982 36.306290 60.906982 36.712379 c +60.906982 38.123699 61.357521 46.692589 60.836857 51.961868 c +60.826767 51.982300 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 16.353134 47.918640 cm +1.000000 1.000000 1.000000 scn +0.000000 3.736245 m +0.000000 5.807401 1.632209 7.472382 3.654834 7.472382 c +5.677542 7.472382 7.309585 5.797228 7.309585 3.736245 c +7.309585 1.675262 5.677542 0.000028 3.654834 0.000028 c +1.632209 0.000028 0.000000 1.675262 0.000000 3.736245 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 32.524460 30.973694 cm +1.000000 1.000000 1.000000 scn +38.200230 17.462723 m +38.200230 0.284256 l +31.541471 0.284256 l +31.541471 16.955149 l +31.541471 20.467976 30.099640 22.244776 27.205791 22.244776 c +24.011585 22.244776 22.399469 20.122755 22.399469 15.950090 c +22.399469 6.822678 l +15.790834 6.822678 l +15.790834 15.950090 l +15.790834 20.143185 14.198734 22.244776 10.984432 22.244776 c +8.100758 22.244776 6.648746 20.467976 6.648746 16.955149 c +6.648746 0.294346 l +0.000000 0.294346 l +0.000000 17.462723 l +0.000000 20.965542 0.871139 23.757576 2.623425 25.828648 c +4.435832 27.899887 6.808930 28.945639 9.742804 28.945639 c +13.147311 28.945639 15.730712 27.605450 17.432966 24.925154 c +19.095194 22.082256 l +20.757338 24.925154 l +22.459507 27.595276 25.032986 28.945639 28.447416 28.945639 c +31.381290 28.945639 33.754387 27.889629 35.566792 25.828648 c +37.319077 23.757576 38.190220 20.985806 38.190220 17.462723 c +38.200230 17.462723 l +h +61.110268 8.924355 m +62.491982 10.416807 63.143234 12.264570 63.143234 14.518509 c +63.143234 16.772449 62.481976 18.640476 61.110268 20.061882 c +59.788589 21.554337 58.106689 22.265121 56.073723 22.265121 c +54.041008 22.265121 52.368858 21.554337 51.037174 20.061882 c +49.715416 18.640476 49.054577 16.772449 49.054577 14.518509 c +49.054577 12.264570 49.715416 10.396461 51.037174 8.924355 c +52.358852 7.502947 54.041008 6.781986 56.073723 6.781986 c +58.106689 6.781986 59.778584 7.492773 61.110268 8.924355 c +h +63.143234 28.255198 m +69.701591 28.255198 l +69.701591 0.781738 l +63.143234 0.781738 l +63.143234 4.020473 l +61.160301 1.330006 58.416882 -0.000011 54.852188 -0.000011 c +51.287495 -0.000011 48.543831 1.370613 46.110611 4.172821 c +43.717499 6.974941 42.505974 10.437069 42.505974 14.498163 c +42.505974 18.559340 43.727505 21.970684 46.110611 24.772808 c +48.553837 27.574930 51.457687 28.996338 54.852188 28.996338 c +58.246773 28.996338 61.160301 27.676495 63.143234 24.996117 c +63.143234 28.234852 l +63.143234 28.255198 l +h +91.770676 15.036257 m +93.703575 13.543886 94.665031 11.462475 94.615005 8.832880 c +94.615005 6.030758 93.653549 3.827599 91.670616 2.304710 c +89.688515 0.812176 87.294495 0.050774 84.390968 0.050774 c +79.154297 0.050774 75.599525 2.253845 73.716660 6.579025 c +79.405289 10.041067 l +80.164940 7.685646 81.837677 6.467285 84.390968 6.467285 c +86.734138 6.467285 87.895714 7.228771 87.895714 8.822790 c +87.895714 9.980196 86.373070 11.025948 83.269424 11.838133 c +82.097839 12.163090 81.127220 12.498138 80.375908 12.772230 c +79.303558 13.208757 78.392975 13.706240 77.631653 14.315380 c +75.749619 15.807833 74.789009 17.777590 74.789009 20.305622 c +74.789009 22.996006 75.699593 25.138290 77.531593 26.681526 c +79.415298 28.275459 81.706749 29.037029 84.451004 29.037029 c +88.826294 29.037029 92.020851 27.118137 94.113853 23.219398 c +88.526115 19.929964 l +87.715591 21.798073 86.333038 22.732088 84.451004 22.732088 c +82.468071 22.732088 81.506630 21.970686 81.506630 20.478231 c +81.506630 19.320744 83.029274 18.274992 86.132919 17.462723 c +88.526115 16.914539 90.408142 16.092180 91.770676 15.036257 c +91.780693 15.036257 l +91.770676 15.036257 l +h +112.618164 21.452854 m +106.870323 21.452854 l +106.870323 10.020803 l +106.870323 8.650179 107.381485 7.817646 108.352104 7.441906 c +109.063393 7.167816 110.485130 7.117115 112.628166 7.218597 c +112.628166 0.791912 l +108.212013 0.243645 105.008308 0.690430 103.126274 2.162537 c +101.243401 3.583942 100.331985 6.233803 100.331985 10.010632 c +100.331985 21.452854 l +95.915833 21.452854 l +95.915833 28.265369 l +100.331985 28.265369 l +100.331985 33.808784 l +106.890335 35.951027 l +106.890335 28.255198 l +112.638176 28.255198 l +112.638176 21.442680 l +112.628166 21.442680 l +112.618164 21.452854 l +h +133.525681 9.086706 m +134.847351 10.508114 135.507782 12.325527 135.507782 14.528599 c +135.507782 16.731840 134.847351 18.528820 133.525681 19.970573 c +132.193161 21.391897 130.571289 22.112776 128.589188 22.112776 c +126.606262 22.112776 124.984390 21.402071 123.651871 19.970573 c +122.381058 18.478121 121.719803 16.680973 121.719803 14.528599 c +121.719803 12.376308 122.381058 10.579159 123.651871 9.086706 c +124.974380 7.665382 126.606262 6.944508 128.589188 6.944508 c +130.571289 6.944508 132.193161 7.655127 133.525681 9.086706 c +h +119.037262 4.203255 m +116.443100 7.005379 115.171455 10.406551 115.171455 14.528599 c +115.171455 18.650732 116.443100 22.001038 119.037262 24.803242 c +121.629745 27.605450 124.834297 29.026855 128.589188 29.026855 c +132.343262 29.026855 135.558640 27.605450 138.141953 24.803242 c +140.725266 22.001038 142.056961 18.538994 142.056961 14.528599 c +142.056961 10.518290 140.725266 7.005379 138.141953 4.203255 c +135.547806 1.401051 132.394119 0.030510 128.589188 0.030510 c +124.784264 0.030510 121.619743 1.401051 119.037262 4.203255 c +h +163.985123 8.934444 m +165.306808 10.426897 165.968063 12.274660 165.968063 14.528599 c +165.968063 16.782539 165.306808 18.650732 163.985123 20.072056 c +162.664291 21.564592 160.982376 22.275211 158.948578 22.275211 c +156.916458 22.275211 155.233719 21.564592 153.862839 20.072056 c +152.540329 18.650732 151.879898 16.782539 151.879898 14.528599 c +151.879898 12.274660 152.540329 10.406551 153.862839 8.934444 c +155.243713 7.513037 156.966492 6.792244 158.948578 6.792244 c +160.932358 6.792244 162.654282 7.502947 163.985123 8.934444 c +h +165.968063 39.260834 m +172.526413 39.260834 l +172.526413 0.791912 l +165.968063 0.791912 l +165.968063 4.030647 l +164.035995 1.340179 161.291748 0.010162 157.727798 0.010162 c +154.163025 0.010162 151.379578 1.380703 148.925522 4.182991 c +146.532318 6.985115 145.321548 10.447161 145.321548 14.508337 c +145.321548 18.569429 146.542328 21.980774 148.925522 24.782898 c +151.358734 27.585186 154.312286 29.006512 157.727798 29.006512 c +161.141647 29.006512 164.035995 27.686666 165.968063 25.006289 c +165.968063 39.250683 l +165.968063 39.260834 l +h +195.566971 9.117228 m +196.888641 10.538635 197.549896 12.355879 197.549896 14.559118 c +197.549896 16.762192 196.888641 18.559340 195.566971 20.001011 c +194.245285 21.422335 192.623413 22.143211 190.630478 22.143211 c +188.638367 22.143211 187.026520 21.432508 185.694000 20.001011 c +184.422363 18.508474 183.761093 16.711493 183.761093 14.559118 c +183.761093 12.406662 184.422363 10.609680 185.694000 9.117228 c +187.016510 7.695736 188.648376 6.974945 190.630478 6.974945 c +192.613403 6.974945 194.235291 7.685648 195.566971 9.117228 c +h +181.077713 4.233692 m +178.495224 7.035900 177.212753 10.437071 177.212753 14.559118 c +177.212753 18.681084 178.485229 22.031557 181.077713 24.833679 c +183.671036 27.635885 186.875580 29.057293 190.630478 29.057293 c +194.385376 29.057293 197.599915 27.635885 200.183228 24.833679 c +202.775726 22.031557 204.098236 18.569429 204.098236 14.559118 c +204.098236 10.548725 202.775726 7.035900 200.183228 4.233692 c +197.589905 1.431572 194.435410 0.060863 190.630478 0.060863 c +186.825546 0.060863 183.661026 1.431572 181.077713 4.233692 c +h +232.475540 17.696289 m +232.475540 0.822433 l +225.917206 0.822433 l +225.917206 16.812975 l +225.917206 18.630386 225.466064 20.001011 224.535477 21.036505 c +223.674088 21.970686 222.452469 22.457994 220.879807 22.457994 c +217.175766 22.457994 215.292923 20.204056 215.292923 15.645479 c +215.292923 0.812172 l +208.734528 0.812172 l +208.734528 28.265369 l +215.292923 28.265369 l +215.292923 25.178900 l +216.864761 27.757797 219.367996 29.026855 222.862732 29.026855 c +225.656174 29.026855 227.949310 28.041977 229.732117 26.011431 c +231.564957 23.980885 232.475540 21.229462 232.475540 17.665854 c +f +n +Q + +endstream +endobj + +6 0 obj + 9965 +endobj + +7 0 obj + << /Type /XObject + /Subtype /Image + /BitsPerComponent 8 + /Length 8 0 R + /Height 148 + /Width 538 + /ColorSpace /DeviceGray + /Filter [ /FlateDecode ] + >> +stream +xC#[ֆ;ݍ;$$@pwwwwww~wW̽LPU[׻׿ }ӿ>_a?CL]0qoAtUǏ>񣯗QoN|ȥ\ Q;iϢАPCa6OP8u!!\@?Qw 3̡̞ǯIL4DFFDEECQ11(66&6oGEGErN 5?%fSHlDEEBDDd$6vdq.11!!!>..N0 <~ՑqDdt\BfіkΗ` .dNMMK@^×E/zҠTt$; 2)1!.&:2tpP;?G&:4&1͕+J O!1q IvGM3|9yy~*r ?//77';;+3ӗ e6~ }gsz|yy>k-$ŧEL|-gfWVVUT։E7TWUUVVfefx)(A+(iчq6WFnQyUM]mUyqn_PZϖddWU646wtvwYo~0/Mu:bPLf|1$<:˯klb"~).z";pxdtl|brrjjzzzffv2 LOMMMNL tu46TWfz]†ShW"#P@K2"cщɉс<#."XCqI73pdlbjfn~~qiyeuu ZX؄:0?7;=59>:4TWU +6#˜|@sI 9bxbDdZ~ Jp:VV:|΄пMfv.ovAiuckW*@;888<<:<:::X萓{{;;[dianzbd('HD02X0s4xkY>| +Jtg5O.mn.M gѼ`8['odrf~emc{wJtͷ!>\svvzrrr R@(!6/ M0X'B DucKͫ<`F;sla1Ca1Ԍ殁sp}ss'7B X&gLJkKC=exEaEF&$=wпn~ +{ +j'wOnNV&k _CfhB#cS<9EUMKG'gW7@Woo|0Ĺ/ϟ??~6`gcynb8ۓ+@a˲Mz}YDbS 1Hw>ڽ뇗,t{ ˇsb¢bmΌÓ˛ϰ~,?'tpngd@{}Y7%)NRE£ѠiB"6eYH5! }2f6XNW3 E_7awgV6u O-n] b4 O?!.7(pwceA+)6ׯ0nT pgW5( &eO1!cvl}Q=6,/odjXT=5wlnm\FPi?}Ï!_<^͍TZ֠)1n ݙm==y丈пo& q2$332^eԶL.n\ DAHx^lLJ˓Bb|#bəARB!3&&B ذ)!SrRK:Wvϯ%.`%?E rws~4eKx7o|vy}}ea`Bb_@B2a!H O`KD-5cxfuᵼy;h{Y(HID!JQ\DWficp[eaE?G dFQ2mſ UY~Wd +o>c]YhgvO.Ӣ|gh@/J(Jɷ't5q8P(?5&º뛫=:\]D*El\կ*M u_ 3eFQd+ϙ&T +hUP G9c *haNеO~e^Eg`ڐZi(r%M􌾙y9x8h9c,S)2S r#sf4 /o 3yNT˹BGk*VVK_giӧPDY(9x `Ɍt;LM +")H̄Ez3G?,I_*Ц,U%CW!Tmd|{|iWb__G_XJPgj +ҝ&M~52M09%Lےb5 + %<$2/6!fUgJJÖ 4R9D%|E]{wZH2snjUi#RI q{hPѥxu#]Lt\W܀#p6y 2U6жLvmqt \*A-)[D=H0y,$UkK8Og T]4OVBSc#,+/I#[+͛efffx=n90lNY9ʀTxDL!iYY>Оde\%hY?tgq8r$iUsEē{sY8ݓLA s+ l +4]Ѥa&M 2eR=Li;# Ño4ՆhU%1AvmՎe WOz`8]:цE&j{VoP%/ O8C`Vh3p%EY-K3L:2r JJ⢂\R^Eb|6ŕz<$H훈N㓒^_N~QqiTZ\ɚF 0ݾΑ/_?ߞNTfzF^S`KIMX,%)+#Hƫ@S,wek4%E9T+5=ypnӊgo*ob MXWTofnA!iAy)> 0 1dgMKu;S$ť.i'i'  +'cta~?//:\$B{ +|l2/A51 v730N—,dX ,/Mb#5=u%'wЁ!.~15.6{[=)&+SHxtlӓ_ZIJchkH̜ںd+r+=o`hlk(I<Ρ[\/g{ks] 5FTm"9p5E/NZCV o'ɇH6I kH J˞peV5vNk6879P,MM Ԑ!ف)"*Ԑ#]ZY֝řɡlaOvW4v M.`'{k 3(#"&%XX;25KkdZjJrt#1)MrysKjZzҢGK3`odn}d F?mwL-nljTˋ3-WWKe!6?&SHL!MMN2G֎_Yh(p +Cr%Z淰<1 6K,8?^)VR0h< + +0=93kۻrxzrr|:?5630:98;TjT)k[?<>=TX+HusK뻆6/Af`wkmif-5nң]=9;=;==>:^_l,A@(Ϗo\P981.nM&# cge$:-12t| mj*Ԗ#:)&3wtziumei~zbtxhxlrvimꁙũ +$ +*P sly6#3`|'H, xIR61/WexLB7aP+lC:?;Z[չC`O)Z;<]{KC Y9EUS[VLoڷ//OWgk=vSkDo;%c.oon뫋ݍ暢T,wT6wfQUs̊յFsCɳեٹ @̠I+@W`fc{ *սٱڒl--1"šΑٕ}hsmyq~nYspr~Ino)~r푟'e52!hMkr^90 .`Q@[uaFJbWy]#3+׷څſ hώvVz3R" O%՝! j(/-,[Җ_%t +Brmy(#9>ٌJ>9Gmw58;]_2MXXwVQMk=Cѣ㽝u9fAegH2DeeS7?m5-[&dosqj4HB!/EKnoNO8"rgq04ĥJq"5g?Wo7G+-yWM ٓW3:w|s߾@̜fpoG*F8ڜl.tX1S2j4;Fh?PsufdmӰgJ|(jїuUPGm W @o=')xL?<T +2H|˞fD}cm4^ w5 &rȌ2EI)/NOYg֧R4>k+mti7QadN/@&ӏQw'zʲ 4L[&6N̂f +4YW15&+5-kbex&?9_g2^OaѶzU(@Jq7of0xFQჴ4C|`.[mvF@⹓ +]QU3!27q~6VWTs%+>)`%Jb 0G5? u7ItAhDݛW:0{|q𙥮^-Ui,1N #3ƞ27/d)ʛ:an YNEvE.#F3(Bw]a]8VV !)Z;x2 $Y]ߠku˞`ѫ "Co $=sxbi Yx|o d0'Q1*3[Wpi0t+ ޅѮʪV;'ZJU3{k}řRe5 +9T|s@Vz/3V]Spem3iI$ƥXq-P0h4 M(l?QSET*D԰h\~K@loe$3,O#h-+z+do +~E߾]+LwseDm {Qx{(3raFB%3bcHhN! +5%Nv8\Xm./nV&5o,uf8IvXA77؜8bsdWfSE_c2%`u-cP;ɌS 54#2B Ci@4Q>蒢3U܃C +KK˫)1Kڲ1&d$ƒ*oÞ ckeafjbjVAʼnڶ=\1 4Nv)1?ph[Gv}~BCwt`7 MfWf1ɯ,U(#|Ehi ud,Ја8e2Loful]p{Mɐmc N2d`0<;|0r7_.Vzғ"pm@e /X( +&oѫ}E}6@߿]Oel梠Ev"^S彾DcT*~ 2$3ܶ8)3X +gS#== +\3@u(&>D vLIqWnX䋓uSgWuۖtHg º!O -*BT>9>:22J܉8~$c4 dhxïBLMOOw":b/X c]Rv!kh8FICN46-Bhk~B N@Fd3mlqmJ?<3~,/@ƽ5%r.oie7fzmm!޳{t,3*@" r49PWOnmhlznanf '\y}[1B&Hꊨ=!x¬=mNWX!`. }]]ݽ +. )2ьނ2Svm~jx[kKkg7ulSp#7x&*2a` G;]Aj[ #%Ȑ6GfoBzMc 1.h 55yiIVd$r*;V f!2V3t4;8}~A 5N#ºq #F{uTt6WWW^::?2+Sڅ=qxe,~H2RK]qwԖHI{3IAIieÖRd=-@+Fz;jkH,SE;Kݵ^ Q ά2k_Н|T$[+mo(++"?>GLʖ̸o\wEm]GBӔoml UExlwe Qa xvw 3xsmJ;`qCXH՝8Ә~ ҁ'|-ଠ$>30o 0L͎4הeggeW `&S~dH$$&7ɞܫS-5yY*X\Ĥ+nOv{&M!*Caj$|uyQ~v;ّ=AU`kqreYqA^^^aIe=ٝUݍ{.-_KVO,g~uE%Pe %ٙMMS1A|*a eDNF X$;za>mWԶtϬ6R +O{HB#1&* # 3~=?ؘ)*gdU5u +t&\ꓡ2>F%5ieLu0TSco_'x|r2U戏#SӁ~J>QCEAvzr=Z}̰̌ Q8 +|f N6Wfgx}%eD%s{Ǘ$:XS6[JZ*U[ }5eY4ח[TIvfuW;\8k`eNK֖ezSN+ UV>Ht2d01,&DƑiNm)l<9$;&R +)>&yXŀ5ۋcݤ|idg/{L#gM|=^n L$]530$7Dq +:,޺2.!'%sq9;he&$$$S^!HQِЈH쬒nc<|FF",QNyxO~~FyHH v7t1eY =u^%9rb  + sniS"-$!'JFLZ>|Lk=RD|?';8'Y{I*c۬DLQOWf9ke ̔eΰ h*+ 1㢴 IrT"tI/EnHǛ@$HXXgtAuyĈAG ~FgYmuPv3(՗)i mG i>}R9#(#ՈGKW)bǒb:ژhIv7f4{0x=wal%Ȱ2HJ_djUAb}:T=YJMIv7w^h.WYPl鴼vɆQ $k۰:`l.YnZAnV#T,p懀NVy_:ܐţM@4H'f,T V&cFVdz'u"PQ<_z&-xAá0/EhS+bRD0WSmcĐdحz`mN%#/$KvEː*HٷWfg"W[B7!΃Ka,֡$,m[Zn0nX^ h"8u gxQ8{a,U4G;p8Y@} d`fڝ$;!tń}o!h;]Ѵ{kD@S;@3CNAR2ŧ̈֡fYe=e 3n޲30DP&ƐLl:rqA|hoC݀'mB|HYV r~L +juqvb ˺:AYx|J' 36@FGо&/bZxV6x2ZX>RA}iA^~y8n +T><Y0pmB&OUN0+[Lr5˥)h^bƾE\IH {QE0?.W" M +D @42 Tw ݥ\;5 XV7qQ@;y!E18d+IR];q7VIv t5ה s_IJV)?l'dhA] )Gɣ'~bGJ# p%y08 8U|$KR"H#2+oB4*f1@)@()4J[tF1g(0 3\) . sl_~21Ƞٳn!C3zT.@O` X'̣drniukW-U/Gj2Ƒ~}bZ`z@LgaZ:>;&r/*R$CyQAQt|u]PpyS{ +†,zd$6l2,>-Rm[{ aAސf}4v|M@FB4O5F)/=YZq9;0!!0Ila& ruGT)m_Z=DgqV ("w1u?7Ԣg ]1DL#At3 +g` 1F_'i4C ;B 3R[Q6qmYm$F xӑbbOXP]DIؖz -O1I Į gRɷE% +25tH|H@:j~ Xk!?athib]̼1:=[BY|L Lц6I?2^@5y\b&^ʓH3"$JIJ*k@`⏁*AA M@V=)(i#*@ao"LxkB-OU<];5C'Ef[$%.I3kpg1ےU26N.9IJW:?Bg@AF˕5V& " ah PҬML0+' ˘,%ד_VnaqyU}sGuˇ<@) 2uԅF&X r%B)H/pIآi1weAvVNɛ7 % h"2jp6IH<5J+o2@ m`6Lb(ΜJ:*7q攓DFf00 #2g dP8ۺ,d~,zD&g? aLqgbY  +4ګ4WlvXPj:$\,vT)0T$~$B+r-dS,,A|+)$$42:ޖJzӽH-+j]ǘ":!3)6Ǡ%30XD1崤Dw}q*(-^nB +!>IJ)ͽE2>:2lj'X dX2d'dV(R< eɌ7 ׼H'+kA(16zBe2ƺX~D|>P+|dW)2|DGfѢT(i]?@0#qNea FGRģ +2k XȨ0Eㆻ-PIkhLln2yt|9Akh3e1DCm*ՑkHТcdn\g>P.ȈMpx zRek3CmE$WNZ{Pi51};Q3:e< |&[2D ew%Q|&O( 2٩DklK&Aw|9d["HO,3Qt%A;gV766qioAeKnL_6t;pí1:ԋT-䤄X&?Sg ,e.LwQf8:Q˨J0C':,KۛSf]#>6֦SB-mLUgݞ_9<i;kY2 6 8EБ ßQÎpg[Q7ahamzLdy#3FZG.H뤓7qeԘM.&jjڻz:Kuksw?BJ +#FfP"RSvwNY*ZPͦ ozfnQݡm]NR#VKVs2v&_w- {ӀU^jJue=P3kj!Ҵ8.:VxbYuBF%3P|D@fLTdb́ 82H>3`~ՠdJ@ܤ[Hw3?!;}`bqֺmPZUl 7pWSmyIQA~AQie}[٦D1< ; g;, !na خrˌHd2'Ή%YG }e@_b=fњ @gk}MeEyEUmlW] 22z;F +^o \XY[[i,-**M [,|%Et_1OVgG;bnFjÑB`,{B2;PWSSgn&Xs5k՚I$؍D+}MMEeu]KkՍƿ&9Р<*lluvl@m[DJ"I6b;@; #44DȘ6QdHfϐ*wd +M~z~zBL?<5s{$3M*sIIނj=qc`oken|NsǺ5[쑭 + GX aQǾ<% m~D ?78:9fnxw2T$2u/<6v/ɵ1=jh;{f6ca$TWyO(@}CDu9x43ЂgŸW5O/> #OhoBh k,P!2'nӏ$.>Af& #:"`/Bc|i%pgcy~zrltz_!mBNglqhocynbo`dR_=`f‚M`N!%Ndy[k3cؙX.e2_1C=?cvzjrzf*iHDasְd @lLzSНݽSs8 +2n!c<܂Mpc{Q]fEDHH9EQţ>ד6*s=xvWyVN<;9>NN/nSVyvdzfqC_Qc3ݽcpqEӥ&X}&vE`x'19!C=8@O3m qj2ׄωceIguת_f2YV !@oî$>?#sq< "YD ThqЌ z(dw{k=& c&)GT/j?ijkd6pcnPN2:S6WOx_ 6m[M$.?>Vhq|TU-}zGAOt^,X[+kIᗰޙ| 8, Cu3lcv6)LSLhB nweNaN_i39\0ab ;d~}y]# =YKXaō~NyWٷD@}P֙ e #YZwLKI1e"}%J\|$xsirli OLRz3+w&z9b#q`5֦w%5º 9z_Xv%ܣTYT +[^Zճ=ON7G:kCf6W4u,o]GZSvg N^c<-3nb{AzVw.lccv9+d6AF0bS9>:eI}e WzuLra9&M7Wh4.\8g\;ZC*//6\vC:nyT,66ĄcGUy\3}p.z"'".-5H 0|=h'.1N3Ssz[ d_&BCA.mw LUcA]h>h{j;G| xC+[;[ks]ڌ4Œ1S;}FǪ]J+ P3:M +:w6 +m-As4XΌ~=aŇ (=ӼiI!gnJqHz1eOqXIT-L\2CJt'wtj~ymc "F6! kV>ț/ɉbKCؼ`P}MKЙ.lMtϜ#\<𵞤FmH$>Oh 𪊓㣣}^hڎ +\twyyASG`Q!F3t(jf5"hɌ DZ~89kȆ`m*dh[QZ=4>mosy憆Ɩξщq#5>xpB#YazYK4QQlcpo[}y~ۆ:6yȨh-;zEss3#Uv*.M6VkJTf-h\w.K;[[V B%ⰹ3 *zh;hP큮ڒt +ԧPd90:1>:M??+~<}cCeH ٟP"@s-?ǠHo$a^Ġy!I ܢf2biYzb8HtX,ili'uPUQMpd簮>/,HO[CeQי 4i-:/oh.͠V&JÕ[R?2>e*Wa͵eYS1[UT>%+&538*QrzbuEiIIYe]S[gWwW{smy~ރa!>> +=Aӝ7mO ͣb#iڔ*hhhgP66+#;kXAfDaL걏FfBnnqe 6$ #[wb 0-ѫ^{鑺d8?[ +K+kjkʊ!Ӷ𞚑[T4(Zi,m!]M3G5ezaoJB1j|-,R=@7IJ+@FkA _O .NR`ca|8d~BHpA ֖榆:LOu9SzsVۑŭXJUm}cSKsKScAPHzzP2 vg7JJJ 3R 1SkoL-%$+j閖z(O/NE̓#]D +F%e赴02j<5fgx6KPXtN *H`:̠Ɔ:.8 hSB2sJŽE&JaVSbfstOnEzI~澤?RPdNhs'A' +MtJ\|$ [N _70qP`I3rԨ%,$c/򿄽>Oj-^ SakԽ>_zǝbҺRǖ;Y%9{^УOzy=56!ɞty4Q",W.,qM5LhNzPn=L%cgu Ye,%Fn&nvEnMGJ}|d }ŹY43qV!١p8N%Ӽ*t@OxE`2&.>fmIpØ(.l0ѱthf/#< ԞDpW>ʰ,i.!H9Iw`#&>L;m q$}H* +#mu>y5ps1 ':6>1[U +"X zi.mq4MJcpO/5\ħ5C^6gfۀ\ +߿=if,wbObhu$ә`'LhL&6!)iV"bg{RҖD+L!Å'bY|8QL42=_5X@ lI& 7w)&ӣ0ȴX U{"U`A%Lぶ)@?i:"rWB ts~0WD1D2mQ,l^~~Rd=,82]c6caV||D2oPp \Z`V,Wi E\JGWsO ft?OxF2E5(6&&:BL&,͊82(KUcj(or э-|1gtEgS'.gQR|%MSLrtE/trML!""RO{ִi"9S)1fʩZŕ (dQ)?R.A2rnX;龹ӿEL72%E,Q?] UWQVTBہP 7EqZOSDpJ Ϸ1~F͆o$| +?I^G!3eߚ]鿔φ(jN2bj+S\ }DJGɔ=*z.8.9R!5qPR:TcqϛU!?#үR%c5E-=)i@|1g"UΏHx߿E ,%-CWw8ީu!s_z_rJn ]bzMW?R/|"A*6OO%J@mќ38Bn$I˟^ӯG4" hTV ?N + ߱1 ~Γ4/)My/Gf +~BO Ll";1mw'h7x_p"SJq}_Cc?o~AD>~ԖnfI$B]q>[Ok + :$zojy@hwun`yHbբkq[ 3L7Db/<=P%!l%%9'InCKWc߿}f^G, N +`km~bN/[0EƯL8'QCzS,W[?W b0["r!H|B!mV,O҇zSCy5â0[Ve4@~ BVLJ󓣃m,bch#;0~e9{̓sʩihϏwחvހGHABnyq~ +*7W8벑F-yGƯMʩ929xDR;ã o,'puuyyOOOv6֖f&GJ|f_>V%$ ߿j?:>9%|C|<bwg{K,/L t͹y>=Z?sA a&[6ۺHp{uavjbbbjvnaiyuu}}sl80?;=5162XWYR'w@Ry&>{c}=]]=C#cS3ss Ylomj*/.iV]b-H/H( [ +?@@`s~o``phxhhhoU%EYVPoA04bt7Ry +I5dƭ0PYZXPXT\Z^QUSSW񧩩Lss2ۙl0,O w{D4S'a ɾʢ\_7=#3;'7!ҽ EEyy9YYnv8lB[B1<;2.2h:&p&?2zrGNx<ތ ϗwϗy4L1[j]C#ƮGl-"4@Ɨކdxd$%řb~`aw{i=:Phk;.nDuUǮ^N5`}'h 4mzB#&V7=ă~&ZR""lGTXxߐ>v#4<\n/f(nnynz|8@DK;Ntg#4f.gГͽC.:uX$8 w=HԣϏ?65)[zy*.Wo>AJHcs(֣WW qBDcܣ$n8o}L̍y!X"͖2MaUWXx&s\Iq{BdrDXQZ`hP;}IqHNM{.ZsSSi|g#IeKiq ՕFpxw~81^_^=))1Id+tR~)գGߝ>~ +sxr˛&/Hl =ZKon w +R<^⡙YyzLPiiIQ^fZqniFhT|7ory6}];ݭ 5eEH g+#V@8+'nh~_OU-@3s7wxosynbںzҮ v6Us5ϷT  )DB??^m,LOa]wfƭGbeߞah|U} 'hW 4<;:\]Zפw/,.mlln-NuTMO|-ԈzG؜rs/E``w{sc}}U[WV76wv6{`wmO IX=:kxfyԼ†9;;6}58;$&PxGߟH zƤyw̵y)|[ЋIno./u ]-gwww7'+2MޑO ?4R%5-zHt׆}8 ϟ??{<@{Ѯ|]3BwfT4t ϭl굹x#_~E߆,^_ V #]=-5C+z9@ra"gB/*;9^+$?TC CILFl׵ M.od} HB9\EeS] 3qq 4*kYЛO2+ac<;=>X]oo(&'G?1/19Eu͝}k{zӝS}q~~mow"M%zܒ CdSm]}CSsz۶Y0i)qpWkcui~G C#E!a1InoV^qyMCkG,Ps}}sc3p`oGKCMyq~e] }JWZB>sȐT_,}#1<$@܈%<YeMwڻzzD=E荈iwKȍP.sY9z7\Yeِ!(/mY>oq=O- +8bwz3|YٹFxwq;SzQ=2G*7jk+JzGg:(Nl՛"ts\|BRf!͖d +RGqV""*L !>, +|-Bt}i + +*u>w@dHND0;BY +endstream +endobj + +8 0 obj + 25939 +endobj + +9 0 obj + << /Type /XObject + /Subtype /Image + /BitsPerComponent 8 + /Length 10 0 R + /Height 148 + /SMask 7 0 R + /Width 538 + /ColorSpace /DeviceRGB + /Filter [ /FlateDecode ] + >> +stream +xK-IrfiCGHӸ=69Df [4uFWQQQ1}{8~G{v5wt!bč?O 7|=7[a1b.Vu]cA q,q, b4k K8&78V8'ψc=oVp+8?nɆznJ%bW\`uWþ}h߳Ho]3\PILmNjfk8=tM7Z(xutPWյ~.)xخl K֟.ǐc{֫v{?wM81젉ɂ4{cwA +8JA7sН|ͯZwJop [4^/nB7ixm:zA#bC#b~61Td O#}ͦ#[*"C|"`X* a֟S@NE" +K޹}q7E87m¹r{;xu@q~WE79` e#)YM1oG*h7)EڰZ?o~-yIopv=1J4c}Mڠo~n8WoV/X^ggİ7?3[s :>+ϊEMyu}jiX4KzHvЁ?u_q-FZ:/DX;F9}rfdy읿$Պ66MjfFX$k"]Ldͻsey;}S?k{qU™;aqX"ki}fu#(lm<(ckRo~z[yڲ]%7u`1½]dSlpE =^8+fxka+a]6z'?H @ t,H#vrfMtq)[l;䰶͟[qf6ћ +<4/şP{_ 7Ek vDNh~gZy_k|Jlk#9 ``wƓɂ np, >^ +me,\>(,=9m7M9^9YMlD69}h|/Efѝꖱ B!{Gf?/v8ןJ4w]4[tEE" F$O-`o Dq!p!9a\~2i–uΡp\ +oJ"!o~͍qGUښuxf_rςq>%2DdV6FA ,F<] qOO4,,HX%MX4AVRC?#:B6_pqڲ9l~"5nl_"?~H(-4Ʋk pn.4zs&8^F򲃕ၽ=y4j45zUuEƹ^04? 0:j; +@wGym%?k.k6aݙ|R;h>o yzbXXC|A!\8枋c؏d_I]/j,αEKBpdkq”ThA 0)A\ۉg~;+cpAnky6K'\ٟGY uaesq-$ȼccʀ8<bxmv=1,j#Ƶ8V1XS6hZji!qp4@ZId4}l: 9хc{ªP +V64?V soRm؏׎#Y )uxsk ;oXOƿ . .6ԎG[cB* THxRczv6xg׬U&`YN)Q 0]!ʀ$pf),k?x8Ry4MS0)eڞHaFƱ0+  ueCX;#XsӳPUP! Ű @ Q AX"kq}<NJwXHȪmlz8%X.=!9kX7r + MC* ~ +4=^<;Ǩ6ŒHC<2."`ȱ{ϔJZ&2j5~$X%,mȀ볣xZ7G}y%]3{nzqlFnM ;1H k jCc1ߩ౳Sb&]( ̒FB hvyzD]%L7EӁ_B$щlH!Ġ ",bD5wOVa`ZuH6Pǂ[{hs=e +:13( T!?í'ƟȂ@" ? offM  vx@,Ň]д#ŻibΞrtDDO`[sg7 p=u2]+]T kh">sDD[7oF/VWć ? lH;xvV3o~|PWkth;HE0[bnza^Uv<ǧ(Gn͝+Br v9y[u)*ؠ4`ߢ+h$XHdwLj GGPm;!;z +ۉASV*iv5{hqcclDՉ,ٝݓb3Cv젃j©ky'cIA+ p$ؠFňA3LuP1xyX60E [sk8kbLXːU`Ƃ9 CM&;L0Z#v#\mX|_ݭw<*(gɂ]c#p @ yVRD ⺮c{`C !&X$XX @ {sClw{ g6l @ Hgc44vYb/+Gk,٠h  @] Bp;hFMΛH5i1F 7h ,0]a4a7"-La.a]C_ fW &rf#4Q4XoZAS7Hg`wAN#BAD4vq#X7r +6vAȹ#\[ɩ&hT78C$Ћ xkAX5%CB]eѨAAsHgA a`1i$>`,Mѓ_ <;#-N 4oɪ Bs4G IX7r ndAQ!jB(R+L3_I}||XyGPbD72:.f9x}M|J0_R`(gt;yX@"a `"h$_d7 bЌ6"Jfi 4'p;w8֛t㜃'UpJ-F&%,I"ȦW;< RTYY&57ӱHsЕ<өT*!İ!hJŖANRᜀ3Cb! opB)d2Čf/@! MqHk-O{c[b`c7Y$؟m<'w)&@Ð2@$c5q]ױ 9TCI$ HEk t=." Ñ``@j@SZ(Ǭlgʳ FL}ЅڼeugQrcQ6ve/ykNۃf Hɡ+[cc2*!Y$tH2Yܾ}l2jJS@Fa^Xj +HHHCM$eE7JS{c<8^:Z,a%DSf]ff]Qʍu] +~&j}xz0PH\kg-҄HXȳbƿ  @DFEb b#fwC oD6zI&rA?u 8O_u0/ @Hk""7?yqC nR{R52>(+ˁ<`Ԅx ~0kV<2\A~bԦH0FY|z9f4|W.?Y]!RUy  <2B j7r* `Rʙ5K .,l6 M쩌 Fb HQ78uXX4V* C3L"KF9!S<17 Hv*wZ׬Z?,Y4! H{cd}ιҲr *c! A#t#bo"1v53t!xF<."h$X,vCv' @̌Jdk,'< фy%! 'L4p^(މ厳?Q$d+Fd]Ps06hͬ2Gf=5{tOGi GoޠA%\V}r2X2nly"m%JBηE;,IAI]"{"' ]Cuq^ ՄY EfM͢f@ SKbj?Xks`Rc^i, F;E6*.f^V [|cZrgD3 kd5-GP0y`A wxvxɓ ݂xK]H `w ' 0-z,h _hr@_ lseqYwK:!NєJBii,X]He`_UbPYH I!)zj;z_xU!,}M 3s]|Xv±~RYVrEc_xR)bH ž[`#s׃KYf,~=i]!R4Y_@VF(Uv1t1jAS{IDzhf-]ˆIk Pu*޼fFZyAO2] aƆC:ղI oH^D ,Z=;S^t4f';<1g 03 $04F ͂čE`;lE M ~Au?A !1/=aHCS{MޱpCI+FpА Bre[s X88ן b +6D/dt` v-Z^0+y¿cMBf[V/DZHqe44rF,0H5e!b V? S녧VFeKV[s\u?):$Y݂B,Q'z_0.ɁiTej% 9D!RQjⲙ5$rBb?Co;!vxMO?"4c1 5~-foՉ[tE46=bm& yX0y5qO-B^aOeVSC3)!!+355"%_#F˥ ˂0)*m"+$ +QO!t֜s4a,F7W sІE/l{w?C$`j򀐖xehl_NU?'$9 &&ؠop1Nb'1͛"FMEMf?C/&;v9* "VT9aHM ~H(X}a=v]ױ& c! 2CfNO e-U%,il +"i] Dz(ӨW0n cY3S{sUc=%%4/] RΧMbPf]& ",?Q^1!7/#3\YMjg^ +E_0Ih}Mg`Q-OiSyPN.j 8rB[Z-@` `A &p4c_ 7~F,gXæ6J8i9QQu\X +\_VuM4JXf,OHu6Jy_tُFQ` dٞk0dTt\B^Dt? -, +w?o$1)](=5mvBSw +tкBxΝs1x?GѫޛI9iSd!ukrIA56 N/ & "<$jげy],FȟXk`&pL;&vDЄMa;`riO 1 y0@9m$ Y ,ޤa^C t4Zk +:oo] a`CB~HB% c%lf1W0X$!LTr"z)(py@Zx%Y +S~\u0ks_HMWنK2 }PjmEК[1~1hAb"`E4zgyәUSJF^V!*4\Sͬc&cc`C) :x)4 9 ~)(ceyI(FI y`F ň콻IHOCM6ugWCͶvNh7k%$3'!2 @j0VU-a5aBb-?h*_ cCA;xS`䄴jP ٠+hX DNMwA l"eCXi ų<<̓V3klvbPm!-*+) C aP  [ځdarD`Cf†;kǻn"iuAQDz%).A^=i>d"XCcYIXA0#@ ` 1V厙b&dDc+9++;QYL6bHАͲ[pgkٶ꯫c` * BSĠ!$F'BX5f>D6pABkv-!ě +) /+~)Nȏ5u/B|%tPEE :hfoudF"7?b欙SHA4A؂ω G8 ^[F@;^0 +feEI<$T7y|JXׇʏ7$H8!XEHP*Fp BB0;ДE=`ԃI A]4'x@ɂIX +Z yfV`5`odŰ0 d&IB&N@QB)8a ؁4CX@"ne$!vxa"9kL([ּ b.aa`Qs5-0/O^ά}dSZhT=hy vx@@ňDБfA [$ϸ~-F$X[ >#GeS 1vG N q#-:G72ȁؠy5 +& c#"11y MVAp*$O5O z CdÈN1;yIeJ,[y];5V5) +gh o,fbbDߨ(d;hgщ,xK4{#gvn"]q#m;=u֜N)m$_P@  >leTCi:<6*4HH&n"  zۆ wT0bςxАf;,Doщ,xKcMHFx;;ǻyNW͞@@rHd`  n]&;uf{˝/|Yy 60[,v,|&v @P5|M*R z}g#<,ɲ%?XX 2wf^ˑO 00223\#jpK{d G9[I*M#L|`͡f +CM F>tne%;kCT?룿1``ӝ"鎈әTܚSZ>G>=,AÀ<8xnz5FXϿj,t3&$5x<*0ӀtL5hfם0`vP0`vDvSFf` 0xh܋kaG9F>4̡1?`U3TRq<2) ':]ܕM|Ԋ>_ַ4F``IAFa +nU|\8s + P1/k9ӝ0O0(.+>eZ7Wgr. A 0C4 0-COrk.IYad(7 +"O!M)ܔ. 6J81NƧ`DY0{dY΅2Sd<"5 A4x0Ȥ̧&0&2V>)nMؗnߵ>&j`NA#E& Y`:|Ajvr *҇u9S0L>vN8IJLxf +O=aq4Y>>ө>!B幵ΖTt(\ 2Xޓ4M0` `"a<9&4#1~7<<}q(gZQC)NCA$n``dF*ys钞c A=[=0Ԕ Bcib hd,> AO +6zR>fYy}ݵ:X%SK d(2ncƷ\u]obq}.$L1Úh)c x݂#AHŖEU625KtC$24x0Ѝ 5 5̥ԗL$1hRlH*7M!BwVɢaLY@n24?4N])O3u"OM0yP0<(2L~45k&0` +wAωGw|= k"&UNo &4M# 5S0xqUzA0P\9)A$r gov +Gw$'? +|:h(̧J +2~1Ww)Nd3lf +&4pGJ :|JSthg¤A vR 14!==?0`f1/%ʰc. +M0` D#0a4x @9Ͼ#IFkpˡYu-c4(|(wi<<ȏ<41fxD4wD0&acv +Ȍw:D1yw +tЄ;#*%W)wh`=Gw>&aF3tA dsOd<{>G2뵲"N +P %C?e1pVuzp}?2@s׏)7@nK<>L}+е\3쮉jc!B0GM&-,]k+aCM}uaC15)4RA"CC3  +]4JzQњ[[[;]F3 4e,G` Aƍ͠}xHx:'&ŘpN! 03ԍFGTaٓQx|p|ҲuJi2L4 <r-;YII[>A eخeR0Q0 qjfDEC}Ph + +ƅ!dΠ-2=H.n`Ew%lh^^(sEPi@tpHz:EXVK*A3t;K01 .1`&1H3h-ZSCtG^? ʀ Du5q+됧NJGιfa@#"2+ҟˡҦ;rS`YSA3v&d `|&4OGf:7-oX`PfzHze=.z1郂Tix\gϞ&5=3TgSOWϭʓH3ч,mR)7:t44\#F멖f5a=_Tz\`K)w mu׬P.0p!dJ%e,/`݌Cp[g Ky% j:4,؊1a2/8Æ&+6:Z_Zk<]`!Cș3h:D~hV֌!swj&+,=frQ&z;Bõ[mz64CH==ú4;څIJJj]"IG& ~7~Ќ<1Gb3U9&aM4AF;ơz钡<:Zq^`RŹF04 AЇ:gAbU?ͥij0ߠ>a\85K"4xC56ڧ[/}0P5xA7;cf20Ks!, 'pW= ccRuH,MH>fq-s b(^)F聩`~ɀ)JwL#"CѪ=nGω;(9VI-8=f A9P8SsZG=T=TSP As؛I)Fn+`d"aa:NsER2r4K*>;'-fFD0tt&`9 +f"C CI01ȧwb̎`5G̠1h+^{Ad4 &?$`~":7zBD|YS  :Ch@Mxl!"[MZND01g(ZI6)2⵨Szע tԅމAO_k チ7;d/@ %5*}TB |j|O;'I 0CtȰ7tjֶ?_z+߳z]kݾpB`>֟R}^34i#Z%P^(݀  44{-Y3 ht^wG`qJLp 5:N4ﵞ ׏_kL j?h)(kf + TBA:LjȘH1;P0`0f(~C`O18ӪJ|%߆y^]1N|M0?f}yrO߃?hj6g7Q=OJ"0)s40ߠ1C|&24C`%aIam˯{qmxW?3tHbe&[/|(`Q0x#SBL`O)> fScaJEb|YzSnB?QhE% 0`"OD>&xdFMd(9|LwD|} D0`aV{~ybr]p8~M(no=Uj#2tGvi2`A&ᇚ4wL$"C &D Lq1Sbx8wl%/[O% "4x0L| v1mfiZFJڣ[^?Q?n9BfM@ePI + "Ȥ蠉1 4ǼPiȧbaa%PJ赾jᏁ}&P'c_>h{|Q`|&Efסf̮;+xg o%W~ص}5k~8Uo7a@ +#T?_9 +f؛`؛<ƀy0x"CA +f+ಕ0ýp8Hx7~tT1TG4vGAGw1:< +L~8 jY6&Qo%Ԫ[ɽ8$T6%.dhpP?5 ERdR0`b||<dQ3]>#. }Ps4p8+kKPJFMi{̧CM + 2tCd؛@Ȥii zGo%6np8TBaT!JUWL +fI4a||ͤ:LtAO$/w^Iv?0J/*W}7WrS@cipi$)2cg),}oZp8Tt|S!<2t݄!H(  P04#OM=Ԥ-06[1Kga0$ٝIϵ_Pc&`j` f* "MdA31}`5l"~,Gzý/=]ً<S:DGưp{Www?Ԥ}G^@&ba?ϾԲx_,p8jO'B +~.f؛<0L1&LK7iu;x0`ٙȘh4cPĘPshZ?A4m"~d-j}߯ӉmRdAs;m%M+&U}}$2av +z>p(3<΅ 755}5ĂBMr-ziH_Pm|/2xE^WC<F> } )p/F]]CKOFPX]Vchp8﨟 +ؽ,n"d8f1lt0{Iʻx ;;iRpJ'¡x2<~ bAv8TU<#7y004a Bg*Ф2R}Vc,p8|*G~6h8( Mo@X3 ^" ^ˤ<V>x}p}k3Z| ?ߊJ|{MCWF"݄&As4>Pqڮkq"#DC\z%I t}p8 ^O}Ag*꿍 4)2 &}j0~A6~F꺮תx=a^A0"סku-^뺨ь  lnr8?%: 'q:ګᨍ 1ȏ`0>5ˆb3j;/(@aנpww?-:̞Җd5oY-U[*4PE /|i;Ϧ .eIW@2CP  +&x0L| G94GBЁA`j eҰ?@ rP|RUɰ ;{3S$~}'bqg:Xz8A%Z9(.aFGx6DC]ã 3m;}˰(6?"a?xbCn1-` ̧̡1GG)a؛|\~:q.\"p8BꗵAjɃ*@1)LOnnB&nr8j)7+/~ڞФPCA>؃ L#y?w/ïJ6m(~Tg0PSd(f1#퉚e7app8~=W^_~k{ކɚ3260`>C ]1 A|WAQ {CE_~_W)PWCD~̎J(DpOzעzu]k'KJc^RDC~b34x0w&€ 9@$$$̻_s1pbCske} +)JBͨ۱{}ŻDy`I#Ofb❋c.p8?ҷ^､}eOGu2 #<(NMd]$$Vҫu]MS^RS) +8(ã v>m: <"ST%,2:6p8~CB}]%*6n{ +sӊ⫭^I|ދFy8߀j}߯cZګ +SVƩ[x0x8i|0kGDoR>o^p8c, ' +;Txu">75B7 l"mg.AV<(y0p ÆBUiۊ=EݶVl+LxSP|^]``w  +42l"~1̦fIȵ~mkMO mrETa/m + +;"pA ;_3D^ȇp8^׏ۊ +ǿ.o41h"CuΥv:;Ț^;{)(bPCg E,^k(fav0p3Qq}{` +\,{CŒp8`z0qo{."e{Epf:1p z +endstream +endobj + +10 0 obj + 32389 +endobj + +11 0 obj + << /ExtGState << /E1 << /SMask << /Type /Mask + /G 1 0 R + /S /Alpha + >> + /Type /ExtGState + >> >> + /XObject << /X2 5 0 R + /X1 9 0 R + >> + >> +endobj + +12 0 obj + << /Length 13 0 R >> +stream +/DeviceRGB CS +/DeviceRGB cs +q +269.000000 0.000000 -0.000000 74.234528 0.000000 0.000000 cm +/X1 Do +Q +q +/E1 gs +/X2 Do +Q + +endstream +endobj + +13 0 obj + 118 +endobj + +14 0 obj + << /Annots [] + /Type /Page + /MediaBox [ 0.000000 0.000000 269.000000 75.000000 ] + /Resources 11 0 R + /Contents 12 0 R + /Parent 15 0 R + >> +endobj + +15 0 obj + << /Kids [ 14 0 R ] + /Count 1 + /Type /Pages + >> +endobj + +16 0 obj + << /Pages 15 0 R + /Type /Catalog + >> +endobj + +xref +0 17 +0000000000 65535 f +0000000010 00000 n +0000000493 00000 n +0000000515 00000 n +0000001038 00000 n +0000001060 00000 n +0000012016 00000 n +0000012039 00000 n +0000038194 00000 n +0000038218 00000 n +0000070841 00000 n +0000070866 00000 n +0000071206 00000 n +0000071382 00000 n +0000071405 00000 n +0000071583 00000 n +0000071659 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 16 0 R + /Size 17 +>> +startxref +71720 +%%EOF \ No newline at end of file diff --git a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.imageset/logotypeFull1.pdf b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.imageset/logotypeFull1.pdf deleted file mode 100644 index 1420a5d7f..000000000 --- a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.imageset/logotypeFull1.pdf +++ /dev/null @@ -1,513 +0,0 @@ -%PDF-1.7 - -1 0 obj - << /BBox [ 0.000000 0.000000 261.000000 67.000000 ] - /Resources << >> - /Subtype /Form - /Length 2 0 R - /Group << /Type /Group - /S /Transparency - >> - /Type /XObject - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 2.000000 2.000000 cm -0.000000 0.000000 0.000000 scn -0.000000 63.000000 m -257.000000 63.000000 l -257.000000 0.000000 l -0.000000 0.000000 l -0.000000 63.000000 l -h -f -n -Q - -endstream -endobj - -2 0 obj - 234 -endobj - -3 0 obj - << /BBox [ 0.000000 0.000000 261.000000 67.000000 ] - /Resources << >> - /Subtype /Form - /Length 4 0 R - /Group << /Type /Group - /S /Transparency - >> - /Type /XObject - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 2.000000 1.844727 cm -0.168627 0.564706 0.850980 scn -57.842663 25.387310 m -56.973518 20.943096 50.061783 16.079765 42.122841 15.137188 c -37.982918 14.645527 33.907391 14.194614 29.561213 14.392532 c -22.453136 14.716278 16.844669 16.079762 16.844669 16.079762 c -16.844669 15.391525 16.887453 14.736427 16.972567 14.123863 c -17.896652 7.149250 23.928431 6.731026 29.641823 6.536243 c -35.408352 6.340115 40.542614 7.950329 40.542614 7.950329 c -40.779942 2.765934 l -40.779942 2.765934 36.746300 0.612568 29.561213 0.216728 c -25.598721 0.000004 20.679268 0.315689 14.948763 1.823364 c -2.521337 5.094391 0.384049 18.266270 0.057106 31.631596 c --0.042868 35.599815 0.018828 39.341911 0.018828 42.470993 c -0.018828 56.138123 9.024163 60.143955 9.024163 60.143955 c -13.564885 62.217625 21.356571 63.089451 29.456736 63.155273 c -29.655783 63.155273 l -37.755947 63.089451 45.552582 62.217625 50.093304 60.143955 c -50.093304 60.143955 59.098644 56.138123 59.098644 42.470993 c -59.098644 42.470993 59.211227 32.387894 57.842663 25.387310 c -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 14.485992 26.452484 cm -0.996078 1.000000 0.996078 scn -0.000000 21.175804 m -0.000000 23.165289 1.622104 24.777744 3.622489 24.777744 c -5.623325 24.777744 7.244979 23.165289 7.244979 21.175804 c -7.244979 19.186768 5.623325 17.573866 3.622489 17.573866 c -1.622104 17.573866 0.000000 19.186768 0.000000 21.175804 c -h -51.953178 16.803417 m -51.953178 0.255280 l -45.359833 0.255280 l -45.359833 16.317129 l -45.359833 19.703238 43.926872 21.421368 41.060944 21.421368 c -37.892841 21.421368 36.304512 19.382627 36.304512 15.351715 c -36.304512 6.560461 l -29.749895 6.560461 l -29.749895 15.351715 l -29.749895 19.382627 28.161566 21.421368 24.993464 21.421368 c -22.127537 21.421368 20.694574 19.703238 20.694574 16.317129 c -20.694574 0.255280 l -14.101229 0.255280 l -14.101229 16.803417 l -14.101229 20.185495 14.967223 22.873068 16.706865 24.861656 c -18.500998 26.849798 20.850389 27.868944 23.766304 27.868944 c -27.140659 27.868944 29.695858 26.579786 31.384611 24.000576 c -33.027431 21.262854 l -34.669796 24.000576 l -36.359001 26.579786 38.913750 27.868944 42.288555 27.868944 c -45.204472 27.868944 47.553417 26.849798 49.347549 24.861656 c -51.087193 22.873068 51.953178 20.185495 51.953178 16.803417 c -51.953178 16.803417 l -h -74.667320 8.577215 m -76.027779 10.006529 76.683022 11.806602 76.683022 13.977438 c -76.683022 16.148273 76.027779 17.948345 74.667320 19.324818 c -73.357300 20.754578 71.693764 21.442368 69.678070 21.442368 c -67.661919 21.442368 65.998833 20.754578 64.688812 19.324818 c -63.378338 17.948345 62.723106 16.148273 62.723106 13.977438 c -62.723106 11.806602 63.378338 10.006529 64.688812 8.577215 c -65.998833 7.200743 67.661919 6.512505 69.678070 6.512505 c -71.693764 6.512505 73.357300 7.200743 74.667320 8.577215 c -h -76.683022 27.213799 m -83.184502 27.213799 l -83.184502 0.741074 l -76.683022 0.741074 l -76.683022 3.865234 l -74.717758 1.270798 71.995941 0.000000 68.468475 0.000000 c -65.091866 0.000000 62.219185 1.323635 59.799988 4.024193 c -57.431683 6.724304 56.222076 10.059816 56.222076 13.977438 c -56.222076 17.842222 57.431683 21.178179 59.799988 23.878288 c -62.219185 26.578400 65.091866 27.954872 68.468475 27.954872 c -71.995941 27.954872 74.717758 26.684074 76.683022 24.090088 c -76.683022 27.213799 l -76.683022 27.213799 l -h -105.058311 14.453876 m -106.973137 13.024565 107.931007 11.012690 107.880569 8.471540 c -107.880569 5.770981 106.922699 3.653431 104.957443 2.170834 c -102.991730 0.741074 100.623421 0.000000 97.750740 0.000000 c -92.559738 0.000000 89.031815 2.118000 87.166977 6.300707 c -92.811928 9.635767 l -93.567589 7.359705 95.230667 6.194584 97.750740 6.194584 c -100.068611 6.194584 101.228233 6.936104 101.228233 8.471540 c -101.228233 9.583378 99.716003 10.589090 96.642021 11.383003 c -95.482407 11.700928 94.524994 12.018402 93.769333 12.283487 c -92.711052 12.706638 91.804077 13.183523 91.047966 13.765636 c -89.183136 15.194948 88.225716 17.101593 88.225716 19.536619 c -88.225716 22.131054 89.132698 24.195765 90.947098 25.678362 c -92.811928 27.213799 95.079361 27.954872 97.801178 27.954872 c -102.135201 27.954872 105.310501 26.101961 107.376183 22.342852 c -101.833023 19.166304 l -101.026474 20.965929 99.666016 21.865967 97.801178 21.865967 c -95.835472 21.865967 94.878067 21.124891 94.878067 19.695580 c -94.878067 18.583744 96.389832 17.578032 99.464264 16.783670 c -101.833023 16.254395 103.697403 15.460037 105.058311 14.453876 c -105.058311 14.453876 l -h -125.722229 20.648455 m -120.027290 20.648455 l -120.027290 9.635767 l -120.027290 8.312132 120.531677 7.518219 121.489082 7.147905 c -122.194763 6.882818 123.605659 6.829983 125.722229 6.936106 c -125.722229 0.741074 l -121.338226 0.211800 118.162918 0.635399 116.298080 2.065159 c -114.433701 3.441635 113.526268 5.982782 113.526268 9.635767 c -113.526268 20.648455 l -109.141808 20.648455 l -109.141808 27.213799 l -113.526268 27.213799 l -113.526268 32.561180 l -120.027290 34.625893 l -120.027290 27.213799 l -125.722229 27.213799 l -125.722229 20.648455 l -125.722229 20.648455 l -h -146.436966 8.735956 m -147.747437 10.112877 148.402237 11.860113 148.402237 13.977663 c -148.402237 16.095211 147.747437 17.842445 146.436966 19.218920 c -145.126495 20.595840 143.513840 21.283630 141.548141 21.283630 c -139.582886 21.283630 137.970245 20.595840 136.659760 19.218920 c -135.399734 17.789608 134.744492 16.042374 134.744492 13.977663 c -134.744492 11.912504 135.399734 10.165268 136.659760 8.735956 c -137.970245 7.359482 139.582886 6.671242 141.548141 6.671242 c -143.513840 6.671242 145.126495 7.359482 146.436966 8.735956 c -146.436966 8.735956 l -h -132.073563 4.023972 m -129.503494 6.724081 128.243469 10.006754 128.243469 13.977663 c -128.243469 17.895733 129.503494 21.177954 132.073563 23.878063 c -134.643616 26.578175 137.818924 27.954649 141.548141 27.954649 c -145.277802 27.954649 148.452667 26.578175 151.023178 23.878063 c -153.593689 21.177954 154.903702 17.842447 154.903702 13.977663 c -154.903702 10.059591 153.593689 6.724081 151.023178 4.023972 c -148.452667 1.323414 145.328247 0.000225 141.548141 0.000225 c -137.768478 0.000225 134.643616 1.323414 132.073563 4.023972 c -h -176.626083 8.577215 m -177.936554 10.006529 178.591339 11.806602 178.591339 13.977438 c -178.591339 16.148273 177.936554 17.948345 176.626083 19.324818 c -175.316055 20.754578 173.652527 21.442368 171.636826 21.442368 c -169.620682 21.442368 167.957596 20.754578 166.597137 19.324818 c -165.287109 17.948345 164.631424 16.148273 164.631424 13.977438 c -164.631424 11.806602 165.287109 10.006529 166.597137 8.577215 c -167.957596 7.200743 169.671112 6.512505 171.636826 6.512505 c -173.652527 6.512505 175.316055 7.200743 176.626083 8.577215 c -h -178.591339 37.802887 m -185.092789 37.802887 l -185.092789 0.741074 l -178.591339 0.741074 l -178.591339 3.865234 l -176.676529 1.270798 173.954697 0.000000 170.427216 0.000000 c -167.050613 0.000000 164.127945 1.323635 161.708755 4.024193 c -159.339996 6.724304 158.130402 10.059816 158.130402 13.977438 c -158.130402 17.842222 159.339996 21.178179 161.708755 23.878288 c -164.127945 26.578400 167.050613 27.954872 170.427216 27.954872 c -173.954697 27.954872 176.676529 26.684074 178.591339 24.090088 c -178.591339 37.802887 l -178.591339 37.802887 l -h -207.924301 8.735956 m -209.234329 10.112877 209.889572 11.860113 209.889572 13.977663 c -209.889572 16.095211 209.234329 17.842445 207.924301 19.218920 c -206.613831 20.595840 205.001190 21.283630 203.035477 21.283630 c -201.070221 21.283630 199.457123 20.595840 198.147110 19.218920 c -196.886612 17.789608 196.231812 16.042374 196.231812 13.977663 c -196.231812 11.912504 196.886612 10.165268 198.147110 8.735956 c -199.457123 7.359482 201.070221 6.671242 203.035477 6.671242 c -205.001190 6.671242 206.613831 7.359482 207.924301 8.735956 c -207.924301 8.735956 l -h -193.560883 4.023972 m -190.990372 6.724081 189.730804 10.006754 189.730804 13.977663 c -189.730804 17.895733 190.990372 21.177954 193.560883 23.878063 c -196.131393 26.578175 199.306259 27.954649 203.035477 27.954649 c -206.765137 27.954649 209.940002 26.578175 212.510498 23.878063 c -215.081009 21.177954 216.391037 17.842447 216.391037 13.977663 c -216.391037 10.059591 215.081009 6.724081 212.510498 4.023972 c -209.940002 1.323414 206.815582 0.000225 203.035477 0.000225 c -199.255814 0.000225 196.131393 1.323414 193.560883 4.023972 c -h -244.513977 16.995380 m -244.513977 0.741432 l -238.012482 0.741432 l -238.012482 16.148182 l -238.012482 17.895418 237.559006 19.219053 236.652023 20.224766 c -235.795044 21.124802 234.585434 21.601686 233.023239 21.601686 c -229.343994 21.601686 227.479614 19.430855 227.479614 15.036346 c -227.479614 0.741432 l -220.978149 0.741432 l -220.978149 27.213709 l -227.479614 27.213709 l -227.479614 24.248959 l -229.041824 26.737270 231.511002 27.954782 234.988937 27.954782 c -237.760742 27.954782 240.028625 27.001907 241.792587 25.042873 c -243.606537 23.083838 244.513977 20.436565 244.513977 16.995380 c -f -n -Q - -endstream -endobj - -4 0 obj - 8970 -endobj - -5 0 obj - << /Filter [ /FlateDecode ] - /ColorSpace /DeviceGray - /Width 522 - /Length 6 0 R - /Height 134 - /BitsPerComponent 8 - /Subtype /Image - /Type /XObject - >> -stream -x_T6 1twH H-"ݭ}׽֞ <=\Zk{^9bX[, p>:T*700ɍMMMMLrL - !Q@eGjCϗHrSsKk;'W7wO/o___o/Ow77'G{[kKsSc#C}t*J$bXut Ḽlݽ:x̹/$'?w6))!.6:DhpLzHb}# k;KS}?D}O@Hx3ɗJ '7yQQqqIii벲WEE/?yqڥgc"Bz8Y1\R [ p6j @hpĩ3)d>*(*}˷Ɩή޾ޞ榆ߕ<κ{-l\d\OGgρ[ą[22z[AUK&7u JLEهo -=FF''g恅ŅŅٙ-5?.˺sL.Kykj}Vg?D:2c+g >U7u[XZY[R(m -xT(676Vf&dž:k*^?˹XvH !2p:U5TUzbD"tnuFAUK:T>RoܷCS [ۼ]qq@MH`&L%VۊwOIn2Փ[Yo-i677GM"8,[٠@Py]6Wd'w5FǺFv~AvRX5If֫Bic '09" iGĭw=Jj0j5\L!Yq@ W#TH \L+~|J?$#J ' T߿9{ ZM~< mnR /vj'73U>^d%)A$ׂN0mJFFDPsfjbd8XDpt,@=(ܕt@a7.>coEQ?YnN0\~ n\*p*4Pseٗb('~nW_mlmmkiz7KcsK7nݾ}֭1C3s N((ͳ˧Z`x;]S)mci֝[1Gm ԑ"X*r;v*-#׺֖O/ŇzIOjxaϵM-mBY\ Yy%iI4:p84cp\ZFAɧ,˧C0:,="^Is6A=|K]S P]^{l'Bkx}:ډZ #% F~bHWuÔO+4{N`wɛCS333SC?k=SeenǸkV;*=cIGmڪ_?zޘJ.H~XR^YU3\'z*)wbݵs`fTJ?7uLP3=-__L -q? F"3c 7vPUyt%#s6:HNA]D=?}q'GzZros1ۓ4-_{EG]zHwçwt5\A$ 8 NY2E <)l̂^ލ9P9o{Gg6h_Z~zk'5E0Xj^chCHHomY`'lz"ߵ]d@`_T U`'/?zS54s\_ZD[yolvTQЅD A<%f|W3<J]>6eU dhp㴄wkz6 -|e~N&sd"Gu@ЏtFe~{@`E 8 Qn ~>hc"]kS{׷hb`5V>O^\M/n^Z[][]]}=Rh4chJU% ζbm~ g]˩ܺ`}S8Cn#ʵޏY 2J-nb~ʼns49` i럘QR7:Ơܢ Uܾ{} "}@by*GHzkuaޙ JZ՚|Q - -2q# -ّuX~z9$J*3gMV6Ԁ.ha=H?)m0<8 tсw/^~>N6x!}hja-Vh -K7)ksuEu-DŲ8OI_kUwCU]Z >S]O@Fbcq2 WSJU]>AtUd͋W?ջo3Cs>u"iV"ߨю'ia x 1EtJXjk$( Y `h}~*ktÏMޖ&z G3D`<#'?>$XiAow6>7thWC] - -(׆@ B/,l(UyǏ/H /9%T9v@ |ǔ/}ӫ\haugkQnRJU_7 -b/24QW5³\3:#8P,<,G̼XYj)M|SJLB;fqZd/}u8bʞɆ Odp4\%SA)_s}c\wmReGr*f OJZ_Q6Xy+؊ǠcR;j HË`{K:Z8wIYeɋӚy``C[0f˞SM`rsl*dP,Ccs; 4 AgH# 6y,/ 5bS8% 噉yhTfrsi[sVd4fBIō PF4m\'tAN؀Na OTb ȃ.'$p96@eƗB 큲ʪ1O8 PYBcZ1xqCKDٸ @Jť`$@&'av" 8H6S-ٰ&1oy["GҸ̠̪gTL,ql/x븝) lCO@U"ƖP -:D 'd6? %l,MO.o@ ;ϊ>~ |t^Ojpߡ "Q, _ԌCw\P6!Яa~dE*̽"iH' 6ór{kKHO@ -HJ`%7ΰX[Y\XL\ څ1]kj7f@:.XpFAS -'\ $_/lB4%)#H\A*%P@ ScC/9"BPHrK\n soߚ:7AZ;$淖 :A3sPѰŒkF,%^y64ѕɩY,`bkb&*Q+})[&((oO ,K*AH JwW}LSVfEzV=sWct܁QYrNY`(lT?ZlUn\yPn -J 4K<;Hd'wsQZ\dxĩ䌢ogVg[p ghvMխV\[3OFXИKߛ*˞7`zՂ:jY7&rfU^o<7;'1:W?FIÅVSE'9rh&yl@bs$Fvm{ݛ'WS.\HcRFqs0C.)>uT&AG^UFqBpF -ؚi-L:Eg} ~Р7r5 Ҝ -$Rw?lP<>72IU@wφYXx\,zŷ1'9w/ ;}ރAqBҟmċ9F++*E:%߸ǵhIxRNG;|<'hZ<@ Nj| 7Ͽx*{o?~173.Ƴ uҐzَpwS->,7( g+z^59"t*9}@Z*@,ـnhY+ҎQEGS;fide>Lsq -sA#Abڅg~/ҏOzX"|sEq/cD#82TDŽ]O;cP#qB!L}yv31쨻]X3k;@]qN dKS&H7;lWSd0Pq/eV!?|_^+g0$yؚ MmCdmW@esb:%GKb/POWG+78VPݿB 9<(A>aW6S)$mdjr.6ɂEIW HL/ `)H#%nQwt:ܯo"eGDF;Lpx`E`R=r"̂U2 !uc#ez@zea^TDffB 9;dY5lNF 3 ;l.ąm(60Wl #:bs>vIPn}x`g>Sw_wLdͩf uF`p:/;8 oj-uҝYؠgeR r׸6lMIg'@j/>c _Na4=k~~J#x~mD9 KJ - itь̤`R"@9uE]+o/!+XYi&fݱg -C$'Cڅ: -~JQ@|{dfkhnH̴kh$S&?\bbyqQ+4&D=s=h2*b߻AN?t?copڜk_B+w\2.E%'Pct/ i3~ZIѷI|Xտ iGAhAǽ>q7ܞ "U岞y _ -Hj nrP7jDAm"`} `hᙢ$$Y g~:a8\p\P6 @N @k|r #䰳_]pQ'Kc}҂pvMD SCoW '[_Zvk8D2S ,S"嵑LHdS7!(G=N4%H1^0mgQ% =~Ib}Ej 6mᢆXBa] Îbe)Ր -[|^$r)_$JSC89jRսc^Nfr:J yF޲ޚO[֤F8hi#dڦ[ӭnrvDޔ\:]ܺ5d@e$`;\ PDҏ;pU )\܊ n(zs1єZ6kJF1w`+Kb#ϤgX-9casqs1G-OKJ(UIJ ;rg)Ÿ9 6pW5BVSk&BP<+ ҳ>vE$AYfF ?Sey=?r[<UAqm/t$%cTcMJ]/a6$iky~d̐ *F7 hq W~ QYJH.A[g,l~k^<ꇟ+<2j+Xi,a=n#لe|V08=?I3}9DdUsMFTt,XҔ1P4J@TwCmP܌GGF =*4d) QǨ4P? n/ ]FJj܄.*'"/VNKpňa߁Qzstf%vO4;1MA[#^!*2m549׳|P398fH-@ W+5~;UkDH$ t^#$1Va. -9,03W4dO.(Wb%lt5(72rtɬ2iMdk 78T ZAc% DG ؘlx\ؘ)`\, lfs.;!(@!&:Iѹ9%@ x  gɂ0:@8nJgL\UC=pB#]f(fJ@VN>%ig}wHdryZA[(W3=~ٷt\`2T}izoT!F {(8<:E(3X~XݠE$xCi`gQAȱٗo "6P5U*([4 B 4: -g15ӆ/,' 12bK R 0"=I%]a'G(AD|3t8t>)ohAEhe6W -BNPUbvSBv-Q&Zps`7x[ 4r1:5 :o(3)\#Xj2N-@p -@KtyagxU}^1b:ˮBJ#(+3܅ } c(?êy޷ .^<.7`fIim}{m$F9%OP 1DC.[݉L~ b"2y5%0~%(@ ;P۠L`J 7. nTkB8X,-(̎ h@@spΎb ֠Cb,rJ 9A3:t͜bR=}W;49BXCY#)E/&'2.xCfZ X0"2}9$74~`MpE t膒F6,8wyTj#0')PE< pW`La*FP8`[ hT@'0wl,V9qY8`ۡ8[j71'_f-J-"/(lZ\bJb移a‡EF ă -a Z)B^'V_P "7/oYWDɉ^-3䰍mAIKξ|\>,,+%/İ(bt@{(jl?!Y昢5Z3*,@\N^wߗa??^ v!aS#vx ґ=#W6}XTO+˚0:B -990HL5RVc2F Rˠ|/PB&f)8?Ay%}aEbCO ~ \NE&!tS~,SِC,t#i$FU 9"(3hmVyp@͞q"R='32KPxEtA:!'`'*4$yX"ڜKc{Cbb(Sk9*YT*FiPx%gڱ#O6',1D"2j -5 hAkV-,$Hdq$]a6 $]3*$DlPh >Q,$Ú'di=vQn_A <`1qhXt#3}'`= Z0 'luX W *jA$72518%,\'^N 'h ] wm@p;o߷KNo5\z¤cc[ 4KLДꦜj~zJ# ^1:<K&qO!qR,}GdzAJX`9 BSb ,xQp$g5:#Y؅*~*t3KQ¬ G -}A(m2ʕ8w][F(: EHbԚ;D:^v&`& Ll=Bg/U!e u= -k?0eTaG2p^2vI: :cksbYS2*B({']1"48x=X#qDCy_ ;N"W£aFGHzc6;M6\$FQ^@,cqjK&uBP=Π@1Ha  @@Ybrm\NFڛ"'AvHbTQDǜx#G_E17G;rJ0%Sk[~ݗ^cʏ23TkB䝷tz QE Ggw"JקJwS}+sOjG1@&a<2S}HA5$2Sw 0BAIÉN0V'T#e} [`0 -|\Π6 -  И` dT /;  'Z^^ s6UXg~Ċ%Zcd퇁5̝')!˪"Mȵ7I;ce@ g^vaQ^pГn oF)P~ᄭ%}ܑ}sZ&H;kVֳ*Zd!#hb6{ݍyBWؙ%lzH߆N=VYԺ*Ylz39F/^),2\,LDɁ+JdrM.v `F=q *IGX*2.pk2D,ё:$fbg@ ǀ/CJ"]3t}N - b-o[cC}}==$UO #e{{ur=:t/9,naǓq)Fr'O{XeÖcЙO;o p: Ų\h`n@uef~qK # 7#߲ Q PW D ha_CŠ51A`֤B0ГZO*# do "aHj|%9o.׿pÎ^01vHS AkdM_\8H/JeFo#^dQ]O_&}.іiJv ;[m^wvp󋼐yv|4@8~SŁw⏹SYXYRs+zfXYxŀ'HpDŗ!;S"(i+;YoF({^_ dI%%j3(D[5Dh# Gn ْ - PQUGb^ㄊ)7FZ>^K8o*@ Y>()eu܏y)k{Oj`).+KGhv@ktMuݼ{򄿓Xlx}xG:~ZBTXHHXT|ڽU]ߒp)WGjrNE^瞵R=Je?QT}5rP '2HgNGNx{bhͣ874]<rT PB2F9<\}3/;p!7'h&#JMP1pk %lCoFWn-Oս-#-99ꝜCs  - M -Umsk퍙^O9vxd܊^uvDѳGX,BbQ:{uX\V0삲$'G. -_}xzy([Ko 3o\rΣUmХP9XRCJH% ;y%Uk -3W$PhW* gh?hAx> `Mq j`a\1HȭY2(X_s7%e+:p'N'3>tNmo V=񠠬w1~w5@8®.Qc?Z}HJ9"?}_@mKmKm~#<__yY8 la8bge)+EY;Tea -"%xcDƧB{ZjYMlvg{u[͚[܃Ea>;ts9!iA7׷(lt+1'J B^^%Ҁ@ƫ٘7*mh?L1nte>NtT:x)DRSD!=@7h %UBc/0Y$/}^?Bndt`τ͹ˁر#@0 5 P2k#WD:75& d:wC,//Je!3( -}ΩE Gta7J&6HLo:PҪ²1% d%.hQ`T\ZO.<sbn ̀0 ZK/':G1%"!F#4^C?޵O=*BVnLv}J»WMKo$hyevblj%@NP7vc߶a< ~tQpD<~fWabӾS GA)nJW;X.@731F O`vym?-4m-i5ֈJf>Yc䈬@N7ZJp{>u 5^qe e;VZHjq#yWL(D_[K4qe1wZj*hی8ómF l -CWUH%` N>B*P -S aPӤ4(A#u7^VVQ}^6!o\LYIVMyZEC۠ Oz& R! 'JnE3b}o3ډ0:$z17}F䇁JK`e8=o"lE\}=V\ix~`CJn%8)ሎ]йw̓3mtQ@\ϮGkT!$5sx0A$1peUSγ?N&ѕ֎cN4AkhU\=06=7,M 6Uzv҇ -zSIk|q6'jZKLtl;29e4> RM4UgIZdyS__Wq;0O|QQW߀T>Ҩު\=-/0U - j[p[{a턟m555},*6VA$lZ泷:{z{{:?-H3LQgյ'x7 !{;[{`7 Zh@pܵGEť%%/ 3/jɕ#3sx7[34?=%:L e1s -aSn?@ҨyٷROEZ%/Ϡ'kttԉ w+m&Z{;%{̋VfdPA0ƛX4 - h DO)q'B,5X?,& gbNxؚHb}cK;GGG; /30q 8E!/^ptLX[iD7dmwںG%p19|R\TQW[3+@$-<O$Knk#X9$֪hhH䩤Ɉ\ҩУn ~gPfVYl>^.6Hc*ũo`hdllld$7<@xM]^|@/V 7rd.DG CYr'Y;S>,i3oXDGDH=dYV=Ͼܒڊtʠe<³j҄[rceZ%dRd8"TTXNj=0e/D"r-+7@Yw Db@s7i@MFmZ0 -&Qn)XMCгV}1s\ ٨\z$ ,3ӈAD럦!Hm/Ʃ[4qF\W,B7higgsiJQ0kGP gA7`b\jl]=u$fKph@K"@Ś?̠DgWw!^20/jb.P=ӎrsi"7%i! Л@M: EH[ `!*b+M =(ҧЦh<\ - RȠ%MVG:ވx?RPJ0A7` @;;۠WY珻9;ğs'ݒ ܎T<@Lpء&ώtה>LpH.yx>`m FfBknm) B`M09Q]s96pd!2t}$j@d/²iCx4 VkK E. -t{Uq}=?G襢m$ ~͍Օ兹Oŏo_p:Ep?z{y]eMc[щUz5p X[[]YZTSÛɧB},iC z:C+ -4؞Qs+rZs`hdtlbbrjzrbb|ltdh{og[s}uէ%n% q1LSEGK1Yr5?$"6)ʭ{ٹE%ߗW~ohllhRYmgy9w_JN >Hz͙C9ZP(?s+;'woQg/^q;~VǹdgϸsjsC+T!GߞG4̀(}M_rc3+[{'Wo_'#cbbcOF8|,T}fIG2L;Z Гr+7 @V66t<ё[[Y>=]:"yH@J[DQ0[8}PG/ӓtuu@φXv2#1;ON# Y_؞.I\!wI4^hp8"=_ 92J[R8,tL<E@\CBgrMp3(7g{ާt7;$ 1r{X=".n5v&KoG{X -W 0 -LRZ&װ݌B +c-e N2Z8<"H#5%C 1p {}DwV>䤝w132""U$P(@, Mm]]t!1x=>A -Yi<`fl$7407744곅O`XL\q=_&͍UXƦbcuӍCJC$5v -clq] 6(GRZ\Pl)Rloөw8quV!%!5HWZcjySGF"wo OռSK[$/qPqqf +7-)PKpҝg-?V60f47΀' [% ?Os`|viuC r@'pU`8=1[uC`js̍Gu}C +[L,Dk̐/ 秆zZ><d{x"WplozG&fTf -兙]U EzтOHws~Z}`xtbjfnnaqqq /s/%9[ZHGċ3|󩪺pݫ2^8fKG9D"T_nnv2|<+*~UC7/''Dzؚ(0LM,\< =x셋 ؏ ;hkalM߀X#302c]=<&||<ݜl,͌/ ~!D5]]kddlbjbbblldh'+8ALe> -stream -x͎FaLvmc -/۹\/EO)J,gY| -)"e_.,˲㏆~jO?Qm\.K]weYwrLJ~믿_W*zA4e_T˗W[*QE/jC'_Z:37re6? |SґW㊫7 2H4'iAz,|@O=˳p.EO8TrCSӇFk| -q^/˲ ۹z+_|_PbMA)jA5j`6cgNS˲e - 0h+B;d8X@Y5WOnOeY. - B\>wǑ.j9$Fc8x"㧉7Bg-5ay~7qwG;̕Beu(="Gk2U5 T7\T^VGa;/Ç@)GRAC!lGiDy7Gq_ }uykKoLypUiG+zT3ZS5_%{g_0P7d^k b}vx'G~q4"8h J&xl M{`yY],^³}ySċ %s,8:|H˻լ`Hڌ'ʹz,)=sn D|MM=P_zA;wө{<| L@B5 *Hgp6\'^k(75 !cgU:C TPEnF =ԓ@PvN{ƉM>3S -6W|_ky @ 6X5.U{0P5AH4ĎGSiQ867e -jPA'#3jcZuy巂j^kz g8p5=V%Da4'a6 9@vK~齩G$ǫXS^4@e9j@ź;|ʣ%T=4Ah줂 9$@=vs;W{pz;Gu|.J;p6'|Ȋٴ6&HPkN+ Vx=~p|47gso p"GkjY9ZM{@@]X -@ғ0U5[?/㧘o;O(8A4>&|au'Oq;OET9d 0[eV SI=D?'1jpU!m ~gêwr>nm9 D IyP#p^/[ BVú {f,ח}ƃٹl?< -``Y^}2׊1`bZcEl6[a1c{T|S:?%͋C^Ŝm6^A`ue_M|fqOa%$ GR *&\+=+ _ߠW/oͶ=PrQ+W>Vp@?}o`Bm 0γxSKj'Gl6<4*ٲO##̈́c4Aڬ9촊 M ' O& ꫯί= rapBrM :ڋǯV^ &fzmo>ʑgm`7*3l*ڦF{KZ^JT̙b @ςZOk䔖[KE -N T$ 9A4A5 až蘭zM=kR_97Uܼ_,w='mZVM<쁊oř-3` >;O]mϢņ}-SQ{mI9i_/WKZ_ߡgW3A! ^Kf/%j5^j=hiaj|6 ̈́N^cD\/jgg>oX*az?AXiYIR:x)P>dlR(~Zڀqoѽ =JC1wX+"`>}pk`S9+H]gў<xլcFk>I@jjAf֦u&1XP4 15j5n$[{3= 83{~u*[@+Yu7y Tucx{Pe۶ݜԵc<{2JU͍S] ->Ʒ=Td3^W=o7*\ -qN$3=^nd&LPmAlawlvx|U4 ah!B=n02!Af uL 0FdEzjjC'H9A{ӽ`b65y|o =㣵 B'veYfx 뽉gDu|WkfM0V VZ?MFl'տxzsg3nϑŃffrB66v1 T6?Q]=X*s OuQف QgKNC6s}FVY65A8Є1fT$`/OM >meGއpgT]6NE@@*Wwׄ:gSt` e~gt1 Ԧvk').b/T"0ŭ ǘ:N& Ԫ*rS;0PYsu -Sqp揦ӎfBE{ڣg.AdI~[@0P3fMsWI{lSu -S<j~o:g͢G[$ 9O$LɯN1}igY@`} fYf*+z@8P=ӳwy ?8}4N84]vA8;jSgO,kW\JLGII@ȕkG'W~}+Yf*+vH}:U=Nw8m5>:N2$3ΏlzU; ަ~jҟedLҙФtaCVA* TЂ5L{ 0V'tb*Ua0PpID֘u\m5B0IE2^uA᭲DXȑfB΄&Vn|AکȧfA* TeͣK3PA:?!|D=溂`" -jos&T9h3W,2)rM,"P`E½ ΚQ56 M` M  ȡin̠քISO6͐fZsm#VȘ@ wnmTa|k5LA5a d0yHA½Ռl˶5 *2 4YJydpRLgmf]9⬠\EfKU<X5曜Ep{wDM{Ȧ@ YPSTT3h5j @E_gŽs{3۶] -&'|/dx7V|W!,zyy_Wt&RV3q\*ida۶ˮVm֬f{Y'5ږG} -oԆNz:BLT*z@0PA ʂ*2[5U; T"  vhWSH=-cͬEFrM " ƀ $z^g>I -ƀdRMeg 5eP*O)ME AA2[<0P_޾I'' !/BsSSؽu~̵Ko92^i+eqS5c:mZIa滌 PLUm ֩:4qWS51fgrѡ̣ oњxFUPF"/1MuEmhG#fm|urkfamgϣzUmnxm,ˆIQ{ڪU7;Tk"#_cMwȔ <A֬Cf"7ǝ yOSsΚњo,7Gv.+_'.bo{Z]9Ax#~Nl5 7o{:yscbm;||{⍴եN3*6ub'RH3aO@ P 5h@Ig$ZAp,B65&?ߢ0-\:jj6i -f -BDM*& \$;>#MK 09 ~xLޠ2-{x?B m |L9eՑf+=^N׽e]W`"S<Bcga -cz@PHs@f͢!Qk==!'?VQ0 ceE0(`@@³OfP.n$"L4ZcZOkbxTfT{(MC Χ`"'SL/Ap7Mo.<&$'pfJ8 恁 -^w*@zj۶˿s~kz5P6aW;lJ{7Nji ǫ/\lt֌WpӤ66CB5wZGG{l {PYr#UǓE>ps@4AFm"PTJ'xNrfןSn@⤢] -0Pa\u]eLH ^u?<;/;ͺz(׫Ga*k3vZGp^/zkfc:\[<\ -YbἶT&٪xwFS7XDdռ zD`@AdP)>P8xR՗̞nTh6cg^MnRwA+9E>o 8 -u TxLJ,DͬF\QS'SȭX_RTɎbIvAo@eq* B΄Y:Ah줂71 f={9NZ֓j},X}mUsYd3,Hio|\ sиU7|5`,QYC.S ǐiI@ ˰iA5#̈́L'M*zD*0PE3#xzI #~{pF>c.0S5Vb믹oYEU$xR*ھR[Jir*H. 8ދcD=6A@B88ʍ?؞q lXIPk|&<-fل,kM**SCњSfjҟ7*\aoF۶]^~6^`y"k05PA@½\Њ̾|O?+\ic8"krDjl)T -b<~]=u֧pKh}[7l A& c9x>TsL;Mi4A4j=˿a)<5 q}T^SԪmOlcFWi RE|vڜbfÓם9dcnRahԛk._Yd$5p}xMޚQ<8]iV6hI[0jLQoM#jVzi,(3Ud7 S7@Y72{F}#?SUqSm$lS,a\mN7 S٘d,P1}G(uk~$RA8ͨ_m硂=T>Md#] Si%@Pͨ͛95&Uz=TAЙ,{yģ ..E ymOi ػ;lvw\̽GTY{ V)4g\&2zɄT3})=)PU`Zdy.,x{jcT|AǶm)ǖ%޸V1p Q^ Hpu7x 3 M: 0PtZPjnCcyglZ{68rNM/./ո'#i7m^HAT!pkϖDM8XWktNqPGYU m.сLNUjْ" 4d:d&ȡ9Ah朜^|pRS`;i^U6PQCpdYϒD%#S7`HG;bQƃ0U9{` a@Bi F:3jK$^ӆAdG۶]^n-wMp ~v&T}(> a@q>X Ϩ ` h0 B5v?M/ѣL8`@̟ӻñLR `XCjIᤃy(iUrZ EX/aV&bi Sbf$ymmjR:x_7+ryAjI3qa- MԚ B&QppZAHɀ02Ir݋Mk: 63̈́3`T V]\ -Ud;aӪ#* PNq j'UAtP=J?LOm.Re U֕PΚN*pzNemZgYmPA@lZAwG~w>Wg V4PAH38ڑޜ'pz,/vVN;:-ZӝVf >#1^quOM T%@j='xO aM\ z&5$4Apĝfa44?^$<* -aohhM Toa a4Cjش9_2y'lR#MA< FꪹgI 79jZS\1ƀ rش0fj臁Amaʓaʥ`.n=ZE! *[…ڟ<Z3mMz+jc_78 -'gjpQA|[7KTwK9̵q'0kc 9Z'͊@Z= -Ud T1XAyThMUdqAϮ, QzZZOHd9{|z3[Nb h:eZ$ lO!ӂ2@ _1p#%5Z@[ *[`j5ɭ=Vj=Nܰ9ԃu+J''uuʰ=@@BE'a - hh1l՘a)VwB 1j*'DT 'ۖȴ3[|J\t*WMYN۶]un;.T 6y@/pp?>u kYf+ ֻHWH[gNRz@NLPޅRx  0XAaTVc4 @Ad*z@@hд1<954y0geYJ&\R0&n?kt]0[Us|zdǪA@h{z˂[ LSӋIbE (ȻtMA\=prX#A8ڙ\@%  5Ԛ - @x*3Pcz(6Գ*𰼡rSqf7Ҋ.6S廝թN[tX1 M^n-9& 2#?j=Ys5*32PaְiՃ[!O9 @,W+[(F U]<ߢ<#66y ROba"򸮆u!d`j])9:nTS _ERmvdxFm./\BgmZG{ Tњ\4[Sse SOc -Be.n^^r@W 3|e)Sf_{k-W?ϫqwME~h& |lon SuQ9ٓ *y=l'{1 m٨U^r&ZMQ5c$ ҟ@m65ϨcQ@B]I'qc& a6n MeExQMu>/%W/Wkpg^'9rhVul6[ӡfbWSz^!3%+'׸E y ~:|0@k{8pbp!S@@ pUfi: M5eg* ʹsδ6Ldýyx)%^^$aض1d^:qNƫ -(^]"Y~:՛Rorkע9T\˙xf[5B 5yǶm'O*rbu}^{ka'7Q0NsjiC{1* rBشM5o!=^epwNq (5hf{d? Bz4X+{{5sCáeYώ}5cB@8cihf|0=cczDͲ,gÞ\ A"M#Ǫ+D\eY= Ad:ADzPIEj'T#7փ,%B.h*3j=4aHEB35O jn۶˲,˗Άu87~* 3)3U{6#GeY/ߐP׽RY{2$p#A:ahvg˲,_4 9:x@[5N# eA{,,Oik,@jO2!h>foYA@62~e.˲I* xUa)5A `@nc²,*@ a.T/V_s ڴNVcOj,'70zu -7,rOjS/5 4jW_O)7*l֦}h Ҳ, gEs'hj?o뽣R4,:+?CZei/7qG4 1^G]#wx#} ضmu/Xe9/j{샠iSqyVzaYedS+z@4T5o.˲,#E"c]eY>_~?mO·yyYe,5=ҙ3_T¯,˲z' s8˲,k|~' B,9%=W"LEUGʟA[,rw:Oaޣt۶˛_U,Ȼ=|Z=j,r TՌ4'Tԋy/2s3~,˲ܴ}~i;JNz@T5&\/˲,w \oE\TfkEjh\W*iA>\ eY1?0~.͞4 V$(̈́& ;PmeYeyͥ\+:AڬY7{j\3SX,FN L塄=u^t&TtuwXey/׿ֿ6Se"ajhM=N,˲<,.i&Dz Td6vRA@B=UzY: :3j4AVcC]eYwyfG"= = -KeY|zp/o |;ʖeYxuݶR}i7 .T1+eY-xQ?]i0²,~?mU[_ -1ƀ0]5߽>/,˲C?6p*.@}PJ|Zv@8ǶmeYv.ԹsE>̗W߿?aYѲ,TߟAEr^eY`]eYP@ -endstream -endobj - -8 0 obj - 14846 -endobj - -9 0 obj - << /ExtGState << /E1 << /SMask << /Type /Mask - /G 1 0 R - /S /Alpha - >> - /Type /ExtGState - >> >> - /XObject << /X2 3 0 R - /X1 7 0 R - >> - >> -endobj - -10 0 obj - << /Length 11 0 R >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -261.000000 0.000000 -0.000000 67.000000 0.000000 0.000000 cm -/X1 Do -Q -q -/E1 gs -/X2 Do -Q - -endstream -endobj - -11 0 obj - 118 -endobj - -12 0 obj - << /Annots [] - /Type /Page - /MediaBox [ 0.000000 0.000000 261.000000 67.000000 ] - /Resources 9 0 R - /Contents 10 0 R - /Parent 13 0 R - >> -endobj - -13 0 obj - << /Kids [ 12 0 R ] - /Count 1 - /Type /Pages - >> -endobj - -14 0 obj - << /Type /Catalog - /Pages 13 0 R - >> -endobj - -xref -0 15 -0000000000 65535 f -0000000010 00000 n -0000000493 00000 n -0000000515 00000 n -0000009734 00000 n -0000009757 00000 n -0000031385 00000 n -0000031409 00000 n -0000046488 00000 n -0000046512 00000 n -0000046851 00000 n -0000047027 00000 n -0000047050 00000 n -0000047227 00000 n -0000047303 00000 n -trailer -<< /ID [ (some) (id) ] - /Root 14 0 R - /Size 15 ->> -startxref -47364 -%%EOF \ No newline at end of file diff --git a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.large.imageset/Contents.json b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.large.imageset/Contents.json deleted file mode 100644 index e26db2fac..000000000 --- a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.large.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "logotypeFull1.large.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.large.imageset/logotypeFull1.large.pdf b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.large.imageset/logotypeFull1.large.pdf deleted file mode 100644 index d4d478ef6..000000000 Binary files a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Scene/Welcome/mastodon.logo.large.imageset/logotypeFull1.large.pdf and /dev/null differ diff --git a/MastodonSDK/Sources/MastodonAsset/Generated/Assets.swift b/MastodonSDK/Sources/MastodonAsset/Generated/Assets.swift index 5cd0059d8..155227685 100644 --- a/MastodonSDK/Sources/MastodonAsset/Generated/Assets.swift +++ b/MastodonSDK/Sources/MastodonAsset/Generated/Assets.swift @@ -8,6 +8,9 @@ #elseif os(tvOS) || os(watchOS) import UIKit #endif +#if canImport(SwiftUI) + import SwiftUI +#endif // Deprecated typealiases @available(*, deprecated, renamed: "ColorAsset.Color", message: "This typealias will be removed in SwiftGen 7.0") @@ -130,6 +133,11 @@ public enum Asset { } public enum Scene { public enum Compose { + public enum Attachment { + public static let indicatorButtonBackground = ColorAsset(name: "Scene/Compose/Attachment/indicator.button.background") + public static let retry = ImageAsset(name: "Scene/Compose/Attachment/retry") + public static let stop = ImageAsset(name: "Scene/Compose/Attachment/stop") + } public static let earth = ImageAsset(name: "Scene/Compose/Earth") public static let mention = ImageAsset(name: "Scene/Compose/Mention") public static let more = ImageAsset(name: "Scene/Compose/More") @@ -163,6 +171,11 @@ public enum Asset { public static let textFieldBackground = ColorAsset(name: "Scene/Onboarding/textField.background") } public enum Profile { + public enum About { + public static let bioAboutFieldVerifiedBackground = ColorAsset(name: "Scene/Profile/About/bio.about.field.verified.background") + public static let bioAboutFieldVerifiedCheckmark = ColorAsset(name: "Scene/Profile/About/bio.about.field.verified.checkmark") + public static let bioAboutFieldVerifiedLink = ColorAsset(name: "Scene/Profile/About/bio.about.field.verified.link") + } public enum Banner { public static let bioEditBackgroundGray = ColorAsset(name: "Scene/Profile/Banner/bio.edit.background.gray") public static let nameEditBackgroundGray = ColorAsset(name: "Scene/Profile/Banner/name.edit.background.gray") @@ -196,10 +209,7 @@ public enum Asset { public static let elephantThreeOnGrassWithTreeThree = ImageAsset(name: "Scene/Welcome/illustration/elephant.three.on.grass.with.tree.three") public static let elephantThreeOnGrassWithTreeTwo = ImageAsset(name: "Scene/Welcome/illustration/elephant.three.on.grass.with.tree.two") } - public static let mastodonLogoBlack = ImageAsset(name: "Scene/Welcome/mastodon.logo.black") - public static let mastodonLogoBlackLarge = ImageAsset(name: "Scene/Welcome/mastodon.logo.black.large") public static let mastodonLogo = ImageAsset(name: "Scene/Welcome/mastodon.logo") - public static let mastodonLogoLarge = ImageAsset(name: "Scene/Welcome/mastodon.logo.large") public static let signInButtonBackground = ColorAsset(name: "Scene/Welcome/sign.in.button.background") } } @@ -274,6 +284,24 @@ public final class ColorAsset { return color }() + #if os(iOS) || os(tvOS) + @available(iOS 11.0, tvOS 11.0, *) + public func color(compatibleWith traitCollection: UITraitCollection) -> Color { + let bundle = Bundle.module + guard let color = Color(named: name, in: bundle, compatibleWith: traitCollection) else { + fatalError("Unable to load color asset named \(name).") + } + return color + } + #endif + + #if canImport(SwiftUI) + @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) + public private(set) lazy var swiftUIColor: SwiftUI.Color = { + SwiftUI.Color(asset: self) + }() + #endif + fileprivate init(name: String) { self.name = name } @@ -293,6 +321,16 @@ public extension ColorAsset.Color { } } +#if canImport(SwiftUI) +@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) +public extension SwiftUI.Color { + init(asset: ColorAsset) { + let bundle = Bundle.module + self.init(asset.name, bundle: bundle) + } +} +#endif + public struct ImageAsset { public fileprivate(set) var name: String @@ -302,6 +340,7 @@ public struct ImageAsset { public typealias Image = UIImage #endif + @available(iOS 8.0, tvOS 9.0, watchOS 2.0, macOS 10.7, *) public var image: Image { let bundle = Bundle.module #if os(iOS) || os(tvOS) @@ -317,9 +356,28 @@ public struct ImageAsset { } return result } + + #if os(iOS) || os(tvOS) + @available(iOS 8.0, tvOS 9.0, *) + public func image(compatibleWith traitCollection: UITraitCollection) -> Image { + let bundle = Bundle.module + guard let result = Image(named: name, in: bundle, compatibleWith: traitCollection) else { + fatalError("Unable to load image asset named \(name).") + } + return result + } + #endif + + #if canImport(SwiftUI) + @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) + public var swiftUIImage: SwiftUI.Image { + SwiftUI.Image(asset: self) + } + #endif } public extension ImageAsset.Image { + @available(iOS 8.0, tvOS 9.0, watchOS 2.0, *) @available(macOS, deprecated, message: "This initializer is unsafe on macOS, please use the ImageAsset.image property") convenience init?(asset: ImageAsset) { @@ -333,3 +391,23 @@ public extension ImageAsset.Image { #endif } } + +#if canImport(SwiftUI) +@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) +public extension SwiftUI.Image { + init(asset: ImageAsset) { + let bundle = Bundle.module + self.init(asset.name, bundle: bundle) + } + + init(asset: ImageAsset, label: Text) { + let bundle = Bundle.module + self.init(asset.name, bundle: bundle, label: label) + } + + init(decorative asset: ImageAsset) { + let bundle = Bundle.module + self.init(decorative: asset.name, bundle: bundle) + } +} +#endif diff --git a/MastodonSDK/Sources/MastodonAsset/Generated/Fonts.swift b/MastodonSDK/Sources/MastodonAsset/Generated/Fonts.swift index 22c6c9ed3..740c44bc9 100644 --- a/MastodonSDK/Sources/MastodonAsset/Generated/Fonts.swift +++ b/MastodonSDK/Sources/MastodonAsset/Generated/Fonts.swift @@ -1,18 +1,20 @@ // swiftlint:disable all // Generated using SwiftGen — https://github.com/SwiftGen/SwiftGen -#if os(OSX) +#if os(macOS) import AppKit.NSFont #elseif os(iOS) || os(tvOS) || os(watchOS) import UIKit.UIFont #endif +#if canImport(SwiftUI) + import SwiftUI +#endif // Deprecated typealiases @available(*, deprecated, renamed: "FontConvertible.Font", message: "This typealias will be removed in SwiftGen 7.0") public typealias Font = FontConvertible.Font -// swiftlint:disable superfluous_disable_command -// swiftlint:disable file_length +// swiftlint:disable superfluous_disable_command file_length implicit_return // MARK: - Fonts @@ -36,7 +38,7 @@ public struct FontConvertible { public let family: String public let path: String - #if os(OSX) + #if os(macOS) public typealias Font = NSFont #elseif os(iOS) || os(tvOS) || os(watchOS) public typealias Font = UIFont @@ -49,12 +51,41 @@ public struct FontConvertible { return font } + #if canImport(SwiftUI) + @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) + public func swiftUIFont(size: CGFloat) -> SwiftUI.Font { + return SwiftUI.Font.custom(self, size: size) + } + + @available(iOS 14.0, tvOS 14.0, watchOS 7.0, macOS 11.0, *) + public func swiftUIFont(fixedSize: CGFloat) -> SwiftUI.Font { + return SwiftUI.Font.custom(self, fixedSize: fixedSize) + } + + @available(iOS 14.0, tvOS 14.0, watchOS 7.0, macOS 11.0, *) + public func swiftUIFont(size: CGFloat, relativeTo textStyle: SwiftUI.Font.TextStyle) -> SwiftUI.Font { + return SwiftUI.Font.custom(self, size: size, relativeTo: textStyle) + } + #endif + public func register() { // swiftlint:disable:next conditional_returns_on_newline guard let url = url else { return } CTFontManagerRegisterFontsForURL(url as CFURL, .process, nil) } + fileprivate func registerIfNeeded() { + #if os(iOS) || os(tvOS) || os(watchOS) + if !UIFont.fontNames(forFamilyName: family).contains(name) { + register() + } + #elseif os(macOS) + if let url = url, CTFontManagerGetScopeForURL(url as CFURL) == .none { + register() + } + #endif + } + fileprivate var url: URL? { // swiftlint:disable:next implicit_return return Bundle.module.url(forResource: path, withExtension: nil) @@ -63,16 +94,34 @@ public struct FontConvertible { public extension FontConvertible.Font { convenience init?(font: FontConvertible, size: CGFloat) { - #if os(iOS) || os(tvOS) || os(watchOS) - if !UIFont.fontNames(forFamilyName: font.family).contains(font.name) { - font.register() - } - #elseif os(OSX) - if let url = font.url, CTFontManagerGetScopeForURL(url as CFURL) == .none { - font.register() - } - #endif - + font.registerIfNeeded() self.init(name: font.name, size: size) } } + +#if canImport(SwiftUI) +@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) +public extension SwiftUI.Font { + static func custom(_ font: FontConvertible, size: CGFloat) -> SwiftUI.Font { + font.registerIfNeeded() + return custom(font.name, size: size) + } +} + +@available(iOS 14.0, tvOS 14.0, watchOS 7.0, macOS 11.0, *) +public extension SwiftUI.Font { + static func custom(_ font: FontConvertible, fixedSize: CGFloat) -> SwiftUI.Font { + font.registerIfNeeded() + return custom(font.name, fixedSize: fixedSize) + } + + static func custom( + _ font: FontConvertible, + size: CGFloat, + relativeTo textStyle: SwiftUI.Font.TextStyle + ) -> SwiftUI.Font { + font.registerIfNeeded() + return custom(font.name, size: size, relativeTo: textStyle) + } +} +#endif diff --git a/MastodonSDK/Sources/MastodonCore/Extension/CoreDataStack/MastodonUser+Property.swift b/MastodonSDK/Sources/MastodonCore/Extension/CoreDataStack/MastodonUser+Property.swift index cebe7f8af..8d2f77ba7 100644 --- a/MastodonSDK/Sources/MastodonCore/Extension/CoreDataStack/MastodonUser+Property.swift +++ b/MastodonSDK/Sources/MastodonCore/Extension/CoreDataStack/MastodonUser+Property.swift @@ -10,6 +10,10 @@ import CoreDataStack import MastodonSDK extension MastodonUser.Property { + public init(entity: Mastodon.Entity.Account, domain: String) { + self.init(entity: entity, domain: domain, networkDate: Date()) + } + init(entity: Mastodon.Entity.Account, domain: String, networkDate: Date) { self.init( identifier: entity.id + "@" + domain, diff --git a/MastodonSDK/Sources/MastodonCore/Model/Compose/CustomEmojiPickerItem.swift b/MastodonSDK/Sources/MastodonCore/Model/Compose/CustomEmojiPickerItem.swift index 52f522703..6174f4687 100644 --- a/MastodonSDK/Sources/MastodonCore/Model/Compose/CustomEmojiPickerItem.swift +++ b/MastodonSDK/Sources/MastodonCore/Model/Compose/CustomEmojiPickerItem.swift @@ -8,28 +8,28 @@ import Foundation import MastodonSDK -enum CustomEmojiPickerItem { +public enum CustomEmojiPickerItem { case emoji(attribute: CustomEmojiAttribute) } extension CustomEmojiPickerItem: Equatable, Hashable { } extension CustomEmojiPickerItem { - final class CustomEmojiAttribute: Equatable, Hashable { - let id = UUID() + public final class CustomEmojiAttribute: Equatable, Hashable { + public let id = UUID() - let emoji: Mastodon.Entity.Emoji + public let emoji: Mastodon.Entity.Emoji - init(emoji: Mastodon.Entity.Emoji) { + public init(emoji: Mastodon.Entity.Emoji) { self.emoji = emoji } - static func == (lhs: CustomEmojiPickerItem.CustomEmojiAttribute, rhs: CustomEmojiPickerItem.CustomEmojiAttribute) -> Bool { + public static func == (lhs: CustomEmojiPickerItem.CustomEmojiAttribute, rhs: CustomEmojiPickerItem.CustomEmojiAttribute) -> Bool { return lhs.id == rhs.id && lhs.emoji.shortcode == rhs.emoji.shortcode } - func hash(into hasher: inout Hasher) { + public func hash(into hasher: inout Hasher) { hasher.combine(id) } } diff --git a/MastodonSDK/Sources/MastodonCore/Service/API/APIService+APIError.swift b/MastodonSDK/Sources/MastodonCore/Service/API/APIService+APIError.swift index 6fdb973da..52b6d4678 100644 --- a/MastodonSDK/Sources/MastodonCore/Service/API/APIService+APIError.swift +++ b/MastodonSDK/Sources/MastodonCore/Service/API/APIService+APIError.swift @@ -43,7 +43,7 @@ extension APIService.APIError: LocalizedError { public var errorDescription: String? { switch errorReason { - case .authenticationMissing: return "Fail to Authenticatie" + case .authenticationMissing: return "Fail to Authenticate" case .badRequest: return "Bad Request" case .badResponse: return "Bad Response" case .requestThrottle: return "Request Throttled" diff --git a/MastodonSDK/Sources/MastodonCore/Service/API/APIService+Account.swift b/MastodonSDK/Sources/MastodonCore/Service/API/APIService+Account.swift index 68649d24c..1b6a57a83 100644 --- a/MastodonSDK/Sources/MastodonCore/Service/API/APIService+Account.swift +++ b/MastodonSDK/Sources/MastodonCore/Service/API/APIService+Account.swift @@ -13,6 +13,15 @@ import MastodonCommon import MastodonSDK extension APIService { + public func authenticatedUserInfo( + authenticationBox: MastodonAuthenticationBox + ) async throws -> Mastodon.Response.Content { + try await accountInfo( + domain: authenticationBox.domain, + userID: authenticationBox.userID, + authorization: authenticationBox.userAuthorization + ) + } public func accountInfo( domain: String, diff --git a/MastodonSDK/Sources/MastodonCore/Service/API/APIService+Onboarding.swift b/MastodonSDK/Sources/MastodonCore/Service/API/APIService+Onboarding.swift index 383763359..84104d838 100644 --- a/MastodonSDK/Sources/MastodonCore/Service/API/APIService+Onboarding.swift +++ b/MastodonSDK/Sources/MastodonCore/Service/API/APIService+Onboarding.swift @@ -12,8 +12,8 @@ import MastodonSDK extension APIService { public func servers( - language: String?, - category: String? + language: String? = nil, + category: String? = nil ) -> AnyPublisher, Error> { let query = Mastodon.API.Onboarding.ServersQuery(language: language, category: category) return Mastodon.API.Onboarding.servers(session: session, query: query) diff --git a/MastodonSDK/Sources/MastodonCore/Service/AuthenticationService.swift b/MastodonSDK/Sources/MastodonCore/Service/AuthenticationService.swift index 48da254c6..00b0e46cd 100644 --- a/MastodonSDK/Sources/MastodonCore/Service/AuthenticationService.swift +++ b/MastodonSDK/Sources/MastodonCore/Service/AuthenticationService.swift @@ -25,6 +25,7 @@ public final class AuthenticationService: NSObject { // output @Published public var mastodonAuthentications: [ManagedObjectRecord] = [] @Published public var mastodonAuthenticationBoxes: [MastodonAuthenticationBox] = [] + public let updateActiveUserAccountPublisher = PassthroughSubject() init( managedObjectContext: NSManagedObjectContext, @@ -67,7 +68,7 @@ public final class AuthenticationService: NSObject { try mastodonAuthenticationFetchedResultsController.performFetch() mastodonAuthentications = mastodonAuthenticationFetchedResultsController.fetchedObjects? .sorted(by: { $0.activedAt > $1.activedAt }) - .compactMap { $0.asRecrod } ?? [] + .compactMap { $0.asRecord } ?? [] } catch { assertionFailure(error.localizedDescription) } @@ -148,7 +149,7 @@ extension AuthenticationService: NSFetchedResultsControllerDelegate { mastodonAuthentications = mastodonAuthenticationFetchedResultsController.fetchedObjects? .sorted(by: { $0.activedAt > $1.activedAt }) - .compactMap { $0.asRecrod } ?? [] + .compactMap { $0.asRecord } ?? [] } } diff --git a/MastodonSDK/Sources/MastodonCore/Service/InstanceService.swift b/MastodonSDK/Sources/MastodonCore/Service/InstanceService.swift index c63e965bd..4cd804036 100644 --- a/MastodonSDK/Sources/MastodonCore/Service/InstanceService.swift +++ b/MastodonSDK/Sources/MastodonCore/Service/InstanceService.swift @@ -24,7 +24,7 @@ public final class InstanceService { weak var authenticationService: AuthenticationService? // output - + init( apiService: APIService, authenticationService: AuthenticationService diff --git a/MastodonSDK/Sources/MastodonExtension/ImageAnalyzer.swift b/MastodonSDK/Sources/MastodonExtension/ImageAnalyzer.swift new file mode 100644 index 000000000..cf8a0f437 --- /dev/null +++ b/MastodonSDK/Sources/MastodonExtension/ImageAnalyzer.swift @@ -0,0 +1,13 @@ +// +// ImageAnalyzer.swift +// +// +// Created by Jed Fox on 2022-11-14. +// + +import VisionKit + +@available(iOS 16.0, *) +extension ImageAnalyzer { + public static let shared = ImageAnalyzer() +} diff --git a/MastodonSDK/Sources/MastodonExtension/UIView.swift b/MastodonSDK/Sources/MastodonExtension/UIView.swift index f96d1618a..fa62be6c0 100644 --- a/MastodonSDK/Sources/MastodonExtension/UIView.swift +++ b/MastodonSDK/Sources/MastodonExtension/UIView.swift @@ -46,3 +46,20 @@ extension UIView { return self } } + +public extension UIView { + + func pinToParent() { + pinTo(to: self.superview) + } + + func pinTo(to view: UIView?) { + guard let pinToView = view else { return } + NSLayoutConstraint.activate([ + topAnchor.constraint(equalTo: pinToView.topAnchor), + leadingAnchor.constraint(equalTo: pinToView.leadingAnchor), + trailingAnchor.constraint(equalTo: pinToView.trailingAnchor), + bottomAnchor.constraint(equalTo: pinToView.bottomAnchor), + ]) + } +} diff --git a/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift b/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift index 44ae29267..0392d2b05 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift +++ b/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift @@ -3,1422 +3,1468 @@ import Foundation -// swiftlint:disable superfluous_disable_command file_length implicit_return +// swiftlint:disable superfluous_disable_command file_length implicit_return prefer_self_in_static_references // MARK: - Strings // swiftlint:disable explicit_type_interface function_parameter_count identifier_name line_length // swiftlint:disable nesting type_body_length type_name vertical_whitespace_opening_braces public enum L10n { - public enum Common { public enum Alerts { public enum BlockDomain { /// Block Domain - public static let blockEntireDomain = L10n.tr("Localizable", "Common.Alerts.BlockDomain.BlockEntireDomain") + public static let blockEntireDomain = L10n.tr("Localizable", "Common.Alerts.BlockDomain.BlockEntireDomain", fallback: "Block Domain") /// Are you really, really sure you want to block the entire %@? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain and any of your followers from that domain will be removed. public static func title(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Alerts.BlockDomain.Title", String(describing: p1)) + return L10n.tr("Localizable", "Common.Alerts.BlockDomain.Title", String(describing: p1), fallback: "Are you really, really sure you want to block the entire %@? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain and any of your followers from that domain will be removed.") } } public enum CleanCache { /// Successfully cleaned %@ cache. public static func message(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Alerts.CleanCache.Message", String(describing: p1)) + return L10n.tr("Localizable", "Common.Alerts.CleanCache.Message", String(describing: p1), fallback: "Successfully cleaned %@ cache.") } /// Clean Cache - public static let title = L10n.tr("Localizable", "Common.Alerts.CleanCache.Title") + public static let title = L10n.tr("Localizable", "Common.Alerts.CleanCache.Title", fallback: "Clean Cache") } public enum Common { /// Please try again. - public static let pleaseTryAgain = L10n.tr("Localizable", "Common.Alerts.Common.PleaseTryAgain") + public static let pleaseTryAgain = L10n.tr("Localizable", "Common.Alerts.Common.PleaseTryAgain", fallback: "Please try again.") /// Please try again later. - public static let pleaseTryAgainLater = L10n.tr("Localizable", "Common.Alerts.Common.PleaseTryAgainLater") + public static let pleaseTryAgainLater = L10n.tr("Localizable", "Common.Alerts.Common.PleaseTryAgainLater", fallback: "Please try again later.") } public enum DeletePost { /// Are you sure you want to delete this post? - public static let message = L10n.tr("Localizable", "Common.Alerts.DeletePost.Message") + public static let message = L10n.tr("Localizable", "Common.Alerts.DeletePost.Message", fallback: "Are you sure you want to delete this post?") /// Delete Post - public static let title = L10n.tr("Localizable", "Common.Alerts.DeletePost.Title") + public static let title = L10n.tr("Localizable", "Common.Alerts.DeletePost.Title", fallback: "Delete Post") } public enum DiscardPostContent { /// Confirm to discard composed post content. - public static let message = L10n.tr("Localizable", "Common.Alerts.DiscardPostContent.Message") + public static let message = L10n.tr("Localizable", "Common.Alerts.DiscardPostContent.Message", fallback: "Confirm to discard composed post content.") /// Discard Draft - public static let title = L10n.tr("Localizable", "Common.Alerts.DiscardPostContent.Title") + public static let title = L10n.tr("Localizable", "Common.Alerts.DiscardPostContent.Title", fallback: "Discard Draft") } public enum EditProfileFailure { /// Cannot edit profile. Please try again. - public static let message = L10n.tr("Localizable", "Common.Alerts.EditProfileFailure.Message") + public static let message = L10n.tr("Localizable", "Common.Alerts.EditProfileFailure.Message", fallback: "Cannot edit profile. Please try again.") /// Edit Profile Error - public static let title = L10n.tr("Localizable", "Common.Alerts.EditProfileFailure.Title") + public static let title = L10n.tr("Localizable", "Common.Alerts.EditProfileFailure.Title", fallback: "Edit Profile Error") } public enum PublishPostFailure { - /// Failed to publish the post.\nPlease check your internet connection. - public static let message = L10n.tr("Localizable", "Common.Alerts.PublishPostFailure.Message") + /// Failed to publish the post. + /// Please check your internet connection. + public static let message = L10n.tr("Localizable", "Common.Alerts.PublishPostFailure.Message", fallback: "Failed to publish the post.\nPlease check your internet connection.") /// Publish Failure - public static let title = L10n.tr("Localizable", "Common.Alerts.PublishPostFailure.Title") + public static let title = L10n.tr("Localizable", "Common.Alerts.PublishPostFailure.Title", fallback: "Publish Failure") public enum AttachmentsMessage { /// Cannot attach more than one video. - public static let moreThanOneVideo = L10n.tr("Localizable", "Common.Alerts.PublishPostFailure.AttachmentsMessage.MoreThanOneVideo") + public static let moreThanOneVideo = L10n.tr("Localizable", "Common.Alerts.PublishPostFailure.AttachmentsMessage.MoreThanOneVideo", fallback: "Cannot attach more than one video.") /// Cannot attach a video to a post that already contains images. - public static let videoAttachWithPhoto = L10n.tr("Localizable", "Common.Alerts.PublishPostFailure.AttachmentsMessage.VideoAttachWithPhoto") + public static let videoAttachWithPhoto = L10n.tr("Localizable", "Common.Alerts.PublishPostFailure.AttachmentsMessage.VideoAttachWithPhoto", fallback: "Cannot attach a video to a post that already contains images.") } } public enum SavePhotoFailure { /// Please enable the photo library access permission to save the photo. - public static let message = L10n.tr("Localizable", "Common.Alerts.SavePhotoFailure.Message") + public static let message = L10n.tr("Localizable", "Common.Alerts.SavePhotoFailure.Message", fallback: "Please enable the photo library access permission to save the photo.") /// Save Photo Failure - public static let title = L10n.tr("Localizable", "Common.Alerts.SavePhotoFailure.Title") + public static let title = L10n.tr("Localizable", "Common.Alerts.SavePhotoFailure.Title", fallback: "Save Photo Failure") } public enum ServerError { /// Server Error - public static let title = L10n.tr("Localizable", "Common.Alerts.ServerError.Title") + public static let title = L10n.tr("Localizable", "Common.Alerts.ServerError.Title", fallback: "Server Error") } public enum SignOut { /// Sign Out - public static let confirm = L10n.tr("Localizable", "Common.Alerts.SignOut.Confirm") + public static let confirm = L10n.tr("Localizable", "Common.Alerts.SignOut.Confirm", fallback: "Sign Out") /// Are you sure you want to sign out? - public static let message = L10n.tr("Localizable", "Common.Alerts.SignOut.Message") + public static let message = L10n.tr("Localizable", "Common.Alerts.SignOut.Message", fallback: "Are you sure you want to sign out?") /// Sign Out - public static let title = L10n.tr("Localizable", "Common.Alerts.SignOut.Title") + public static let title = L10n.tr("Localizable", "Common.Alerts.SignOut.Title", fallback: "Sign Out") } public enum SignUpFailure { /// Sign Up Failure - public static let title = L10n.tr("Localizable", "Common.Alerts.SignUpFailure.Title") + public static let title = L10n.tr("Localizable", "Common.Alerts.SignUpFailure.Title", fallback: "Sign Up Failure") } public enum VoteFailure { /// The poll has ended - public static let pollEnded = L10n.tr("Localizable", "Common.Alerts.VoteFailure.PollEnded") + public static let pollEnded = L10n.tr("Localizable", "Common.Alerts.VoteFailure.PollEnded", fallback: "The poll has ended") /// Vote Failure - public static let title = L10n.tr("Localizable", "Common.Alerts.VoteFailure.Title") + public static let title = L10n.tr("Localizable", "Common.Alerts.VoteFailure.Title", fallback: "Vote Failure") } } public enum Controls { public enum Actions { /// Add - public static let add = L10n.tr("Localizable", "Common.Controls.Actions.Add") + public static let add = L10n.tr("Localizable", "Common.Controls.Actions.Add", fallback: "Add") /// Back - public static let back = L10n.tr("Localizable", "Common.Controls.Actions.Back") + public static let back = L10n.tr("Localizable", "Common.Controls.Actions.Back", fallback: "Back") /// Block %@ public static func blockDomain(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Controls.Actions.BlockDomain", String(describing: p1)) + return L10n.tr("Localizable", "Common.Controls.Actions.BlockDomain", String(describing: p1), fallback: "Block %@") } /// Cancel - public static let cancel = L10n.tr("Localizable", "Common.Controls.Actions.Cancel") + public static let cancel = L10n.tr("Localizable", "Common.Controls.Actions.Cancel", fallback: "Cancel") /// Compose - public static let compose = L10n.tr("Localizable", "Common.Controls.Actions.Compose") + public static let compose = L10n.tr("Localizable", "Common.Controls.Actions.Compose", fallback: "Compose") /// Confirm - public static let confirm = L10n.tr("Localizable", "Common.Controls.Actions.Confirm") + public static let confirm = L10n.tr("Localizable", "Common.Controls.Actions.Confirm", fallback: "Confirm") /// Continue - public static let `continue` = L10n.tr("Localizable", "Common.Controls.Actions.Continue") + public static let `continue` = L10n.tr("Localizable", "Common.Controls.Actions.Continue", fallback: "Continue") /// Copy Photo - public static let copyPhoto = L10n.tr("Localizable", "Common.Controls.Actions.CopyPhoto") + public static let copyPhoto = L10n.tr("Localizable", "Common.Controls.Actions.CopyPhoto", fallback: "Copy Photo") /// Delete - public static let delete = L10n.tr("Localizable", "Common.Controls.Actions.Delete") + public static let delete = L10n.tr("Localizable", "Common.Controls.Actions.Delete", fallback: "Delete") /// Discard - public static let discard = L10n.tr("Localizable", "Common.Controls.Actions.Discard") + public static let discard = L10n.tr("Localizable", "Common.Controls.Actions.Discard", fallback: "Discard") /// Done - public static let done = L10n.tr("Localizable", "Common.Controls.Actions.Done") + public static let done = L10n.tr("Localizable", "Common.Controls.Actions.Done", fallback: "Done") /// Edit - public static let edit = L10n.tr("Localizable", "Common.Controls.Actions.Edit") + public static let edit = L10n.tr("Localizable", "Common.Controls.Actions.Edit", fallback: "Edit") /// Find people to follow - public static let findPeople = L10n.tr("Localizable", "Common.Controls.Actions.FindPeople") + public static let findPeople = L10n.tr("Localizable", "Common.Controls.Actions.FindPeople", fallback: "Find people to follow") /// Manually search instead - public static let manuallySearch = L10n.tr("Localizable", "Common.Controls.Actions.ManuallySearch") + public static let manuallySearch = L10n.tr("Localizable", "Common.Controls.Actions.ManuallySearch", fallback: "Manually search instead") /// Next - public static let next = L10n.tr("Localizable", "Common.Controls.Actions.Next") + public static let next = L10n.tr("Localizable", "Common.Controls.Actions.Next", fallback: "Next") /// OK - public static let ok = L10n.tr("Localizable", "Common.Controls.Actions.Ok") + public static let ok = L10n.tr("Localizable", "Common.Controls.Actions.Ok", fallback: "OK") /// Open - public static let `open` = L10n.tr("Localizable", "Common.Controls.Actions.Open") + public static let `open` = L10n.tr("Localizable", "Common.Controls.Actions.Open", fallback: "Open") /// Open in Browser - public static let openInBrowser = L10n.tr("Localizable", "Common.Controls.Actions.OpenInBrowser") + public static let openInBrowser = L10n.tr("Localizable", "Common.Controls.Actions.OpenInBrowser", fallback: "Open in Browser") /// Open in Safari - public static let openInSafari = L10n.tr("Localizable", "Common.Controls.Actions.OpenInSafari") + public static let openInSafari = L10n.tr("Localizable", "Common.Controls.Actions.OpenInSafari", fallback: "Open in Safari") /// Preview - public static let preview = L10n.tr("Localizable", "Common.Controls.Actions.Preview") + public static let preview = L10n.tr("Localizable", "Common.Controls.Actions.Preview", fallback: "Preview") /// Previous - public static let previous = L10n.tr("Localizable", "Common.Controls.Actions.Previous") + public static let previous = L10n.tr("Localizable", "Common.Controls.Actions.Previous", fallback: "Previous") /// Remove - public static let remove = L10n.tr("Localizable", "Common.Controls.Actions.Remove") + public static let remove = L10n.tr("Localizable", "Common.Controls.Actions.Remove", fallback: "Remove") /// Reply - public static let reply = L10n.tr("Localizable", "Common.Controls.Actions.Reply") + public static let reply = L10n.tr("Localizable", "Common.Controls.Actions.Reply", fallback: "Reply") /// Report %@ public static func reportUser(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Controls.Actions.ReportUser", String(describing: p1)) + return L10n.tr("Localizable", "Common.Controls.Actions.ReportUser", String(describing: p1), fallback: "Report %@") } /// Save - public static let save = L10n.tr("Localizable", "Common.Controls.Actions.Save") + public static let save = L10n.tr("Localizable", "Common.Controls.Actions.Save", fallback: "Save") /// Save Photo - public static let savePhoto = L10n.tr("Localizable", "Common.Controls.Actions.SavePhoto") + public static let savePhoto = L10n.tr("Localizable", "Common.Controls.Actions.SavePhoto", fallback: "Save Photo") /// See More - public static let seeMore = L10n.tr("Localizable", "Common.Controls.Actions.SeeMore") + public static let seeMore = L10n.tr("Localizable", "Common.Controls.Actions.SeeMore", fallback: "See More") /// Settings - public static let settings = L10n.tr("Localizable", "Common.Controls.Actions.Settings") + public static let settings = L10n.tr("Localizable", "Common.Controls.Actions.Settings", fallback: "Settings") /// Share - public static let share = L10n.tr("Localizable", "Common.Controls.Actions.Share") + public static let share = L10n.tr("Localizable", "Common.Controls.Actions.Share", fallback: "Share") /// Share Post - public static let sharePost = L10n.tr("Localizable", "Common.Controls.Actions.SharePost") + public static let sharePost = L10n.tr("Localizable", "Common.Controls.Actions.SharePost", fallback: "Share Post") /// Share %@ public static func shareUser(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Controls.Actions.ShareUser", String(describing: p1)) + return L10n.tr("Localizable", "Common.Controls.Actions.ShareUser", String(describing: p1), fallback: "Share %@") } - /// Sign In - public static let signIn = L10n.tr("Localizable", "Common.Controls.Actions.SignIn") - /// Sign Up - public static let signUp = L10n.tr("Localizable", "Common.Controls.Actions.SignUp") + /// Log in + public static let signIn = L10n.tr("Localizable", "Common.Controls.Actions.SignIn", fallback: "Log in") + /// Create account + public static let signUp = L10n.tr("Localizable", "Common.Controls.Actions.SignUp", fallback: "Create account") /// Skip - public static let skip = L10n.tr("Localizable", "Common.Controls.Actions.Skip") + public static let skip = L10n.tr("Localizable", "Common.Controls.Actions.Skip", fallback: "Skip") /// Take Photo - public static let takePhoto = L10n.tr("Localizable", "Common.Controls.Actions.TakePhoto") + public static let takePhoto = L10n.tr("Localizable", "Common.Controls.Actions.TakePhoto", fallback: "Take Photo") /// Try Again - public static let tryAgain = L10n.tr("Localizable", "Common.Controls.Actions.TryAgain") + public static let tryAgain = L10n.tr("Localizable", "Common.Controls.Actions.TryAgain", fallback: "Try Again") /// Unblock %@ public static func unblockDomain(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Controls.Actions.UnblockDomain", String(describing: p1)) + return L10n.tr("Localizable", "Common.Controls.Actions.UnblockDomain", String(describing: p1), fallback: "Unblock %@") } } public enum Friendship { /// Block - public static let block = L10n.tr("Localizable", "Common.Controls.Friendship.Block") + public static let block = L10n.tr("Localizable", "Common.Controls.Friendship.Block", fallback: "Block") /// Block %@ public static func blockDomain(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Controls.Friendship.BlockDomain", String(describing: p1)) + return L10n.tr("Localizable", "Common.Controls.Friendship.BlockDomain", String(describing: p1), fallback: "Block %@") } /// Blocked - public static let blocked = L10n.tr("Localizable", "Common.Controls.Friendship.Blocked") + public static let blocked = L10n.tr("Localizable", "Common.Controls.Friendship.Blocked", fallback: "Blocked") /// Block %@ public static func blockUser(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Controls.Friendship.BlockUser", String(describing: p1)) + return L10n.tr("Localizable", "Common.Controls.Friendship.BlockUser", String(describing: p1), fallback: "Block %@") } /// Edit Info - public static let editInfo = L10n.tr("Localizable", "Common.Controls.Friendship.EditInfo") + public static let editInfo = L10n.tr("Localizable", "Common.Controls.Friendship.EditInfo", fallback: "Edit Info") /// Follow - public static let follow = L10n.tr("Localizable", "Common.Controls.Friendship.Follow") + public static let follow = L10n.tr("Localizable", "Common.Controls.Friendship.Follow", fallback: "Follow") /// Following - public static let following = L10n.tr("Localizable", "Common.Controls.Friendship.Following") + public static let following = L10n.tr("Localizable", "Common.Controls.Friendship.Following", fallback: "Following") /// Hide Reblogs - public static let hideReblogs = L10n.tr("Localizable", "Common.Controls.Friendship.HideReblogs") + public static let hideReblogs = L10n.tr("Localizable", "Common.Controls.Friendship.HideReblogs", fallback: "Hide Reblogs") /// Mute - public static let mute = L10n.tr("Localizable", "Common.Controls.Friendship.Mute") + public static let mute = L10n.tr("Localizable", "Common.Controls.Friendship.Mute", fallback: "Mute") /// Muted - public static let muted = L10n.tr("Localizable", "Common.Controls.Friendship.Muted") + public static let muted = L10n.tr("Localizable", "Common.Controls.Friendship.Muted", fallback: "Muted") /// Mute %@ public static func muteUser(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Controls.Friendship.MuteUser", String(describing: p1)) + return L10n.tr("Localizable", "Common.Controls.Friendship.MuteUser", String(describing: p1), fallback: "Mute %@") } /// Pending - public static let pending = L10n.tr("Localizable", "Common.Controls.Friendship.Pending") + public static let pending = L10n.tr("Localizable", "Common.Controls.Friendship.Pending", fallback: "Pending") /// Request - public static let request = L10n.tr("Localizable", "Common.Controls.Friendship.Request") + public static let request = L10n.tr("Localizable", "Common.Controls.Friendship.Request", fallback: "Request") /// Show Reblogs - public static let showReblogs = L10n.tr("Localizable", "Common.Controls.Friendship.ShowReblogs") + public static let showReblogs = L10n.tr("Localizable", "Common.Controls.Friendship.ShowReblogs", fallback: "Show Reblogs") /// Unblock - public static let unblock = L10n.tr("Localizable", "Common.Controls.Friendship.Unblock") + public static let unblock = L10n.tr("Localizable", "Common.Controls.Friendship.Unblock", fallback: "Unblock") /// Unblock %@ public static func unblockUser(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Controls.Friendship.UnblockUser", String(describing: p1)) + return L10n.tr("Localizable", "Common.Controls.Friendship.UnblockUser", String(describing: p1), fallback: "Unblock %@") } /// Unmute - public static let unmute = L10n.tr("Localizable", "Common.Controls.Friendship.Unmute") + public static let unmute = L10n.tr("Localizable", "Common.Controls.Friendship.Unmute", fallback: "Unmute") /// Unmute %@ public static func unmuteUser(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Controls.Friendship.UnmuteUser", String(describing: p1)) + return L10n.tr("Localizable", "Common.Controls.Friendship.UnmuteUser", String(describing: p1), fallback: "Unmute %@") } } public enum Keyboard { public enum Common { /// Compose New Post - public static let composeNewPost = L10n.tr("Localizable", "Common.Controls.Keyboard.Common.ComposeNewPost") + public static let composeNewPost = L10n.tr("Localizable", "Common.Controls.Keyboard.Common.ComposeNewPost", fallback: "Compose New Post") /// Open Settings - public static let openSettings = L10n.tr("Localizable", "Common.Controls.Keyboard.Common.OpenSettings") + public static let openSettings = L10n.tr("Localizable", "Common.Controls.Keyboard.Common.OpenSettings", fallback: "Open Settings") /// Show Favorites - public static let showFavorites = L10n.tr("Localizable", "Common.Controls.Keyboard.Common.ShowFavorites") + public static let showFavorites = L10n.tr("Localizable", "Common.Controls.Keyboard.Common.ShowFavorites", fallback: "Show Favorites") /// Switch to %@ public static func switchToTab(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Controls.Keyboard.Common.SwitchToTab", String(describing: p1)) + return L10n.tr("Localizable", "Common.Controls.Keyboard.Common.SwitchToTab", String(describing: p1), fallback: "Switch to %@") } } public enum SegmentedControl { /// Next Section - public static let nextSection = L10n.tr("Localizable", "Common.Controls.Keyboard.SegmentedControl.NextSection") + public static let nextSection = L10n.tr("Localizable", "Common.Controls.Keyboard.SegmentedControl.NextSection", fallback: "Next Section") /// Previous Section - public static let previousSection = L10n.tr("Localizable", "Common.Controls.Keyboard.SegmentedControl.PreviousSection") + public static let previousSection = L10n.tr("Localizable", "Common.Controls.Keyboard.SegmentedControl.PreviousSection", fallback: "Previous Section") } public enum Timeline { /// Next Post - public static let nextStatus = L10n.tr("Localizable", "Common.Controls.Keyboard.Timeline.NextStatus") + public static let nextStatus = L10n.tr("Localizable", "Common.Controls.Keyboard.Timeline.NextStatus", fallback: "Next Post") /// Open Author's Profile - public static let openAuthorProfile = L10n.tr("Localizable", "Common.Controls.Keyboard.Timeline.OpenAuthorProfile") + public static let openAuthorProfile = L10n.tr("Localizable", "Common.Controls.Keyboard.Timeline.OpenAuthorProfile", fallback: "Open Author's Profile") /// Open Reblogger's Profile - public static let openRebloggerProfile = L10n.tr("Localizable", "Common.Controls.Keyboard.Timeline.OpenRebloggerProfile") + public static let openRebloggerProfile = L10n.tr("Localizable", "Common.Controls.Keyboard.Timeline.OpenRebloggerProfile", fallback: "Open Reblogger's Profile") /// Open Post - public static let openStatus = L10n.tr("Localizable", "Common.Controls.Keyboard.Timeline.OpenStatus") + public static let openStatus = L10n.tr("Localizable", "Common.Controls.Keyboard.Timeline.OpenStatus", fallback: "Open Post") /// Preview Image - public static let previewImage = L10n.tr("Localizable", "Common.Controls.Keyboard.Timeline.PreviewImage") + public static let previewImage = L10n.tr("Localizable", "Common.Controls.Keyboard.Timeline.PreviewImage", fallback: "Preview Image") /// Previous Post - public static let previousStatus = L10n.tr("Localizable", "Common.Controls.Keyboard.Timeline.PreviousStatus") + public static let previousStatus = L10n.tr("Localizable", "Common.Controls.Keyboard.Timeline.PreviousStatus", fallback: "Previous Post") /// Reply to Post - public static let replyStatus = L10n.tr("Localizable", "Common.Controls.Keyboard.Timeline.ReplyStatus") + public static let replyStatus = L10n.tr("Localizable", "Common.Controls.Keyboard.Timeline.ReplyStatus", fallback: "Reply to Post") /// Toggle Content Warning - public static let toggleContentWarning = L10n.tr("Localizable", "Common.Controls.Keyboard.Timeline.ToggleContentWarning") + public static let toggleContentWarning = L10n.tr("Localizable", "Common.Controls.Keyboard.Timeline.ToggleContentWarning", fallback: "Toggle Content Warning") /// Toggle Favorite on Post - public static let toggleFavorite = L10n.tr("Localizable", "Common.Controls.Keyboard.Timeline.ToggleFavorite") + public static let toggleFavorite = L10n.tr("Localizable", "Common.Controls.Keyboard.Timeline.ToggleFavorite", fallback: "Toggle Favorite on Post") /// Toggle Reblog on Post - public static let toggleReblog = L10n.tr("Localizable", "Common.Controls.Keyboard.Timeline.ToggleReblog") + public static let toggleReblog = L10n.tr("Localizable", "Common.Controls.Keyboard.Timeline.ToggleReblog", fallback: "Toggle Reblog on Post") } } public enum Status { /// Content Warning - public static let contentWarning = L10n.tr("Localizable", "Common.Controls.Status.ContentWarning") + public static let contentWarning = L10n.tr("Localizable", "Common.Controls.Status.ContentWarning", fallback: "Content Warning") /// Tap anywhere to reveal - public static let mediaContentWarning = L10n.tr("Localizable", "Common.Controls.Status.MediaContentWarning") + public static let mediaContentWarning = L10n.tr("Localizable", "Common.Controls.Status.MediaContentWarning", fallback: "Tap anywhere to reveal") /// Sensitive Content - public static let sensitiveContent = L10n.tr("Localizable", "Common.Controls.Status.SensitiveContent") + public static let sensitiveContent = L10n.tr("Localizable", "Common.Controls.Status.SensitiveContent", fallback: "Sensitive Content") /// Show Post - public static let showPost = L10n.tr("Localizable", "Common.Controls.Status.ShowPost") + public static let showPost = L10n.tr("Localizable", "Common.Controls.Status.ShowPost", fallback: "Show Post") /// Show user profile - public static let showUserProfile = L10n.tr("Localizable", "Common.Controls.Status.ShowUserProfile") + public static let showUserProfile = L10n.tr("Localizable", "Common.Controls.Status.ShowUserProfile", fallback: "Show user profile") /// Tap to reveal - public static let tapToReveal = L10n.tr("Localizable", "Common.Controls.Status.TapToReveal") + public static let tapToReveal = L10n.tr("Localizable", "Common.Controls.Status.TapToReveal", fallback: "Tap to reveal") /// %@ reblogged public static func userReblogged(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Controls.Status.UserReblogged", String(describing: p1)) + return L10n.tr("Localizable", "Common.Controls.Status.UserReblogged", String(describing: p1), fallback: "%@ reblogged") } /// Replied to %@ public static func userRepliedTo(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Controls.Status.UserRepliedTo", String(describing: p1)) + return L10n.tr("Localizable", "Common.Controls.Status.UserRepliedTo", String(describing: p1), fallback: "Replied to %@") } public enum Actions { /// Favorite - public static let favorite = L10n.tr("Localizable", "Common.Controls.Status.Actions.Favorite") + public static let favorite = L10n.tr("Localizable", "Common.Controls.Status.Actions.Favorite", fallback: "Favorite") /// Hide - public static let hide = L10n.tr("Localizable", "Common.Controls.Status.Actions.Hide") + public static let hide = L10n.tr("Localizable", "Common.Controls.Status.Actions.Hide", fallback: "Hide") /// Menu - public static let menu = L10n.tr("Localizable", "Common.Controls.Status.Actions.Menu") + public static let menu = L10n.tr("Localizable", "Common.Controls.Status.Actions.Menu", fallback: "Menu") /// Reblog - public static let reblog = L10n.tr("Localizable", "Common.Controls.Status.Actions.Reblog") + public static let reblog = L10n.tr("Localizable", "Common.Controls.Status.Actions.Reblog", fallback: "Reblog") /// Reply - public static let reply = L10n.tr("Localizable", "Common.Controls.Status.Actions.Reply") + public static let reply = L10n.tr("Localizable", "Common.Controls.Status.Actions.Reply", fallback: "Reply") /// Show GIF - public static let showGif = L10n.tr("Localizable", "Common.Controls.Status.Actions.ShowGif") + public static let showGif = L10n.tr("Localizable", "Common.Controls.Status.Actions.ShowGif", fallback: "Show GIF") /// Show image - public static let showImage = L10n.tr("Localizable", "Common.Controls.Status.Actions.ShowImage") + public static let showImage = L10n.tr("Localizable", "Common.Controls.Status.Actions.ShowImage", fallback: "Show image") /// Show video player - public static let showVideoPlayer = L10n.tr("Localizable", "Common.Controls.Status.Actions.ShowVideoPlayer") + public static let showVideoPlayer = L10n.tr("Localizable", "Common.Controls.Status.Actions.ShowVideoPlayer", fallback: "Show video player") /// Tap then hold to show menu - public static let tapThenHoldToShowMenu = L10n.tr("Localizable", "Common.Controls.Status.Actions.TapThenHoldToShowMenu") + public static let tapThenHoldToShowMenu = L10n.tr("Localizable", "Common.Controls.Status.Actions.TapThenHoldToShowMenu", fallback: "Tap then hold to show menu") /// Unfavorite - public static let unfavorite = L10n.tr("Localizable", "Common.Controls.Status.Actions.Unfavorite") + public static let unfavorite = L10n.tr("Localizable", "Common.Controls.Status.Actions.Unfavorite", fallback: "Unfavorite") /// Undo reblog - public static let unreblog = L10n.tr("Localizable", "Common.Controls.Status.Actions.Unreblog") + public static let unreblog = L10n.tr("Localizable", "Common.Controls.Status.Actions.Unreblog", fallback: "Undo reblog") } public enum MetaEntity { /// Email address: %@ public static func email(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Controls.Status.MetaEntity.Email", String(describing: p1)) + return L10n.tr("Localizable", "Common.Controls.Status.MetaEntity.Email", String(describing: p1), fallback: "Email address: %@") } - /// Hastag %@ + /// Hashtag: %@ public static func hashtag(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Controls.Status.MetaEntity.Hashtag", String(describing: p1)) + return L10n.tr("Localizable", "Common.Controls.Status.MetaEntity.Hashtag", String(describing: p1), fallback: "Hashtag: %@") } /// Show Profile: %@ public static func mention(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Controls.Status.MetaEntity.Mention", String(describing: p1)) + return L10n.tr("Localizable", "Common.Controls.Status.MetaEntity.Mention", String(describing: p1), fallback: "Show Profile: %@") } /// Link: %@ public static func url(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Controls.Status.MetaEntity.Url", String(describing: p1)) + return L10n.tr("Localizable", "Common.Controls.Status.MetaEntity.Url", String(describing: p1), fallback: "Link: %@") } } public enum Poll { /// Closed - public static let closed = L10n.tr("Localizable", "Common.Controls.Status.Poll.Closed") + public static let closed = L10n.tr("Localizable", "Common.Controls.Status.Poll.Closed", fallback: "Closed") /// Vote - public static let vote = L10n.tr("Localizable", "Common.Controls.Status.Poll.Vote") + public static let vote = L10n.tr("Localizable", "Common.Controls.Status.Poll.Vote", fallback: "Vote") } public enum Tag { /// Email - public static let email = L10n.tr("Localizable", "Common.Controls.Status.Tag.Email") + public static let email = L10n.tr("Localizable", "Common.Controls.Status.Tag.Email", fallback: "Email") /// Emoji - public static let emoji = L10n.tr("Localizable", "Common.Controls.Status.Tag.Emoji") + public static let emoji = L10n.tr("Localizable", "Common.Controls.Status.Tag.Emoji", fallback: "Emoji") /// Hashtag - public static let hashtag = L10n.tr("Localizable", "Common.Controls.Status.Tag.Hashtag") + public static let hashtag = L10n.tr("Localizable", "Common.Controls.Status.Tag.Hashtag", fallback: "Hashtag") /// Link - public static let link = L10n.tr("Localizable", "Common.Controls.Status.Tag.Link") + public static let link = L10n.tr("Localizable", "Common.Controls.Status.Tag.Link", fallback: "Link") /// Mention - public static let mention = L10n.tr("Localizable", "Common.Controls.Status.Tag.Mention") + public static let mention = L10n.tr("Localizable", "Common.Controls.Status.Tag.Mention", fallback: "Mention") /// URL - public static let url = L10n.tr("Localizable", "Common.Controls.Status.Tag.Url") + public static let url = L10n.tr("Localizable", "Common.Controls.Status.Tag.Url", fallback: "URL") } public enum Visibility { /// Only mentioned user can see this post. - public static let direct = L10n.tr("Localizable", "Common.Controls.Status.Visibility.Direct") + public static let direct = L10n.tr("Localizable", "Common.Controls.Status.Visibility.Direct", fallback: "Only mentioned user can see this post.") /// Only their followers can see this post. - public static let `private` = L10n.tr("Localizable", "Common.Controls.Status.Visibility.Private") + public static let `private` = L10n.tr("Localizable", "Common.Controls.Status.Visibility.Private", fallback: "Only their followers can see this post.") /// Only my followers can see this post. - public static let privateFromMe = L10n.tr("Localizable", "Common.Controls.Status.Visibility.PrivateFromMe") + public static let privateFromMe = L10n.tr("Localizable", "Common.Controls.Status.Visibility.PrivateFromMe", fallback: "Only my followers can see this post.") /// Everyone can see this post but not display in the public timeline. - public static let unlisted = L10n.tr("Localizable", "Common.Controls.Status.Visibility.Unlisted") + public static let unlisted = L10n.tr("Localizable", "Common.Controls.Status.Visibility.Unlisted", fallback: "Everyone can see this post but not display in the public timeline.") } } public enum Tabs { /// Home - public static let home = L10n.tr("Localizable", "Common.Controls.Tabs.Home") - /// Notification - public static let notification = L10n.tr("Localizable", "Common.Controls.Tabs.Notification") + public static let home = L10n.tr("Localizable", "Common.Controls.Tabs.Home", fallback: "Home") + /// Notifications + public static let notifications = L10n.tr("Localizable", "Common.Controls.Tabs.Notifications", fallback: "Notifications") /// Profile - public static let profile = L10n.tr("Localizable", "Common.Controls.Tabs.Profile") + public static let profile = L10n.tr("Localizable", "Common.Controls.Tabs.Profile", fallback: "Profile") /// Search - public static let search = L10n.tr("Localizable", "Common.Controls.Tabs.Search") + public static let search = L10n.tr("Localizable", "Common.Controls.Tabs.Search", fallback: "Search") } public enum Timeline { /// Filtered - public static let filtered = L10n.tr("Localizable", "Common.Controls.Timeline.Filtered") + public static let filtered = L10n.tr("Localizable", "Common.Controls.Timeline.Filtered", fallback: "Filtered") public enum Header { - /// You can’t view this user’s profile\nuntil they unblock you. - public static let blockedWarning = L10n.tr("Localizable", "Common.Controls.Timeline.Header.BlockedWarning") - /// You can’t view this user's profile\nuntil you unblock them.\nYour profile looks like this to them. - public static let blockingWarning = L10n.tr("Localizable", "Common.Controls.Timeline.Header.BlockingWarning") + /// You can’t view this user’s profile + /// until they unblock you. + public static let blockedWarning = L10n.tr("Localizable", "Common.Controls.Timeline.Header.BlockedWarning", fallback: "You can’t view this user’s profile\nuntil they unblock you.") + /// You can’t view this user's profile + /// until you unblock them. + /// Your profile looks like this to them. + public static let blockingWarning = L10n.tr("Localizable", "Common.Controls.Timeline.Header.BlockingWarning", fallback: "You can’t view this user's profile\nuntil you unblock them.\nYour profile looks like this to them.") /// No Post Found - public static let noStatusFound = L10n.tr("Localizable", "Common.Controls.Timeline.Header.NoStatusFound") + public static let noStatusFound = L10n.tr("Localizable", "Common.Controls.Timeline.Header.NoStatusFound", fallback: "No Post Found") /// This user has been suspended. - public static let suspendedWarning = L10n.tr("Localizable", "Common.Controls.Timeline.Header.SuspendedWarning") - /// You can’t view %@’s profile\nuntil they unblock you. + public static let suspendedWarning = L10n.tr("Localizable", "Common.Controls.Timeline.Header.SuspendedWarning", fallback: "This user has been suspended.") + /// You can’t view %@’s profile + /// until they unblock you. public static func userBlockedWarning(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Controls.Timeline.Header.UserBlockedWarning", String(describing: p1)) + return L10n.tr("Localizable", "Common.Controls.Timeline.Header.UserBlockedWarning", String(describing: p1), fallback: "You can’t view %@’s profile\nuntil they unblock you.") } - /// You can’t view %@’s profile\nuntil you unblock them.\nYour profile looks like this to them. + /// You can’t view %@’s profile + /// until you unblock them. + /// Your profile looks like this to them. public static func userBlockingWarning(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Controls.Timeline.Header.UserBlockingWarning", String(describing: p1)) + return L10n.tr("Localizable", "Common.Controls.Timeline.Header.UserBlockingWarning", String(describing: p1), fallback: "You can’t view %@’s profile\nuntil you unblock them.\nYour profile looks like this to them.") } /// %@’s account has been suspended. public static func userSuspendedWarning(_ p1: Any) -> String { - return L10n.tr("Localizable", "Common.Controls.Timeline.Header.UserSuspendedWarning", String(describing: p1)) + return L10n.tr("Localizable", "Common.Controls.Timeline.Header.UserSuspendedWarning", String(describing: p1), fallback: "%@’s account has been suspended.") } } public enum Loader { /// Loading missing posts... - public static let loadingMissingPosts = L10n.tr("Localizable", "Common.Controls.Timeline.Loader.LoadingMissingPosts") + public static let loadingMissingPosts = L10n.tr("Localizable", "Common.Controls.Timeline.Loader.LoadingMissingPosts", fallback: "Loading missing posts...") /// Load missing posts - public static let loadMissingPosts = L10n.tr("Localizable", "Common.Controls.Timeline.Loader.LoadMissingPosts") + public static let loadMissingPosts = L10n.tr("Localizable", "Common.Controls.Timeline.Loader.LoadMissingPosts", fallback: "Load missing posts") /// Show more replies - public static let showMoreReplies = L10n.tr("Localizable", "Common.Controls.Timeline.Loader.ShowMoreReplies") + public static let showMoreReplies = L10n.tr("Localizable", "Common.Controls.Timeline.Loader.ShowMoreReplies", fallback: "Show more replies") } public enum Timestamp { /// Now - public static let now = L10n.tr("Localizable", "Common.Controls.Timeline.Timestamp.Now") + public static let now = L10n.tr("Localizable", "Common.Controls.Timeline.Timestamp.Now", fallback: "Now") } } } } - public enum Scene { public enum AccountList { /// Add Account - public static let addAccount = L10n.tr("Localizable", "Scene.AccountList.AddAccount") + public static let addAccount = L10n.tr("Localizable", "Scene.AccountList.AddAccount", fallback: "Add Account") /// Dismiss Account Switcher - public static let dismissAccountSwitcher = L10n.tr("Localizable", "Scene.AccountList.DismissAccountSwitcher") + public static let dismissAccountSwitcher = L10n.tr("Localizable", "Scene.AccountList.DismissAccountSwitcher", fallback: "Dismiss Account Switcher") /// Current selected profile: %@. Double tap then hold to show account switcher public static func tabBarHint(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.AccountList.TabBarHint", String(describing: p1)) + return L10n.tr("Localizable", "Scene.AccountList.TabBarHint", String(describing: p1), fallback: "Current selected profile: %@. Double tap then hold to show account switcher") } } public enum Bookmark { /// Bookmarks - public static let title = L10n.tr("Localizable", "Scene.Bookmark.Title") + public static let title = L10n.tr("Localizable", "Scene.Bookmark.Title", fallback: "Bookmarks") } public enum Compose { /// Publish - public static let composeAction = L10n.tr("Localizable", "Scene.Compose.ComposeAction") + public static let composeAction = L10n.tr("Localizable", "Scene.Compose.ComposeAction", fallback: "Publish") /// Type or paste what’s on your mind - public static let contentInputPlaceholder = L10n.tr("Localizable", "Scene.Compose.ContentInputPlaceholder") + public static let contentInputPlaceholder = L10n.tr("Localizable", "Scene.Compose.ContentInputPlaceholder", fallback: "Type or paste what’s on your mind") /// replying to %@ public static func replyingToUser(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Compose.ReplyingToUser", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Compose.ReplyingToUser", String(describing: p1), fallback: "replying to %@") } public enum Accessibility { /// Add Attachment - public static let appendAttachment = L10n.tr("Localizable", "Scene.Compose.Accessibility.AppendAttachment") + public static let appendAttachment = L10n.tr("Localizable", "Scene.Compose.Accessibility.AppendAttachment", fallback: "Add Attachment") /// Add Poll - public static let appendPoll = L10n.tr("Localizable", "Scene.Compose.Accessibility.AppendPoll") + public static let appendPoll = L10n.tr("Localizable", "Scene.Compose.Accessibility.AppendPoll", fallback: "Add Poll") /// Custom Emoji Picker - public static let customEmojiPicker = L10n.tr("Localizable", "Scene.Compose.Accessibility.CustomEmojiPicker") + public static let customEmojiPicker = L10n.tr("Localizable", "Scene.Compose.Accessibility.CustomEmojiPicker", fallback: "Custom Emoji Picker") /// Disable Content Warning - public static let disableContentWarning = L10n.tr("Localizable", "Scene.Compose.Accessibility.DisableContentWarning") + public static let disableContentWarning = L10n.tr("Localizable", "Scene.Compose.Accessibility.DisableContentWarning", fallback: "Disable Content Warning") /// Enable Content Warning - public static let enableContentWarning = L10n.tr("Localizable", "Scene.Compose.Accessibility.EnableContentWarning") + public static let enableContentWarning = L10n.tr("Localizable", "Scene.Compose.Accessibility.EnableContentWarning", fallback: "Enable Content Warning") + /// Posting as %@ + public static func postingAs(_ p1: Any) -> String { + return L10n.tr("Localizable", "Scene.Compose.Accessibility.PostingAs", String(describing: p1), fallback: "Posting as %@") + } + /// Post Options + public static let postOptions = L10n.tr("Localizable", "Scene.Compose.Accessibility.PostOptions", fallback: "Post Options") /// Post Visibility Menu - public static let postVisibilityMenu = L10n.tr("Localizable", "Scene.Compose.Accessibility.PostVisibilityMenu") + public static let postVisibilityMenu = L10n.tr("Localizable", "Scene.Compose.Accessibility.PostVisibilityMenu", fallback: "Post Visibility Menu") /// Remove Poll - public static let removePoll = L10n.tr("Localizable", "Scene.Compose.Accessibility.RemovePoll") + public static let removePoll = L10n.tr("Localizable", "Scene.Compose.Accessibility.RemovePoll", fallback: "Remove Poll") } public enum Attachment { - /// This %@ is broken and can’t be\nuploaded to Mastodon. + /// This %@ is broken and can’t be + /// uploaded to Mastodon. public static func attachmentBroken(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Compose.Attachment.AttachmentBroken", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Compose.Attachment.AttachmentBroken", String(describing: p1), fallback: "This %@ is broken and can’t be\nuploaded to Mastodon.") } + /// Attachment too large + public static let attachmentTooLarge = L10n.tr("Localizable", "Scene.Compose.Attachment.AttachmentTooLarge", fallback: "Attachment too large") + /// Can not recognize this media attachment + public static let canNotRecognizeThisMediaAttachment = L10n.tr("Localizable", "Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment", fallback: "Can not recognize this media attachment") + /// Compressing... + public static let compressingState = L10n.tr("Localizable", "Scene.Compose.Attachment.CompressingState", fallback: "Compressing...") /// Describe the photo for the visually-impaired... - public static let descriptionPhoto = L10n.tr("Localizable", "Scene.Compose.Attachment.DescriptionPhoto") + public static let descriptionPhoto = L10n.tr("Localizable", "Scene.Compose.Attachment.DescriptionPhoto", fallback: "Describe the photo for the visually-impaired...") /// Describe the video for the visually-impaired... - public static let descriptionVideo = L10n.tr("Localizable", "Scene.Compose.Attachment.DescriptionVideo") + public static let descriptionVideo = L10n.tr("Localizable", "Scene.Compose.Attachment.DescriptionVideo", fallback: "Describe the video for the visually-impaired...") + /// Load Failed + public static let loadFailed = L10n.tr("Localizable", "Scene.Compose.Attachment.LoadFailed", fallback: "Load Failed") /// photo - public static let photo = L10n.tr("Localizable", "Scene.Compose.Attachment.Photo") + public static let photo = L10n.tr("Localizable", "Scene.Compose.Attachment.Photo", fallback: "photo") + /// Server Processing... + public static let serverProcessingState = L10n.tr("Localizable", "Scene.Compose.Attachment.ServerProcessingState", fallback: "Server Processing...") + /// Upload Failed + public static let uploadFailed = L10n.tr("Localizable", "Scene.Compose.Attachment.UploadFailed", fallback: "Upload Failed") /// video - public static let video = L10n.tr("Localizable", "Scene.Compose.Attachment.Video") + public static let video = L10n.tr("Localizable", "Scene.Compose.Attachment.Video", fallback: "video") } public enum AutoComplete { /// Space to add - public static let spaceToAdd = L10n.tr("Localizable", "Scene.Compose.AutoComplete.SpaceToAdd") + public static let spaceToAdd = L10n.tr("Localizable", "Scene.Compose.AutoComplete.SpaceToAdd", fallback: "Space to add") } public enum ContentWarning { /// Write an accurate warning here... - public static let placeholder = L10n.tr("Localizable", "Scene.Compose.ContentWarning.Placeholder") + public static let placeholder = L10n.tr("Localizable", "Scene.Compose.ContentWarning.Placeholder", fallback: "Write an accurate warning here...") } public enum Keyboard { /// Add Attachment - %@ public static func appendAttachmentEntry(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Compose.Keyboard.AppendAttachmentEntry", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Compose.Keyboard.AppendAttachmentEntry", String(describing: p1), fallback: "Add Attachment - %@") } /// Discard Post - public static let discardPost = L10n.tr("Localizable", "Scene.Compose.Keyboard.DiscardPost") + public static let discardPost = L10n.tr("Localizable", "Scene.Compose.Keyboard.DiscardPost", fallback: "Discard Post") /// Publish Post - public static let publishPost = L10n.tr("Localizable", "Scene.Compose.Keyboard.PublishPost") + public static let publishPost = L10n.tr("Localizable", "Scene.Compose.Keyboard.PublishPost", fallback: "Publish Post") /// Select Visibility - %@ public static func selectVisibilityEntry(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Compose.Keyboard.SelectVisibilityEntry", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Compose.Keyboard.SelectVisibilityEntry", String(describing: p1), fallback: "Select Visibility - %@") } /// Toggle Content Warning - public static let toggleContentWarning = L10n.tr("Localizable", "Scene.Compose.Keyboard.ToggleContentWarning") + public static let toggleContentWarning = L10n.tr("Localizable", "Scene.Compose.Keyboard.ToggleContentWarning", fallback: "Toggle Content Warning") /// Toggle Poll - public static let togglePoll = L10n.tr("Localizable", "Scene.Compose.Keyboard.TogglePoll") + public static let togglePoll = L10n.tr("Localizable", "Scene.Compose.Keyboard.TogglePoll", fallback: "Toggle Poll") } public enum MediaSelection { /// Browse - public static let browse = L10n.tr("Localizable", "Scene.Compose.MediaSelection.Browse") + public static let browse = L10n.tr("Localizable", "Scene.Compose.MediaSelection.Browse", fallback: "Browse") /// Take Photo - public static let camera = L10n.tr("Localizable", "Scene.Compose.MediaSelection.Camera") + public static let camera = L10n.tr("Localizable", "Scene.Compose.MediaSelection.Camera", fallback: "Take Photo") /// Photo Library - public static let photoLibrary = L10n.tr("Localizable", "Scene.Compose.MediaSelection.PhotoLibrary") + public static let photoLibrary = L10n.tr("Localizable", "Scene.Compose.MediaSelection.PhotoLibrary", fallback: "Photo Library") } public enum Poll { /// Duration: %@ public static func durationTime(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Compose.Poll.DurationTime", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Compose.Poll.DurationTime", String(describing: p1), fallback: "Duration: %@") } /// 1 Day - public static let oneDay = L10n.tr("Localizable", "Scene.Compose.Poll.OneDay") + public static let oneDay = L10n.tr("Localizable", "Scene.Compose.Poll.OneDay", fallback: "1 Day") /// 1 Hour - public static let oneHour = L10n.tr("Localizable", "Scene.Compose.Poll.OneHour") + public static let oneHour = L10n.tr("Localizable", "Scene.Compose.Poll.OneHour", fallback: "1 Hour") /// Option %ld public static func optionNumber(_ p1: Int) -> String { - return L10n.tr("Localizable", "Scene.Compose.Poll.OptionNumber", p1) + return L10n.tr("Localizable", "Scene.Compose.Poll.OptionNumber", p1, fallback: "Option %ld") } /// 7 Days - public static let sevenDays = L10n.tr("Localizable", "Scene.Compose.Poll.SevenDays") + public static let sevenDays = L10n.tr("Localizable", "Scene.Compose.Poll.SevenDays", fallback: "7 Days") /// 6 Hours - public static let sixHours = L10n.tr("Localizable", "Scene.Compose.Poll.SixHours") + public static let sixHours = L10n.tr("Localizable", "Scene.Compose.Poll.SixHours", fallback: "6 Hours") + /// The poll has empty option + public static let thePollHasEmptyOption = L10n.tr("Localizable", "Scene.Compose.Poll.ThePollHasEmptyOption", fallback: "The poll has empty option") + /// The poll is invalid + public static let thePollIsInvalid = L10n.tr("Localizable", "Scene.Compose.Poll.ThePollIsInvalid", fallback: "The poll is invalid") /// 30 minutes - public static let thirtyMinutes = L10n.tr("Localizable", "Scene.Compose.Poll.ThirtyMinutes") + public static let thirtyMinutes = L10n.tr("Localizable", "Scene.Compose.Poll.ThirtyMinutes", fallback: "30 minutes") /// 3 Days - public static let threeDays = L10n.tr("Localizable", "Scene.Compose.Poll.ThreeDays") + public static let threeDays = L10n.tr("Localizable", "Scene.Compose.Poll.ThreeDays", fallback: "3 Days") } public enum Title { /// New Post - public static let newPost = L10n.tr("Localizable", "Scene.Compose.Title.NewPost") + public static let newPost = L10n.tr("Localizable", "Scene.Compose.Title.NewPost", fallback: "New Post") /// New Reply - public static let newReply = L10n.tr("Localizable", "Scene.Compose.Title.NewReply") + public static let newReply = L10n.tr("Localizable", "Scene.Compose.Title.NewReply", fallback: "New Reply") } public enum Visibility { /// Only people I mention - public static let direct = L10n.tr("Localizable", "Scene.Compose.Visibility.Direct") + public static let direct = L10n.tr("Localizable", "Scene.Compose.Visibility.Direct", fallback: "Only people I mention") /// Followers only - public static let `private` = L10n.tr("Localizable", "Scene.Compose.Visibility.Private") + public static let `private` = L10n.tr("Localizable", "Scene.Compose.Visibility.Private", fallback: "Followers only") /// Public - public static let `public` = L10n.tr("Localizable", "Scene.Compose.Visibility.Public") + public static let `public` = L10n.tr("Localizable", "Scene.Compose.Visibility.Public", fallback: "Public") /// Unlisted - public static let unlisted = L10n.tr("Localizable", "Scene.Compose.Visibility.Unlisted") + public static let unlisted = L10n.tr("Localizable", "Scene.Compose.Visibility.Unlisted", fallback: "Unlisted") } } public enum ConfirmEmail { /// Tap the link we emailed to you to verify your account. - public static let subtitle = L10n.tr("Localizable", "Scene.ConfirmEmail.Subtitle") + public static let subtitle = L10n.tr("Localizable", "Scene.ConfirmEmail.Subtitle", fallback: "Tap the link we emailed to you to verify your account.") /// Tap the link we emailed to you to verify your account - public static let tapTheLinkWeEmailedToYouToVerifyYourAccount = L10n.tr("Localizable", "Scene.ConfirmEmail.TapTheLinkWeEmailedToYouToVerifyYourAccount") + public static let tapTheLinkWeEmailedToYouToVerifyYourAccount = L10n.tr("Localizable", "Scene.ConfirmEmail.TapTheLinkWeEmailedToYouToVerifyYourAccount", fallback: "Tap the link we emailed to you to verify your account") /// One last thing. - public static let title = L10n.tr("Localizable", "Scene.ConfirmEmail.Title") + public static let title = L10n.tr("Localizable", "Scene.ConfirmEmail.Title", fallback: "One last thing.") public enum Button { /// Open Email App - public static let openEmailApp = L10n.tr("Localizable", "Scene.ConfirmEmail.Button.OpenEmailApp") + public static let openEmailApp = L10n.tr("Localizable", "Scene.ConfirmEmail.Button.OpenEmailApp", fallback: "Open Email App") /// Resend - public static let resend = L10n.tr("Localizable", "Scene.ConfirmEmail.Button.Resend") + public static let resend = L10n.tr("Localizable", "Scene.ConfirmEmail.Button.Resend", fallback: "Resend") } public enum DontReceiveEmail { /// Check if your email address is correct as well as your junk folder if you haven’t. - public static let description = L10n.tr("Localizable", "Scene.ConfirmEmail.DontReceiveEmail.Description") + public static let description = L10n.tr("Localizable", "Scene.ConfirmEmail.DontReceiveEmail.Description", fallback: "Check if your email address is correct as well as your junk folder if you haven’t.") /// Resend Email - public static let resendEmail = L10n.tr("Localizable", "Scene.ConfirmEmail.DontReceiveEmail.ResendEmail") + public static let resendEmail = L10n.tr("Localizable", "Scene.ConfirmEmail.DontReceiveEmail.ResendEmail", fallback: "Resend Email") /// Check your email - public static let title = L10n.tr("Localizable", "Scene.ConfirmEmail.DontReceiveEmail.Title") + public static let title = L10n.tr("Localizable", "Scene.ConfirmEmail.DontReceiveEmail.Title", fallback: "Check your email") } public enum OpenEmailApp { /// We just sent you an email. Check your junk folder if you haven’t. - public static let description = L10n.tr("Localizable", "Scene.ConfirmEmail.OpenEmailApp.Description") + public static let description = L10n.tr("Localizable", "Scene.ConfirmEmail.OpenEmailApp.Description", fallback: "We just sent you an email. Check your junk folder if you haven’t.") /// Mail - public static let mail = L10n.tr("Localizable", "Scene.ConfirmEmail.OpenEmailApp.Mail") + public static let mail = L10n.tr("Localizable", "Scene.ConfirmEmail.OpenEmailApp.Mail", fallback: "Mail") /// Open Email Client - public static let openEmailClient = L10n.tr("Localizable", "Scene.ConfirmEmail.OpenEmailApp.OpenEmailClient") + public static let openEmailClient = L10n.tr("Localizable", "Scene.ConfirmEmail.OpenEmailApp.OpenEmailClient", fallback: "Open Email Client") /// Check your inbox. - public static let title = L10n.tr("Localizable", "Scene.ConfirmEmail.OpenEmailApp.Title") + public static let title = L10n.tr("Localizable", "Scene.ConfirmEmail.OpenEmailApp.Title", fallback: "Check your inbox.") } } public enum Discovery { /// These are the posts gaining traction in your corner of Mastodon. - public static let intro = L10n.tr("Localizable", "Scene.Discovery.Intro") + public static let intro = L10n.tr("Localizable", "Scene.Discovery.Intro", fallback: "These are the posts gaining traction in your corner of Mastodon.") public enum Tabs { /// Community - public static let community = L10n.tr("Localizable", "Scene.Discovery.Tabs.Community") + public static let community = L10n.tr("Localizable", "Scene.Discovery.Tabs.Community", fallback: "Community") /// For You - public static let forYou = L10n.tr("Localizable", "Scene.Discovery.Tabs.ForYou") + public static let forYou = L10n.tr("Localizable", "Scene.Discovery.Tabs.ForYou", fallback: "For You") /// Hashtags - public static let hashtags = L10n.tr("Localizable", "Scene.Discovery.Tabs.Hashtags") + public static let hashtags = L10n.tr("Localizable", "Scene.Discovery.Tabs.Hashtags", fallback: "Hashtags") /// News - public static let news = L10n.tr("Localizable", "Scene.Discovery.Tabs.News") + public static let news = L10n.tr("Localizable", "Scene.Discovery.Tabs.News", fallback: "News") /// Posts - public static let posts = L10n.tr("Localizable", "Scene.Discovery.Tabs.Posts") + public static let posts = L10n.tr("Localizable", "Scene.Discovery.Tabs.Posts", fallback: "Posts") } } public enum Familiarfollowers { /// Followed by %@ public static func followedByNames(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Familiarfollowers.FollowedByNames", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Familiarfollowers.FollowedByNames", String(describing: p1), fallback: "Followed by %@") } /// Followers you familiar - public static let title = L10n.tr("Localizable", "Scene.Familiarfollowers.Title") + public static let title = L10n.tr("Localizable", "Scene.Familiarfollowers.Title", fallback: "Followers you familiar") } public enum Favorite { /// Your Favorites - public static let title = L10n.tr("Localizable", "Scene.Favorite.Title") + public static let title = L10n.tr("Localizable", "Scene.Favorite.Title", fallback: "Your Favorites") } public enum FavoritedBy { /// Favorited By - public static let title = L10n.tr("Localizable", "Scene.FavoritedBy.Title") + public static let title = L10n.tr("Localizable", "Scene.FavoritedBy.Title", fallback: "Favorited By") } public enum Follower { /// Followers from other servers are not displayed. - public static let footer = L10n.tr("Localizable", "Scene.Follower.Footer") + public static let footer = L10n.tr("Localizable", "Scene.Follower.Footer", fallback: "Followers from other servers are not displayed.") /// follower - public static let title = L10n.tr("Localizable", "Scene.Follower.Title") + public static let title = L10n.tr("Localizable", "Scene.Follower.Title", fallback: "follower") } public enum Following { /// Follows from other servers are not displayed. - public static let footer = L10n.tr("Localizable", "Scene.Following.Footer") + public static let footer = L10n.tr("Localizable", "Scene.Following.Footer", fallback: "Follows from other servers are not displayed.") /// following - public static let title = L10n.tr("Localizable", "Scene.Following.Title") + public static let title = L10n.tr("Localizable", "Scene.Following.Title", fallback: "following") } public enum HomeTimeline { /// Home - public static let title = L10n.tr("Localizable", "Scene.HomeTimeline.Title") + public static let title = L10n.tr("Localizable", "Scene.HomeTimeline.Title", fallback: "Home") public enum NavigationBarState { /// See new posts - public static let newPosts = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.NewPosts") + public static let newPosts = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.NewPosts", fallback: "See new posts") /// Offline - public static let offline = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.Offline") + public static let offline = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.Offline", fallback: "Offline") /// Published! - public static let published = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.Published") + public static let published = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.Published", fallback: "Published!") /// Publishing post... - public static let publishing = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.Publishing") + public static let publishing = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.Publishing", fallback: "Publishing post...") public enum Accessibility { /// Tap to scroll to top and tap again to previous location - public static let logoHint = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.Accessibility.LogoHint") + public static let logoHint = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.Accessibility.LogoHint", fallback: "Tap to scroll to top and tap again to previous location") /// Logo Button - public static let logoLabel = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.Accessibility.LogoLabel") + public static let logoLabel = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.Accessibility.LogoLabel", fallback: "Logo Button") } } } + public enum Login { + /// Log you in on the server you created your account on. + public static let subtitle = L10n.tr("Localizable", "Scene.Login.Subtitle", fallback: "Log you in on the server you created your account on.") + /// Welcome back + public static let title = L10n.tr("Localizable", "Scene.Login.Title", fallback: "Welcome back") + public enum ServerSearchField { + /// Enter URL or search for your server + public static let placeholder = L10n.tr("Localizable", "Scene.Login.ServerSearchField.Placeholder", fallback: "Enter URL or search for your server") + } + } public enum Notification { public enum FollowRequest { /// Accept - public static let accept = L10n.tr("Localizable", "Scene.Notification.FollowRequest.Accept") + public static let accept = L10n.tr("Localizable", "Scene.Notification.FollowRequest.Accept", fallback: "Accept") /// Accepted - public static let accepted = L10n.tr("Localizable", "Scene.Notification.FollowRequest.Accepted") + public static let accepted = L10n.tr("Localizable", "Scene.Notification.FollowRequest.Accepted", fallback: "Accepted") /// reject - public static let reject = L10n.tr("Localizable", "Scene.Notification.FollowRequest.Reject") + public static let reject = L10n.tr("Localizable", "Scene.Notification.FollowRequest.Reject", fallback: "reject") /// Rejected - public static let rejected = L10n.tr("Localizable", "Scene.Notification.FollowRequest.Rejected") + public static let rejected = L10n.tr("Localizable", "Scene.Notification.FollowRequest.Rejected", fallback: "Rejected") } public enum Keyobard { /// Show Everything - public static let showEverything = L10n.tr("Localizable", "Scene.Notification.Keyobard.ShowEverything") + public static let showEverything = L10n.tr("Localizable", "Scene.Notification.Keyobard.ShowEverything", fallback: "Show Everything") /// Show Mentions - public static let showMentions = L10n.tr("Localizable", "Scene.Notification.Keyobard.ShowMentions") + public static let showMentions = L10n.tr("Localizable", "Scene.Notification.Keyobard.ShowMentions", fallback: "Show Mentions") } public enum NotificationDescription { /// favorited your post - public static let favoritedYourPost = L10n.tr("Localizable", "Scene.Notification.NotificationDescription.FavoritedYourPost") + public static let favoritedYourPost = L10n.tr("Localizable", "Scene.Notification.NotificationDescription.FavoritedYourPost", fallback: "favorited your post") /// followed you - public static let followedYou = L10n.tr("Localizable", "Scene.Notification.NotificationDescription.FollowedYou") + public static let followedYou = L10n.tr("Localizable", "Scene.Notification.NotificationDescription.FollowedYou", fallback: "followed you") /// mentioned you - public static let mentionedYou = L10n.tr("Localizable", "Scene.Notification.NotificationDescription.MentionedYou") + public static let mentionedYou = L10n.tr("Localizable", "Scene.Notification.NotificationDescription.MentionedYou", fallback: "mentioned you") /// poll has ended - public static let pollHasEnded = L10n.tr("Localizable", "Scene.Notification.NotificationDescription.PollHasEnded") + public static let pollHasEnded = L10n.tr("Localizable", "Scene.Notification.NotificationDescription.PollHasEnded", fallback: "poll has ended") /// reblogged your post - public static let rebloggedYourPost = L10n.tr("Localizable", "Scene.Notification.NotificationDescription.RebloggedYourPost") + public static let rebloggedYourPost = L10n.tr("Localizable", "Scene.Notification.NotificationDescription.RebloggedYourPost", fallback: "reblogged your post") /// request to follow you - public static let requestToFollowYou = L10n.tr("Localizable", "Scene.Notification.NotificationDescription.RequestToFollowYou") + public static let requestToFollowYou = L10n.tr("Localizable", "Scene.Notification.NotificationDescription.RequestToFollowYou", fallback: "request to follow you") } public enum Title { /// Everything - public static let everything = L10n.tr("Localizable", "Scene.Notification.Title.Everything") + public static let everything = L10n.tr("Localizable", "Scene.Notification.Title.Everything", fallback: "Everything") /// Mentions - public static let mentions = L10n.tr("Localizable", "Scene.Notification.Title.Mentions") + public static let mentions = L10n.tr("Localizable", "Scene.Notification.Title.Mentions", fallback: "Mentions") } } public enum Preview { public enum Keyboard { /// Close Preview - public static let closePreview = L10n.tr("Localizable", "Scene.Preview.Keyboard.ClosePreview") + public static let closePreview = L10n.tr("Localizable", "Scene.Preview.Keyboard.ClosePreview", fallback: "Close Preview") /// Show Next - public static let showNext = L10n.tr("Localizable", "Scene.Preview.Keyboard.ShowNext") + public static let showNext = L10n.tr("Localizable", "Scene.Preview.Keyboard.ShowNext", fallback: "Show Next") /// Show Previous - public static let showPrevious = L10n.tr("Localizable", "Scene.Preview.Keyboard.ShowPrevious") + public static let showPrevious = L10n.tr("Localizable", "Scene.Preview.Keyboard.ShowPrevious", fallback: "Show Previous") } } public enum Profile { public enum Accessibility { /// Double tap to open the list - public static let doubleTapToOpenTheList = L10n.tr("Localizable", "Scene.Profile.Accessibility.DoubleTapToOpenTheList") + public static let doubleTapToOpenTheList = L10n.tr("Localizable", "Scene.Profile.Accessibility.DoubleTapToOpenTheList", fallback: "Double tap to open the list") /// Edit avatar image - public static let editAvatarImage = L10n.tr("Localizable", "Scene.Profile.Accessibility.EditAvatarImage") + public static let editAvatarImage = L10n.tr("Localizable", "Scene.Profile.Accessibility.EditAvatarImage", fallback: "Edit avatar image") /// Show avatar image - public static let showAvatarImage = L10n.tr("Localizable", "Scene.Profile.Accessibility.ShowAvatarImage") + public static let showAvatarImage = L10n.tr("Localizable", "Scene.Profile.Accessibility.ShowAvatarImage", fallback: "Show avatar image") /// Show banner image - public static let showBannerImage = L10n.tr("Localizable", "Scene.Profile.Accessibility.ShowBannerImage") + public static let showBannerImage = L10n.tr("Localizable", "Scene.Profile.Accessibility.ShowBannerImage", fallback: "Show banner image") } public enum Dashboard { /// followers - public static let followers = L10n.tr("Localizable", "Scene.Profile.Dashboard.Followers") + public static let followers = L10n.tr("Localizable", "Scene.Profile.Dashboard.Followers", fallback: "followers") /// following - public static let following = L10n.tr("Localizable", "Scene.Profile.Dashboard.Following") + public static let following = L10n.tr("Localizable", "Scene.Profile.Dashboard.Following", fallback: "following") /// posts - public static let posts = L10n.tr("Localizable", "Scene.Profile.Dashboard.Posts") + public static let posts = L10n.tr("Localizable", "Scene.Profile.Dashboard.Posts", fallback: "posts") } public enum Fields { /// Add Row - public static let addRow = L10n.tr("Localizable", "Scene.Profile.Fields.AddRow") + public static let addRow = L10n.tr("Localizable", "Scene.Profile.Fields.AddRow", fallback: "Add Row") public enum Placeholder { /// Content - public static let content = L10n.tr("Localizable", "Scene.Profile.Fields.Placeholder.Content") + public static let content = L10n.tr("Localizable", "Scene.Profile.Fields.Placeholder.Content", fallback: "Content") /// Label - public static let label = L10n.tr("Localizable", "Scene.Profile.Fields.Placeholder.Label") + public static let label = L10n.tr("Localizable", "Scene.Profile.Fields.Placeholder.Label", fallback: "Label") + } + public enum Verified { + /// Ownership of this link was checked on %@ + public static func long(_ p1: Any) -> String { + return L10n.tr("Localizable", "Scene.Profile.Fields.Verified.Long", String(describing: p1), fallback: "Ownership of this link was checked on %@") + } + /// Verified on %@ + public static func short(_ p1: Any) -> String { + return L10n.tr("Localizable", "Scene.Profile.Fields.Verified.Short", String(describing: p1), fallback: "Verified on %@") + } } } public enum Header { /// Follows You - public static let followsYou = L10n.tr("Localizable", "Scene.Profile.Header.FollowsYou") + public static let followsYou = L10n.tr("Localizable", "Scene.Profile.Header.FollowsYou", fallback: "Follows You") } public enum RelationshipActionAlert { public enum ConfirmBlockUser { /// Confirm to block %@ public static func message(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message", String(describing: p1), fallback: "Confirm to block %@") } /// Block Account - public static let title = L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title") + public static let title = L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title", fallback: "Block Account") } public enum ConfirmHideReblogs { /// Confirm to hide reblogs - public static let message = L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Message") + public static let message = L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Message", fallback: "Confirm to hide reblogs") /// Hide Reblogs - public static let title = L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Title") + public static let title = L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Title", fallback: "Hide Reblogs") } public enum ConfirmMuteUser { /// Confirm to mute %@ public static func message(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Message", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Message", String(describing: p1), fallback: "Confirm to mute %@") } /// Mute Account - public static let title = L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Title") + public static let title = L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Title", fallback: "Mute Account") } public enum ConfirmShowReblogs { /// Confirm to show reblogs - public static let message = L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message") + public static let message = L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message", fallback: "Confirm to show reblogs") /// Show Reblogs - public static let title = L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Title") + public static let title = L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Title", fallback: "Show Reblogs") } public enum ConfirmUnblockUser { /// Confirm to unblock %@ public static func message(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Message", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Message", String(describing: p1), fallback: "Confirm to unblock %@") } /// Unblock Account - public static let title = L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Title") + public static let title = L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Title", fallback: "Unblock Account") } public enum ConfirmUnmuteUser { /// Confirm to unmute %@ public static func message(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmUnmuteUser.Message", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmUnmuteUser.Message", String(describing: p1), fallback: "Confirm to unmute %@") } /// Unmute Account - public static let title = L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmUnmuteUser.Title") + public static let title = L10n.tr("Localizable", "Scene.Profile.RelationshipActionAlert.ConfirmUnmuteUser.Title", fallback: "Unmute Account") } } public enum SegmentedControl { /// About - public static let about = L10n.tr("Localizable", "Scene.Profile.SegmentedControl.About") + public static let about = L10n.tr("Localizable", "Scene.Profile.SegmentedControl.About", fallback: "About") /// Media - public static let media = L10n.tr("Localizable", "Scene.Profile.SegmentedControl.Media") + public static let media = L10n.tr("Localizable", "Scene.Profile.SegmentedControl.Media", fallback: "Media") /// Posts - public static let posts = L10n.tr("Localizable", "Scene.Profile.SegmentedControl.Posts") + public static let posts = L10n.tr("Localizable", "Scene.Profile.SegmentedControl.Posts", fallback: "Posts") /// Posts and Replies - public static let postsAndReplies = L10n.tr("Localizable", "Scene.Profile.SegmentedControl.PostsAndReplies") + public static let postsAndReplies = L10n.tr("Localizable", "Scene.Profile.SegmentedControl.PostsAndReplies", fallback: "Posts and Replies") /// Replies - public static let replies = L10n.tr("Localizable", "Scene.Profile.SegmentedControl.Replies") + public static let replies = L10n.tr("Localizable", "Scene.Profile.SegmentedControl.Replies", fallback: "Replies") } } public enum RebloggedBy { /// Reblogged By - public static let title = L10n.tr("Localizable", "Scene.RebloggedBy.Title") + public static let title = L10n.tr("Localizable", "Scene.RebloggedBy.Title", fallback: "Reblogged By") } public enum Register { /// Let’s get you set up on %@ public static func letsGetYouSetUpOnDomain(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Register.LetsGetYouSetUpOnDomain", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Register.LetsGetYouSetUpOnDomain", String(describing: p1), fallback: "Let’s get you set up on %@") } /// Let’s get you set up on %@ public static func title(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Register.Title", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Register.Title", String(describing: p1), fallback: "Let’s get you set up on %@") } public enum Error { public enum Item { /// Agreement - public static let agreement = L10n.tr("Localizable", "Scene.Register.Error.Item.Agreement") + public static let agreement = L10n.tr("Localizable", "Scene.Register.Error.Item.Agreement", fallback: "Agreement") /// Email - public static let email = L10n.tr("Localizable", "Scene.Register.Error.Item.Email") + public static let email = L10n.tr("Localizable", "Scene.Register.Error.Item.Email", fallback: "Email") /// Locale - public static let locale = L10n.tr("Localizable", "Scene.Register.Error.Item.Locale") + public static let locale = L10n.tr("Localizable", "Scene.Register.Error.Item.Locale", fallback: "Locale") /// Password - public static let password = L10n.tr("Localizable", "Scene.Register.Error.Item.Password") + public static let password = L10n.tr("Localizable", "Scene.Register.Error.Item.Password", fallback: "Password") /// Reason - public static let reason = L10n.tr("Localizable", "Scene.Register.Error.Item.Reason") + public static let reason = L10n.tr("Localizable", "Scene.Register.Error.Item.Reason", fallback: "Reason") /// Username - public static let username = L10n.tr("Localizable", "Scene.Register.Error.Item.Username") + public static let username = L10n.tr("Localizable", "Scene.Register.Error.Item.Username", fallback: "Username") } public enum Reason { /// %@ must be accepted public static func accepted(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Register.Error.Reason.Accepted", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Register.Error.Reason.Accepted", String(describing: p1), fallback: "%@ must be accepted") } /// %@ is required public static func blank(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Register.Error.Reason.Blank", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Register.Error.Reason.Blank", String(describing: p1), fallback: "%@ is required") } /// %@ contains a disallowed email provider public static func blocked(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Register.Error.Reason.Blocked", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Register.Error.Reason.Blocked", String(describing: p1), fallback: "%@ contains a disallowed email provider") } /// %@ is not a supported value public static func inclusion(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Register.Error.Reason.Inclusion", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Register.Error.Reason.Inclusion", String(describing: p1), fallback: "%@ is not a supported value") } /// %@ is invalid public static func invalid(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Register.Error.Reason.Invalid", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Register.Error.Reason.Invalid", String(describing: p1), fallback: "%@ is invalid") } /// %@ is a reserved keyword public static func reserved(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Register.Error.Reason.Reserved", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Register.Error.Reason.Reserved", String(describing: p1), fallback: "%@ is a reserved keyword") } /// %@ is already in use public static func taken(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Register.Error.Reason.Taken", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Register.Error.Reason.Taken", String(describing: p1), fallback: "%@ is already in use") } /// %@ is too long public static func tooLong(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Register.Error.Reason.TooLong", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Register.Error.Reason.TooLong", String(describing: p1), fallback: "%@ is too long") } /// %@ is too short public static func tooShort(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Register.Error.Reason.TooShort", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Register.Error.Reason.TooShort", String(describing: p1), fallback: "%@ is too short") } /// %@ does not seem to exist public static func unreachable(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Register.Error.Reason.Unreachable", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Register.Error.Reason.Unreachable", String(describing: p1), fallback: "%@ does not seem to exist") } } public enum Special { /// This is not a valid email address - public static let emailInvalid = L10n.tr("Localizable", "Scene.Register.Error.Special.EmailInvalid") + public static let emailInvalid = L10n.tr("Localizable", "Scene.Register.Error.Special.EmailInvalid", fallback: "This is not a valid email address") /// Password is too short (must be at least 8 characters) - public static let passwordTooShort = L10n.tr("Localizable", "Scene.Register.Error.Special.PasswordTooShort") + public static let passwordTooShort = L10n.tr("Localizable", "Scene.Register.Error.Special.PasswordTooShort", fallback: "Password is too short (must be at least 8 characters)") /// Username must only contain alphanumeric characters and underscores - public static let usernameInvalid = L10n.tr("Localizable", "Scene.Register.Error.Special.UsernameInvalid") + public static let usernameInvalid = L10n.tr("Localizable", "Scene.Register.Error.Special.UsernameInvalid", fallback: "Username must only contain alphanumeric characters and underscores") /// Username is too long (can’t be longer than 30 characters) - public static let usernameTooLong = L10n.tr("Localizable", "Scene.Register.Error.Special.UsernameTooLong") + public static let usernameTooLong = L10n.tr("Localizable", "Scene.Register.Error.Special.UsernameTooLong", fallback: "Username is too long (can’t be longer than 30 characters)") } } public enum Input { public enum Avatar { /// Delete - public static let delete = L10n.tr("Localizable", "Scene.Register.Input.Avatar.Delete") + public static let delete = L10n.tr("Localizable", "Scene.Register.Input.Avatar.Delete", fallback: "Delete") } public enum DisplayName { /// display name - public static let placeholder = L10n.tr("Localizable", "Scene.Register.Input.DisplayName.Placeholder") + public static let placeholder = L10n.tr("Localizable", "Scene.Register.Input.DisplayName.Placeholder", fallback: "display name") } public enum Email { /// email - public static let placeholder = L10n.tr("Localizable", "Scene.Register.Input.Email.Placeholder") + public static let placeholder = L10n.tr("Localizable", "Scene.Register.Input.Email.Placeholder", fallback: "email") } public enum Invite { /// Why do you want to join? - public static let registrationUserInviteRequest = L10n.tr("Localizable", "Scene.Register.Input.Invite.RegistrationUserInviteRequest") + public static let registrationUserInviteRequest = L10n.tr("Localizable", "Scene.Register.Input.Invite.RegistrationUserInviteRequest", fallback: "Why do you want to join?") } public enum Password { /// 8 characters - public static let characterLimit = L10n.tr("Localizable", "Scene.Register.Input.Password.CharacterLimit") + public static let characterLimit = L10n.tr("Localizable", "Scene.Register.Input.Password.CharacterLimit", fallback: "8 characters") /// Your password needs at least eight characters - public static let hint = L10n.tr("Localizable", "Scene.Register.Input.Password.Hint") + public static let hint = L10n.tr("Localizable", "Scene.Register.Input.Password.Hint", fallback: "Your password needs at least eight characters") /// password - public static let placeholder = L10n.tr("Localizable", "Scene.Register.Input.Password.Placeholder") + public static let placeholder = L10n.tr("Localizable", "Scene.Register.Input.Password.Placeholder", fallback: "password") /// Your password needs at least: - public static let require = L10n.tr("Localizable", "Scene.Register.Input.Password.Require") + public static let require = L10n.tr("Localizable", "Scene.Register.Input.Password.Require", fallback: "Your password needs at least:") public enum Accessibility { /// checked - public static let checked = L10n.tr("Localizable", "Scene.Register.Input.Password.Accessibility.Checked") + public static let checked = L10n.tr("Localizable", "Scene.Register.Input.Password.Accessibility.Checked", fallback: "checked") /// unchecked - public static let unchecked = L10n.tr("Localizable", "Scene.Register.Input.Password.Accessibility.Unchecked") + public static let unchecked = L10n.tr("Localizable", "Scene.Register.Input.Password.Accessibility.Unchecked", fallback: "unchecked") } } public enum Username { /// This username is taken. - public static let duplicatePrompt = L10n.tr("Localizable", "Scene.Register.Input.Username.DuplicatePrompt") + public static let duplicatePrompt = L10n.tr("Localizable", "Scene.Register.Input.Username.DuplicatePrompt", fallback: "This username is taken.") /// username - public static let placeholder = L10n.tr("Localizable", "Scene.Register.Input.Username.Placeholder") + public static let placeholder = L10n.tr("Localizable", "Scene.Register.Input.Username.Placeholder", fallback: "username") } } } public enum Report { /// Are there any other posts you’d like to add to the report? - public static let content1 = L10n.tr("Localizable", "Scene.Report.Content1") + public static let content1 = L10n.tr("Localizable", "Scene.Report.Content1", fallback: "Are there any other posts you’d like to add to the report?") /// Is there anything the moderators should know about this report? - public static let content2 = L10n.tr("Localizable", "Scene.Report.Content2") + public static let content2 = L10n.tr("Localizable", "Scene.Report.Content2", fallback: "Is there anything the moderators should know about this report?") /// REPORTED - public static let reported = L10n.tr("Localizable", "Scene.Report.Reported") + public static let reported = L10n.tr("Localizable", "Scene.Report.Reported", fallback: "REPORTED") /// Thanks for reporting, we’ll look into this. - public static let reportSentTitle = L10n.tr("Localizable", "Scene.Report.ReportSentTitle") + public static let reportSentTitle = L10n.tr("Localizable", "Scene.Report.ReportSentTitle", fallback: "Thanks for reporting, we’ll look into this.") /// Send Report - public static let send = L10n.tr("Localizable", "Scene.Report.Send") + public static let send = L10n.tr("Localizable", "Scene.Report.Send", fallback: "Send Report") /// Send without comment - public static let skipToSend = L10n.tr("Localizable", "Scene.Report.SkipToSend") + public static let skipToSend = L10n.tr("Localizable", "Scene.Report.SkipToSend", fallback: "Send without comment") /// Step 1 of 2 - public static let step1 = L10n.tr("Localizable", "Scene.Report.Step1") + public static let step1 = L10n.tr("Localizable", "Scene.Report.Step1", fallback: "Step 1 of 2") /// Step 2 of 2 - public static let step2 = L10n.tr("Localizable", "Scene.Report.Step2") + public static let step2 = L10n.tr("Localizable", "Scene.Report.Step2", fallback: "Step 2 of 2") /// Type or paste additional comments - public static let textPlaceholder = L10n.tr("Localizable", "Scene.Report.TextPlaceholder") + public static let textPlaceholder = L10n.tr("Localizable", "Scene.Report.TextPlaceholder", fallback: "Type or paste additional comments") /// Report %@ public static func title(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Report.Title", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Report.Title", String(describing: p1), fallback: "Report %@") } /// Report - public static let titleReport = L10n.tr("Localizable", "Scene.Report.TitleReport") + public static let titleReport = L10n.tr("Localizable", "Scene.Report.TitleReport", fallback: "Report") public enum StepFinal { /// Block %@ public static func blockUser(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Report.StepFinal.BlockUser", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Report.StepFinal.BlockUser", String(describing: p1), fallback: "Block %@") } /// Don’t want to see this? - public static let dontWantToSeeThis = L10n.tr("Localizable", "Scene.Report.StepFinal.DontWantToSeeThis") + public static let dontWantToSeeThis = L10n.tr("Localizable", "Scene.Report.StepFinal.DontWantToSeeThis", fallback: "Don’t want to see this?") /// Mute %@ public static func muteUser(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Report.StepFinal.MuteUser", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Report.StepFinal.MuteUser", String(describing: p1), fallback: "Mute %@") } /// They will no longer be able to follow or see your posts, but they can see if they’ve been blocked. - public static let theyWillNoLongerBeAbleToFollowOrSeeYourPostsButTheyCanSeeIfTheyveBeenBlocked = L10n.tr("Localizable", "Scene.Report.StepFinal.TheyWillNoLongerBeAbleToFollowOrSeeYourPostsButTheyCanSeeIfTheyveBeenBlocked") + public static let theyWillNoLongerBeAbleToFollowOrSeeYourPostsButTheyCanSeeIfTheyveBeenBlocked = L10n.tr("Localizable", "Scene.Report.StepFinal.TheyWillNoLongerBeAbleToFollowOrSeeYourPostsButTheyCanSeeIfTheyveBeenBlocked", fallback: "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked.") /// Unfollow - public static let unfollow = L10n.tr("Localizable", "Scene.Report.StepFinal.Unfollow") + public static let unfollow = L10n.tr("Localizable", "Scene.Report.StepFinal.Unfollow", fallback: "Unfollow") /// Unfollowed - public static let unfollowed = L10n.tr("Localizable", "Scene.Report.StepFinal.Unfollowed") + public static let unfollowed = L10n.tr("Localizable", "Scene.Report.StepFinal.Unfollowed", fallback: "Unfollowed") /// Unfollow %@ public static func unfollowUser(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Report.StepFinal.UnfollowUser", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Report.StepFinal.UnfollowUser", String(describing: p1), fallback: "Unfollow %@") } /// When you see something you don’t like on Mastodon, you can remove the person from your experience. - public static let whenYouSeeSomethingYouDontLikeOnMastodonYouCanRemoveThePersonFromYourExperience = L10n.tr("Localizable", "Scene.Report.StepFinal.WhenYouSeeSomethingYouDontLikeOnMastodonYouCanRemoveThePersonFromYourExperience.") + public static let whenYouSeeSomethingYouDontLikeOnMastodonYouCanRemoveThePersonFromYourExperience = L10n.tr("Localizable", "Scene.Report.StepFinal.WhenYouSeeSomethingYouDontLikeOnMastodonYouCanRemoveThePersonFromYourExperience.", fallback: "When you see something you don’t like on Mastodon, you can remove the person from your experience.") /// While we review this, you can take action against %@ public static func whileWeReviewThisYouCanTakeActionAgainstUser(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Report.StepFinal.WhileWeReviewThisYouCanTakeActionAgainstUser", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Report.StepFinal.WhileWeReviewThisYouCanTakeActionAgainstUser", String(describing: p1), fallback: "While we review this, you can take action against %@") } /// You won’t see their posts or reblogs in your home feed. They won’t know they’ve been muted. - public static let youWontSeeTheirPostsOrReblogsInYourHomeFeedTheyWontKnowTheyVeBeenMuted = L10n.tr("Localizable", "Scene.Report.StepFinal.YouWontSeeTheirPostsOrReblogsInYourHomeFeedTheyWontKnowTheyVeBeenMuted") + public static let youWontSeeTheirPostsOrReblogsInYourHomeFeedTheyWontKnowTheyVeBeenMuted = L10n.tr("Localizable", "Scene.Report.StepFinal.YouWontSeeTheirPostsOrReblogsInYourHomeFeedTheyWontKnowTheyVeBeenMuted", fallback: "You won’t see their posts or reblogs in your home feed. They won’t know they’ve been muted.") } public enum StepFour { /// Is there anything else we should know? - public static let isThereAnythingElseWeShouldKnow = L10n.tr("Localizable", "Scene.Report.StepFour.IsThereAnythingElseWeShouldKnow") + public static let isThereAnythingElseWeShouldKnow = L10n.tr("Localizable", "Scene.Report.StepFour.IsThereAnythingElseWeShouldKnow", fallback: "Is there anything else we should know?") /// Step 4 of 4 - public static let step4Of4 = L10n.tr("Localizable", "Scene.Report.StepFour.Step4Of4") + public static let step4Of4 = L10n.tr("Localizable", "Scene.Report.StepFour.Step4Of4", fallback: "Step 4 of 4") } public enum StepOne { /// I don’t like it - public static let iDontLikeIt = L10n.tr("Localizable", "Scene.Report.StepOne.IDontLikeIt") + public static let iDontLikeIt = L10n.tr("Localizable", "Scene.Report.StepOne.IDontLikeIt", fallback: "I don’t like it") /// It is not something you want to see - public static let itIsNotSomethingYouWantToSee = L10n.tr("Localizable", "Scene.Report.StepOne.ItIsNotSomethingYouWantToSee") + public static let itIsNotSomethingYouWantToSee = L10n.tr("Localizable", "Scene.Report.StepOne.ItIsNotSomethingYouWantToSee", fallback: "It is not something you want to see") /// It’s something else - public static let itsSomethingElse = L10n.tr("Localizable", "Scene.Report.StepOne.ItsSomethingElse") + public static let itsSomethingElse = L10n.tr("Localizable", "Scene.Report.StepOne.ItsSomethingElse", fallback: "It’s something else") /// It’s spam - public static let itsSpam = L10n.tr("Localizable", "Scene.Report.StepOne.ItsSpam") + public static let itsSpam = L10n.tr("Localizable", "Scene.Report.StepOne.ItsSpam", fallback: "It’s spam") /// It violates server rules - public static let itViolatesServerRules = L10n.tr("Localizable", "Scene.Report.StepOne.ItViolatesServerRules") + public static let itViolatesServerRules = L10n.tr("Localizable", "Scene.Report.StepOne.ItViolatesServerRules", fallback: "It violates server rules") /// Malicious links, fake engagement, or repetetive replies - public static let maliciousLinksFakeEngagementOrRepetetiveReplies = L10n.tr("Localizable", "Scene.Report.StepOne.MaliciousLinksFakeEngagementOrRepetetiveReplies") + public static let maliciousLinksFakeEngagementOrRepetetiveReplies = L10n.tr("Localizable", "Scene.Report.StepOne.MaliciousLinksFakeEngagementOrRepetetiveReplies", fallback: "Malicious links, fake engagement, or repetetive replies") /// Select the best match - public static let selectTheBestMatch = L10n.tr("Localizable", "Scene.Report.StepOne.SelectTheBestMatch") + public static let selectTheBestMatch = L10n.tr("Localizable", "Scene.Report.StepOne.SelectTheBestMatch", fallback: "Select the best match") /// Step 1 of 4 - public static let step1Of4 = L10n.tr("Localizable", "Scene.Report.StepOne.Step1Of4") + public static let step1Of4 = L10n.tr("Localizable", "Scene.Report.StepOne.Step1Of4", fallback: "Step 1 of 4") /// The issue does not fit into other categories - public static let theIssueDoesNotFitIntoOtherCategories = L10n.tr("Localizable", "Scene.Report.StepOne.TheIssueDoesNotFitIntoOtherCategories") + public static let theIssueDoesNotFitIntoOtherCategories = L10n.tr("Localizable", "Scene.Report.StepOne.TheIssueDoesNotFitIntoOtherCategories", fallback: "The issue does not fit into other categories") /// What's wrong with this account? - public static let whatsWrongWithThisAccount = L10n.tr("Localizable", "Scene.Report.StepOne.WhatsWrongWithThisAccount") + public static let whatsWrongWithThisAccount = L10n.tr("Localizable", "Scene.Report.StepOne.WhatsWrongWithThisAccount", fallback: "What's wrong with this account?") /// What's wrong with this post? - public static let whatsWrongWithThisPost = L10n.tr("Localizable", "Scene.Report.StepOne.WhatsWrongWithThisPost") + public static let whatsWrongWithThisPost = L10n.tr("Localizable", "Scene.Report.StepOne.WhatsWrongWithThisPost", fallback: "What's wrong with this post?") /// What's wrong with %@? public static func whatsWrongWithThisUsername(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Report.StepOne.WhatsWrongWithThisUsername", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Report.StepOne.WhatsWrongWithThisUsername", String(describing: p1), fallback: "What's wrong with %@?") } /// You are aware that it breaks specific rules - public static let youAreAwareThatItBreaksSpecificRules = L10n.tr("Localizable", "Scene.Report.StepOne.YouAreAwareThatItBreaksSpecificRules") + public static let youAreAwareThatItBreaksSpecificRules = L10n.tr("Localizable", "Scene.Report.StepOne.YouAreAwareThatItBreaksSpecificRules", fallback: "You are aware that it breaks specific rules") } public enum StepThree { /// Are there any posts that back up this report? - public static let areThereAnyPostsThatBackUpThisReport = L10n.tr("Localizable", "Scene.Report.StepThree.AreThereAnyPostsThatBackUpThisReport") + public static let areThereAnyPostsThatBackUpThisReport = L10n.tr("Localizable", "Scene.Report.StepThree.AreThereAnyPostsThatBackUpThisReport", fallback: "Are there any posts that back up this report?") /// Select all that apply - public static let selectAllThatApply = L10n.tr("Localizable", "Scene.Report.StepThree.SelectAllThatApply") + public static let selectAllThatApply = L10n.tr("Localizable", "Scene.Report.StepThree.SelectAllThatApply", fallback: "Select all that apply") /// Step 3 of 4 - public static let step3Of4 = L10n.tr("Localizable", "Scene.Report.StepThree.Step3Of4") + public static let step3Of4 = L10n.tr("Localizable", "Scene.Report.StepThree.Step3Of4", fallback: "Step 3 of 4") } public enum StepTwo { /// I just don’t like it - public static let iJustDonTLikeIt = L10n.tr("Localizable", "Scene.Report.StepTwo.IJustDon’tLikeIt") + public static let iJustDonTLikeIt = L10n.tr("Localizable", "Scene.Report.StepTwo.IJustDon’tLikeIt", fallback: "I just don’t like it") /// Select all that apply - public static let selectAllThatApply = L10n.tr("Localizable", "Scene.Report.StepTwo.SelectAllThatApply") + public static let selectAllThatApply = L10n.tr("Localizable", "Scene.Report.StepTwo.SelectAllThatApply", fallback: "Select all that apply") /// Step 2 of 4 - public static let step2Of4 = L10n.tr("Localizable", "Scene.Report.StepTwo.Step2Of4") + public static let step2Of4 = L10n.tr("Localizable", "Scene.Report.StepTwo.Step2Of4", fallback: "Step 2 of 4") /// Which rules are being violated? - public static let whichRulesAreBeingViolated = L10n.tr("Localizable", "Scene.Report.StepTwo.WhichRulesAreBeingViolated") + public static let whichRulesAreBeingViolated = L10n.tr("Localizable", "Scene.Report.StepTwo.WhichRulesAreBeingViolated", fallback: "Which rules are being violated?") } } public enum Search { /// Search - public static let title = L10n.tr("Localizable", "Scene.Search.Title") + public static let title = L10n.tr("Localizable", "Scene.Search.Title", fallback: "Search") public enum Recommend { /// See All - public static let buttonText = L10n.tr("Localizable", "Scene.Search.Recommend.ButtonText") + public static let buttonText = L10n.tr("Localizable", "Scene.Search.Recommend.ButtonText", fallback: "See All") public enum Accounts { /// You may like to follow these accounts - public static let description = L10n.tr("Localizable", "Scene.Search.Recommend.Accounts.Description") + public static let description = L10n.tr("Localizable", "Scene.Search.Recommend.Accounts.Description", fallback: "You may like to follow these accounts") /// Follow - public static let follow = L10n.tr("Localizable", "Scene.Search.Recommend.Accounts.Follow") + public static let follow = L10n.tr("Localizable", "Scene.Search.Recommend.Accounts.Follow", fallback: "Follow") /// Accounts you might like - public static let title = L10n.tr("Localizable", "Scene.Search.Recommend.Accounts.Title") + public static let title = L10n.tr("Localizable", "Scene.Search.Recommend.Accounts.Title", fallback: "Accounts you might like") } public enum HashTag { /// Hashtags that are getting quite a bit of attention - public static let description = L10n.tr("Localizable", "Scene.Search.Recommend.HashTag.Description") + public static let description = L10n.tr("Localizable", "Scene.Search.Recommend.HashTag.Description", fallback: "Hashtags that are getting quite a bit of attention") /// %@ people are talking public static func peopleTalking(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Search.Recommend.HashTag.PeopleTalking", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Search.Recommend.HashTag.PeopleTalking", String(describing: p1), fallback: "%@ people are talking") } /// Trending on Mastodon - public static let title = L10n.tr("Localizable", "Scene.Search.Recommend.HashTag.Title") + public static let title = L10n.tr("Localizable", "Scene.Search.Recommend.HashTag.Title", fallback: "Trending on Mastodon") } } public enum SearchBar { /// Cancel - public static let cancel = L10n.tr("Localizable", "Scene.Search.SearchBar.Cancel") + public static let cancel = L10n.tr("Localizable", "Scene.Search.SearchBar.Cancel", fallback: "Cancel") /// Search hashtags and users - public static let placeholder = L10n.tr("Localizable", "Scene.Search.SearchBar.Placeholder") + public static let placeholder = L10n.tr("Localizable", "Scene.Search.SearchBar.Placeholder", fallback: "Search hashtags and users") } public enum Searching { /// Clear - public static let clear = L10n.tr("Localizable", "Scene.Search.Searching.Clear") + public static let clear = L10n.tr("Localizable", "Scene.Search.Searching.Clear", fallback: "Clear") /// Recent searches - public static let recentSearch = L10n.tr("Localizable", "Scene.Search.Searching.RecentSearch") + public static let recentSearch = L10n.tr("Localizable", "Scene.Search.Searching.RecentSearch", fallback: "Recent searches") public enum EmptyState { /// No results - public static let noResults = L10n.tr("Localizable", "Scene.Search.Searching.EmptyState.NoResults") + public static let noResults = L10n.tr("Localizable", "Scene.Search.Searching.EmptyState.NoResults", fallback: "No results") } public enum Segment { /// All - public static let all = L10n.tr("Localizable", "Scene.Search.Searching.Segment.All") + public static let all = L10n.tr("Localizable", "Scene.Search.Searching.Segment.All", fallback: "All") /// Hashtags - public static let hashtags = L10n.tr("Localizable", "Scene.Search.Searching.Segment.Hashtags") + public static let hashtags = L10n.tr("Localizable", "Scene.Search.Searching.Segment.Hashtags", fallback: "Hashtags") /// People - public static let people = L10n.tr("Localizable", "Scene.Search.Searching.Segment.People") + public static let people = L10n.tr("Localizable", "Scene.Search.Searching.Segment.People", fallback: "People") /// Posts - public static let posts = L10n.tr("Localizable", "Scene.Search.Searching.Segment.Posts") + public static let posts = L10n.tr("Localizable", "Scene.Search.Searching.Segment.Posts", fallback: "Posts") } } } public enum ServerPicker { - /// Pick a server based on your interests, region, or a general purpose one. - public static let subtitle = L10n.tr("Localizable", "Scene.ServerPicker.Subtitle") - /// Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual. - public static let subtitleExtend = L10n.tr("Localizable", "Scene.ServerPicker.SubtitleExtend") + /// Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers. + public static let subtitle = L10n.tr("Localizable", "Scene.ServerPicker.Subtitle", fallback: "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.") /// Mastodon is made of users in different servers. - public static let title = L10n.tr("Localizable", "Scene.ServerPicker.Title") + public static let title = L10n.tr("Localizable", "Scene.ServerPicker.Title", fallback: "Mastodon is made of users in different servers.") public enum Button { /// See Less - public static let seeLess = L10n.tr("Localizable", "Scene.ServerPicker.Button.SeeLess") + public static let seeLess = L10n.tr("Localizable", "Scene.ServerPicker.Button.SeeLess", fallback: "See Less") /// See More - public static let seeMore = L10n.tr("Localizable", "Scene.ServerPicker.Button.SeeMore") + public static let seeMore = L10n.tr("Localizable", "Scene.ServerPicker.Button.SeeMore", fallback: "See More") public enum Category { /// academia - public static let academia = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Academia") + public static let academia = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Academia", fallback: "academia") /// activism - public static let activism = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Activism") + public static let activism = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Activism", fallback: "activism") /// All - public static let all = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.All") + public static let all = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.All", fallback: "All") /// Category: All - public static let allAccessiblityDescription = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.AllAccessiblityDescription") + public static let allAccessiblityDescription = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.AllAccessiblityDescription", fallback: "Category: All") /// art - public static let art = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Art") + public static let art = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Art", fallback: "art") /// food - public static let food = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Food") + public static let food = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Food", fallback: "food") /// furry - public static let furry = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Furry") + public static let furry = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Furry", fallback: "furry") /// games - public static let games = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Games") + public static let games = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Games", fallback: "games") /// general - public static let general = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.General") + public static let general = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.General", fallback: "general") /// journalism - public static let journalism = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Journalism") + public static let journalism = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Journalism", fallback: "journalism") /// lgbt - public static let lgbt = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Lgbt") + public static let lgbt = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Lgbt", fallback: "lgbt") /// music - public static let music = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Music") + public static let music = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Music", fallback: "music") /// regional - public static let regional = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Regional") + public static let regional = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Regional", fallback: "regional") /// tech - public static let tech = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Tech") + public static let tech = L10n.tr("Localizable", "Scene.ServerPicker.Button.Category.Tech", fallback: "tech") } } public enum EmptyState { /// Something went wrong while loading the data. Check your internet connection. - public static let badNetwork = L10n.tr("Localizable", "Scene.ServerPicker.EmptyState.BadNetwork") + public static let badNetwork = L10n.tr("Localizable", "Scene.ServerPicker.EmptyState.BadNetwork", fallback: "Something went wrong while loading the data. Check your internet connection.") /// Finding available servers... - public static let findingServers = L10n.tr("Localizable", "Scene.ServerPicker.EmptyState.FindingServers") + public static let findingServers = L10n.tr("Localizable", "Scene.ServerPicker.EmptyState.FindingServers", fallback: "Finding available servers...") /// No results - public static let noResults = L10n.tr("Localizable", "Scene.ServerPicker.EmptyState.NoResults") + public static let noResults = L10n.tr("Localizable", "Scene.ServerPicker.EmptyState.NoResults", fallback: "No results") } public enum Input { - /// Search servers - public static let placeholder = L10n.tr("Localizable", "Scene.ServerPicker.Input.Placeholder") - /// Search servers or enter URL - public static let searchServersOrEnterUrl = L10n.tr("Localizable", "Scene.ServerPicker.Input.SearchServersOrEnterUrl") + /// Search communities or enter URL + public static let searchServersOrEnterUrl = L10n.tr("Localizable", "Scene.ServerPicker.Input.SearchServersOrEnterUrl", fallback: "Search communities or enter URL") } public enum Label { /// CATEGORY - public static let category = L10n.tr("Localizable", "Scene.ServerPicker.Label.Category") + public static let category = L10n.tr("Localizable", "Scene.ServerPicker.Label.Category", fallback: "CATEGORY") /// LANGUAGE - public static let language = L10n.tr("Localizable", "Scene.ServerPicker.Label.Language") + public static let language = L10n.tr("Localizable", "Scene.ServerPicker.Label.Language", fallback: "LANGUAGE") /// USERS - public static let users = L10n.tr("Localizable", "Scene.ServerPicker.Label.Users") + public static let users = L10n.tr("Localizable", "Scene.ServerPicker.Label.Users", fallback: "USERS") } } public enum ServerRules { /// privacy policy - public static let privacyPolicy = L10n.tr("Localizable", "Scene.ServerRules.PrivacyPolicy") + public static let privacyPolicy = L10n.tr("Localizable", "Scene.ServerRules.PrivacyPolicy", fallback: "privacy policy") /// By continuing, you’re subject to the terms of service and privacy policy for %@. public static func prompt(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.ServerRules.Prompt", String(describing: p1)) + return L10n.tr("Localizable", "Scene.ServerRules.Prompt", String(describing: p1), fallback: "By continuing, you’re subject to the terms of service and privacy policy for %@.") } /// These are set and enforced by the %@ moderators. public static func subtitle(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.ServerRules.Subtitle", String(describing: p1)) + return L10n.tr("Localizable", "Scene.ServerRules.Subtitle", String(describing: p1), fallback: "These are set and enforced by the %@ moderators.") } /// terms of service - public static let termsOfService = L10n.tr("Localizable", "Scene.ServerRules.TermsOfService") + public static let termsOfService = L10n.tr("Localizable", "Scene.ServerRules.TermsOfService", fallback: "terms of service") /// Some ground rules. - public static let title = L10n.tr("Localizable", "Scene.ServerRules.Title") + public static let title = L10n.tr("Localizable", "Scene.ServerRules.Title", fallback: "Some ground rules.") public enum Button { /// I Agree - public static let confirm = L10n.tr("Localizable", "Scene.ServerRules.Button.Confirm") + public static let confirm = L10n.tr("Localizable", "Scene.ServerRules.Button.Confirm", fallback: "I Agree") } } public enum Settings { /// Settings - public static let title = L10n.tr("Localizable", "Scene.Settings.Title") + public static let title = L10n.tr("Localizable", "Scene.Settings.Title", fallback: "Settings") public enum Footer { /// Mastodon is open source software. You can report issues on GitHub at %@ (%@) public static func mastodonDescription(_ p1: Any, _ p2: Any) -> String { - return L10n.tr("Localizable", "Scene.Settings.Footer.MastodonDescription", String(describing: p1), String(describing: p2)) + return L10n.tr("Localizable", "Scene.Settings.Footer.MastodonDescription", String(describing: p1), String(describing: p2), fallback: "Mastodon is open source software. You can report issues on GitHub at %@ (%@)") } } public enum Keyboard { /// Close Settings Window - public static let closeSettingsWindow = L10n.tr("Localizable", "Scene.Settings.Keyboard.CloseSettingsWindow") + public static let closeSettingsWindow = L10n.tr("Localizable", "Scene.Settings.Keyboard.CloseSettingsWindow", fallback: "Close Settings Window") } public enum Section { public enum Appearance { /// Automatic - public static let automatic = L10n.tr("Localizable", "Scene.Settings.Section.Appearance.Automatic") + public static let automatic = L10n.tr("Localizable", "Scene.Settings.Section.Appearance.Automatic", fallback: "Automatic") /// Always Dark - public static let dark = L10n.tr("Localizable", "Scene.Settings.Section.Appearance.Dark") + public static let dark = L10n.tr("Localizable", "Scene.Settings.Section.Appearance.Dark", fallback: "Always Dark") /// Always Light - public static let light = L10n.tr("Localizable", "Scene.Settings.Section.Appearance.Light") + public static let light = L10n.tr("Localizable", "Scene.Settings.Section.Appearance.Light", fallback: "Always Light") /// Appearance - public static let title = L10n.tr("Localizable", "Scene.Settings.Section.Appearance.Title") + public static let title = L10n.tr("Localizable", "Scene.Settings.Section.Appearance.Title", fallback: "Appearance") } public enum BoringZone { /// Account Settings - public static let accountSettings = L10n.tr("Localizable", "Scene.Settings.Section.BoringZone.AccountSettings") + public static let accountSettings = L10n.tr("Localizable", "Scene.Settings.Section.BoringZone.AccountSettings", fallback: "Account Settings") /// Privacy Policy - public static let privacy = L10n.tr("Localizable", "Scene.Settings.Section.BoringZone.Privacy") + public static let privacy = L10n.tr("Localizable", "Scene.Settings.Section.BoringZone.Privacy", fallback: "Privacy Policy") /// Terms of Service - public static let terms = L10n.tr("Localizable", "Scene.Settings.Section.BoringZone.Terms") + public static let terms = L10n.tr("Localizable", "Scene.Settings.Section.BoringZone.Terms", fallback: "Terms of Service") /// The Boring Zone - public static let title = L10n.tr("Localizable", "Scene.Settings.Section.BoringZone.Title") + public static let title = L10n.tr("Localizable", "Scene.Settings.Section.BoringZone.Title", fallback: "The Boring Zone") } public enum LookAndFeel { /// Light - public static let light = L10n.tr("Localizable", "Scene.Settings.Section.LookAndFeel.Light") + public static let light = L10n.tr("Localizable", "Scene.Settings.Section.LookAndFeel.Light", fallback: "Light") /// Really Dark - public static let reallyDark = L10n.tr("Localizable", "Scene.Settings.Section.LookAndFeel.ReallyDark") + public static let reallyDark = L10n.tr("Localizable", "Scene.Settings.Section.LookAndFeel.ReallyDark", fallback: "Really Dark") /// Sorta Dark - public static let sortaDark = L10n.tr("Localizable", "Scene.Settings.Section.LookAndFeel.SortaDark") + public static let sortaDark = L10n.tr("Localizable", "Scene.Settings.Section.LookAndFeel.SortaDark", fallback: "Sorta Dark") /// Look and Feel - public static let title = L10n.tr("Localizable", "Scene.Settings.Section.LookAndFeel.Title") + public static let title = L10n.tr("Localizable", "Scene.Settings.Section.LookAndFeel.Title", fallback: "Look and Feel") /// Use System - public static let useSystem = L10n.tr("Localizable", "Scene.Settings.Section.LookAndFeel.UseSystem") + public static let useSystem = L10n.tr("Localizable", "Scene.Settings.Section.LookAndFeel.UseSystem", fallback: "Use System") } public enum Notifications { /// Reblogs my post - public static let boosts = L10n.tr("Localizable", "Scene.Settings.Section.Notifications.Boosts") + public static let boosts = L10n.tr("Localizable", "Scene.Settings.Section.Notifications.Boosts", fallback: "Reblogs my post") /// Favorites my post - public static let favorites = L10n.tr("Localizable", "Scene.Settings.Section.Notifications.Favorites") + public static let favorites = L10n.tr("Localizable", "Scene.Settings.Section.Notifications.Favorites", fallback: "Favorites my post") /// Follows me - public static let follows = L10n.tr("Localizable", "Scene.Settings.Section.Notifications.Follows") + public static let follows = L10n.tr("Localizable", "Scene.Settings.Section.Notifications.Follows", fallback: "Follows me") /// Mentions me - public static let mentions = L10n.tr("Localizable", "Scene.Settings.Section.Notifications.Mentions") + public static let mentions = L10n.tr("Localizable", "Scene.Settings.Section.Notifications.Mentions", fallback: "Mentions me") /// Notifications - public static let title = L10n.tr("Localizable", "Scene.Settings.Section.Notifications.Title") + public static let title = L10n.tr("Localizable", "Scene.Settings.Section.Notifications.Title", fallback: "Notifications") public enum Trigger { /// anyone - public static let anyone = L10n.tr("Localizable", "Scene.Settings.Section.Notifications.Trigger.Anyone") + public static let anyone = L10n.tr("Localizable", "Scene.Settings.Section.Notifications.Trigger.Anyone", fallback: "anyone") /// anyone I follow - public static let follow = L10n.tr("Localizable", "Scene.Settings.Section.Notifications.Trigger.Follow") + public static let follow = L10n.tr("Localizable", "Scene.Settings.Section.Notifications.Trigger.Follow", fallback: "anyone I follow") /// a follower - public static let follower = L10n.tr("Localizable", "Scene.Settings.Section.Notifications.Trigger.Follower") + public static let follower = L10n.tr("Localizable", "Scene.Settings.Section.Notifications.Trigger.Follower", fallback: "a follower") /// no one - public static let noone = L10n.tr("Localizable", "Scene.Settings.Section.Notifications.Trigger.Noone") + public static let noone = L10n.tr("Localizable", "Scene.Settings.Section.Notifications.Trigger.Noone", fallback: "no one") /// Notify me when - public static let title = L10n.tr("Localizable", "Scene.Settings.Section.Notifications.Trigger.Title") + public static let title = L10n.tr("Localizable", "Scene.Settings.Section.Notifications.Trigger.Title", fallback: "Notify me when") } } public enum Preference { /// Disable animated avatars - public static let disableAvatarAnimation = L10n.tr("Localizable", "Scene.Settings.Section.Preference.DisableAvatarAnimation") + public static let disableAvatarAnimation = L10n.tr("Localizable", "Scene.Settings.Section.Preference.DisableAvatarAnimation", fallback: "Disable animated avatars") /// Disable animated emojis - public static let disableEmojiAnimation = L10n.tr("Localizable", "Scene.Settings.Section.Preference.DisableEmojiAnimation") + public static let disableEmojiAnimation = L10n.tr("Localizable", "Scene.Settings.Section.Preference.DisableEmojiAnimation", fallback: "Disable animated emojis") /// Open links in Mastodon - public static let openLinksInMastodon = L10n.tr("Localizable", "Scene.Settings.Section.Preference.OpenLinksInMastodon") + public static let openLinksInMastodon = L10n.tr("Localizable", "Scene.Settings.Section.Preference.OpenLinksInMastodon", fallback: "Open links in Mastodon") /// Preferences - public static let title = L10n.tr("Localizable", "Scene.Settings.Section.Preference.Title") + public static let title = L10n.tr("Localizable", "Scene.Settings.Section.Preference.Title", fallback: "Preferences") /// True black dark mode - public static let trueBlackDarkMode = L10n.tr("Localizable", "Scene.Settings.Section.Preference.TrueBlackDarkMode") + public static let trueBlackDarkMode = L10n.tr("Localizable", "Scene.Settings.Section.Preference.TrueBlackDarkMode", fallback: "True black dark mode") /// Use default browser to open links - public static let usingDefaultBrowser = L10n.tr("Localizable", "Scene.Settings.Section.Preference.UsingDefaultBrowser") + public static let usingDefaultBrowser = L10n.tr("Localizable", "Scene.Settings.Section.Preference.UsingDefaultBrowser", fallback: "Use default browser to open links") } public enum SpicyZone { /// Clear Media Cache - public static let clear = L10n.tr("Localizable", "Scene.Settings.Section.SpicyZone.Clear") + public static let clear = L10n.tr("Localizable", "Scene.Settings.Section.SpicyZone.Clear", fallback: "Clear Media Cache") /// Sign Out - public static let signout = L10n.tr("Localizable", "Scene.Settings.Section.SpicyZone.Signout") + public static let signout = L10n.tr("Localizable", "Scene.Settings.Section.SpicyZone.Signout", fallback: "Sign Out") /// The Spicy Zone - public static let title = L10n.tr("Localizable", "Scene.Settings.Section.SpicyZone.Title") + public static let title = L10n.tr("Localizable", "Scene.Settings.Section.SpicyZone.Title", fallback: "The Spicy Zone") } } } public enum SuggestionAccount { /// When you follow someone, you’ll see their posts in your home feed. - public static let followExplain = L10n.tr("Localizable", "Scene.SuggestionAccount.FollowExplain") + public static let followExplain = L10n.tr("Localizable", "Scene.SuggestionAccount.FollowExplain", fallback: "When you follow someone, you’ll see their posts in your home feed.") /// Find People to Follow - public static let title = L10n.tr("Localizable", "Scene.SuggestionAccount.Title") + public static let title = L10n.tr("Localizable", "Scene.SuggestionAccount.Title", fallback: "Find People to Follow") } public enum Thread { /// Post - public static let backTitle = L10n.tr("Localizable", "Scene.Thread.BackTitle") + public static let backTitle = L10n.tr("Localizable", "Scene.Thread.BackTitle", fallback: "Post") /// Post from %@ public static func title(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.Thread.Title", String(describing: p1)) + return L10n.tr("Localizable", "Scene.Thread.Title", String(describing: p1), fallback: "Post from %@") } } public enum Welcome { /// Get Started - public static let getStarted = L10n.tr("Localizable", "Scene.Welcome.GetStarted") + public static let getStarted = L10n.tr("Localizable", "Scene.Welcome.GetStarted", fallback: "Get Started") /// Log In - public static let logIn = L10n.tr("Localizable", "Scene.Welcome.LogIn") - /// Social networking\nback in your hands. - public static let slogan = L10n.tr("Localizable", "Scene.Welcome.Slogan") + public static let logIn = L10n.tr("Localizable", "Scene.Welcome.LogIn", fallback: "Log In") + /// Social networking + /// back in your hands. + public static let slogan = L10n.tr("Localizable", "Scene.Welcome.Slogan", fallback: "Social networking\nback in your hands.") } public enum Wizard { /// Double tap to dismiss this wizard - public static let accessibilityHint = L10n.tr("Localizable", "Scene.Wizard.AccessibilityHint") + public static let accessibilityHint = L10n.tr("Localizable", "Scene.Wizard.AccessibilityHint", fallback: "Double tap to dismiss this wizard") /// Switch between multiple accounts by holding the profile button. - public static let multipleAccountSwitchIntroDescription = L10n.tr("Localizable", "Scene.Wizard.MultipleAccountSwitchIntroDescription") + public static let multipleAccountSwitchIntroDescription = L10n.tr("Localizable", "Scene.Wizard.MultipleAccountSwitchIntroDescription", fallback: "Switch between multiple accounts by holding the profile button.") /// New in Mastodon - public static let newInMastodon = L10n.tr("Localizable", "Scene.Wizard.NewInMastodon") + public static let newInMastodon = L10n.tr("Localizable", "Scene.Wizard.NewInMastodon", fallback: "New in Mastodon") } } - public enum A11y { public enum Plural { public enum Count { + /// Plural format key: "%#@character_count@ left" + public static func charactersLeft(_ p1: Int) -> String { + return L10n.tr("Localizable", "a11y.plural.count.characters_left", p1, fallback: "Plural format key: \"%#@character_count@ left\"") + } /// Plural format key: "Input limit exceeds %#@character_count@" public static func inputLimitExceeds(_ p1: Int) -> String { - return L10n.tr("Localizable", "a11y.plural.count.input_limit_exceeds", p1) + return L10n.tr("Localizable", "a11y.plural.count.input_limit_exceeds", p1, fallback: "Plural format key: \"Input limit exceeds %#@character_count@\"") } /// Plural format key: "Input limit remains %#@character_count@" public static func inputLimitRemains(_ p1: Int) -> String { - return L10n.tr("Localizable", "a11y.plural.count.input_limit_remains", p1) + return L10n.tr("Localizable", "a11y.plural.count.input_limit_remains", p1, fallback: "Plural format key: \"Input limit remains %#@character_count@\"") } public enum Unread { /// Plural format key: "%#@notification_count_unread_notification@" public static func notification(_ p1: Int) -> String { - return L10n.tr("Localizable", "a11y.plural.count.unread.notification", p1) + return L10n.tr("Localizable", "a11y.plural.count.unread.notification", p1, fallback: "Plural format key: \"%#@notification_count_unread_notification@\"") } } } } } - public enum Date { public enum Day { /// Plural format key: "%#@count_day_left@" public static func `left`(_ p1: Int) -> String { - return L10n.tr("Localizable", "date.day.left", p1) + return L10n.tr("Localizable", "date.day.left", p1, fallback: "Plural format key: \"%#@count_day_left@\"") } public enum Ago { /// Plural format key: "%#@count_day_ago_abbr@" public static func abbr(_ p1: Int) -> String { - return L10n.tr("Localizable", "date.day.ago.abbr", p1) + return L10n.tr("Localizable", "date.day.ago.abbr", p1, fallback: "Plural format key: \"%#@count_day_ago_abbr@\"") } } } public enum Hour { /// Plural format key: "%#@count_hour_left@" public static func `left`(_ p1: Int) -> String { - return L10n.tr("Localizable", "date.hour.left", p1) + return L10n.tr("Localizable", "date.hour.left", p1, fallback: "Plural format key: \"%#@count_hour_left@\"") } public enum Ago { /// Plural format key: "%#@count_hour_ago_abbr@" public static func abbr(_ p1: Int) -> String { - return L10n.tr("Localizable", "date.hour.ago.abbr", p1) + return L10n.tr("Localizable", "date.hour.ago.abbr", p1, fallback: "Plural format key: \"%#@count_hour_ago_abbr@\"") } } } public enum Minute { /// Plural format key: "%#@count_minute_left@" public static func `left`(_ p1: Int) -> String { - return L10n.tr("Localizable", "date.minute.left", p1) + return L10n.tr("Localizable", "date.minute.left", p1, fallback: "Plural format key: \"%#@count_minute_left@\"") } public enum Ago { /// Plural format key: "%#@count_minute_ago_abbr@" public static func abbr(_ p1: Int) -> String { - return L10n.tr("Localizable", "date.minute.ago.abbr", p1) + return L10n.tr("Localizable", "date.minute.ago.abbr", p1, fallback: "Plural format key: \"%#@count_minute_ago_abbr@\"") } } } public enum Month { /// Plural format key: "%#@count_month_left@" public static func `left`(_ p1: Int) -> String { - return L10n.tr("Localizable", "date.month.left", p1) + return L10n.tr("Localizable", "date.month.left", p1, fallback: "Plural format key: \"%#@count_month_left@\"") } public enum Ago { /// Plural format key: "%#@count_month_ago_abbr@" public static func abbr(_ p1: Int) -> String { - return L10n.tr("Localizable", "date.month.ago.abbr", p1) + return L10n.tr("Localizable", "date.month.ago.abbr", p1, fallback: "Plural format key: \"%#@count_month_ago_abbr@\"") } } } public enum Second { /// Plural format key: "%#@count_second_left@" public static func `left`(_ p1: Int) -> String { - return L10n.tr("Localizable", "date.second.left", p1) + return L10n.tr("Localizable", "date.second.left", p1, fallback: "Plural format key: \"%#@count_second_left@\"") } public enum Ago { /// Plural format key: "%#@count_second_ago_abbr@" public static func abbr(_ p1: Int) -> String { - return L10n.tr("Localizable", "date.second.ago.abbr", p1) + return L10n.tr("Localizable", "date.second.ago.abbr", p1, fallback: "Plural format key: \"%#@count_second_ago_abbr@\"") } } } public enum Year { /// Plural format key: "%#@count_year_left@" public static func `left`(_ p1: Int) -> String { - return L10n.tr("Localizable", "date.year.left", p1) + return L10n.tr("Localizable", "date.year.left", p1, fallback: "Plural format key: \"%#@count_year_left@\"") } public enum Ago { /// Plural format key: "%#@count_year_ago_abbr@" public static func abbr(_ p1: Int) -> String { - return L10n.tr("Localizable", "date.year.ago.abbr", p1) + return L10n.tr("Localizable", "date.year.ago.abbr", p1, fallback: "Plural format key: \"%#@count_year_ago_abbr@\"") } } } } - public enum Plural { /// Plural format key: "%#@count_people_talking@" public static func peopleTalking(_ p1: Int) -> String { - return L10n.tr("Localizable", "plural.people_talking", p1) + return L10n.tr("Localizable", "plural.people_talking", p1, fallback: "Plural format key: \"%#@count_people_talking@\"") } public enum Count { /// Plural format key: "%#@favorite_count@" public static func favorite(_ p1: Int) -> String { - return L10n.tr("Localizable", "plural.count.favorite", p1) + return L10n.tr("Localizable", "plural.count.favorite", p1, fallback: "Plural format key: \"%#@favorite_count@\"") } /// Plural format key: "%#@names@%#@count_mutual@" public static func followedByAndMutual(_ p1: Int, _ p2: Int) -> String { - return L10n.tr("Localizable", "plural.count.followed_by_and_mutual", p1, p2) + return L10n.tr("Localizable", "plural.count.followed_by_and_mutual", p1, p2, fallback: "Plural format key: \"%#@names@%#@count_mutual@\"") } /// Plural format key: "%#@count_follower@" public static func follower(_ p1: Int) -> String { - return L10n.tr("Localizable", "plural.count.follower", p1) + return L10n.tr("Localizable", "plural.count.follower", p1, fallback: "Plural format key: \"%#@count_follower@\"") } /// Plural format key: "%#@count_following@" public static func following(_ p1: Int) -> String { - return L10n.tr("Localizable", "plural.count.following", p1) + return L10n.tr("Localizable", "plural.count.following", p1, fallback: "Plural format key: \"%#@count_following@\"") } /// Plural format key: "%#@media_count@" public static func media(_ p1: Int) -> String { - return L10n.tr("Localizable", "plural.count.media", p1) + return L10n.tr("Localizable", "plural.count.media", p1, fallback: "Plural format key: \"%#@media_count@\"") } /// Plural format key: "%#@post_count@" public static func post(_ p1: Int) -> String { - return L10n.tr("Localizable", "plural.count.post", p1) + return L10n.tr("Localizable", "plural.count.post", p1, fallback: "Plural format key: \"%#@post_count@\"") } /// Plural format key: "%#@reblog_count@" public static func reblog(_ p1: Int) -> String { - return L10n.tr("Localizable", "plural.count.reblog", p1) + return L10n.tr("Localizable", "plural.count.reblog", p1, fallback: "Plural format key: \"%#@reblog_count@\"") } /// Plural format key: "%#@reply_count@" public static func reply(_ p1: Int) -> String { - return L10n.tr("Localizable", "plural.count.reply", p1) + return L10n.tr("Localizable", "plural.count.reply", p1, fallback: "Plural format key: \"%#@reply_count@\"") } /// Plural format key: "%#@vote_count@" public static func vote(_ p1: Int) -> String { - return L10n.tr("Localizable", "plural.count.vote", p1) + return L10n.tr("Localizable", "plural.count.vote", p1, fallback: "Plural format key: \"%#@vote_count@\"") } /// Plural format key: "%#@voter_count@" public static func voter(_ p1: Int) -> String { - return L10n.tr("Localizable", "plural.count.voter", p1) + return L10n.tr("Localizable", "plural.count.voter", p1, fallback: "Plural format key: \"%#@voter_count@\"") } public enum MetricFormatted { /// Plural format key: "%@ %#@post_count@" public static func post(_ p1: Any, _ p2: Int) -> String { - return L10n.tr("Localizable", "plural.count.metric_formatted.post", String(describing: p1), p2) + return L10n.tr("Localizable", "plural.count.metric_formatted.post", String(describing: p1), p2, fallback: "Plural format key: \"%@ %#@post_count@\"") } } } @@ -1430,8 +1476,8 @@ public enum L10n { // MARK: - Implementation Details extension L10n { - private static func tr(_ table: String, _ key: String, _ args: CVarArg...) -> String { - let format = Bundle.module.localizedString(forKey: key, value: nil, table: table) + private static func tr(_ table: String, _ key: String, _ args: CVarArg..., fallback value: String) -> String { + let format = Bundle.module.localizedString(forKey: key, value: value, table: table) return String(format: format, locale: Locale.current, arguments: args) } } diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings new file mode 100644 index 000000000..adeaad07b --- /dev/null +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings @@ -0,0 +1,464 @@ +"Common.Alerts.BlockDomain.BlockEntireDomain" = "Block Domain"; +"Common.Alerts.BlockDomain.Title" = "Are you really, really sure you want to block the entire %@? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain and any of your followers from that domain will be removed."; +"Common.Alerts.CleanCache.Message" = "Successfully cleaned %@ cache."; +"Common.Alerts.CleanCache.Title" = "Clean Cache"; +"Common.Alerts.Common.PleaseTryAgain" = "Please try again."; +"Common.Alerts.Common.PleaseTryAgainLater" = "Please try again later."; +"Common.Alerts.DeletePost.Message" = "Are you sure you want to delete this post?"; +"Common.Alerts.DeletePost.Title" = "Delete Post"; +"Common.Alerts.DiscardPostContent.Message" = "Confirm to discard composed post content."; +"Common.Alerts.DiscardPostContent.Title" = "Discard Draft"; +"Common.Alerts.EditProfileFailure.Message" = "Cannot edit profile. Please try again."; +"Common.Alerts.EditProfileFailure.Title" = "Edit Profile Error"; +"Common.Alerts.PublishPostFailure.AttachmentsMessage.MoreThanOneVideo" = "Cannot attach more than one video."; +"Common.Alerts.PublishPostFailure.AttachmentsMessage.VideoAttachWithPhoto" = "Cannot attach a video to a post that already contains images."; +"Common.Alerts.PublishPostFailure.Message" = "Failed to publish the post. +Please check your internet connection."; +"Common.Alerts.PublishPostFailure.Title" = "Publish Failure"; +"Common.Alerts.SavePhotoFailure.Message" = "Please enable the photo library access permission to save the photo."; +"Common.Alerts.SavePhotoFailure.Title" = "Save Photo Failure"; +"Common.Alerts.ServerError.Title" = "Server Error"; +"Common.Alerts.SignOut.Confirm" = "Sign Out"; +"Common.Alerts.SignOut.Message" = "Are you sure you want to sign out?"; +"Common.Alerts.SignOut.Title" = "Sign Out"; +"Common.Alerts.SignUpFailure.Title" = "Sign Up Failure"; +"Common.Alerts.VoteFailure.PollEnded" = "The poll has ended"; +"Common.Alerts.VoteFailure.Title" = "Vote Failure"; +"Common.Controls.Actions.Add" = "Add"; +"Common.Controls.Actions.Back" = "Back"; +"Common.Controls.Actions.BlockDomain" = "Block %@"; +"Common.Controls.Actions.Cancel" = "Cancel"; +"Common.Controls.Actions.Compose" = "Compose"; +"Common.Controls.Actions.Confirm" = "Confirm"; +"Common.Controls.Actions.Continue" = "Continue"; +"Common.Controls.Actions.CopyPhoto" = "Copy Photo"; +"Common.Controls.Actions.Delete" = "Delete"; +"Common.Controls.Actions.Discard" = "Discard"; +"Common.Controls.Actions.Done" = "Done"; +"Common.Controls.Actions.Edit" = "Edit"; +"Common.Controls.Actions.FindPeople" = "Find people to follow"; +"Common.Controls.Actions.ManuallySearch" = "Manually search instead"; +"Common.Controls.Actions.Next" = "Next"; +"Common.Controls.Actions.Ok" = "OK"; +"Common.Controls.Actions.Open" = "Open"; +"Common.Controls.Actions.OpenInBrowser" = "Open in Browser"; +"Common.Controls.Actions.OpenInSafari" = "Open in Safari"; +"Common.Controls.Actions.Preview" = "Preview"; +"Common.Controls.Actions.Previous" = "Previous"; +"Common.Controls.Actions.Remove" = "Remove"; +"Common.Controls.Actions.Reply" = "Reply"; +"Common.Controls.Actions.ReportUser" = "Report %@"; +"Common.Controls.Actions.Save" = "Save"; +"Common.Controls.Actions.SavePhoto" = "Save Photo"; +"Common.Controls.Actions.SeeMore" = "See More"; +"Common.Controls.Actions.Settings" = "Settings"; +"Common.Controls.Actions.Share" = "Share"; +"Common.Controls.Actions.SharePost" = "Share Post"; +"Common.Controls.Actions.ShareUser" = "Share %@"; +"Common.Controls.Actions.SignIn" = "Log in"; +"Common.Controls.Actions.SignUp" = "Create account"; +"Common.Controls.Actions.Skip" = "Skip"; +"Common.Controls.Actions.TakePhoto" = "Take Photo"; +"Common.Controls.Actions.TryAgain" = "Try Again"; +"Common.Controls.Actions.UnblockDomain" = "Unblock %@"; +"Common.Controls.Friendship.Block" = "Block"; +"Common.Controls.Friendship.BlockDomain" = "Block %@"; +"Common.Controls.Friendship.BlockUser" = "Block %@"; +"Common.Controls.Friendship.Blocked" = "Blocked"; +"Common.Controls.Friendship.EditInfo" = "Edit Info"; +"Common.Controls.Friendship.Follow" = "Follow"; +"Common.Controls.Friendship.Following" = "Following"; +"Common.Controls.Friendship.HideReblogs" = "Hide Reblogs"; +"Common.Controls.Friendship.Mute" = "Mute"; +"Common.Controls.Friendship.MuteUser" = "Mute %@"; +"Common.Controls.Friendship.Muted" = "Muted"; +"Common.Controls.Friendship.Pending" = "Pending"; +"Common.Controls.Friendship.Request" = "Request"; +"Common.Controls.Friendship.ShowReblogs" = "Show Reblogs"; +"Common.Controls.Friendship.Unblock" = "Unblock"; +"Common.Controls.Friendship.UnblockUser" = "Unblock %@"; +"Common.Controls.Friendship.Unmute" = "Unmute"; +"Common.Controls.Friendship.UnmuteUser" = "Unmute %@"; +"Common.Controls.Keyboard.Common.ComposeNewPost" = "Compose New Post"; +"Common.Controls.Keyboard.Common.OpenSettings" = "Open Settings"; +"Common.Controls.Keyboard.Common.ShowFavorites" = "Show Favorites"; +"Common.Controls.Keyboard.Common.SwitchToTab" = "Switch to %@"; +"Common.Controls.Keyboard.SegmentedControl.NextSection" = "Next Section"; +"Common.Controls.Keyboard.SegmentedControl.PreviousSection" = "Previous Section"; +"Common.Controls.Keyboard.Timeline.NextStatus" = "Next Post"; +"Common.Controls.Keyboard.Timeline.OpenAuthorProfile" = "Open Author's Profile"; +"Common.Controls.Keyboard.Timeline.OpenRebloggerProfile" = "Open Reblogger's Profile"; +"Common.Controls.Keyboard.Timeline.OpenStatus" = "Open Post"; +"Common.Controls.Keyboard.Timeline.PreviewImage" = "Preview Image"; +"Common.Controls.Keyboard.Timeline.PreviousStatus" = "Previous Post"; +"Common.Controls.Keyboard.Timeline.ReplyStatus" = "Reply to Post"; +"Common.Controls.Keyboard.Timeline.ToggleContentWarning" = "Toggle Content Warning"; +"Common.Controls.Keyboard.Timeline.ToggleFavorite" = "Toggle Favorite on Post"; +"Common.Controls.Keyboard.Timeline.ToggleReblog" = "Toggle Reblog on Post"; +"Common.Controls.Status.Actions.Favorite" = "Favorite"; +"Common.Controls.Status.Actions.Hide" = "Hide"; +"Common.Controls.Status.Actions.Menu" = "Menu"; +"Common.Controls.Status.Actions.Reblog" = "Reblog"; +"Common.Controls.Status.Actions.Reply" = "Reply"; +"Common.Controls.Status.Actions.ShowGif" = "Show GIF"; +"Common.Controls.Status.Actions.ShowImage" = "Show image"; +"Common.Controls.Status.Actions.ShowVideoPlayer" = "Show video player"; +"Common.Controls.Status.Actions.TapThenHoldToShowMenu" = "Tap then hold to show menu"; +"Common.Controls.Status.Actions.Unfavorite" = "Unfavorite"; +"Common.Controls.Status.Actions.Unreblog" = "Undo reblog"; +"Common.Controls.Status.ContentWarning" = "Content Warning"; +"Common.Controls.Status.MediaContentWarning" = "Tap anywhere to reveal"; +"Common.Controls.Status.MetaEntity.Email" = "Email address: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Hashtag: %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Show Profile: %@"; +"Common.Controls.Status.MetaEntity.Url" = "Link: %@"; +"Common.Controls.Status.Poll.Closed" = "Closed"; +"Common.Controls.Status.Poll.Vote" = "Vote"; +"Common.Controls.Status.SensitiveContent" = "Sensitive Content"; +"Common.Controls.Status.ShowPost" = "Show Post"; +"Common.Controls.Status.ShowUserProfile" = "Show user profile"; +"Common.Controls.Status.Tag.Email" = "Email"; +"Common.Controls.Status.Tag.Emoji" = "Emoji"; +"Common.Controls.Status.Tag.Hashtag" = "Hashtag"; +"Common.Controls.Status.Tag.Link" = "Link"; +"Common.Controls.Status.Tag.Mention" = "Mention"; +"Common.Controls.Status.Tag.Url" = "URL"; +"Common.Controls.Status.TapToReveal" = "Tap to reveal"; +"Common.Controls.Status.UserReblogged" = "%@ reblogged"; +"Common.Controls.Status.UserRepliedTo" = "Replied to %@"; +"Common.Controls.Status.Visibility.Direct" = "Only mentioned user can see this post."; +"Common.Controls.Status.Visibility.Private" = "Only their followers can see this post."; +"Common.Controls.Status.Visibility.PrivateFromMe" = "Only my followers can see this post."; +"Common.Controls.Status.Visibility.Unlisted" = "Everyone can see this post but not display in the public timeline."; +"Common.Controls.Tabs.Home" = "Home"; +"Common.Controls.Tabs.Notifications" = "Notifications"; +"Common.Controls.Tabs.Profile" = "Profile"; +"Common.Controls.Tabs.Search" = "Search"; +"Common.Controls.Timeline.Filtered" = "Filtered"; +"Common.Controls.Timeline.Header.BlockedWarning" = "You can’t view this user’s profile +until they unblock you."; +"Common.Controls.Timeline.Header.BlockingWarning" = "You can’t view this user's profile +until you unblock them. +Your profile looks like this to them."; +"Common.Controls.Timeline.Header.NoStatusFound" = "No Post Found"; +"Common.Controls.Timeline.Header.SuspendedWarning" = "This user has been suspended."; +"Common.Controls.Timeline.Header.UserBlockedWarning" = "You can’t view %@’s profile +until they unblock you."; +"Common.Controls.Timeline.Header.UserBlockingWarning" = "You can’t view %@’s profile +until you unblock them. +Your profile looks like this to them."; +"Common.Controls.Timeline.Header.UserSuspendedWarning" = "%@’s account has been suspended."; +"Common.Controls.Timeline.Loader.LoadMissingPosts" = "Load missing posts"; +"Common.Controls.Timeline.Loader.LoadingMissingPosts" = "Loading missing posts..."; +"Common.Controls.Timeline.Loader.ShowMoreReplies" = "Show more replies"; +"Common.Controls.Timeline.Timestamp.Now" = "Now"; +"Scene.AccountList.AddAccount" = "Add Account"; +"Scene.AccountList.DismissAccountSwitcher" = "Dismiss Account Switcher"; +"Scene.AccountList.TabBarHint" = "Current selected profile: %@. Double tap then hold to show account switcher"; +"Scene.Bookmark.Title" = "Bookmarks"; +"Scene.Compose.Accessibility.AppendAttachment" = "Add Attachment"; +"Scene.Compose.Accessibility.AppendPoll" = "Add Poll"; +"Scene.Compose.Accessibility.CustomEmojiPicker" = "Custom Emoji Picker"; +"Scene.Compose.Accessibility.DisableContentWarning" = "Disable Content Warning"; +"Scene.Compose.Accessibility.EnableContentWarning" = "Enable Content Warning"; +"Scene.Compose.Accessibility.PostOptions" = "Post Options"; +"Scene.Compose.Accessibility.PostVisibilityMenu" = "Post Visibility Menu"; +"Scene.Compose.Accessibility.PostingAs" = "Posting as %@"; +"Scene.Compose.Accessibility.RemovePoll" = "Remove Poll"; +"Scene.Compose.Attachment.AttachmentBroken" = "This %@ is broken and can’t be +uploaded to Mastodon."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "Attachment too large"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Can not recognize this media attachment"; +"Scene.Compose.Attachment.CompressingState" = "Compressing..."; +"Scene.Compose.Attachment.DescriptionPhoto" = "Describe the photo for the visually-impaired..."; +"Scene.Compose.Attachment.DescriptionVideo" = "Describe the video for the visually-impaired..."; +"Scene.Compose.Attachment.LoadFailed" = "Load Failed"; +"Scene.Compose.Attachment.Photo" = "photo"; +"Scene.Compose.Attachment.ServerProcessingState" = "Server Processing..."; +"Scene.Compose.Attachment.UploadFailed" = "Upload Failed"; +"Scene.Compose.Attachment.Video" = "video"; +"Scene.Compose.AutoComplete.SpaceToAdd" = "Space to add"; +"Scene.Compose.ComposeAction" = "Publish"; +"Scene.Compose.ContentInputPlaceholder" = "Type or paste what’s on your mind"; +"Scene.Compose.ContentWarning.Placeholder" = "Write an accurate warning here..."; +"Scene.Compose.Keyboard.AppendAttachmentEntry" = "Add Attachment - %@"; +"Scene.Compose.Keyboard.DiscardPost" = "Discard Post"; +"Scene.Compose.Keyboard.PublishPost" = "Publish Post"; +"Scene.Compose.Keyboard.SelectVisibilityEntry" = "Select Visibility - %@"; +"Scene.Compose.Keyboard.ToggleContentWarning" = "Toggle Content Warning"; +"Scene.Compose.Keyboard.TogglePoll" = "Toggle Poll"; +"Scene.Compose.MediaSelection.Browse" = "Browse"; +"Scene.Compose.MediaSelection.Camera" = "Take Photo"; +"Scene.Compose.MediaSelection.PhotoLibrary" = "Photo Library"; +"Scene.Compose.Poll.DurationTime" = "Duration: %@"; +"Scene.Compose.Poll.OneDay" = "1 Day"; +"Scene.Compose.Poll.OneHour" = "1 Hour"; +"Scene.Compose.Poll.OptionNumber" = "Option %ld"; +"Scene.Compose.Poll.SevenDays" = "7 Days"; +"Scene.Compose.Poll.SixHours" = "6 Hours"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "The poll has empty option"; +"Scene.Compose.Poll.ThePollIsInvalid" = "The poll is invalid"; +"Scene.Compose.Poll.ThirtyMinutes" = "30 minutes"; +"Scene.Compose.Poll.ThreeDays" = "3 Days"; +"Scene.Compose.ReplyingToUser" = "replying to %@"; +"Scene.Compose.Title.NewPost" = "New Post"; +"Scene.Compose.Title.NewReply" = "New Reply"; +"Scene.Compose.Visibility.Direct" = "Only people I mention"; +"Scene.Compose.Visibility.Private" = "Followers only"; +"Scene.Compose.Visibility.Public" = "Public"; +"Scene.Compose.Visibility.Unlisted" = "Unlisted"; +"Scene.ConfirmEmail.Button.OpenEmailApp" = "Open Email App"; +"Scene.ConfirmEmail.Button.Resend" = "Resend"; +"Scene.ConfirmEmail.DontReceiveEmail.Description" = "Check if your email address is correct as well as your junk folder if you haven’t."; +"Scene.ConfirmEmail.DontReceiveEmail.ResendEmail" = "Resend Email"; +"Scene.ConfirmEmail.DontReceiveEmail.Title" = "Check your email"; +"Scene.ConfirmEmail.OpenEmailApp.Description" = "We just sent you an email. Check your junk folder if you haven’t."; +"Scene.ConfirmEmail.OpenEmailApp.Mail" = "Mail"; +"Scene.ConfirmEmail.OpenEmailApp.OpenEmailClient" = "Open Email Client"; +"Scene.ConfirmEmail.OpenEmailApp.Title" = "Check your inbox."; +"Scene.ConfirmEmail.Subtitle" = "Tap the link we emailed to you to verify your account."; +"Scene.ConfirmEmail.TapTheLinkWeEmailedToYouToVerifyYourAccount" = "Tap the link we emailed to you to verify your account"; +"Scene.ConfirmEmail.Title" = "One last thing."; +"Scene.Discovery.Intro" = "These are the posts gaining traction in your corner of Mastodon."; +"Scene.Discovery.Tabs.Community" = "Community"; +"Scene.Discovery.Tabs.ForYou" = "For You"; +"Scene.Discovery.Tabs.Hashtags" = "Hashtags"; +"Scene.Discovery.Tabs.News" = "News"; +"Scene.Discovery.Tabs.Posts" = "Posts"; +"Scene.Familiarfollowers.FollowedByNames" = "Followed by %@"; +"Scene.Familiarfollowers.Title" = "Followers you familiar"; +"Scene.Favorite.Title" = "Your Favorites"; +"Scene.FavoritedBy.Title" = "Favorited By"; +"Scene.Follower.Footer" = "Followers from other servers are not displayed."; +"Scene.Follower.Title" = "follower"; +"Scene.Following.Footer" = "Follows from other servers are not displayed."; +"Scene.Following.Title" = "following"; +"Scene.HomeTimeline.NavigationBarState.Accessibility.LogoHint" = "Tap to scroll to top and tap again to previous location"; +"Scene.HomeTimeline.NavigationBarState.Accessibility.LogoLabel" = "Logo Button"; +"Scene.HomeTimeline.NavigationBarState.NewPosts" = "See new posts"; +"Scene.HomeTimeline.NavigationBarState.Offline" = "Offline"; +"Scene.HomeTimeline.NavigationBarState.Published" = "Published!"; +"Scene.HomeTimeline.NavigationBarState.Publishing" = "Publishing post..."; +"Scene.HomeTimeline.Title" = "Home"; +"Scene.Login.ServerSearchField.Placeholder" = "Enter URL or search for your server"; +"Scene.Login.Subtitle" = "Log you in on the server you created your account on."; +"Scene.Login.Title" = "Welcome back"; +"Scene.Notification.FollowRequest.Accept" = "Accept"; +"Scene.Notification.FollowRequest.Accepted" = "Accepted"; +"Scene.Notification.FollowRequest.Reject" = "reject"; +"Scene.Notification.FollowRequest.Rejected" = "Rejected"; +"Scene.Notification.Keyobard.ShowEverything" = "Show Everything"; +"Scene.Notification.Keyobard.ShowMentions" = "Show Mentions"; +"Scene.Notification.NotificationDescription.FavoritedYourPost" = "favorited your post"; +"Scene.Notification.NotificationDescription.FollowedYou" = "followed you"; +"Scene.Notification.NotificationDescription.MentionedYou" = "mentioned you"; +"Scene.Notification.NotificationDescription.PollHasEnded" = "poll has ended"; +"Scene.Notification.NotificationDescription.RebloggedYourPost" = "reblogged your post"; +"Scene.Notification.NotificationDescription.RequestToFollowYou" = "request to follow you"; +"Scene.Notification.Title.Everything" = "Everything"; +"Scene.Notification.Title.Mentions" = "Mentions"; +"Scene.Preview.Keyboard.ClosePreview" = "Close Preview"; +"Scene.Preview.Keyboard.ShowNext" = "Show Next"; +"Scene.Preview.Keyboard.ShowPrevious" = "Show Previous"; +"Scene.Profile.Accessibility.DoubleTapToOpenTheList" = "Double tap to open the list"; +"Scene.Profile.Accessibility.EditAvatarImage" = "Edit avatar image"; +"Scene.Profile.Accessibility.ShowAvatarImage" = "Show avatar image"; +"Scene.Profile.Accessibility.ShowBannerImage" = "Show banner image"; +"Scene.Profile.Dashboard.Followers" = "followers"; +"Scene.Profile.Dashboard.Following" = "following"; +"Scene.Profile.Dashboard.Posts" = "posts"; +"Scene.Profile.Fields.AddRow" = "Add Row"; +"Scene.Profile.Fields.Placeholder.Content" = "Content"; +"Scene.Profile.Fields.Placeholder.Label" = "Label"; +"Scene.Profile.Fields.Verified.Long" = "Ownership of this link was checked on %@"; +"Scene.Profile.Fields.Verified.Short" = "Verified on %@"; +"Scene.Profile.Header.FollowsYou" = "Follows You"; +"Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "Confirm to block %@"; +"Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "Block Account"; +"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Message" = "Confirm to hide reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Title" = "Hide Reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Message" = "Confirm to mute %@"; +"Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Title" = "Mute Account"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message" = "Confirm to show reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Title" = "Show Reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Message" = "Confirm to unblock %@"; +"Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Title" = "Unblock Account"; +"Scene.Profile.RelationshipActionAlert.ConfirmUnmuteUser.Message" = "Confirm to unmute %@"; +"Scene.Profile.RelationshipActionAlert.ConfirmUnmuteUser.Title" = "Unmute Account"; +"Scene.Profile.SegmentedControl.About" = "About"; +"Scene.Profile.SegmentedControl.Media" = "Media"; +"Scene.Profile.SegmentedControl.Posts" = "Posts"; +"Scene.Profile.SegmentedControl.PostsAndReplies" = "Posts and Replies"; +"Scene.Profile.SegmentedControl.Replies" = "Replies"; +"Scene.RebloggedBy.Title" = "Reblogged By"; +"Scene.Register.Error.Item.Agreement" = "Agreement"; +"Scene.Register.Error.Item.Email" = "Email"; +"Scene.Register.Error.Item.Locale" = "Locale"; +"Scene.Register.Error.Item.Password" = "Password"; +"Scene.Register.Error.Item.Reason" = "Reason"; +"Scene.Register.Error.Item.Username" = "Username"; +"Scene.Register.Error.Reason.Accepted" = "%@ must be accepted"; +"Scene.Register.Error.Reason.Blank" = "%@ is required"; +"Scene.Register.Error.Reason.Blocked" = "%@ contains a disallowed email provider"; +"Scene.Register.Error.Reason.Inclusion" = "%@ is not a supported value"; +"Scene.Register.Error.Reason.Invalid" = "%@ is invalid"; +"Scene.Register.Error.Reason.Reserved" = "%@ is a reserved keyword"; +"Scene.Register.Error.Reason.Taken" = "%@ is already in use"; +"Scene.Register.Error.Reason.TooLong" = "%@ is too long"; +"Scene.Register.Error.Reason.TooShort" = "%@ is too short"; +"Scene.Register.Error.Reason.Unreachable" = "%@ does not seem to exist"; +"Scene.Register.Error.Special.EmailInvalid" = "This is not a valid email address"; +"Scene.Register.Error.Special.PasswordTooShort" = "Password is too short (must be at least 8 characters)"; +"Scene.Register.Error.Special.UsernameInvalid" = "Username must only contain alphanumeric characters and underscores"; +"Scene.Register.Error.Special.UsernameTooLong" = "Username is too long (can’t be longer than 30 characters)"; +"Scene.Register.Input.Avatar.Delete" = "Delete"; +"Scene.Register.Input.DisplayName.Placeholder" = "display name"; +"Scene.Register.Input.Email.Placeholder" = "email"; +"Scene.Register.Input.Invite.RegistrationUserInviteRequest" = "Why do you want to join?"; +"Scene.Register.Input.Password.Accessibility.Checked" = "checked"; +"Scene.Register.Input.Password.Accessibility.Unchecked" = "unchecked"; +"Scene.Register.Input.Password.CharacterLimit" = "8 characters"; +"Scene.Register.Input.Password.Hint" = "Your password needs at least eight characters"; +"Scene.Register.Input.Password.Placeholder" = "password"; +"Scene.Register.Input.Password.Require" = "Your password needs at least:"; +"Scene.Register.Input.Username.DuplicatePrompt" = "This username is taken."; +"Scene.Register.Input.Username.Placeholder" = "username"; +"Scene.Register.LetsGetYouSetUpOnDomain" = "Let’s get you set up on %@"; +"Scene.Register.Title" = "Let’s get you set up on %@"; +"Scene.Report.Content1" = "Are there any other posts you’d like to add to the report?"; +"Scene.Report.Content2" = "Is there anything the moderators should know about this report?"; +"Scene.Report.ReportSentTitle" = "Thanks for reporting, we’ll look into this."; +"Scene.Report.Reported" = "REPORTED"; +"Scene.Report.Send" = "Send Report"; +"Scene.Report.SkipToSend" = "Send without comment"; +"Scene.Report.Step1" = "Step 1 of 2"; +"Scene.Report.Step2" = "Step 2 of 2"; +"Scene.Report.StepFinal.BlockUser" = "Block %@"; +"Scene.Report.StepFinal.DontWantToSeeThis" = "Don’t want to see this?"; +"Scene.Report.StepFinal.MuteUser" = "Mute %@"; +"Scene.Report.StepFinal.TheyWillNoLongerBeAbleToFollowOrSeeYourPostsButTheyCanSeeIfTheyveBeenBlocked" = "They will no longer be able to follow or see your posts, but they can see if they’ve been blocked."; +"Scene.Report.StepFinal.Unfollow" = "Unfollow"; +"Scene.Report.StepFinal.UnfollowUser" = "Unfollow %@"; +"Scene.Report.StepFinal.Unfollowed" = "Unfollowed"; +"Scene.Report.StepFinal.WhenYouSeeSomethingYouDontLikeOnMastodonYouCanRemoveThePersonFromYourExperience." = "When you see something you don’t like on Mastodon, you can remove the person from your experience."; +"Scene.Report.StepFinal.WhileWeReviewThisYouCanTakeActionAgainstUser" = "While we review this, you can take action against %@"; +"Scene.Report.StepFinal.YouWontSeeTheirPostsOrReblogsInYourHomeFeedTheyWontKnowTheyVeBeenMuted" = "You won’t see their posts or reblogs in your home feed. They won’t know they’ve been muted."; +"Scene.Report.StepFour.IsThereAnythingElseWeShouldKnow" = "Is there anything else we should know?"; +"Scene.Report.StepFour.Step4Of4" = "Step 4 of 4"; +"Scene.Report.StepOne.IDontLikeIt" = "I don’t like it"; +"Scene.Report.StepOne.ItIsNotSomethingYouWantToSee" = "It is not something you want to see"; +"Scene.Report.StepOne.ItViolatesServerRules" = "It violates server rules"; +"Scene.Report.StepOne.ItsSomethingElse" = "It’s something else"; +"Scene.Report.StepOne.ItsSpam" = "It’s spam"; +"Scene.Report.StepOne.MaliciousLinksFakeEngagementOrRepetetiveReplies" = "Malicious links, fake engagement, or repetetive replies"; +"Scene.Report.StepOne.SelectTheBestMatch" = "Select the best match"; +"Scene.Report.StepOne.Step1Of4" = "Step 1 of 4"; +"Scene.Report.StepOne.TheIssueDoesNotFitIntoOtherCategories" = "The issue does not fit into other categories"; +"Scene.Report.StepOne.WhatsWrongWithThisAccount" = "What's wrong with this account?"; +"Scene.Report.StepOne.WhatsWrongWithThisPost" = "What's wrong with this post?"; +"Scene.Report.StepOne.WhatsWrongWithThisUsername" = "What's wrong with %@?"; +"Scene.Report.StepOne.YouAreAwareThatItBreaksSpecificRules" = "You are aware that it breaks specific rules"; +"Scene.Report.StepThree.AreThereAnyPostsThatBackUpThisReport" = "Are there any posts that back up this report?"; +"Scene.Report.StepThree.SelectAllThatApply" = "Select all that apply"; +"Scene.Report.StepThree.Step3Of4" = "Step 3 of 4"; +"Scene.Report.StepTwo.IJustDon’tLikeIt" = "I just don’t like it"; +"Scene.Report.StepTwo.SelectAllThatApply" = "Select all that apply"; +"Scene.Report.StepTwo.Step2Of4" = "Step 2 of 4"; +"Scene.Report.StepTwo.WhichRulesAreBeingViolated" = "Which rules are being violated?"; +"Scene.Report.TextPlaceholder" = "Type or paste additional comments"; +"Scene.Report.Title" = "Report %@"; +"Scene.Report.TitleReport" = "Report"; +"Scene.Search.Recommend.Accounts.Description" = "You may like to follow these accounts"; +"Scene.Search.Recommend.Accounts.Follow" = "Follow"; +"Scene.Search.Recommend.Accounts.Title" = "Accounts you might like"; +"Scene.Search.Recommend.ButtonText" = "See All"; +"Scene.Search.Recommend.HashTag.Description" = "Hashtags that are getting quite a bit of attention"; +"Scene.Search.Recommend.HashTag.PeopleTalking" = "%@ people are talking"; +"Scene.Search.Recommend.HashTag.Title" = "Trending on Mastodon"; +"Scene.Search.SearchBar.Cancel" = "Cancel"; +"Scene.Search.SearchBar.Placeholder" = "Search hashtags and users"; +"Scene.Search.Searching.Clear" = "Clear"; +"Scene.Search.Searching.EmptyState.NoResults" = "No results"; +"Scene.Search.Searching.RecentSearch" = "Recent searches"; +"Scene.Search.Searching.Segment.All" = "All"; +"Scene.Search.Searching.Segment.Hashtags" = "Hashtags"; +"Scene.Search.Searching.Segment.People" = "People"; +"Scene.Search.Searching.Segment.Posts" = "Posts"; +"Scene.Search.Title" = "Search"; +"Scene.ServerPicker.Button.Category.Academia" = "academia"; +"Scene.ServerPicker.Button.Category.Activism" = "activism"; +"Scene.ServerPicker.Button.Category.All" = "All"; +"Scene.ServerPicker.Button.Category.AllAccessiblityDescription" = "Category: All"; +"Scene.ServerPicker.Button.Category.Art" = "art"; +"Scene.ServerPicker.Button.Category.Food" = "food"; +"Scene.ServerPicker.Button.Category.Furry" = "furry"; +"Scene.ServerPicker.Button.Category.Games" = "games"; +"Scene.ServerPicker.Button.Category.General" = "general"; +"Scene.ServerPicker.Button.Category.Journalism" = "journalism"; +"Scene.ServerPicker.Button.Category.Lgbt" = "lgbt"; +"Scene.ServerPicker.Button.Category.Music" = "music"; +"Scene.ServerPicker.Button.Category.Regional" = "regional"; +"Scene.ServerPicker.Button.Category.Tech" = "tech"; +"Scene.ServerPicker.Button.SeeLess" = "See Less"; +"Scene.ServerPicker.Button.SeeMore" = "See More"; +"Scene.ServerPicker.EmptyState.BadNetwork" = "Something went wrong while loading the data. Check your internet connection."; +"Scene.ServerPicker.EmptyState.FindingServers" = "Finding available servers..."; +"Scene.ServerPicker.EmptyState.NoResults" = "No results"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Search communities or enter URL"; +"Scene.ServerPicker.Label.Category" = "CATEGORY"; +"Scene.ServerPicker.Label.Language" = "LANGUAGE"; +"Scene.ServerPicker.Label.Users" = "USERS"; +"Scene.ServerPicker.Subtitle" = "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers."; +"Scene.ServerPicker.Title" = "Mastodon is made of users in different servers."; +"Scene.ServerRules.Button.Confirm" = "I Agree"; +"Scene.ServerRules.PrivacyPolicy" = "privacy policy"; +"Scene.ServerRules.Prompt" = "By continuing, you’re subject to the terms of service and privacy policy for %@."; +"Scene.ServerRules.Subtitle" = "These are set and enforced by the %@ moderators."; +"Scene.ServerRules.TermsOfService" = "terms of service"; +"Scene.ServerRules.Title" = "Some ground rules."; +"Scene.Settings.Footer.MastodonDescription" = "Mastodon is open source software. You can report issues on GitHub at %@ (%@)"; +"Scene.Settings.Keyboard.CloseSettingsWindow" = "Close Settings Window"; +"Scene.Settings.Section.Appearance.Automatic" = "Automatic"; +"Scene.Settings.Section.Appearance.Dark" = "Always Dark"; +"Scene.Settings.Section.Appearance.Light" = "Always Light"; +"Scene.Settings.Section.Appearance.Title" = "Appearance"; +"Scene.Settings.Section.BoringZone.AccountSettings" = "Account Settings"; +"Scene.Settings.Section.BoringZone.Privacy" = "Privacy Policy"; +"Scene.Settings.Section.BoringZone.Terms" = "Terms of Service"; +"Scene.Settings.Section.BoringZone.Title" = "The Boring Zone"; +"Scene.Settings.Section.LookAndFeel.Light" = "Light"; +"Scene.Settings.Section.LookAndFeel.ReallyDark" = "Really Dark"; +"Scene.Settings.Section.LookAndFeel.SortaDark" = "Sorta Dark"; +"Scene.Settings.Section.LookAndFeel.Title" = "Look and Feel"; +"Scene.Settings.Section.LookAndFeel.UseSystem" = "Use System"; +"Scene.Settings.Section.Notifications.Boosts" = "Reblogs my post"; +"Scene.Settings.Section.Notifications.Favorites" = "Favorites my post"; +"Scene.Settings.Section.Notifications.Follows" = "Follows me"; +"Scene.Settings.Section.Notifications.Mentions" = "Mentions me"; +"Scene.Settings.Section.Notifications.Title" = "Notifications"; +"Scene.Settings.Section.Notifications.Trigger.Anyone" = "anyone"; +"Scene.Settings.Section.Notifications.Trigger.Follow" = "anyone I follow"; +"Scene.Settings.Section.Notifications.Trigger.Follower" = "a follower"; +"Scene.Settings.Section.Notifications.Trigger.Noone" = "no one"; +"Scene.Settings.Section.Notifications.Trigger.Title" = "Notify me when"; +"Scene.Settings.Section.Preference.DisableAvatarAnimation" = "Disable animated avatars"; +"Scene.Settings.Section.Preference.DisableEmojiAnimation" = "Disable animated emojis"; +"Scene.Settings.Section.Preference.OpenLinksInMastodon" = "Open links in Mastodon"; +"Scene.Settings.Section.Preference.Title" = "Preferences"; +"Scene.Settings.Section.Preference.TrueBlackDarkMode" = "True black dark mode"; +"Scene.Settings.Section.Preference.UsingDefaultBrowser" = "Use default browser to open links"; +"Scene.Settings.Section.SpicyZone.Clear" = "Clear Media Cache"; +"Scene.Settings.Section.SpicyZone.Signout" = "Sign Out"; +"Scene.Settings.Section.SpicyZone.Title" = "The Spicy Zone"; +"Scene.Settings.Title" = "Settings"; +"Scene.SuggestionAccount.FollowExplain" = "When you follow someone, you’ll see their posts in your home feed."; +"Scene.SuggestionAccount.Title" = "Find People to Follow"; +"Scene.Thread.BackTitle" = "Post"; +"Scene.Thread.Title" = "Post from %@"; +"Scene.Welcome.GetStarted" = "Get Started"; +"Scene.Welcome.LogIn" = "Log In"; +"Scene.Welcome.Slogan" = "Social networking +back in your hands."; +"Scene.Wizard.AccessibilityHint" = "Double tap to dismiss this wizard"; +"Scene.Wizard.MultipleAccountSwitchIntroDescription" = "Switch between multiple accounts by holding the profile button."; +"Scene.Wizard.NewInMastodon" = "New in Mastodon"; \ No newline at end of file diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.stringsdict new file mode 100644 index 000000000..f8964ca5d --- /dev/null +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.stringsdict @@ -0,0 +1,631 @@ + + + + + a11y.plural.count.unread.notification + + NSStringLocalizedFormatKey + %#@notification_count_unread_notification@ + notification_count_unread_notification + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + no unread notifications + one + 1 unread notification + few + %ld unread notifications + many + %ld unread notifications + other + %ld unread notifications + + + a11y.plural.count.input_limit_exceeds + + NSStringLocalizedFormatKey + Input limit exceeds %#@character_count@ + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 characters + one + 1 character + few + %ld characters + many + %ld characters + other + %ld characters + + + a11y.plural.count.input_limit_remains + + NSStringLocalizedFormatKey + Input limit remains %#@character_count@ + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 characters + one + 1 character + few + %ld characters + many + %ld characters + other + %ld characters + + + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + no characters + one + 1 character + few + %ld characters + many + %ld characters + other + %ld characters + + + plural.count.followed_by_and_mutual + + NSStringLocalizedFormatKey + %#@names@%#@count_mutual@ + names + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + other + + + count_mutual + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + Followed by %1$@ + one + Followed by %1$@, and another mutual + few + Followed by %1$@, and %ld mutuals + many + Followed by %1$@, and %ld mutuals + other + Followed by %1$@, and %ld mutuals + + + plural.count.metric_formatted.post + + NSStringLocalizedFormatKey + %@ %#@post_count@ + post_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + posts + one + post + few + posts + many + posts + other + posts + + + plural.count.media + + NSStringLocalizedFormatKey + %#@media_count@ + media_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 media + one + 1 media + few + %ld media + many + %ld media + other + %ld media + + + plural.count.post + + NSStringLocalizedFormatKey + %#@post_count@ + post_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 posts + one + 1 post + few + %ld posts + many + %ld posts + other + %ld posts + + + plural.count.favorite + + NSStringLocalizedFormatKey + %#@favorite_count@ + favorite_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 favorites + one + 1 favorite + few + %ld favorites + many + %ld favorites + other + %ld favorites + + + plural.count.reblog + + NSStringLocalizedFormatKey + %#@reblog_count@ + reblog_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 reblogs + one + 1 reblog + few + %ld reblogs + many + %ld reblogs + other + %ld reblogs + + + plural.count.reply + + NSStringLocalizedFormatKey + %#@reply_count@ + reply_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 replies + one + 1 reply + few + %ld replies + many + %ld replies + other + %ld replies + + + plural.count.vote + + NSStringLocalizedFormatKey + %#@vote_count@ + vote_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 votes + one + 1 vote + few + %ld votes + many + %ld votes + other + %ld votes + + + plural.count.voter + + NSStringLocalizedFormatKey + %#@voter_count@ + voter_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 voters + one + 1 voter + few + %ld voters + many + %ld voters + other + %ld voters + + + plural.people_talking + + NSStringLocalizedFormatKey + %#@count_people_talking@ + count_people_talking + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 people talking + one + 1 people talking + few + %ld people talking + many + %ld people talking + other + %ld people talking + + + plural.count.following + + NSStringLocalizedFormatKey + %#@count_following@ + count_following + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 following + one + 1 following + few + %ld following + many + %ld following + other + %ld following + + + plural.count.follower + + NSStringLocalizedFormatKey + %#@count_follower@ + count_follower + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 followers + one + 1 follower + few + %ld followers + many + %ld followers + other + %ld followers + + + date.year.left + + NSStringLocalizedFormatKey + %#@count_year_left@ + count_year_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 years left + one + 1 year left + few + %ld years left + many + %ld years left + other + %ld years left + + + date.month.left + + NSStringLocalizedFormatKey + %#@count_month_left@ + count_month_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 months left + one + 1 months left + few + %ld months left + many + %ld months left + other + %ld months left + + + date.day.left + + NSStringLocalizedFormatKey + %#@count_day_left@ + count_day_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 days left + one + 1 day left + few + %ld days left + many + %ld days left + other + %ld days left + + + date.hour.left + + NSStringLocalizedFormatKey + %#@count_hour_left@ + count_hour_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 hours left + one + 1 hour left + few + %ld hours left + many + %ld hours left + other + %ld hours left + + + date.minute.left + + NSStringLocalizedFormatKey + %#@count_minute_left@ + count_minute_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 minutes left + one + 1 minute left + few + %ld minutes left + many + %ld minutes left + other + %ld minutes left + + + date.second.left + + NSStringLocalizedFormatKey + %#@count_second_left@ + count_second_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0 seconds left + one + 1 second left + few + %ld seconds left + many + %ld seconds left + other + %ld seconds left + + + date.year.ago.abbr + + NSStringLocalizedFormatKey + %#@count_year_ago_abbr@ + count_year_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0y ago + one + 1y ago + few + %ldy ago + many + %ldy ago + other + %ldy ago + + + date.month.ago.abbr + + NSStringLocalizedFormatKey + %#@count_month_ago_abbr@ + count_month_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0M ago + one + 1M ago + few + %ldM ago + many + %ldM ago + other + %ldM ago + + + date.day.ago.abbr + + NSStringLocalizedFormatKey + %#@count_day_ago_abbr@ + count_day_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0d ago + one + 1d ago + few + %ldd ago + many + %ldd ago + other + %ldd ago + + + date.hour.ago.abbr + + NSStringLocalizedFormatKey + %#@count_hour_ago_abbr@ + count_hour_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0h ago + one + 1h ago + few + %ldh ago + many + %ldh ago + other + %ldh ago + + + date.minute.ago.abbr + + NSStringLocalizedFormatKey + %#@count_minute_ago_abbr@ + count_minute_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0m ago + one + 1m ago + few + %ldm ago + many + %ldm ago + other + %ldm ago + + + date.second.ago.abbr + + NSStringLocalizedFormatKey + %#@count_second_ago_abbr@ + count_second_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + 0s ago + one + 1s ago + few + %lds ago + many + %lds ago + other + %lds ago + + + + diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/ar.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/ar.lproj/Localizable.strings index 9ecfa450e..17d0569c7 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/ar.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/ar.lproj/Localizable.strings @@ -55,8 +55,8 @@ "Common.Controls.Actions.Share" = "المُشارك"; "Common.Controls.Actions.SharePost" = "مشارك المنشور"; "Common.Controls.Actions.ShareUser" = "مُشارَكَةُ %@"; -"Common.Controls.Actions.SignIn" = "تسجيل الدخول"; -"Common.Controls.Actions.SignUp" = "إنشاء حِساب"; +"Common.Controls.Actions.SignIn" = "تسجيلُ الدخول"; +"Common.Controls.Actions.SignUp" = "Create account"; "Common.Controls.Actions.Skip" = "تخطي"; "Common.Controls.Actions.TakePhoto" = "اِلتِقاطُ صُورَة"; "Common.Controls.Actions.TryAgain" = "المُحاولة مرة أُخرى"; @@ -68,13 +68,13 @@ "Common.Controls.Friendship.EditInfo" = "تَحريرُ المَعلُومات"; "Common.Controls.Friendship.Follow" = "مُتابَعَة"; "Common.Controls.Friendship.Following" = "مُتابَع"; -"Common.Controls.Friendship.HideReblogs" = "Hide Reblogs"; +"Common.Controls.Friendship.HideReblogs" = "إخفاء إعادات التدوين"; "Common.Controls.Friendship.Mute" = "كَتم"; "Common.Controls.Friendship.MuteUser" = "كَتمُ %@"; "Common.Controls.Friendship.Muted" = "مكتوم"; "Common.Controls.Friendship.Pending" = "قيد المُراجعة"; "Common.Controls.Friendship.Request" = "إرسال طَلَب"; -"Common.Controls.Friendship.ShowReblogs" = "Show Reblogs"; +"Common.Controls.Friendship.ShowReblogs" = "إظهار إعادات التدوين"; "Common.Controls.Friendship.Unblock" = "رفع الحَظر"; "Common.Controls.Friendship.UnblockUser" = "رفع الحَظر عن %@"; "Common.Controls.Friendship.Unmute" = "رفع الكتم"; @@ -108,6 +108,10 @@ "Common.Controls.Status.Actions.Unreblog" = "التراجُع عن إعادة النشر"; "Common.Controls.Status.ContentWarning" = "تحذير المُحتوى"; "Common.Controls.Status.MediaContentWarning" = "اُنقُر لِلكَشف"; +"Common.Controls.Status.MetaEntity.Email" = "عُنوان البريد الإلكتُروني: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "وَسْم: %@"; +"Common.Controls.Status.MetaEntity.Mention" = "إظهار المِلف التعريفي: %@"; +"Common.Controls.Status.MetaEntity.Url" = "رابِط: %@"; "Common.Controls.Status.Poll.Closed" = "انتهى"; "Common.Controls.Status.Poll.Vote" = "صَوِّت"; "Common.Controls.Status.SensitiveContent" = "مُحتَوى حَسَّاس"; @@ -151,19 +155,27 @@ "Scene.AccountList.AddAccount" = "إضافَةُ حِساب"; "Scene.AccountList.DismissAccountSwitcher" = "تجاهُل مبدِّل الحِساب"; "Scene.AccountList.TabBarHint" = "المِلَفُّ المُحدَّدُ حالِيًّا: %@. اُنقُر نَقرًا مُزدَوَجًا مَعَ الاِستِمرارِ لِإظهارِ مُبدِّلِ الحِساب"; -"Scene.Bookmark.Title" = "Bookmarks"; +"Scene.Bookmark.Title" = "العَلاماتُ المَرجعيَّة"; "Scene.Compose.Accessibility.AppendAttachment" = "إضافة مُرفَق"; "Scene.Compose.Accessibility.AppendPoll" = "اضافة استطلاع رأي"; "Scene.Compose.Accessibility.CustomEmojiPicker" = "منتقي الرموز التعبيرية المُخصَّص"; "Scene.Compose.Accessibility.DisableContentWarning" = "تعطيل تحذير المُحتَوى"; "Scene.Compose.Accessibility.EnableContentWarning" = "تفعيل تحذير المُحتَوى"; +"Scene.Compose.Accessibility.PostOptions" = "Post Options"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "قائمة ظهور المنشور"; +"Scene.Compose.Accessibility.PostingAs" = "نَشر كَـ %@"; "Scene.Compose.Accessibility.RemovePoll" = "إزالة الاستطلاع"; "Scene.Compose.Attachment.AttachmentBroken" = "هذا ال%@ مُعطَّل ويتعذَّرُ رفعُه إلى ماستودون."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "المُرفَق كَبيرٌ جِدًّا"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "يتعذَّرُ التعرُّفُ على وسائِطِ هذا المُرفَق"; +"Scene.Compose.Attachment.CompressingState" = "يجري الضغط..."; "Scene.Compose.Attachment.DescriptionPhoto" = "صِف الصورة للمَكفوفين..."; "Scene.Compose.Attachment.DescriptionVideo" = "صِف المقطع المرئي للمَكفوفين..."; +"Scene.Compose.Attachment.LoadFailed" = "فَشَلَ التَّحميل"; "Scene.Compose.Attachment.Photo" = "صورة"; +"Scene.Compose.Attachment.ServerProcessingState" = "مُعالجة الخادم جارِيَة..."; +"Scene.Compose.Attachment.UploadFailed" = "فَشَلَ الرَّفع"; "Scene.Compose.Attachment.Video" = "مقطع مرئي"; "Scene.Compose.AutoComplete.SpaceToAdd" = "انقر على مساحة لإضافتِها"; "Scene.Compose.ComposeAction" = "نَشر"; @@ -184,6 +196,8 @@ "Scene.Compose.Poll.OptionNumber" = "الخيار %ld"; "Scene.Compose.Poll.SevenDays" = "سبعةُ أيام"; "Scene.Compose.Poll.SixHours" = "سِتُّ ساعات"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "يوجَدُ خِيارٌ فارِغٌ فِي الاِستِطلاع"; +"Scene.Compose.Poll.ThePollIsInvalid" = "الاِستِطلاعُ غيرُ صالِح"; "Scene.Compose.Poll.ThirtyMinutes" = "ثلاثون دقيقة"; "Scene.Compose.Poll.ThreeDays" = "ثلاثةُ أيام"; "Scene.Compose.ReplyingToUser" = "رَدًا على %@"; @@ -226,6 +240,9 @@ "Scene.HomeTimeline.NavigationBarState.Published" = "تمَّ النَّشر!"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "يَجري نَشر المُشارَكَة..."; "Scene.HomeTimeline.Title" = "الرَّئِيسَة"; +"Scene.Login.ServerSearchField.Placeholder" = "Enter URL or search for your server"; +"Scene.Login.Subtitle" = "Log you in on the server you created your account on."; +"Scene.Login.Title" = "Welcome back"; "Scene.Notification.FollowRequest.Accept" = "قَبُول"; "Scene.Notification.FollowRequest.Accepted" = "مَقبُول"; "Scene.Notification.FollowRequest.Reject" = "رَفض"; @@ -253,15 +270,17 @@ "Scene.Profile.Fields.AddRow" = "إضافة صف"; "Scene.Profile.Fields.Placeholder.Content" = "المُحتَوى"; "Scene.Profile.Fields.Placeholder.Label" = "التسمية"; +"Scene.Profile.Fields.Verified.Long" = "تمَّ التَّحقق مِن مِلكية هذا الرابِطِ بِتاريخ %@"; +"Scene.Profile.Fields.Verified.Short" = "تمَّ التَّحقق بِتاريخ %@"; "Scene.Profile.Header.FollowsYou" = "يُتابِعُك"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "تأكيدُ حَظر %@"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "حَظرُ الحِساب"; -"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Message" = "Confirm to hide reblogs"; -"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Title" = "Hide Reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Message" = "التأكيد لِإخفاء إعادات التدوين"; +"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Title" = "إخفاء إعادات التدوين"; "Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Message" = "تأكيدُ كَتم %@"; "Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Title" = "كَتمُ الحِساب"; -"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message" = "Confirm to show reblogs"; -"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Title" = "Show Reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message" = "التأكيد لِإظهار إعادات التدوين"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Title" = "إظهار إعادات التدوين"; "Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Message" = "تأكيدُ رَفع الحَظرِ عَن %@"; "Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Title" = "رَفعُ الحَظرِ عَنِ الحِساب"; "Scene.Profile.RelationshipActionAlert.ConfirmUnmuteUser.Message" = "أكِّد لرفع الكتمْ عن %@"; @@ -385,13 +404,11 @@ "Scene.ServerPicker.EmptyState.BadNetwork" = "حدث خطأٌ ما أثناء تحميل البيانات. تحقَّق من اتصالك بالإنترنت."; "Scene.ServerPicker.EmptyState.FindingServers" = "يجري إيجاد خوادم متوفِّرَة..."; "Scene.ServerPicker.EmptyState.NoResults" = "لا توجد نتائج"; -"Scene.ServerPicker.Input.Placeholder" = "اِبحَث عن خادِم أو انضم إلى آخر خاص بك..."; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "اِبحَث فِي الخَوادِم أو أدخِل رابِط"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Search communities or enter URL"; "Scene.ServerPicker.Label.Category" = "الفئة"; "Scene.ServerPicker.Label.Language" = "اللُّغَة"; "Scene.ServerPicker.Label.Users" = "مُستَخدِم"; -"Scene.ServerPicker.Subtitle" = "اختر مجتمعًا بناءً على اهتماماتك، منطقتك أو يمكنك حتى اختيارُ مجتمعٍ ذي غرضٍ عام."; -"Scene.ServerPicker.SubtitleExtend" = "اختر مجتمعًا بناءً على اهتماماتك، منطقتك أو يمكنك حتى اختيارُ مجتمعٍ ذي غرضٍ عام. تُشغَّل جميعُ المجتمعِ مِن قِبَلِ مُنظمَةٍ أو فردٍ مُستقلٍ تمامًا."; +"Scene.ServerPicker.Subtitle" = "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers."; "Scene.ServerPicker.Title" = "اِختر خادِم، أيًّا مِنهُم."; "Scene.ServerRules.Button.Confirm" = "أنا مُوافِق"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/ar.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/ar.lproj/Localizable.stringsdict index 862d98184..91368a4fb 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/ar.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/ar.lproj/Localizable.stringsdict @@ -74,6 +74,30 @@ %ld حَرف + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + لَا حَرف + one + حَرفٌ واحِد + two + حَرفانِ اِثنان + few + %ld characters + many + %ld characters + other + %ld حَرف + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/ca.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/ca.lproj/Localizable.strings index 1e691f8a9..43c63deda 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/ca.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/ca.lproj/Localizable.strings @@ -56,7 +56,7 @@ Comprova la teva connexió a Internet."; "Common.Controls.Actions.SharePost" = "Compartir Publicació"; "Common.Controls.Actions.ShareUser" = "Compartir %@"; "Common.Controls.Actions.SignIn" = "Iniciar sessió"; -"Common.Controls.Actions.SignUp" = "Registre"; +"Common.Controls.Actions.SignUp" = "Crea un compte"; "Common.Controls.Actions.Skip" = "Omet"; "Common.Controls.Actions.TakePhoto" = "Fes una foto"; "Common.Controls.Actions.TryAgain" = "Torna a provar"; @@ -108,6 +108,10 @@ Comprova la teva connexió a Internet."; "Common.Controls.Status.Actions.Unreblog" = "Desfer l'impuls"; "Common.Controls.Status.ContentWarning" = "Advertència de Contingut"; "Common.Controls.Status.MediaContentWarning" = "Toca qualsevol lloc per a mostrar"; +"Common.Controls.Status.MetaEntity.Email" = "Correu electrònic: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Etiqueta %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Mostra el Perfil: %@"; +"Common.Controls.Status.MetaEntity.Url" = "Enllaç: %@"; "Common.Controls.Status.Poll.Closed" = "Finalitzada"; "Common.Controls.Status.Poll.Vote" = "Vota"; "Common.Controls.Status.SensitiveContent" = "Contingut sensible"; @@ -151,19 +155,27 @@ El teu perfil els sembla així."; "Scene.AccountList.AddAccount" = "Afegir compte"; "Scene.AccountList.DismissAccountSwitcher" = "Descartar el commutador de comptes"; "Scene.AccountList.TabBarHint" = "Perfil actual seleccionat: %@. Toca dues vegades i manté el dit per a mostrar el commutador de comptes"; -"Scene.Bookmark.Title" = "Bookmarks"; +"Scene.Bookmark.Title" = "Marcadors"; "Scene.Compose.Accessibility.AppendAttachment" = "Afegeix Adjunt"; "Scene.Compose.Accessibility.AppendPoll" = "Afegir enquesta"; "Scene.Compose.Accessibility.CustomEmojiPicker" = "Selector d'Emoji Personalitzat"; "Scene.Compose.Accessibility.DisableContentWarning" = "Desactiva l'Avís de Contingut"; "Scene.Compose.Accessibility.EnableContentWarning" = "Activa l'Avís de Contingut"; +"Scene.Compose.Accessibility.PostOptions" = "Opcions del tut"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "Menú de Visibilitat de Publicació"; +"Scene.Compose.Accessibility.PostingAs" = "Publicant com a %@"; "Scene.Compose.Accessibility.RemovePoll" = "Eliminar Enquesta"; "Scene.Compose.Attachment.AttachmentBroken" = "Aquest %@ està trencat i no pot ser carregat a Mastodon."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "El fitxer adjunt és massa gran"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "No es pot reconèixer aquest adjunt multimèdia"; +"Scene.Compose.Attachment.CompressingState" = "Comprimint..."; "Scene.Compose.Attachment.DescriptionPhoto" = "Descriu la foto per als disminuïts visuals..."; "Scene.Compose.Attachment.DescriptionVideo" = "Descriu el vídeo per als disminuïts visuals..."; +"Scene.Compose.Attachment.LoadFailed" = "Ha fallat la càrrega"; "Scene.Compose.Attachment.Photo" = "foto"; +"Scene.Compose.Attachment.ServerProcessingState" = "Servidor processant..."; +"Scene.Compose.Attachment.UploadFailed" = "Pujada fallida"; "Scene.Compose.Attachment.Video" = "vídeo"; "Scene.Compose.AutoComplete.SpaceToAdd" = "Espai per afegir"; "Scene.Compose.ComposeAction" = "Publica"; @@ -184,6 +196,8 @@ carregat a Mastodon."; "Scene.Compose.Poll.OptionNumber" = "Opció %ld"; "Scene.Compose.Poll.SevenDays" = "7 Dies"; "Scene.Compose.Poll.SixHours" = "6 Hores"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "L'enquesta té una opció buida"; +"Scene.Compose.Poll.ThePollIsInvalid" = "L'enquesta no és vàlida"; "Scene.Compose.Poll.ThirtyMinutes" = "30 minuts"; "Scene.Compose.Poll.ThreeDays" = "3 Dies"; "Scene.Compose.ReplyingToUser" = "responent a %@"; @@ -226,6 +240,9 @@ carregat a Mastodon."; "Scene.HomeTimeline.NavigationBarState.Published" = "Publicat!"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "S'està publicant..."; "Scene.HomeTimeline.Title" = "Inici"; +"Scene.Login.ServerSearchField.Placeholder" = "Insereix la URL o cerca el teu servidor"; +"Scene.Login.Subtitle" = "T'inicia sessió en el servidor on has creat el teu compte."; +"Scene.Login.Title" = "Ben tornat"; "Scene.Notification.FollowRequest.Accept" = "Acceptar"; "Scene.Notification.FollowRequest.Accepted" = "Acceptat"; "Scene.Notification.FollowRequest.Reject" = "rebutjar"; @@ -253,6 +270,8 @@ carregat a Mastodon."; "Scene.Profile.Fields.AddRow" = "Afegeix fila"; "Scene.Profile.Fields.Placeholder.Content" = "Contingut"; "Scene.Profile.Fields.Placeholder.Label" = "Etiqueta"; +"Scene.Profile.Fields.Verified.Long" = "La propietat d'aquest enllaç es va verificar el dia %@"; +"Scene.Profile.Fields.Verified.Short" = "Verificat a %@"; "Scene.Profile.Header.FollowsYou" = "Et segueix"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "Confirma per a bloquejar %@"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "Bloqueja el Compte"; @@ -385,13 +404,11 @@ carregat a Mastodon."; "Scene.ServerPicker.EmptyState.BadNetwork" = "Alguna cosa no ha anat bé en carregar les dades. Comprova la teva connexió a Internet."; "Scene.ServerPicker.EmptyState.FindingServers" = "Cercant els servidors disponibles..."; "Scene.ServerPicker.EmptyState.NoResults" = "No hi ha resultats"; -"Scene.ServerPicker.Input.Placeholder" = "Cerca servidors"; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Cerca servidors o introdueix l'enllaç"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Cerca comunitats o introdueix l'URL"; "Scene.ServerPicker.Label.Category" = "CATEGORIA"; "Scene.ServerPicker.Label.Language" = "LLENGUATGE"; "Scene.ServerPicker.Label.Users" = "USUARIS"; -"Scene.ServerPicker.Subtitle" = "Tria una comunitat segons els teus interessos, regió o una de propòsit general."; -"Scene.ServerPicker.SubtitleExtend" = "Tria una comunitat segons els teus interessos, regió o una de propòsit general. Cada comunitat és operada per una organització totalment independent o individualment."; +"Scene.ServerPicker.Subtitle" = "Tria un servidor en funció de la teva regió, interessos o un de propòsit general. Seguiràs podent connectar amb tothom a Mastodon, independentment del servidor."; "Scene.ServerPicker.Title" = "Mastodon està fet d'usuaris en diferents comunitats."; "Scene.ServerRules.Button.Confirm" = "Hi estic d'acord"; "Scene.ServerRules.PrivacyPolicy" = "política de privadesa"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/ca.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/ca.lproj/Localizable.stringsdict index cc28edbc6..947597417 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/ca.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/ca.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld caràcters + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + resten %#@character_count@ + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 caràcter + other + %ld caràcters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/ckb.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/ckb.lproj/Localizable.strings index 053211f28..4e76e20fb 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/ckb.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/ckb.lproj/Localizable.strings @@ -55,8 +55,8 @@ "Common.Controls.Actions.Share" = "هاوبەشی بکە"; "Common.Controls.Actions.SharePost" = "هاوبەشی بکە"; "Common.Controls.Actions.ShareUser" = "%@ هاوبەش بکە"; -"Common.Controls.Actions.SignIn" = "بچۆ ژوورەوە"; -"Common.Controls.Actions.SignUp" = "خۆت تۆمار بکە"; +"Common.Controls.Actions.SignIn" = "Log in"; +"Common.Controls.Actions.SignUp" = "Create account"; "Common.Controls.Actions.Skip" = "بیپەڕێنە"; "Common.Controls.Actions.TakePhoto" = "وێنە بگرە"; "Common.Controls.Actions.TryAgain" = "هەوڵ بدەوە"; @@ -108,6 +108,10 @@ "Common.Controls.Status.Actions.Unreblog" = "پۆستکردنەکە بگەڕێنەوە"; "Common.Controls.Status.ContentWarning" = "ئاگاداریی ناوەڕۆک"; "Common.Controls.Status.MediaContentWarning" = "دەستی پیا بنێ بۆ نیشاندانی"; +"Common.Controls.Status.MetaEntity.Email" = "Email address: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Hashtag: %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Show Profile: %@"; +"Common.Controls.Status.MetaEntity.Url" = "Link: %@"; "Common.Controls.Status.Poll.Closed" = "داخراوە"; "Common.Controls.Status.Poll.Vote" = "دەنگ بدە"; "Common.Controls.Status.SensitiveContent" = "ناوەڕۆکی هەستیار"; @@ -157,12 +161,20 @@ "Scene.Compose.Accessibility.CustomEmojiPicker" = "هەڵبژێری ئیمۆجی"; "Scene.Compose.Accessibility.DisableContentWarning" = "ئاگاداریی ناوەڕۆک ناچالاک بکە"; "Scene.Compose.Accessibility.EnableContentWarning" = "ئاگاداریی ناوەڕۆک چالاک بکە"; +"Scene.Compose.Accessibility.PostOptions" = "Post Options"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "پێڕستی شێوازی دەرکەوتنی پۆست"; +"Scene.Compose.Accessibility.PostingAs" = "Posting as %@"; "Scene.Compose.Accessibility.RemovePoll" = "دانگدانەکە لابە"; "Scene.Compose.Attachment.AttachmentBroken" = "ئەم %@ـە تێک چووە و ناتوانیت بەرزی بکەیتەوە."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "Attachment too large"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Can not recognize this media attachment"; +"Scene.Compose.Attachment.CompressingState" = "Compressing..."; "Scene.Compose.Attachment.DescriptionPhoto" = "وێنەکەت بۆ نابیناکان باس بکە..."; "Scene.Compose.Attachment.DescriptionVideo" = "ڤیدیۆکەت بۆ نابیناکان باس بکە..."; +"Scene.Compose.Attachment.LoadFailed" = "Load Failed"; "Scene.Compose.Attachment.Photo" = "وێنە"; +"Scene.Compose.Attachment.ServerProcessingState" = "Server Processing..."; +"Scene.Compose.Attachment.UploadFailed" = "Upload Failed"; "Scene.Compose.Attachment.Video" = "ڤیدیۆ"; "Scene.Compose.AutoComplete.SpaceToAdd" = "بۆشایی دابنێ بۆ زیادکردن"; "Scene.Compose.ComposeAction" = "بڵاوی بکەوە"; @@ -183,6 +195,8 @@ "Scene.Compose.Poll.OptionNumber" = "بژاردەی %ld"; "Scene.Compose.Poll.SevenDays" = "7 ڕۆژ"; "Scene.Compose.Poll.SixHours" = "6 کاتژمێر"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "The poll has empty option"; +"Scene.Compose.Poll.ThePollIsInvalid" = "The poll is invalid"; "Scene.Compose.Poll.ThirtyMinutes" = "30 خولەک"; "Scene.Compose.Poll.ThreeDays" = "3 ڕۆژ"; "Scene.Compose.ReplyingToUser" = "لە وەڵامدا بۆ %@"; @@ -225,6 +239,9 @@ "Scene.HomeTimeline.NavigationBarState.Published" = "بڵاوکرایەوە!"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "پۆستەکە بڵاو دەکرێتەوە..."; "Scene.HomeTimeline.Title" = "ماڵەوە"; +"Scene.Login.ServerSearchField.Placeholder" = "Enter URL or search for your server"; +"Scene.Login.Subtitle" = "Log you in on the server you created your account on."; +"Scene.Login.Title" = "Welcome back"; "Scene.Notification.FollowRequest.Accept" = "Accept"; "Scene.Notification.FollowRequest.Accepted" = "Accepted"; "Scene.Notification.FollowRequest.Reject" = "reject"; @@ -252,6 +269,8 @@ "Scene.Profile.Fields.AddRow" = "ڕیز زیاد بکە"; "Scene.Profile.Fields.Placeholder.Content" = "ناوەڕۆک"; "Scene.Profile.Fields.Placeholder.Label" = "ناونیشان"; +"Scene.Profile.Fields.Verified.Long" = "Ownership of this link was checked on %@"; +"Scene.Profile.Fields.Verified.Short" = "Verified on %@"; "Scene.Profile.Header.FollowsYou" = "Follows You"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "دڵنیا ببەوە بۆ ئاستەنگکردنی %@"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "ئاستەنگی بکە"; @@ -384,13 +403,11 @@ "Scene.ServerPicker.EmptyState.BadNetwork" = "هەڵەیەک ڕوویدا لە کاتی بارکردن. لە هەبوونی هێڵی ئینتەرنێت دڵنیا بە."; "Scene.ServerPicker.EmptyState.FindingServers" = "ڕاژەکار دەدۆزرێتەوە..."; "Scene.ServerPicker.EmptyState.NoResults" = "ئەنجام نییە"; -"Scene.ServerPicker.Input.Placeholder" = "بگەڕێ"; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Search servers or enter URL"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Search communities or enter URL"; "Scene.ServerPicker.Label.Category" = "بەش"; "Scene.ServerPicker.Label.Language" = "زمان"; "Scene.ServerPicker.Label.Users" = "بەکارهێنەر"; -"Scene.ServerPicker.Subtitle" = "ڕاژەکارێکێکی گشتی یان دانەیەک لەسەر بنەمای حەزەکانت و هەرێمەکەت هەڵبژێرە."; -"Scene.ServerPicker.SubtitleExtend" = "ڕاژەکارێکێکی گشتی یان دانەیەک لەسەر بنەمای حەزەکانت و هەرێمەکەت هەڵبژێرە. هەر ڕاژەکارێک لەلایەن ڕێکخراوێک یان تاکەکەسێک بەڕێوە دەبرێت."; +"Scene.ServerPicker.Subtitle" = "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers."; "Scene.ServerPicker.Title" = "ماستۆدۆن لە چەندان بەکارهێنەر پێک دێت کە لە ڕاژەکاری جیاواز دان."; "Scene.ServerRules.Button.Confirm" = "ڕازیم"; "Scene.ServerRules.PrivacyPolicy" = "سیاسەتی تایبەتێتی"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/ckb.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/ckb.lproj/Localizable.stringsdict index 001a8a608..8116226ec 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/ckb.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/ckb.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld نووسە + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/cs.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/cs.lproj/Localizable.strings new file mode 100644 index 000000000..22260e380 --- /dev/null +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/cs.lproj/Localizable.strings @@ -0,0 +1,459 @@ +"Common.Alerts.BlockDomain.BlockEntireDomain" = "Blokovat doménu"; +"Common.Alerts.BlockDomain.Title" = "Opravdu chcete blokovat celou doménu %@? Ve většině případů stačí zablokovat nebo skrýt pár konkrétních uživatelů, což také doporučujeme. Z této domény neuvidíte obsah v žádné veřejné časové ose ani v oznámeních. Vaši sledující z této domény budou odstraněni."; +"Common.Alerts.CleanCache.Message" = "Úspěšně vyčištěno %@ mezipaměti."; +"Common.Alerts.CleanCache.Title" = "Vyčistit mezipaměť"; +"Common.Alerts.Common.PleaseTryAgain" = "Zkuste to prosím znovu."; +"Common.Alerts.Common.PleaseTryAgainLater" = "Zkuste to prosím znovu později."; +"Common.Alerts.DeletePost.Message" = "Opravdu chcete smazat tento příspěvek?"; +"Common.Alerts.DeletePost.Title" = "Odstranit příspěvek"; +"Common.Alerts.DiscardPostContent.Message" = "Potvrďte odstranění obsahu složeného příspěvku."; +"Common.Alerts.DiscardPostContent.Title" = "Zahodit koncept"; +"Common.Alerts.EditProfileFailure.Message" = "Nelze upravit profil. Zkuste to prosím znovu."; +"Common.Alerts.EditProfileFailure.Title" = "Chyba při úpravě profilu"; +"Common.Alerts.PublishPostFailure.AttachmentsMessage.MoreThanOneVideo" = "Nelze připojit více než jedno video."; +"Common.Alerts.PublishPostFailure.AttachmentsMessage.VideoAttachWithPhoto" = "K příspěvku, který již obsahuje obrázky, nelze připojit video."; +"Common.Alerts.PublishPostFailure.Message" = "Nepodařilo se publikovat příspěvek. +Zkontrolujte prosím připojení k internetu."; +"Common.Alerts.PublishPostFailure.Title" = "Publikování selhalo"; +"Common.Alerts.SavePhotoFailure.Message" = "Pro uložení fotografie povolte přístup k knihovně fotografií."; +"Common.Alerts.SavePhotoFailure.Title" = "Uložení fotografie se nezdařilo"; +"Common.Alerts.ServerError.Title" = "Chyba serveru"; +"Common.Alerts.SignOut.Confirm" = "Odhlásit se"; +"Common.Alerts.SignOut.Message" = "Opravdu se chcete odhlásit?"; +"Common.Alerts.SignOut.Title" = "Odhlásit se"; +"Common.Alerts.SignUpFailure.Title" = "Registrace selhala"; +"Common.Alerts.VoteFailure.PollEnded" = "Anketa skončila"; +"Common.Alerts.VoteFailure.Title" = "Selhání hlasování"; +"Common.Controls.Actions.Add" = "Přidat"; +"Common.Controls.Actions.Back" = "Zpět"; +"Common.Controls.Actions.BlockDomain" = "Blokovat %@"; +"Common.Controls.Actions.Cancel" = "Zrušit"; +"Common.Controls.Actions.Compose" = "Napsat"; +"Common.Controls.Actions.Confirm" = "Potvrdit"; +"Common.Controls.Actions.Continue" = "Pokračovat"; +"Common.Controls.Actions.CopyPhoto" = "Kopírovat fotografii"; +"Common.Controls.Actions.Delete" = "Smazat"; +"Common.Controls.Actions.Discard" = "Zahodit"; +"Common.Controls.Actions.Done" = "Hotovo"; +"Common.Controls.Actions.Edit" = "Upravit"; +"Common.Controls.Actions.FindPeople" = "Najít lidi ke sledování"; +"Common.Controls.Actions.ManuallySearch" = "Místo toho ručně vyhledat"; +"Common.Controls.Actions.Next" = "Další"; +"Common.Controls.Actions.Ok" = "OK"; +"Common.Controls.Actions.Open" = "Otevřít"; +"Common.Controls.Actions.OpenInBrowser" = "Otevřít v prohlížeči"; +"Common.Controls.Actions.OpenInSafari" = "Otevřít v Safari"; +"Common.Controls.Actions.Preview" = "Náhled"; +"Common.Controls.Actions.Previous" = "Předchozí"; +"Common.Controls.Actions.Remove" = "Odstranit"; +"Common.Controls.Actions.Reply" = "Odpovědět"; +"Common.Controls.Actions.ReportUser" = "Nahlásit %@"; +"Common.Controls.Actions.Save" = "Uložit"; +"Common.Controls.Actions.SavePhoto" = "Uložit fotku"; +"Common.Controls.Actions.SeeMore" = "Zobrazit více"; +"Common.Controls.Actions.Settings" = "Nastavení"; +"Common.Controls.Actions.Share" = "Sdílet"; +"Common.Controls.Actions.SharePost" = "Sdílet příspěvek"; +"Common.Controls.Actions.ShareUser" = "Sdílet %@"; +"Common.Controls.Actions.SignIn" = "Přihlásit se"; +"Common.Controls.Actions.SignUp" = "Vytvořit účet"; +"Common.Controls.Actions.Skip" = "Přeskočit"; +"Common.Controls.Actions.TakePhoto" = "Vyfotit"; +"Common.Controls.Actions.TryAgain" = "Zkusit znovu"; +"Common.Controls.Actions.UnblockDomain" = "Odblokovat %@"; +"Common.Controls.Friendship.Block" = "Blokovat"; +"Common.Controls.Friendship.BlockDomain" = "Blokovat %@"; +"Common.Controls.Friendship.BlockUser" = "Blokovat %@"; +"Common.Controls.Friendship.Blocked" = "Blokovaný"; +"Common.Controls.Friendship.EditInfo" = "Upravit informace"; +"Common.Controls.Friendship.Follow" = "Sledovat"; +"Common.Controls.Friendship.Following" = "Sleduji"; +"Common.Controls.Friendship.HideReblogs" = "Hide Reblogs"; +"Common.Controls.Friendship.Mute" = "Skrýt"; +"Common.Controls.Friendship.MuteUser" = "Skrýt %@"; +"Common.Controls.Friendship.Muted" = "Skrytý"; +"Common.Controls.Friendship.Pending" = "Čekající"; +"Common.Controls.Friendship.Request" = "Požadavek"; +"Common.Controls.Friendship.ShowReblogs" = "Show Reblogs"; +"Common.Controls.Friendship.Unblock" = "Odblokovat"; +"Common.Controls.Friendship.UnblockUser" = "Odblokovat %@"; +"Common.Controls.Friendship.Unmute" = "Odkrýt"; +"Common.Controls.Friendship.UnmuteUser" = "Odkrýt %@"; +"Common.Controls.Keyboard.Common.ComposeNewPost" = "Vytvořit nový příspěvek"; +"Common.Controls.Keyboard.Common.OpenSettings" = "Otevřít Nastavení"; +"Common.Controls.Keyboard.Common.ShowFavorites" = "Zobrazit Oblíbené"; +"Common.Controls.Keyboard.Common.SwitchToTab" = "Přepnout na %@"; +"Common.Controls.Keyboard.SegmentedControl.NextSection" = "Další sekce"; +"Common.Controls.Keyboard.SegmentedControl.PreviousSection" = "Předchozí sekce"; +"Common.Controls.Keyboard.Timeline.NextStatus" = "Další příspěvek"; +"Common.Controls.Keyboard.Timeline.OpenAuthorProfile" = "Otevřít profil autora"; +"Common.Controls.Keyboard.Timeline.OpenRebloggerProfile" = "Otevřít rebloggerův profil"; +"Common.Controls.Keyboard.Timeline.OpenStatus" = "Otevřít příspěvek"; +"Common.Controls.Keyboard.Timeline.PreviewImage" = "Náhled obrázku"; +"Common.Controls.Keyboard.Timeline.PreviousStatus" = "Předchozí příspěvek"; +"Common.Controls.Keyboard.Timeline.ReplyStatus" = "Odpovědět na příspěvek"; +"Common.Controls.Keyboard.Timeline.ToggleContentWarning" = "Přepnout varování obsahu"; +"Common.Controls.Keyboard.Timeline.ToggleFavorite" = "Toggle Favorite on Post"; +"Common.Controls.Keyboard.Timeline.ToggleReblog" = "Toggle Reblog on Post"; +"Common.Controls.Status.Actions.Favorite" = "Oblíbit"; +"Common.Controls.Status.Actions.Hide" = "Skrýt"; +"Common.Controls.Status.Actions.Menu" = "Nabídka"; +"Common.Controls.Status.Actions.Reblog" = "Boostnout"; +"Common.Controls.Status.Actions.Reply" = "Odpovědět"; +"Common.Controls.Status.Actions.ShowGif" = "Zobrazit GIF"; +"Common.Controls.Status.Actions.ShowImage" = "Zobrazit obrázek"; +"Common.Controls.Status.Actions.ShowVideoPlayer" = "Zobrazit video přehrávač"; +"Common.Controls.Status.Actions.TapThenHoldToShowMenu" = "Klepnutím podržte pro zobrazení nabídky"; +"Common.Controls.Status.Actions.Unfavorite" = "Odebrat z oblízených"; +"Common.Controls.Status.Actions.Unreblog" = "Undo reblog"; +"Common.Controls.Status.ContentWarning" = "Varování o obsahu"; +"Common.Controls.Status.MediaContentWarning" = "Klepnutím kdekoli zobrazíte"; +"Common.Controls.Status.MetaEntity.Email" = "E-mailová adresa: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Hashtag: %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Zobrazit profil: %@"; +"Common.Controls.Status.MetaEntity.Url" = "Odkaz: %@"; +"Common.Controls.Status.Poll.Closed" = "Uzavřeno"; +"Common.Controls.Status.Poll.Vote" = "Hlasovat"; +"Common.Controls.Status.SensitiveContent" = "Citlivý obsah"; +"Common.Controls.Status.ShowPost" = "Zobrazit příspěvek"; +"Common.Controls.Status.ShowUserProfile" = "Zobrazit profil uživatele"; +"Common.Controls.Status.Tag.Email" = "E-mail"; +"Common.Controls.Status.Tag.Emoji" = "Emoji"; +"Common.Controls.Status.Tag.Hashtag" = "Hashtag"; +"Common.Controls.Status.Tag.Link" = "Odkaz"; +"Common.Controls.Status.Tag.Mention" = "Zmínka"; +"Common.Controls.Status.Tag.Url" = "URL"; +"Common.Controls.Status.TapToReveal" = "Klepnutím zobrazit"; +"Common.Controls.Status.UserReblogged" = "%@ reblogged"; +"Common.Controls.Status.UserRepliedTo" = "Odpověděl %@"; +"Common.Controls.Status.Visibility.Direct" = "Pouze zmíněný uživatel může vidět tento příspěvek."; +"Common.Controls.Status.Visibility.Private" = "Pouze jejich sledující mohou vidět tento příspěvek."; +"Common.Controls.Status.Visibility.PrivateFromMe" = "Pouze moji sledující mohou vidět tento příspěvek."; +"Common.Controls.Status.Visibility.Unlisted" = "Každý může vidět tento příspěvek, ale nezobrazovat ve veřejné časové ose."; +"Common.Controls.Tabs.Home" = "Domů"; +"Common.Controls.Tabs.Notification" = "Oznamování"; +"Common.Controls.Tabs.Profile" = "Profil"; +"Common.Controls.Tabs.Search" = "Hledat"; +"Common.Controls.Timeline.Filtered" = "Filtrováno"; +"Common.Controls.Timeline.Header.BlockedWarning" = "Nemůžeš zobrazit profil tohoto uživatele, dokud tě neodblokují."; +"Common.Controls.Timeline.Header.BlockingWarning" = "Nemůžete zobrazit profil tohoto uživatele, dokud ho neodblokujete. +Váš profil pro něj vypadá takto."; +"Common.Controls.Timeline.Header.NoStatusFound" = "Nebyl nalezen žádný příspěvek"; +"Common.Controls.Timeline.Header.SuspendedWarning" = "Tento uživatel byl pozastaven."; +"Common.Controls.Timeline.Header.UserBlockedWarning" = "Nemůžete zobrazit profil %@, dokud vás neodblokuje."; +"Common.Controls.Timeline.Header.UserBlockingWarning" = "Nemůžete zobrazit profil %@, dokud ho neodblokujete. +Váš profil pro něj vypadá takto."; +"Common.Controls.Timeline.Header.UserSuspendedWarning" = "Účet %@ byl pozastaven."; +"Common.Controls.Timeline.Loader.LoadMissingPosts" = "Načíst chybějící příspěvky"; +"Common.Controls.Timeline.Loader.LoadingMissingPosts" = "Načíst chybějící příspěvky..."; +"Common.Controls.Timeline.Loader.ShowMoreReplies" = "Zobrazit více odovědí"; +"Common.Controls.Timeline.Timestamp.Now" = "Nyní"; +"Scene.AccountList.AddAccount" = "Přidat účet"; +"Scene.AccountList.DismissAccountSwitcher" = "Zrušit přepínač účtů"; +"Scene.AccountList.TabBarHint" = "Aktuální vybraný profil: %@. Dvojitým poklepáním zobrazíte přepínač účtů"; +"Scene.Bookmark.Title" = "Záložky"; +"Scene.Compose.Accessibility.AppendAttachment" = "Přidat přílohu"; +"Scene.Compose.Accessibility.AppendPoll" = "Přidat anketu"; +"Scene.Compose.Accessibility.CustomEmojiPicker" = "Vlastní výběr Emoji"; +"Scene.Compose.Accessibility.DisableContentWarning" = "Vypnout upozornění na obsah"; +"Scene.Compose.Accessibility.EnableContentWarning" = "Povolit upozornění na obsah"; +"Scene.Compose.Accessibility.PostOptions" = "Možnosti příspěvku"; +"Scene.Compose.Accessibility.PostVisibilityMenu" = "Menu viditelnosti příspěvku"; +"Scene.Compose.Accessibility.PostingAs" = "Odesílání jako %@"; +"Scene.Compose.Accessibility.RemovePoll" = "Odstranit anketu"; +"Scene.Compose.Attachment.AttachmentBroken" = "Tento %@ je poškozený a nemůže být +nahrán do Mastodonu."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "Příloha je příliš velká"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Nelze rozpoznat toto medium přílohy"; +"Scene.Compose.Attachment.CompressingState" = "Probíhá komprese..."; +"Scene.Compose.Attachment.DescriptionPhoto" = "Popište fotografii pro zrakově postižené osoby..."; +"Scene.Compose.Attachment.DescriptionVideo" = "Popište video pro zrakově postižené..."; +"Scene.Compose.Attachment.LoadFailed" = "Načtení se nezdařilo"; +"Scene.Compose.Attachment.Photo" = "fotka"; +"Scene.Compose.Attachment.ServerProcessingState" = "Zpracování serveru..."; +"Scene.Compose.Attachment.UploadFailed" = "Nahrání selhalo"; +"Scene.Compose.Attachment.Video" = "video"; +"Scene.Compose.AutoComplete.SpaceToAdd" = "Mezera k přidání"; +"Scene.Compose.ComposeAction" = "Zveřejnit"; +"Scene.Compose.ContentInputPlaceholder" = "Napište nebo vložte, co je na mysli"; +"Scene.Compose.ContentWarning.Placeholder" = "Zde napište přesné varování..."; +"Scene.Compose.Keyboard.AppendAttachmentEntry" = "Přidat přílohu - %@"; +"Scene.Compose.Keyboard.DiscardPost" = "Zahodit příspěvek"; +"Scene.Compose.Keyboard.PublishPost" = "Publikovat příspěvek"; +"Scene.Compose.Keyboard.SelectVisibilityEntry" = "Vyberte viditelnost - %@"; +"Scene.Compose.Keyboard.ToggleContentWarning" = "Přepnout varování obsahu"; +"Scene.Compose.Keyboard.TogglePoll" = "Přepnout anketu"; +"Scene.Compose.MediaSelection.Browse" = "Procházet"; +"Scene.Compose.MediaSelection.Camera" = "Vyfotit"; +"Scene.Compose.MediaSelection.PhotoLibrary" = "Knihovna fotografií"; +"Scene.Compose.Poll.DurationTime" = "Doba trvání: %@"; +"Scene.Compose.Poll.OneDay" = "1 den"; +"Scene.Compose.Poll.OneHour" = "1 hodina"; +"Scene.Compose.Poll.OptionNumber" = "Možnost %ld"; +"Scene.Compose.Poll.SevenDays" = "7 dní"; +"Scene.Compose.Poll.SixHours" = "6 hodin"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "Anketa má prázdnou možnost"; +"Scene.Compose.Poll.ThePollIsInvalid" = "Anketa je neplatná"; +"Scene.Compose.Poll.ThirtyMinutes" = "30 minut"; +"Scene.Compose.Poll.ThreeDays" = "3 dny"; +"Scene.Compose.ReplyingToUser" = "odpovídá na %@"; +"Scene.Compose.Title.NewPost" = "Nový příspěvek"; +"Scene.Compose.Title.NewReply" = "Nová odpověď"; +"Scene.Compose.Visibility.Direct" = "Pouze lidé, které zmíním"; +"Scene.Compose.Visibility.Private" = "Pouze sledující"; +"Scene.Compose.Visibility.Public" = "Veřejný"; +"Scene.Compose.Visibility.Unlisted" = "Neuvedeno"; +"Scene.ConfirmEmail.Button.OpenEmailApp" = "Otevřít e-mailovou aplikaci"; +"Scene.ConfirmEmail.Button.Resend" = "Poslat znovu"; +"Scene.ConfirmEmail.DontReceiveEmail.Description" = "Zkontrolujte, zda je vaše e-mailová adresa správná, stejně jako složka nevyžádané pošty, pokud ji máte."; +"Scene.ConfirmEmail.DontReceiveEmail.ResendEmail" = "Znovu odeslat e-mail"; +"Scene.ConfirmEmail.DontReceiveEmail.Title" = "Zkontrolujte svůj e-mail"; +"Scene.ConfirmEmail.OpenEmailApp.Description" = "Právě jsme vám poslali e-mail. Zkontrolujte složku nevyžádané zprávy, pokud ji máte."; +"Scene.ConfirmEmail.OpenEmailApp.Mail" = "Pošta"; +"Scene.ConfirmEmail.OpenEmailApp.OpenEmailClient" = "Otevřít e-mailového klienta"; +"Scene.ConfirmEmail.OpenEmailApp.Title" = "Zkontrolujte doručenou poštu."; +"Scene.ConfirmEmail.Subtitle" = "Klepněte na odkaz, který jsme vám poslali e-mailem, abyste ověřili Váš účet."; +"Scene.ConfirmEmail.TapTheLinkWeEmailedToYouToVerifyYourAccount" = "Klepněte na odkaz, který jsme vám poslali e-mailem, abyste ověřili Váš účet"; +"Scene.ConfirmEmail.Title" = "Ještě jedna věc."; +"Scene.Discovery.Intro" = "Toto jsou příspěvky, které získávají pozornost ve vašem koutu Mastodonu."; +"Scene.Discovery.Tabs.Community" = "Komunita"; +"Scene.Discovery.Tabs.ForYou" = "Pro vás"; +"Scene.Discovery.Tabs.Hashtags" = "Hashtagy"; +"Scene.Discovery.Tabs.News" = "Zprávy"; +"Scene.Discovery.Tabs.Posts" = "Příspěvky"; +"Scene.Familiarfollowers.FollowedByNames" = "Sledován od %@"; +"Scene.Familiarfollowers.Title" = "Sledující, které znáte"; +"Scene.Favorite.Title" = "Vaše oblíbené"; +"Scene.FavoritedBy.Title" = "Oblíben"; +"Scene.Follower.Footer" = "Sledující z jiných serverů nejsou zobrazeni."; +"Scene.Follower.Title" = "sledující"; +"Scene.Following.Footer" = "Sledování z jiných serverů není zobrazeno."; +"Scene.Following.Title" = "sledování"; +"Scene.HomeTimeline.NavigationBarState.Accessibility.LogoHint" = "Klepnutím přejdete nahoru a znovu klepněte na předchozí místo"; +"Scene.HomeTimeline.NavigationBarState.Accessibility.LogoLabel" = "Tlačítko s logem"; +"Scene.HomeTimeline.NavigationBarState.NewPosts" = "Nové příspěvky"; +"Scene.HomeTimeline.NavigationBarState.Offline" = "Offline"; +"Scene.HomeTimeline.NavigationBarState.Published" = "Publikováno!"; +"Scene.HomeTimeline.NavigationBarState.Publishing" = "Publikování příspěvku..."; +"Scene.HomeTimeline.Title" = "Domů"; +"Scene.Login.ServerSearchField.Placeholder" = "Zadejte URL nebo vyhledávejte váš server"; +"Scene.Login.Subtitle" = "Přihlaste se na serveru, na kterém jste si vytvořili účet."; +"Scene.Login.Title" = "Vítejte zpět"; +"Scene.Notification.FollowRequest.Accept" = "Přijmout"; +"Scene.Notification.FollowRequest.Accepted" = "Přijato"; +"Scene.Notification.FollowRequest.Reject" = "odmítnout"; +"Scene.Notification.FollowRequest.Rejected" = "Zamítnuto"; +"Scene.Notification.Keyobard.ShowEverything" = "Zobrazit vše"; +"Scene.Notification.Keyobard.ShowMentions" = "Zobrazit zmínky"; +"Scene.Notification.NotificationDescription.FavoritedYourPost" = "si oblíbil váš příspěvek"; +"Scene.Notification.NotificationDescription.FollowedYou" = "vás sleduje"; +"Scene.Notification.NotificationDescription.MentionedYou" = "vás zmínil/a"; +"Scene.Notification.NotificationDescription.PollHasEnded" = "anketa skončila"; +"Scene.Notification.NotificationDescription.RebloggedYourPost" = "boostnul váš příspěvek"; +"Scene.Notification.NotificationDescription.RequestToFollowYou" = "požádat vás o sledování"; +"Scene.Notification.Title.Everything" = "Všechno"; +"Scene.Notification.Title.Mentions" = "Zmínky"; +"Scene.Preview.Keyboard.ClosePreview" = "Zavřít náhled"; +"Scene.Preview.Keyboard.ShowNext" = "Zobrazit další"; +"Scene.Preview.Keyboard.ShowPrevious" = "Zobrazit předchozí"; +"Scene.Profile.Accessibility.DoubleTapToOpenTheList" = "Dvojitým poklepáním otevřete seznam"; +"Scene.Profile.Accessibility.EditAvatarImage" = "Upravit obrázek avataru"; +"Scene.Profile.Accessibility.ShowAvatarImage" = "Zobrazit obrázek avataru"; +"Scene.Profile.Accessibility.ShowBannerImage" = "Zobrazit obrázek banneru"; +"Scene.Profile.Dashboard.Followers" = "sledující"; +"Scene.Profile.Dashboard.Following" = "sledování"; +"Scene.Profile.Dashboard.Posts" = "příspěvky"; +"Scene.Profile.Fields.AddRow" = "Přidat řádek"; +"Scene.Profile.Fields.Placeholder.Content" = "Obsah"; +"Scene.Profile.Fields.Placeholder.Label" = "Označení"; +"Scene.Profile.Fields.Verified.Long" = "Vlastnictví tohoto odkazu bylo zkontrolováno na %@"; +"Scene.Profile.Fields.Verified.Short" = "Ověřeno na %@"; +"Scene.Profile.Header.FollowsYou" = "Sleduje vás"; +"Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "Potvrdit blokování %@"; +"Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "Blokovat účet"; +"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Message" = "Confirm to hide reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Title" = "Hide Reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Message" = "Potvrdit skrytí %@"; +"Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Title" = "Skrýt účet"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message" = "Confirm to show reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Title" = "Show Reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Message" = "Potvrďte odblokování %@"; +"Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Title" = "Odblokovat účet"; +"Scene.Profile.RelationshipActionAlert.ConfirmUnmuteUser.Message" = "Potvrďte zrušení ztlumení %@"; +"Scene.Profile.RelationshipActionAlert.ConfirmUnmuteUser.Title" = "Zrušit skrytí účtu"; +"Scene.Profile.SegmentedControl.About" = "O uživateli"; +"Scene.Profile.SegmentedControl.Media" = "Média"; +"Scene.Profile.SegmentedControl.Posts" = "Příspěvky"; +"Scene.Profile.SegmentedControl.PostsAndReplies" = "Příspěvky a odpovědi"; +"Scene.Profile.SegmentedControl.Replies" = "Odpovědí"; +"Scene.RebloggedBy.Title" = "Reblogged By"; +"Scene.Register.Error.Item.Agreement" = "Souhlas"; +"Scene.Register.Error.Item.Email" = "E-mail"; +"Scene.Register.Error.Item.Locale" = "Jazyk"; +"Scene.Register.Error.Item.Password" = "Heslo"; +"Scene.Register.Error.Item.Reason" = "Důvod"; +"Scene.Register.Error.Item.Username" = "Uživatelské jméno"; +"Scene.Register.Error.Reason.Accepted" = "%@ musí být přijato"; +"Scene.Register.Error.Reason.Blank" = "%@ je vyžadováno"; +"Scene.Register.Error.Reason.Blocked" = "%@ používá zakázanou e-mailovou službu"; +"Scene.Register.Error.Reason.Inclusion" = "%@ není podporovaná hodnota"; +"Scene.Register.Error.Reason.Invalid" = "%@ je neplatné"; +"Scene.Register.Error.Reason.Reserved" = "%@ je rezervované klíčové slovo"; +"Scene.Register.Error.Reason.Taken" = "%@ se již používá"; +"Scene.Register.Error.Reason.TooLong" = "%@ je příliš dlouhé"; +"Scene.Register.Error.Reason.TooShort" = "%@ je příliš krátké"; +"Scene.Register.Error.Reason.Unreachable" = "%@ pravděpodobně neexistuje"; +"Scene.Register.Error.Special.EmailInvalid" = "Toto není platná e-mailová adresa"; +"Scene.Register.Error.Special.PasswordTooShort" = "Heslo je příliš krátké (musí mít alespoň 8 znaků)"; +"Scene.Register.Error.Special.UsernameInvalid" = "Uživatelské jméno musí obsahovat pouze alfanumerické znaky a podtržítka"; +"Scene.Register.Error.Special.UsernameTooLong" = "Uživatelské jméno je příliš dlouhé (nemůže být delší než 30 znaků)"; +"Scene.Register.Input.Avatar.Delete" = "Smazat"; +"Scene.Register.Input.DisplayName.Placeholder" = "zobrazované jméno"; +"Scene.Register.Input.Email.Placeholder" = "e-mail"; +"Scene.Register.Input.Invite.RegistrationUserInviteRequest" = "Proč se chcete připojit?"; +"Scene.Register.Input.Password.Accessibility.Checked" = "zaškrtnuto"; +"Scene.Register.Input.Password.Accessibility.Unchecked" = "nezaškrtnuto"; +"Scene.Register.Input.Password.CharacterLimit" = "8 znaků"; +"Scene.Register.Input.Password.Hint" = "Vaše heslo musí obsahovat alespoň 8 znaků"; +"Scene.Register.Input.Password.Placeholder" = "heslo"; +"Scene.Register.Input.Password.Require" = "Heslo musí být alespoň:"; +"Scene.Register.Input.Username.DuplicatePrompt" = "Toto uživatelské jméno je použito."; +"Scene.Register.Input.Username.Placeholder" = "uživatelské jméno"; +"Scene.Register.LetsGetYouSetUpOnDomain" = "Pojďme si nastavit %@"; +"Scene.Register.Title" = "Pojďme si nastavit %@"; +"Scene.Report.Content1" = "Existují nějaké další příspěvky, které byste chtěli přidat do zprávy?"; +"Scene.Report.Content2" = "Je o tomto hlášení něco, co by měli vědět moderátoři?"; +"Scene.Report.ReportSentTitle" = "Děkujeme za nahlášení, podíváme se na to."; +"Scene.Report.Reported" = "NAHLÁŠEN"; +"Scene.Report.Send" = "Odeslat hlášení"; +"Scene.Report.SkipToSend" = "Odeslat bez komentáře"; +"Scene.Report.Step1" = "Krok 1 ze 2"; +"Scene.Report.Step2" = "Krok 2 ze 2"; +"Scene.Report.StepFinal.BlockUser" = "Blokovat %@"; +"Scene.Report.StepFinal.DontWantToSeeThis" = "Nechcete to vidět?"; +"Scene.Report.StepFinal.MuteUser" = "Skrýt %@"; +"Scene.Report.StepFinal.TheyWillNoLongerBeAbleToFollowOrSeeYourPostsButTheyCanSeeIfTheyveBeenBlocked" = "Už nebudou moci sledovat nebo vidět vaše příspěvky, ale mohou vidět, zda byly zablokovány."; +"Scene.Report.StepFinal.Unfollow" = "Přestat sledovat"; +"Scene.Report.StepFinal.UnfollowUser" = "Přestat sledovat %@"; +"Scene.Report.StepFinal.Unfollowed" = "Už nesledujete"; +"Scene.Report.StepFinal.WhenYouSeeSomethingYouDontLikeOnMastodonYouCanRemoveThePersonFromYourExperience." = "Když uvidíte něco, co se vám nelíbí na Mastodonu, můžete odstranit tuto osobu ze svého zážitku."; +"Scene.Report.StepFinal.WhileWeReviewThisYouCanTakeActionAgainstUser" = "Zatímco to posuzujeme, můžete podniknout kroky proti %@"; +"Scene.Report.StepFinal.YouWontSeeTheirPostsOrReblogsInYourHomeFeedTheyWontKnowTheyVeBeenMuted" = "Neuvidíte jejich příspěvky nebo boostnutí v domovském kanálu. Nebudou vědět, že jsou skrytí."; +"Scene.Report.StepFour.IsThereAnythingElseWeShouldKnow" = "Je ještě něco jiného, co bychom měli vědět?"; +"Scene.Report.StepFour.Step4Of4" = "Krok 4 ze 4"; +"Scene.Report.StepOne.IDontLikeIt" = "Nelíbí se mi"; +"Scene.Report.StepOne.ItIsNotSomethingYouWantToSee" = "Není to něco, co chcete vidět"; +"Scene.Report.StepOne.ItViolatesServerRules" = "Porušuje pravidla serveru"; +"Scene.Report.StepOne.ItsSomethingElse" = "Jde o něco jiného"; +"Scene.Report.StepOne.ItsSpam" = "Je to spam"; +"Scene.Report.StepOne.MaliciousLinksFakeEngagementOrRepetetiveReplies" = "Škodlivé odkazy, falešné zapojení nebo opakující se odpovědi"; +"Scene.Report.StepOne.SelectTheBestMatch" = "Vyberte nejbližší možnost"; +"Scene.Report.StepOne.Step1Of4" = "Krok 1 ze 4"; +"Scene.Report.StepOne.TheIssueDoesNotFitIntoOtherCategories" = "Problém neodpovídá ostatním kategoriím"; +"Scene.Report.StepOne.WhatsWrongWithThisAccount" = "Co je špatně s tímto účtem?"; +"Scene.Report.StepOne.WhatsWrongWithThisPost" = "Co je na tomto příspěvku špatně?"; +"Scene.Report.StepOne.WhatsWrongWithThisUsername" = "Co je špatně na %@?"; +"Scene.Report.StepOne.YouAreAwareThatItBreaksSpecificRules" = "Máte za to, že porušuje konkrétní pravidla"; +"Scene.Report.StepThree.AreThereAnyPostsThatBackUpThisReport" = "Existují příspěvky dokládající toto hlášení?"; +"Scene.Report.StepThree.SelectAllThatApply" = "Vyberte všechna relevantní"; +"Scene.Report.StepThree.Step3Of4" = "Krok 3 ze 4"; +"Scene.Report.StepTwo.IJustDon’tLikeIt" = "Jen se mi to nelíbí"; +"Scene.Report.StepTwo.SelectAllThatApply" = "Vyberte všechna relevantní"; +"Scene.Report.StepTwo.Step2Of4" = "Krok 2 ze 4"; +"Scene.Report.StepTwo.WhichRulesAreBeingViolated" = "Jaká pravidla jsou porušována?"; +"Scene.Report.TextPlaceholder" = "Napište nebo vložte další komentáře"; +"Scene.Report.Title" = "Nahlásit %@"; +"Scene.Report.TitleReport" = "Nahlásit"; +"Scene.Search.Recommend.Accounts.Description" = "Možná budete chtít sledovat tyto účty"; +"Scene.Search.Recommend.Accounts.Follow" = "Sledovat"; +"Scene.Search.Recommend.Accounts.Title" = "Účty, které by se vám mohly líbit"; +"Scene.Search.Recommend.ButtonText" = "Zobrazit vše"; +"Scene.Search.Recommend.HashTag.Description" = "Hashtagy, kterým se dostává dosti pozornosti"; +"Scene.Search.Recommend.HashTag.PeopleTalking" = "%@ lidí mluví"; +"Scene.Search.Recommend.HashTag.Title" = "Populární na Mastodonu"; +"Scene.Search.SearchBar.Cancel" = "Zrušit"; +"Scene.Search.SearchBar.Placeholder" = "Hledat hashtagy a uživatele"; +"Scene.Search.Searching.Clear" = "Vymazat"; +"Scene.Search.Searching.EmptyState.NoResults" = "Žádné výsledky"; +"Scene.Search.Searching.RecentSearch" = "Nedávná hledání"; +"Scene.Search.Searching.Segment.All" = "Vše"; +"Scene.Search.Searching.Segment.Hashtags" = "Hashtagy"; +"Scene.Search.Searching.Segment.People" = "Lidé"; +"Scene.Search.Searching.Segment.Posts" = "Příspěvky"; +"Scene.Search.Title" = "Hledat"; +"Scene.ServerPicker.Button.Category.Academia" = "akademická sféra"; +"Scene.ServerPicker.Button.Category.Activism" = "aktivismus"; +"Scene.ServerPicker.Button.Category.All" = "Vše"; +"Scene.ServerPicker.Button.Category.AllAccessiblityDescription" = "Kategorie: Vše"; +"Scene.ServerPicker.Button.Category.Art" = "umění"; +"Scene.ServerPicker.Button.Category.Food" = "jídlo"; +"Scene.ServerPicker.Button.Category.Furry" = "furry"; +"Scene.ServerPicker.Button.Category.Games" = "hry"; +"Scene.ServerPicker.Button.Category.General" = "obecné"; +"Scene.ServerPicker.Button.Category.Journalism" = "žurnalistika"; +"Scene.ServerPicker.Button.Category.Lgbt" = "lgbt"; +"Scene.ServerPicker.Button.Category.Music" = "hudba"; +"Scene.ServerPicker.Button.Category.Regional" = "regionální"; +"Scene.ServerPicker.Button.Category.Tech" = "technologie"; +"Scene.ServerPicker.Button.SeeLess" = "Zobrazit méně"; +"Scene.ServerPicker.Button.SeeMore" = "Zobrazit více"; +"Scene.ServerPicker.EmptyState.BadNetwork" = "Při načítání dat nastala chyba. Zkontrolujte připojení k internetu."; +"Scene.ServerPicker.EmptyState.FindingServers" = "Hledání dostupných serverů..."; +"Scene.ServerPicker.EmptyState.NoResults" = "Žádné výsledky"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Hledejte komunity nebo zadejte URL"; +"Scene.ServerPicker.Label.Category" = "KATEGORIE"; +"Scene.ServerPicker.Label.Language" = "JAZYK"; +"Scene.ServerPicker.Label.Users" = "UŽIVATELÉ"; +"Scene.ServerPicker.Subtitle" = "Vyberte server založený ve vašem regionu, podle zájmů nebo podle obecného účelu. Stále můžete chatovat s kýmkoli na Mastodonu bez ohledu na vaše servery."; +"Scene.ServerPicker.Title" = "Mastodon tvoří uživatelé z různých serverů."; +"Scene.ServerRules.Button.Confirm" = "Souhlasím"; +"Scene.ServerRules.PrivacyPolicy" = "zásady ochrany osobních údajů"; +"Scene.ServerRules.Prompt" = "Pokračováním budete podléhat podmínkám služby a zásad ochrany osobních údajů pro uživatele %@."; +"Scene.ServerRules.Subtitle" = "Ty nastavují a prosazují moderátoři %@."; +"Scene.ServerRules.TermsOfService" = "podmínky služby"; +"Scene.ServerRules.Title" = "Některá základní pravidla."; +"Scene.Settings.Footer.MastodonDescription" = "Mastodon je open source software. Na GitHub můžete nahlásit problémy na %@ (%@)"; +"Scene.Settings.Keyboard.CloseSettingsWindow" = "Zavřít okno nastavení"; +"Scene.Settings.Section.Appearance.Automatic" = "Automaticky"; +"Scene.Settings.Section.Appearance.Dark" = "Vždy tmavý"; +"Scene.Settings.Section.Appearance.Light" = "Vždy světlý"; +"Scene.Settings.Section.Appearance.Title" = "Vzhled"; +"Scene.Settings.Section.BoringZone.AccountSettings" = "Nastavení účtu"; +"Scene.Settings.Section.BoringZone.Privacy" = "Zásady ochrany osobních údajů"; +"Scene.Settings.Section.BoringZone.Terms" = "Podmínky služby"; +"Scene.Settings.Section.BoringZone.Title" = "Nudná část"; +"Scene.Settings.Section.LookAndFeel.Light" = "Světlý"; +"Scene.Settings.Section.LookAndFeel.ReallyDark" = "Skutečně tmavý"; +"Scene.Settings.Section.LookAndFeel.SortaDark" = "Sorta Dark"; +"Scene.Settings.Section.LookAndFeel.Title" = "Vzhled a chování"; +"Scene.Settings.Section.LookAndFeel.UseSystem" = "Použít systém"; +"Scene.Settings.Section.Notifications.Boosts" = "Boostnul můj příspěvek"; +"Scene.Settings.Section.Notifications.Favorites" = "Oblíbil si můj příspěvek"; +"Scene.Settings.Section.Notifications.Follows" = "Sleduje mě"; +"Scene.Settings.Section.Notifications.Mentions" = "Zmiňuje mě"; +"Scene.Settings.Section.Notifications.Title" = "Upozornění"; +"Scene.Settings.Section.Notifications.Trigger.Anyone" = "kdokoliv"; +"Scene.Settings.Section.Notifications.Trigger.Follow" = "kdokoli, koho sleduji"; +"Scene.Settings.Section.Notifications.Trigger.Follower" = "sledující"; +"Scene.Settings.Section.Notifications.Trigger.Noone" = "nikdo"; +"Scene.Settings.Section.Notifications.Trigger.Title" = "Upozornit, když"; +"Scene.Settings.Section.Preference.DisableAvatarAnimation" = "Zakázat animované avatary"; +"Scene.Settings.Section.Preference.DisableEmojiAnimation" = "Zakázat animované emoji"; +"Scene.Settings.Section.Preference.OpenLinksInMastodon" = "Otevřít odkazy v Mastodonu"; +"Scene.Settings.Section.Preference.Title" = "Předvolby"; +"Scene.Settings.Section.Preference.TrueBlackDarkMode" = "Skutečný černý tmavý režim"; +"Scene.Settings.Section.Preference.UsingDefaultBrowser" = "Použít výchozí prohlížeč pro otevírání odkazů"; +"Scene.Settings.Section.SpicyZone.Clear" = "Vymazat mezipaměť médií"; +"Scene.Settings.Section.SpicyZone.Signout" = "Odhlásit se"; +"Scene.Settings.Section.SpicyZone.Title" = "Ostrá část"; +"Scene.Settings.Title" = "Nastavení"; +"Scene.SuggestionAccount.FollowExplain" = "Když někoho sledujete, uvidíte jejich příspěvky ve vašem domovském kanálu."; +"Scene.SuggestionAccount.Title" = "Najít lidi pro sledování"; +"Scene.Thread.BackTitle" = "Příspěvek"; +"Scene.Thread.Title" = "Příspěvek od %@"; +"Scene.Welcome.GetStarted" = "Začínáme"; +"Scene.Welcome.LogIn" = "Přihlásit se"; +"Scene.Welcome.Slogan" = "Sociální sítě opět ve vašich rukou."; +"Scene.Wizard.AccessibilityHint" = "Dvojitým poklepáním tohoto průvodce odmítnete"; +"Scene.Wizard.MultipleAccountSwitchIntroDescription" = "Přepínání mezi více účty podržením tlačítka profilu."; +"Scene.Wizard.NewInMastodon" = "Nový v Mastodonu"; \ No newline at end of file diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/cs.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/cs.lproj/Localizable.stringsdict new file mode 100644 index 000000000..6e44e9f0a --- /dev/null +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/cs.lproj/Localizable.stringsdict @@ -0,0 +1,581 @@ + + + + + a11y.plural.count.unread.notification + + NSStringLocalizedFormatKey + %#@notification_count_unread_notification@ + notification_count_unread_notification + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 nepřečtené oznámení + few + %ld nepřečtené oznámení + many + %ld nepřečtených oznámení + other + %ld nepřečtených oznámení + + + a11y.plural.count.input_limit_exceeds + + NSStringLocalizedFormatKey + Vstupní limit přesahuje %#@character_count@ + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 znak + few + %ld znaky + many + %ld znaků + other + %ld znaků + + + a11y.plural.count.input_limit_remains + + NSStringLocalizedFormatKey + Vstupní limit zůstává %#@character_count@ + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 znak + few + %ld znaky + many + %ld znaků + other + %ld znaků + + + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 znak + few + %ld znaky + many + %ld znaků + other + %ld znaků + + + plural.count.followed_by_and_mutual + + NSStringLocalizedFormatKey + %#@names@%#@count_mutual@ + names + + one + + few + + many + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + other + + + count_mutual + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + Followed by %1$@, and another mutual + few + Followed by %1$@, and %ld mutuals + many + Followed by %1$@, and %ld mutuals + other + Followed by %1$@, and %ld mutuals + + + plural.count.metric_formatted.post + + NSStringLocalizedFormatKey + %@ %#@post_count@ + post_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + příspěvek + few + příspěvky + many + příspěvků + other + příspěvků + + + plural.count.media + + NSStringLocalizedFormatKey + %#@media_count@ + media_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 médium + few + %ld média + many + %ld médií + other + %ld médií + + + plural.count.post + + NSStringLocalizedFormatKey + %#@post_count@ + post_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 příspěvek + few + %ld příspěvky + many + %ld příspěvků + other + %ld příspěvků + + + plural.count.favorite + + NSStringLocalizedFormatKey + %#@favorite_count@ + favorite_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 oblíbený + few + %ld favorites + many + %ld favorites + other + %ld favorites + + + plural.count.reblog + + NSStringLocalizedFormatKey + %#@reblog_count@ + reblog_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 reblog + few + %ld reblogs + many + %ld reblogs + other + %ld reblogs + + + plural.count.reply + + NSStringLocalizedFormatKey + %#@reply_count@ + reply_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 odpověď + few + %ld odpovědi + many + %ld odpovědí + other + %ld odpovědí + + + plural.count.vote + + NSStringLocalizedFormatKey + %#@vote_count@ + vote_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 hlas + few + %ld hlasy + many + %ld hlasů + other + %ld hlasů + + + plural.count.voter + + NSStringLocalizedFormatKey + %#@voter_count@ + voter_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 hlasující + few + %ld hlasující + many + %ld hlasujících + other + %ld hlasujících + + + plural.people_talking + + NSStringLocalizedFormatKey + %#@count_people_talking@ + count_people_talking + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 people talking + few + %ld people talking + many + %ld people talking + other + %ld people talking + + + plural.count.following + + NSStringLocalizedFormatKey + %#@count_following@ + count_following + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 sledující + few + %ld sledující + many + %ld sledujících + other + %ld sledujících + + + plural.count.follower + + NSStringLocalizedFormatKey + %#@count_follower@ + count_follower + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 follower + few + %ld followers + many + %ld followers + other + %ld followers + + + date.year.left + + NSStringLocalizedFormatKey + %#@count_year_left@ + count_year_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + Zbývá 1 rok + few + Zbývají %ld roky + many + Zbývá %ld roků + other + Zbývá %ld roků + + + date.month.left + + NSStringLocalizedFormatKey + %#@count_month_left@ + count_month_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + Zbývá 1 měsíc + few + %ld months left + many + %ld months left + other + %ld months left + + + date.day.left + + NSStringLocalizedFormatKey + %#@count_day_left@ + count_day_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 day left + few + %ld days left + many + %ld days left + other + %ld days left + + + date.hour.left + + NSStringLocalizedFormatKey + %#@count_hour_left@ + count_hour_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 hour left + few + %ld hours left + many + %ld hours left + other + %ld hours left + + + date.minute.left + + NSStringLocalizedFormatKey + %#@count_minute_left@ + count_minute_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 minute left + few + %ld minutes left + many + %ld minutes left + other + %ld minutes left + + + date.second.left + + NSStringLocalizedFormatKey + %#@count_second_left@ + count_second_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 second left + few + %ld seconds left + many + %ld seconds left + other + %ld seconds left + + + date.year.ago.abbr + + NSStringLocalizedFormatKey + %#@count_year_ago_abbr@ + count_year_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1y ago + few + %ldy ago + many + %ldy ago + other + %ldy ago + + + date.month.ago.abbr + + NSStringLocalizedFormatKey + %#@count_month_ago_abbr@ + count_month_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1M ago + few + %ldM ago + many + %ldM ago + other + %ldM ago + + + date.day.ago.abbr + + NSStringLocalizedFormatKey + %#@count_day_ago_abbr@ + count_day_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1d ago + few + %ldd ago + many + %ldd ago + other + %ldd ago + + + date.hour.ago.abbr + + NSStringLocalizedFormatKey + %#@count_hour_ago_abbr@ + count_hour_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1h ago + few + %ldh ago + many + %ldh ago + other + %ldh ago + + + date.minute.ago.abbr + + NSStringLocalizedFormatKey + %#@count_minute_ago_abbr@ + count_minute_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1m ago + few + %ldm ago + many + %ldm ago + other + %ldm ago + + + date.second.ago.abbr + + NSStringLocalizedFormatKey + %#@count_second_ago_abbr@ + count_second_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1s ago + few + %lds ago + many + %lds ago + other + %lds ago + + + + diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/de.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/de.lproj/Localizable.strings index 0a78adc48..29f3d16f5 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/de.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/de.lproj/Localizable.strings @@ -56,7 +56,7 @@ Bitte überprüfe deine Internetverbindung."; "Common.Controls.Actions.SharePost" = "Beitrag teilen"; "Common.Controls.Actions.ShareUser" = "%@ teilen"; "Common.Controls.Actions.SignIn" = "Anmelden"; -"Common.Controls.Actions.SignUp" = "Registrieren"; +"Common.Controls.Actions.SignUp" = "Konto erstellen"; "Common.Controls.Actions.Skip" = "Überspringen"; "Common.Controls.Actions.TakePhoto" = "Foto aufnehmen"; "Common.Controls.Actions.TryAgain" = "Nochmals versuchen"; @@ -108,6 +108,10 @@ Bitte überprüfe deine Internetverbindung."; "Common.Controls.Status.Actions.Unreblog" = "Nicht mehr teilen"; "Common.Controls.Status.ContentWarning" = "Inhaltswarnung"; "Common.Controls.Status.MediaContentWarning" = "Tippe irgendwo zum Anzeigen"; +"Common.Controls.Status.MetaEntity.Email" = "Email address: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Hashtag: %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Show Profile: %@"; +"Common.Controls.Status.MetaEntity.Url" = "Link: %@"; "Common.Controls.Status.Poll.Closed" = "Beendet"; "Common.Controls.Status.Poll.Vote" = "Abstimmen"; "Common.Controls.Status.SensitiveContent" = "NSFW-Inhalt"; @@ -151,19 +155,27 @@ Dein Profil sieht für diesen Benutzer auch so aus."; "Scene.AccountList.AddAccount" = "Konto hinzufügen"; "Scene.AccountList.DismissAccountSwitcher" = "Dialog zum Wechseln des Kontos schließen"; "Scene.AccountList.TabBarHint" = "Aktuell ausgewähltes Profil: %@. Doppeltippen dann gedrückt halten, um den Kontoschalter anzuzeigen"; -"Scene.Bookmark.Title" = "Bookmarks"; +"Scene.Bookmark.Title" = "Lesezeichen"; "Scene.Compose.Accessibility.AppendAttachment" = "Anhang hinzufügen"; "Scene.Compose.Accessibility.AppendPoll" = "Umfrage hinzufügen"; "Scene.Compose.Accessibility.CustomEmojiPicker" = "Benutzerdefinierter Emojiwähler"; "Scene.Compose.Accessibility.DisableContentWarning" = "Inhaltswarnung ausschalten"; "Scene.Compose.Accessibility.EnableContentWarning" = "Inhaltswarnung einschalten"; +"Scene.Compose.Accessibility.PostOptions" = "Post Options"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "Sichtbarkeitsmenü"; +"Scene.Compose.Accessibility.PostingAs" = "Posting as %@"; "Scene.Compose.Accessibility.RemovePoll" = "Umfrage entfernen"; "Scene.Compose.Attachment.AttachmentBroken" = "Dieses %@ scheint defekt zu sein und kann nicht auf Mastodon hochgeladen werden."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "Anhang zu groß"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Medienanhang wurde nicht erkannt"; +"Scene.Compose.Attachment.CompressingState" = "Komprimieren..."; "Scene.Compose.Attachment.DescriptionPhoto" = "Für Menschen mit Sehbehinderung beschreiben..."; "Scene.Compose.Attachment.DescriptionVideo" = "Für Menschen mit Sehbehinderung beschreiben..."; +"Scene.Compose.Attachment.LoadFailed" = "Laden fehlgeschlagen"; "Scene.Compose.Attachment.Photo" = "Foto"; +"Scene.Compose.Attachment.ServerProcessingState" = "Serververarbeitung..."; +"Scene.Compose.Attachment.UploadFailed" = "Upload fehlgeschlagen"; "Scene.Compose.Attachment.Video" = "Video"; "Scene.Compose.AutoComplete.SpaceToAdd" = "Leerzeichen um hinzuzufügen"; "Scene.Compose.ComposeAction" = "Veröffentlichen"; @@ -184,6 +196,8 @@ kann nicht auf Mastodon hochgeladen werden."; "Scene.Compose.Poll.OptionNumber" = "Auswahlmöglichkeit %ld"; "Scene.Compose.Poll.SevenDays" = "7 Tage"; "Scene.Compose.Poll.SixHours" = "6 Stunden"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "Die Umfrage hat eine leere Option"; +"Scene.Compose.Poll.ThePollIsInvalid" = "Die Umfrage ist ungültig"; "Scene.Compose.Poll.ThirtyMinutes" = "30 Minuten"; "Scene.Compose.Poll.ThreeDays" = "3 Tage"; "Scene.Compose.ReplyingToUser" = "antwortet auf %@"; @@ -215,9 +229,9 @@ kann nicht auf Mastodon hochgeladen werden."; "Scene.Familiarfollowers.Title" = "Follower, die dir bekannt vorkommen"; "Scene.Favorite.Title" = "Deine Favoriten"; "Scene.FavoritedBy.Title" = "Favorisiert von"; -"Scene.Follower.Footer" = "Follower von anderen Servern werden nicht angezeigt."; +"Scene.Follower.Footer" = "Folger, die nicht auf deinem Server registriert sind, werden nicht angezeigt."; "Scene.Follower.Title" = "Follower"; -"Scene.Following.Footer" = "Wem das Konto folgt wird von anderen Servern werden nicht angezeigt."; +"Scene.Following.Footer" = "Gefolgte, die nicht auf deinem Server registriert sind, werden nicht angezeigt."; "Scene.Following.Title" = "Folgende"; "Scene.HomeTimeline.NavigationBarState.Accessibility.LogoHint" = "Zum Scrollen nach oben tippen und zum vorherigen Ort erneut tippen"; "Scene.HomeTimeline.NavigationBarState.Accessibility.LogoLabel" = "Logo-Button"; @@ -226,6 +240,9 @@ kann nicht auf Mastodon hochgeladen werden."; "Scene.HomeTimeline.NavigationBarState.Published" = "Veröffentlicht!"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "Beitrag wird veröffentlicht..."; "Scene.HomeTimeline.Title" = "Startseite"; +"Scene.Login.ServerSearchField.Placeholder" = "URL eingeben oder nach Server suchen"; +"Scene.Login.Subtitle" = "Melden Sie sich auf dem Server an, auf dem Sie Ihr Konto erstellt haben."; +"Scene.Login.Title" = "Willkommen zurück"; "Scene.Notification.FollowRequest.Accept" = "Akzeptieren"; "Scene.Notification.FollowRequest.Accepted" = "Akzeptiert"; "Scene.Notification.FollowRequest.Reject" = "Ablehnen"; @@ -247,12 +264,14 @@ kann nicht auf Mastodon hochgeladen werden."; "Scene.Profile.Accessibility.EditAvatarImage" = "Profilbild bearbeiten"; "Scene.Profile.Accessibility.ShowAvatarImage" = "Profilbild anzeigen"; "Scene.Profile.Accessibility.ShowBannerImage" = "Bannerbild anzeigen"; -"Scene.Profile.Dashboard.Followers" = "Folger"; +"Scene.Profile.Dashboard.Followers" = "Folgende"; "Scene.Profile.Dashboard.Following" = "Gefolgte"; "Scene.Profile.Dashboard.Posts" = "Beiträge"; "Scene.Profile.Fields.AddRow" = "Zeile hinzufügen"; "Scene.Profile.Fields.Placeholder.Content" = "Inhalt"; "Scene.Profile.Fields.Placeholder.Label" = "Bezeichnung"; +"Scene.Profile.Fields.Verified.Long" = "Besitz des Links wurde überprüft am %@"; +"Scene.Profile.Fields.Verified.Short" = "Überprüft am %@"; "Scene.Profile.Header.FollowsYou" = "Folgt dir"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "Bestätige %@ zu blockieren"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "Konto blockieren"; @@ -260,7 +279,7 @@ kann nicht auf Mastodon hochgeladen werden."; "Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Title" = "Reblogs ausblenden"; "Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Message" = "Bestätige %@ stumm zu schalten"; "Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Title" = "Konto stummschalten"; -"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message" = "Confirm to show reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message" = "Bestätigen um Reblogs anzuzeigen"; "Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Title" = "Reblogs anzeigen"; "Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Message" = "Bestätige %@ zu entsperren"; "Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Title" = "Konto entsperren"; @@ -385,13 +404,11 @@ kann nicht auf Mastodon hochgeladen werden."; "Scene.ServerPicker.EmptyState.BadNetwork" = "Beim Laden der Daten ist etwas schief gelaufen. Überprüfe deine Internetverbindung."; "Scene.ServerPicker.EmptyState.FindingServers" = "Verfügbare Server werden gesucht..."; "Scene.ServerPicker.EmptyState.NoResults" = "Keine Ergebnisse"; -"Scene.ServerPicker.Input.Placeholder" = "Nach Server suchen oder URL eingeben"; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Nach Server suchen oder URL eingeben"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Suche nach einer Community oder gib eine URL ein"; "Scene.ServerPicker.Label.Category" = "KATEGORIE"; "Scene.ServerPicker.Label.Language" = "SPRACHE"; "Scene.ServerPicker.Label.Users" = "BENUTZER"; -"Scene.ServerPicker.Subtitle" = "Wähle eine Gemeinschaft, die auf deinen Interessen, Region oder einem allgemeinen Zweck basiert."; -"Scene.ServerPicker.SubtitleExtend" = "Wähle eine Gemeinschaft basierend auf deinen Interessen, deiner Region oder einem allgemeinen Zweck. Jede Gemeinschaft wird von einer völlig unabhängigen Organisation oder Einzelperson betrieben."; +"Scene.ServerPicker.Subtitle" = "Wähle einen Server basierend auf deinen Interessen oder deiner Region – oder einfach einen allgemeinen. Du kannst trotzdem mit jedem interagieren, egal auf welchem Server."; "Scene.ServerPicker.Title" = "Wähle einen Server, beliebigen Server."; "Scene.ServerRules.Button.Confirm" = "Ich stimme zu"; @@ -422,7 +439,7 @@ beliebigen Server."; "Scene.Settings.Section.Notifications.Title" = "Benachrichtigungen"; "Scene.Settings.Section.Notifications.Trigger.Anyone" = "jeder"; "Scene.Settings.Section.Notifications.Trigger.Follow" = "ein von mir Gefolgter"; -"Scene.Settings.Section.Notifications.Trigger.Follower" = "ein Folger"; +"Scene.Settings.Section.Notifications.Trigger.Follower" = "ein Folgender"; "Scene.Settings.Section.Notifications.Trigger.Noone" = "niemand"; "Scene.Settings.Section.Notifications.Trigger.Title" = "Benachrichtige mich, wenn"; "Scene.Settings.Section.Preference.DisableAvatarAnimation" = "Animierte Profilbilder deaktivieren"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/de.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/de.lproj/Localizable.stringsdict index c6a8a4297..1965fd02b 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/de.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/de.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld Zeichen + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey @@ -248,9 +264,9 @@ NSStringFormatValueTypeKey ld one - 1 Follower + 1 Folgender other - %ld Follower + %ld Folgende date.year.left diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings index 9114b96e5..2a3f1efbf 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings @@ -55,8 +55,8 @@ Please check your internet connection."; "Common.Controls.Actions.Share" = "Share"; "Common.Controls.Actions.SharePost" = "Share Post"; "Common.Controls.Actions.ShareUser" = "Share %@"; -"Common.Controls.Actions.SignIn" = "Sign In"; -"Common.Controls.Actions.SignUp" = "Sign Up"; +"Common.Controls.Actions.SignIn" = "Log in"; +"Common.Controls.Actions.SignUp" = "Create account"; "Common.Controls.Actions.Skip" = "Skip"; "Common.Controls.Actions.TakePhoto" = "Take Photo"; "Common.Controls.Actions.TryAgain" = "Try Again"; @@ -109,7 +109,7 @@ Please check your internet connection."; "Common.Controls.Status.ContentWarning" = "Content Warning"; "Common.Controls.Status.MediaContentWarning" = "Tap anywhere to reveal"; "Common.Controls.Status.MetaEntity.Email" = "Email address: %@"; -"Common.Controls.Status.MetaEntity.Hashtag" = "Hastag %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Hashtag: %@"; "Common.Controls.Status.MetaEntity.Mention" = "Show Profile: %@"; "Common.Controls.Status.MetaEntity.Url" = "Link: %@"; "Common.Controls.Status.Poll.Closed" = "Closed"; @@ -161,13 +161,21 @@ Your profile looks like this to them."; "Scene.Compose.Accessibility.CustomEmojiPicker" = "Custom Emoji Picker"; "Scene.Compose.Accessibility.DisableContentWarning" = "Disable Content Warning"; "Scene.Compose.Accessibility.EnableContentWarning" = "Enable Content Warning"; +"Scene.Compose.Accessibility.PostOptions" = "Post Options"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "Post Visibility Menu"; +"Scene.Compose.Accessibility.PostingAs" = "Posting as %@"; "Scene.Compose.Accessibility.RemovePoll" = "Remove Poll"; "Scene.Compose.Attachment.AttachmentBroken" = "This %@ is broken and can’t be uploaded to Mastodon."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "Attachment too large"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Can not recognize this media attachment"; +"Scene.Compose.Attachment.CompressingState" = "Compressing..."; "Scene.Compose.Attachment.DescriptionPhoto" = "Describe the photo for the visually-impaired..."; "Scene.Compose.Attachment.DescriptionVideo" = "Describe the video for the visually-impaired..."; +"Scene.Compose.Attachment.LoadFailed" = "Load Failed"; "Scene.Compose.Attachment.Photo" = "photo"; +"Scene.Compose.Attachment.ServerProcessingState" = "Server Processing..."; +"Scene.Compose.Attachment.UploadFailed" = "Upload Failed"; "Scene.Compose.Attachment.Video" = "video"; "Scene.Compose.AutoComplete.SpaceToAdd" = "Space to add"; "Scene.Compose.ComposeAction" = "Publish"; @@ -188,6 +196,8 @@ uploaded to Mastodon."; "Scene.Compose.Poll.OptionNumber" = "Option %ld"; "Scene.Compose.Poll.SevenDays" = "7 Days"; "Scene.Compose.Poll.SixHours" = "6 Hours"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "The poll has empty option"; +"Scene.Compose.Poll.ThePollIsInvalid" = "The poll is invalid"; "Scene.Compose.Poll.ThirtyMinutes" = "30 minutes"; "Scene.Compose.Poll.ThreeDays" = "3 Days"; "Scene.Compose.ReplyingToUser" = "replying to %@"; @@ -230,6 +240,9 @@ uploaded to Mastodon."; "Scene.HomeTimeline.NavigationBarState.Published" = "Published!"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "Publishing post..."; "Scene.HomeTimeline.Title" = "Home"; +"Scene.Login.ServerSearchField.Placeholder" = "Enter URL or search for your server"; +"Scene.Login.Subtitle" = "Log you in on the server you created your account on."; +"Scene.Login.Title" = "Welcome back"; "Scene.Notification.FollowRequest.Accept" = "Accept"; "Scene.Notification.FollowRequest.Accepted" = "Accepted"; "Scene.Notification.FollowRequest.Reject" = "reject"; @@ -257,6 +270,8 @@ uploaded to Mastodon."; "Scene.Profile.Fields.AddRow" = "Add Row"; "Scene.Profile.Fields.Placeholder.Content" = "Content"; "Scene.Profile.Fields.Placeholder.Label" = "Label"; +"Scene.Profile.Fields.Verified.Long" = "Ownership of this link was checked on %@"; +"Scene.Profile.Fields.Verified.Short" = "Verified on %@"; "Scene.Profile.Header.FollowsYou" = "Follows You"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "Confirm to block %@"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "Block Account"; @@ -389,13 +404,11 @@ uploaded to Mastodon."; "Scene.ServerPicker.EmptyState.BadNetwork" = "Something went wrong while loading the data. Check your internet connection."; "Scene.ServerPicker.EmptyState.FindingServers" = "Finding available servers..."; "Scene.ServerPicker.EmptyState.NoResults" = "No results"; -"Scene.ServerPicker.Input.Placeholder" = "Search servers"; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Search servers or enter URL"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Search communities or enter URL"; "Scene.ServerPicker.Label.Category" = "CATEGORY"; "Scene.ServerPicker.Label.Language" = "LANGUAGE"; "Scene.ServerPicker.Label.Users" = "USERS"; -"Scene.ServerPicker.Subtitle" = "Pick a server based on your interests, region, or a general purpose one."; -"Scene.ServerPicker.SubtitleExtend" = "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual."; +"Scene.ServerPicker.Subtitle" = "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers."; "Scene.ServerPicker.Title" = "Mastodon is made of users in different servers."; "Scene.ServerRules.Button.Confirm" = "I Agree"; "Scene.ServerRules.PrivacyPolicy" = "privacy policy"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.stringsdict index bdcae6ac9..297e6675a 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.stringsdict @@ -50,6 +50,28 @@ %ld characters + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + zero + no characters + one + 1 character + few + %ld characters + many + %ld characters + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/es.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/es.lproj/Localizable.strings index 47ed11bb9..b2cb18954 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/es.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/es.lproj/Localizable.strings @@ -55,8 +55,8 @@ Por favor, revise su conexión a internet."; "Common.Controls.Actions.Share" = "Compartir"; "Common.Controls.Actions.SharePost" = "Compartir publicación"; "Common.Controls.Actions.ShareUser" = "Compartir %@"; -"Common.Controls.Actions.SignIn" = "Iniciar sesión"; -"Common.Controls.Actions.SignUp" = "Regístrate"; +"Common.Controls.Actions.SignIn" = "Log in"; +"Common.Controls.Actions.SignUp" = "Create account"; "Common.Controls.Actions.Skip" = "Omitir"; "Common.Controls.Actions.TakePhoto" = "Tomar foto"; "Common.Controls.Actions.TryAgain" = "Inténtalo de nuevo"; @@ -108,6 +108,10 @@ Por favor, revise su conexión a internet."; "Common.Controls.Status.Actions.Unreblog" = "Deshacer reblogueo"; "Common.Controls.Status.ContentWarning" = "Advertencia de Contenido"; "Common.Controls.Status.MediaContentWarning" = "Pulsa en cualquier sitio para mostrar"; +"Common.Controls.Status.MetaEntity.Email" = "Email address: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Hashtag: %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Show Profile: %@"; +"Common.Controls.Status.MetaEntity.Url" = "Link: %@"; "Common.Controls.Status.Poll.Closed" = "Cerrado"; "Common.Controls.Status.Poll.Vote" = "Vota"; "Common.Controls.Status.SensitiveContent" = "Contenido sensible"; @@ -157,13 +161,21 @@ Tu perfil se ve así para él."; "Scene.Compose.Accessibility.CustomEmojiPicker" = "Selector de Emojis Personalizados"; "Scene.Compose.Accessibility.DisableContentWarning" = "Desactivar Advertencia de Contenido"; "Scene.Compose.Accessibility.EnableContentWarning" = "Activar Advertencia de Contenido"; +"Scene.Compose.Accessibility.PostOptions" = "Post Options"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "Menú de Visibilidad de la Publicación"; +"Scene.Compose.Accessibility.PostingAs" = "Posting as %@"; "Scene.Compose.Accessibility.RemovePoll" = "Eliminar Encuesta"; "Scene.Compose.Attachment.AttachmentBroken" = "Este %@ está roto y no puede subirse a Mastodon."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "Attachment too large"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Can not recognize this media attachment"; +"Scene.Compose.Attachment.CompressingState" = "Compressing..."; "Scene.Compose.Attachment.DescriptionPhoto" = "Describe la foto para los usuarios con dificultad visual..."; "Scene.Compose.Attachment.DescriptionVideo" = "Describe el vídeo para los usuarios con dificultad visual..."; +"Scene.Compose.Attachment.LoadFailed" = "Load Failed"; "Scene.Compose.Attachment.Photo" = "foto"; +"Scene.Compose.Attachment.ServerProcessingState" = "Server Processing..."; +"Scene.Compose.Attachment.UploadFailed" = "Upload Failed"; "Scene.Compose.Attachment.Video" = "vídeo"; "Scene.Compose.AutoComplete.SpaceToAdd" = "Espacio para añadir"; "Scene.Compose.ComposeAction" = "Publicar"; @@ -184,6 +196,8 @@ subirse a Mastodon."; "Scene.Compose.Poll.OptionNumber" = "Opción %ld"; "Scene.Compose.Poll.SevenDays" = "7 Días"; "Scene.Compose.Poll.SixHours" = "6 Horas"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "The poll has empty option"; +"Scene.Compose.Poll.ThePollIsInvalid" = "The poll is invalid"; "Scene.Compose.Poll.ThirtyMinutes" = "30 minutos"; "Scene.Compose.Poll.ThreeDays" = "4 Días"; "Scene.Compose.ReplyingToUser" = "en respuesta a %@"; @@ -227,6 +241,9 @@ pulsa en el enlace para confirmar tu cuenta."; "Scene.HomeTimeline.NavigationBarState.Published" = "¡Publicado!"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "Publicación en curso..."; "Scene.HomeTimeline.Title" = "Inicio"; +"Scene.Login.ServerSearchField.Placeholder" = "Enter URL or search for your server"; +"Scene.Login.Subtitle" = "Log you in on the server you created your account on."; +"Scene.Login.Title" = "Welcome back"; "Scene.Notification.FollowRequest.Accept" = "Aceptar"; "Scene.Notification.FollowRequest.Accepted" = "Aceptado"; "Scene.Notification.FollowRequest.Reject" = "rechazar"; @@ -254,6 +271,8 @@ pulsa en el enlace para confirmar tu cuenta."; "Scene.Profile.Fields.AddRow" = "Añadir Fila"; "Scene.Profile.Fields.Placeholder.Content" = "Contenido"; "Scene.Profile.Fields.Placeholder.Label" = "Nombre para el campo"; +"Scene.Profile.Fields.Verified.Long" = "Ownership of this link was checked on %@"; +"Scene.Profile.Fields.Verified.Short" = "Verified on %@"; "Scene.Profile.Header.FollowsYou" = "Te sigue"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "Confirmar para bloquear a %@"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "Bloquear cuenta"; @@ -386,13 +405,11 @@ pulsa en el enlace para confirmar tu cuenta."; "Scene.ServerPicker.EmptyState.BadNetwork" = "Algo ha ido mal al cargar los datos. Comprueba tu conexión a Internet."; "Scene.ServerPicker.EmptyState.FindingServers" = "Encontrando servidores disponibles..."; "Scene.ServerPicker.EmptyState.NoResults" = "Sin resultados"; -"Scene.ServerPicker.Input.Placeholder" = "Encuentra un servidor o únete al tuyo propio..."; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Buscar servidores o introducir la URL"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Search communities or enter URL"; "Scene.ServerPicker.Label.Category" = "CATEGORÍA"; "Scene.ServerPicker.Label.Language" = "IDIOMA"; "Scene.ServerPicker.Label.Users" = "USUARIOS"; -"Scene.ServerPicker.Subtitle" = "Elige una comunidad relacionada con tus intereses, con tu región o una más genérica."; -"Scene.ServerPicker.SubtitleExtend" = "Elige una comunidad relacionada con tus intereses, con tu región o una más genérica. Cada comunidad está operada por una organización o individuo completamente independiente."; +"Scene.ServerPicker.Subtitle" = "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers."; "Scene.ServerPicker.Title" = "Elige un servidor, cualquier servidor."; "Scene.ServerRules.Button.Confirm" = "Acepto"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/es.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/es.lproj/Localizable.stringsdict index def3d7bba..ca07b6b28 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/es.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/es.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld caracteres + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/eu.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/eu.lproj/Localizable.strings index e2be3068d..e2985112e 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/eu.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/eu.lproj/Localizable.strings @@ -55,8 +55,8 @@ Egiaztatu Interneteko konexioa."; "Common.Controls.Actions.Share" = "Partekatu"; "Common.Controls.Actions.SharePost" = "Partekatu bidalketa"; "Common.Controls.Actions.ShareUser" = "Partekatu %@"; -"Common.Controls.Actions.SignIn" = "Hasi saioa"; -"Common.Controls.Actions.SignUp" = "Eman Izena"; +"Common.Controls.Actions.SignIn" = "Log in"; +"Common.Controls.Actions.SignUp" = "Create account"; "Common.Controls.Actions.Skip" = "Saltatu"; "Common.Controls.Actions.TakePhoto" = "Atera argazkia"; "Common.Controls.Actions.TryAgain" = "Saiatu berriro"; @@ -108,6 +108,10 @@ Egiaztatu Interneteko konexioa."; "Common.Controls.Status.Actions.Unreblog" = "Desegin bultzada"; "Common.Controls.Status.ContentWarning" = "Edukiaren abisua"; "Common.Controls.Status.MediaContentWarning" = "Ukitu edonon bistaratzeko"; +"Common.Controls.Status.MetaEntity.Email" = "Email address: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Hashtag: %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Show Profile: %@"; +"Common.Controls.Status.MetaEntity.Url" = "Link: %@"; "Common.Controls.Status.Poll.Closed" = "Itxita"; "Common.Controls.Status.Poll.Vote" = "Bozkatu"; "Common.Controls.Status.SensitiveContent" = "Sensitive Content"; @@ -157,13 +161,21 @@ Zure profilak itxura hau du berarentzat."; "Scene.Compose.Accessibility.CustomEmojiPicker" = "Emoji pertsonalizatuen hautatzailea"; "Scene.Compose.Accessibility.DisableContentWarning" = "Desgaitu edukiaren abisua"; "Scene.Compose.Accessibility.EnableContentWarning" = "Gaitu edukiaren abisua"; +"Scene.Compose.Accessibility.PostOptions" = "Post Options"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "Bidalketaren ikusgaitasunaren menua"; +"Scene.Compose.Accessibility.PostingAs" = "Posting as %@"; "Scene.Compose.Accessibility.RemovePoll" = "Kendu inkesta"; "Scene.Compose.Attachment.AttachmentBroken" = "%@ hondatuta dago eta ezin da Mastodonera igo."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "Attachment too large"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Can not recognize this media attachment"; +"Scene.Compose.Attachment.CompressingState" = "Compressing..."; "Scene.Compose.Attachment.DescriptionPhoto" = "Deskribatu argazkia ikusmen arazoak dituztenentzat..."; "Scene.Compose.Attachment.DescriptionVideo" = "Deskribatu bideoa ikusmen arazoak dituztenentzat..."; +"Scene.Compose.Attachment.LoadFailed" = "Load Failed"; "Scene.Compose.Attachment.Photo" = "argazkia"; +"Scene.Compose.Attachment.ServerProcessingState" = "Server Processing..."; +"Scene.Compose.Attachment.UploadFailed" = "Upload Failed"; "Scene.Compose.Attachment.Video" = "bideoa"; "Scene.Compose.AutoComplete.SpaceToAdd" = "Sakatu zuriunea gehitzeko"; "Scene.Compose.ComposeAction" = "Argitaratu"; @@ -184,6 +196,8 @@ Mastodonera igo."; "Scene.Compose.Poll.OptionNumber" = "%ld aukera"; "Scene.Compose.Poll.SevenDays" = "7 egun"; "Scene.Compose.Poll.SixHours" = "6 ordu"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "The poll has empty option"; +"Scene.Compose.Poll.ThePollIsInvalid" = "The poll is invalid"; "Scene.Compose.Poll.ThirtyMinutes" = "30 minutu"; "Scene.Compose.Poll.ThreeDays" = "3 egun"; "Scene.Compose.ReplyingToUser" = "%@(r)i erantzuten"; @@ -226,6 +240,9 @@ Mastodonera igo."; "Scene.HomeTimeline.NavigationBarState.Published" = "Argitaratua!"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "Bidalketa argitaratzen..."; "Scene.HomeTimeline.Title" = "Hasiera"; +"Scene.Login.ServerSearchField.Placeholder" = "Enter URL or search for your server"; +"Scene.Login.Subtitle" = "Log you in on the server you created your account on."; +"Scene.Login.Title" = "Welcome back"; "Scene.Notification.FollowRequest.Accept" = "Accept"; "Scene.Notification.FollowRequest.Accepted" = "Accepted"; "Scene.Notification.FollowRequest.Reject" = "reject"; @@ -253,6 +270,8 @@ Mastodonera igo."; "Scene.Profile.Fields.AddRow" = "Gehitu errenkada"; "Scene.Profile.Fields.Placeholder.Content" = "Edukia"; "Scene.Profile.Fields.Placeholder.Label" = "Etiketa"; +"Scene.Profile.Fields.Verified.Long" = "Ownership of this link was checked on %@"; +"Scene.Profile.Fields.Verified.Short" = "Verified on %@"; "Scene.Profile.Header.FollowsYou" = "Follows You"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "Berretsi %@ blokeatzea"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "Blokeatu kontua"; @@ -385,13 +404,11 @@ Mastodonera igo."; "Scene.ServerPicker.EmptyState.BadNetwork" = "Arazoren bat egon da datuak kargatzean. Egiaztatu zure Interneteko konexioa."; "Scene.ServerPicker.EmptyState.FindingServers" = "Erabilgarri dauden zerbitzariak bilatzen..."; "Scene.ServerPicker.EmptyState.NoResults" = "Emaitzarik ez"; -"Scene.ServerPicker.Input.Placeholder" = "Bilatu zerbitzari bat edo sortu zurea..."; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Search servers or enter URL"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Search communities or enter URL"; "Scene.ServerPicker.Label.Category" = "KATEGORIA"; "Scene.ServerPicker.Label.Language" = "HIZKUNTZA"; "Scene.ServerPicker.Label.Users" = "ERABILTZAILEAK"; -"Scene.ServerPicker.Subtitle" = "Aukeratu komunitate bat zure interes edo lurraldearen arabera, edo erabilera orokorreko bat."; -"Scene.ServerPicker.SubtitleExtend" = "Aukeratu komunitate bat zure interes edo lurraldearen arabera, edo erabilera orokorreko bat. Komunitate bakoitza erakunde edo norbanako independente batek kudeatzen du."; +"Scene.ServerPicker.Subtitle" = "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers."; "Scene.ServerPicker.Title" = "Aukeratu zerbitzari bat, edozein zerbitzari."; "Scene.ServerRules.Button.Confirm" = "Ados nago"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/eu.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/eu.lproj/Localizable.stringsdict index 0159a7da9..057ca4010 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/eu.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/eu.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld karaktere + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/fi.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/fi.lproj/Localizable.strings index fbf48fa83..7902fb6eb 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/fi.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/fi.lproj/Localizable.strings @@ -55,8 +55,8 @@ Tarkista internet-yhteytesi."; "Common.Controls.Actions.Share" = "Jaa"; "Common.Controls.Actions.SharePost" = "Jaa julkaisu"; "Common.Controls.Actions.ShareUser" = "Jaa %@"; -"Common.Controls.Actions.SignIn" = "Kirjaudu sisään"; -"Common.Controls.Actions.SignUp" = "Rekisteröidy"; +"Common.Controls.Actions.SignIn" = "Log in"; +"Common.Controls.Actions.SignUp" = "Create account"; "Common.Controls.Actions.Skip" = "Ohita"; "Common.Controls.Actions.TakePhoto" = "Ota kuva"; "Common.Controls.Actions.TryAgain" = "Yritä uudelleen"; @@ -108,6 +108,10 @@ Tarkista internet-yhteytesi."; "Common.Controls.Status.Actions.Unreblog" = "Peru edelleen jako"; "Common.Controls.Status.ContentWarning" = "Sisältövaroitus"; "Common.Controls.Status.MediaContentWarning" = "Napauta mistä tahansa paljastaaksesi"; +"Common.Controls.Status.MetaEntity.Email" = "Email address: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Hashtag: %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Show Profile: %@"; +"Common.Controls.Status.MetaEntity.Url" = "Link: %@"; "Common.Controls.Status.Poll.Closed" = "Suljettu"; "Common.Controls.Status.Poll.Vote" = "Vote"; "Common.Controls.Status.SensitiveContent" = "Sensitive Content"; @@ -157,13 +161,21 @@ Profiilisi näyttää tältä hänelle."; "Scene.Compose.Accessibility.CustomEmojiPicker" = "Mukautettu emojivalitsin"; "Scene.Compose.Accessibility.DisableContentWarning" = "Poista sisältövaroitus käytöstä"; "Scene.Compose.Accessibility.EnableContentWarning" = "Ota sisältövaroitus käyttöön"; +"Scene.Compose.Accessibility.PostOptions" = "Post Options"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "Julkaisun näkyvyysvalikko"; +"Scene.Compose.Accessibility.PostingAs" = "Posting as %@"; "Scene.Compose.Accessibility.RemovePoll" = "Poista kysely"; "Scene.Compose.Attachment.AttachmentBroken" = "This %@ is broken and can’t be uploaded to Mastodon."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "Attachment too large"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Can not recognize this media attachment"; +"Scene.Compose.Attachment.CompressingState" = "Compressing..."; "Scene.Compose.Attachment.DescriptionPhoto" = "Kuvaile kuva näkövammaisille..."; "Scene.Compose.Attachment.DescriptionVideo" = "Kuvaile video näkövammaisille..."; +"Scene.Compose.Attachment.LoadFailed" = "Load Failed"; "Scene.Compose.Attachment.Photo" = "kuva"; +"Scene.Compose.Attachment.ServerProcessingState" = "Server Processing..."; +"Scene.Compose.Attachment.UploadFailed" = "Upload Failed"; "Scene.Compose.Attachment.Video" = "video"; "Scene.Compose.AutoComplete.SpaceToAdd" = "Space to add"; "Scene.Compose.ComposeAction" = "Julkaise"; @@ -184,6 +196,8 @@ uploaded to Mastodon."; "Scene.Compose.Poll.OptionNumber" = "Vaihtoehto %ld"; "Scene.Compose.Poll.SevenDays" = "7 päivää"; "Scene.Compose.Poll.SixHours" = "6 tuntia"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "The poll has empty option"; +"Scene.Compose.Poll.ThePollIsInvalid" = "The poll is invalid"; "Scene.Compose.Poll.ThirtyMinutes" = "30 minuuttia"; "Scene.Compose.Poll.ThreeDays" = "3 päivää"; "Scene.Compose.ReplyingToUser" = "vastaamassa tilille %@"; @@ -226,6 +240,9 @@ uploaded to Mastodon."; "Scene.HomeTimeline.NavigationBarState.Published" = "Julkaistu!"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "Julkaistaan julkaisua..."; "Scene.HomeTimeline.Title" = "Koti"; +"Scene.Login.ServerSearchField.Placeholder" = "Enter URL or search for your server"; +"Scene.Login.Subtitle" = "Log you in on the server you created your account on."; +"Scene.Login.Title" = "Welcome back"; "Scene.Notification.FollowRequest.Accept" = "Accept"; "Scene.Notification.FollowRequest.Accepted" = "Accepted"; "Scene.Notification.FollowRequest.Reject" = "reject"; @@ -253,6 +270,8 @@ uploaded to Mastodon."; "Scene.Profile.Fields.AddRow" = "Lisää rivi"; "Scene.Profile.Fields.Placeholder.Content" = "Sisältö"; "Scene.Profile.Fields.Placeholder.Label" = "Nimi"; +"Scene.Profile.Fields.Verified.Long" = "Ownership of this link was checked on %@"; +"Scene.Profile.Fields.Verified.Short" = "Verified on %@"; "Scene.Profile.Header.FollowsYou" = "Follows You"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "Confirm to block %@"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "Block Account"; @@ -385,13 +404,11 @@ uploaded to Mastodon."; "Scene.ServerPicker.EmptyState.BadNetwork" = "Jokin meni pieleen dataa ladatessa. Tarkista internet-yhteytesi."; "Scene.ServerPicker.EmptyState.FindingServers" = "Etsistään saatavilla olevia palvelimia..."; "Scene.ServerPicker.EmptyState.NoResults" = "Ei hakutuloksia"; -"Scene.ServerPicker.Input.Placeholder" = "Etsi palvelin tai liity omaan..."; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Search servers or enter URL"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Search communities or enter URL"; "Scene.ServerPicker.Label.Category" = "KATEGORIA"; "Scene.ServerPicker.Label.Language" = "KIELI"; "Scene.ServerPicker.Label.Users" = "TILIÄ"; -"Scene.ServerPicker.Subtitle" = "Pick a server based on your interests, region, or a general purpose one."; -"Scene.ServerPicker.SubtitleExtend" = "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual."; +"Scene.ServerPicker.Subtitle" = "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers."; "Scene.ServerPicker.Title" = "Valitse palvelin, mikä tahansa palvelin."; "Scene.ServerRules.Button.Confirm" = "Hyväksyn"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/fi.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/fi.lproj/Localizable.stringsdict index 8048edf2d..ccfee35c9 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/fi.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/fi.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld merkkiä + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/fr.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/fr.lproj/Localizable.strings index 03efc3549..f393adec1 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/fr.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/fr.lproj/Localizable.strings @@ -108,6 +108,10 @@ Veuillez vérifier votre accès à Internet."; "Common.Controls.Status.Actions.Unreblog" = "Annuler le reblog"; "Common.Controls.Status.ContentWarning" = "Avertissement de contenu"; "Common.Controls.Status.MediaContentWarning" = "Tapotez n’importe où pour révéler la publication"; +"Common.Controls.Status.MetaEntity.Email" = "Adresse e-mail : %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Hashtag : %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Afficher le profile : %@"; +"Common.Controls.Status.MetaEntity.Url" = "Lien : %@"; "Common.Controls.Status.Poll.Closed" = "Fermé"; "Common.Controls.Status.Poll.Vote" = "Voter"; "Common.Controls.Status.SensitiveContent" = "Contenu sensible"; @@ -151,19 +155,27 @@ Votre profil ressemble à ça pour lui."; "Scene.AccountList.AddAccount" = "Ajouter un compte"; "Scene.AccountList.DismissAccountSwitcher" = "Rejeter le commutateur de compte"; "Scene.AccountList.TabBarHint" = "Profil sélectionné actuel: %@. Double appui puis maintenez enfoncé pour afficher le changement de compte"; -"Scene.Bookmark.Title" = "Bookmarks"; +"Scene.Bookmark.Title" = "Favoris"; "Scene.Compose.Accessibility.AppendAttachment" = "Joindre un document"; "Scene.Compose.Accessibility.AppendPoll" = "Ajouter un Sondage"; "Scene.Compose.Accessibility.CustomEmojiPicker" = "Sélecteur d’émojis personnalisés"; "Scene.Compose.Accessibility.DisableContentWarning" = "Désactiver l'avertissement de contenu"; "Scene.Compose.Accessibility.EnableContentWarning" = "Basculer l’avertissement de contenu"; +"Scene.Compose.Accessibility.PostOptions" = "Options de publication"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "Menu de Visibilité de la publication"; +"Scene.Compose.Accessibility.PostingAs" = "Publié en tant que %@"; "Scene.Compose.Accessibility.RemovePoll" = "Retirer le sondage"; "Scene.Compose.Attachment.AttachmentBroken" = "Ce %@ est brisé et ne peut pas être téléversé sur Mastodon."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "La pièce jointe est trop volumineuse"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Impossible de reconnaître cette pièce jointe"; +"Scene.Compose.Attachment.CompressingState" = "Compression..."; "Scene.Compose.Attachment.DescriptionPhoto" = "Décrire cette photo pour les personnes malvoyantes..."; "Scene.Compose.Attachment.DescriptionVideo" = "Décrire cette vidéo pour les personnes malvoyantes..."; +"Scene.Compose.Attachment.LoadFailed" = "Échec du chargement"; "Scene.Compose.Attachment.Photo" = "photo"; +"Scene.Compose.Attachment.ServerProcessingState" = "Traitement du serveur..."; +"Scene.Compose.Attachment.UploadFailed" = "Échec de l’envoi"; "Scene.Compose.Attachment.Video" = "vidéo"; "Scene.Compose.AutoComplete.SpaceToAdd" = "Espace à ajouter"; "Scene.Compose.ComposeAction" = "Publier"; @@ -184,6 +196,8 @@ téléversé sur Mastodon."; "Scene.Compose.Poll.OptionNumber" = "Option %ld"; "Scene.Compose.Poll.SevenDays" = "7 jour"; "Scene.Compose.Poll.SixHours" = "6 Heures"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "Le sondage n'a pas d'options"; +"Scene.Compose.Poll.ThePollIsInvalid" = "Le sondage est invalide"; "Scene.Compose.Poll.ThirtyMinutes" = "30 minutes"; "Scene.Compose.Poll.ThreeDays" = "3 jour"; "Scene.Compose.ReplyingToUser" = "répondre à %@"; @@ -226,6 +240,9 @@ téléversé sur Mastodon."; "Scene.HomeTimeline.NavigationBarState.Published" = "Publié!"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "Publication en cours ..."; "Scene.HomeTimeline.Title" = "Accueil"; +"Scene.Login.ServerSearchField.Placeholder" = "Entrez l'URL ou recherchez votre serveur"; +"Scene.Login.Subtitle" = "Connectez-vous sur le serveur sur lequel vous avez créé votre compte."; +"Scene.Login.Title" = "Content de vous revoir"; "Scene.Notification.FollowRequest.Accept" = "Accepter"; "Scene.Notification.FollowRequest.Accepted" = "Accepté"; "Scene.Notification.FollowRequest.Reject" = "rejeter"; @@ -253,6 +270,8 @@ téléversé sur Mastodon."; "Scene.Profile.Fields.AddRow" = "Ajouter une rangée"; "Scene.Profile.Fields.Placeholder.Content" = "Contenu"; "Scene.Profile.Fields.Placeholder.Label" = "Étiquette"; +"Scene.Profile.Fields.Verified.Long" = "La propriété de ce lien a été vérifiée le %@"; +"Scene.Profile.Fields.Verified.Short" = "Vérifié le %@"; "Scene.Profile.Header.FollowsYou" = "Vous suit"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "Confirmer le blocage de %@"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "Bloquer le compte"; @@ -385,13 +404,11 @@ téléversé sur Mastodon."; "Scene.ServerPicker.EmptyState.BadNetwork" = "Une erreur s'est produite lors du chargement des données. Vérifiez votre connexion Internet."; "Scene.ServerPicker.EmptyState.FindingServers" = "Recherche des serveurs disponibles..."; "Scene.ServerPicker.EmptyState.NoResults" = "Aucun résultat"; -"Scene.ServerPicker.Input.Placeholder" = "Trouvez un serveur ou rejoignez le vôtre..."; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Rechercher des serveurs ou entrer une URL"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Rechercher parmi les communautés ou renseigner une URL"; "Scene.ServerPicker.Label.Category" = "CATÉGORIE"; "Scene.ServerPicker.Label.Language" = "LANGUE"; "Scene.ServerPicker.Label.Users" = "UTILISATEUR·RICE·S"; -"Scene.ServerPicker.Subtitle" = "Choisissez une communauté en fonction de vos intérêts, de votre région ou de votre objectif général."; -"Scene.ServerPicker.SubtitleExtend" = "Choisissez une communauté basée sur vos intérêts, votre région ou un but général. Chaque communauté est gérée par une organisation ou un individu entièrement indépendant."; +"Scene.ServerPicker.Subtitle" = "Choisissez un serveur basé sur votre région, vos intérêts ou un généraliste. Vous pouvez toujours discuter avec n'importe qui sur Mastodon, indépendamment de vos serveurs."; "Scene.ServerPicker.Title" = "Choisissez un serveur, n'importe quel serveur."; "Scene.ServerRules.Button.Confirm" = "J’accepte"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/fr.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/fr.lproj/Localizable.stringsdict index d9d860a47..4eb068697 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/fr.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/fr.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld caractères + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ restants + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 caractère + other + %ld caractères + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/gd.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/gd.lproj/Localizable.strings index 2d1964d81..6ccf6cf15 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/gd.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/gd.lproj/Localizable.strings @@ -56,7 +56,7 @@ Thoir sùil air a’ cheangal agad ris an eadar-lìon."; "Common.Controls.Actions.SharePost" = "Co-roinn am post"; "Common.Controls.Actions.ShareUser" = "Co-roinn %@"; "Common.Controls.Actions.SignIn" = "Clàraich a-steach"; -"Common.Controls.Actions.SignUp" = "Clàraich leinn"; +"Common.Controls.Actions.SignUp" = "Cruthaich cunntas"; "Common.Controls.Actions.Skip" = "Leum thairis air"; "Common.Controls.Actions.TakePhoto" = "Tog dealbh"; "Common.Controls.Actions.TryAgain" = "Feuch ris a-rithist"; @@ -68,13 +68,13 @@ Thoir sùil air a’ cheangal agad ris an eadar-lìon."; "Common.Controls.Friendship.EditInfo" = "Deasaich"; "Common.Controls.Friendship.Follow" = "Lean"; "Common.Controls.Friendship.Following" = "’Ga leantainn"; -"Common.Controls.Friendship.HideReblogs" = "Hide Reblogs"; +"Common.Controls.Friendship.HideReblogs" = "Falaich na brosnachaidhean"; "Common.Controls.Friendship.Mute" = "Mùch"; "Common.Controls.Friendship.MuteUser" = "Mùch %@"; "Common.Controls.Friendship.Muted" = "’Ga mhùchadh"; "Common.Controls.Friendship.Pending" = "Ri dhèiligeadh"; "Common.Controls.Friendship.Request" = "Iarrtas"; -"Common.Controls.Friendship.ShowReblogs" = "Show Reblogs"; +"Common.Controls.Friendship.ShowReblogs" = "Seall na brosnachaidhean"; "Common.Controls.Friendship.Unblock" = "Dì-bhac"; "Common.Controls.Friendship.UnblockUser" = "Dì-bhac %@"; "Common.Controls.Friendship.Unmute" = "Dì-mhùch"; @@ -108,6 +108,10 @@ Thoir sùil air a’ cheangal agad ris an eadar-lìon."; "Common.Controls.Status.Actions.Unreblog" = "Na brosnaich tuilleadh"; "Common.Controls.Status.ContentWarning" = "Rabhadh susbainte"; "Common.Controls.Status.MediaContentWarning" = "Thoir gnogag àite sam bith gus a nochdadh"; +"Common.Controls.Status.MetaEntity.Email" = "Seòladh puist-d: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Taga hais: %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Seall a’ phròifil: %@"; +"Common.Controls.Status.MetaEntity.Url" = "Ceangal: %@"; "Common.Controls.Status.Poll.Closed" = "Dùinte"; "Common.Controls.Status.Poll.Vote" = "Cuir bhòt"; "Common.Controls.Status.SensitiveContent" = "Susbaint fhrionasach"; @@ -151,19 +155,27 @@ Seo an coltas a th’ air a’ phròifil agad dhaibh-san."; "Scene.AccountList.AddAccount" = "Cuir cunntas ris"; "Scene.AccountList.DismissAccountSwitcher" = "Leig seachad taghadh a’ chunntais"; "Scene.AccountList.TabBarHint" = "A’ phròifil air a taghadh: %@. Thoir gnogag dhùbailte is cùm sìos a ghearradh leum gu cunntas eile"; -"Scene.Bookmark.Title" = "Bookmarks"; +"Scene.Bookmark.Title" = "Comharran-lìn"; "Scene.Compose.Accessibility.AppendAttachment" = "Cuir ceanglachan ris"; "Scene.Compose.Accessibility.AppendPoll" = "Cuir cunntas-bheachd ris"; "Scene.Compose.Accessibility.CustomEmojiPicker" = "Roghnaichear nan Emoji gnàthaichte"; "Scene.Compose.Accessibility.DisableContentWarning" = "Cuir rabhadh susbainte à comas"; "Scene.Compose.Accessibility.EnableContentWarning" = "Cuir rabhadh susbainte an comas"; +"Scene.Compose.Accessibility.PostOptions" = "Roghainnean postaidh"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "Clàr-taice faicsinneachd a’ phuist"; +"Scene.Compose.Accessibility.PostingAs" = "A’ postadh mar %@"; "Scene.Compose.Accessibility.RemovePoll" = "Thoir air falbh an cunntas-bheachd"; "Scene.Compose.Attachment.AttachmentBroken" = "Seo %@ a tha briste is cha ghabh a luchdadh suas gu Mastodon."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "Tha an ceanglachan ro mhòr"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Cha do dh’aithnich sinn an ceanglachan meadhain seo"; +"Scene.Compose.Attachment.CompressingState" = "’Ga dhùmhlachadh…"; "Scene.Compose.Attachment.DescriptionPhoto" = "Mìnich an dealbh dhan fheadhainn air a bheil cion-lèirsinne…"; "Scene.Compose.Attachment.DescriptionVideo" = "Mìnich a’ video dhan fheadhainn air a bheil cion-lèirsinne…"; +"Scene.Compose.Attachment.LoadFailed" = "Dh’fhàillig leis an luchdadh"; "Scene.Compose.Attachment.Photo" = "dealbh"; +"Scene.Compose.Attachment.ServerProcessingState" = "Tha am frithealaiche ’ga phròiseasadh…"; +"Scene.Compose.Attachment.UploadFailed" = "Dh’fhàillig leis an luchdadh suas"; "Scene.Compose.Attachment.Video" = "video"; "Scene.Compose.AutoComplete.SpaceToAdd" = "Brùth air Space gus a chur ris"; "Scene.Compose.ComposeAction" = "Foillsich"; @@ -184,6 +196,8 @@ a luchdadh suas gu Mastodon."; "Scene.Compose.Poll.OptionNumber" = "Roghainn %ld"; "Scene.Compose.Poll.SevenDays" = "Seachdain"; "Scene.Compose.Poll.SixHours" = "6 uairean a thìde"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "Tha roghainn fhalamh aig a’ chunntas-bheachd"; +"Scene.Compose.Poll.ThePollIsInvalid" = "Tha an cunntas-bheachd mì-dhligheach"; "Scene.Compose.Poll.ThirtyMinutes" = "Leth-uair a thìde"; "Scene.Compose.Poll.ThreeDays" = "3 làithean"; "Scene.Compose.ReplyingToUser" = "a’ freagairt gu %@"; @@ -226,6 +240,9 @@ a luchdadh suas gu Mastodon."; "Scene.HomeTimeline.NavigationBarState.Published" = "Chaidh fhoillseachadh!"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "A’ foillseachadh a’ phuist…"; "Scene.HomeTimeline.Title" = "Dachaigh"; +"Scene.Login.ServerSearchField.Placeholder" = "Cuir a-steach URL an fhrithealaiche agad"; +"Scene.Login.Subtitle" = "Clàraich a-steach air an fhrithealaiche far an do chruthaich thu an cunntas agad."; +"Scene.Login.Title" = "Fàilte air ais"; "Scene.Notification.FollowRequest.Accept" = "Gabh ris"; "Scene.Notification.FollowRequest.Accepted" = "Air a ghabhail ris"; "Scene.Notification.FollowRequest.Reject" = "diùlt"; @@ -253,15 +270,17 @@ a luchdadh suas gu Mastodon."; "Scene.Profile.Fields.AddRow" = "Cuir ràgh ris"; "Scene.Profile.Fields.Placeholder.Content" = "Susbaint"; "Scene.Profile.Fields.Placeholder.Label" = "Leubail"; +"Scene.Profile.Fields.Verified.Long" = "Chaidh dearbhadh cò leis a tha an ceangal seo %@"; +"Scene.Profile.Fields.Verified.Short" = "Air a dhearbhadh %@"; "Scene.Profile.Header.FollowsYou" = "’Gad leantainn"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "Dearbh bacadh %@"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "Bac an cunntas"; -"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Message" = "Confirm to hide reblogs"; -"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Title" = "Hide Reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Message" = "Dearbh falach nam brosnachaidhean"; +"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Title" = "Falaich na brosnachaidhean"; "Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Message" = "Dearbh mùchadh %@"; "Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Title" = "Mùch an cunntas"; -"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message" = "Confirm to show reblogs"; -"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Title" = "Show Reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message" = "Dearbh sealladh nam brosnachaidhean"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Title" = "Seall na brosnachaidhean"; "Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Message" = "Dearbh dì-bhacadh %@"; "Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Title" = "Dì-bhac an cunntas"; "Scene.Profile.RelationshipActionAlert.ConfirmUnmuteUser.Message" = "Dearbh dì-mhùchadh %@"; @@ -385,13 +404,11 @@ a luchdadh suas gu Mastodon."; "Scene.ServerPicker.EmptyState.BadNetwork" = "Chaidh rudeigin ceàrr le luchdadh an dàta. Thoir sùil air a’ cheangal agad ris an eadar-lìon."; "Scene.ServerPicker.EmptyState.FindingServers" = "A’ lorg nam frithealaichean ri am faighinn…"; "Scene.ServerPicker.EmptyState.NoResults" = "Gun toradh"; -"Scene.ServerPicker.Input.Placeholder" = "Lorg frithealaiche"; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Lorg frithealaiche no cuir a-steach URL"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Lorg coimhearsnachd no cuir a-steach URL"; "Scene.ServerPicker.Label.Category" = "ROINN-SEÒRSA"; "Scene.ServerPicker.Label.Language" = "CÀNAN"; "Scene.ServerPicker.Label.Users" = "CLEACHDAICHEAN"; -"Scene.ServerPicker.Subtitle" = "Tagh frithealaiche stèidhichte air d’ ùidhean, air far a bheil thu no fear coitcheann."; -"Scene.ServerPicker.SubtitleExtend" = "Tagh frithealaiche stèidhichte air d’ ùidhean, air far a bheil thu no fear coitcheann. Tha gach frithealaiche fo stiùireadh buidhinn no neach neo-eisimeilich fa leth."; +"Scene.ServerPicker.Subtitle" = "Tagh frithealaiche stèidhichte air na sgìre agad, d’ ùidhean, air far a bheil thu no fear coitcheann. ’S urrainn dhut fhathast conaltradh le duine sam bith air Mastodon ge b’ e na frithealaichean agaibh-se."; "Scene.ServerPicker.Title" = "Tha cleachdaichean Mhastodon air iomadh frithealaiche eadar-dhealaichte."; "Scene.ServerRules.Button.Confirm" = "Gabhaidh mi ris"; "Scene.ServerRules.PrivacyPolicy" = "poileasaidh prìobhaideachd"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/gd.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/gd.lproj/Localizable.stringsdict index d0ccb5f41..9b3e69ea7 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/gd.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/gd.lproj/Localizable.stringsdict @@ -62,6 +62,26 @@ %ld caractar + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ air fhàgail + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + %ld charactar + two + %ld charactar + few + %ld caractaran + other + %ld caractar + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/gl.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/gl.lproj/Localizable.strings index c76089221..f9e1c6589 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/gl.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/gl.lproj/Localizable.strings @@ -56,7 +56,7 @@ Comproba a conexión a internet."; "Common.Controls.Actions.SharePost" = "Compartir publicación"; "Common.Controls.Actions.ShareUser" = "Compartir %@"; "Common.Controls.Actions.SignIn" = "Acceder"; -"Common.Controls.Actions.SignUp" = "Inscribirse"; +"Common.Controls.Actions.SignUp" = "Crear conta"; "Common.Controls.Actions.Skip" = "Omitir"; "Common.Controls.Actions.TakePhoto" = "Facer foto"; "Common.Controls.Actions.TryAgain" = "Intentar de novo"; @@ -68,13 +68,13 @@ Comproba a conexión a internet."; "Common.Controls.Friendship.EditInfo" = "Editar info"; "Common.Controls.Friendship.Follow" = "Seguir"; "Common.Controls.Friendship.Following" = "Seguindo"; -"Common.Controls.Friendship.HideReblogs" = "Hide Reblogs"; +"Common.Controls.Friendship.HideReblogs" = "Agochar Promocións"; "Common.Controls.Friendship.Mute" = "Acalar"; "Common.Controls.Friendship.MuteUser" = "Acalar a %@"; "Common.Controls.Friendship.Muted" = "Acalada"; "Common.Controls.Friendship.Pending" = "Pendente"; "Common.Controls.Friendship.Request" = "Solicitar"; -"Common.Controls.Friendship.ShowReblogs" = "Show Reblogs"; +"Common.Controls.Friendship.ShowReblogs" = "Mostrar Promocións"; "Common.Controls.Friendship.Unblock" = "Desbloquear"; "Common.Controls.Friendship.UnblockUser" = "Desbloquear a %@"; "Common.Controls.Friendship.Unmute" = "Non Acalar"; @@ -108,6 +108,10 @@ Comproba a conexión a internet."; "Common.Controls.Status.Actions.Unreblog" = "Retirar promoción"; "Common.Controls.Status.ContentWarning" = "Aviso sobre o contido"; "Common.Controls.Status.MediaContentWarning" = "Toca nalgures para mostrar"; +"Common.Controls.Status.MetaEntity.Email" = "Enderezo de email: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Cancelo: %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Mostrar Perfil: %@"; +"Common.Controls.Status.MetaEntity.Url" = "Ligazón: %@"; "Common.Controls.Status.Poll.Closed" = "Pechada"; "Common.Controls.Status.Poll.Vote" = "Votar"; "Common.Controls.Status.SensitiveContent" = "Contido sensible"; @@ -151,19 +155,27 @@ Así se ve o teu perfil."; "Scene.AccountList.AddAccount" = "Engadir conta"; "Scene.AccountList.DismissAccountSwitcher" = "Desbotar intercambiador de contas"; "Scene.AccountList.TabBarHint" = "Perfil seleccionado: %@. Dobre toque e manter para mostrar o intercambiador de contas"; -"Scene.Bookmark.Title" = "Bookmarks"; +"Scene.Bookmark.Title" = "Marcadores"; "Scene.Compose.Accessibility.AppendAttachment" = "Engadir anexo"; "Scene.Compose.Accessibility.AppendPoll" = "Engadir enquisa"; "Scene.Compose.Accessibility.CustomEmojiPicker" = "Selector emoji personalizado"; "Scene.Compose.Accessibility.DisableContentWarning" = "Retirar Aviso sobre o contido"; "Scene.Compose.Accessibility.EnableContentWarning" = "Marcar con Aviso sobre o contido"; +"Scene.Compose.Accessibility.PostOptions" = "Opcións da publicación"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "Visibilidade da publicación"; +"Scene.Compose.Accessibility.PostingAs" = "Publicando como %@"; "Scene.Compose.Accessibility.RemovePoll" = "Eliminar enquisa"; "Scene.Compose.Attachment.AttachmentBroken" = "Este %@ está estragado e non pode ser subido a Mastodon."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "Adxunto demasiado grande"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Non se recoñece o tipo de multimedia"; +"Scene.Compose.Attachment.CompressingState" = "Comprimindo..."; "Scene.Compose.Attachment.DescriptionPhoto" = "Describe a foto para persoas con problemas visuais..."; "Scene.Compose.Attachment.DescriptionVideo" = "Describe o vídeo para persoas con problemas visuais..."; +"Scene.Compose.Attachment.LoadFailed" = "Fallou a carga"; "Scene.Compose.Attachment.Photo" = "foto"; +"Scene.Compose.Attachment.ServerProcessingState" = "Procesando no servidor..."; +"Scene.Compose.Attachment.UploadFailed" = "Erro na subida"; "Scene.Compose.Attachment.Video" = "vídeo"; "Scene.Compose.AutoComplete.SpaceToAdd" = "Barra de espazo engade"; "Scene.Compose.ComposeAction" = "Publicar"; @@ -184,6 +196,8 @@ ser subido a Mastodon."; "Scene.Compose.Poll.OptionNumber" = "Opción %ld"; "Scene.Compose.Poll.SevenDays" = "7 Días"; "Scene.Compose.Poll.SixHours" = "6 Horas"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "A enquisa ten unha opción baleira"; +"Scene.Compose.Poll.ThePollIsInvalid" = "A enquisa non é válida"; "Scene.Compose.Poll.ThirtyMinutes" = "30 minutos"; "Scene.Compose.Poll.ThreeDays" = "3 Días"; "Scene.Compose.ReplyingToUser" = "en resposta a %@"; @@ -226,6 +240,9 @@ ser subido a Mastodon."; "Scene.HomeTimeline.NavigationBarState.Published" = "Publicado!"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "Publicando..."; "Scene.HomeTimeline.Title" = "Inicio"; +"Scene.Login.ServerSearchField.Placeholder" = "Escribe o URL ou busca o teu servidor"; +"Scene.Login.Subtitle" = "Conéctate ao servidor no que creaches a conta."; +"Scene.Login.Title" = "Benvido outra vez"; "Scene.Notification.FollowRequest.Accept" = "Aceptar"; "Scene.Notification.FollowRequest.Accepted" = "Aceptada"; "Scene.Notification.FollowRequest.Reject" = "rexeitar"; @@ -253,15 +270,17 @@ ser subido a Mastodon."; "Scene.Profile.Fields.AddRow" = "Engadir fila"; "Scene.Profile.Fields.Placeholder.Content" = "Contido"; "Scene.Profile.Fields.Placeholder.Label" = "Etiqueta"; +"Scene.Profile.Fields.Verified.Long" = "A propiedade desta ligazón foi verificada o %@"; +"Scene.Profile.Fields.Verified.Short" = "Verificada en %@"; "Scene.Profile.Header.FollowsYou" = "Séguete"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "Confirma o bloqueo de %@"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "Bloquear Conta"; -"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Message" = "Confirm to hide reblogs"; -"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Title" = "Hide Reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Message" = "Confirma para agochar promocións"; +"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Title" = "Agochar Promocións"; "Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Message" = "Confirma Acalar a %@"; "Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Title" = "Acalar conta"; -"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message" = "Confirm to show reblogs"; -"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Title" = "Show Reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message" = "Confirma para ver promocións"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Title" = "Mostrar Promocións"; "Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Message" = "Confirma o desbloqueo de %@"; "Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Title" = "Desbloquear Conta"; "Scene.Profile.RelationshipActionAlert.ConfirmUnmuteUser.Message" = "Confirma restablecer a %@"; @@ -385,13 +404,11 @@ ser subido a Mastodon."; "Scene.ServerPicker.EmptyState.BadNetwork" = "Algo fallou ao cargar os datos. Comproba a conexión a internet."; "Scene.ServerPicker.EmptyState.FindingServers" = "Buscando servidores dispoñibles..."; "Scene.ServerPicker.EmptyState.NoResults" = "Sen resultados"; -"Scene.ServerPicker.Input.Placeholder" = "Buscar comunidades"; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Busca un servidor ou escribe URL"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Busca comunidades ou escribe URL"; "Scene.ServerPicker.Label.Category" = "CATEGORÍA"; "Scene.ServerPicker.Label.Language" = "IDIOMA"; "Scene.ServerPicker.Label.Users" = "USUARIAS"; -"Scene.ServerPicker.Subtitle" = "Elixe unha comunidade en función dos teus intereses, rexión ou unha de propósito xeral."; -"Scene.ServerPicker.SubtitleExtend" = "Elixe unha comunidade en función dos teus intereses, rexión ou unha de propósito xeral. Cada comunidade está xestionada por unha organización totalmente independente ou unha única persoa."; +"Scene.ServerPicker.Subtitle" = "Elixe un servidor en función dos teus intereses, rexión o un de propósito xeral. Poderás conversar con calquera en Mastodon, independentemente do servidor que elixas."; "Scene.ServerPicker.Title" = "Mastodon fórmano as persoas das diferentes comunidades."; "Scene.ServerRules.Button.Confirm" = "Acepto"; "Scene.ServerRules.PrivacyPolicy" = "polícica de privacidade"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/gl.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/gl.lproj/Localizable.stringsdict index ff9d87c18..51b146ed4 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/gl.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/gl.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld caracteres + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ restantes + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 caracter + other + %ld caracteres + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/it.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/it.lproj/Localizable.strings index c83cb7458..fab67c38d 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/it.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/it.lproj/Localizable.strings @@ -56,7 +56,7 @@ Per favore verifica la tua connessione internet."; "Common.Controls.Actions.SharePost" = "Condividi il post"; "Common.Controls.Actions.ShareUser" = "Condividi %@"; "Common.Controls.Actions.SignIn" = "Accedi"; -"Common.Controls.Actions.SignUp" = "Registrati"; +"Common.Controls.Actions.SignUp" = "Crea un account"; "Common.Controls.Actions.Skip" = "Salta"; "Common.Controls.Actions.TakePhoto" = "Scatta foto"; "Common.Controls.Actions.TryAgain" = "Riprova"; @@ -108,6 +108,10 @@ Per favore verifica la tua connessione internet."; "Common.Controls.Status.Actions.Unreblog" = "Annulla condivisione"; "Common.Controls.Status.ContentWarning" = "Avviso sul contenuto"; "Common.Controls.Status.MediaContentWarning" = "Tocca ovunque per rivelare"; +"Common.Controls.Status.MetaEntity.Email" = "Indirizzo email: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Hashtag: %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Mostra il profilo: %@"; +"Common.Controls.Status.MetaEntity.Url" = "Collegamento: %@"; "Common.Controls.Status.Poll.Closed" = "Chiuso"; "Common.Controls.Status.Poll.Vote" = "Vota"; "Common.Controls.Status.SensitiveContent" = "Contenuto sensibile"; @@ -151,19 +155,27 @@ Il tuo profilo sembra questo per loro."; "Scene.AccountList.AddAccount" = "Aggiungi account"; "Scene.AccountList.DismissAccountSwitcher" = "Ignora il cambio account"; "Scene.AccountList.TabBarHint" = "Profilo corrente selezionato: %@. Doppio tocco e tieni premuto per mostrare il cambio account"; -"Scene.Bookmark.Title" = "Bookmarks"; +"Scene.Bookmark.Title" = "Segnalibri"; "Scene.Compose.Accessibility.AppendAttachment" = "Aggiungi allegato"; "Scene.Compose.Accessibility.AppendPoll" = "Aggiungi sondaggio"; "Scene.Compose.Accessibility.CustomEmojiPicker" = "Selettore Emoji personalizzato"; "Scene.Compose.Accessibility.DisableContentWarning" = "Disabilita avviso di contenuti"; "Scene.Compose.Accessibility.EnableContentWarning" = "Abilita avvertimento contenuti"; +"Scene.Compose.Accessibility.PostOptions" = "Opzioni del messaggio"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "Menu di visibilità del post"; +"Scene.Compose.Accessibility.PostingAs" = "Pubblicazione come %@"; "Scene.Compose.Accessibility.RemovePoll" = "Elimina sondaggio"; "Scene.Compose.Attachment.AttachmentBroken" = "Questo %@ è rotto e non può essere caricato su Mastodon."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "Allegato troppo grande"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Impossibile riconoscere questo allegato multimediale"; +"Scene.Compose.Attachment.CompressingState" = "Compressione in corso..."; "Scene.Compose.Attachment.DescriptionPhoto" = "Descrivi la foto per gli utenti ipovedenti..."; "Scene.Compose.Attachment.DescriptionVideo" = "Descrivi il filmato per gli utenti ipovedenti..."; +"Scene.Compose.Attachment.LoadFailed" = "Caricamento fallito"; "Scene.Compose.Attachment.Photo" = "foto"; +"Scene.Compose.Attachment.ServerProcessingState" = "Elaborazione del server in corso..."; +"Scene.Compose.Attachment.UploadFailed" = "Caricamento fallito"; "Scene.Compose.Attachment.Video" = "filmato"; "Scene.Compose.AutoComplete.SpaceToAdd" = "Spazio da aggiungere"; "Scene.Compose.ComposeAction" = "Pubblica"; @@ -184,6 +196,8 @@ caricato su Mastodon."; "Scene.Compose.Poll.OptionNumber" = "Opzione %ld"; "Scene.Compose.Poll.SevenDays" = "7 giorni"; "Scene.Compose.Poll.SixHours" = "6 ore"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "Il sondaggio ha un'opzione vuota"; +"Scene.Compose.Poll.ThePollIsInvalid" = "Il sondaggio non è valido"; "Scene.Compose.Poll.ThirtyMinutes" = "30 minuti"; "Scene.Compose.Poll.ThreeDays" = "3 giorni"; "Scene.Compose.ReplyingToUser" = "rispondendo a %@"; @@ -226,6 +240,9 @@ caricato su Mastodon."; "Scene.HomeTimeline.NavigationBarState.Published" = "Pubblicato!"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "Pubblicazione post..."; "Scene.HomeTimeline.Title" = "Inizio"; +"Scene.Login.ServerSearchField.Placeholder" = "Inserisci l'URL o cerca il tuo server"; +"Scene.Login.Subtitle" = "Accedi al server sul quale hai creato il tuo account."; +"Scene.Login.Title" = "Bentornato/a"; "Scene.Notification.FollowRequest.Accept" = "Accetta"; "Scene.Notification.FollowRequest.Accepted" = "Richiesta accettata"; "Scene.Notification.FollowRequest.Reject" = "rifiuta"; @@ -253,6 +270,8 @@ caricato su Mastodon."; "Scene.Profile.Fields.AddRow" = "Aggiungi riga"; "Scene.Profile.Fields.Placeholder.Content" = "Contenuto"; "Scene.Profile.Fields.Placeholder.Label" = "Etichetta"; +"Scene.Profile.Fields.Verified.Long" = "La proprietà di questo collegamento è stata verificata il %@"; +"Scene.Profile.Fields.Verified.Short" = "Verificato il %@"; "Scene.Profile.Header.FollowsYou" = "Ti segue"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "Confermi di bloccare %@"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "Blocca account"; @@ -385,13 +404,11 @@ caricato su Mastodon."; "Scene.ServerPicker.EmptyState.BadNetwork" = "Qualcosa è andato storto durante il caricamento dei dati. Controlla la tua connessione internet."; "Scene.ServerPicker.EmptyState.FindingServers" = "Ricerca server disponibili..."; "Scene.ServerPicker.EmptyState.NoResults" = "Nessun risultato"; -"Scene.ServerPicker.Input.Placeholder" = "Cerca comunità"; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Cerca i server o inserisci l'URL"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Cerca le comunità o inserisci l'URL"; "Scene.ServerPicker.Label.Category" = "CATEGORIA"; "Scene.ServerPicker.Label.Language" = "LINGUA"; "Scene.ServerPicker.Label.Users" = "UTENTI"; -"Scene.ServerPicker.Subtitle" = "Scegli una comunità basata sui tuoi interessi, regione o uno scopo generale."; -"Scene.ServerPicker.SubtitleExtend" = "Scegli una comunità basata sui tuoi interessi, regione o uno scopo generale. Ogni comunità è gestita da un'organizzazione completamente indipendente o individuale."; +"Scene.ServerPicker.Subtitle" = "Scegli un server in base alla tua regione, ai tuoi interessi o uno generico. Puoi comunque chattare con chiunque su Mastodon, indipendentemente dai tuoi server."; "Scene.ServerPicker.Title" = "Mastodon è fatto di utenti in diverse comunità."; "Scene.ServerRules.Button.Confirm" = "Accetto"; "Scene.ServerRules.PrivacyPolicy" = "privacy policy"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/it.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/it.lproj/Localizable.stringsdict index 38f986521..3a8549914 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/it.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/it.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld caratteri + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ rimanenti + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 carattere + other + %ld caratteri + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/ja.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/ja.lproj/Localizable.strings index 080624f06..01701dfc2 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/ja.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/ja.lproj/Localizable.strings @@ -55,8 +55,8 @@ "Common.Controls.Actions.Share" = "共有"; "Common.Controls.Actions.SharePost" = "投稿を共有"; "Common.Controls.Actions.ShareUser" = "%@を共有"; -"Common.Controls.Actions.SignIn" = "サインイン"; -"Common.Controls.Actions.SignUp" = "サインアップ"; +"Common.Controls.Actions.SignIn" = "Log in"; +"Common.Controls.Actions.SignUp" = "Create account"; "Common.Controls.Actions.Skip" = "スキップ"; "Common.Controls.Actions.TakePhoto" = "写真を撮る"; "Common.Controls.Actions.TryAgain" = "再実行"; @@ -108,6 +108,10 @@ "Common.Controls.Status.Actions.Unreblog" = "ブーストを戻す"; "Common.Controls.Status.ContentWarning" = "コンテンツ警告"; "Common.Controls.Status.MediaContentWarning" = "どこかをタップして表示"; +"Common.Controls.Status.MetaEntity.Email" = "Email address: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Hashtag: %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Show Profile: %@"; +"Common.Controls.Status.MetaEntity.Url" = "Link: %@"; "Common.Controls.Status.Poll.Closed" = "終了"; "Common.Controls.Status.Poll.Vote" = "投票"; "Common.Controls.Status.SensitiveContent" = "閲覧注意"; @@ -153,12 +157,20 @@ "Scene.Compose.Accessibility.CustomEmojiPicker" = "カスタム絵文字ピッカー"; "Scene.Compose.Accessibility.DisableContentWarning" = "閲覧注意を無効にする"; "Scene.Compose.Accessibility.EnableContentWarning" = "閲覧注意を有効にする"; +"Scene.Compose.Accessibility.PostOptions" = "Post Options"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "投稿の表示メニュー"; +"Scene.Compose.Accessibility.PostingAs" = "Posting as %@"; "Scene.Compose.Accessibility.RemovePoll" = "投票を消去"; "Scene.Compose.Attachment.AttachmentBroken" = "%@は壊れていてMastodonにアップロードできません。"; +"Scene.Compose.Attachment.AttachmentTooLarge" = "Attachment too large"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Can not recognize this media attachment"; +"Scene.Compose.Attachment.CompressingState" = "Compressing..."; "Scene.Compose.Attachment.DescriptionPhoto" = "閲覧が難しいユーザーへの画像説明"; "Scene.Compose.Attachment.DescriptionVideo" = "閲覧が難しいユーザーへの映像説明"; +"Scene.Compose.Attachment.LoadFailed" = "Load Failed"; "Scene.Compose.Attachment.Photo" = "写真"; +"Scene.Compose.Attachment.ServerProcessingState" = "Server Processing..."; +"Scene.Compose.Attachment.UploadFailed" = "Upload Failed"; "Scene.Compose.Attachment.Video" = "動画"; "Scene.Compose.AutoComplete.SpaceToAdd" = "スペースを追加"; "Scene.Compose.ComposeAction" = "投稿"; @@ -179,6 +191,8 @@ "Scene.Compose.Poll.OptionNumber" = "オプション %ld"; "Scene.Compose.Poll.SevenDays" = "7日"; "Scene.Compose.Poll.SixHours" = "6時間"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "The poll has empty option"; +"Scene.Compose.Poll.ThePollIsInvalid" = "The poll is invalid"; "Scene.Compose.Poll.ThirtyMinutes" = "30分"; "Scene.Compose.Poll.ThreeDays" = "3日"; "Scene.Compose.ReplyingToUser" = "%@に返信"; @@ -221,6 +235,9 @@ "Scene.HomeTimeline.NavigationBarState.Published" = "投稿しました!"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "投稿中..."; "Scene.HomeTimeline.Title" = "ホーム"; +"Scene.Login.ServerSearchField.Placeholder" = "Enter URL or search for your server"; +"Scene.Login.Subtitle" = "Log you in on the server you created your account on."; +"Scene.Login.Title" = "Welcome back"; "Scene.Notification.FollowRequest.Accept" = "承認"; "Scene.Notification.FollowRequest.Accepted" = "承諾済み"; "Scene.Notification.FollowRequest.Reject" = "拒否"; @@ -248,6 +265,8 @@ "Scene.Profile.Fields.AddRow" = "行追加"; "Scene.Profile.Fields.Placeholder.Content" = "コンテンツ"; "Scene.Profile.Fields.Placeholder.Label" = "ラベル"; +"Scene.Profile.Fields.Verified.Long" = "Ownership of this link was checked on %@"; +"Scene.Profile.Fields.Verified.Short" = "Verified on %@"; "Scene.Profile.Header.FollowsYou" = "フォローされています"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "%@をブロックしますか？"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "アカウントをブロック"; @@ -380,13 +399,11 @@ "Scene.ServerPicker.EmptyState.BadNetwork" = "データの読み込み中に何か問題が発生しました。インターネットの接続状況を確認してください。"; "Scene.ServerPicker.EmptyState.FindingServers" = "利用可能なサーバーの検索..."; "Scene.ServerPicker.EmptyState.NoResults" = "なし"; -"Scene.ServerPicker.Input.Placeholder" = "サーバーを探す"; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "サーバーを検索またはURLを入力"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Search communities or enter URL"; "Scene.ServerPicker.Label.Category" = "カテゴリー"; "Scene.ServerPicker.Label.Language" = "言語"; "Scene.ServerPicker.Label.Users" = "ユーザー"; -"Scene.ServerPicker.Subtitle" = "あなたの興味分野・地域に合ったコミュニティや、汎用のものを選択してください。"; -"Scene.ServerPicker.SubtitleExtend" = "あなたの興味分野・地域に合ったコミュニティや、汎用のものを選択してください。各コミュニティはそれぞれ完全に独立した組織や個人によって運営されています。"; +"Scene.ServerPicker.Subtitle" = "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers."; "Scene.ServerPicker.Title" = "サーバーを選択"; "Scene.ServerRules.Button.Confirm" = "同意する"; "Scene.ServerRules.PrivacyPolicy" = "プライバシーポリシー"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/ja.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/ja.lproj/Localizable.stringsdict index cbc999738..795a971b7 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/ja.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/ja.lproj/Localizable.stringsdict @@ -44,6 +44,20 @@ %ld 文字 + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/kab.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/kab.lproj/Localizable.strings index 1339af4cf..781143b71 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/kab.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/kab.lproj/Localizable.strings @@ -56,7 +56,7 @@ Ma ulac aɣilif, senqed tuqqna-inek internet."; "Common.Controls.Actions.SharePost" = "Bḍu tasuffeɣt"; "Common.Controls.Actions.ShareUser" = "Bḍu %@"; "Common.Controls.Actions.SignIn" = "Qqen"; -"Common.Controls.Actions.SignUp" = "Jerred amiḍan"; +"Common.Controls.Actions.SignUp" = "Snulfu-d amiḍan"; "Common.Controls.Actions.Skip" = "Zgel"; "Common.Controls.Actions.TakePhoto" = "Ṭṭef tawlaft"; "Common.Controls.Actions.TryAgain" = "Ɛreḍ tikkelt-nniḍen"; @@ -108,6 +108,10 @@ Ma ulac aɣilif, senqed tuqqna-inek internet."; "Common.Controls.Status.Actions.Unreblog" = "Sefsex allus n usuffeɣ"; "Common.Controls.Status.ContentWarning" = "Alɣu n ugbur"; "Common.Controls.Status.MediaContentWarning" = "Sit anida tebɣiḍ i wakken ad twaliḍ"; +"Common.Controls.Status.MetaEntity.Email" = "Tansa imayl : %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Ahacṭag : %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Sken-d amaɣnu : %@"; +"Common.Controls.Status.MetaEntity.Url" = "Asaɣ : %@"; "Common.Controls.Status.Poll.Closed" = "Ifukk"; "Common.Controls.Status.Poll.Vote" = "Dɣeṛ"; "Common.Controls.Status.SensitiveContent" = "Agbur amḥulfu"; @@ -157,13 +161,21 @@ Akka i as-d-yettban umaɣnu-inek."; "Scene.Compose.Accessibility.CustomEmojiPicker" = "Amefran n yimujiten udmawanen"; "Scene.Compose.Accessibility.DisableContentWarning" = "Sens alɣu n ugbur"; "Scene.Compose.Accessibility.EnableContentWarning" = "Rmed alɣu n ugbur"; +"Scene.Compose.Accessibility.PostOptions" = "Post Options"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "Umuɣ n ubani n tsuffeɣt"; +"Scene.Compose.Accessibility.PostingAs" = "Posting as %@"; "Scene.Compose.Accessibility.RemovePoll" = "Kkes asenqed"; "Scene.Compose.Attachment.AttachmentBroken" = "%@-a yerreẓ, ur yezmir ara Ad d-yettwasali ɣef Mastodon."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "Attachment too large"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Can not recognize this media attachment"; +"Scene.Compose.Attachment.CompressingState" = "Compressing..."; "Scene.Compose.Attachment.DescriptionPhoto" = "Glem-d tawlaft i wid yesɛan ugur deg yiẓri..."; "Scene.Compose.Attachment.DescriptionVideo" = "Glem-d tavidyut i wid yesɛan ugur deg yiẓri..."; +"Scene.Compose.Attachment.LoadFailed" = "Load Failed"; "Scene.Compose.Attachment.Photo" = "tawlaft"; +"Scene.Compose.Attachment.ServerProcessingState" = "Server Processing..."; +"Scene.Compose.Attachment.UploadFailed" = "Upload Failed"; "Scene.Compose.Attachment.Video" = "tavidyutt"; "Scene.Compose.AutoComplete.SpaceToAdd" = "Tallunt ara yettwarnun"; "Scene.Compose.ComposeAction" = "Sufeɣ"; @@ -184,6 +196,8 @@ Ad d-yettwasali ɣef Mastodon."; "Scene.Compose.Poll.OptionNumber" = "Taxtiṛt %ld"; "Scene.Compose.Poll.SevenDays" = "7 n wussan"; "Scene.Compose.Poll.SixHours" = "6 n yisragen"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "The poll has empty option"; +"Scene.Compose.Poll.ThePollIsInvalid" = "The poll is invalid"; "Scene.Compose.Poll.ThirtyMinutes" = "30 n tesdatin"; "Scene.Compose.Poll.ThreeDays" = "3 n wussan"; "Scene.Compose.ReplyingToUser" = "tiririt ɣef %@"; @@ -223,9 +237,12 @@ Ad d-yettwasali ɣef Mastodon."; "Scene.HomeTimeline.NavigationBarState.Accessibility.LogoLabel" = "Taqeffalt n ulugu"; "Scene.HomeTimeline.NavigationBarState.NewPosts" = "Tissufaɣ timaynutin"; "Scene.HomeTimeline.NavigationBarState.Offline" = "Beṛṛa n tuqqna"; -"Scene.HomeTimeline.NavigationBarState.Published" = "Yettwasuffeɣ!"; -"Scene.HomeTimeline.NavigationBarState.Publishing" = "Asuffeɣ tasuffeɣt..."; +"Scene.HomeTimeline.NavigationBarState.Published" = "Tettwasuffeɣ!"; +"Scene.HomeTimeline.NavigationBarState.Publishing" = "Asuffeɣ n tasuffeɣt..."; "Scene.HomeTimeline.Title" = "Agejdan"; +"Scene.Login.ServerSearchField.Placeholder" = "Sekcem URL neɣ nadi ɣef uqeddac-ik·im"; +"Scene.Login.Subtitle" = "Log you in on the server you created your account on."; +"Scene.Login.Title" = "Ansuf yess·ek·em"; "Scene.Notification.FollowRequest.Accept" = "Accept"; "Scene.Notification.FollowRequest.Accepted" = "Accepted"; "Scene.Notification.FollowRequest.Reject" = "agi"; @@ -253,6 +270,8 @@ Ad d-yettwasali ɣef Mastodon."; "Scene.Profile.Fields.AddRow" = "Rnu izirig"; "Scene.Profile.Fields.Placeholder.Content" = "Agbur"; "Scene.Profile.Fields.Placeholder.Label" = "Tabzimt"; +"Scene.Profile.Fields.Verified.Long" = "Ownership of this link was checked on %@"; +"Scene.Profile.Fields.Verified.Short" = "Verified on %@"; "Scene.Profile.Header.FollowsYou" = "Yeṭṭafaṛ-ik•im"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "Sentem asewḥel n %@"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "Sewḥel amiḍan"; @@ -338,7 +357,7 @@ Ad d-yettwasali ɣef Mastodon."; "Scene.Report.StepOne.WhatsWrongWithThisAccount" = "Acu n wugur yellan deg umiḍan-a?"; "Scene.Report.StepOne.WhatsWrongWithThisPost" = "Acu n wugur yellan d tsuffeɣt-a?"; "Scene.Report.StepOne.WhatsWrongWithThisUsername" = "Acu n wugur yellan d %@?"; -"Scene.Report.StepOne.YouAreAwareThatItBreaksSpecificRules" = "Teẓriḍ y•tettruẓu kra n yilugan"; +"Scene.Report.StepOne.YouAreAwareThatItBreaksSpecificRules" = "Teẓriḍ y·tettruẓu kra n yilugan"; "Scene.Report.StepThree.AreThereAnyPostsThatBackUpThisReport" = "Llant tsuffaɣ ara isdemren aneqqis-a?"; "Scene.Report.StepThree.SelectAllThatApply" = "Fren akk tifrat ara yettusnasen"; "Scene.Report.StepThree.Step3Of4" = "Aḥric 3 seg 4"; @@ -385,13 +404,11 @@ Ad d-yettwasali ɣef Mastodon."; "Scene.ServerPicker.EmptyState.BadNetwork" = "Tella-d tuccḍa lawan n usali n yisefka. Senqed tuqqna-ink internet."; "Scene.ServerPicker.EmptyState.FindingServers" = "Tifin n yiqeddacen yellan..."; "Scene.ServerPicker.EmptyState.NoResults" = "Ulac igemmaḍ"; -"Scene.ServerPicker.Input.Placeholder" = "Nadi timɣiwnin"; "Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Nadi timɣiwnin neɣ sekcem URL"; "Scene.ServerPicker.Label.Category" = "TAGGAYT"; "Scene.ServerPicker.Label.Language" = "TUTLAYT"; "Scene.ServerPicker.Label.Users" = "ISEQDACEN"; -"Scene.ServerPicker.Subtitle" = "Fren tamɣiwent almend n wayen tḥemmleḍ, n tmurt-ik neɣ n yiswi-inek amatu."; -"Scene.ServerPicker.SubtitleExtend" = "Fren tamɣiwent almend n wayen tḥemmleḍ, n tmurt-ik neɣ n yiswi-inek amatu. Yal tamɣiwent tsedday-itt tkebbanit neɣ amdan ilelliyen."; +"Scene.ServerPicker.Subtitle" = "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers."; "Scene.ServerPicker.Title" = "Mastodon yettwaxdem i yiseqdacen deg waṭas n temɣiwnin."; "Scene.ServerRules.Button.Confirm" = "Qebleɣ"; "Scene.ServerRules.PrivacyPolicy" = "tasertit tabaḍnit"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/kab.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/kab.lproj/Localizable.stringsdict index 7fc6a50bb..f18a906c0 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/kab.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/kab.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld yisekkilen + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 n usekkil + other + %ld n isekkilen + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey @@ -120,7 +136,7 @@ NSStringFormatValueTypeKey ld one - 1 tsuffeɣt + 1 n tsuffeɣt other %ld n tsuffaɣ @@ -296,9 +312,9 @@ NSStringFormatValueTypeKey ld one - Yeqqim-d 1 wass + Yeqqim-d 1 n wass other - Qqimen-d %ld wussan + Qqimen-d %ld n wussan date.hour.left @@ -312,9 +328,9 @@ NSStringFormatValueTypeKey ld one - Yeqqim-d 1 usrag + Yeqqim-d 1 n wesrag other - Qqimen-d %ld yisragen + Qqimen-d %ld n yisragen date.minute.left @@ -328,9 +344,9 @@ NSStringFormatValueTypeKey ld one - 1 tesdat i d-yeqqimen + 1 n tesdat i d-yeqqimen other - %ld tesdatin i d-yeqqimen + %ld n tesdatin i d-yeqqimen date.second.left @@ -344,9 +360,9 @@ NSStringFormatValueTypeKey ld one - 1 tasint i d-yeqqimen + 1 n tasint i d-yeqqimen other - %ld tsinin i d-yeqqimen + %ld n tasinin i d-yeqqimen date.year.ago.abbr @@ -360,9 +376,9 @@ NSStringFormatValueTypeKey ld one - 1 useggas aya + %ld n useggas aya other - %ld yiseggasen aya + %ld n yiseggasen aya date.month.ago.abbr @@ -376,9 +392,9 @@ NSStringFormatValueTypeKey ld one - 1 wayyur aya + %ld n wayyur aya other - %ld wayyuren aya + %ld n wayyuren aya date.day.ago.abbr @@ -392,9 +408,9 @@ NSStringFormatValueTypeKey ld one - 1 wass aya + %ld n wass aya other - %ld wussan aya + %ld n wussan aya date.hour.ago.abbr @@ -408,9 +424,9 @@ NSStringFormatValueTypeKey ld one - 1 usrag aya + %ld n wesrag aya other - %ld yisragen aya + %ld n yisragen aya date.minute.ago.abbr @@ -424,9 +440,9 @@ NSStringFormatValueTypeKey ld one - 1 tesdat aya + %ld n tesdat aya other - %ld tesdatin aya + %ld n tesdatin aya date.second.ago.abbr @@ -440,9 +456,9 @@ NSStringFormatValueTypeKey ld one - 1 tasint aya + %ld n tasint aya other - %ld tsinin aya + %ld n tasinin aya diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/ku.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/ku.lproj/Localizable.strings index a72543a3e..03ac1f46d 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/ku.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/ku.lproj/Localizable.strings @@ -56,7 +56,7 @@ Jkx girêdana înternetê xwe kontrol bike."; "Common.Controls.Actions.SharePost" = "Şandiyê parve bike"; "Common.Controls.Actions.ShareUser" = "%@ parve bike"; "Common.Controls.Actions.SignIn" = "Têkeve"; -"Common.Controls.Actions.SignUp" = "Tomar bibe"; +"Common.Controls.Actions.SignUp" = "Ajimêr biafirîne"; "Common.Controls.Actions.Skip" = "Derbas bike"; "Common.Controls.Actions.TakePhoto" = "Wêne bikişîne"; "Common.Controls.Actions.TryAgain" = "Dîsa biceribîne"; @@ -68,13 +68,13 @@ Jkx girêdana înternetê xwe kontrol bike."; "Common.Controls.Friendship.EditInfo" = "Zanyariyan serrast bike"; "Common.Controls.Friendship.Follow" = "Bişopîne"; "Common.Controls.Friendship.Following" = "Dişopîne"; -"Common.Controls.Friendship.HideReblogs" = "Hide Reblogs"; +"Common.Controls.Friendship.HideReblogs" = "Bilindkirinan veşêre"; "Common.Controls.Friendship.Mute" = "Bêdeng bike"; "Common.Controls.Friendship.MuteUser" = "%@ bêdeng bike"; "Common.Controls.Friendship.Muted" = "Bêdengkirî"; "Common.Controls.Friendship.Pending" = "Tê nirxandin"; "Common.Controls.Friendship.Request" = "Daxwaz bike"; -"Common.Controls.Friendship.ShowReblogs" = "Show Reblogs"; +"Common.Controls.Friendship.ShowReblogs" = "Bilindkirinan nîşan bide"; "Common.Controls.Friendship.Unblock" = "Astengiyê rake"; "Common.Controls.Friendship.UnblockUser" = "%@ asteng neke"; "Common.Controls.Friendship.Unmute" = "Bêdeng neke"; @@ -108,6 +108,10 @@ Jkx girêdana înternetê xwe kontrol bike."; "Common.Controls.Status.Actions.Unreblog" = "Ji nû ve nivîsandinê vegere"; "Common.Controls.Status.ContentWarning" = "Hişyariya naverokê"; "Common.Controls.Status.MediaContentWarning" = "Ji bo eşkerekirinê li derekî bitikîne"; +"Common.Controls.Status.MetaEntity.Email" = "Navnîşanên e-nameyê: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Hashtagê: %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Profîlê nîşan bide: %@"; +"Common.Controls.Status.MetaEntity.Url" = "Girêdan: %@"; "Common.Controls.Status.Poll.Closed" = "Girtî"; "Common.Controls.Status.Poll.Vote" = "Deng bide"; "Common.Controls.Status.SensitiveContent" = "Naveroka hestiyarî"; @@ -151,19 +155,27 @@ Profîla te ji wan ra wiha xuya dike."; "Scene.AccountList.AddAccount" = "Ajimêr tevlî bike"; "Scene.AccountList.DismissAccountSwitcher" = "Guherkera ajimêrê paş guh bike"; "Scene.AccountList.TabBarHint" = "Profîla hilbijartî ya niha: %@. Du caran bitikîne û paşê dest bide ser da ku guhêrbara ajimêr were nîşandan"; -"Scene.Bookmark.Title" = "Bookmarks"; +"Scene.Bookmark.Title" = "Şûnpel"; "Scene.Compose.Accessibility.AppendAttachment" = "Pêvek tevlî bike"; "Scene.Compose.Accessibility.AppendPoll" = "Rapirsî tevlî bike"; "Scene.Compose.Accessibility.CustomEmojiPicker" = "Hilbijêrê emojî yên kesanekirî"; "Scene.Compose.Accessibility.DisableContentWarning" = "Hişyariya naverokê neçalak bike"; "Scene.Compose.Accessibility.EnableContentWarning" = "Hişyariya naverokê çalak bike"; +"Scene.Compose.Accessibility.PostOptions" = "Vebijêrkên şandiyê"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "Kulîna xuyabûna şandiyê"; +"Scene.Compose.Accessibility.PostingAs" = "Biweşîne wekî %@"; "Scene.Compose.Accessibility.RemovePoll" = "Rapirsî rake"; "Scene.Compose.Attachment.AttachmentBroken" = "Ev %@ naxebite û nayê barkirin li ser Mastodon."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "Pêvek pir mezin e"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Nikare ev pêveka medyayê nas bike"; +"Scene.Compose.Attachment.CompressingState" = "Tê guvaştin..."; "Scene.Compose.Attachment.DescriptionPhoto" = "Wêneyê ji bo kêmbînên dîtbar bide nasîn..."; "Scene.Compose.Attachment.DescriptionVideo" = "Vîdyoyê ji bo kêmbînên dîtbar bide nasîn..."; +"Scene.Compose.Attachment.LoadFailed" = "Barkirin têk çû"; "Scene.Compose.Attachment.Photo" = "wêne"; +"Scene.Compose.Attachment.ServerProcessingState" = "Pêvajoya rajekar pêş de diçe..."; +"Scene.Compose.Attachment.UploadFailed" = "Barkirin têk çû"; "Scene.Compose.Attachment.Video" = "vîdyo"; "Scene.Compose.AutoComplete.SpaceToAdd" = "Bicîhkirinê tevlî bike"; "Scene.Compose.ComposeAction" = "Biweşîne"; @@ -184,6 +196,8 @@ Profîla te ji wan ra wiha xuya dike."; "Scene.Compose.Poll.OptionNumber" = "Vebijêrk %ld"; "Scene.Compose.Poll.SevenDays" = "7 Roj"; "Scene.Compose.Poll.SixHours" = "6 Demjimêr"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "Vebijêrkên vê dengdayînê vala ne"; +"Scene.Compose.Poll.ThePollIsInvalid" = "Ev dengdayîn ne derbasdar e"; "Scene.Compose.Poll.ThirtyMinutes" = "30 xulek"; "Scene.Compose.Poll.ThreeDays" = "3 Roj"; "Scene.Compose.ReplyingToUser" = "bersiv bide %@"; @@ -227,6 +241,9 @@ girêdanê bitikne da ku ajimêra xwe bidî piştrastkirin."; "Scene.HomeTimeline.NavigationBarState.Published" = "Hate weşandin!"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "Şandî tê weşandin..."; "Scene.HomeTimeline.Title" = "Serrûpel"; +"Scene.Login.ServerSearchField.Placeholder" = "Girêdanê têxe an jî li rajekarê xwe bigere"; +"Scene.Login.Subtitle" = "Têketinê bike ser rajekarê ku te ajimêrê xwe tê de çê kiriye."; +"Scene.Login.Title" = "Dîsa bi xêr hatî"; "Scene.Notification.FollowRequest.Accept" = "Bipejirîne"; "Scene.Notification.FollowRequest.Accepted" = "Pejirandî"; "Scene.Notification.FollowRequest.Reject" = "nepejirîne"; @@ -254,15 +271,17 @@ girêdanê bitikne da ku ajimêra xwe bidî piştrastkirin."; "Scene.Profile.Fields.AddRow" = "Rêzê tevlî bike"; "Scene.Profile.Fields.Placeholder.Content" = "Naverok"; "Scene.Profile.Fields.Placeholder.Label" = "Nîşan"; +"Scene.Profile.Fields.Verified.Long" = "Xwedaniya li vê girêdanê di %@ de hatiye kontrolkirin"; +"Scene.Profile.Fields.Verified.Short" = "Hate piştrastkirin li ser %@"; "Scene.Profile.Header.FollowsYou" = "Te dişopîne"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "Ji bo rakirina astengkirinê %@ bipejirîne"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "Ajimêr asteng bike"; -"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Message" = "Confirm to hide reblogs"; -"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Title" = "Hide Reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Message" = "Bo veşartina bilindkirinan bipejirîne"; +"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Title" = "Bilindkirinan veşêre"; "Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Message" = "Ji bo bêdengkirina %@ bipejirîne"; "Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Title" = "Ajimêrê bêdeng bike"; -"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message" = "Confirm to show reblogs"; -"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Title" = "Show Reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message" = "Bo nîşandana bilindkirinan bipejirîne"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Title" = "Bilindkirinan nîşan bide"; "Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Message" = "Ji bo rakirina astengkirinê %@ bipejirîne"; "Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Title" = "Astengiyê li ser ajimêr rake"; "Scene.Profile.RelationshipActionAlert.ConfirmUnmuteUser.Message" = "Ji bo vekirina bêdengkirinê %@ bipejirîne"; @@ -386,13 +405,11 @@ girêdanê bitikne da ku ajimêra xwe bidî piştrastkirin."; "Scene.ServerPicker.EmptyState.BadNetwork" = "Di dema barkirina daneyan da çewtî derket. Girêdana xwe ya înternetê kontrol bike."; "Scene.ServerPicker.EmptyState.FindingServers" = "Peydakirina rajekarên berdest..."; "Scene.ServerPicker.EmptyState.NoResults" = "Encam tune"; -"Scene.ServerPicker.Input.Placeholder" = "Li rajekaran bigere"; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Li rajekaran bigere an jî girêdanê têxe"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Li civakan bigere an jî girêdanê têxe"; "Scene.ServerPicker.Label.Category" = "BEŞ"; "Scene.ServerPicker.Label.Language" = "ZIMAN"; "Scene.ServerPicker.Label.Users" = "BIKARHÊNER"; -"Scene.ServerPicker.Subtitle" = "Li gorî berjewendî, herêm, an jî armancek gelemperî civakekê hilbijêre."; -"Scene.ServerPicker.SubtitleExtend" = "Li gorî berjewendî, herêm, an jî armancek gelemperî civakekê hilbijêre. Her civakek ji hêla rêxistinek an kesek bi tevahî serbixwe ve tê xebitandin."; +"Scene.ServerPicker.Subtitle" = "Li gorî herêm, berjewendî, an jî armanceke giştî rajekarekê hilbijêre. Tu hîn jî dikarî li ser Mastodon bi her kesî re biaxivî, her rajekarê te çi be."; "Scene.ServerPicker.Title" = "Mastodon ji bikarhênerên di civakên cuda de pêk tê."; "Scene.ServerRules.Button.Confirm" = "Ez dipejirînim"; "Scene.ServerRules.PrivacyPolicy" = "polîtikaya nihêniyê"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/ku.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/ku.lproj/Localizable.stringsdict index 77571439f..c904186d8 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/ku.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/ku.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld tîp + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ maye + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 peyv + other + %ld peyv + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/nl.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/nl.lproj/Localizable.strings index 3bcc33bf5..0d8f1dd0f 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/nl.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/nl.lproj/Localizable.strings @@ -54,8 +54,8 @@ "Common.Controls.Actions.Share" = "Deel"; "Common.Controls.Actions.SharePost" = "Deel bericht"; "Common.Controls.Actions.ShareUser" = "Delen %@"; -"Common.Controls.Actions.SignIn" = "Aanmelden"; -"Common.Controls.Actions.SignUp" = "Registreren"; +"Common.Controls.Actions.SignIn" = "Log in"; +"Common.Controls.Actions.SignUp" = "Create account"; "Common.Controls.Actions.Skip" = "Overslaan"; "Common.Controls.Actions.TakePhoto" = "Maak foto"; "Common.Controls.Actions.TryAgain" = "Probeer Opnieuw"; @@ -107,6 +107,10 @@ "Common.Controls.Status.Actions.Unreblog" = "Delen ongedaan maken"; "Common.Controls.Status.ContentWarning" = "Inhoudswaarschuwing"; "Common.Controls.Status.MediaContentWarning" = "Tap hier om te tonen"; +"Common.Controls.Status.MetaEntity.Email" = "Email address: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Hashtag: %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Show Profile: %@"; +"Common.Controls.Status.MetaEntity.Url" = "Link: %@"; "Common.Controls.Status.Poll.Closed" = "Gesloten"; "Common.Controls.Status.Poll.Vote" = "Stemmen"; "Common.Controls.Status.SensitiveContent" = "Gevoelige inhoud"; @@ -152,12 +156,20 @@ Uw profiel ziet er zo uit voor hen."; "Scene.Compose.Accessibility.CustomEmojiPicker" = "Eigen Emojikiezer"; "Scene.Compose.Accessibility.DisableContentWarning" = "Inhoudswaarschuwing Uitschakelen"; "Scene.Compose.Accessibility.EnableContentWarning" = "Inhoudswaarschuwing inschakelen"; +"Scene.Compose.Accessibility.PostOptions" = "Post Options"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "Berichtzichtbaarheidsmenu"; +"Scene.Compose.Accessibility.PostingAs" = "Posting as %@"; "Scene.Compose.Accessibility.RemovePoll" = "Peiling verwijderen"; "Scene.Compose.Attachment.AttachmentBroken" = "Deze %@ is corrupt en kan niet geüpload worden naar Mastodon."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "Attachment too large"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Can not recognize this media attachment"; +"Scene.Compose.Attachment.CompressingState" = "Compressing..."; "Scene.Compose.Attachment.DescriptionPhoto" = "Omschrijf de foto voor mensen met een visuele beperking..."; "Scene.Compose.Attachment.DescriptionVideo" = "Omschrijf de video voor mensen met een visuele beperking..."; +"Scene.Compose.Attachment.LoadFailed" = "Load Failed"; "Scene.Compose.Attachment.Photo" = "foto"; +"Scene.Compose.Attachment.ServerProcessingState" = "Server Processing..."; +"Scene.Compose.Attachment.UploadFailed" = "Upload Failed"; "Scene.Compose.Attachment.Video" = "video"; "Scene.Compose.AutoComplete.SpaceToAdd" = "Spaties toe te voegen"; "Scene.Compose.ComposeAction" = "Publiceren"; @@ -178,6 +190,8 @@ Uw profiel ziet er zo uit voor hen."; "Scene.Compose.Poll.OptionNumber" = "Optie %ld"; "Scene.Compose.Poll.SevenDays" = "7 Dagen"; "Scene.Compose.Poll.SixHours" = "6 Uur"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "The poll has empty option"; +"Scene.Compose.Poll.ThePollIsInvalid" = "The poll is invalid"; "Scene.Compose.Poll.ThirtyMinutes" = "30 minuten"; "Scene.Compose.Poll.ThreeDays" = "3 Dagen"; "Scene.Compose.ReplyingToUser" = "reageren op %@"; @@ -221,6 +235,9 @@ klik op de link om uw account te bevestigen."; "Scene.HomeTimeline.NavigationBarState.Published" = "Gepubliceerd!"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "Bericht publiceren..."; "Scene.HomeTimeline.Title" = "Start"; +"Scene.Login.ServerSearchField.Placeholder" = "Enter URL or search for your server"; +"Scene.Login.Subtitle" = "Log you in on the server you created your account on."; +"Scene.Login.Title" = "Welcome back"; "Scene.Notification.FollowRequest.Accept" = "Accept"; "Scene.Notification.FollowRequest.Accepted" = "Accepted"; "Scene.Notification.FollowRequest.Reject" = "reject"; @@ -248,6 +265,8 @@ klik op de link om uw account te bevestigen."; "Scene.Profile.Fields.AddRow" = "Rij Toevoegen"; "Scene.Profile.Fields.Placeholder.Content" = "Inhoud"; "Scene.Profile.Fields.Placeholder.Label" = "Etiket"; +"Scene.Profile.Fields.Verified.Long" = "Ownership of this link was checked on %@"; +"Scene.Profile.Fields.Verified.Short" = "Verified on %@"; "Scene.Profile.Header.FollowsYou" = "Follows You"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "Bevestig om %@ te blokkeren"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "Blokkeer account"; @@ -380,13 +399,11 @@ klik op de link om uw account te bevestigen."; "Scene.ServerPicker.EmptyState.BadNetwork" = "Er is een fout opgetreden bij het laden van de gegevens. Controleer uw internetverbinding."; "Scene.ServerPicker.EmptyState.FindingServers" = "Beschikbare servers zoeken..."; "Scene.ServerPicker.EmptyState.NoResults" = "Geen resultaten"; -"Scene.ServerPicker.Input.Placeholder" = "Zoek uw server of sluit u bij een nieuwe server aan..."; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Search servers or enter URL"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Search communities or enter URL"; "Scene.ServerPicker.Label.Category" = "CATEGORIE"; "Scene.ServerPicker.Label.Language" = "TAAL"; "Scene.ServerPicker.Label.Users" = "GEBRUIKERS"; -"Scene.ServerPicker.Subtitle" = "Kies een gemeenschap gebaseerd op jouw interesses, regio of een algemeen doel."; -"Scene.ServerPicker.SubtitleExtend" = "Kies een gemeenschap gebaseerd op jouw interesses, regio, of een algemeen doel. Elke gemeenschap wordt beheerd door een volledig onafhankelijke organisatie of individu."; +"Scene.ServerPicker.Subtitle" = "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers."; "Scene.ServerPicker.Title" = "Kies een server, welke dan ook."; "Scene.ServerRules.Button.Confirm" = "Ik Ga Akkoord"; "Scene.ServerRules.PrivacyPolicy" = "privacybeleid"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/nl.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/nl.lproj/Localizable.stringsdict index 314600ff7..84769b0c1 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/nl.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/nl.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld tekens + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/ru.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/ru.lproj/Localizable.strings index 0513a955b..2ad16cb77 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/ru.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/ru.lproj/Localizable.strings @@ -55,8 +55,8 @@ "Common.Controls.Actions.Share" = "Поделиться"; "Common.Controls.Actions.SharePost" = "Поделиться постом"; "Common.Controls.Actions.ShareUser" = "Поделиться %@"; -"Common.Controls.Actions.SignIn" = "Войти"; -"Common.Controls.Actions.SignUp" = "Зарегистрироваться"; +"Common.Controls.Actions.SignIn" = "Log in"; +"Common.Controls.Actions.SignUp" = "Create account"; "Common.Controls.Actions.Skip" = "Пропустить"; "Common.Controls.Actions.TakePhoto" = "Сделать фото"; "Common.Controls.Actions.TryAgain" = "Попробовать снова"; @@ -108,6 +108,10 @@ "Common.Controls.Status.Actions.Unreblog" = "Убрать продвижение"; "Common.Controls.Status.ContentWarning" = "Предупреждение о содержании"; "Common.Controls.Status.MediaContentWarning" = "Нажмите в любом месте, чтобы показать"; +"Common.Controls.Status.MetaEntity.Email" = "Email address: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Hashtag: %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Show Profile: %@"; +"Common.Controls.Status.MetaEntity.Url" = "Link: %@"; "Common.Controls.Status.Poll.Closed" = "Завершён"; "Common.Controls.Status.Poll.Vote" = "Проголосовать"; "Common.Controls.Status.SensitiveContent" = "Sensitive Content"; @@ -165,13 +169,21 @@ "Scene.Compose.Accessibility.CustomEmojiPicker" = "Меню пользовательских эмодзи"; "Scene.Compose.Accessibility.DisableContentWarning" = "Убрать предупреждение о содержании"; "Scene.Compose.Accessibility.EnableContentWarning" = "Добавить предупреждение о содержании"; +"Scene.Compose.Accessibility.PostOptions" = "Post Options"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "Меню видимости поста"; +"Scene.Compose.Accessibility.PostingAs" = "Posting as %@"; "Scene.Compose.Accessibility.RemovePoll" = "Убрать опрос"; "Scene.Compose.Attachment.AttachmentBroken" = "Это %@ повреждено и не может быть отправлено в Mastodon."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "Attachment too large"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Can not recognize this media attachment"; +"Scene.Compose.Attachment.CompressingState" = "Compressing..."; "Scene.Compose.Attachment.DescriptionPhoto" = "Опишите фото для людей с нарушениями зрения..."; "Scene.Compose.Attachment.DescriptionVideo" = "Опишите видео для людей с нарушениями зрения..."; +"Scene.Compose.Attachment.LoadFailed" = "Load Failed"; "Scene.Compose.Attachment.Photo" = "изображение"; +"Scene.Compose.Attachment.ServerProcessingState" = "Server Processing..."; +"Scene.Compose.Attachment.UploadFailed" = "Upload Failed"; "Scene.Compose.Attachment.Video" = "видео"; "Scene.Compose.AutoComplete.SpaceToAdd" = "Пробел, чтобы добавить"; "Scene.Compose.ComposeAction" = "Опубликовать"; @@ -192,6 +204,8 @@ "Scene.Compose.Poll.OptionNumber" = "Вариант %ld"; "Scene.Compose.Poll.SevenDays" = "7 дней"; "Scene.Compose.Poll.SixHours" = "6 часов"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "The poll has empty option"; +"Scene.Compose.Poll.ThePollIsInvalid" = "The poll is invalid"; "Scene.Compose.Poll.ThirtyMinutes" = "30 минут"; "Scene.Compose.Poll.ThreeDays" = "3 дня"; "Scene.Compose.ReplyingToUser" = "ответ %@"; @@ -237,6 +251,9 @@ "Scene.HomeTimeline.NavigationBarState.Published" = "Опубликовано!"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "Публикуем пост..."; "Scene.HomeTimeline.Title" = "Главная"; +"Scene.Login.ServerSearchField.Placeholder" = "Enter URL or search for your server"; +"Scene.Login.Subtitle" = "Log you in on the server you created your account on."; +"Scene.Login.Title" = "Welcome back"; "Scene.Notification.FollowRequest.Accept" = "Accept"; "Scene.Notification.FollowRequest.Accepted" = "Accepted"; "Scene.Notification.FollowRequest.Reject" = "reject"; @@ -264,6 +281,8 @@ "Scene.Profile.Fields.AddRow" = "Добавить строку"; "Scene.Profile.Fields.Placeholder.Content" = "Содержимое"; "Scene.Profile.Fields.Placeholder.Label" = "Ярлык"; +"Scene.Profile.Fields.Verified.Long" = "Ownership of this link was checked on %@"; +"Scene.Profile.Fields.Verified.Short" = "Verified on %@"; "Scene.Profile.Header.FollowsYou" = "Подписан(а) на вас"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "Confirm to block %@"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "Block Account"; @@ -396,13 +415,11 @@ "Scene.ServerPicker.EmptyState.BadNetwork" = "Что-то пошло не так при загрузке данных. Проверьте подключение к интернету."; "Scene.ServerPicker.EmptyState.FindingServers" = "Ищем доступные сервера..."; "Scene.ServerPicker.EmptyState.NoResults" = "Нет результатов"; -"Scene.ServerPicker.Input.Placeholder" = "Найдите сервер или присоединитесь к своему..."; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Поиск по серверам или ссылке"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Search communities or enter URL"; "Scene.ServerPicker.Label.Category" = "КАТЕГОРИЯ"; "Scene.ServerPicker.Label.Language" = "ЯЗЫК"; "Scene.ServerPicker.Label.Users" = "ПОЛЬЗОВАТЕЛИ"; -"Scene.ServerPicker.Subtitle" = "Выберите сообщество на основе своих интересов, региона или общей тематики."; -"Scene.ServerPicker.SubtitleExtend" = "Pick a server based on your interests, region, or a general purpose one. Each server is operated by an entirely independent organization or individual."; +"Scene.ServerPicker.Subtitle" = "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers."; "Scene.ServerPicker.Title" = "Выберите сервер, любой сервер."; "Scene.ServerRules.Button.Confirm" = "Принимаю"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/ru.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/ru.lproj/Localizable.stringsdict index afb29a6aa..c9552a9e4 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/ru.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/ru.lproj/Localizable.stringsdict @@ -62,6 +62,26 @@ %ld символа осталось + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + few + %ld characters + many + %ld characters + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/sl.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/sl.lproj/Localizable.strings new file mode 100644 index 000000000..44f868442 --- /dev/null +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/sl.lproj/Localizable.strings @@ -0,0 +1,464 @@ +"Common.Alerts.BlockDomain.BlockEntireDomain" = "Blokiraj domeno"; +"Common.Alerts.BlockDomain.Title" = "Ali ste res, res prepričani, da želite blokirati celotno %@? V večini primerov je nekaj ciljnih blokiranj ali utišanj dovolj in boljše. Vsebine iz te domene ne boste videli na javnih časovnicah ali obvestilih. Vaši sledilci iz te domene bodo odstranjeni."; +"Common.Alerts.CleanCache.Message" = "Uspešno počiščem predpomnilnik %@."; +"Common.Alerts.CleanCache.Title" = "Počisti predpomnilnik"; +"Common.Alerts.Common.PleaseTryAgain" = "Poskusite znova."; +"Common.Alerts.Common.PleaseTryAgainLater" = "Poskusite znova pozneje."; +"Common.Alerts.DeletePost.Message" = "Ali ste prepričani, da želite izbrisati to objavo?"; +"Common.Alerts.DeletePost.Title" = "Izbriši objavo"; +"Common.Alerts.DiscardPostContent.Message" = "Potrdite za opustitev sestavljene vsebine objave."; +"Common.Alerts.DiscardPostContent.Title" = "Zavrzi osnutek"; +"Common.Alerts.EditProfileFailure.Message" = "Profila ni mogoče urejati. Poskusite znova."; +"Common.Alerts.EditProfileFailure.Title" = "Napaka urejanja profila"; +"Common.Alerts.PublishPostFailure.AttachmentsMessage.MoreThanOneVideo" = "Ni možno priložiti več kot enega videoposnetka."; +"Common.Alerts.PublishPostFailure.AttachmentsMessage.VideoAttachWithPhoto" = "Videoposnetka ni mogoče priložiti objavi, ki že vsebuje slike."; +"Common.Alerts.PublishPostFailure.Message" = "Objava je spodletela. +Preverite svojo internetno povezavo."; +"Common.Alerts.PublishPostFailure.Title" = "Spodletela objava"; +"Common.Alerts.SavePhotoFailure.Message" = "Za shranjevanje fotografije omogočite pravice za dostop do knjižnice fotografij."; +"Common.Alerts.SavePhotoFailure.Title" = "Neuspelo shranjevanje fotografije"; +"Common.Alerts.ServerError.Title" = "Napaka strežnika"; +"Common.Alerts.SignOut.Confirm" = "Odjava"; +"Common.Alerts.SignOut.Message" = "Ali ste prepričani, da se želite odjaviti?"; +"Common.Alerts.SignOut.Title" = "Odjava"; +"Common.Alerts.SignUpFailure.Title" = "Neuspela registracija"; +"Common.Alerts.VoteFailure.PollEnded" = "Anketa je zaključena"; +"Common.Alerts.VoteFailure.Title" = "Napaka glasovanja"; +"Common.Controls.Actions.Add" = "Dodaj"; +"Common.Controls.Actions.Back" = "Nazaj"; +"Common.Controls.Actions.BlockDomain" = "Blokiraj %@"; +"Common.Controls.Actions.Cancel" = "Prekliči"; +"Common.Controls.Actions.Compose" = "Sestavi"; +"Common.Controls.Actions.Confirm" = "Potrdi"; +"Common.Controls.Actions.Continue" = "Nadaljuj"; +"Common.Controls.Actions.CopyPhoto" = "Kopiraj fotografijo"; +"Common.Controls.Actions.Delete" = "Izbriši"; +"Common.Controls.Actions.Discard" = "Opusti"; +"Common.Controls.Actions.Done" = "Opravljeno"; +"Common.Controls.Actions.Edit" = "Uredi"; +"Common.Controls.Actions.FindPeople" = "Poiščite osebe, ki jim želite slediti"; +"Common.Controls.Actions.ManuallySearch" = "Raje išči ročno"; +"Common.Controls.Actions.Next" = "Naslednji"; +"Common.Controls.Actions.Ok" = "V redu"; +"Common.Controls.Actions.Open" = "Odpri"; +"Common.Controls.Actions.OpenInBrowser" = "Odpri v brskalniku"; +"Common.Controls.Actions.OpenInSafari" = "Odpri v Safariju"; +"Common.Controls.Actions.Preview" = "Predogled"; +"Common.Controls.Actions.Previous" = "Prejšnji"; +"Common.Controls.Actions.Remove" = "Odstrani"; +"Common.Controls.Actions.Reply" = "Odgovori"; +"Common.Controls.Actions.ReportUser" = "Prijavi %@"; +"Common.Controls.Actions.Save" = "Shrani"; +"Common.Controls.Actions.SavePhoto" = "Shrani fotografijo"; +"Common.Controls.Actions.SeeMore" = "Pokaži več"; +"Common.Controls.Actions.Settings" = "Nastavitve"; +"Common.Controls.Actions.Share" = "Deli"; +"Common.Controls.Actions.SharePost" = "Deli objavo"; +"Common.Controls.Actions.ShareUser" = "Deli %@"; +"Common.Controls.Actions.SignIn" = "Prijava"; +"Common.Controls.Actions.SignUp" = "Ustvari račun"; +"Common.Controls.Actions.Skip" = "Preskoči"; +"Common.Controls.Actions.TakePhoto" = "Posnemi fotografijo"; +"Common.Controls.Actions.TryAgain" = "Poskusi ponovno"; +"Common.Controls.Actions.UnblockDomain" = "Odblokiraj %@"; +"Common.Controls.Friendship.Block" = "Blokiraj"; +"Common.Controls.Friendship.BlockDomain" = "Blokiraj %@"; +"Common.Controls.Friendship.BlockUser" = "Blokiraj %@"; +"Common.Controls.Friendship.Blocked" = "Blokirano"; +"Common.Controls.Friendship.EditInfo" = "Uredi podatke"; +"Common.Controls.Friendship.Follow" = "Sledi"; +"Common.Controls.Friendship.Following" = "Sledi"; +"Common.Controls.Friendship.HideReblogs" = "Skrij poobjave"; +"Common.Controls.Friendship.Mute" = "Utišaj"; +"Common.Controls.Friendship.MuteUser" = "Utišaj %@"; +"Common.Controls.Friendship.Muted" = "Utišan"; +"Common.Controls.Friendship.Pending" = "Na čakanju"; +"Common.Controls.Friendship.Request" = "Zahteva"; +"Common.Controls.Friendship.ShowReblogs" = "Pokaži poobjave"; +"Common.Controls.Friendship.Unblock" = "Odblokiraj"; +"Common.Controls.Friendship.UnblockUser" = "Odblokiraj %@"; +"Common.Controls.Friendship.Unmute" = "Odtišaj"; +"Common.Controls.Friendship.UnmuteUser" = "Odtišaj %@"; +"Common.Controls.Keyboard.Common.ComposeNewPost" = "Sestavi novo objavo"; +"Common.Controls.Keyboard.Common.OpenSettings" = "Odpri nastavitve"; +"Common.Controls.Keyboard.Common.ShowFavorites" = "Pokaži priljubljene"; +"Common.Controls.Keyboard.Common.SwitchToTab" = "Preklopi na %@"; +"Common.Controls.Keyboard.SegmentedControl.NextSection" = "Naslednji odsek"; +"Common.Controls.Keyboard.SegmentedControl.PreviousSection" = "Prejšnji odsek"; +"Common.Controls.Keyboard.Timeline.NextStatus" = "Naslednja objava"; +"Common.Controls.Keyboard.Timeline.OpenAuthorProfile" = "Pokaži profil avtorja"; +"Common.Controls.Keyboard.Timeline.OpenRebloggerProfile" = "Odpri profil poobjavitelja"; +"Common.Controls.Keyboard.Timeline.OpenStatus" = "Odpri objavo"; +"Common.Controls.Keyboard.Timeline.PreviewImage" = "Predogled slike"; +"Common.Controls.Keyboard.Timeline.PreviousStatus" = "Prejšnja objava"; +"Common.Controls.Keyboard.Timeline.ReplyStatus" = "Odgovori"; +"Common.Controls.Keyboard.Timeline.ToggleContentWarning" = "Preklopi opozorilo o vsebini"; +"Common.Controls.Keyboard.Timeline.ToggleFavorite" = "Preklopi priljubljenost objave"; +"Common.Controls.Keyboard.Timeline.ToggleReblog" = "Preklopi poobjavo za objavo"; +"Common.Controls.Status.Actions.Favorite" = "Priljubljen"; +"Common.Controls.Status.Actions.Hide" = "Skrij"; +"Common.Controls.Status.Actions.Menu" = "Meni"; +"Common.Controls.Status.Actions.Reblog" = "Poobjavi"; +"Common.Controls.Status.Actions.Reply" = "Odgovori"; +"Common.Controls.Status.Actions.ShowGif" = "Pokaži GIF"; +"Common.Controls.Status.Actions.ShowImage" = "Pokaži sliko"; +"Common.Controls.Status.Actions.ShowVideoPlayer" = "Pokaži predvajalnik"; +"Common.Controls.Status.Actions.TapThenHoldToShowMenu" = "Tapnite, nato držite, da se pojavi meni"; +"Common.Controls.Status.Actions.Unfavorite" = "Odstrani iz priljubljenih"; +"Common.Controls.Status.Actions.Unreblog" = "Razveljavi poobjavo"; +"Common.Controls.Status.ContentWarning" = "Opozorilo o vsebini"; +"Common.Controls.Status.MediaContentWarning" = "Tapnite kamorkoli, da razkrijete"; +"Common.Controls.Status.MetaEntity.Email" = "E-naslov: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Ključnik: %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Pokaži profil: %@"; +"Common.Controls.Status.MetaEntity.Url" = "Povezava: %@"; +"Common.Controls.Status.Poll.Closed" = "Zaprto"; +"Common.Controls.Status.Poll.Vote" = "Glasuj"; +"Common.Controls.Status.SensitiveContent" = "Občutljiva vsebina"; +"Common.Controls.Status.ShowPost" = "Pokaži objavo"; +"Common.Controls.Status.ShowUserProfile" = "Prikaži uporabnikov profil"; +"Common.Controls.Status.Tag.Email" = "E-naslov"; +"Common.Controls.Status.Tag.Emoji" = "Emotikon"; +"Common.Controls.Status.Tag.Hashtag" = "Ključnik"; +"Common.Controls.Status.Tag.Link" = "Povezava"; +"Common.Controls.Status.Tag.Mention" = "Omeni"; +"Common.Controls.Status.Tag.Url" = "URL"; +"Common.Controls.Status.TapToReveal" = "Tapnite za razkritje"; +"Common.Controls.Status.UserReblogged" = "%@ je poobjavil_a"; +"Common.Controls.Status.UserRepliedTo" = "Odgovarja %@"; +"Common.Controls.Status.Visibility.Direct" = "Samo omenjeni uporabnik lahko vidi to objavo."; +"Common.Controls.Status.Visibility.Private" = "Samo sledilci osebe lahko vidijo to objavo."; +"Common.Controls.Status.Visibility.PrivateFromMe" = "Samo moji sledilci lahko vidijo to objavo."; +"Common.Controls.Status.Visibility.Unlisted" = "Vsak lahko vidi to objavo, ni pa prikazana na javni časovnici."; +"Common.Controls.Tabs.Home" = "Domov"; +"Common.Controls.Tabs.Notification" = "Obvestilo"; +"Common.Controls.Tabs.Profile" = "Profil"; +"Common.Controls.Tabs.Search" = "Iskanje"; +"Common.Controls.Timeline.Filtered" = "Filtrirano"; +"Common.Controls.Timeline.Header.BlockedWarning" = "Profila tega uporabnika ne morete +videti, dokler vas ne odblokirajo."; +"Common.Controls.Timeline.Header.BlockingWarning" = "Profila tega uporabnika ne morete +videti, dokler jih ne odblokirate. +Vaš profil je zanje videti tako."; +"Common.Controls.Timeline.Header.NoStatusFound" = "Ne najdem nobenih objav"; +"Common.Controls.Timeline.Header.SuspendedWarning" = "Ta oseba je bila suspendirana."; +"Common.Controls.Timeline.Header.UserBlockedWarning" = "Profila uporabnika %@ ne morete +videti, dokler vas ne odblokirajo."; +"Common.Controls.Timeline.Header.UserBlockingWarning" = "Profila uporabnika %@ ne morete +videti, dokler jih ne odblokirate. +Vaš profil je zanje videti tako."; +"Common.Controls.Timeline.Header.UserSuspendedWarning" = "Račun osebe %@ je suspendiran."; +"Common.Controls.Timeline.Loader.LoadMissingPosts" = "Naloži manjkajoče objave"; +"Common.Controls.Timeline.Loader.LoadingMissingPosts" = "Nalaganje manjkajočih objav ..."; +"Common.Controls.Timeline.Loader.ShowMoreReplies" = "Pokaži več odgovorov"; +"Common.Controls.Timeline.Timestamp.Now" = "Zdaj"; +"Scene.AccountList.AddAccount" = "Dodaj račun"; +"Scene.AccountList.DismissAccountSwitcher" = "Umakni preklopnik med računi"; +"Scene.AccountList.TabBarHint" = "Trenutno izbran profil: %@. Dvakrat tapnite, nato držite, da se pojavi preklopnik med računi."; +"Scene.Bookmark.Title" = "Zaznamki"; +"Scene.Compose.Accessibility.AppendAttachment" = "Dodaj priponko"; +"Scene.Compose.Accessibility.AppendPoll" = "Dodaj anketo"; +"Scene.Compose.Accessibility.CustomEmojiPicker" = "Izbirnik čustvenčkov po meri"; +"Scene.Compose.Accessibility.DisableContentWarning" = "Onemogoči opozorilo o vsebini"; +"Scene.Compose.Accessibility.EnableContentWarning" = "Omogoči opozorilo o vsebini"; +"Scene.Compose.Accessibility.PostOptions" = "Možnosti objave"; +"Scene.Compose.Accessibility.PostVisibilityMenu" = "Meni vidnosti objave"; +"Scene.Compose.Accessibility.PostingAs" = "Objavljate kot %@"; +"Scene.Compose.Accessibility.RemovePoll" = "Odstrani anketo"; +"Scene.Compose.Attachment.AttachmentBroken" = "To %@ je okvarjeno in ga ni +možno naložiti v Mastodon."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "Priponka je prevelika"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Te medijske priponke ni mogoče prepoznati"; +"Scene.Compose.Attachment.CompressingState" = "Stiskanje ..."; +"Scene.Compose.Attachment.DescriptionPhoto" = "Opiši fotografijo za slabovidne in osebe z okvaro vida ..."; +"Scene.Compose.Attachment.DescriptionVideo" = "Opiši video za slabovidne in osebe z okvaro vida ..."; +"Scene.Compose.Attachment.LoadFailed" = "Nalaganje ni uspelo"; +"Scene.Compose.Attachment.Photo" = "fotografija"; +"Scene.Compose.Attachment.ServerProcessingState" = "Obdelovanje na strežniku ..."; +"Scene.Compose.Attachment.UploadFailed" = "Nalaganje na strežnik ni uspelo"; +"Scene.Compose.Attachment.Video" = "video"; +"Scene.Compose.AutoComplete.SpaceToAdd" = "Preslednica za dodajanje"; +"Scene.Compose.ComposeAction" = "Objavi"; +"Scene.Compose.ContentInputPlaceholder" = "Vnesite ali prilepite, kar vam leži na duši"; +"Scene.Compose.ContentWarning.Placeholder" = "Tukaj zapišite opozorilo ..."; +"Scene.Compose.Keyboard.AppendAttachmentEntry" = "Dodaj priponko - %@"; +"Scene.Compose.Keyboard.DiscardPost" = "Opusti objavo"; +"Scene.Compose.Keyboard.PublishPost" = "Objavi objavo"; +"Scene.Compose.Keyboard.SelectVisibilityEntry" = "Izberite vidnost - %@"; +"Scene.Compose.Keyboard.ToggleContentWarning" = "Preklopi opozorilo o vsebini"; +"Scene.Compose.Keyboard.TogglePoll" = "Preklopi anketo"; +"Scene.Compose.MediaSelection.Browse" = "Prebrskaj"; +"Scene.Compose.MediaSelection.Camera" = "Posnemi fotografijo"; +"Scene.Compose.MediaSelection.PhotoLibrary" = "Knjižnica fotografij"; +"Scene.Compose.Poll.DurationTime" = "Trajanje: %@"; +"Scene.Compose.Poll.OneDay" = "1 dan"; +"Scene.Compose.Poll.OneHour" = "1 ura"; +"Scene.Compose.Poll.OptionNumber" = "Možnost %ld"; +"Scene.Compose.Poll.SevenDays" = "7 dni"; +"Scene.Compose.Poll.SixHours" = "6 ur"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "Anketa ima prazno izbiro"; +"Scene.Compose.Poll.ThePollIsInvalid" = "Anketa je neveljavna"; +"Scene.Compose.Poll.ThirtyMinutes" = "30 minut"; +"Scene.Compose.Poll.ThreeDays" = "3 dni"; +"Scene.Compose.ReplyingToUser" = "odgovarja %@"; +"Scene.Compose.Title.NewPost" = "Nova objava"; +"Scene.Compose.Title.NewReply" = "Nov odgovor"; +"Scene.Compose.Visibility.Direct" = "Samo osebe, ki jih omenjam"; +"Scene.Compose.Visibility.Private" = "Samo sledilci"; +"Scene.Compose.Visibility.Public" = "Javno"; +"Scene.Compose.Visibility.Unlisted" = "Ni prikazano"; +"Scene.ConfirmEmail.Button.OpenEmailApp" = "Odpri aplikacijo za e-pošto"; +"Scene.ConfirmEmail.Button.Resend" = "Ponovno pošlji"; +"Scene.ConfirmEmail.DontReceiveEmail.Description" = "Preverite, ali je vaš e-naslov pravilen, pa tudi vsebino mape neželene pošte, če tega še niste storili."; +"Scene.ConfirmEmail.DontReceiveEmail.ResendEmail" = "Ponovno pošlji e-pošto"; +"Scene.ConfirmEmail.DontReceiveEmail.Title" = "Preverite svojo e-pošto"; +"Scene.ConfirmEmail.OpenEmailApp.Description" = "Ravnokar smo vam poslali e-sporočilo. Preverite neželeno pošto, če sporočila ne najdete med dohodno pošto."; +"Scene.ConfirmEmail.OpenEmailApp.Mail" = "E-pošta"; +"Scene.ConfirmEmail.OpenEmailApp.OpenEmailClient" = "Odpri odjemalca e-pošte"; +"Scene.ConfirmEmail.OpenEmailApp.Title" = "Preverite svojo dohodno e-pošto."; +"Scene.ConfirmEmail.Subtitle" = "Tapnite povezavo, ki smo vam jo poslali po e-pošti, da overite svoj račun."; +"Scene.ConfirmEmail.TapTheLinkWeEmailedToYouToVerifyYourAccount" = "Tapnite povezavo, ki smo vam jo poslali po e-pošti, da overite svoj račun"; +"Scene.ConfirmEmail.Title" = "Še zadnja stvar."; +"Scene.Discovery.Intro" = "To so objave, ki plenijo pozornost na vašem koncu Mastodona."; +"Scene.Discovery.Tabs.Community" = "Skupnost"; +"Scene.Discovery.Tabs.ForYou" = "Za vas"; +"Scene.Discovery.Tabs.Hashtags" = "Ključniki"; +"Scene.Discovery.Tabs.News" = "Novice"; +"Scene.Discovery.Tabs.Posts" = "Objave"; +"Scene.Familiarfollowers.FollowedByNames" = "Sledijo %@"; +"Scene.Familiarfollowers.Title" = "Znani sledilci"; +"Scene.Favorite.Title" = "Vaši priljubljeni"; +"Scene.FavoritedBy.Title" = "Med priljubljene dal_a"; +"Scene.Follower.Footer" = "Sledilci z drugih strežnikov niso prikazani."; +"Scene.Follower.Title" = "sledilec"; +"Scene.Following.Footer" = "Sledenje z drugih strežnikov ni prikazano."; +"Scene.Following.Title" = "sledi"; +"Scene.HomeTimeline.NavigationBarState.Accessibility.LogoHint" = "Tapnite, da podrsate na vrh; tapnite znova, da se pomaknete na prejšnji položaj"; +"Scene.HomeTimeline.NavigationBarState.Accessibility.LogoLabel" = "Gumb logotipa"; +"Scene.HomeTimeline.NavigationBarState.NewPosts" = "Pokaži nove objave"; +"Scene.HomeTimeline.NavigationBarState.Offline" = "Nepovezan"; +"Scene.HomeTimeline.NavigationBarState.Published" = "Objavljeno!"; +"Scene.HomeTimeline.NavigationBarState.Publishing" = "Objavljanje objave ..."; +"Scene.HomeTimeline.Title" = "Domov"; +"Scene.Login.ServerSearchField.Placeholder" = "Vnesite URL ali poiščite svoj strežnik"; +"Scene.Login.Subtitle" = "Prijavite se na strežniku, na katerem ste ustvarili račun."; +"Scene.Login.Title" = "Dobrodošli nazaj"; +"Scene.Notification.FollowRequest.Accept" = "Sprejmi"; +"Scene.Notification.FollowRequest.Accepted" = "Sprejeto"; +"Scene.Notification.FollowRequest.Reject" = "Zavrni"; +"Scene.Notification.FollowRequest.Rejected" = "Zavrnjeno"; +"Scene.Notification.Keyobard.ShowEverything" = "Pokaži vse"; +"Scene.Notification.Keyobard.ShowMentions" = "Pokaži omembe"; +"Scene.Notification.NotificationDescription.FavoritedYourPost" = "je vzljubil/a vašo objavo"; +"Scene.Notification.NotificationDescription.FollowedYou" = "vam sledi"; +"Scene.Notification.NotificationDescription.MentionedYou" = "vas je omenil/a"; +"Scene.Notification.NotificationDescription.PollHasEnded" = "anketa je zaključena"; +"Scene.Notification.NotificationDescription.RebloggedYourPost" = "je poobjavil_a vašo objavo"; +"Scene.Notification.NotificationDescription.RequestToFollowYou" = "vas je zaprosil za sledenje"; +"Scene.Notification.Title.Everything" = "Vse"; +"Scene.Notification.Title.Mentions" = "Omembe"; +"Scene.Preview.Keyboard.ClosePreview" = "Zapri predogled"; +"Scene.Preview.Keyboard.ShowNext" = "Pokaži naslednje"; +"Scene.Preview.Keyboard.ShowPrevious" = "Pokaži prejšnje"; +"Scene.Profile.Accessibility.DoubleTapToOpenTheList" = "Dvakrat tapnite, da se odpre seznam"; +"Scene.Profile.Accessibility.EditAvatarImage" = "Uredi sliko avatarja"; +"Scene.Profile.Accessibility.ShowAvatarImage" = "Pokaži sliko avatarja"; +"Scene.Profile.Accessibility.ShowBannerImage" = "Pokaži sliko pasice"; +"Scene.Profile.Dashboard.Followers" = "sledilcev"; +"Scene.Profile.Dashboard.Following" = "sledi"; +"Scene.Profile.Dashboard.Posts" = "Objave"; +"Scene.Profile.Fields.AddRow" = "Dodaj vrstico"; +"Scene.Profile.Fields.Placeholder.Content" = "Vsebina"; +"Scene.Profile.Fields.Placeholder.Label" = "Oznaka"; +"Scene.Profile.Fields.Verified.Long" = "Lastništvo te povezave je bilo preverjeno %@"; +"Scene.Profile.Fields.Verified.Short" = "Preverjeno %@"; +"Scene.Profile.Header.FollowsYou" = "Vam sledi"; +"Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "Potrdite za blokado %@"; +"Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "Blokiraj račun"; +"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Message" = "Potrdite, da poobjave ne bodo prikazane"; +"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Title" = "Skrij poobjave"; +"Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Message" = "Potrdite utišanje %@"; +"Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Title" = "Utišaj račun"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message" = "Potrdite, da bodo poobjave prikazane"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Title" = "Pokaži poobjave"; +"Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Message" = "Potrdite za umik blokade %@"; +"Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Title" = "Odblokiraj račun"; +"Scene.Profile.RelationshipActionAlert.ConfirmUnmuteUser.Message" = "Potrdite umik utišanja %@"; +"Scene.Profile.RelationshipActionAlert.ConfirmUnmuteUser.Title" = "Odtišaj račun"; +"Scene.Profile.SegmentedControl.About" = "O programu"; +"Scene.Profile.SegmentedControl.Media" = "Mediji"; +"Scene.Profile.SegmentedControl.Posts" = "Objave"; +"Scene.Profile.SegmentedControl.PostsAndReplies" = "Objave in odgovori"; +"Scene.Profile.SegmentedControl.Replies" = "Odgovori"; +"Scene.RebloggedBy.Title" = "Poobjavil_a"; +"Scene.Register.Error.Item.Agreement" = "Sporazum"; +"Scene.Register.Error.Item.Email" = "E-pošta"; +"Scene.Register.Error.Item.Locale" = "Krajevne nastavitve"; +"Scene.Register.Error.Item.Password" = "Geslo"; +"Scene.Register.Error.Item.Reason" = "Razlog"; +"Scene.Register.Error.Item.Username" = "Uporabniško ime"; +"Scene.Register.Error.Reason.Accepted" = "%@ mora biti sprejet"; +"Scene.Register.Error.Reason.Blank" = "%@ je zahtevan"; +"Scene.Register.Error.Reason.Blocked" = "%@ vsebuje nedovoljenega ponudnika e-poštnih storitev"; +"Scene.Register.Error.Reason.Inclusion" = "%@ ni podprta vrednost"; +"Scene.Register.Error.Reason.Invalid" = "%@ ni veljavno"; +"Scene.Register.Error.Reason.Reserved" = "%@ je rezervirana ključna beseda"; +"Scene.Register.Error.Reason.Taken" = "%@ je že v uporabi"; +"Scene.Register.Error.Reason.TooLong" = "%@ je predolgo"; +"Scene.Register.Error.Reason.TooShort" = "%@ je prekratko"; +"Scene.Register.Error.Reason.Unreachable" = "%@ kot kaže ne obstaja"; +"Scene.Register.Error.Special.EmailInvalid" = "E-naslov ni veljaven"; +"Scene.Register.Error.Special.PasswordTooShort" = "Geslo je prekratko (dolgo mora biti vsaj 8 znakov)"; +"Scene.Register.Error.Special.UsernameInvalid" = "Uporabniško ime lahko vsebuje samo alfanumerične znake ter podčrtaje."; +"Scene.Register.Error.Special.UsernameTooLong" = "Uporabniško ime je predolgo (ne more biti daljše od 30 znakov)"; +"Scene.Register.Input.Avatar.Delete" = "Izbriši"; +"Scene.Register.Input.DisplayName.Placeholder" = "pojavno ime"; +"Scene.Register.Input.Email.Placeholder" = "e-pošta"; +"Scene.Register.Input.Invite.RegistrationUserInviteRequest" = "Zakaj se želite pridružiti?"; +"Scene.Register.Input.Password.Accessibility.Checked" = "potrjeno"; +"Scene.Register.Input.Password.Accessibility.Unchecked" = "nepotrjeno"; +"Scene.Register.Input.Password.CharacterLimit" = "8 znakov"; +"Scene.Register.Input.Password.Hint" = "Geslo mora biti dolgo najmanj 8 znakov."; +"Scene.Register.Input.Password.Placeholder" = "geslo"; +"Scene.Register.Input.Password.Require" = "Vaše geslo potrebuje vsaj:"; +"Scene.Register.Input.Username.DuplicatePrompt" = "To ime je že zasedeno."; +"Scene.Register.Input.Username.Placeholder" = "uporabniško ime"; +"Scene.Register.LetsGetYouSetUpOnDomain" = "Naj vas namestimo na %@"; +"Scene.Register.Title" = "Naj vas namestimo na %@"; +"Scene.Report.Content1" = "Ali so še kakšne druge objave, ki bi jih želeli dodati k prijavi?"; +"Scene.Report.Content2" = "Je kaj, kar bi moderatorji morali vedeti o tem poročilu?"; +"Scene.Report.ReportSentTitle" = "Hvala za poročilo, bomo preverili."; +"Scene.Report.Reported" = "PRIJAVLJEN"; +"Scene.Report.Send" = "Pošlji poročilo"; +"Scene.Report.SkipToSend" = "Pošlji brez komentarja"; +"Scene.Report.Step1" = "Korak 1 od 2"; +"Scene.Report.Step2" = "Korak 2 od 2"; +"Scene.Report.StepFinal.BlockUser" = "Blokiraj %@"; +"Scene.Report.StepFinal.DontWantToSeeThis" = "Ne želite videti tega?"; +"Scene.Report.StepFinal.MuteUser" = "Utišaj %@"; +"Scene.Report.StepFinal.TheyWillNoLongerBeAbleToFollowOrSeeYourPostsButTheyCanSeeIfTheyveBeenBlocked" = "Nič več ne bodo mogli slediti ali videti vaše objave, lahko pa vidijo, če so blokirani."; +"Scene.Report.StepFinal.Unfollow" = "Prenehaj slediti"; +"Scene.Report.StepFinal.UnfollowUser" = "Prenehaj slediti %@"; +"Scene.Report.StepFinal.Unfollowed" = "Ne sledi več"; +"Scene.Report.StepFinal.WhenYouSeeSomethingYouDontLikeOnMastodonYouCanRemoveThePersonFromYourExperience." = "Če vidite nekaj, česar na Masodonu ne želite, lahko odstranite osebo iz svoje izkušnje."; +"Scene.Report.StepFinal.WhileWeReviewThisYouCanTakeActionAgainstUser" = "Medtem, ko to pregledujemo, lahko proti %@ ukrepate"; +"Scene.Report.StepFinal.YouWontSeeTheirPostsOrReblogsInYourHomeFeedTheyWontKnowTheyVeBeenMuted" = "Njihovih objav ali poobjav ne boste videli v svojem domačem viru. Ne bodo vedeli, da so utišani."; +"Scene.Report.StepFour.IsThereAnythingElseWeShouldKnow" = "Je še kaj, za kar menite, da bi morali vedeti?"; +"Scene.Report.StepFour.Step4Of4" = "Korak 4 od 4"; +"Scene.Report.StepOne.IDontLikeIt" = "Ni mi všeč"; +"Scene.Report.StepOne.ItIsNotSomethingYouWantToSee" = "To ni tisto, kar želite videti"; +"Scene.Report.StepOne.ItViolatesServerRules" = "Krši strežniška pravila"; +"Scene.Report.StepOne.ItsSomethingElse" = "Gre za nekaj drugega"; +"Scene.Report.StepOne.ItsSpam" = "To je neželena vsebina"; +"Scene.Report.StepOne.MaliciousLinksFakeEngagementOrRepetetiveReplies" = "Škodljive povezave, lažno prizadevanje ali ponavljajoči se odgovori"; +"Scene.Report.StepOne.SelectTheBestMatch" = "Izberite najboljši zadetek"; +"Scene.Report.StepOne.Step1Of4" = "Korak 1 od 4"; +"Scene.Report.StepOne.TheIssueDoesNotFitIntoOtherCategories" = "Težava ne sodi v druge kategorije"; +"Scene.Report.StepOne.WhatsWrongWithThisAccount" = "Kaj je narobe s tem računom?"; +"Scene.Report.StepOne.WhatsWrongWithThisPost" = "Kaj je narobe s to objavo?"; +"Scene.Report.StepOne.WhatsWrongWithThisUsername" = "Kaj je narobe s/z %@?"; +"Scene.Report.StepOne.YouAreAwareThatItBreaksSpecificRules" = "Zavedate se, da krši določena pravila"; +"Scene.Report.StepThree.AreThereAnyPostsThatBackUpThisReport" = "Ali so kakšne objave, ki dokazujejo trditve iz tega poročila?"; +"Scene.Report.StepThree.SelectAllThatApply" = "Izberite vse, kar ustreza"; +"Scene.Report.StepThree.Step3Of4" = "Korak 3 od 4"; +"Scene.Report.StepTwo.IJustDon’tLikeIt" = "Ni mi všeč"; +"Scene.Report.StepTwo.SelectAllThatApply" = "Izberite vse, kar ustreza"; +"Scene.Report.StepTwo.Step2Of4" = "Korak 2 od 4"; +"Scene.Report.StepTwo.WhichRulesAreBeingViolated" = "Katera pravila so kršena?"; +"Scene.Report.TextPlaceholder" = "Vnesite ali prilepite dodatne komentarje"; +"Scene.Report.Title" = "Prijavi %@"; +"Scene.Report.TitleReport" = "Poročaj"; +"Scene.Search.Recommend.Accounts.Description" = "Morda želite slediti tem računom"; +"Scene.Search.Recommend.Accounts.Follow" = "Sledi"; +"Scene.Search.Recommend.Accounts.Title" = "Računi, ki vam bi bili morda všeč"; +"Scene.Search.Recommend.ButtonText" = "Prikaži vse"; +"Scene.Search.Recommend.HashTag.Description" = "Ključniki, ki imajo veliko pozornosti"; +"Scene.Search.Recommend.HashTag.PeopleTalking" = "%@ oseb se pogovarja"; +"Scene.Search.Recommend.HashTag.Title" = "V trendu na Mastodonu"; +"Scene.Search.SearchBar.Cancel" = "Prekliči"; +"Scene.Search.SearchBar.Placeholder" = "Išči ključnike in uporabnike"; +"Scene.Search.Searching.Clear" = "Počisti"; +"Scene.Search.Searching.EmptyState.NoResults" = "Ni rezultatov"; +"Scene.Search.Searching.RecentSearch" = "Nedavna iskanja"; +"Scene.Search.Searching.Segment.All" = "Vse"; +"Scene.Search.Searching.Segment.Hashtags" = "Ključniki"; +"Scene.Search.Searching.Segment.People" = "Ljudje"; +"Scene.Search.Searching.Segment.Posts" = "Objave"; +"Scene.Search.Title" = "Iskanje"; +"Scene.ServerPicker.Button.Category.Academia" = "akademsko"; +"Scene.ServerPicker.Button.Category.Activism" = "aktivizem"; +"Scene.ServerPicker.Button.Category.All" = "Vse"; +"Scene.ServerPicker.Button.Category.AllAccessiblityDescription" = "Kategorija: vse"; +"Scene.ServerPicker.Button.Category.Art" = "umetnost"; +"Scene.ServerPicker.Button.Category.Food" = "hrana"; +"Scene.ServerPicker.Button.Category.Furry" = "Kosmato"; +"Scene.ServerPicker.Button.Category.Games" = "igre"; +"Scene.ServerPicker.Button.Category.General" = "splošno"; +"Scene.ServerPicker.Button.Category.Journalism" = "novinarstvo"; +"Scene.ServerPicker.Button.Category.Lgbt" = "lgbq+"; +"Scene.ServerPicker.Button.Category.Music" = "glasba"; +"Scene.ServerPicker.Button.Category.Regional" = "regionalno"; +"Scene.ServerPicker.Button.Category.Tech" = "tehnologija"; +"Scene.ServerPicker.Button.SeeLess" = "Pokaži manj"; +"Scene.ServerPicker.Button.SeeMore" = "Pokaži več"; +"Scene.ServerPicker.EmptyState.BadNetwork" = "Med nalaganjem podatkov je prišlo do napake. Preverite svojo internetno povezavo."; +"Scene.ServerPicker.EmptyState.FindingServers" = "Iskanje razpoložljivih strežnikov ..."; +"Scene.ServerPicker.EmptyState.NoResults" = "Ni rezultatov"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Iščite po skupnostih ali vnesite URL"; +"Scene.ServerPicker.Label.Category" = "KATEGORIJA"; +"Scene.ServerPicker.Label.Language" = "JEZIK"; +"Scene.ServerPicker.Label.Users" = "UPORABNIKI"; +"Scene.ServerPicker.Subtitle" = "Strežnik izberite glede na svojo regijo, zanimanje ali pa kar splošno. Še vedno lahko klepetate s komer koli na Mastodonu, ne glede na strežnik."; +"Scene.ServerPicker.Title" = "Mastodon tvorijo uporabniki z različnih strežnikov."; +"Scene.ServerRules.Button.Confirm" = "Strinjam se"; +"Scene.ServerRules.PrivacyPolicy" = "pravilnik o zasebnosti"; +"Scene.ServerRules.Prompt" = "Če boste nadaljevali, za vas veljajo pogoji storitve in pravilnik o zasebnosti za %@."; +"Scene.ServerRules.Subtitle" = "Slednje določajo in njihovo spoštovanje zagotavljajo moderatorji %@."; +"Scene.ServerRules.TermsOfService" = "pogoji uporabe"; +"Scene.ServerRules.Title" = "Nekaj osnovnih pravil."; +"Scene.Settings.Footer.MastodonDescription" = "Mastodon je odprtokodna programska oprema. Na GitHubu na %@ (%@) lahko poročate o napakah"; +"Scene.Settings.Keyboard.CloseSettingsWindow" = "Zapri okno nastavitev"; +"Scene.Settings.Section.Appearance.Automatic" = "Samodejno"; +"Scene.Settings.Section.Appearance.Dark" = "Vedno temno"; +"Scene.Settings.Section.Appearance.Light" = "Vedno svetlo"; +"Scene.Settings.Section.Appearance.Title" = "Videz"; +"Scene.Settings.Section.BoringZone.AccountSettings" = "Nastavitve računa"; +"Scene.Settings.Section.BoringZone.Privacy" = "Pravilnik o zasebnosti"; +"Scene.Settings.Section.BoringZone.Terms" = "Pogoji uporabe"; +"Scene.Settings.Section.BoringZone.Title" = "Cona dolgočasja"; +"Scene.Settings.Section.LookAndFeel.Light" = "Svetlo"; +"Scene.Settings.Section.LookAndFeel.ReallyDark" = "Zares temno"; +"Scene.Settings.Section.LookAndFeel.SortaDark" = "Nekako temno"; +"Scene.Settings.Section.LookAndFeel.Title" = "Videz in občutek"; +"Scene.Settings.Section.LookAndFeel.UseSystem" = "Uporabi sistemsko"; +"Scene.Settings.Section.Notifications.Boosts" = "prepošlje mojo objavo"; +"Scene.Settings.Section.Notifications.Favorites" = "mojo objavo da med priljubljene"; +"Scene.Settings.Section.Notifications.Follows" = "me sledi"; +"Scene.Settings.Section.Notifications.Mentions" = "me omeni"; +"Scene.Settings.Section.Notifications.Title" = "Obvestila"; +"Scene.Settings.Section.Notifications.Trigger.Anyone" = "kdor koli"; +"Scene.Settings.Section.Notifications.Trigger.Follow" = "nekdo, ki mu sledim,"; +"Scene.Settings.Section.Notifications.Trigger.Follower" = "sledilec/ka"; +"Scene.Settings.Section.Notifications.Trigger.Noone" = "nihče"; +"Scene.Settings.Section.Notifications.Trigger.Title" = "Obvesti me, ko"; +"Scene.Settings.Section.Preference.DisableAvatarAnimation" = "Onemogoči animirane avatarje"; +"Scene.Settings.Section.Preference.DisableEmojiAnimation" = "Onemogoči animirane emotikone"; +"Scene.Settings.Section.Preference.OpenLinksInMastodon" = "Odpri povezave v Mastodonu"; +"Scene.Settings.Section.Preference.Title" = "Nastavitve"; +"Scene.Settings.Section.Preference.TrueBlackDarkMode" = "Resnično črni temni način"; +"Scene.Settings.Section.Preference.UsingDefaultBrowser" = "Uporabi privzeti brskalnik za odpiranje povezav"; +"Scene.Settings.Section.SpicyZone.Clear" = "Počisti medijski predpomnilnik"; +"Scene.Settings.Section.SpicyZone.Signout" = "Odjava"; +"Scene.Settings.Section.SpicyZone.Title" = "Pikantna cona"; +"Scene.Settings.Title" = "Nastavitve"; +"Scene.SuggestionAccount.FollowExplain" = "Ko nekomu sledite, vidite njihove objave v svojem domačem viru."; +"Scene.SuggestionAccount.Title" = "Poiščite osebe, ki jim želite slediti"; +"Scene.Thread.BackTitle" = "Objavi"; +"Scene.Thread.Title" = "Objavil/a"; +"Scene.Welcome.GetStarted" = "Začnite"; +"Scene.Welcome.LogIn" = "Prijava"; +"Scene.Welcome.Slogan" = "Družbeno mreženje +spet v vaših rokah."; +"Scene.Wizard.AccessibilityHint" = "Dvakrat tapnite, da zapustite tega čarovnika"; +"Scene.Wizard.MultipleAccountSwitchIntroDescription" = "Preklopite med več računi s pritiskom gumba profila."; +"Scene.Wizard.NewInMastodon" = "Novo v Mastodonu"; \ No newline at end of file diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/sl.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/sl.lproj/Localizable.stringsdict new file mode 100644 index 000000000..87cc42142 --- /dev/null +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/sl.lproj/Localizable.stringsdict @@ -0,0 +1,581 @@ + + + + + a11y.plural.count.unread.notification + + NSStringLocalizedFormatKey + %#@notification_count_unread_notification@ + notification_count_unread_notification + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + %ld neprebrano obvestilo + two + %ld neprebrani obvestili + few + %ld neprebrana obvestila + other + %ld neprebranih obvestil + + + a11y.plural.count.input_limit_exceeds + + NSStringLocalizedFormatKey + Omejitev vnosa presega %#@character_count@ + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + %ld znak + two + %ld znaka + few + %ld znaki + other + %ld znakov + + + a11y.plural.count.input_limit_remains + + NSStringLocalizedFormatKey + Omejitev vnosa ostaja %#@character_count@ + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + %ld znak + two + %ld znaka + few + %ld znaki + other + %ld znakov + + + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + preostaja %#@character_count@ + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + %ld znak + two + %ld znaka + few + %ld znaki + other + %ld znakov + + + plural.count.followed_by_and_mutual + + NSStringLocalizedFormatKey + %#@names@%#@count_mutual@ + names + + one + + two + + few + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + other + + + count_mutual + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + Sledijo %1$@ in %ld skupni + two + Sledijo %1$@ in %ld skupna + few + Sledijo %1$@ in %ld skupni + other + Sledijo %1$@ in %ld skupnih + + + plural.count.metric_formatted.post + + NSStringLocalizedFormatKey + %@ %#@post_count@ + post_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + objava + two + objavi + few + objave + other + objav + + + plural.count.media + + NSStringLocalizedFormatKey + %#@media_count@ + media_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + %ld medij + two + %ld medija + few + %ld mediji + other + %ld medijev + + + plural.count.post + + NSStringLocalizedFormatKey + %#@post_count@ + post_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + %ld objava + two + %ld objavi + few + %ld objave + other + %ld objav + + + plural.count.favorite + + NSStringLocalizedFormatKey + %#@favorite_count@ + favorite_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + %ld priljubljeni + two + %ld priljubljena + few + %ld priljubljeni + other + %ld priljubljenih + + + plural.count.reblog + + NSStringLocalizedFormatKey + %#@reblog_count@ + reblog_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + %ld poobjava + two + %ld poobjavi + few + %ld poobjave + other + %ld poobjav + + + plural.count.reply + + NSStringLocalizedFormatKey + %#@reply_count@ + reply_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + %ld odgovor + two + %ld odgovora + few + %ld odgovori + other + %ld odgovorov + + + plural.count.vote + + NSStringLocalizedFormatKey + %#@vote_count@ + vote_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + %ld glas + two + %ld glasova + few + %ld glasovi + other + %ld glasov + + + plural.count.voter + + NSStringLocalizedFormatKey + %#@voter_count@ + voter_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + %ld glasovalec + two + %ld glasovalca + few + %ld glasovalci + other + %ld glasovalcev + + + plural.people_talking + + NSStringLocalizedFormatKey + %#@count_people_talking@ + count_people_talking + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + %ld oseba se pogovarja + two + %ld osebi se pogovarjata + few + %ld osebe se pogovarjajo + other + %ld oseb se pogovarja + + + plural.count.following + + NSStringLocalizedFormatKey + %#@count_following@ + count_following + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + %ld sledi + two + %ld sledita + few + %ld sledijo + other + %ld sledijo + + + plural.count.follower + + NSStringLocalizedFormatKey + %#@count_follower@ + count_follower + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + %ld sledilec + two + %ld sledilca + few + %ld sledilci + other + %ld sledilcev + + + date.year.left + + NSStringLocalizedFormatKey + %#@count_year_left@ + count_year_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + na voljo še %ld leto + two + na voljo še %ld leti + few + na voljo še %ld leta + other + na voljo še %ld let + + + date.month.left + + NSStringLocalizedFormatKey + %#@count_month_left@ + count_month_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + na voljo še %ld mesec + two + na voljo še %ld meseca + few + na voljo še %ld mesece + other + na voljo še %ld mesecev + + + date.day.left + + NSStringLocalizedFormatKey + %#@count_day_left@ + count_day_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + še %ld dan + two + še %ld dneva + few + še %ld dnevi + other + še %ld dni + + + date.hour.left + + NSStringLocalizedFormatKey + %#@count_hour_left@ + count_hour_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + na voljo še %ld uro + two + na voljo še %ld uri + few + na voljo še %ld ure + other + na voljo še %ld ur + + + date.minute.left + + NSStringLocalizedFormatKey + %#@count_minute_left@ + count_minute_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + Še %ld min. + two + Še %ld min. + few + Še %ld min. + other + Še %ld min. + + + date.second.left + + NSStringLocalizedFormatKey + %#@count_second_left@ + count_second_left + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + Preostane še %ld s + two + Preostaneta še %ld s + few + Preostanejo še %ld s + other + Preostane še %ld s + + + date.year.ago.abbr + + NSStringLocalizedFormatKey + %#@count_year_ago_abbr@ + count_year_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + pred %ld letom + two + pred %ld letoma + few + pred %ld leti + other + pred %ld leti + + + date.month.ago.abbr + + NSStringLocalizedFormatKey + %#@count_month_ago_abbr@ + count_month_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + pred %ld mesecem + two + pred %ld mesecema + few + pred %ld meseci + other + pred %ld meseci + + + date.day.ago.abbr + + NSStringLocalizedFormatKey + %#@count_day_ago_abbr@ + count_day_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + pred %ld dnem + two + pred %ld dnevoma + few + pred %ld dnemi + other + pred %ld dnemi + + + date.hour.ago.abbr + + NSStringLocalizedFormatKey + %#@count_hour_ago_abbr@ + count_hour_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + pred %ld uro + two + pred %ld urama + few + pred %ld urami + other + pred %ld urami + + + date.minute.ago.abbr + + NSStringLocalizedFormatKey + %#@count_minute_ago_abbr@ + count_minute_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + pred %ld min + two + pred %ld min + few + pred %ld min + other + pred %ld min + + + date.second.ago.abbr + + NSStringLocalizedFormatKey + %#@count_second_ago_abbr@ + count_second_ago_abbr + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + pred %ld s + two + pred %ld s + few + pred %ld s + other + pred %ld s + + + + diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/sv.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/sv.lproj/Localizable.strings index 849d88284..79781cae7 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/sv.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/sv.lproj/Localizable.strings @@ -56,7 +56,7 @@ Kontrollera din internetanslutning."; "Common.Controls.Actions.SharePost" = "Dela inlägg"; "Common.Controls.Actions.ShareUser" = "Dela %@"; "Common.Controls.Actions.SignIn" = "Logga in"; -"Common.Controls.Actions.SignUp" = "Registrera dig"; +"Common.Controls.Actions.SignUp" = "Skapa konto"; "Common.Controls.Actions.Skip" = "Hoppa över"; "Common.Controls.Actions.TakePhoto" = "Ta foto"; "Common.Controls.Actions.TryAgain" = "Försök igen"; @@ -68,13 +68,13 @@ Kontrollera din internetanslutning."; "Common.Controls.Friendship.EditInfo" = "Redigera info"; "Common.Controls.Friendship.Follow" = "Följ"; "Common.Controls.Friendship.Following" = "Följer"; -"Common.Controls.Friendship.HideReblogs" = "Dölj puffar"; +"Common.Controls.Friendship.HideReblogs" = "Dölj boostar"; "Common.Controls.Friendship.Mute" = "Tysta"; "Common.Controls.Friendship.MuteUser" = "Tysta %@"; "Common.Controls.Friendship.Muted" = "Tystad"; "Common.Controls.Friendship.Pending" = "Väntande"; "Common.Controls.Friendship.Request" = "Följ"; -"Common.Controls.Friendship.ShowReblogs" = "Visa knuffar"; +"Common.Controls.Friendship.ShowReblogs" = "Visa boostar"; "Common.Controls.Friendship.Unblock" = "Avblockera"; "Common.Controls.Friendship.UnblockUser" = "Avblockera %@"; "Common.Controls.Friendship.Unmute" = "Avtysta"; @@ -87,27 +87,31 @@ Kontrollera din internetanslutning."; "Common.Controls.Keyboard.SegmentedControl.PreviousSection" = "Föregående avsnitt"; "Common.Controls.Keyboard.Timeline.NextStatus" = "Nästa inlägg"; "Common.Controls.Keyboard.Timeline.OpenAuthorProfile" = "Öppna författarens profil"; -"Common.Controls.Keyboard.Timeline.OpenRebloggerProfile" = "Öppna ompostarens profil"; +"Common.Controls.Keyboard.Timeline.OpenRebloggerProfile" = "Öppna boostarens profil"; "Common.Controls.Keyboard.Timeline.OpenStatus" = "Öppna inlägg"; "Common.Controls.Keyboard.Timeline.PreviewImage" = "Förhandsgranska bild"; "Common.Controls.Keyboard.Timeline.PreviousStatus" = "Föregående inlägg"; "Common.Controls.Keyboard.Timeline.ReplyStatus" = "Svara på inlägg"; "Common.Controls.Keyboard.Timeline.ToggleContentWarning" = "Växla innehållsvarning"; "Common.Controls.Keyboard.Timeline.ToggleFavorite" = "Växla favorit på inlägg"; -"Common.Controls.Keyboard.Timeline.ToggleReblog" = "Växla puff på inlägg"; +"Common.Controls.Keyboard.Timeline.ToggleReblog" = "Växla boost på inlägg"; "Common.Controls.Status.Actions.Favorite" = "Favorit"; "Common.Controls.Status.Actions.Hide" = "Dölj"; "Common.Controls.Status.Actions.Menu" = "Meny"; -"Common.Controls.Status.Actions.Reblog" = "Puffa"; +"Common.Controls.Status.Actions.Reblog" = "Boosta"; "Common.Controls.Status.Actions.Reply" = "Svara"; "Common.Controls.Status.Actions.ShowGif" = "Visa GIF"; "Common.Controls.Status.Actions.ShowImage" = "Visa bild"; "Common.Controls.Status.Actions.ShowVideoPlayer" = "Visa videospelare"; "Common.Controls.Status.Actions.TapThenHoldToShowMenu" = "Tryck och håll ned för att visa menyn"; "Common.Controls.Status.Actions.Unfavorite" = "Ta bort favorit"; -"Common.Controls.Status.Actions.Unreblog" = "Ångra puff"; +"Common.Controls.Status.Actions.Unreblog" = "Ångra boost"; "Common.Controls.Status.ContentWarning" = "Innehållsvarning"; "Common.Controls.Status.MediaContentWarning" = "Tryck var som helst för att visa"; +"Common.Controls.Status.MetaEntity.Email" = "E-postadress: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Hashtag: %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Visa profil: %@"; +"Common.Controls.Status.MetaEntity.Url" = "Länk: %@"; "Common.Controls.Status.Poll.Closed" = "Stängd"; "Common.Controls.Status.Poll.Vote" = "Rösta"; "Common.Controls.Status.SensitiveContent" = "Känsligt innehåll"; @@ -120,7 +124,7 @@ Kontrollera din internetanslutning."; "Common.Controls.Status.Tag.Mention" = "Omnämn"; "Common.Controls.Status.Tag.Url" = "URL"; "Common.Controls.Status.TapToReveal" = "Tryck för att visa"; -"Common.Controls.Status.UserReblogged" = "%@ puffade"; +"Common.Controls.Status.UserReblogged" = "%@ boostade"; "Common.Controls.Status.UserRepliedTo" = "Svarade på %@"; "Common.Controls.Status.Visibility.Direct" = "Endast omnämnda användare kan se detta inlägg."; "Common.Controls.Status.Visibility.Private" = "Endast deras följare kan se detta inlägg."; @@ -151,19 +155,27 @@ Din profil ser ut så här för dem."; "Scene.AccountList.AddAccount" = "Lägg till konto"; "Scene.AccountList.DismissAccountSwitcher" = "Stäng kontoväxlare"; "Scene.AccountList.TabBarHint" = "Nuvarande vald profil: %@. Dubbeltryck och håll för att visa kontoväxlare"; -"Scene.Bookmark.Title" = "Bookmarks"; +"Scene.Bookmark.Title" = "Bokmärken"; "Scene.Compose.Accessibility.AppendAttachment" = "Lägg till bilaga"; "Scene.Compose.Accessibility.AppendPoll" = "Lägg till omröstning"; "Scene.Compose.Accessibility.CustomEmojiPicker" = "Anpassad emoji-väljare"; "Scene.Compose.Accessibility.DisableContentWarning" = "Inaktivera innehållsvarning"; "Scene.Compose.Accessibility.EnableContentWarning" = "Aktivera innehållsvarning"; +"Scene.Compose.Accessibility.PostOptions" = "Inläggsalternativ"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "Inläggssynlighetsmeny"; +"Scene.Compose.Accessibility.PostingAs" = "Postar som %@"; "Scene.Compose.Accessibility.RemovePoll" = "Ta bort omröstning"; "Scene.Compose.Attachment.AttachmentBroken" = "Denna %@ är trasig och kan inte laddas upp till Mastodon."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "Bilagan är för stor"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Känner inte igen mediebilagan"; +"Scene.Compose.Attachment.CompressingState" = "Komprimerar..."; "Scene.Compose.Attachment.DescriptionPhoto" = "Beskriv fotot för synskadade..."; "Scene.Compose.Attachment.DescriptionVideo" = "Beskriv videon för de synskadade..."; +"Scene.Compose.Attachment.LoadFailed" = "Det gick inte att läsa in"; "Scene.Compose.Attachment.Photo" = "foto"; +"Scene.Compose.Attachment.ServerProcessingState" = "Behandlas av servern..."; +"Scene.Compose.Attachment.UploadFailed" = "Uppladdning misslyckades"; "Scene.Compose.Attachment.Video" = "video"; "Scene.Compose.AutoComplete.SpaceToAdd" = "Mellanslag för att lägga till"; "Scene.Compose.ComposeAction" = "Publicera"; @@ -184,6 +196,8 @@ laddas upp till Mastodon."; "Scene.Compose.Poll.OptionNumber" = "Alternativ %ld"; "Scene.Compose.Poll.SevenDays" = "7 dagar"; "Scene.Compose.Poll.SixHours" = "6 timmar"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "Undersökningen har ett tomt alternativ"; +"Scene.Compose.Poll.ThePollIsInvalid" = "Undersökningen är ogiltig"; "Scene.Compose.Poll.ThirtyMinutes" = "30 minuter"; "Scene.Compose.Poll.ThreeDays" = "3 dagar"; "Scene.Compose.ReplyingToUser" = "svarar %@"; @@ -226,6 +240,9 @@ laddas upp till Mastodon."; "Scene.HomeTimeline.NavigationBarState.Published" = "Publicerat!"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "Publicerar inlägget..."; "Scene.HomeTimeline.Title" = "Hem"; +"Scene.Login.ServerSearchField.Placeholder" = "Ange URL eller sök efter din server"; +"Scene.Login.Subtitle" = "Logga in på servern där du skapade ditt konto."; +"Scene.Login.Title" = "Välkommen tillbaka"; "Scene.Notification.FollowRequest.Accept" = "Godkänn"; "Scene.Notification.FollowRequest.Accepted" = "Godkänd"; "Scene.Notification.FollowRequest.Reject" = "avvisa"; @@ -236,7 +253,7 @@ laddas upp till Mastodon."; "Scene.Notification.NotificationDescription.FollowedYou" = "följde dig"; "Scene.Notification.NotificationDescription.MentionedYou" = "nämnde dig"; "Scene.Notification.NotificationDescription.PollHasEnded" = "omröstningen har avslutats"; -"Scene.Notification.NotificationDescription.RebloggedYourPost" = "puffade ditt inlägg"; +"Scene.Notification.NotificationDescription.RebloggedYourPost" = "boostade ditt inlägg"; "Scene.Notification.NotificationDescription.RequestToFollowYou" = "begär att följa dig"; "Scene.Notification.Title.Everything" = "Allting"; "Scene.Notification.Title.Mentions" = "Omnämningar"; @@ -253,15 +270,17 @@ laddas upp till Mastodon."; "Scene.Profile.Fields.AddRow" = "Lägg till rad"; "Scene.Profile.Fields.Placeholder.Content" = "Innehåll"; "Scene.Profile.Fields.Placeholder.Label" = "Etikett"; +"Scene.Profile.Fields.Verified.Long" = "Ägarskap för denna länk kontrollerades den %@"; +"Scene.Profile.Fields.Verified.Short" = "Verifierad på %@"; "Scene.Profile.Header.FollowsYou" = "Följer dig"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "Bekräfta för att blockera %@"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "Blockera konto"; -"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Message" = "Bekräfta för att dölja puffar"; -"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Title" = "Dölj puffar"; +"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Message" = "Bekräfta för att dölja boostar"; +"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Title" = "Dölj boostar"; "Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Message" = "Bekräfta för att tysta %@"; "Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Title" = "Tysta konto"; -"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message" = "Bekräfta för att visa puffar"; -"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Title" = "Visa puffar"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message" = "Bekräfta för att visa boostar"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Title" = "Visa boostar"; "Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Message" = "Bekräfta för att avblockera %@"; "Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Title" = "Avblockera konto"; "Scene.Profile.RelationshipActionAlert.ConfirmUnmuteUser.Message" = "Bekräfta för att avtysta %@"; @@ -271,7 +290,7 @@ laddas upp till Mastodon."; "Scene.Profile.SegmentedControl.Posts" = "Inlägg"; "Scene.Profile.SegmentedControl.PostsAndReplies" = "Inlägg och svar"; "Scene.Profile.SegmentedControl.Replies" = "Svar"; -"Scene.RebloggedBy.Title" = "Puffat av"; +"Scene.RebloggedBy.Title" = "Boostat av"; "Scene.Register.Error.Item.Agreement" = "Avtal"; "Scene.Register.Error.Item.Email" = "E-post"; "Scene.Register.Error.Item.Locale" = "Språk"; @@ -323,7 +342,7 @@ laddas upp till Mastodon."; "Scene.Report.StepFinal.Unfollowed" = "Slutade följa"; "Scene.Report.StepFinal.WhenYouSeeSomethingYouDontLikeOnMastodonYouCanRemoveThePersonFromYourExperience." = "När du ser något som du inte gillar på Mastodon kan du ta bort personen från din upplevelse."; "Scene.Report.StepFinal.WhileWeReviewThisYouCanTakeActionAgainstUser" = "Medan vi granskar detta kan du vidta åtgärder mot %@"; -"Scene.Report.StepFinal.YouWontSeeTheirPostsOrReblogsInYourHomeFeedTheyWontKnowTheyVeBeenMuted" = "Du kommer inte att se deras inlägg eller ompostningar i ditt hemflöde. De kommer inte att veta att de har blivit tystade."; +"Scene.Report.StepFinal.YouWontSeeTheirPostsOrReblogsInYourHomeFeedTheyWontKnowTheyVeBeenMuted" = "Du kommer inte att se deras inlägg eller boostar i ditt hemflöde. De kommer inte att veta att de har blivit tystade."; "Scene.Report.StepFour.IsThereAnythingElseWeShouldKnow" = "Finns det något annat vi borde veta?"; "Scene.Report.StepFour.Step4Of4" = "Steg 4 av 4"; "Scene.Report.StepOne.IDontLikeIt" = "Jag tycker inte om det"; @@ -385,13 +404,11 @@ laddas upp till Mastodon."; "Scene.ServerPicker.EmptyState.BadNetwork" = "Något gick fel när data laddades. Försök igen eller kontrollera din internetanslutning."; "Scene.ServerPicker.EmptyState.FindingServers" = "Söker tillgängliga servrar..."; "Scene.ServerPicker.EmptyState.NoResults" = "Inga resultat"; -"Scene.ServerPicker.Input.Placeholder" = "Sök gemenskaper"; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Sök servrar eller ange URL"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Sök gemenskaper eller ange URL"; "Scene.ServerPicker.Label.Category" = "KATEGORI"; "Scene.ServerPicker.Label.Language" = "SPRÅK"; "Scene.ServerPicker.Label.Users" = "ANVÄNDARE"; -"Scene.ServerPicker.Subtitle" = "Välj en server baserat på dina intressen, region eller ett allmänt syfte."; -"Scene.ServerPicker.SubtitleExtend" = "Välj en server baserat på dina intressen, region eller ett allmänt syfte. Varje server drivs av en helt oberoende organisation eller individ."; +"Scene.ServerPicker.Subtitle" = "Välj en server baserat på dina intressen, region eller en allmän server. Du kan fortfarande nå alla, oavsett server."; "Scene.ServerPicker.Title" = "Mastodon utgörs av användare på olika servrar."; "Scene.ServerRules.Button.Confirm" = "Jag godkänner"; "Scene.ServerRules.PrivacyPolicy" = "integritetspolicy"; @@ -414,7 +431,7 @@ laddas upp till Mastodon."; "Scene.Settings.Section.LookAndFeel.SortaDark" = "Ganska mörk"; "Scene.Settings.Section.LookAndFeel.Title" = "Utseende och känsla"; "Scene.Settings.Section.LookAndFeel.UseSystem" = "Följ systeminställningarna"; -"Scene.Settings.Section.Notifications.Boosts" = "Ompostar mitt inlägg"; +"Scene.Settings.Section.Notifications.Boosts" = "Boostar mitt inlägg"; "Scene.Settings.Section.Notifications.Favorites" = "Favoriserar mitt inlägg"; "Scene.Settings.Section.Notifications.Follows" = "Följer mig"; "Scene.Settings.Section.Notifications.Mentions" = "Nämner mig"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/sv.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/sv.lproj/Localizable.stringsdict index 048af4732..3cbfeae6d 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/sv.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/sv.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld tecken + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ kvar + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + %ld tecken + other + %ld tecken + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey @@ -152,9 +168,9 @@ NSStringFormatValueTypeKey ld one - %ld puff + %ld boost other - %ld puffar + %ld boostar plural.count.reply diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/th.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/th.lproj/Localizable.strings index 15514928c..25c7e37f8 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/th.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/th.lproj/Localizable.strings @@ -55,8 +55,8 @@ "Common.Controls.Actions.Share" = "แบ่งปัน"; "Common.Controls.Actions.SharePost" = "แบ่งปันโพสต์"; "Common.Controls.Actions.ShareUser" = "แบ่งปัน %@"; -"Common.Controls.Actions.SignIn" = "ลงชื่อเข้า"; -"Common.Controls.Actions.SignUp" = "ลงทะเบียน"; +"Common.Controls.Actions.SignIn" = "เข้าสู่ระบบ"; +"Common.Controls.Actions.SignUp" = "สร้างบัญชี"; "Common.Controls.Actions.Skip" = "ข้าม"; "Common.Controls.Actions.TakePhoto" = "ถ่ายรูป"; "Common.Controls.Actions.TryAgain" = "ลองอีกครั้ง"; @@ -68,13 +68,13 @@ "Common.Controls.Friendship.EditInfo" = "แก้ไขข้อมูล"; "Common.Controls.Friendship.Follow" = "ติดตาม"; "Common.Controls.Friendship.Following" = "กำลังติดตาม"; -"Common.Controls.Friendship.HideReblogs" = "Hide Reblogs"; +"Common.Controls.Friendship.HideReblogs" = "ซ่อนการดัน"; "Common.Controls.Friendship.Mute" = "ซ่อน"; "Common.Controls.Friendship.MuteUser" = "ซ่อน %@"; "Common.Controls.Friendship.Muted" = "ซ่อนอยู่"; "Common.Controls.Friendship.Pending" = "รอดำเนินการ"; "Common.Controls.Friendship.Request" = "ขอ"; -"Common.Controls.Friendship.ShowReblogs" = "Show Reblogs"; +"Common.Controls.Friendship.ShowReblogs" = "แสดงการดัน"; "Common.Controls.Friendship.Unblock" = "เลิกปิดกั้น"; "Common.Controls.Friendship.UnblockUser" = "เลิกปิดกั้น %@"; "Common.Controls.Friendship.Unmute" = "เลิกซ่อน"; @@ -108,6 +108,10 @@ "Common.Controls.Status.Actions.Unreblog" = "เลิกทำการดัน"; "Common.Controls.Status.ContentWarning" = "คำเตือนเนื้อหา"; "Common.Controls.Status.MediaContentWarning" = "แตะที่ใดก็ตามเพื่อเปิดเผย"; +"Common.Controls.Status.MetaEntity.Email" = "ที่อยู่อีเมล: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "แฮชแท็ก: %@"; +"Common.Controls.Status.MetaEntity.Mention" = "โปรไฟล์ที่แสดง: %@"; +"Common.Controls.Status.MetaEntity.Url" = "ลิงก์: %@"; "Common.Controls.Status.Poll.Closed" = "ปิดแล้ว"; "Common.Controls.Status.Poll.Vote" = "ลงคะแนน"; "Common.Controls.Status.SensitiveContent" = "เนื้อหาที่ละเอียดอ่อน"; @@ -151,19 +155,27 @@ "Scene.AccountList.AddAccount" = "เพิ่มบัญชี"; "Scene.AccountList.DismissAccountSwitcher" = "ปิดตัวสลับบัญชี"; "Scene.AccountList.TabBarHint" = "โปรไฟล์ที่เลือกในปัจจุบัน: %@ แตะสองครั้งแล้วกดค้างไว้เพื่อแสดงตัวสลับบัญชี"; -"Scene.Bookmark.Title" = "Bookmarks"; +"Scene.Bookmark.Title" = "ที่คั่นหน้า"; "Scene.Compose.Accessibility.AppendAttachment" = "เพิ่มไฟล์แนบ"; "Scene.Compose.Accessibility.AppendPoll" = "เพิ่มการสำรวจความคิดเห็น"; "Scene.Compose.Accessibility.CustomEmojiPicker" = "ตัวเลือกอีโมจิที่กำหนดเอง"; "Scene.Compose.Accessibility.DisableContentWarning" = "ปิดใช้งานคำเตือนเนื้อหา"; "Scene.Compose.Accessibility.EnableContentWarning" = "เปิดใช้งานคำเตือนเนื้อหา"; +"Scene.Compose.Accessibility.PostOptions" = "ตัวเลือกโพสต์"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "เมนูการมองเห็นโพสต์"; +"Scene.Compose.Accessibility.PostingAs" = "กำลังโพสต์เป็น %@"; "Scene.Compose.Accessibility.RemovePoll" = "เอาการสำรวจความคิดเห็นออก"; "Scene.Compose.Attachment.AttachmentBroken" = "%@ นี้เสียหายและไม่สามารถ อัปโหลดไปยัง Mastodon"; +"Scene.Compose.Attachment.AttachmentTooLarge" = "ไฟล์แนบใหญ่เกินไป"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "ไม่สามารถระบุไฟล์แนบสื่อนี้"; +"Scene.Compose.Attachment.CompressingState" = "กำลังบีบอัด..."; "Scene.Compose.Attachment.DescriptionPhoto" = "อธิบายรูปภาพสำหรับผู้บกพร่องทางการมองเห็น..."; "Scene.Compose.Attachment.DescriptionVideo" = "อธิบายวิดีโอสำหรับผู้บกพร่องทางการมองเห็น..."; +"Scene.Compose.Attachment.LoadFailed" = "การโหลดล้มเหลว"; "Scene.Compose.Attachment.Photo" = "รูปภาพ"; +"Scene.Compose.Attachment.ServerProcessingState" = "เซิร์ฟเวอร์กำลังประมวลผล..."; +"Scene.Compose.Attachment.UploadFailed" = "การอัปโหลดล้มเหลว"; "Scene.Compose.Attachment.Video" = "วิดีโอ"; "Scene.Compose.AutoComplete.SpaceToAdd" = "เว้นวรรคเพื่อเพิ่ม"; "Scene.Compose.ComposeAction" = "เผยแพร่"; @@ -184,6 +196,8 @@ "Scene.Compose.Poll.OptionNumber" = "ตัวเลือก %ld"; "Scene.Compose.Poll.SevenDays" = "7 วัน"; "Scene.Compose.Poll.SixHours" = "6 ชั่วโมง"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "การสำรวจความคิดเห็นมีตัวเลือกที่ว่างเปล่า"; +"Scene.Compose.Poll.ThePollIsInvalid" = "การสำรวจความคิดเห็นไม่ถูกต้อง"; "Scene.Compose.Poll.ThirtyMinutes" = "30 นาที"; "Scene.Compose.Poll.ThreeDays" = "3 วัน"; "Scene.Compose.ReplyingToUser" = "กำลังตอบกลับ %@"; @@ -195,10 +209,10 @@ "Scene.Compose.Visibility.Unlisted" = "ไม่อยู่ในรายการ"; "Scene.ConfirmEmail.Button.OpenEmailApp" = "เปิดแอปอีเมล"; "Scene.ConfirmEmail.Button.Resend" = "ส่งใหม่"; -"Scene.ConfirmEmail.DontReceiveEmail.Description" = "หากคุณยังไม่ได้รับอีเมล ตรวจสอบว่าที่อยู่อีเมลของคุณถูกต้อง รวมถึงโฟลเดอร์อีเมลขยะของคุณ"; +"Scene.ConfirmEmail.DontReceiveEmail.Description" = "ตรวจสอบว่าที่อยู่อีเมลของคุณถูกต้องเช่นเดียวกับโฟลเดอร์อีเมลขยะหากคุณยังไม่ได้ทำ"; "Scene.ConfirmEmail.DontReceiveEmail.ResendEmail" = "ส่งอีเมลใหม่"; "Scene.ConfirmEmail.DontReceiveEmail.Title" = "ตรวจสอบอีเมลของคุณ"; -"Scene.ConfirmEmail.OpenEmailApp.Description" = "เราเพิ่งส่งอีเมลหาคุณ หากคุณยังไม่ได้รับอีเมล โปรดตรวจสอบโฟลเดอร์อีเมลขยะ"; +"Scene.ConfirmEmail.OpenEmailApp.Description" = "เราเพิ่งส่งอีเมลถึงคุณ ตรวจสอบโฟลเดอร์อีเมลขยะของคุณหากคุณยังไม่ได้ทำ"; "Scene.ConfirmEmail.OpenEmailApp.Mail" = "จดหมาย"; "Scene.ConfirmEmail.OpenEmailApp.OpenEmailClient" = "เปิดไคลเอ็นต์อีเมล"; "Scene.ConfirmEmail.OpenEmailApp.Title" = "ตรวจสอบกล่องขาเข้าของคุณ"; @@ -226,6 +240,9 @@ "Scene.HomeTimeline.NavigationBarState.Published" = "เผยแพร่แล้ว!"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "กำลังเผยแพร่โพสต์..."; "Scene.HomeTimeline.Title" = "หน้าแรก"; +"Scene.Login.ServerSearchField.Placeholder" = "ป้อน URL หรือค้นหาสำหรับเซิร์ฟเวอร์ของคุณ"; +"Scene.Login.Subtitle" = "นำคุณเข้าสู่ระบบในเซิร์ฟเวอร์ที่คุณได้สร้างบัญชีของคุณไว้ใน"; +"Scene.Login.Title" = "ยินดีต้อนรับกลับมา"; "Scene.Notification.FollowRequest.Accept" = "ยอมรับ"; "Scene.Notification.FollowRequest.Accepted" = "ยอมรับแล้ว"; "Scene.Notification.FollowRequest.Reject" = "ปฏิเสธ"; @@ -253,15 +270,17 @@ "Scene.Profile.Fields.AddRow" = "เพิ่มแถว"; "Scene.Profile.Fields.Placeholder.Content" = "เนื้อหา"; "Scene.Profile.Fields.Placeholder.Label" = "ป้ายชื่อ"; +"Scene.Profile.Fields.Verified.Long" = "ตรวจสอบความเป็นเจ้าของของลิงก์นี้เมื่อ %@"; +"Scene.Profile.Fields.Verified.Short" = "ตรวจสอบเมื่อ %@"; "Scene.Profile.Header.FollowsYou" = "ติดตามคุณ"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "ยืนยันเพื่อปิดกั้น %@"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "ปิดกั้นบัญชี"; -"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Message" = "Confirm to hide reblogs"; -"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Title" = "Hide Reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Message" = "ยืนยันเพื่อซ่อนการดัน"; +"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Title" = "ซ่อนการดัน"; "Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Message" = "ยืนยันเพื่อซ่อน %@"; "Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Title" = "ซ่อนบัญชี"; -"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message" = "Confirm to show reblogs"; -"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Title" = "Show Reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message" = "ยืนยันเพื่อแสดงการดัน"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Title" = "แสดงการดัน"; "Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Message" = "ยืนยันเพื่อเลิกปิดกั้น %@"; "Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Title" = "เลิกปิดกั้นบัญชี"; "Scene.Profile.RelationshipActionAlert.ConfirmUnmuteUser.Message" = "ยืนยันเพื่อเลิกซ่อน %@"; @@ -287,7 +306,7 @@ "Scene.Register.Error.Reason.Taken" = "%@ ถูกใช้งานแล้ว"; "Scene.Register.Error.Reason.TooLong" = "%@ ยาวเกินไป"; "Scene.Register.Error.Reason.TooShort" = "%@ สั้นเกินไป"; -"Scene.Register.Error.Reason.Unreachable" = "ดูเหมือนว่า %@ จะไม่มีอยู่"; +"Scene.Register.Error.Reason.Unreachable" = "ดูเหมือนว่าจะไม่มี %@ อยู่"; "Scene.Register.Error.Special.EmailInvalid" = "นี่ไม่ใช่ที่อยู่อีเมลที่ถูกต้อง"; "Scene.Register.Error.Special.PasswordTooShort" = "รหัสผ่านสั้นเกินไป (ต้องมีอย่างน้อย 8 ตัวอักษร)"; "Scene.Register.Error.Special.UsernameInvalid" = "ชื่อผู้ใช้ต้องมีเฉพาะตัวอักษรและตัวเลขและขีดล่างเท่านั้น"; @@ -385,13 +404,11 @@ "Scene.ServerPicker.EmptyState.BadNetwork" = "มีบางอย่างผิดพลาดขณะโหลดข้อมูล ตรวจสอบการเชื่อมต่ออินเทอร์เน็ตของคุณ"; "Scene.ServerPicker.EmptyState.FindingServers" = "กำลังค้นหาเซิร์ฟเวอร์ที่พร้อมใช้งาน..."; "Scene.ServerPicker.EmptyState.NoResults" = "ไม่มีผลลัพธ์"; -"Scene.ServerPicker.Input.Placeholder" = "ค้นหาเซิร์ฟเวอร์"; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "ค้นหาเซิร์ฟเวอร์หรือป้อน URL"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "ค้นหาชุมชนหรือป้อน URL"; "Scene.ServerPicker.Label.Category" = "หมวดหมู่"; "Scene.ServerPicker.Label.Language" = "ภาษา"; "Scene.ServerPicker.Label.Users" = "ผู้ใช้"; -"Scene.ServerPicker.Subtitle" = "เลือกเซิร์ฟเวอร์ตามความสนใจ, ภูมิภาค หรือวัตถุประสงค์ทั่วไปของคุณ"; -"Scene.ServerPicker.SubtitleExtend" = "เลือกเซิร์ฟเวอร์ตามความสนใจ, ภูมิภาค หรือวัตถุประสงค์ทั่วไปของคุณ แต่ละเซิร์ฟเวอร์ดำเนินการโดยองค์กรหรือบุคคลที่เป็นอิสระโดยสิ้นเชิง"; +"Scene.ServerPicker.Subtitle" = "เลือกเซิร์ฟเวอร์ตามภูมิภาค, ความสนใจ หรือวัตถุประสงค์ทั่วไปของคุณ คุณยังคงสามารถแชทกับใครก็ตามใน Mastodon โดยไม่คำนึงถึงเซิร์ฟเวอร์ของคุณ"; "Scene.ServerPicker.Title" = "Mastodon ประกอบด้วยผู้ใช้ในเซิร์ฟเวอร์ต่าง ๆ"; "Scene.ServerRules.Button.Confirm" = "ฉันเห็นด้วย"; "Scene.ServerRules.PrivacyPolicy" = "นโยบายความเป็นส่วนตัว"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/th.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/th.lproj/Localizable.stringsdict index 897d07eca..f25561ad6 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/th.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/th.lproj/Localizable.stringsdict @@ -44,6 +44,20 @@ %ld ตัวอักษร + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + เหลืออีก %#@character_count@ + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + other + %ld ตัวอักษร + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/tr.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/tr.lproj/Localizable.strings index eec4a2940..fcee4e12e 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/tr.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/tr.lproj/Localizable.strings @@ -54,8 +54,8 @@ "Common.Controls.Actions.Share" = "Paylaş"; "Common.Controls.Actions.SharePost" = "Gönderiyi Paylaş"; "Common.Controls.Actions.ShareUser" = "%@ ile paylaş"; -"Common.Controls.Actions.SignIn" = "Giriş Yap"; -"Common.Controls.Actions.SignUp" = "Kaydol"; +"Common.Controls.Actions.SignIn" = "Log in"; +"Common.Controls.Actions.SignUp" = "Create account"; "Common.Controls.Actions.Skip" = "Atla"; "Common.Controls.Actions.TakePhoto" = "Fotoğraf Çek"; "Common.Controls.Actions.TryAgain" = "Tekrar Deneyin"; @@ -107,6 +107,10 @@ "Common.Controls.Status.Actions.Unreblog" = "Yeniden paylaşımı geri al"; "Common.Controls.Status.ContentWarning" = "İçerik Uyarısı"; "Common.Controls.Status.MediaContentWarning" = "Göstermek için herhangi bir yere basın"; +"Common.Controls.Status.MetaEntity.Email" = "Email address: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Hashtag: %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Show Profile: %@"; +"Common.Controls.Status.MetaEntity.Url" = "Link: %@"; "Common.Controls.Status.Poll.Closed" = "Kapandı"; "Common.Controls.Status.Poll.Vote" = "Oy ver"; "Common.Controls.Status.SensitiveContent" = "Hassas İçerik"; @@ -156,13 +160,21 @@ Bu kişiye göre profiliniz böyle gözüküyor."; "Scene.Compose.Accessibility.CustomEmojiPicker" = "Özel Emoji Seçici"; "Scene.Compose.Accessibility.DisableContentWarning" = "İçerik Uyarısını Kapat"; "Scene.Compose.Accessibility.EnableContentWarning" = "İçerik Uyarısını Etkinleştir"; +"Scene.Compose.Accessibility.PostOptions" = "Post Options"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "Gönderi Görünürlüğü Menüsü"; +"Scene.Compose.Accessibility.PostingAs" = "Posting as %@"; "Scene.Compose.Accessibility.RemovePoll" = "Anketi Kaldır"; "Scene.Compose.Attachment.AttachmentBroken" = "Bu %@ bozuk ve Mastodon'a yüklenemiyor."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "Attachment too large"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Can not recognize this media attachment"; +"Scene.Compose.Attachment.CompressingState" = "Compressing..."; "Scene.Compose.Attachment.DescriptionPhoto" = "Görme engelliler için fotoğrafı tarif edin..."; "Scene.Compose.Attachment.DescriptionVideo" = "Görme engelliler için videoyu tarif edin..."; +"Scene.Compose.Attachment.LoadFailed" = "Load Failed"; "Scene.Compose.Attachment.Photo" = "fotoğraf"; +"Scene.Compose.Attachment.ServerProcessingState" = "Server Processing..."; +"Scene.Compose.Attachment.UploadFailed" = "Upload Failed"; "Scene.Compose.Attachment.Video" = "video"; "Scene.Compose.AutoComplete.SpaceToAdd" = "Eklemek için boşluk tuşuna basın"; "Scene.Compose.ComposeAction" = "Yayınla"; @@ -183,6 +195,8 @@ yüklenemiyor."; "Scene.Compose.Poll.OptionNumber" = "Seçenek %ld"; "Scene.Compose.Poll.SevenDays" = "7 Gün"; "Scene.Compose.Poll.SixHours" = "6 Saat"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "The poll has empty option"; +"Scene.Compose.Poll.ThePollIsInvalid" = "The poll is invalid"; "Scene.Compose.Poll.ThirtyMinutes" = "30 dakika"; "Scene.Compose.Poll.ThreeDays" = "3 Gün"; "Scene.Compose.ReplyingToUser" = "yanıtlanıyor: %@"; @@ -225,6 +239,9 @@ yüklenemiyor."; "Scene.HomeTimeline.NavigationBarState.Published" = "Yayınlandı!"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "Gönderi yayınlanıyor..."; "Scene.HomeTimeline.Title" = "Ana Sayfa"; +"Scene.Login.ServerSearchField.Placeholder" = "Enter URL or search for your server"; +"Scene.Login.Subtitle" = "Log you in on the server you created your account on."; +"Scene.Login.Title" = "Welcome back"; "Scene.Notification.FollowRequest.Accept" = "Accept"; "Scene.Notification.FollowRequest.Accepted" = "Accepted"; "Scene.Notification.FollowRequest.Reject" = "reject"; @@ -252,6 +269,8 @@ yüklenemiyor."; "Scene.Profile.Fields.AddRow" = "Satır Ekle"; "Scene.Profile.Fields.Placeholder.Content" = "İçerik"; "Scene.Profile.Fields.Placeholder.Label" = "Etiket"; +"Scene.Profile.Fields.Verified.Long" = "Ownership of this link was checked on %@"; +"Scene.Profile.Fields.Verified.Short" = "Verified on %@"; "Scene.Profile.Header.FollowsYou" = "Seni takip ediyor"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "%@ engellemeyi onayla"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "Hesabı Engelle"; @@ -384,13 +403,11 @@ yüklenemiyor."; "Scene.ServerPicker.EmptyState.BadNetwork" = "Veriyi yüklerken bir hata oluştu. Lütfen internet bağlantınızı kontrol edin."; "Scene.ServerPicker.EmptyState.FindingServers" = "Mevcut sunucular aranıyor..."; "Scene.ServerPicker.EmptyState.NoResults" = "Sonuç yok"; -"Scene.ServerPicker.Input.Placeholder" = "Toplulukları ara"; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Sunucuları ara ya da bir bağlantı gir"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Search communities or enter URL"; "Scene.ServerPicker.Label.Category" = "KATEGORİ"; "Scene.ServerPicker.Label.Language" = "DİL"; "Scene.ServerPicker.Label.Users" = "KULLANICILAR"; -"Scene.ServerPicker.Subtitle" = "İlgi alanlarınıza, bölgenize veya genel amaçlı bir topluluk seçin."; -"Scene.ServerPicker.SubtitleExtend" = "İlgi alanlarınıza, bölgenize veya genel amaçlı bir topluluk seçin. Her topluluk tamamen bağımsız bir kuruluş veya kişi tarafından işletilmektedir."; +"Scene.ServerPicker.Subtitle" = "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers."; "Scene.ServerPicker.Title" = "Mastodon, farklı topluluklardaki kullanıcılardan oluşur."; "Scene.ServerRules.Button.Confirm" = "Kabul Ediyorum"; "Scene.ServerRules.PrivacyPolicy" = "gizlilik politikası"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/tr.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/tr.lproj/Localizable.stringsdict index 29df92c2b..6ef7f4c75 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/tr.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/tr.lproj/Localizable.stringsdict @@ -50,6 +50,22 @@ %ld karakter + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ left + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + 1 character + other + %ld characters + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/vi.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/vi.lproj/Localizable.strings index 14f36c7e7..5a14fb2cf 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/vi.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/vi.lproj/Localizable.strings @@ -56,7 +56,7 @@ Vui lòng kiểm tra kết nối mạng."; "Common.Controls.Actions.SharePost" = "Chia sẻ tút"; "Common.Controls.Actions.ShareUser" = "Chia sẻ %@"; "Common.Controls.Actions.SignIn" = "Đăng nhập"; -"Common.Controls.Actions.SignUp" = "Đăng ký"; +"Common.Controls.Actions.SignUp" = "Tạo tài khoản"; "Common.Controls.Actions.Skip" = "Bỏ qua"; "Common.Controls.Actions.TakePhoto" = "Chụp ảnh"; "Common.Controls.Actions.TryAgain" = "Thử lại"; @@ -108,6 +108,10 @@ Vui lòng kiểm tra kết nối mạng."; "Common.Controls.Status.Actions.Unreblog" = "Hủy đăng lại"; "Common.Controls.Status.ContentWarning" = "Nội dung ẩn"; "Common.Controls.Status.MediaContentWarning" = "Nhấn để hiển thị"; +"Common.Controls.Status.MetaEntity.Email" = "Email: %@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "Hashtag: %@"; +"Common.Controls.Status.MetaEntity.Mention" = "Hiện hồ sơ: %@"; +"Common.Controls.Status.MetaEntity.Url" = "Link: %@"; "Common.Controls.Status.Poll.Closed" = "Kết thúc"; "Common.Controls.Status.Poll.Vote" = "Bình chọn"; "Common.Controls.Status.SensitiveContent" = "Nội dung nhạy cảm"; @@ -151,19 +155,27 @@ Họ sẽ thấy trang của bạn như thế này."; "Scene.AccountList.AddAccount" = "Thêm tài khoản"; "Scene.AccountList.DismissAccountSwitcher" = "Bỏ qua chuyển đổi tài khoản"; "Scene.AccountList.TabBarHint" = "Đang dùng tài khoản: %@. Nhấn hai lần và giữ để đổi sang tài khoản khác"; -"Scene.Bookmark.Title" = "Bookmarks"; +"Scene.Bookmark.Title" = "Tút đã lưu"; "Scene.Compose.Accessibility.AppendAttachment" = "Thêm media"; "Scene.Compose.Accessibility.AppendPoll" = "Tạo bình chọn"; "Scene.Compose.Accessibility.CustomEmojiPicker" = "Chọn emoji"; "Scene.Compose.Accessibility.DisableContentWarning" = "Tắt nội dung ẩn"; "Scene.Compose.Accessibility.EnableContentWarning" = "Bật nội dung ẩn"; +"Scene.Compose.Accessibility.PostOptions" = "Tùy chọn đăng"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "Menu hiển thị tút"; +"Scene.Compose.Accessibility.PostingAs" = "Đăng dưới dạng %@"; "Scene.Compose.Accessibility.RemovePoll" = "Xóa bình chọn"; "Scene.Compose.Attachment.AttachmentBroken" = "%@ này bị lỗi và không thể tải lên Mastodon."; +"Scene.Compose.Attachment.AttachmentTooLarge" = "Tập tin đính kèm quá lớn"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "Không xem được tập tin đính kèm"; +"Scene.Compose.Attachment.CompressingState" = "Đang nén..."; "Scene.Compose.Attachment.DescriptionPhoto" = "Mô tả hình ảnh cho người khiếm thị..."; "Scene.Compose.Attachment.DescriptionVideo" = "Mô tả video cho người khiếm thị..."; +"Scene.Compose.Attachment.LoadFailed" = "Tải thất bại"; "Scene.Compose.Attachment.Photo" = "ảnh"; +"Scene.Compose.Attachment.ServerProcessingState" = "Máy chủ đang xử lý..."; +"Scene.Compose.Attachment.UploadFailed" = "Tải lên thất bại"; "Scene.Compose.Attachment.Video" = "video"; "Scene.Compose.AutoComplete.SpaceToAdd" = "Khoảng cách để thêm"; "Scene.Compose.ComposeAction" = "Đăng"; @@ -184,6 +196,8 @@ tải lên Mastodon."; "Scene.Compose.Poll.OptionNumber" = "Lựa chọn %ld"; "Scene.Compose.Poll.SevenDays" = "7 ngày"; "Scene.Compose.Poll.SixHours" = "6 giờ"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "Thiếu lựa chọn"; +"Scene.Compose.Poll.ThePollIsInvalid" = "Bình chọn không hợp lệ"; "Scene.Compose.Poll.ThirtyMinutes" = "30 phút"; "Scene.Compose.Poll.ThreeDays" = "3 ngày"; "Scene.Compose.ReplyingToUser" = "trả lời %@"; @@ -226,6 +240,9 @@ tải lên Mastodon."; "Scene.HomeTimeline.NavigationBarState.Published" = "Đã đăng!"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "Đang đăng tút..."; "Scene.HomeTimeline.Title" = "Bảng tin"; +"Scene.Login.ServerSearchField.Placeholder" = "Nhập URL hoặc tìm máy chủ"; +"Scene.Login.Subtitle" = "Đăng nhập vào máy chủ mà bạn đã tạo tài khoản."; +"Scene.Login.Title" = "Chào mừng trở lại!"; "Scene.Notification.FollowRequest.Accept" = "Chấp nhận"; "Scene.Notification.FollowRequest.Accepted" = "Đã chấp nhận"; "Scene.Notification.FollowRequest.Reject" = "từ chối"; @@ -253,6 +270,8 @@ tải lên Mastodon."; "Scene.Profile.Fields.AddRow" = "Thêm hàng"; "Scene.Profile.Fields.Placeholder.Content" = "Nội dung"; "Scene.Profile.Fields.Placeholder.Label" = "Nhãn"; +"Scene.Profile.Fields.Verified.Long" = "Liên kết này đã được xác minh trên %@"; +"Scene.Profile.Fields.Verified.Short" = "Đã xác minh %@"; "Scene.Profile.Header.FollowsYou" = "Đang theo dõi bạn"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "Xác nhận chặn %@"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "Chặn người này"; @@ -385,13 +404,11 @@ tải lên Mastodon."; "Scene.ServerPicker.EmptyState.BadNetwork" = "Đã xảy ra lỗi. Hãy thử lại hoặc kiểm tra kết nối internet của bạn."; "Scene.ServerPicker.EmptyState.FindingServers" = "Đang tìm máy chủ hoạt động..."; "Scene.ServerPicker.EmptyState.NoResults" = "Không có kết quả"; -"Scene.ServerPicker.Input.Placeholder" = "Tìm máy chủ"; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Tìm máy chủ hoặc nhập URL"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "Tìm một máy chủ hoặc nhập URL"; "Scene.ServerPicker.Label.Category" = "PHÂN LOẠI"; "Scene.ServerPicker.Label.Language" = "NGÔN NGỮ"; "Scene.ServerPicker.Label.Users" = "NGƯỜI"; -"Scene.ServerPicker.Subtitle" = "Chọn một máy chủ dựa theo sở thích, tôn giáo, hoặc ý muốn của bạn."; -"Scene.ServerPicker.SubtitleExtend" = "Chọn một máy chủ dựa theo sở thích, tôn giáo, hoặc ý muốn của bạn. Mỗi máy chủ có thể được vận hành bởi một cá nhân hoặc một tổ chức."; +"Scene.ServerPicker.Subtitle" = "Chọn một máy chủ dựa theo sở thích, tôn giáo, hoặc ý muốn của bạn. Bạn vẫn có thể giao tiếp với bất cứ ai mà không phụ thuộc vào máy chủ của họ."; "Scene.ServerPicker.Title" = "Mastodon gồm nhiều máy chủ với thành viên riêng."; "Scene.ServerRules.Button.Confirm" = "Tôi đồng ý"; "Scene.ServerRules.PrivacyPolicy" = "chính sách bảo mật"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/vi.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/vi.lproj/Localizable.stringsdict index 6905b240e..4c772f014 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/vi.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/vi.lproj/Localizable.stringsdict @@ -44,6 +44,20 @@ %ld ký tự + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ còn lại + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + other + %ld ký tự + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/zh-Hans.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/zh-Hans.lproj/Localizable.strings index 8e5de6b52..0c779d293 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/zh-Hans.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/zh-Hans.lproj/Localizable.strings @@ -56,7 +56,7 @@ "Common.Controls.Actions.SharePost" = "分享帖子"; "Common.Controls.Actions.ShareUser" = "分享 %@"; "Common.Controls.Actions.SignIn" = "登录"; -"Common.Controls.Actions.SignUp" = "注册"; +"Common.Controls.Actions.SignUp" = "创建账户"; "Common.Controls.Actions.Skip" = "跳过"; "Common.Controls.Actions.TakePhoto" = "拍照"; "Common.Controls.Actions.TryAgain" = "再试一次"; @@ -68,13 +68,13 @@ "Common.Controls.Friendship.EditInfo" = "编辑"; "Common.Controls.Friendship.Follow" = "关注"; "Common.Controls.Friendship.Following" = "正在关注"; -"Common.Controls.Friendship.HideReblogs" = "Hide Reblogs"; +"Common.Controls.Friendship.HideReblogs" = "隐藏转发"; "Common.Controls.Friendship.Mute" = "静音"; "Common.Controls.Friendship.MuteUser" = "静音 %@"; "Common.Controls.Friendship.Muted" = "已静音"; "Common.Controls.Friendship.Pending" = "待确认"; "Common.Controls.Friendship.Request" = "请求"; -"Common.Controls.Friendship.ShowReblogs" = "Show Reblogs"; +"Common.Controls.Friendship.ShowReblogs" = "显示转发"; "Common.Controls.Friendship.Unblock" = "解除屏蔽"; "Common.Controls.Friendship.UnblockUser" = "解除屏蔽 %@"; "Common.Controls.Friendship.Unmute" = "取消静音"; @@ -108,6 +108,10 @@ "Common.Controls.Status.Actions.Unreblog" = "取消转发"; "Common.Controls.Status.ContentWarning" = "内容警告"; "Common.Controls.Status.MediaContentWarning" = "点击任意位置显示"; +"Common.Controls.Status.MetaEntity.Email" = "邮箱地址：%@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "话题：%@"; +"Common.Controls.Status.MetaEntity.Mention" = "显示用户资料：%@"; +"Common.Controls.Status.MetaEntity.Url" = "链接：%@"; "Common.Controls.Status.Poll.Closed" = "已关闭"; "Common.Controls.Status.Poll.Vote" = "投票"; "Common.Controls.Status.SensitiveContent" = "敏感内容"; @@ -151,19 +155,27 @@ "Scene.AccountList.AddAccount" = "添加账户"; "Scene.AccountList.DismissAccountSwitcher" = "关闭账户切换页面"; "Scene.AccountList.TabBarHint" = "当前账户：%@。 双击并按住来打开账户切换页面"; -"Scene.Bookmark.Title" = "Bookmarks"; +"Scene.Bookmark.Title" = "书签"; "Scene.Compose.Accessibility.AppendAttachment" = "添加附件"; "Scene.Compose.Accessibility.AppendPoll" = "添加投票"; "Scene.Compose.Accessibility.CustomEmojiPicker" = "自定义表情选择器"; "Scene.Compose.Accessibility.DisableContentWarning" = "关闭内容警告"; "Scene.Compose.Accessibility.EnableContentWarning" = "启用内容警告"; +"Scene.Compose.Accessibility.PostOptions" = "帖子选项"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "帖子可见性"; +"Scene.Compose.Accessibility.PostingAs" = "以 %@ 身份发布"; "Scene.Compose.Accessibility.RemovePoll" = "移除投票"; "Scene.Compose.Attachment.AttachmentBroken" = "%@已损坏 无法上传到 Mastodon"; +"Scene.Compose.Attachment.AttachmentTooLarge" = "附件太大"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "无法识别此媒体"; +"Scene.Compose.Attachment.CompressingState" = "压缩中..."; "Scene.Compose.Attachment.DescriptionPhoto" = "为视觉障碍人士添加照片的文字说明..."; "Scene.Compose.Attachment.DescriptionVideo" = "为视觉障碍人士添加视频的文字说明..."; +"Scene.Compose.Attachment.LoadFailed" = "加载失败"; "Scene.Compose.Attachment.Photo" = "照片"; +"Scene.Compose.Attachment.ServerProcessingState" = "服务器正在处理..."; +"Scene.Compose.Attachment.UploadFailed" = "上传失败"; "Scene.Compose.Attachment.Video" = "视频"; "Scene.Compose.AutoComplete.SpaceToAdd" = "输入空格键入"; "Scene.Compose.ComposeAction" = "发送"; @@ -184,6 +196,8 @@ "Scene.Compose.Poll.OptionNumber" = "选项 %ld"; "Scene.Compose.Poll.SevenDays" = "7 天"; "Scene.Compose.Poll.SixHours" = "6 小时"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "投票含有空选项"; +"Scene.Compose.Poll.ThePollIsInvalid" = "投票无效"; "Scene.Compose.Poll.ThirtyMinutes" = "30 分钟"; "Scene.Compose.Poll.ThreeDays" = "3 天"; "Scene.Compose.ReplyingToUser" = "回复给 %@"; @@ -226,6 +240,9 @@ "Scene.HomeTimeline.NavigationBarState.Published" = "已发送"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "正在发送..."; "Scene.HomeTimeline.Title" = "主页"; +"Scene.Login.ServerSearchField.Placeholder" = "输入网址或搜索您的服务器"; +"Scene.Login.Subtitle" = "登入您账户所在的服务器。"; +"Scene.Login.Title" = "欢迎回来"; "Scene.Notification.FollowRequest.Accept" = "接受"; "Scene.Notification.FollowRequest.Accepted" = "已接受"; "Scene.Notification.FollowRequest.Reject" = "拒绝"; @@ -253,15 +270,17 @@ "Scene.Profile.Fields.AddRow" = "添加"; "Scene.Profile.Fields.Placeholder.Content" = "内容"; "Scene.Profile.Fields.Placeholder.Label" = "标签"; +"Scene.Profile.Fields.Verified.Long" = "此链接的所有权已在 %@ 上检查通过"; +"Scene.Profile.Fields.Verified.Short" = "验证于 %@"; "Scene.Profile.Header.FollowsYou" = "关注了你"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "确认屏蔽 %@"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "屏蔽帐户"; -"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Message" = "Confirm to hide reblogs"; -"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Title" = "Hide Reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Message" = "确认隐藏转发"; +"Scene.Profile.RelationshipActionAlert.ConfirmHideReblogs.Title" = "隐藏转发"; "Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Message" = "确认静音 %@"; "Scene.Profile.RelationshipActionAlert.ConfirmMuteUser.Title" = "静音账户"; -"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message" = "Confirm to show reblogs"; -"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Title" = "Show Reblogs"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Message" = "确认显示转发"; +"Scene.Profile.RelationshipActionAlert.ConfirmShowReblogs.Title" = "显示转发"; "Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Message" = "确认取消屏蔽 %@"; "Scene.Profile.RelationshipActionAlert.ConfirmUnblockUser.Title" = "解除屏蔽帐户"; "Scene.Profile.RelationshipActionAlert.ConfirmUnmuteUser.Message" = "确认取消静音 %@"; @@ -385,13 +404,11 @@ "Scene.ServerPicker.EmptyState.BadNetwork" = "出了些问题。请检查你的互联网连接"; "Scene.ServerPicker.EmptyState.FindingServers" = "正在查找可用的服务器..."; "Scene.ServerPicker.EmptyState.NoResults" = "无结果"; -"Scene.ServerPicker.Input.Placeholder" = "查找或加入你自己的服务器..."; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "搜索服务器或输入 URL"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "搜索社区或输入 URL"; "Scene.ServerPicker.Label.Category" = "类别"; "Scene.ServerPicker.Label.Language" = "语言"; "Scene.ServerPicker.Label.Users" = "用户"; -"Scene.ServerPicker.Subtitle" = "根据你的兴趣、区域或一般目的选择一个社区。"; -"Scene.ServerPicker.SubtitleExtend" = "根据你的兴趣、区域或一般目的选择一个社区。每个社区都由完全独立的组织或个人管理。"; +"Scene.ServerPicker.Subtitle" = "根据你的地区、兴趣挑选一个服务器。无论你选择哪个服务器，你都可以跟其他服务器的任何人一起聊天。"; "Scene.ServerPicker.Title" = "挑选一个服务器， 任意服务器。"; "Scene.ServerRules.Button.Confirm" = "我同意"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/zh-Hans.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/zh-Hans.lproj/Localizable.stringsdict index 5a7af3752..362d55c4f 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/zh-Hans.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/zh-Hans.lproj/Localizable.stringsdict @@ -44,6 +44,20 @@ %ld 个字符 + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + %#@character_count@ 剩余 + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + other + %ld 个字符 + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/zh-Hant.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/zh-Hant.lproj/Localizable.strings index f97926795..10dbbf8ca 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/zh-Hant.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/zh-Hant.lproj/Localizable.strings @@ -56,7 +56,7 @@ "Common.Controls.Actions.SharePost" = "分享嘟文"; "Common.Controls.Actions.ShareUser" = "分享 %@"; "Common.Controls.Actions.SignIn" = "登入"; -"Common.Controls.Actions.SignUp" = "註冊"; +"Common.Controls.Actions.SignUp" = "新增帳號"; "Common.Controls.Actions.Skip" = "跳過"; "Common.Controls.Actions.TakePhoto" = "拍攝照片"; "Common.Controls.Actions.TryAgain" = "再試一次"; @@ -108,6 +108,10 @@ "Common.Controls.Status.Actions.Unreblog" = "取消轉嘟"; "Common.Controls.Status.ContentWarning" = "內容警告"; "Common.Controls.Status.MediaContentWarning" = "輕觸任何地方以顯示"; +"Common.Controls.Status.MetaEntity.Email" = "電子郵件地址：%@"; +"Common.Controls.Status.MetaEntity.Hashtag" = "主題標籤： %@"; +"Common.Controls.Status.MetaEntity.Mention" = "顯示個人檔案：%@"; +"Common.Controls.Status.MetaEntity.Url" = "連結：%@"; "Common.Controls.Status.Poll.Closed" = "已關閉"; "Common.Controls.Status.Poll.Vote" = "投票"; "Common.Controls.Status.SensitiveContent" = "敏感內容"; @@ -147,18 +151,26 @@ "Scene.AccountList.AddAccount" = "新增帳號"; "Scene.AccountList.DismissAccountSwitcher" = "關閉帳號切換器"; "Scene.AccountList.TabBarHint" = "目前已選擇的個人檔案：%@。點兩下然後按住以顯示帳號切換器"; -"Scene.Bookmark.Title" = "Bookmarks"; +"Scene.Bookmark.Title" = "書籤"; "Scene.Compose.Accessibility.AppendAttachment" = "新增附件"; "Scene.Compose.Accessibility.AppendPoll" = "新增投票"; "Scene.Compose.Accessibility.CustomEmojiPicker" = "自訂 emoji 選擇器"; "Scene.Compose.Accessibility.DisableContentWarning" = "停用內容警告"; "Scene.Compose.Accessibility.EnableContentWarning" = "啟用內容警告"; +"Scene.Compose.Accessibility.PostOptions" = "嘟文選項"; "Scene.Compose.Accessibility.PostVisibilityMenu" = "嘟文可見性選單"; +"Scene.Compose.Accessibility.PostingAs" = "以 %@ 發嘟"; "Scene.Compose.Accessibility.RemovePoll" = "移除投票"; "Scene.Compose.Attachment.AttachmentBroken" = "此 %@ 已損毀，並無法被上傳至 Mastodon。"; +"Scene.Compose.Attachment.AttachmentTooLarge" = "附加檔案大小過大"; +"Scene.Compose.Attachment.CanNotRecognizeThisMediaAttachment" = "無法識別此媒體附加檔案"; +"Scene.Compose.Attachment.CompressingState" = "正在壓縮..."; "Scene.Compose.Attachment.DescriptionPhoto" = "為視障人士提供圖片說明..."; "Scene.Compose.Attachment.DescriptionVideo" = "為視障人士提供影片說明..."; +"Scene.Compose.Attachment.LoadFailed" = "讀取失敗"; "Scene.Compose.Attachment.Photo" = "照片"; +"Scene.Compose.Attachment.ServerProcessingState" = "伺服器處理中..."; +"Scene.Compose.Attachment.UploadFailed" = "上傳失敗"; "Scene.Compose.Attachment.Video" = "影片"; "Scene.Compose.AutoComplete.SpaceToAdd" = "添加的空白"; "Scene.Compose.ComposeAction" = "嘟出去"; @@ -179,6 +191,8 @@ "Scene.Compose.Poll.OptionNumber" = "選項 %ld"; "Scene.Compose.Poll.SevenDays" = "七天"; "Scene.Compose.Poll.SixHours" = "六小時"; +"Scene.Compose.Poll.ThePollHasEmptyOption" = "此投票有空白選項"; +"Scene.Compose.Poll.ThePollIsInvalid" = "此投票是無效的"; "Scene.Compose.Poll.ThirtyMinutes" = "30 分鐘"; "Scene.Compose.Poll.ThreeDays" = "三天"; "Scene.Compose.ReplyingToUser" = "正在回覆 %@"; @@ -221,6 +235,9 @@ "Scene.HomeTimeline.NavigationBarState.Published" = "嘟出去！"; "Scene.HomeTimeline.NavigationBarState.Publishing" = "發表嘟文..."; "Scene.HomeTimeline.Title" = "首頁"; +"Scene.Login.ServerSearchField.Placeholder" = "請輸入 URL 或搜尋您的伺服器"; +"Scene.Login.Subtitle" = "登入您新增帳號之伺服器"; +"Scene.Login.Title" = "歡迎回來"; "Scene.Notification.FollowRequest.Accept" = "接受"; "Scene.Notification.FollowRequest.Accepted" = "已接受"; "Scene.Notification.FollowRequest.Reject" = "拒絕"; @@ -248,6 +265,8 @@ "Scene.Profile.Fields.AddRow" = "新增列"; "Scene.Profile.Fields.Placeholder.Content" = "內容"; "Scene.Profile.Fields.Placeholder.Label" = "標籤"; +"Scene.Profile.Fields.Verified.Long" = "已在 %@ 檢查此連結的擁有者權限"; +"Scene.Profile.Fields.Verified.Short" = "於 %@ 上已驗證"; "Scene.Profile.Header.FollowsYou" = "跟隨了您"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Message" = "確認將 %@ 封鎖"; "Scene.Profile.RelationshipActionAlert.ConfirmBlockUser.Title" = "封鎖"; @@ -380,13 +399,11 @@ "Scene.ServerPicker.EmptyState.BadNetwork" = "讀取資料時發生錯誤。請檢查您的網路連線。"; "Scene.ServerPicker.EmptyState.FindingServers" = "尋找可用的伺服器..."; "Scene.ServerPicker.EmptyState.NoResults" = "沒有結果"; -"Scene.ServerPicker.Input.Placeholder" = "搜尋伺服器"; -"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "搜尋伺服器或輸入網址"; +"Scene.ServerPicker.Input.SearchServersOrEnterUrl" = "搜尋社群或輸入 URL 地址"; "Scene.ServerPicker.Label.Category" = "分類"; "Scene.ServerPicker.Label.Language" = "語言"; "Scene.ServerPicker.Label.Users" = "使用者"; -"Scene.ServerPicker.Subtitle" = "基於您的興趣、地區、或一般用途選定一個伺服器。"; -"Scene.ServerPicker.SubtitleExtend" = "基於您的興趣、地區、或一般用途選定一個伺服器。每個伺服器是由完全獨立的組織或個人營運。"; +"Scene.ServerPicker.Subtitle" = "基於您的興趣、地區、或一般用途選定一個伺服器。您仍會與任何伺服器中的每個人連結。"; "Scene.ServerPicker.Title" = "Mastodon 由不同伺服器的使用者組成。"; "Scene.ServerRules.Button.Confirm" = "我已閱讀並同意"; "Scene.ServerRules.PrivacyPolicy" = "隱私權政策"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/zh-Hant.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/zh-Hant.lproj/Localizable.stringsdict index c0ce0f9a2..d545fd6a4 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/zh-Hant.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/zh-Hant.lproj/Localizable.stringsdict @@ -44,6 +44,20 @@ %ld 個字 + a11y.plural.count.characters_left + + NSStringLocalizedFormatKey + 剩餘 %#@character_count@ 字 + character_count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + other + %ld 個字 + + plural.count.followed_by_and_mutual NSStringLocalizedFormatKey diff --git a/MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+V2+Media.swift b/MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+V2+Media.swift index 4f8ac71d5..6c905438c 100644 --- a/MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+V2+Media.swift +++ b/MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+V2+Media.swift @@ -43,6 +43,20 @@ extension Mastodon.API.V2.Media { request.timeoutInterval = 180 // should > 200 Kb/s for 40 MiB media attachment let serialStream = query.serialStream request.httpBodyStream = serialStream.boundStreams.input + + // total unit count in bytes count + // will small than actally count due to multipart protocol meta + serialStream.progress.totalUnitCount = { + var size = 0 + size += query.file?.sizeInByte ?? 0 + size += query.thumbnail?.sizeInByte ?? 0 + return Int64(size) + }() + query.progress.addChild( + serialStream.progress, + withPendingUnitCount: query.progress.totalUnitCount + ) + return session.dataTaskPublisher(for: request) .tryMap { data, response in let value = try Mastodon.API.decode(type: Mastodon.Entity.Attachment.self, from: data, response: response) diff --git a/MastodonSDK/Sources/MastodonSDK/API/Mastodon+API.swift b/MastodonSDK/Sources/MastodonSDK/API/Mastodon+API.swift index 43d5873d0..5d507bace 100644 --- a/MastodonSDK/Sources/MastodonSDK/API/Mastodon+API.swift +++ b/MastodonSDK/Sources/MastodonSDK/API/Mastodon+API.swift @@ -11,7 +11,7 @@ import enum NIOHTTP1.HTTPResponseStatus extension Mastodon.API { - static let timeoutInterval: TimeInterval = 10 + static let timeoutInterval: TimeInterval = 60 static let httpHeaderDateFormatter: ISO8601DateFormatter = { var formatter = ISO8601DateFormatter() diff --git a/MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Server.swift b/MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Server.swift index 2d1f9953f..4267810b7 100644 --- a/MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Server.swift +++ b/MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Server.swift @@ -9,7 +9,7 @@ import Foundation extension Mastodon.Entity { - public struct Server: Codable, Equatable { + public struct Server: Codable, Equatable, Hashable { public let domain: String public let version: String public let description: String diff --git a/MastodonSDK/Sources/MastodonSDK/Query/MediaAttachment.swift b/MastodonSDK/Sources/MastodonSDK/Query/MediaAttachment.swift index f1fdac8bb..05639964e 100644 --- a/MastodonSDK/Sources/MastodonSDK/Query/MediaAttachment.swift +++ b/MastodonSDK/Sources/MastodonSDK/Query/MediaAttachment.swift @@ -54,7 +54,7 @@ extension Mastodon.Query.MediaAttachment { return data.map { "data:" + mimeType + ";base64," + $0.base64EncodedString() } } - var sizeInByte: Int? { + public var sizeInByte: Int? { switch self { case .jpeg(let data), .gif(let data), .png(let data): return data?.count diff --git a/MastodonSDK/Sources/MastodonSDK/Query/SerialStream.swift b/MastodonSDK/Sources/MastodonSDK/Query/SerialStream.swift index 5d806b6ba..5808b9f6d 100644 --- a/MastodonSDK/Sources/MastodonSDK/Query/SerialStream.swift +++ b/MastodonSDK/Sources/MastodonSDK/Query/SerialStream.swift @@ -82,6 +82,10 @@ final class SerialStream: NSObject { self.progress.completedUnitCount += Int64(writeResult) self.logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): estimate progress: \(self.progress.completedUnitCount)/\(self.progress.totalUnitCount)") + + if writeResult == -1 { + break + } } } diff --git a/MastodonSDK/Sources/MastodonUI/DataSource/CustomEmojiPickerSection+Diffable.swift b/MastodonSDK/Sources/MastodonUI/DataSource/CustomEmojiPickerSection+Diffable.swift index ca3658e95..4c142b532 100644 --- a/MastodonSDK/Sources/MastodonUI/DataSource/CustomEmojiPickerSection+Diffable.swift +++ b/MastodonSDK/Sources/MastodonUI/DataSource/CustomEmojiPickerSection+Diffable.swift @@ -5,55 +5,55 @@ // Created by MainasuK on 22/10/10. // -import Foundation +import UIKit import MastodonCore extension CustomEmojiPickerSection { -// static func collectionViewDiffableDataSource( -// collectionView: UICollectionView, -// dependency: NeedsDependency -// ) -> UICollectionViewDiffableDataSource { -// let dataSource = UICollectionViewDiffableDataSource(collectionView: collectionView) { [weak dependency] collectionView, indexPath, item -> UICollectionViewCell? in -// guard let _ = dependency else { return nil } -// switch item { -// case .emoji(let attribute): -// let cell = collectionView.dequeueReusableCell(withReuseIdentifier: String(describing: CustomEmojiPickerItemCollectionViewCell.self), for: indexPath) as! CustomEmojiPickerItemCollectionViewCell -// let placeholder = UIImage.placeholder(size: CustomEmojiPickerItemCollectionViewCell.itemSize, color: .systemFill) -// .af.imageRounded(withCornerRadius: 4) -// -// let isAnimated = !UserDefaults.shared.preferredStaticEmoji -// let url = URL(string: isAnimated ? attribute.emoji.url : attribute.emoji.staticURL) -// cell.emojiImageView.sd_setImage( -// with: url, -// placeholderImage: placeholder, -// options: [], -// context: nil -// ) -// cell.accessibilityLabel = attribute.emoji.shortcode -// return cell -// } -// } -// -// dataSource.supplementaryViewProvider = { [weak dataSource] collectionView, kind, indexPath -> UICollectionReusableView? in -// guard let dataSource = dataSource else { return nil } -// let sections = dataSource.snapshot().sectionIdentifiers -// guard indexPath.section < sections.count else { return nil } -// let section = sections[indexPath.section] -// -// switch kind { -// case String(describing: CustomEmojiPickerHeaderCollectionReusableView.self): -// let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: String(describing: CustomEmojiPickerHeaderCollectionReusableView.self), for: indexPath) as! CustomEmojiPickerHeaderCollectionReusableView -// switch section { -// case .emoji(let name): -// header.titleLabel.text = name -// } -// return header -// default: -// assertionFailure() -// return nil -// } -// } -// -// return dataSource -// } + static func collectionViewDiffableDataSource( + collectionView: UICollectionView, + context: AppContext + ) -> UICollectionViewDiffableDataSource { + let dataSource = UICollectionViewDiffableDataSource(collectionView: collectionView) { [weak context] collectionView, indexPath, item -> UICollectionViewCell? in + guard let _ = context else { return nil } + switch item { + case .emoji(let attribute): + let cell = collectionView.dequeueReusableCell(withReuseIdentifier: String(describing: CustomEmojiPickerItemCollectionViewCell.self), for: indexPath) as! CustomEmojiPickerItemCollectionViewCell + let placeholder = UIImage.placeholder(size: CustomEmojiPickerItemCollectionViewCell.itemSize, color: .systemFill) + .af.imageRounded(withCornerRadius: 4) + + let isAnimated = !UserDefaults.shared.preferredStaticEmoji + let url = URL(string: isAnimated ? attribute.emoji.url : attribute.emoji.staticURL) + cell.emojiImageView.sd_setImage( + with: url, + placeholderImage: placeholder, + options: [], + context: nil + ) + cell.accessibilityLabel = attribute.emoji.shortcode + return cell + } + } + + dataSource.supplementaryViewProvider = { [weak dataSource] collectionView, kind, indexPath -> UICollectionReusableView? in + guard let dataSource = dataSource else { return nil } + let sections = dataSource.snapshot().sectionIdentifiers + guard indexPath.section < sections.count else { return nil } + let section = sections[indexPath.section] + + switch kind { + case String(describing: CustomEmojiPickerHeaderCollectionReusableView.self): + let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: String(describing: CustomEmojiPickerHeaderCollectionReusableView.self), for: indexPath) as! CustomEmojiPickerHeaderCollectionReusableView + switch section { + case .emoji(let name): + header.titleLabel.text = name + } + return header + default: + assertionFailure() + return nil + } + } + + return dataSource + } } diff --git a/MastodonSDK/Sources/MastodonUI/Extension/MetaLabel.swift b/MastodonSDK/Sources/MastodonUI/Extension/MetaLabel.swift index 22c05a969..3e2c6853c 100644 --- a/MastodonSDK/Sources/MastodonUI/Extension/MetaLabel.swift +++ b/MastodonSDK/Sources/MastodonUI/Extension/MetaLabel.swift @@ -66,7 +66,9 @@ extension MetaLabel { textColor = Asset.Colors.Label.primary.color textAlignment = .center paragraphStyle.alignment = .center - + numberOfLines = 0 + textContainer.maximumNumberOfLines = 0 + case .statusSpoilerBanner: font = UIFontMetrics(forTextStyle: .headline).scaledFont(for: .systemFont(ofSize: 17, weight: .regular)) textColor = Asset.Colors.Label.primary.color diff --git a/MastodonSDK/Sources/MastodonUI/Extension/View.swift b/MastodonSDK/Sources/MastodonUI/Extension/View.swift new file mode 100644 index 000000000..756e51b64 --- /dev/null +++ b/MastodonSDK/Sources/MastodonUI/Extension/View.swift @@ -0,0 +1,21 @@ +// +// View.swift +// +// +// Created by MainasuK on 2022/11/8. +// + +import SwiftUI + +extension View { + public func badgeView(_ content: Content) -> some View where Content: View { + overlay( + ZStack { + content + } + .alignmentGuide(.top) { $0.height / 2 } + .alignmentGuide(.trailing) { $0.width / 2 } + .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topTrailing) + ) + } +} diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentView.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentView.swift index f4d1397a9..9346c3bee 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentView.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentView.swift @@ -10,237 +10,194 @@ import UIKit import SwiftUI import Introspect import AVKit +import MastodonAsset +import MastodonLocalization +import Introspect public struct AttachmentView: View { - static let size = CGSize(width: 56, height: 56) - static let cornerRadius: CGFloat = 8 - @ObservedObject var viewModel: AttachmentViewModel - - let action: (Action) -> Void - - @State var isCaptionEditorPresented = false - @State var caption = "" + + var blurEffect: UIBlurEffect { + UIBlurEffect(style: .systemUltraThinMaterialDark) + } public var body: some View { - Text("Hello") -// Menu { -// menu -// } label: { -// let image = viewModel.thumbnail ?? .placeholder(color: .systemGray3) -// Image(uiImage: image) -// .resizable() -// .aspectRatio(contentMode: .fill) -// .frame(width: AttachmentView.size.width, height: AttachmentView.size.height) -// .overlay { -// ZStack { -// // spinner -// if viewModel.output == nil { -// Color.clear -// .background(.ultraThinMaterial) -// ProgressView() -// .progressViewStyle(CircularProgressViewStyle()) -// .foregroundStyle(.regularMaterial) -// } -// // border -// RoundedRectangle(cornerRadius: AttachmentView.cornerRadius) -// .stroke(Color.black.opacity(0.05)) -// } -// .transition(.opacity) -// } -// .overlay(alignment: .bottom) { -// HStack(alignment: .bottom) { -// // alt -// VStack(spacing: 2) { -// switch viewModel.output { -// case .video: -// Image(uiImage: Asset.Media.playerRectangle.image) -// .resizable() -// .frame(width: 16, height: 12) -// default: -// EmptyView() -// } -// if !viewModel.caption.isEmpty { -// Image(uiImage: Asset.Media.altRectangle.image) -// .resizable() -// .frame(width: 16, height: 12) -// } -// } -// Spacer() -// // option -// Image(systemName: "ellipsis") -// .resizable() -// .frame(width: 12, height: 12) -// .symbolVariant(.circle) -// .symbolVariant(.fill) -// .symbolRenderingMode(.palette) -// .foregroundStyle(.white, .black) -// } -// .padding(6) -// } -// .cornerRadius(AttachmentView.cornerRadius) -// } // end Menu -// .sheet(isPresented: $isCaptionEditorPresented) { -// captionSheet -// } // end caption sheet -// .sheet(isPresented: $viewModel.isPreviewPresented) { -// previewSheet -// } // end preview sheet - + Color.clear.aspectRatio(358.0/232.0, contentMode: .fill) + .overlay( + ZStack { + let image = viewModel.thumbnail ?? .placeholder(color: .secondarySystemFill) + Image(uiImage: image) + .resizable() + .aspectRatio(contentMode: .fill) + } + ) + .overlay( + ZStack { + Color.clear + .overlay( + VStack(alignment: .leading) { + let placeholder: String = { + switch viewModel.output { + case .image: return L10n.Scene.Compose.Attachment.descriptionPhoto + case .video: return L10n.Scene.Compose.Attachment.descriptionVideo + case nil: return "" + } + }() + Spacer() + TextField(placeholder, text: $viewModel.caption) + .lineLimit(1) + .textFieldStyle(.plain) + .foregroundColor(.white) + .placeholder(placeholder, when: viewModel.caption.isEmpty) + .padding(8) + } + ) + + // loading… + if viewModel.output == nil, viewModel.error == nil { + ProgressView() + .progressViewStyle(.circular) + } + + // load failed + // cannot re-entry + if viewModel.output == nil, let error = viewModel.error { + VisualEffectView(effect: blurEffect) + VStack { + Text(L10n.Scene.Compose.Attachment.loadFailed) + .font(.system(size: 13, weight: .semibold)) + Text(error.localizedDescription) + .font(.system(size: 12, weight: .regular)) + } + } + + // loaded + // uploading… or upload failed + // could retry upload when error emit + if viewModel.output != nil, viewModel.uploadState != .finish { + VisualEffectView(effect: blurEffect) + VStack { + let action: AttachmentViewModel.Action = { + if let _ = viewModel.error { + return .retry + } else { + return .remove + } + }() + Button { + viewModel.delegate?.attachmentViewModel(viewModel, actionButtonDidPressed: action) + } label: { + let image: UIImage = { + switch action { + case .remove: + return Asset.Scene.Compose.Attachment.stop.image.withRenderingMode(.alwaysTemplate) + case .retry: + return Asset.Scene.Compose.Attachment.retry.image.withRenderingMode(.alwaysTemplate) + } + }() + Image(uiImage: image) + .foregroundColor(.white) + .padding() + .background(Color(Asset.Scene.Compose.Attachment.indicatorButtonBackground.color)) + .overlay( + Group { + switch viewModel.uploadState { + case .compressing: + CircleProgressView(progress: viewModel.videoCompressProgress) + .animation(.default, value: viewModel.videoCompressProgress) + case .uploading: + CircleProgressView(progress: viewModel.fractionCompleted) + .animation(.default, value: viewModel.fractionCompleted) + default: + EmptyView() + } + } + ) + .clipShape(Circle()) + .padding() + } + + let title: String = { + switch action { + case .remove: + switch viewModel.uploadState { + case .compressing: + return L10n.Scene.Compose.Attachment.compressingState + default: + if viewModel.fractionCompleted < 0.9 { + let totalSizeInByte = viewModel.outputSizeInByte + let uploadSizeInByte = Double(totalSizeInByte) * min(1.0, viewModel.fractionCompleted + 0.1) // 9:1 + let total = viewModel.byteCountFormatter.string(fromByteCount: Int64(totalSizeInByte)) + let upload = viewModel.byteCountFormatter.string(fromByteCount: Int64(uploadSizeInByte)) + return "\(upload) / \(total)" + } else { + return L10n.Scene.Compose.Attachment.serverProcessingState + } + } + case .retry: + return L10n.Scene.Compose.Attachment.uploadFailed + } + }() + let subtitle: String = { + switch action { + case .remove: + if viewModel.progress.fractionCompleted < 1, viewModel.uploadState == .uploading { + if viewModel.progress.fractionCompleted < 0.9 { + return viewModel.remainTimeLocalizedString ?? "" + } else { + return "" + } + } else if viewModel.videoCompressProgress < 1, viewModel.uploadState == .compressing { + return viewModel.percentageFormatter.string(from: NSNumber(floatLiteral: viewModel.videoCompressProgress)) ?? "" + } else { + return "" + } + case .retry: + return viewModel.error?.localizedDescription ?? "" + } + }() + Text(title) + .font(.system(size: 13, weight: .semibold)) + .foregroundColor(.white) + .padding(.horizontal) + Text(subtitle) + .font(.system(size: 12, weight: .regular)) + .foregroundColor(.white) + .padding(.horizontal) + .lineLimit(nil) + .multilineTextAlignment(.center) + .frame(maxWidth: 240) + } + } + } // end ZStack + ) } // end body -// var menu: some View { -// Group { -// Button( -// action: { -// action(.preview) -// }, -// label: { -// Label(L10n.Scene.Compose.Media.preview, systemImage: "photo") -// } -// ) -// // caption -// let canAddCaption: Bool = { -// switch viewModel.output { -// case .image: return true -// case .video: return false -// case .none: return false -// } -// }() -// if canAddCaption { -// Button( -// action: { -// action(.caption) -// caption = viewModel.caption -// isCaptionEditorPresented.toggle() -// }, -// label: { -// let title = viewModel.caption.isEmpty ? L10n.Scene.Compose.Media.Caption.add : L10n.Scene.Compose.Media.Caption.update -// Label(title, systemImage: "text.bubble") -// // FIXME: https://stackoverflow.com/questions/72318730/how-to-customize-swiftui-menu -// // add caption subtitle -// } -// ) -// } -// Divider() -// // remove -// Button( -// role: .destructive, -// action: { -// action(.remove) -// }, -// label: { -// Label(L10n.Scene.Compose.Media.remove, systemImage: "minus.circle") -// } -// ) -// } -// } - -// var captionSheet: some View { -// NavigationView { -// ScrollView(.vertical) { -// VStack { -// // preview -// switch viewModel.output { -// case .image: -// let image = viewModel.thumbnail ?? .placeholder(color: .systemGray3) -// Image(uiImage: image) -// .resizable() -// .aspectRatio(contentMode: .fill) -// case .video(let url, _): -// let player = AVPlayer(url: url) -// VideoPlayer(player: player) -// .frame(height: 300) -// case .none: -// EmptyView() -// } -// // caption textField -// TextField( -// text: $caption, -// prompt: Text(L10n.Scene.Compose.Media.Caption.addADescriptionForThisImage) -// ) { -// Text(L10n.Scene.Compose.Media.Caption.update) -// } -// .padding() -// .introspectTextField { textField in -// textField.becomeFirstResponder() -// } -// } -// } -// .navigationTitle(L10n.Scene.Compose.Media.Caption.update) -// .navigationBarTitleDisplayMode(.inline) -// .toolbar { -// ToolbarItem(placement: .navigationBarLeading) { -// Button { -// isCaptionEditorPresented.toggle() -// } label: { -// Image(systemName: "xmark.circle.fill") -// .resizable() -// .frame(width: 30, height: 30, alignment: .center) -// .symbolRenderingMode(.hierarchical) -// .foregroundStyle(Color(uiColor: .secondaryLabel), Color(uiColor: .tertiaryLabel)) -// } -// } -// ToolbarItem(placement: .navigationBarTrailing) { -// Button { -// viewModel.caption = caption.trimmingCharacters(in: .whitespacesAndNewlines) -// isCaptionEditorPresented.toggle() -// } label: { -// Text(L10n.Common.Controls.Actions.save) -// } -// } -// } -// } // end NavigationView -// } - - // design for share extension - // preferred UIKit preview in app -// var previewSheet: some View { -// NavigationView { -// ScrollView(.vertical) { -// VStack { -// // preview -// switch viewModel.output { -// case .image: -// let image = viewModel.thumbnail ?? .placeholder(color: .systemGray3) -// Image(uiImage: image) -// .resizable() -// .aspectRatio(contentMode: .fill) -// case .video(let url, _): -// let player = AVPlayer(url: url) -// VideoPlayer(player: player) -// .frame(height: 300) -// case .none: -// EmptyView() -// } -// Spacer() -// } -// } -// .navigationTitle(L10n.Scene.Compose.Media.preview) -// .navigationBarTitleDisplayMode(.inline) -// .toolbar { -// ToolbarItem(placement: .navigationBarLeading) { -// Button { -// viewModel.isPreviewPresented.toggle() -// } label: { -// Image(systemName: "xmark.circle.fill") -// .resizable() -// .frame(width: 30, height: 30, alignment: .center) -// .symbolRenderingMode(.hierarchical) -// .foregroundStyle(Color(uiColor: .secondaryLabel), Color(uiColor: .tertiaryLabel)) -// } -// } -// } -// } // end NavigationView -// } - } -extension AttachmentView { - public enum Action: Hashable { - case preview - case caption - case remove +// https://stackoverflow.com/a/57715771/3797903 +extension View { + fileprivate func placeholder( + when shouldShow: Bool, + alignment: Alignment = .leading, + @ViewBuilder placeholder: () -> Content) -> some View { + + ZStack(alignment: alignment) { + placeholder().opacity(shouldShow ? 1 : 0) + self + } + } + + fileprivate func placeholder( + _ text: String, + when shouldShow: Bool, + alignment: Alignment = .leading) -> some View { + + placeholder(when: shouldShow, alignment: alignment) { + Text(text) + .foregroundColor(.white.opacity(0.7)) + .lineLimit(1) + } } } diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+Compress.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+Compress.swift new file mode 100644 index 000000000..e5d6702ad --- /dev/null +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+Compress.swift @@ -0,0 +1,94 @@ +// +// AttachmentViewModel+Compress.swift +// +// +// Created by MainasuK on 2022/11/11. +// + +import os.log +import UIKit +import AVKit +import SessionExporter +import MastodonCore + +extension AttachmentViewModel { + func comporessVideo(url: URL) async throws -> URL { + let urlAsset = AVURLAsset(url: url) + let exporter = NextLevelSessionExporter(withAsset: urlAsset) + exporter.outputFileType = .mp4 + + let isLandscape: Bool = { + guard let track = urlAsset.tracks(withMediaType: .video).first else { + return true + } + + let size = track.naturalSize.applying(track.preferredTransform) + return abs(size.width) >= abs(size.height) + }() + + let outputURL = try FileManager.default.createTemporaryFileURL( + filename: UUID().uuidString, + pathExtension: url.pathExtension + ) + exporter.outputURL = outputURL + + let compressionDict: [String: Any] = [ + AVVideoAverageBitRateKey: NSNumber(integerLiteral: 3000000), // 3000k + AVVideoProfileLevelKey: AVVideoProfileLevelH264HighAutoLevel as String, + AVVideoAverageNonDroppableFrameRateKey: NSNumber(floatLiteral: 30), // 30 FPS + ] + exporter.videoOutputConfiguration = [ + AVVideoCodecKey: AVVideoCodecType.h264, + AVVideoWidthKey: NSNumber(integerLiteral: isLandscape ? 1280 : 720), + AVVideoHeightKey: NSNumber(integerLiteral: isLandscape ? 720 : 1280), + AVVideoScalingModeKey: AVVideoScalingModeResizeAspectFill, + AVVideoCompressionPropertiesKey: compressionDict + ] + exporter.audioOutputConfiguration = [ + AVFormatIDKey: kAudioFormatMPEG4AAC, + AVEncoderBitRateKey: NSNumber(integerLiteral: 128000), // 128k + AVNumberOfChannelsKey: NSNumber(integerLiteral: 2), + AVSampleRateKey: NSNumber(value: Float(44100)) + ] + + // needs set to LOW priority to prevent priority inverse issue + let task = Task(priority: .utility) { + _ = try await exportVideo(by: exporter) + } + _ = try await task.value + + return outputURL + } + + private func exportVideo(by exporter: NextLevelSessionExporter) async throws -> URL { + guard let outputURL = exporter.outputURL else { + throw AppError.badRequest + } + return try await withCheckedThrowingContinuation { continuation in + exporter.export(progressHandler: { progress in + DispatchQueue.main.async { [weak self] in + guard let self = self else { return } + self.videoCompressProgress = Double(progress) + os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: export progress: %.2f", ((#file as NSString).lastPathComponent), #line, #function, progress) + } + }, completionHandler: { result in + switch result { + case .success(let status): + switch status { + case .completed: + print("NextLevelSessionExporter, export completed, \(exporter.outputURL?.description ?? "")") + continuation.resume(with: .success(outputURL)) + default: + if Task.isCancelled { + exporter.cancelExport() + os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: cancel export", ((#file as NSString).lastPathComponent), #line, #function) + } + print("NextLevelSessionExporter, did not complete") + } + case .failure(let error): + continuation.resume(with: .failure(error)) + } + }) + } + } // end func +} diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+DragAndDrop.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+DragAndDrop.swift new file mode 100644 index 000000000..269b836bc --- /dev/null +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+DragAndDrop.swift @@ -0,0 +1,144 @@ +// +// AttachmentViewModel+DragAndDrop.swift +// +// +// Created by MainasuK on 2022/11/8. +// + +import os.log +import UIKit +import Combine +import UniformTypeIdentifiers + +// MARK: - TypeIdentifiedItemProvider +extension AttachmentViewModel: TypeIdentifiedItemProvider { + public static var typeIdentifier: String { + // must in UTI format + // https://developer.apple.com/library/archive/qa/qa1796/_index.html + return "org.joinmastodon.app.AttachmentViewModel" + } +} + +// MARK: - NSItemProviderWriting +extension AttachmentViewModel: NSItemProviderWriting { + + + /// Attachment uniform type idendifiers + /// + /// The latest one for in-app drag and drop. + /// And use generic `image` and `movie` type to + /// allows transformable media in different formats + public static var writableTypeIdentifiersForItemProvider: [String] { + return [ + UTType.image.identifier, + UTType.movie.identifier, + AttachmentViewModel.typeIdentifier, + ] + } + + public var writableTypeIdentifiersForItemProvider: [String] { + // should append elements in priority order from high to low + var typeIdentifiers: [String] = [] + + // FIXME: check jpg or png + switch input { + case .image: + typeIdentifiers.append(UTType.png.identifier) + case .url(let url): + let _uti = UTType(filenameExtension: url.pathExtension) + if let uti = _uti { + if uti.conforms(to: .image) { + typeIdentifiers.append(UTType.png.identifier) + } else if uti.conforms(to: .movie) { + typeIdentifiers.append(UTType.mpeg4Movie.identifier) + } + } + case .pickerResult(let item): + if item.itemProvider.isImage() { + typeIdentifiers.append(UTType.png.identifier) + } else if item.itemProvider.isMovie() { + typeIdentifiers.append(UTType.mpeg4Movie.identifier) + } + case .itemProvider(let itemProvider): + if itemProvider.isImage() { + typeIdentifiers.append(UTType.png.identifier) + } else if itemProvider.isMovie() { + typeIdentifiers.append(UTType.mpeg4Movie.identifier) + } + } + + typeIdentifiers.append(AttachmentViewModel.typeIdentifier) + + return typeIdentifiers + } + + public func loadData( + withTypeIdentifier typeIdentifier: String, + forItemProviderCompletionHandler completionHandler: @escaping (Data?, Error?) -> Void + ) -> Progress? { + switch typeIdentifier { + case AttachmentViewModel.typeIdentifier: + do { + let archiver = NSKeyedArchiver(requiringSecureCoding: false) + try archiver.encodeEncodable(id, forKey: NSKeyedArchiveRootObjectKey) + archiver.finishEncoding() + let data = archiver.encodedData + completionHandler(data, nil) + } catch { + assertionFailure() + completionHandler(nil, nil) + } + default: + break + } + + let loadingProgress = Progress(totalUnitCount: 100) + + Publishers.CombineLatest( + $output, + $error + ) + .sink { [weak self] output, error in + guard let self = self else { return } + + // continue when load completed + guard output != nil || error != nil else { return } + + switch output { + case .image(let data, _): + switch typeIdentifier { + case UTType.png.identifier: + loadingProgress.completedUnitCount = 100 + completionHandler(data, nil) + default: + completionHandler(nil, nil) + } + case .video(let url, _): + switch typeIdentifier { + case UTType.png.identifier: + let _image = AttachmentViewModel.createThumbnailForVideo(url: url) + let _data = _image?.pngData() + loadingProgress.completedUnitCount = 100 + completionHandler(_data, nil) + case UTType.mpeg4Movie.identifier: + let task = URLSession.shared.dataTask(with: url) { data, response, error in + completionHandler(data, error) + } + task.progress.observe(\.fractionCompleted) { progress, change in + loadingProgress.completedUnitCount = Int64(100 * progress.fractionCompleted) + } + .store(in: &self.observations) + task.resume() + default: + completionHandler(nil, nil) + } + case nil: + completionHandler(nil, error) + } + } + .store(in: &disposeBag) + + return loadingProgress + } + +} diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+Load.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+Load.swift new file mode 100644 index 000000000..a259485f1 --- /dev/null +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+Load.swift @@ -0,0 +1,148 @@ +// +// AttachmentViewModel+Load.swift +// +// +// Created by MainasuK on 2022/11/8. +// + +import os.log +import UIKit +import AVKit +import UniformTypeIdentifiers + +extension AttachmentViewModel { + + @MainActor + func load(input: Input) async throws -> Output { + switch input { + case .image(let image): + guard let data = image.pngData() else { + throw AttachmentError.invalidAttachmentType + } + return .image(data, imageKind: .png) + case .url(let url): + do { + let output = try await AttachmentViewModel.load(url: url) + return output + } catch { + throw error + } + case .pickerResult(let pickerResult): + do { + let output = try await AttachmentViewModel.load(itemProvider: pickerResult.itemProvider) + return output + } catch { + throw error + } + case .itemProvider(let itemProvider): + do { + let output = try await AttachmentViewModel.load(itemProvider: itemProvider) + return output + } catch { + throw error + } + } + } + + private static func load(url: URL) async throws -> Output { + guard let uti = UTType(filenameExtension: url.pathExtension) else { + throw AttachmentError.invalidAttachmentType + } + + if uti.conforms(to: .image) { + guard url.startAccessingSecurityScopedResource() else { + throw AttachmentError.invalidAttachmentType + } + defer { url.stopAccessingSecurityScopedResource() } + let imageData = try Data(contentsOf: url) + return .image(imageData, imageKind: imageData.kf.imageFormat == .PNG ? .png : .jpg) + } else if uti.conforms(to: .movie) { + guard url.startAccessingSecurityScopedResource() else { + throw AttachmentError.invalidAttachmentType + } + defer { url.stopAccessingSecurityScopedResource() } + + let fileName = UUID().uuidString + let tempDirectoryURL = FileManager.default.temporaryDirectory + let fileURL = tempDirectoryURL.appendingPathComponent(fileName).appendingPathExtension(url.pathExtension) + try FileManager.default.createDirectory(at: tempDirectoryURL, withIntermediateDirectories: true, attributes: nil) + try FileManager.default.copyItem(at: url, to: fileURL) + return .video(fileURL, mimeType: UTType.movie.preferredMIMEType ?? "video/mp4") + } else { + throw AttachmentError.invalidAttachmentType + } + } + + private static func load(itemProvider: NSItemProvider) async throws -> Output { + if itemProvider.isImage() { + guard let result = try await itemProvider.loadImageData() else { + throw AttachmentError.invalidAttachmentType + } + let imageKind: Output.ImageKind = { + if let type = result.type { + if type == UTType.png { + return .png + } + if type == UTType.jpeg { + return .jpg + } + } + + let imageData = result.data + + if imageData.kf.imageFormat == .PNG { + return .png + } + if imageData.kf.imageFormat == .JPEG { + return .jpg + } + + assertionFailure("unknown image kind") + return .jpg + }() + return .image(result.data, imageKind: imageKind) + } else if itemProvider.isMovie() { + guard let result = try await itemProvider.loadVideoData() else { + throw AttachmentError.invalidAttachmentType + } + return .video(result.url, mimeType: "video/mp4") + } else { + assertionFailure() + throw AttachmentError.invalidAttachmentType + } + } + +} + +extension AttachmentViewModel { + static func createThumbnailForVideo(url: URL) -> UIImage? { + guard FileManager.default.fileExists(atPath: url.path) else { return nil } + let asset = AVURLAsset(url: url) + let assetImageGenerator = AVAssetImageGenerator(asset: asset) + assetImageGenerator.appliesPreferredTrackTransform = true // fix orientation + do { + let cgImage = try assetImageGenerator.copyCGImage(at: CMTimeMake(value: 0, timescale: 1), actualTime: nil) + let image = UIImage(cgImage: cgImage) + return image + } catch { + AttachmentViewModel.logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): thumbnail generate fail: \(error.localizedDescription)") + return nil + } + } +} + +extension NSItemProvider { + func isImage() -> Bool { + return hasRepresentationConforming( + toTypeIdentifier: UTType.image.identifier, + fileOptions: [] + ) + } + + func isMovie() -> Bool { + return hasRepresentationConforming( + toTypeIdentifier: UTType.movie.identifier, + fileOptions: [] + ) + } +} diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+Upload.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+Upload.swift index 0a4aadec3..e26e97d35 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+Upload.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel+Upload.swift @@ -52,153 +52,65 @@ extension Data { } } -// Twitter Only -//extension AttachmentViewModel { -// class SliceResult { -// -// let fileURL: URL -// let chunks: Chunked -// let chunkCount: Int -// let type: UTType -// let sizeInBytes: UInt64 -// -// public init?( -// url: URL, -// type: UTType -// ) { -// guard let chunks = try? FileHandle(forReadingFrom: url).bytes.chunked else { return nil } -// let _sizeInBytes: UInt64? = { -// let attribute = try? FileManager.default.attributesOfItem(atPath: url.path) -// return attribute?[.size] as? UInt64 -// }() -// guard let sizeInBytes = _sizeInBytes else { return nil } -// -// self.fileURL = url -// self.chunks = chunks -// self.chunkCount = SliceResult.chunkCount(chunkSize: UInt64(chunks.chunkSize), sizeInBytes: sizeInBytes) -// self.type = type -// self.sizeInBytes = sizeInBytes -// } -// -// public init?( -// imageData: Data, -// type: UTType -// ) { -// let _fileURL = try? FileManager.default.createTemporaryFileURL( -// filename: UUID().uuidString, -// pathExtension: imageData.kf.imageFormat == .PNG ? "png" : "jpeg" -// ) -// guard let fileURL = _fileURL else { return nil } -// -// do { -// try imageData.write(to: fileURL) -// } catch { -// return nil -// } -// -// guard let chunks = try? FileHandle(forReadingFrom: fileURL).bytes.chunked else { -// return nil -// } -// let sizeInBytes = UInt64(imageData.count) -// -// self.fileURL = fileURL -// self.chunks = chunks -// self.chunkCount = SliceResult.chunkCount(chunkSize: UInt64(chunks.chunkSize), sizeInBytes: sizeInBytes) -// self.type = type -// self.sizeInBytes = sizeInBytes -// } -// -// static func chunkCount(chunkSize: UInt64, sizeInBytes: UInt64) -> Int { -// guard sizeInBytes > 0 else { return 0 } -// let count = sizeInBytes / chunkSize -// let remains = sizeInBytes % chunkSize -// let result = remains > 0 ? count + 1 : count -// return Int(result) -// } -// -// } -// -// static func slice(output: Output, sizeLimit: SizeLimit) -> SliceResult? { -// // needs execute in background -// assert(!Thread.isMainThread) -// -// // try png then use JPEG compress with Q=0.8 -// // then slice into 1MiB chunks -// switch output { -// case .image(let data, _): -// let maxPayloadSizeInBytes = sizeLimit.image -// -// // use processed imageData to remove EXIF -// guard let image = UIImage(data: data), -// var imageData = image.pngData() -// else { return nil } -// -// var didRemoveEXIF = false -// repeat { -// guard let image = KFCrossPlatformImage(data: imageData) else { return nil } -// if imageData.kf.imageFormat == .PNG { -// // A. png image -// guard let pngData = image.pngData() else { return nil } -// didRemoveEXIF = true -// if pngData.count > maxPayloadSizeInBytes { -// guard let compressedJpegData = image.jpegData(compressionQuality: 0.8) else { return nil } -// os_log("%{public}s[%{public}ld], %{public}s: compress png %.2fMiB -> jpeg %.2fMiB", ((#file as NSString).lastPathComponent), #line, #function, Double(imageData.count) / 1024 / 1024, Double(compressedJpegData.count) / 1024 / 1024) -// imageData = compressedJpegData -// } else { -// os_log("%{public}s[%{public}ld], %{public}s: png %.2fMiB", ((#file as NSString).lastPathComponent), #line, #function, Double(pngData.count) / 1024 / 1024) -// imageData = pngData -// } -// } else { -// // B. other image -// if !didRemoveEXIF { -// guard let jpegData = image.jpegData(compressionQuality: 0.8) else { return nil } -// os_log("%{public}s[%{public}ld], %{public}s: compress jpeg %.2fMiB -> jpeg %.2fMiB", ((#file as NSString).lastPathComponent), #line, #function, Double(imageData.count) / 1024 / 1024, Double(jpegData.count) / 1024 / 1024) -// imageData = jpegData -// didRemoveEXIF = true -// } else { -// let targetSize = CGSize(width: image.size.width * 0.8, height: image.size.height * 0.8) -// let scaledImage = image.af.imageScaled(to: targetSize) -// guard let compressedJpegData = scaledImage.jpegData(compressionQuality: 0.8) else { return nil } -// os_log("%{public}s[%{public}ld], %{public}s: compress jpeg %.2fMiB -> jpeg %.2fMiB", ((#file as NSString).lastPathComponent), #line, #function, Double(imageData.count) / 1024 / 1024, Double(compressedJpegData.count) / 1024 / 1024) -// imageData = compressedJpegData -// } -// } -// } while (imageData.count > maxPayloadSizeInBytes) -// -// return SliceResult( -// imageData: imageData, -// type: imageData.kf.imageFormat == .PNG ? UTType.png : UTType.jpeg -// ) -// -//// case .gif(let url): -//// fatalError() -// case .video(let url, _): -// return SliceResult( -// url: url, -// type: .movie -// ) -// } -// } -//} - extension AttachmentViewModel { + public enum UploadState { + case none + case compressing + case ready + case uploading + case fail + case finish + } + struct UploadContext { let apiService: APIService let authContext: AuthContext } - enum UploadResult { - case mastodon(Mastodon.Response.Content) - } + public typealias UploadResult = Mastodon.Entity.Attachment } extension AttachmentViewModel { - func upload(context: UploadContext) async throws -> UploadResult { - return try await uploadMastodonMedia( - context: context - ) + @MainActor + func upload(isRetry: Bool = false) async throws { + do { + let result = try await upload( + context: .init( + apiService: self.api, + authContext: self.authContext + ), + isRetry: isRetry + ) + update(uploadResult: result) + } catch { + self.error = error + } } + @MainActor + private func upload(context: UploadContext, isRetry: Bool) async throws -> UploadResult { + if isRetry { + guard uploadState == .fail else { throw AppError.badRequest } + self.error = nil + self.fractionCompleted = 0 + } else { + guard uploadState == .ready else { throw AppError.badRequest } + } + do { + update(uploadState: .uploading) + let result = try await uploadMastodonMedia( + context: context + ) + update(uploadState: .finish) + return result + } catch { + update(uploadState: .fail) + throw error + } + } + + // MainActor is required here to trigger stream upload task + @MainActor private func uploadMastodonMedia( context: UploadContext ) async throws -> UploadResult { @@ -260,7 +172,7 @@ extension AttachmentViewModel { if attachmentUploadResponse.statusCode == 202 { // note: // the Mastodon server append the attachments in order by upload time - // can not upload concurrency + // can not upload parallels let waitProcessRetryLimit = checkUploadTaskRetryLimit var waitProcessRetryCount: Int64 = 0 @@ -283,7 +195,7 @@ extension AttachmentViewModel { // escape here progress.completedUnitCount = progress.totalUnitCount - return .mastodon(attachmentStatusResponse) + return attachmentStatusResponse.value } else { AttachmentViewModel.logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): attachment processing. Retry \(waitProcessRetryCount)/\(waitProcessRetryLimit)") @@ -296,7 +208,7 @@ extension AttachmentViewModel { } else { AttachmentViewModel.logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): upload attachment success: \(attachmentUploadResponse.value.url ?? "")") - return .mastodon(attachmentUploadResponse) + return attachmentUploadResponse.value } } } diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel.swift index 7d0e8c859..18da157c5 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Attachment/AttachmentViewModel.swift @@ -11,36 +11,111 @@ import Combine import PhotosUI import Kingfisher import MastodonCore +import MastodonLocalization +import func QuartzCore.CACurrentMediaTime + +public protocol AttachmentViewModelDelegate: AnyObject { + func attachmentViewModel(_ viewModel: AttachmentViewModel, uploadStateValueDidChange state: AttachmentViewModel.UploadState) + func attachmentViewModel(_ viewModel: AttachmentViewModel, actionButtonDidPressed action: AttachmentViewModel.Action) +} final public class AttachmentViewModel: NSObject, ObservableObject, Identifiable { static let logger = Logger(subsystem: "AttachmentViewModel", category: "ViewModel") + let logger = Logger(subsystem: "AttachmentViewModel", category: "ViewModel") public let id = UUID() var disposeBag = Set() var observations = Set() + + weak var delegate: AttachmentViewModelDelegate? + + let byteCountFormatter: ByteCountFormatter = { + let formatter = ByteCountFormatter() + formatter.allowsNonnumericFormatting = true + formatter.countStyle = .memory + return formatter + }() + + let percentageFormatter: NumberFormatter = { + let formatter = NumberFormatter() + formatter.numberStyle = .percent + return formatter + }() // input + public let api: APIService + public let authContext: AuthContext public let input: Input @Published var caption = "" - @Published var sizeLimit = SizeLimit() - @Published public var isPreviewPresented = false + // @Published var sizeLimit = SizeLimit() // output @Published public private(set) var output: Output? @Published public private(set) var thumbnail: UIImage? // original size image thumbnail - @Published var error: Error? - let progress = Progress() // upload progress + @Published public private(set) var outputSizeInByte: Int64 = 0 - public init(input: Input) { + @Published public private(set) var uploadState: UploadState = .none + @Published public private(set) var uploadResult: UploadResult? + @Published var error: Error? + + var uploadTask: Task<(), Never>? + + @Published var videoCompressProgress: Double = 0 + + let progress = Progress() // upload progress + @Published var fractionCompleted: Double = 0 + + private var lastTimestamp: TimeInterval? + private var lastUploadSizeInByte: Int64 = 0 + private var averageUploadSpeedInByte: Int64 = 0 + private var remainTimeInterval: Double? + @Published var remainTimeLocalizedString: String? + + public init( + api: APIService, + authContext: AuthContext, + input: Input, + delegate: AttachmentViewModelDelegate + ) { + self.api = api + self.authContext = authContext self.input = input + self.delegate = delegate super.init() // end init - defer { - load(input: input) - } + Timer.publish(every: 1.0 / 60.0, on: .main, in: .common) // 60 FPS + .autoconnect() + .share() + .receive(on: DispatchQueue.main) + .sink { [weak self] _ in + guard let self = self else { return } + self.step() + } + .store(in: &disposeBag) + + progress + .observe(\.fractionCompleted, options: [.initial, .new]) { [weak self] progress, _ in + guard let self = self else { return } + self.logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): publish progress \(progress.fractionCompleted)") + DispatchQueue.main.async { + self.fractionCompleted = progress.fractionCompleted + } + } + .store(in: &observations) + + // Note: this observation is redundant if .fractionCompleted listener always emit event when reach 1.0 progress + // progress + // .observe(\.isFinished, options: [.initial, .new]) { [weak self] progress, _ in + // guard let self = self else { return } + // self.logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): publish progress \(progress.fractionCompleted)") + // DispatchQueue.main.async { + // self.objectWillChange.send() + // } + // } + // .store(in: &observations) $output .map { output -> UIImage? in @@ -53,22 +128,121 @@ final public class AttachmentViewModel: NSObject, ObservableObject, Identifiable return nil } } + .receive(on: DispatchQueue.main) .assign(to: &$thumbnail) + + defer { + let uploadTask = Task { @MainActor in + do { + var output = try await load(input: input) + + switch output { + case .video(let fileURL, let mimeType): + self.output = output + self.update(uploadState: .compressing) + let compressedFileURL = try await comporessVideo(url: fileURL) + output = .video(compressedFileURL, mimeType: mimeType) + try? FileManager.default.removeItem(at: fileURL) // remove old file + default: + break + } + + self.outputSizeInByte = output.asAttachment.sizeInByte.flatMap { Int64($0) } ?? 0 + self.output = output + + self.update(uploadState: .ready) + self.delegate?.attachmentViewModel(self, uploadStateValueDidChange: self.uploadState) + } catch { + self.error = error + } + } // end Task + self.uploadTask = uploadTask + Task { + await uploadTask.value + } + } } deinit { + os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) + + uploadTask?.cancel() + switch output { case .image: // FIXME: break case .video(let url, _): try? FileManager.default.removeItem(at: url) - case nil : + case nil: break } } } +// calculate the upload speed +// ref: https://stackoverflow.com/a/3841706/3797903 +extension AttachmentViewModel { + + static var SpeedSmoothingFactor = 0.4 + static let remainsTimeFormatter: RelativeDateTimeFormatter = { + let formatter = RelativeDateTimeFormatter() + formatter.unitsStyle = .full + return formatter + }() + + @objc private func step() { + + let uploadProgress = min(progress.fractionCompleted + 0.1, 1) // the progress split into 9:1 blocks (download : waiting) + + guard let lastTimestamp = self.lastTimestamp else { + self.lastTimestamp = CACurrentMediaTime() + self.lastUploadSizeInByte = Int64(Double(outputSizeInByte) * uploadProgress) + return + } + + let duration = CACurrentMediaTime() - lastTimestamp + guard duration >= 1.0 else { return } // update every 1 sec + + let old = self.lastUploadSizeInByte + self.lastUploadSizeInByte = Int64(Double(outputSizeInByte) * uploadProgress) + + let newSpeed = self.lastUploadSizeInByte - old + let lastAverageSpeed = self.averageUploadSpeedInByte + let newAverageSpeed = Int64(AttachmentViewModel.SpeedSmoothingFactor * Double(newSpeed) + (1 - AttachmentViewModel.SpeedSmoothingFactor) * Double(lastAverageSpeed)) + + let remainSizeInByte = Double(outputSizeInByte) * (1 - uploadProgress) + + let speed = Double(newAverageSpeed) + if speed != .zero { + // estimate by speed + let uploadRemainTimeInSecond = remainSizeInByte / speed + // estimate by progress 1s for 10% + let remainPercentage = 1 - uploadProgress + let estimateRemainTimeByProgress = remainPercentage / 0.1 + // max estimate + var remainTimeInSecond = max(estimateRemainTimeByProgress, uploadRemainTimeInSecond) + + // do not increate timer when < 5 sec + if let remainTimeInterval = self.remainTimeInterval, remainTimeInSecond < 5 { + remainTimeInSecond = min(remainTimeInterval, remainTimeInSecond) + self.remainTimeInterval = remainTimeInSecond + } else { + self.remainTimeInterval = remainTimeInSecond + } + + let string = AttachmentViewModel.remainsTimeFormatter.localizedString(fromTimeInterval: remainTimeInSecond) + remainTimeLocalizedString = string + // print("remains: \(remainSizeInByte), speed: \(newAverageSpeed), \(string)") + } else { + remainTimeLocalizedString = nil + } + + self.lastTimestamp = CACurrentMediaTime() + self.averageUploadSpeedInByte = newAverageSpeed + } +} + extension AttachmentViewModel { public enum Input: Hashable { case image(UIImage) @@ -86,24 +260,18 @@ extension AttachmentViewModel { case png case jpg } - - public var twitterMediaCategory: TwitterMediaCategory { - switch self { - case .image: return .image - case .video: return .amplifyVideo - } - } } + // not in using public struct SizeLimit { public let image: Int public let gif: Int public let video: Int public init( - image: Int = 5 * 1024 * 1024, // 5 MiB, - gif: Int = 15 * 1024 * 1024, // 15 MiB, - video: Int = 512 * 1024 * 1024 // 512 MiB + image: Int = 10 * 1024 * 1024, // 10 MiB + gif: Int = 40 * 1024 * 1024, // 40 MiB + video: Int = 40 * 1024 * 1024 // 40 MiB ) { self.image = image self.gif = gif @@ -111,291 +279,38 @@ extension AttachmentViewModel { } } - public enum AttachmentError: Error { + public enum AttachmentError: Error, LocalizedError { case invalidAttachmentType case attachmentTooLarge - } - - public enum TwitterMediaCategory: String { - case image = "TWEET_IMAGE" - case GIF = "TWEET_GIF" - case video = "TWEET_VIDEO" - case amplifyVideo = "AMPLIFY_VIDEO" - } -} - -extension AttachmentViewModel { - - private func load(input: Input) { - switch input { - case .image(let image): - guard let data = image.pngData() else { - error = AttachmentError.invalidAttachmentType - return - } - output = .image(data, imageKind: .png) - case .url(let url): - Task { @MainActor in - do { - let output = try await AttachmentViewModel.load(url: url) - self.output = output - } catch { - self.error = error - } - } // end Task - case .pickerResult(let pickerResult): - Task { @MainActor in - do { - let output = try await AttachmentViewModel.load(itemProvider: pickerResult.itemProvider) - self.output = output - } catch { - self.error = error - } - } // end Task - case .itemProvider(let itemProvider): - Task { @MainActor in - do { - let output = try await AttachmentViewModel.load(itemProvider: itemProvider) - self.output = output - } catch { - self.error = error - } - } // end Task - } - } - - private static func load(url: URL) async throws -> Output { - guard let uti = UTType(filenameExtension: url.pathExtension) else { - throw AttachmentError.invalidAttachmentType - } - if uti.conforms(to: .image) { - guard url.startAccessingSecurityScopedResource() else { - throw AttachmentError.invalidAttachmentType + public var errorDescription: String? { + switch self { + case .invalidAttachmentType: + return L10n.Scene.Compose.Attachment.canNotRecognizeThisMediaAttachment + case .attachmentTooLarge: + return L10n.Scene.Compose.Attachment.attachmentTooLarge } - defer { url.stopAccessingSecurityScopedResource() } - let imageData = try Data(contentsOf: url) - return .image(imageData, imageKind: imageData.kf.imageFormat == .PNG ? .png : .jpg) - } else if uti.conforms(to: .movie) { - guard url.startAccessingSecurityScopedResource() else { - throw AttachmentError.invalidAttachmentType - } - defer { url.stopAccessingSecurityScopedResource() } - - let fileName = UUID().uuidString - let tempDirectoryURL = FileManager.default.temporaryDirectory - let fileURL = tempDirectoryURL.appendingPathComponent(fileName).appendingPathExtension(url.pathExtension) - try FileManager.default.createDirectory(at: tempDirectoryURL, withIntermediateDirectories: true, attributes: nil) - try FileManager.default.copyItem(at: url, to: fileURL) - return .video(fileURL, mimeType: UTType.movie.preferredMIMEType ?? "video/mp4") - } else { - throw AttachmentError.invalidAttachmentType - } - } - - private static func load(itemProvider: NSItemProvider) async throws -> Output { - if itemProvider.isImage() { - guard let result = try await itemProvider.loadImageData() else { - throw AttachmentError.invalidAttachmentType - } - let imageKind: Output.ImageKind = { - if let type = result.type { - if type == UTType.png { - return .png - } - if type == UTType.jpeg { - return .jpg - } - } - - let imageData = result.data - - if imageData.kf.imageFormat == .PNG { - return .png - } - if imageData.kf.imageFormat == .JPEG { - return .jpg - } - - assertionFailure("unknown image kind") - return .jpg - }() - return .image(result.data, imageKind: imageKind) - } else if itemProvider.isMovie() { - guard let result = try await itemProvider.loadVideoData() else { - throw AttachmentError.invalidAttachmentType - } - return .video(result.url, mimeType: "video/mp4") - } else { - assertionFailure() - throw AttachmentError.invalidAttachmentType } } } extension AttachmentViewModel { - static func createThumbnailForVideo(url: URL) -> UIImage? { - guard FileManager.default.fileExists(atPath: url.path) else { return nil } - let asset = AVURLAsset(url: url) - let assetImageGenerator = AVAssetImageGenerator(asset: asset) - assetImageGenerator.appliesPreferredTrackTransform = true // fix orientation - do { - let cgImage = try assetImageGenerator.copyCGImage(at: CMTimeMake(value: 0, timescale: 1), actualTime: nil) - let image = UIImage(cgImage: cgImage) - return image - } catch { - AttachmentViewModel.logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): thumbnail generate fail: \(error.localizedDescription)") - return nil - } + public enum Action: Hashable { + case remove + case retry } } -// MARK: - TypeIdentifiedItemProvider -extension AttachmentViewModel: TypeIdentifiedItemProvider { - public static var typeIdentifier: String { - // must in UTI format - // https://developer.apple.com/library/archive/qa/qa1796/_index.html - return "com.twidere.AttachmentViewModel" - } -} - -// MARK: - NSItemProviderWriting -extension AttachmentViewModel: NSItemProviderWriting { - - - /// Attachment uniform type idendifiers - /// - /// The latest one for in-app drag and drop. - /// And use generic `image` and `movie` type to - /// allows transformable media in different formats - public static var writableTypeIdentifiersForItemProvider: [String] { - return [ - UTType.image.identifier, - UTType.movie.identifier, - AttachmentViewModel.typeIdentifier, - ] - } - - public var writableTypeIdentifiersForItemProvider: [String] { - // should append elements in priority order from high to low - var typeIdentifiers: [String] = [] - - // FIXME: check jpg or png - switch input { - case .image: - typeIdentifiers.append(UTType.png.identifier) - case .url(let url): - let _uti = UTType(filenameExtension: url.pathExtension) - if let uti = _uti { - if uti.conforms(to: .image) { - typeIdentifiers.append(UTType.png.identifier) - } else if uti.conforms(to: .movie) { - typeIdentifiers.append(UTType.mpeg4Movie.identifier) - } - } - case .pickerResult(let item): - if item.itemProvider.isImage() { - typeIdentifiers.append(UTType.png.identifier) - } else if item.itemProvider.isMovie() { - typeIdentifiers.append(UTType.mpeg4Movie.identifier) - } - case .itemProvider(let itemProvider): - if itemProvider.isImage() { - typeIdentifiers.append(UTType.png.identifier) - } else if itemProvider.isMovie() { - typeIdentifiers.append(UTType.mpeg4Movie.identifier) - } - } - - typeIdentifiers.append(AttachmentViewModel.typeIdentifier) - - return typeIdentifiers - } - - public func loadData( - withTypeIdentifier typeIdentifier: String, - forItemProviderCompletionHandler completionHandler: @escaping (Data?, Error?) -> Void - ) -> Progress? { - switch typeIdentifier { - case AttachmentViewModel.typeIdentifier: - do { - let archiver = NSKeyedArchiver(requiringSecureCoding: false) - try archiver.encodeEncodable(id, forKey: NSKeyedArchiveRootObjectKey) - archiver.finishEncoding() - let data = archiver.encodedData - completionHandler(data, nil) - } catch { - assertionFailure() - completionHandler(nil, nil) - } - default: - break - } - - let loadingProgress = Progress(totalUnitCount: 100) - - Publishers.CombineLatest( - $output, - $error - ) - .sink { [weak self] output, error in - guard let self = self else { return } - - // continue when load completed - guard output != nil || error != nil else { return } - - switch output { - case .image(let data, _): - switch typeIdentifier { - case UTType.png.identifier: - loadingProgress.completedUnitCount = 100 - completionHandler(data, nil) - default: - completionHandler(nil, nil) - } - case .video(let url, _): - switch typeIdentifier { - case UTType.png.identifier: - let _image = AttachmentViewModel.createThumbnailForVideo(url: url) - let _data = _image?.pngData() - loadingProgress.completedUnitCount = 100 - completionHandler(_data, nil) - case UTType.mpeg4Movie.identifier: - let task = URLSession.shared.dataTask(with: url) { data, response, error in - completionHandler(data, error) - } - task.progress.observe(\.fractionCompleted) { progress, change in - loadingProgress.completedUnitCount = Int64(100 * progress.fractionCompleted) - } - .store(in: &self.observations) - task.resume() - default: - completionHandler(nil, nil) - } - case nil: - completionHandler(nil, error) - } - } - .store(in: &disposeBag) - - return loadingProgress - } - -} - -extension NSItemProvider { - fileprivate func isImage() -> Bool { - return hasRepresentationConforming( - toTypeIdentifier: UTType.image.identifier, - fileOptions: [] - ) - } - - fileprivate func isMovie() -> Bool { - return hasRepresentationConforming( - toTypeIdentifier: UTType.movie.identifier, - fileOptions: [] - ) +extension AttachmentViewModel { + @MainActor + func update(uploadState: UploadState) { + self.uploadState = uploadState + self.delegate?.attachmentViewModel(self, uploadStateValueDidChange: self.uploadState) + } + + @MainActor + func update(uploadResult: UploadResult) { + self.uploadResult = uploadResult } } diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/AutoComplete/AutoCompleteViewController.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/AutoComplete/AutoCompleteViewController.swift index aa21057d1..ccb483f35 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/AutoComplete/AutoCompleteViewController.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/AutoComplete/AutoCompleteViewController.swift @@ -80,15 +80,10 @@ extension AutoCompleteViewController { tableView.translatesAutoresizingMaskIntoConstraints = false containerBackgroundView.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: containerBackgroundView.topAnchor), - tableView.leadingAnchor.constraint(equalTo: containerBackgroundView.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: containerBackgroundView.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: containerBackgroundView.bottomAnchor), - ]) + tableView.pinToParent() tableView.delegate = self -// viewModel.setupDiffableDataSource(tableView: tableView) + viewModel.setupDiffableDataSource(tableView: tableView) // bind to layout chevron viewModel.symbolBoundingRect diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/AutoComplete/AutoCompleteViewModel+Diffable.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/AutoComplete/AutoCompleteViewModel+Diffable.swift index adbf6ac09..2dd815d0a 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/AutoComplete/AutoCompleteViewModel+Diffable.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/AutoComplete/AutoCompleteViewModel+Diffable.swift @@ -6,17 +6,18 @@ // import UIKit +import MastodonCore extension AutoCompleteViewModel { -// func setupDiffableDataSource( -// tableView: UITableView -// ) { -// diffableDataSource = AutoCompleteSection.tableViewDiffableDataSource(for: tableView) -// -// var snapshot = NSDiffableDataSourceSnapshot() -// snapshot.appendSections([.main]) -// diffableDataSource?.apply(snapshot) -// } + func setupDiffableDataSource( + tableView: UITableView + ) { + diffableDataSource = AutoCompleteSection.tableViewDiffableDataSource(tableView: tableView) + + var snapshot = NSDiffableDataSourceSnapshot() + snapshot.appendSections([.main]) + diffableDataSource?.apply(snapshot) + } } diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/AutoComplete/AutoCompleteViewModel+State.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/AutoComplete/AutoCompleteViewModel+State.swift index b1f5f3187..7f93c4ba7 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/AutoComplete/AutoCompleteViewModel+State.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/AutoComplete/AutoCompleteViewModel+State.swift @@ -102,7 +102,7 @@ extension AutoCompleteViewModel.State { return } - guard let customEmojiViewModel = viewModel.customEmojiViewModel.value else { + guard let customEmojiViewModel = viewModel.customEmojiViewModel else { await enter(state: Fail.self) return } diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/AutoComplete/AutoCompleteViewModel.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/AutoComplete/AutoCompleteViewModel.swift index 61715cd63..d8fa06db6 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/AutoComplete/AutoCompleteViewModel.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/AutoComplete/AutoCompleteViewModel.swift @@ -20,7 +20,7 @@ final class AutoCompleteViewModel { let authContext: AuthContext public let inputText = CurrentValueSubject("") // contains "@" or "#" prefix public let symbolBoundingRect = CurrentValueSubject(.zero) - public let customEmojiViewModel = CurrentValueSubject(nil) + public let customEmojiViewModel: EmojiService.CustomEmojiViewModel? // output public var autoCompleteItems = CurrentValueSubject<[AutoCompleteItem], Never>([]) @@ -40,6 +40,8 @@ final class AutoCompleteViewModel { init(context: AppContext, authContext: AuthContext) { self.context = context self.authContext = authContext + self.customEmojiViewModel = context.emojiService.dequeueCustomEmojiViewModel(for: authContext.mastodonAuthenticationBox.domain) + // end init autoCompleteItems .receive(on: DispatchQueue.main) @@ -71,7 +73,7 @@ final class AutoCompleteViewModel { inputText .removeDuplicates() - .receive(on: DispatchQueue.main) + .throttle(for: .milliseconds(200), scheduler: DispatchQueue.main, latest: true) .sink { [weak self] inputText in guard let self = self else { return } self.stateMachine.enter(State.Loading.self) diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/AutoComplete/View/AutoCompleteTopChevronView.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/AutoComplete/View/AutoCompleteTopChevronView.swift index ccc36b1df..98690a3ce 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/AutoComplete/View/AutoCompleteTopChevronView.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/AutoComplete/View/AutoCompleteTopChevronView.swift @@ -8,7 +8,6 @@ import UIKit import Combine import MastodonCore -import MastodonUI final class AutoCompleteTopChevronView: UIView { @@ -66,12 +65,7 @@ extension AutoCompleteTopChevronView { shadowView.translatesAutoresizingMaskIntoConstraints = false addSubview(shadowView) - NSLayoutConstraint.activate([ - shadowView.topAnchor.constraint(equalTo: topAnchor), - shadowView.leadingAnchor.constraint(equalTo: leadingAnchor), - shadowView.trailingAnchor.constraint(equalTo: trailingAnchor), - shadowView.bottomAnchor.constraint(equalTo: bottomAnchor), - ]) + shadowView.pinToParent() shadowLayer.fillColor = topViewBackgroundColor.cgColor shadowView.layer.addSublayer(shadowLayer) diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewController.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewController.swift index 3417ed935..811da063a 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewController.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewController.swift @@ -14,12 +14,15 @@ import MastodonCore public final class ComposeContentViewController: UIViewController { + static let minAutoCompleteVisibleHeight: CGFloat = 100 + let logger = Logger(subsystem: "ComposeContentViewController", category: "ViewController") var disposeBag = Set() public var viewModel: ComposeContentViewModel! private(set) lazy var composeContentToolbarViewModel = ComposeContentToolbarView.ViewModel(delegate: self) + // tableView container let tableView: ComposeTableView = { let tableView = ComposeTableView() tableView.estimatedRowHeight = UITableView.automaticDimension @@ -29,6 +32,16 @@ public final class ComposeContentViewController: UIViewController { return tableView }() + // auto complete + private(set) lazy var autoCompleteViewController: AutoCompleteViewController = { + let viewController = AutoCompleteViewController() + viewController.viewModel = AutoCompleteViewModel(context: viewModel.context, authContext: viewModel.authContext) + viewController.delegate = self + // viewController.viewModel.customEmojiViewModel.value = viewModel.customEmojiViewModel + return viewController + }() + + // toolbar lazy var composeContentToolbarView = ComposeContentToolbarView(viewModel: composeContentToolbarViewModel) var composeContentToolbarViewBottomLayoutConstraint: NSLayoutConstraint! let composeContentToolbarBackgroundView = UIView() @@ -42,24 +55,33 @@ public final class ComposeContentViewController: UIViewController { return configuration } - private(set) lazy var photoLibraryPicker: PHPickerViewController = { + public private(set) lazy var photoLibraryPicker: PHPickerViewController = { let imagePicker = PHPickerViewController(configuration: ComposeContentViewController.createPhotoLibraryPickerConfiguration()) imagePicker.delegate = self return imagePicker }() - private(set) lazy var imagePickerController: UIImagePickerController = { + public private(set) lazy var imagePickerController: UIImagePickerController = { let imagePickerController = UIImagePickerController() imagePickerController.sourceType = .camera imagePickerController.delegate = self return imagePickerController }() - private(set) lazy var documentPickerController: UIDocumentPickerViewController = { + public private(set) lazy var documentPickerController: UIDocumentPickerViewController = { let documentPickerController = UIDocumentPickerViewController(forOpeningContentTypes: [.image, .movie]) documentPickerController.delegate = self return documentPickerController }() + + // emoji picker inputView + let customEmojiPickerInputView: CustomEmojiPickerInputView = { + let view = CustomEmojiPickerInputView( + frame: CGRect(x: 0, y: 0, width: 0, height: 300), + inputViewStyle: .keyboard + ) + return view + }() deinit { os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) @@ -71,6 +93,8 @@ extension ComposeContentViewController { public override func viewDidLoad() { super.viewDidLoad() + viewModel.delegate = self + // setup view self.setupBackgroundColor(theme: ThemeService.shared.currentTheme.value) ThemeService.shared.currentTheme @@ -84,16 +108,17 @@ extension ComposeContentViewController { // setup tableView tableView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(tableView) - NSLayoutConstraint.activate([ - tableView.topAnchor.constraint(equalTo: view.topAnchor), - tableView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - tableView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + tableView.pinToParent() tableView.delegate = self viewModel.setupDataSource(tableView: tableView) + // setup emoji picker + customEmojiPickerInputView.collectionView.delegate = self + viewModel.customEmojiPickerInputViewModel.customEmojiPickerInputView = customEmojiPickerInputView + viewModel.setupCustomEmojiPickerDiffableDataSource(collectionView: customEmojiPickerInputView.collectionView) + + // setup toolbar let toolbarHostingView = UIHostingController(rootView: composeContentToolbarView) toolbarHostingView.view.translatesAutoresizingMaskIntoConstraints = false view.addSubview(toolbarHostingView.view) @@ -116,49 +141,43 @@ extension ComposeContentViewController { view.bottomAnchor.constraint(equalTo: composeContentToolbarBackgroundView.bottomAnchor), ]) - let keyboardHasShortcutBar = CurrentValueSubject(traitCollection.userInterfaceIdiom == .pad) // update default value later + // bind keyboard let keyboardEventPublishers = Publishers.CombineLatest3( KeyboardResponderService.shared.isShow, KeyboardResponderService.shared.state, KeyboardResponderService.shared.endFrame ) -// Publishers.CombineLatest3( -// viewModel.$isCustomEmojiComposing, -// ) - keyboardEventPublishers - .sink(receiveValue: { [weak self] keyboardEvents in + Publishers.CombineLatest3( + keyboardEventPublishers, + viewModel.$isEmojiActive, + viewModel.$autoCompleteInfo + ) + .sink(receiveValue: { [weak self] keyboardEvents, isEmojiActive, autoCompleteInfo in guard let self = self else { return } let (isShow, state, endFrame) = keyboardEvents - -// switch self.traitCollection.userInterfaceIdiom { -// case .pad: -// keyboardHasShortcutBar.value = state != .floating -// default: -// keyboardHasShortcutBar.value = false -// } -// + let extraMargin: CGFloat = { var margin = ComposeContentToolbarView.toolbarHeight -// if autoCompleteInfo != nil { -//// margin += ComposeViewController.minAutoCompleteVisibleHeight -// } + if autoCompleteInfo != nil { + margin += ComposeContentViewController.minAutoCompleteVisibleHeight + } return margin }() -// + guard isShow, state == .dock else { self.tableView.contentInset.bottom = extraMargin self.tableView.verticalScrollIndicatorInsets.bottom = extraMargin -// if let superView = self.autoCompleteViewController.tableView.superview { -// let autoCompleteTableViewBottomInset: CGFloat = { -// let tableViewFrameInWindow = superView.convert(self.autoCompleteViewController.tableView.frame, to: nil) -// let padding = tableViewFrameInWindow.maxY + self.composeToolbarView.frame.height + AutoCompleteViewController.chevronViewHeight - self.view.frame.maxY -// return max(0, padding) -// }() -// self.autoCompleteViewController.tableView.contentInset.bottom = autoCompleteTableViewBottomInset -// self.autoCompleteViewController.tableView.verticalScrollIndicatorInsets.bottom = autoCompleteTableViewBottomInset -// } + if let superView = self.autoCompleteViewController.tableView.superview { + let autoCompleteTableViewBottomInset: CGFloat = { + let tableViewFrameInWindow = superView.convert(self.autoCompleteViewController.tableView.frame, to: nil) + let padding = tableViewFrameInWindow.maxY + ComposeContentToolbarView.toolbarHeight + AutoCompleteViewController.chevronViewHeight - self.view.frame.maxY + return max(0, padding) + }() + self.autoCompleteViewController.tableView.contentInset.bottom = autoCompleteTableViewBottomInset + self.autoCompleteViewController.tableView.verticalScrollIndicatorInsets.bottom = autoCompleteTableViewBottomInset + } UIView.animate(withDuration: 0.3) { self.composeContentToolbarViewBottomLayoutConstraint.constant = self.view.safeAreaInsets.bottom @@ -169,17 +188,16 @@ extension ComposeContentViewController { return } // isShow AND dock state -// self.systemKeyboardHeight = endFrame.height // adjust inset for auto-complete -// let autoCompleteTableViewBottomInset: CGFloat = { -// guard let superview = self.autoCompleteViewController.tableView.superview else { return .zero } -// let tableViewFrameInWindow = superview.convert(self.autoCompleteViewController.tableView.frame, to: nil) -// let padding = tableViewFrameInWindow.maxY + self.composeToolbarView.frame.height + AutoCompleteViewController.chevronViewHeight - endFrame.minY -// return max(0, padding) -// }() -// self.autoCompleteViewController.tableView.contentInset.bottom = autoCompleteTableViewBottomInset -// self.autoCompleteViewController.tableView.verticalScrollIndicatorInsets.bottom = autoCompleteTableViewBottomInset + let autoCompleteTableViewBottomInset: CGFloat = { + guard let superview = self.autoCompleteViewController.tableView.superview else { return .zero } + let tableViewFrameInWindow = superview.convert(self.autoCompleteViewController.tableView.frame, to: nil) + let padding = tableViewFrameInWindow.maxY + ComposeContentToolbarView.toolbarHeight + AutoCompleteViewController.chevronViewHeight - endFrame.minY + return max(0, padding) + }() + self.autoCompleteViewController.tableView.contentInset.bottom = autoCompleteTableViewBottomInset + self.autoCompleteViewController.tableView.verticalScrollIndicatorInsets.bottom = autoCompleteTableViewBottomInset // adjust inset for tableView let contentFrame = self.view.convert(self.tableView.frame, to: nil) @@ -218,14 +236,63 @@ extension ComposeContentViewController { } .store(in: &disposeBag) + // bind auto-complete + viewModel.$autoCompleteInfo + .receive(on: DispatchQueue.main) + .sink { [weak self] info in + guard let self = self else { return } + guard let textView = self.viewModel.contentMetaText?.textView else { return } + if self.autoCompleteViewController.view.superview == nil { + self.autoCompleteViewController.view.frame = self.view.bounds + // add to container view. seealso: `viewDidLayoutSubviews()` + self.viewModel.composeContentTableViewCell.contentView.addSubview(self.autoCompleteViewController.view) + self.addChild(self.autoCompleteViewController) + self.autoCompleteViewController.didMove(toParent: self) + self.autoCompleteViewController.view.isHidden = true + self.tableView.autoCompleteViewController = self.autoCompleteViewController + } + self.updateAutoCompleteViewControllerLayout() + self.autoCompleteViewController.view.isHidden = info == nil + guard let info = info else { return } + let symbolBoundingRectInContainer = textView.convert(info.symbolBoundingRect, to: self.autoCompleteViewController.chevronView) + print(info.symbolBoundingRect) + self.autoCompleteViewController.view.frame.origin.y = info.textBoundingRect.maxY + self.viewModel.contentTextViewFrame.minY + self.autoCompleteViewController.viewModel.symbolBoundingRect.value = symbolBoundingRectInContainer + self.autoCompleteViewController.viewModel.inputText.value = String(info.inputText) + } + .store(in: &disposeBag) + + // bind emoji picker + viewModel.customEmojiViewModel?.emojis + .receive(on: DispatchQueue.main) + .sink(receiveValue: { [weak self] emojis in + guard let self = self else { return } + if emojis.isEmpty { + self.customEmojiPickerInputView.activityIndicatorView.startAnimating() + } else { + self.customEmojiPickerInputView.activityIndicatorView.stopAnimating() + } + }) + .store(in: &disposeBag) + // bind toolbar bindToolbarViewModel() + + // bind attachment picker + viewModel.$attachmentViewModels + .receive(on: DispatchQueue.main) + .sink { [weak self] _ in + guard let self = self else { return } + self.resetImagePicker() + } + .store(in: &disposeBag) } public override func viewDidLayoutSubviews() { super.viewDidLayoutSubviews() viewModel.viewLayoutFrame.update(view: view) + updateAutoCompleteViewControllerLayout() } public override func viewSafeAreaInsetsDidChange() { @@ -257,12 +324,50 @@ extension ComposeContentViewController { } private func bindToolbarViewModel() { + viewModel.$isAttachmentButtonEnabled.assign(to: &composeContentToolbarViewModel.$isAttachmentButtonEnabled) + viewModel.$isPollButtonEnabled.assign(to: &composeContentToolbarViewModel.$isPollButtonEnabled) viewModel.$isPollActive.assign(to: &composeContentToolbarViewModel.$isPollActive) viewModel.$isEmojiActive.assign(to: &composeContentToolbarViewModel.$isEmojiActive) viewModel.$isContentWarningActive.assign(to: &composeContentToolbarViewModel.$isContentWarningActive) + viewModel.$visibility.assign(to: &composeContentToolbarViewModel.$visibility) viewModel.$maxTextInputLimit.assign(to: &composeContentToolbarViewModel.$maxTextInputLimit) viewModel.$contentWeightedLength.assign(to: &composeContentToolbarViewModel.$contentWeightedLength) viewModel.$contentWarningWeightedLength.assign(to: &composeContentToolbarViewModel.$contentWarningWeightedLength) + + // bind back to source due to visibility not update via delegate + composeContentToolbarViewModel.$visibility + .dropFirst() + .receive(on: DispatchQueue.main) + .sink { [weak self] visibility in + guard let self = self else { return } + if self.viewModel.visibility != visibility { + self.viewModel.visibility = visibility + } + } + .store(in: &disposeBag) + } + + private func updateAutoCompleteViewControllerLayout() { + // pin autoCompleteViewController frame to current view + if let containerView = autoCompleteViewController.view.superview { + let viewFrameInWindow = containerView.convert(autoCompleteViewController.view.frame, to: view) + if viewFrameInWindow.origin.x != 0 { + autoCompleteViewController.view.frame.origin.x = -viewFrameInWindow.origin.x + } + autoCompleteViewController.view.frame.size.width = view.frame.width + } + } + + private func resetImagePicker() { + let selectionLimit = max(1, viewModel.maxMediaAttachmentLimit - viewModel.attachmentViewModels.count) + let configuration = ComposeContentViewController.createPhotoLibraryPickerConfiguration(selectionLimit: selectionLimit) + photoLibraryPicker = createImagePicker(configuration: configuration) + } + + private func createImagePicker(configuration: PHPickerConfiguration) -> PHPickerViewController { + let imagePicker = PHPickerViewController(configuration: configuration) + imagePicker.delegate = self + return imagePicker } } @@ -325,16 +430,15 @@ extension ComposeContentViewController: PHPickerViewControllerDelegate { public func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) { picker.dismiss(animated: true, completion: nil) - // TODO: -// let attachmentServices: [MastodonAttachmentService] = results.map { result in -// let service = MastodonAttachmentService( -// context: context, -// pickerResult: result, -// initialAuthenticationBox: viewModel.authenticationBox -// ) -// return service -// } -// viewModel.attachmentServices = viewModel.attachmentServices + attachmentServices + let attachmentViewModels: [AttachmentViewModel] = results.map { result in + AttachmentViewModel( + api: viewModel.context.apiService, + authContext: viewModel.authContext, + input: .pickerResult(result), + delegate: viewModel + ) + } + viewModel.attachmentViewModels += attachmentViewModels } } @@ -345,12 +449,13 @@ extension ComposeContentViewController: UIImagePickerControllerDelegate & UINavi guard let image = info[.originalImage] as? UIImage else { return } -// let attachmentService = MastodonAttachmentService( -// context: context, -// image: image, -// initialAuthenticationBox: viewModel.authenticationBox -// ) -// viewModel.attachmentServices = viewModel.attachmentServices + [attachmentService] + let attachmentViewModel = AttachmentViewModel( + api: viewModel.context.apiService, + authContext: viewModel.authContext, + input: .image(image), + delegate: viewModel + ) + viewModel.attachmentViewModels += [attachmentViewModel] } public func imagePickerControllerDidCancel(_ picker: UIImagePickerController) { @@ -364,12 +469,13 @@ extension ComposeContentViewController: UIDocumentPickerDelegate { public func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) { guard let url = urls.first else { return } -// let attachmentService = MastodonAttachmentService( -// context: context, -// documentURL: url, -// initialAuthenticationBox: viewModel.authenticationBox -// ) -// viewModel.attachmentServices = viewModel.attachmentServices + [attachmentService] + let attachmentViewModel = AttachmentViewModel( + api: viewModel.context.apiService, + authContext: viewModel.authContext, + input: .url(url), + delegate: viewModel + ) + viewModel.attachmentViewModels += [attachmentViewModel] } } @@ -428,3 +534,123 @@ extension ComposeContentViewController: ComposeContentToolbarViewDelegate { } } } + +// MARK: - AutoCompleteViewControllerDelegate +extension ComposeContentViewController: AutoCompleteViewControllerDelegate { + func autoCompleteViewController( + _ viewController: AutoCompleteViewController, + didSelectItem item: AutoCompleteItem + ) { + logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): did select item: \(String(describing: item))") + + guard let info = viewModel.autoCompleteInfo else { return } + guard let metaText = viewModel.contentMetaText else { return } + + let _replacedText: String? = { + var text: String + switch item { + case .hashtag(let hashtag): + text = "#" + hashtag.name + case .hashtagV1(let hashtagName): + text = "#" + hashtagName + case .account(let account): + text = "@" + account.acct + case .emoji(let emoji): + text = ":" + emoji.shortcode + ":" + case .bottomLoader: + return nil + } + return text + }() + guard let replacedText = _replacedText else { return } + guard let text = metaText.textView.text else { return } + + let range = NSRange(info.toHighlightEndRange, in: text) + metaText.textStorage.replaceCharacters(in: range, with: replacedText) + viewModel.autoCompleteInfo = nil + + // set selected range + let newRange = NSRange(location: range.location + (replacedText as NSString).length, length: 0) + guard metaText.textStorage.length <= newRange.location else { return } + metaText.textView.selectedRange = newRange + + // append a space and trigger textView delegate update + DispatchQueue.main.async { + metaText.textView.insertText(" ") + } + } +} + +// MARK: - UICollectionViewDelegate +extension ComposeContentViewController: UICollectionViewDelegate { + + public func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { + os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: select %s", ((#file as NSString).lastPathComponent), #line, #function, indexPath.debugDescription) + + switch collectionView { + case customEmojiPickerInputView.collectionView: + guard let diffableDataSource = viewModel.customEmojiPickerDiffableDataSource else { return } + let item = diffableDataSource.itemIdentifier(for: indexPath) + guard case let .emoji(attribute) = item else { return } + let emoji = attribute.emoji + + // make click sound + UIDevice.current.playInputClick() + + // retrieve active text input and insert emoji + // the trailing space is REQUIRED to make regex happy + _ = viewModel.customEmojiPickerInputViewModel.insertText(":\(emoji.shortcode): ") + default: + assertionFailure() + } + } // end func + +} + +// MARK: - ComposeContentViewModelDelegate +extension ComposeContentViewController: ComposeContentViewModelDelegate { + public func composeContentViewModel( + _ viewModel: ComposeContentViewModel, + handleAutoComplete info: ComposeContentViewModel.AutoCompleteInfo + ) -> Bool { + let snapshot = autoCompleteViewController.viewModel.diffableDataSource.snapshot() + guard let item = snapshot.itemIdentifiers.first else { return false } + + // FIXME: redundant code + guard let metaText = viewModel.contentMetaText else { return false } + guard let text = metaText.textView.text else { return false } + let _replacedText: String? = { + var text: String + switch item { + case .hashtag, .hashtagV1: + // do no fill the hashtag + // allow user delete suffix and post they want + return nil + case .account(let account): + text = "@" + account.acct + case .emoji(let emoji): + text = ":" + emoji.shortcode + ":" + case .bottomLoader: + return nil + } + return text + }() + guard let replacedText = _replacedText else { return false } + + let range = NSRange(info.toHighlightEndRange, in: text) + metaText.textStorage.replaceCharacters(in: range, with: replacedText) + viewModel.autoCompleteInfo = nil + + // set selected range + let newRange = NSRange(location: range.location + (replacedText as NSString).length, length: 0) + guard metaText.textStorage.length <= newRange.location else { return true } + metaText.textView.selectedRange = newRange + + // append a space and trigger textView delegate update + DispatchQueue.main.async { + metaText.textView.insertText(" ") + } + + return true + } +} diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel+DataSource.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel+DataSource.swift index 3f6028b56..abbfe0e61 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel+DataSource.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel+DataSource.swift @@ -66,14 +66,15 @@ extension ComposeContentViewModel { guard let replyTo = status.object(in: context.managedObjectContext) else { return } cell.statusView.configure(status: replyTo) } - case .hashtag(let hashtag): + case .hashtag: break - case .mention(let user): + case .mention: break } } } +// MARK: - UITableViewDataSource extension ComposeContentViewModel: UITableViewDataSource { public func numberOfSections(in tableView: UITableView) -> Int { return Section.allCases.count @@ -99,3 +100,42 @@ extension ComposeContentViewModel: UITableViewDataSource { } } } + +extension ComposeContentViewModel { + + func setupCustomEmojiPickerDiffableDataSource( + collectionView: UICollectionView + ) { + let diffableDataSource = CustomEmojiPickerSection.collectionViewDiffableDataSource( + collectionView: collectionView, + context: context + ) + self.customEmojiPickerDiffableDataSource = diffableDataSource + + let domain = authContext.mastodonAuthenticationBox.domain.uppercased() + customEmojiViewModel?.emojis + .receive(on: DispatchQueue.main) + .sink { [weak self, weak diffableDataSource] emojis in + guard let _ = self else { return } + guard let diffableDataSource = diffableDataSource else { return } + + var snapshot = NSDiffableDataSourceSnapshot() + let customEmojiSection = CustomEmojiPickerSection.emoji(name: domain) + snapshot.appendSections([customEmojiSection]) + let items: [CustomEmojiPickerItem] = { + var items = [CustomEmojiPickerItem]() + for emoji in emojis where emoji.visibleInPicker { + let attribute = CustomEmojiPickerItem.CustomEmojiAttribute(emoji: emoji) + let item = CustomEmojiPickerItem.emoji(attribute: attribute) + items.append(item) + } + return items + }() + snapshot.appendItems(items, toSection: customEmojiSection) + + diffableDataSource.apply(snapshot) + } + .store(in: &disposeBag) + } + +} diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel+MetaTextDelegate.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel+MetaTextDelegate.swift index 80cc033e8..8a189739d 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel+MetaTextDelegate.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel+MetaTextDelegate.swift @@ -37,7 +37,7 @@ extension ComposeContentViewModel: MetaTextDelegate { let content = MastodonContent( content: textInput, - emojis: [:] // TODO: emojiViewModel?.emojis.asDictionary ?? [:] + emojis: [:] // customEmojiViewModel?.emojis.value.asDictionary ?? [:] ) let metaContent = MastodonMetaContent.convert(text: content) return metaContent @@ -48,7 +48,7 @@ extension ComposeContentViewModel: MetaTextDelegate { let content = MastodonContent( content: textInput, - emojis: [:] // emojiViewModel?.emojis.asDictionary ?? [:] + emojis: [:] // customEmojiViewModel?.emojis.value.asDictionary ?? [:] ) let metaContent = MastodonMetaContent.convert(text: content) return metaContent diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel+UITextViewDelegate.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel+UITextViewDelegate.swift new file mode 100644 index 000000000..cdf322a38 --- /dev/null +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel+UITextViewDelegate.swift @@ -0,0 +1,209 @@ +// +// ComposeContentViewModel+UITextViewDelegate.swift +// +// +// Created by MainasuK on 2022/11/13. +// + +import os.log +import UIKit + +// MARK: - UITextViewDelegate +extension ComposeContentViewModel: UITextViewDelegate { + + public func textViewDidBeginEditing(_ textView: UITextView) { + // Note: + // Xcode warning: + // Publishing changes from within view updates is not allowed, this will cause undefined behavior. + // + // Just ignore the warning and see what will happen… + switch textView { + case contentMetaText?.textView: + isContentEditing = true + case contentWarningMetaText?.textView: + isContentWarningEditing = true + default: + assertionFailure() + break + } + } + + public func textViewDidChange(_ textView: UITextView) { + switch textView { + case contentMetaText?.textView: + // update model + guard let metaText = self.contentMetaText else { + assertionFailure() + return + } + let backedString = metaText.backedString + logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): \(backedString)") + + // configure auto completion + setupAutoComplete(for: textView) + + case contentWarningMetaText?.textView: + break + default: + assertionFailure() + } + } + + public func textViewDidEndEditing(_ textView: UITextView) { + switch textView { + case contentMetaText?.textView: + isContentEditing = false + case contentWarningMetaText?.textView: + isContentWarningEditing = false + default: + assertionFailure() + break + } + } + + public func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool { + switch textView { + case contentMetaText?.textView: + if text == " ", let autoCompleteInfo = self.autoCompleteInfo { + assert(delegate != nil) + let isHandled = delegate?.composeContentViewModel(self, handleAutoComplete: autoCompleteInfo) ?? false + return !isHandled + } + + return true + case contentWarningMetaText?.textView: + let isReturn = text == "\n" + if isReturn { + setContentTextViewFirstResponderIfNeeds() + } + return !isReturn + default: + assertionFailure() + return true + } + } + +} + +extension ComposeContentViewModel { + + func insertContentText(text: String) { + guard let contentMetaText = self.contentMetaText else { return } + // FIXME: smart prefix and suffix + let string = contentMetaText.textStorage.string + let isEmpty = string.isEmpty + let hasPrefix = string.hasPrefix(" ") + if hasPrefix || isEmpty { + contentMetaText.textView.insertText(text) + } else { + contentMetaText.textView.insertText(" " + text) + } + } + + func setContentTextViewFirstResponderIfNeeds() { + guard let contentMetaText = self.contentMetaText else { return } + guard !contentMetaText.textView.isFirstResponder else { return } + contentMetaText.textView.becomeFirstResponder() + } + + func setContentWarningTextViewFirstResponderIfNeeds() { + guard let contentWarningMetaText = self.contentWarningMetaText else { return } + guard !contentWarningMetaText.textView.isFirstResponder else { return } + contentWarningMetaText.textView.becomeFirstResponder() + } + +} + +extension ComposeContentViewModel { + + private func setupAutoComplete(for textView: UITextView) { + guard var autoCompletion = ComposeContentViewModel.scanAutoCompleteInfo(textView: textView) else { + self.autoCompleteInfo = nil + return + } + os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: auto complete %s (%s)", ((#file as NSString).lastPathComponent), #line, #function, String(autoCompletion.toHighlightEndString), String(autoCompletion.toCursorString)) + + // get layout text bounding rect + var glyphRange = NSRange() + textView.layoutManager.characterRange(forGlyphRange: NSRange(autoCompletion.toCursorRange, in: textView.text), actualGlyphRange: &glyphRange) + let textContainer = textView.layoutManager.textContainers[0] + let textBoundingRect = textView.layoutManager.boundingRect(forGlyphRange: glyphRange, in: textContainer) + + let retryLayoutTimes = autoCompleteRetryLayoutTimes + guard textBoundingRect.size != .zero else { + autoCompleteRetryLayoutTimes += 1 + // avoid infinite loop + guard retryLayoutTimes < 3 else { return } + // needs retry calculate layout when the rect position changing + DispatchQueue.main.async { + self.setupAutoComplete(for: textView) + } + return + } + autoCompleteRetryLayoutTimes = 0 + + // get symbol bounding rect + textView.layoutManager.characterRange(forGlyphRange: NSRange(autoCompletion.symbolRange, in: textView.text), actualGlyphRange: &glyphRange) + let symbolBoundingRect = textView.layoutManager.boundingRect(forGlyphRange: glyphRange, in: textContainer) + + // set bounding rect and trigger layout + autoCompletion.textBoundingRect = textBoundingRect + autoCompletion.symbolBoundingRect = symbolBoundingRect + autoCompleteInfo = autoCompletion + } + + private static func scanAutoCompleteInfo(textView: UITextView) -> AutoCompleteInfo? { + guard let text = textView.text, + textView.selectedRange.location > 0, !text.isEmpty, + let selectedRange = Range(textView.selectedRange, in: text) else { + return nil + } + let cursorIndex = selectedRange.upperBound + let _highlightStartIndex: String.Index? = { + var index = text.index(before: cursorIndex) + while index > text.startIndex { + let char = text[index] + if char == "@" || char == "#" || char == ":" { + return index + } + index = text.index(before: index) + } + assert(index == text.startIndex) + let char = text[index] + if char == "@" || char == "#" || char == ":" { + return index + } else { + return nil + } + }() + + guard let highlightStartIndex = _highlightStartIndex else { return nil } + let scanRange = NSRange(highlightStartIndex..= cursorIndex else { return nil } + let symbolRange = highlightStartIndex.. Bool +} public final class ComposeContentViewModel: NSObject, ObservableObject { @@ -28,12 +33,20 @@ public final class ComposeContentViewModel: NSObject, ObservableObject { // input let context: AppContext let kind: Kind + weak var delegate: ComposeContentViewModelDelegate? @Published var viewLayoutFrame = ViewLayoutFrame() // author (me) @Published var authContext: AuthContext + // auto-complete info + @Published var autoCompleteRetryLayoutTimes = 0 + @Published var autoCompleteInfo: AutoCompleteInfo? = nil + + // emoji + var customEmojiPickerDiffableDataSource: UICollectionViewDiffableDataSource? + // output // limit @@ -42,10 +55,12 @@ public final class ComposeContentViewModel: NSObject, ObservableObject { // content public weak var contentMetaText: MetaText? { didSet { -// guard let textView = contentMetaText?.textView else { return } -// customEmojiPickerInputViewModel.configure(textInput: textView) + guard let textView = contentMetaText?.textView else { return } + customEmojiPickerInputViewModel.configure(textInput: textView) } } + // for hashtag: "# " + // for mention: "@ " @Published public var initialContent = "" @Published public var content = "" @Published public var contentWeightedLength = 0 @@ -56,8 +71,8 @@ public final class ComposeContentViewModel: NSObject, ObservableObject { // content warning weak var contentWarningMetaText: MetaText? { didSet { - //guard let textView = contentWarningMetaText?.textView else { return } - //customEmojiPickerInputViewModel.configure(textInput: textView) + guard let textView = contentWarningMetaText?.textView else { return } + customEmojiPickerInputViewModel.configure(textInput: textView) } } @Published public var isContentWarningActive = false @@ -76,7 +91,7 @@ public final class ComposeContentViewModel: NSObject, ObservableObject { // @Published public internal(set) var isMediaValid = true // poll - @Published var isPollActive = false + @Published public var isPollActive = false @Published public var pollOptions: [PollComposeItem.Option] = { // initial with 2 options var options: [PollComposeItem.Option] = [] @@ -91,15 +106,26 @@ public final class ComposeContentViewModel: NSObject, ObservableObject { // emoji @Published var isEmojiActive = false + let customEmojiViewModel: EmojiService.CustomEmojiViewModel? + let customEmojiPickerInputViewModel = CustomEmojiPickerInputViewModel() + @Published var isLoadingCustomEmoji = false // visibility - @Published var visibility: Mastodon.Entity.Status.Visibility + @Published public var visibility: Mastodon.Entity.Status.Visibility // UI & UX @Published var replyToCellFrame: CGRect = .zero @Published var contentCellFrame: CGRect = .zero + @Published var contentTextViewFrame: CGRect = .zero @Published var scrollViewState: ScrollViewState = .fold - + + @Published var characterCount: Int = 0 + + @Published public private(set) var isPublishBarButtonItemEnabled = true + @Published var isAttachmentButtonEnabled = false + @Published var isPollButtonEnabled = false + + @Published public private(set) var shouldDismiss = true public init( context: AppContext, @@ -144,9 +170,102 @@ public final class ComposeContentViewModel: NSObject, ObservableObject { } return visibility }() + self.customEmojiViewModel = context.emojiService.dequeueCustomEmojiViewModel( + for: authContext.mastodonAuthenticationBox.domain + ) super.init() // end init + // setup initial value + switch kind { + case .reply(let record): + context.managedObjectContext.performAndWait { + guard let status = record.object(in: context.managedObjectContext) else { + assertionFailure() + return + } + let author = authContext.mastodonAuthenticationBox.authenticationRecord.object(in: context.managedObjectContext)?.user + + var mentionAccts: [String] = [] + if author?.id != status.author.id { + mentionAccts.append("@" + status.author.acct) + } + let mentions = status.mentions + .filter { author?.id != $0.id } + for mention in mentions { + let acct = "@" + mention.acct + guard !mentionAccts.contains(acct) else { continue } + mentionAccts.append(acct) + } + for acct in mentionAccts { + UITextChecker.learnWord(acct) + } + if let spoilerText = status.spoilerText, !spoilerText.isEmpty { + self.isContentWarningActive = true + self.contentWarning = spoilerText + } + + let initialComposeContent = mentionAccts.joined(separator: " ") + let preInsertedContent: String? = initialComposeContent.isEmpty ? nil : initialComposeContent + " " + self.initialContent = preInsertedContent ?? "" + self.content = preInsertedContent ?? "" + } + case .hashtag(let hashtag): + let initialComposeContent = "#" + hashtag + UITextChecker.learnWord(initialComposeContent) + let preInsertedContent = initialComposeContent + " " + self.initialContent = preInsertedContent + self.content = preInsertedContent + case .mention(let record): + context.managedObjectContext.performAndWait { + guard let user = record.object(in: context.managedObjectContext) else { return } + let initialComposeContent = "@" + user.acct + UITextChecker.learnWord(initialComposeContent) + let preInsertedContent = initialComposeContent + " " + self.initialContent = preInsertedContent + self.content = preInsertedContent + } + case .post: + break + } + + // set limit + let _configuration: Mastodon.Entity.Instance.Configuration? = { + var configuration: Mastodon.Entity.Instance.Configuration? = nil + context.managedObjectContext.performAndWait { + guard let authentication = authContext.mastodonAuthenticationBox.authenticationRecord.object(in: context.managedObjectContext) + else { return } + configuration = authentication.instance?.configuration + } + return configuration + }() + if let configuration = _configuration { + // set character limit + if let maxCharacters = configuration.statuses?.maxCharacters { + maxTextInputLimit = maxCharacters + } + // set media limit + if let maxMediaAttachments = configuration.statuses?.maxMediaAttachments { + maxMediaAttachmentLimit = maxMediaAttachments + } + // set poll option limit + if let maxOptions = configuration.polls?.maxOptions { + maxPollOptionLimit = maxOptions + } + // TODO: more limit + } + + bind() + } + + deinit { + os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) + } + +} + +extension ComposeContentViewModel { + private func bind() { // bind author $authContext .sink { [weak self] authContext in @@ -177,12 +296,138 @@ public final class ComposeContentViewModel: NSObject, ObservableObject { ) .map { $0 + $1 <= $2 } .assign(to: &$isContentValid) - } - - deinit { - os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) - } + + // bind attachment + $attachmentViewModels + .receive(on: DispatchQueue.main) + .sink { [weak self] _ in + guard let self = self else { return } + Task { + try await self.uploadMediaInQueue() + } + } + .store(in: &disposeBag) + + // bind emoji inputView + $isEmojiActive.assign(to: &customEmojiPickerInputViewModel.$isCustomEmojiComposing) + + // bind toolbar + Publishers.CombineLatest3( + $isPollActive, + $attachmentViewModels, + $maxMediaAttachmentLimit + ) + .receive(on: DispatchQueue.main) + .sink { [weak self] isPollActive, attachmentViewModels, maxMediaAttachmentLimit in + guard let self = self else { return } + let shouldMediaDisable = isPollActive || attachmentViewModels.count >= maxMediaAttachmentLimit + let shouldPollDisable = attachmentViewModels.count > 0 + + self.isAttachmentButtonEnabled = !shouldMediaDisable + self.isPollButtonEnabled = !shouldPollDisable + } + .store(in: &disposeBag) + + // bind status content character count + Publishers.CombineLatest3( + $contentWeightedLength, + $contentWarningWeightedLength, + $isContentWarningActive + ) + .map { contentWeightedLength, contentWarningWeightedLength, isContentWarningActive -> Int in + var count = contentWeightedLength + if isContentWarningActive { + count += contentWarningWeightedLength + } + return count + } + .assign(to: &$characterCount) + + // bind compose bar button item UI state + let isComposeContentEmpty = $content + .map { $0.isEmpty } + let isComposeContentValid = Publishers.CombineLatest( + $characterCount, + $maxTextInputLimit + ) + .map { characterCount, maxTextInputLimit in + characterCount <= maxTextInputLimit + } + let isMediaEmpty = $attachmentViewModels + .map { $0.isEmpty } + let isMediaUploadAllSuccess = $attachmentViewModels + .map { attachmentViewModels in + return Publishers.MergeMany(attachmentViewModels.map { $0.$uploadState }) + .delay(for: 0.3, scheduler: DispatchQueue.main) // convert to outputs with delay. Due to @Published emit before changes + .map { _ in attachmentViewModels.map { $0.uploadState } } + } + .switchToLatest() + .map { outputs in + guard outputs.allSatisfy({ $0 == .finish }) else { return false } + return true + } + .prepend(true) + + let isPollOptionsAllValid = $pollOptions + .map { options in + return Publishers.MergeMany(options.map { $0.$text }) + .delay(for: 0.3, scheduler: DispatchQueue.main) // convert to outputs with delay. Due to @Published emit before changes + .map { _ in options.map { $0.text } } + } + .switchToLatest() + .map { outputs in + return outputs.allSatisfy { !$0.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty } + } + .prepend(true) + + let isPublishBarButtonItemEnabledPrecondition1 = Publishers.CombineLatest4( + isComposeContentEmpty, + isComposeContentValid, + isMediaEmpty, + isMediaUploadAllSuccess + ) + .map { isComposeContentEmpty, isComposeContentValid, isMediaEmpty, isMediaUploadAllSuccess -> Bool in + if isMediaEmpty { + return isComposeContentValid && !isComposeContentEmpty + } else { + return isComposeContentValid && isMediaUploadAllSuccess + } + } + .eraseToAnyPublisher() + + let isPublishBarButtonItemEnabledPrecondition2 = Publishers.CombineLatest( + $isPollActive, + isPollOptionsAllValid + ) + .map { isPollActive, isPollOptionsAllValid -> Bool in + if isPollActive { + return isPollOptionsAllValid + } else { + return true + } + } + .eraseToAnyPublisher() + + Publishers.CombineLatest( + isPublishBarButtonItemEnabledPrecondition1, + isPublishBarButtonItemEnabledPrecondition2 + ) + .map { $0 && $1 } + .assign(to: &$isPublishBarButtonItemEnabled) + + // bind modal dismiss state + $content + .receive(on: DispatchQueue.main) + .map { content in + if content.isEmpty { + return true + } + // if the trimmed content equal to initial content + return content.trimmingCharacters(in: .whitespacesAndNewlines) == self.initialContent + } + .assign(to: &$shouldDismiss) + } } extension ComposeContentViewModel { @@ -192,13 +437,30 @@ extension ComposeContentViewModel { case mention(user: ManagedObjectRecord) case reply(status: ManagedObjectRecord) } - + public enum ScrollViewState { case fold // snap to input case expand // snap to reply } } +extension ComposeContentViewModel { + public struct AutoCompleteInfo { + // model + let inputText: Substring + // range + let symbolRange: Range + let symbolString: Substring + let toCursorRange: Range + let toCursorString: Substring + let toHighlightEndRange: Range + let toHighlightEndString: Substring + // geometry + var textBoundingRect: CGRect = .zero + var symbolBoundingRect: CGRect = .zero + } +} + extension ComposeContentViewModel { func createNewPollOptionIfCould() { logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public)") @@ -217,14 +479,14 @@ extension ComposeContentViewModel { public var errorDescription: String? { switch self { case .pollHasEmptyOption: - return "The post poll is invalid" // TODO: i18n + return L10n.Scene.Compose.Poll.thePollIsInvalid } } public var failureReason: String? { switch self { case .pollHasEmptyOption: - return "The poll has empty option" // TODO: i18n + return L10n.Scene.Compose.Poll.thePollHasEmptyOption } } } @@ -236,7 +498,7 @@ extension ComposeContentViewModel { let managedObjectContext = self.context.managedObjectContext var _author: ManagedObjectRecord? managedObjectContext.performAndWait { - _author = authContext.mastodonAuthenticationBox.authenticationRecord.object(in: managedObjectContext)?.user.asRecrod + _author = authContext.mastodonAuthenticationBox.authenticationRecord.object(in: managedObjectContext)?.user.asRecord } guard let author = _author else { throw AppError.badAuthentication @@ -275,70 +537,58 @@ extension ComposeContentViewModel { } // end func publisher() } -// MARK: - UITextViewDelegate -extension ComposeContentViewModel: UITextViewDelegate { - public func textViewDidBeginEditing(_ textView: UITextView) { - switch textView { - case contentMetaText?.textView: - isContentEditing = true - case contentWarningMetaText?.textView: - isContentWarningEditing = true - default: - break - } - } +extension ComposeContentViewModel { - public func textViewDidEndEditing(_ textView: UITextView) { - switch textView { - case contentMetaText?.textView: - isContentEditing = false - case contentWarningMetaText?.textView: - isContentWarningEditing = false - default: - break + public enum AttachmentPrecondition: Error, LocalizedError { + case videoAttachWithPhoto + case moreThanOneVideo + + public var errorDescription: String? { + return L10n.Common.Alerts.PublishPostFailure.title } - } - - public func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool { - switch textView { - case contentMetaText?.textView: - return true - case contentWarningMetaText?.textView: - let isReturn = text == "\n" - if isReturn { - setContentTextViewFirstResponderIfNeeds() + + public var failureReason: String? { + switch self { + case .videoAttachWithPhoto: + return L10n.Common.Alerts.PublishPostFailure.AttachmentsMessage.videoAttachWithPhoto + case .moreThanOneVideo: + return L10n.Common.Alerts.PublishPostFailure.AttachmentsMessage.moreThanOneVideo + } + } + } + + // check exclusive limit: + // - up to 1 video + // - up to N photos + public func checkAttachmentPrecondition() throws { + let attachmentViewModels = self.attachmentViewModels + guard !attachmentViewModels.isEmpty else { return } + + var photoAttachmentViewModels: [AttachmentViewModel] = [] + var videoAttachmentViewModels: [AttachmentViewModel] = [] + attachmentViewModels.forEach { attachmentViewModel in + guard let output = attachmentViewModel.output else { + assertionFailure() + return + } + switch output { + case .image: + photoAttachmentViewModels.append(attachmentViewModel) + case .video: + videoAttachmentViewModels.append(attachmentViewModel) + } + } + + if !videoAttachmentViewModels.isEmpty { + guard videoAttachmentViewModels.count == 1 else { + throw AttachmentPrecondition.moreThanOneVideo + } + guard photoAttachmentViewModels.isEmpty else { + throw AttachmentPrecondition.videoAttachWithPhoto } - return !isReturn - default: - assertionFailure() - return true } } - func insertContentText(text: String) { - guard let contentMetaText = self.contentMetaText else { return } - // FIXME: smart prefix and suffix - let string = contentMetaText.textStorage.string - let isEmpty = string.isEmpty - let hasPrefix = string.hasPrefix(" ") - if hasPrefix || isEmpty { - contentMetaText.textView.insertText(text) - } else { - contentMetaText.textView.insertText(" " + text) - } - } - - func setContentTextViewFirstResponderIfNeeds() { - guard let contentMetaText = self.contentMetaText else { return } - guard !contentMetaText.textView.isFirstResponder else { return } - contentMetaText.textView.becomeFirstResponder() - } - - func setContentWarningTextViewFirstResponderIfNeeds() { - guard let contentWarningMetaText = self.contentWarningMetaText else { return } - guard !contentWarningMetaText.textView.isFirstResponder else { return } - contentWarningMetaText.textView.becomeFirstResponder() - } } // MARK: - DeleteBackwardResponseTextFieldRelayDelegate @@ -392,3 +642,56 @@ extension ComposeContentViewModel: DeleteBackwardResponseTextFieldRelayDelegate } } + +// MARK: - AttachmentViewModelDelegate +extension ComposeContentViewModel: AttachmentViewModelDelegate { + + public func attachmentViewModel( + _ viewModel: AttachmentViewModel, + uploadStateValueDidChange state: AttachmentViewModel.UploadState + ) { + Task { + try await uploadMediaInQueue() + } + } + + @MainActor + func uploadMediaInQueue() async throws { + for (i, attachmentViewModel) in attachmentViewModels.enumerated() { + switch attachmentViewModel.uploadState { + case .none: + return + case .compressing: + return + case .ready: + let count = self.attachmentViewModels.count + logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): upload \(i)/\(count) attachment") + try await attachmentViewModel.upload() + return + case .uploading: + return + case .fail: + return + case .finish: + continue + } + } + } + + public func attachmentViewModel( + _ viewModel: AttachmentViewModel, + actionButtonDidPressed action: AttachmentViewModel.Action + ) { + switch action { + case .retry: + Task { + try await viewModel.upload(isRetry: true) + } + case .remove: + attachmentViewModels.removeAll(where: { $0 === viewModel }) + Task { + try await uploadMediaInQueue() + } + } + } +} diff --git a/Mastodon/Scene/Compose/CollectionViewCell/CustomEmojiPickerHeaderCollectionReusableView.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/EmojiPicker/CustomEmojiPickerHeaderCollectionReusableView.swift similarity index 100% rename from Mastodon/Scene/Compose/CollectionViewCell/CustomEmojiPickerHeaderCollectionReusableView.swift rename to MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/EmojiPicker/CustomEmojiPickerHeaderCollectionReusableView.swift diff --git a/Mastodon/Scene/Compose/View/CustomEmojiPickerInputView.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/EmojiPicker/CustomEmojiPickerInputView.swift similarity index 91% rename from Mastodon/Scene/Compose/View/CustomEmojiPickerInputView.swift rename to MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/EmojiPicker/CustomEmojiPickerInputView.swift index 2fa582883..237164ae2 100644 --- a/Mastodon/Scene/Compose/View/CustomEmojiPickerInputView.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/EmojiPicker/CustomEmojiPickerInputView.swift @@ -44,12 +44,7 @@ extension CustomEmojiPickerInputView { collectionView.translatesAutoresizingMaskIntoConstraints = false addSubview(collectionView) - NSLayoutConstraint.activate([ - collectionView.topAnchor.constraint(equalTo: topAnchor), - collectionView.leadingAnchor.constraint(equalTo: leadingAnchor), - collectionView.trailingAnchor.constraint(equalTo: trailingAnchor), - collectionView.bottomAnchor.constraint(equalTo: bottomAnchor), - ]) + collectionView.pinToParent() activityIndicatorView.hidesWhenStopped = true activityIndicatorView.startAnimating() diff --git a/Mastodon/Scene/Compose/View/CustomEmojiPickerInputViewModel.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/EmojiPicker/CustomEmojiPickerInputViewModel.swift similarity index 52% rename from Mastodon/Scene/Compose/View/CustomEmojiPickerInputViewModel.swift rename to MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/EmojiPicker/CustomEmojiPickerInputViewModel.swift index 496c8191b..729524ce5 100644 --- a/Mastodon/Scene/Compose/View/CustomEmojiPickerInputViewModel.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/EmojiPicker/CustomEmojiPickerInputViewModel.swift @@ -9,7 +9,6 @@ import UIKit import Combine import MetaTextKit import MastodonCore -import MastodonUI final class CustomEmojiPickerInputViewModel { @@ -20,8 +19,7 @@ final class CustomEmojiPickerInputViewModel { // input weak var customEmojiPickerInputView: CustomEmojiPickerInputView? - // output - let isCustomEmojiComposing = CurrentValueSubject(false) + @Published var isCustomEmojiComposing = false } @@ -51,27 +49,28 @@ extension CustomEmojiPickerInputViewModel { for reference in customEmojiReplaceableTextInputReferences { guard let textInput = reference.value else { continue } guard textInput.isFirstResponder == true else { continue } - guard let selectedTextRange = textInput.selectedTextRange else { continue } + // guard let selectedTextRange = textInput.selectedTextRange else { continue } textInput.insertText(text) + // FIXME: inline emoji // due to insert text render as attachment // the cursor reset logic not works // hack with hard code +2 offset - assert(text.hasSuffix(": ")) - guard text.hasPrefix(":") && text.hasSuffix(": ") else { continue } - - if let _ = textInput as? MetaTextView { - if let newPosition = textInput.position(from: selectedTextRange.start, offset: 2) { - let newSelectedTextRange = textInput.textRange(from: newPosition, to: newPosition) - textInput.selectedTextRange = newSelectedTextRange - } - } else { - if let newPosition = textInput.position(from: selectedTextRange.start, offset: text.length) { - let newSelectedTextRange = textInput.textRange(from: newPosition, to: newPosition) - textInput.selectedTextRange = newSelectedTextRange - } - } + // assert(text.hasSuffix(": ")) + // guard text.hasPrefix(":") && text.hasSuffix(": ") else { continue } + // + // if let _ = textInput as? MetaTextView { + // if let newPosition = textInput.position(from: selectedTextRange.start, offset: 2) { + // let newSelectedTextRange = textInput.textRange(from: newPosition, to: newPosition) + // textInput.selectedTextRange = newSelectedTextRange + // } + // } else { + // if let newPosition = textInput.position(from: selectedTextRange.start, offset: text.length) { + // let newSelectedTextRange = textInput.textRange(from: newPosition, to: newPosition) + // textInput.selectedTextRange = newSelectedTextRange + // } + // } return reference } @@ -81,3 +80,16 @@ extension CustomEmojiPickerInputViewModel { } +extension CustomEmojiPickerInputViewModel { + public func configure(textInput: CustomEmojiReplaceableTextInput) { + $isCustomEmojiComposing + .receive(on: DispatchQueue.main) + .sink { [weak self] isCustomEmojiComposing in + guard let self = self else { return } + textInput.inputView = isCustomEmojiComposing ? self.customEmojiPickerInputView : nil + textInput.reloadInputViews() + self.append(customEmojiReplaceableTextInput: textInput) + } + .store(in: &disposeBag) + } +} diff --git a/Mastodon/Scene/Compose/CollectionViewCell/CustomEmojiPickerItemCollectionViewCell.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/EmojiPicker/CustomEmojiPickerItemCollectionViewCell.swift similarity index 76% rename from Mastodon/Scene/Compose/CollectionViewCell/CustomEmojiPickerItemCollectionViewCell.swift rename to MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/EmojiPicker/CustomEmojiPickerItemCollectionViewCell.swift index c92e689bc..49b1a8269 100644 --- a/Mastodon/Scene/Compose/CollectionViewCell/CustomEmojiPickerItemCollectionViewCell.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/EmojiPicker/CustomEmojiPickerItemCollectionViewCell.swift @@ -46,12 +46,7 @@ extension CustomEmojiPickerItemCollectionViewCell { private func _init() { emojiImageView.translatesAutoresizingMaskIntoConstraints = false contentView.addSubview(emojiImageView) - NSLayoutConstraint.activate([ - emojiImageView.topAnchor.constraint(equalTo: contentView.topAnchor), - emojiImageView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor), - emojiImageView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor), - emojiImageView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor), - ]) + emojiImageView.pinToParent() isAccessibilityElement = true accessibilityTraits = .button diff --git a/Mastodon/Helper/MastodonRegex.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Helper/MastodonRegex.swift similarity index 100% rename from Mastodon/Helper/MastodonRegex.swift rename to MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Helper/MastodonRegex.swift diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Poll/PollOptionTextField.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Poll/PollOptionTextField.swift index 5143bea35..fa409c114 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Poll/PollOptionTextField.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Poll/PollOptionTextField.swift @@ -39,7 +39,7 @@ public struct PollOptionTextField: UIViewRepresentable { textField.text = text textField.placeholder = { if index >= 0 { - return L10n.Scene.Compose.Poll.optionNumber(index) + return L10n.Scene.Compose.Poll.optionNumber(index + 1) } else { assertionFailure() return "" diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Publisher/MastodonStatusPublisher.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Publisher/MastodonStatusPublisher.swift index ea3be18a8..93f3dd3a1 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Publisher/MastodonStatusPublisher.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Publisher/MastodonStatusPublisher.swift @@ -119,13 +119,31 @@ extension MastodonStatusPublisher: StatusPublisher { progress.addChild(attachmentViewModel.progress, withPendingUnitCount: publishAttachmentTaskWeight) // upload media do { - let result = try await attachmentViewModel.upload(context: uploadContext) - guard case let .mastodon(response) = result else { - assertionFailure() - continue + guard let attachment = attachmentViewModel.uploadResult else { + // precondition: all media uploaded + throw AppError.badRequest } - let attachmentID = response.value.id - attachmentIDs.append(attachmentID) + attachmentIDs.append(attachment.id) + + let caption = attachmentViewModel.caption + guard !caption.isEmpty else { continue } + + _ = try await api.updateMedia( + domain: authContext.mastodonAuthenticationBox.domain, + attachmentID: attachment.id, + query: .init( + file: nil, + thumbnail: nil, + description: caption, + focus: nil + ), + mastodonAuthenticationBox: authContext.mastodonAuthenticationBox + ).singleOutput() + + // TODO: allow background upload + // let attachment = try await attachmentViewModel.upload(context: uploadContext) + // let attachmentID = attachment.id + // attachmentIDs.append(attachmentID) } catch { logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): upload attachment fail: \(error.localizedDescription)") _state = .failure(error) diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/TableViewCell/ComposeContentTableViewCell.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/TableViewCell/ComposeContentTableViewCell.swift index 3a646f1fc..90d432825 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/TableViewCell/ComposeContentTableViewCell.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/TableViewCell/ComposeContentTableViewCell.swift @@ -7,74 +7,12 @@ import os.log import UIKit -import Combine -import MetaTextKit -import UITextView_Placeholder -import MastodonAsset -import MastodonLocalization import UIHostingConfigurationBackport -//protocol ComposeStatusContentTableViewCellDelegate: AnyObject { -// func composeStatusContentTableViewCell(_ cell: ComposeStatusContentTableViewCell, textViewShouldBeginEditing textView: UITextView) -> Bool -//} - final class ComposeContentTableViewCell: UITableViewCell { let logger = Logger(subsystem: "ComposeContentTableViewCell", category: "View") -// var disposeBag = Set() -// weak var delegate: ComposeStatusContentTableViewCellDelegate? -// -// let statusView = StatusView() -// -// let statusContentWarningEditorView = StatusContentWarningEditorView() -// -// let textEditorViewContainerView = UIView() -// -// static let metaTextViewTag: Int = 333 -// let metaText: MetaText = { -// let metaText = MetaText() -// metaText.textView.backgroundColor = .clear -// metaText.textView.isScrollEnabled = false -// metaText.textView.keyboardType = .twitter -// metaText.textView.textDragInteraction?.isEnabled = false // disable drag for link and attachment -// metaText.textView.textContainer.lineFragmentPadding = 10 // leading inset -// metaText.textView.font = UIFontMetrics(forTextStyle: .body).scaledFont(for: .systemFont(ofSize: 17, weight: .regular)) -// metaText.textView.attributedPlaceholder = { -// var attributes = metaText.textAttributes -// attributes[.foregroundColor] = Asset.Colors.Label.secondary.color -// return NSAttributedString( -// string: L10n.Scene.Compose.contentInputPlaceholder, -// attributes: attributes -// ) -// }() -// metaText.paragraphStyle = { -// let style = NSMutableParagraphStyle() -// style.lineSpacing = 5 -// style.paragraphSpacing = 0 -// return style -// }() -// metaText.textAttributes = [ -// .font: UIFontMetrics(forTextStyle: .body).scaledFont(for: .systemFont(ofSize: 17, weight: .regular)), -// .foregroundColor: Asset.Colors.Label.primary.color, -// ] -// metaText.linkAttributes = [ -// .font: UIFontMetrics(forTextStyle: .body).scaledFont(for: .systemFont(ofSize: 17, weight: .semibold)), -// .foregroundColor: Asset.Colors.brand.color, -// ] -// return metaText -// }() -// -// // output -// let contentWarningContent = PassthroughSubject() -// -// override func prepareForReuse() { -// super.prepareForReuse() -// -// metaText.delegate = nil -// metaText.textView.delegate = nil -// } - override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { super.init(style: style, reuseIdentifier: reuseIdentifier) _init() @@ -93,79 +31,6 @@ extension ComposeContentTableViewCell { selectionStyle = .none layer.zPosition = 999 backgroundColor = .clear - -// let containerStackView = UIStackView() -// containerStackView.axis = .vertical -// containerStackView.translatesAutoresizingMaskIntoConstraints = false -// contentView.addSubview(containerStackView) -// NSLayoutConstraint.activate([ -// containerStackView.topAnchor.constraint(equalTo: contentView.topAnchor), -// containerStackView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor), -// containerStackView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor), -// containerStackView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor), -// ]) -// containerStackView.preservesSuperviewLayoutMargins = true -// -// containerStackView.addArrangedSubview(statusContentWarningEditorView) -// statusContentWarningEditorView.setContentHuggingPriority(.required - 1, for: .vertical) -// -// let statusContainerView = UIView() -// statusContainerView.preservesSuperviewLayoutMargins = true -// containerStackView.addArrangedSubview(statusContainerView) -// statusView.translatesAutoresizingMaskIntoConstraints = false -// statusContainerView.addSubview(statusView) -// NSLayoutConstraint.activate([ -// statusView.topAnchor.constraint(equalTo: statusContainerView.topAnchor, constant: 20), -// statusView.leadingAnchor.constraint(equalTo: statusContainerView.leadingAnchor), -// statusView.trailingAnchor.constraint(equalTo: statusContainerView.trailingAnchor), -// statusView.bottomAnchor.constraint(equalTo: statusContainerView.bottomAnchor), -// ]) -// statusView.setup(style: .composeStatusAuthor) -// -// containerStackView.addArrangedSubview(textEditorViewContainerView) -// metaText.textView.translatesAutoresizingMaskIntoConstraints = false -// textEditorViewContainerView.addSubview(metaText.textView) -// NSLayoutConstraint.activate([ -// metaText.textView.topAnchor.constraint(equalTo: textEditorViewContainerView.topAnchor), -// metaText.textView.leadingAnchor.constraint(equalTo: textEditorViewContainerView.layoutMarginsGuide.leadingAnchor), -// metaText.textView.trailingAnchor.constraint(equalTo: textEditorViewContainerView.layoutMarginsGuide.trailingAnchor), -// metaText.textView.bottomAnchor.constraint(equalTo: textEditorViewContainerView.bottomAnchor), -// metaText.textView.heightAnchor.constraint(greaterThanOrEqualToConstant: 64).priority(.defaultHigh), -// ]) -// statusContentWarningEditorView.textView.delegate = self } } - -// MARK: - UITextViewDelegate -//extension ComposeStatusContentTableViewCell: UITextViewDelegate { -// -// func textViewShouldBeginEditing(_ textView: UITextView) -> Bool { -// return delegate?.composeStatusContentTableViewCell(self, textViewShouldBeginEditing: textView) ?? true -// } -// -// func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool { -// switch textView { -// case statusContentWarningEditorView.textView: -// // disable input line break -// guard text != "\n" else { return false } -// return true -// default: -// assertionFailure() -// return true -// } -// } -// -// func textViewDidChange(_ textView: UITextView) { -// logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): text: \(textView.text ?? "")") -// guard textView === statusContentWarningEditorView.textView else { return } -// // replace line break with space -// // needs check input state to prevent break the IME -// if textView.markedTextRange == nil { -// textView.text = textView.text.replacingOccurrences(of: "\n", with: " ") -// } -// contentWarningContent.send(textView.text) -// } -// -//} - diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/TableViewCell/ComposeStatusAttachmentTableViewCell.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/TableViewCell/ComposeStatusAttachmentTableViewCell.swift deleted file mode 100644 index 42a851bf1..000000000 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/TableViewCell/ComposeStatusAttachmentTableViewCell.swift +++ /dev/null @@ -1,172 +0,0 @@ -// -// ComposeStatusAttachmentTableViewCell.swift -// Mastodon -// -// Created by MainasuK Cirno on 2021-6-29. -// - -import UIKit -import SwiftUI -import Combine -import AlamofireImage -import MastodonAsset -import MastodonCore -import MastodonLocalization -import UIHostingConfigurationBackport - -//final class ComposeStatusAttachmentTableViewCell: UITableViewCell { -// -// private(set) var dataSource: UICollectionViewDiffableDataSource! -// weak var composeStatusAttachmentCollectionViewCellDelegate: ComposeStatusAttachmentCollectionViewCellDelegate? -// var observations = Set() -// -// private static func createLayout() -> UICollectionViewLayout { -// let itemSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1.0), heightDimension: .estimated(44)) -// let item = NSCollectionLayoutItem(layoutSize: itemSize) -// let groupSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1.0), heightDimension: .estimated(44)) -// let group = NSCollectionLayoutGroup.vertical(layoutSize: groupSize, subitems: [item]) -// let section = NSCollectionLayoutSection(group: group) -// section.contentInsetsReference = .readableContent -// return UICollectionViewCompositionalLayout(section: section) -// } -// -// private(set) var collectionViewHeightLayoutConstraint: NSLayoutConstraint! -// let collectionView: UICollectionView = { -// let collectionViewLayout = ComposeStatusAttachmentTableViewCell.createLayout() -// let collectionView = UICollectionView(frame: .zero, collectionViewLayout: collectionViewLayout) -// collectionView.register(ComposeStatusAttachmentCollectionViewCell.self, forCellWithReuseIdentifier: String(describing: ComposeStatusAttachmentCollectionViewCell.self)) -// collectionView.backgroundColor = .clear -// collectionView.alwaysBounceVertical = true -// collectionView.isScrollEnabled = false -// return collectionView -// }() -// let collectionViewHeightDidUpdate = PassthroughSubject() -// -// override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { -// super.init(style: style, reuseIdentifier: reuseIdentifier) -// _init() -// } -// -// required init?(coder: NSCoder) { -// super.init(coder: coder) -// _init() -// } -// -//} -// -//extension ComposeStatusAttachmentTableViewCell { -// -// private func _init() { -// backgroundColor = .clear -// contentView.backgroundColor = .clear -// -// collectionView.translatesAutoresizingMaskIntoConstraints = false -// contentView.addSubview(collectionView) -// collectionViewHeightLayoutConstraint = collectionView.heightAnchor.constraint(equalToConstant: 200).priority(.defaultHigh) -// NSLayoutConstraint.activate([ -// collectionView.topAnchor.constraint(equalTo: contentView.topAnchor), -// collectionView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor), -// collectionView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor), -// collectionView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor), -// collectionViewHeightLayoutConstraint, -// ]) -// -// collectionView.observe(\.contentSize, options: [.initial, .new]) { [weak self] collectionView, _ in -// guard let self = self else { return } -// self.collectionViewHeightLayoutConstraint.constant = collectionView.contentSize.height -// self.collectionViewHeightDidUpdate.send() -// } -// .store(in: &observations) -// -// self.dataSource = UICollectionViewDiffableDataSource(collectionView: collectionView) { -// [weak self] collectionView, indexPath, item -> UICollectionViewCell? in -// guard let _ = self else { return UICollectionViewCell() } -// switch item { -// case .attachment: -// let cell = collectionView.dequeueReusableCell(withReuseIdentifier: String(describing: ComposeStatusAttachmentCollectionViewCell.self), for: indexPath) as! ComposeStatusAttachmentCollectionViewCell -// cell.contentConfiguration = UIHostingConfigurationBackport { -// HStack { -// Image(systemName: "star") -// Text("Favorites") -// Spacer() -// } -// } -//// cell.attachmentContainerView.descriptionTextView.text = attachmentService.description.value -//// cell.delegate = self.composeStatusAttachmentCollectionViewCellDelegate -//// attachmentService.thumbnailImage -//// .receive(on: DispatchQueue.main) -//// .sink { [weak cell] thumbnailImage in -//// guard let cell = cell else { return } -//// let size = cell.attachmentContainerView.previewImageView.frame.size != .zero ? cell.attachmentContainerView.previewImageView.frame.size : CGSize(width: 1, height: 1) -//// guard let image = thumbnailImage else { -//// let placeholder = UIImage.placeholder( -//// size: size, -//// color: ThemeService.shared.currentTheme.value.systemGroupedBackgroundColor -//// ) -//// .af.imageRounded( -//// withCornerRadius: AttachmentContainerView.containerViewCornerRadius -//// ) -//// cell.attachmentContainerView.previewImageView.image = placeholder -//// return -//// } -//// // cannot get correct size. set corner radius on layer -//// cell.attachmentContainerView.previewImageView.image = image -//// } -//// .store(in: &cell.disposeBag) -//// Publishers.CombineLatest( -//// attachmentService.uploadStateMachineSubject.eraseToAnyPublisher(), -//// attachmentService.error.eraseToAnyPublisher() -//// ) -//// .receive(on: DispatchQueue.main) -//// .sink { [weak cell, weak attachmentService] uploadState, error in -//// guard let cell = cell else { return } -//// guard let attachmentService = attachmentService else { return } -//// cell.attachmentContainerView.emptyStateView.isHidden = error == nil -//// cell.attachmentContainerView.descriptionBackgroundView.isHidden = error != nil -//// if let error = error { -//// cell.attachmentContainerView.activityIndicatorView.stopAnimating() -//// cell.attachmentContainerView.emptyStateView.label.text = error.localizedDescription -//// } else { -//// guard let uploadState = uploadState else { return } -//// switch uploadState { -//// case is MastodonAttachmentService.UploadState.Finish: -//// cell.attachmentContainerView.activityIndicatorView.stopAnimating() -//// case is MastodonAttachmentService.UploadState.Fail: -//// cell.attachmentContainerView.activityIndicatorView.stopAnimating() -//// // FIXME: not display -//// cell.attachmentContainerView.emptyStateView.label.text = { -//// if let file = attachmentService.file.value { -//// switch file { -//// case .jpeg, .png, .gif: -//// return L10n.Scene.Compose.Attachment.attachmentBroken(L10n.Scene.Compose.Attachment.photo) -//// case .other: -//// return L10n.Scene.Compose.Attachment.attachmentBroken(L10n.Scene.Compose.Attachment.video) -//// } -//// } else { -//// return L10n.Scene.Compose.Attachment.attachmentBroken(L10n.Scene.Compose.Attachment.photo) -//// } -//// }() -//// default: -//// break -//// } -//// } -//// } -//// .store(in: &cell.disposeBag) -//// NotificationCenter.default.publisher( -//// for: UITextView.textDidChangeNotification, -//// object: cell.attachmentContainerView.descriptionTextView -//// ) -//// .receive(on: DispatchQueue.main) -//// .sink { notification in -//// guard let textField = notification.object as? UITextView else { return } -//// let text = textField.text?.trimmingCharacters(in: .whitespacesAndNewlines) -//// attachmentService.description.value = text -//// } -//// .store(in: &cell.disposeBag) -// return cell -// } -// } -// } -// -//} -// diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/TableViewCell/ComposeStatusPollTableViewCell.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/TableViewCell/ComposeStatusPollTableViewCell.swift deleted file mode 100644 index 27b835a5a..000000000 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/TableViewCell/ComposeStatusPollTableViewCell.swift +++ /dev/null @@ -1,209 +0,0 @@ -// -// ComposeStatusPollTableViewCell.swift -// Mastodon -// -// Created by MainasuK Cirno on 2021-6-29. -// - -import os.log -import UIKit -import Combine -import MastodonAsset -import MastodonLocalization - -//protocol ComposeStatusPollTableViewCellDelegate: AnyObject { -// func composeStatusPollTableViewCell(_ cell: ComposeStatusPollTableViewCell, pollOptionAttributesDidReorder options: [ComposeStatusPollItem.PollOptionAttribute]) -//} -// -//final class ComposeStatusPollTableViewCell: UITableViewCell { -// -// let logger = Logger(subsystem: "ComposeStatusPollTableViewCell", category: "UI") -// -// private(set) var dataSource: UICollectionViewDiffableDataSource! -// var observations = Set() -// -// weak var customEmojiPickerInputViewModel: CustomEmojiPickerInputViewModel? -// weak var delegate: ComposeStatusPollTableViewCellDelegate? -// weak var composeStatusPollOptionCollectionViewCellDelegate: ComposeStatusPollOptionCollectionViewCellDelegate? -// weak var composeStatusPollOptionAppendEntryCollectionViewCellDelegate: ComposeStatusPollOptionAppendEntryCollectionViewCellDelegate? -// weak var composeStatusPollExpiresOptionCollectionViewCellDelegate: ComposeStatusPollExpiresOptionCollectionViewCellDelegate? -// -// private static func createLayout() -> UICollectionViewLayout { -// let itemSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1.0), heightDimension: .estimated(44)) -// let item = NSCollectionLayoutItem(layoutSize: itemSize) -// let groupSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1.0), heightDimension: .estimated(44)) -// let group = NSCollectionLayoutGroup.vertical(layoutSize: groupSize, subitems: [item]) -// let section = NSCollectionLayoutSection(group: group) -// section.contentInsetsReference = .readableContent -// return UICollectionViewCompositionalLayout(section: section) -// } -// -// private(set) var collectionViewHeightLayoutConstraint: NSLayoutConstraint! -// let collectionView: UICollectionView = { -// let collectionViewLayout = ComposeStatusPollTableViewCell.createLayout() -// let collectionView = UICollectionView(frame: .zero, collectionViewLayout: collectionViewLayout) -// collectionView.register(ComposeStatusPollOptionCollectionViewCell.self, forCellWithReuseIdentifier: String(describing: ComposeStatusPollOptionCollectionViewCell.self)) -// collectionView.register(ComposeStatusPollOptionAppendEntryCollectionViewCell.self, forCellWithReuseIdentifier: String(describing: ComposeStatusPollOptionAppendEntryCollectionViewCell.self)) -// collectionView.register(ComposeStatusPollExpiresOptionCollectionViewCell.self, forCellWithReuseIdentifier: String(describing: ComposeStatusPollExpiresOptionCollectionViewCell.self)) -// collectionView.backgroundColor = .clear -// collectionView.alwaysBounceVertical = true -// collectionView.isScrollEnabled = false -// collectionView.dragInteractionEnabled = true -// return collectionView -// }() -// let collectionViewHeightDidUpdate = PassthroughSubject() -// -// override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { -// super.init(style: style, reuseIdentifier: reuseIdentifier) -// _init() -// } -// -// required init?(coder: NSCoder) { -// super.init(coder: coder) -// _init() -// } -// -//} -// -//extension ComposeStatusPollTableViewCell { -// -// private func _init() { -// backgroundColor = .clear -// contentView.backgroundColor = .clear -// -// collectionView.translatesAutoresizingMaskIntoConstraints = false -// contentView.addSubview(collectionView) -// collectionViewHeightLayoutConstraint = collectionView.heightAnchor.constraint(equalToConstant: 300).priority(.defaultHigh) -// NSLayoutConstraint.activate([ -// collectionView.topAnchor.constraint(equalTo: contentView.topAnchor), -// collectionView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor), -// collectionView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor), -// collectionView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor), -// collectionViewHeightLayoutConstraint, -// ]) -// -// collectionView.observe(\.contentSize, options: [.initial, .new]) { [weak self] collectionView, _ in -// guard let self = self else { return } -// self.collectionViewHeightLayoutConstraint.constant = collectionView.contentSize.height -// self.collectionViewHeightDidUpdate.send() -// } -// .store(in: &observations) -// -// self.dataSource = UICollectionViewDiffableDataSource(collectionView: collectionView) { [ -// weak self -// ] collectionView, indexPath, item -> UICollectionViewCell? in -// guard let self = self else { return UICollectionViewCell() } -// -// switch item { -// case .pollOption(let attribute): -// let cell = collectionView.dequeueReusableCell(withReuseIdentifier: String(describing: ComposeStatusPollOptionCollectionViewCell.self), for: indexPath) as! ComposeStatusPollOptionCollectionViewCell -// cell.pollOptionView.optionTextField.text = attribute.option.value -// cell.pollOptionView.optionTextField.placeholder = L10n.Scene.Compose.Poll.optionNumber(indexPath.item + 1) -// cell.pollOption -// .receive(on: DispatchQueue.main) -// .assign(to: \.value, on: attribute.option) -// .store(in: &cell.disposeBag) -// cell.delegate = self.composeStatusPollOptionCollectionViewCellDelegate -// if let customEmojiPickerInputViewModel = self.customEmojiPickerInputViewModel { -// ComposeStatusSection.configureCustomEmojiPicker(viewModel: customEmojiPickerInputViewModel, customEmojiReplaceableTextInput: cell.pollOptionView.optionTextField, disposeBag: &cell.disposeBag) -// } -// return cell -// case .pollOptionAppendEntry: -// let cell = collectionView.dequeueReusableCell(withReuseIdentifier: String(describing: ComposeStatusPollOptionAppendEntryCollectionViewCell.self), for: indexPath) as! ComposeStatusPollOptionAppendEntryCollectionViewCell -// cell.delegate = self.composeStatusPollOptionAppendEntryCollectionViewCellDelegate -// return cell -// case .pollExpiresOption(let attribute): -// let cell = collectionView.dequeueReusableCell(withReuseIdentifier: String(describing: ComposeStatusPollExpiresOptionCollectionViewCell.self), for: indexPath) as! ComposeStatusPollExpiresOptionCollectionViewCell -// cell.durationButton.setTitle(L10n.Scene.Compose.Poll.durationTime(attribute.expiresOption.value.title), for: .normal) -// attribute.expiresOption -// .receive(on: DispatchQueue.main) -// .sink { [weak cell] expiresOption in -// guard let cell = cell else { return } -// cell.durationButton.setTitle(L10n.Scene.Compose.Poll.durationTime(expiresOption.title), for: .normal) -// } -// .store(in: &cell.disposeBag) -// cell.delegate = self.composeStatusPollExpiresOptionCollectionViewCellDelegate -// return cell -// } -// } -// -// collectionView.dragDelegate = self -// collectionView.dropDelegate = self -// } -// -//} -// -//// MARK: - UICollectionViewDragDelegate -//extension ComposeStatusPollTableViewCell: UICollectionViewDragDelegate { -// -// func collectionView(_ collectionView: UICollectionView, itemsForBeginning session: UIDragSession, at indexPath: IndexPath) -> [UIDragItem] { -// guard let item = dataSource.itemIdentifier(for: indexPath) else { return [] } -// switch item { -// case .pollOption: -// let itemProvider = NSItemProvider(object: String(item.hashValue) as NSString) -// let dragItem = UIDragItem(itemProvider: itemProvider) -// dragItem.localObject = item -// return [dragItem] -// default: -// return [] -// } -// } -// -// func collectionView(_ collectionView: UICollectionView, dragSessionIsRestrictedToDraggingApplication session: UIDragSession) -> Bool { -// // drag to app should be the same app -// return true -// } -//} -// -//// MARK: - UICollectionViewDropDelegate -//extension ComposeStatusPollTableViewCell: UICollectionViewDropDelegate { -// // didUpdate -// func collectionView(_ collectionView: UICollectionView, dropSessionDidUpdate session: UIDropSession, withDestinationIndexPath destinationIndexPath: IndexPath?) -> UICollectionViewDropProposal { -// guard collectionView.hasActiveDrag, -// let destinationIndexPath = destinationIndexPath, -// let item = dataSource.itemIdentifier(for: destinationIndexPath) -// else { -// return UICollectionViewDropProposal(operation: .forbidden) -// } -// -// switch item { -// case .pollOption: -// return UICollectionViewDropProposal(operation: .move, intent: .insertAtDestinationIndexPath) -// default: -// return UICollectionViewDropProposal(operation: .cancel) -// } -// } -// -// // performDrop -// func collectionView(_ collectionView: UICollectionView, performDropWith coordinator: UICollectionViewDropCoordinator) { -// guard let dropItem = coordinator.items.first, -// let item = dropItem.dragItem.localObject as? ComposeStatusPollItem, -// case .pollOption = item -// else { return } -// -// guard coordinator.proposal.operation == .move else { return } -// guard let destinationIndexPath = coordinator.destinationIndexPath, -// let _ = collectionView.cellForItem(at: destinationIndexPath) as? ComposeStatusPollOptionCollectionViewCell -// else { return } -// -// var snapshot = dataSource.snapshot() -// guard destinationIndexPath.row < snapshot.itemIdentifiers.count else { return } -// let anchorItem = snapshot.itemIdentifiers[destinationIndexPath.row] -// snapshot.moveItem(item, afterItem: anchorItem) -// dataSource.apply(snapshot) -// -// coordinator.drop(dropItem.dragItem, toItemAt: destinationIndexPath) -// } -//} -// -//extension ComposeStatusPollTableViewCell: UICollectionViewDelegate { -// func collectionView(_ collectionView: UICollectionView, targetIndexPathForMoveFromItemAt originalIndexPath: IndexPath, toProposedIndexPath proposedIndexPath: IndexPath) -> IndexPath { -// logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): \(originalIndexPath.debugDescription) -> \(proposedIndexPath.debugDescription)") -// -// guard let _ = collectionView.cellForItem(at: proposedIndexPath) as? ComposeStatusPollOptionCollectionViewCell else { -// return originalIndexPath -// } -// -// return proposedIndexPath -// } -//} diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/View/ComposeContentToolbarView+ViewModel.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Toolbar/ComposeContentToolbarView+ViewModel.swift similarity index 83% rename from MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/View/ComposeContentToolbarView+ViewModel.swift rename to MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Toolbar/ComposeContentToolbarView+ViewModel.swift index 4a34c77d4..6374203fa 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/View/ComposeContentToolbarView+ViewModel.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Toolbar/ComposeContentToolbarView+ViewModel.swift @@ -27,6 +27,9 @@ extension ComposeContentToolbarView { @Published var isEmojiActive = false @Published var isContentWarningActive = false + @Published var isAttachmentButtonEnabled = false + @Published var isPollButtonEnabled = false + @Published public var maxTextInputLimit = 500 @Published public var contentWeightedLength = 0 @Published public var contentWarningWeightedLength = 0 @@ -120,4 +123,19 @@ extension ComposeContentToolbarView.ViewModel { return action.inactiveImage } } + + func label(for action: Action) -> String { + switch action { + case .attachment: + return L10n.Scene.Compose.Accessibility.appendAttachment + case .poll: + return isPollActive ? L10n.Scene.Compose.Accessibility.removePoll : L10n.Scene.Compose.Accessibility.appendPoll + case .emoji: + return L10n.Scene.Compose.Accessibility.customEmojiPicker + case .contentWarning: + return isContentWarningActive ? L10n.Scene.Compose.Accessibility.disableContentWarning : L10n.Scene.Compose.Accessibility.enableContentWarning + case .visibility: + return L10n.Scene.Compose.Accessibility.postVisibilityMenu + } + } } diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/View/ComposeContentToolbarView.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Toolbar/ComposeContentToolbarView.swift similarity index 82% rename from MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/View/ComposeContentToolbarView.swift rename to MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Toolbar/ComposeContentToolbarView.swift index 52026c636..683164bdd 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/View/ComposeContentToolbarView.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Toolbar/ComposeContentToolbarView.swift @@ -44,7 +44,9 @@ struct ComposeContentToolbarView: View { } } label: { label(for: action) + .opacity(viewModel.isAttachmentButtonEnabled ? 1.0 : 0.5) } + .disabled(!viewModel.isAttachmentButtonEnabled) .frame(width: 48, height: 48) case .visibility: Menu { @@ -61,8 +63,19 @@ struct ComposeContentToolbarView: View { } } label: { label(for: viewModel.visibility.image) + .accessibilityLabel(L10n.Scene.Compose.Keyboard.selectVisibilityEntry(viewModel.visibility.title)) } .frame(width: 48, height: 48) + case .poll: + Button { + logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): \(String(describing: action))") + viewModel.delegate?.composeContentToolbarView(viewModel, toolbarItemDidPressed: action) + } label: { + label(for: action) + .opacity(viewModel.isPollButtonEnabled ? 1.0 : 0.5) + } + .disabled(!viewModel.isPollButtonEnabled) + .frame(width: 48, height: 48) default: Button { logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): \(String(describing: action))") @@ -86,11 +99,14 @@ struct ComposeContentToolbarView: View { Text("\(remains)") .foregroundColor(Color(isOverflow ? UIColor.systemRed : UIColor.secondaryLabel)) .font(.system(size: isOverflow ? 18 : 16, weight: isOverflow ? .medium : .regular)) + .accessibilityLabel(L10n.A11y.Plural.Count.charactersLeft(remains)) } .padding(.leading, 4) // 4 + 12 = 16 .padding(.trailing, 16) .frame(height: ComposeContentToolbarView.toolbarHeight) .background(Color(viewModel.backgroundColor)) + .accessibilityElement(children: .contain) + .accessibilityLabel(L10n.Scene.Compose.Accessibility.postOptions) } } @@ -100,6 +116,7 @@ extension ComposeContentToolbarView { Image(uiImage: viewModel.image(for: action)) .foregroundColor(Color(Asset.Scene.Compose.buttonTint.color)) .frame(width: 24, height: 24, alignment: .center) + .accessibilityLabel(viewModel.label(for: action)) } func label(for image: UIImage) -> some View { diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/View/ComposeContentView.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/View/ComposeContentView.swift index 25584848a..a7f867f60 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/View/ComposeContentView.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/View/ComposeContentView.swift @@ -11,15 +11,18 @@ import MastodonAsset import MastodonCore import MastodonLocalization import Stripes +import Kingfisher public struct ComposeContentView: View { static let logger = Logger(subsystem: "ComposeContentView", category: "View") var logger: Logger { ComposeContentView.logger } + static let contentViewCoordinateSpace = "ComposeContentView.Content" static var margin: CGFloat = 16 @ObservedObject var viewModel: ComposeContentViewModel + public var body: some View { VStack(spacing: .zero) { @@ -105,9 +108,25 @@ public struct ComposeContentView: View { .frame(minHeight: 100) .fixedSize(horizontal: false, vertical: true) .padding(.horizontal, ComposeContentView.margin) + .background( + GeometryReader { proxy in + Color.clear.preference(key: ViewFramePreferenceKey.self, value: proxy.frame(in: .named(ComposeContentView.contentViewCoordinateSpace))) + } + .onPreferenceChange(ViewFramePreferenceKey.self) { frame in + logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): content textView frame: \(frame.debugDescription)") + let rect = frame.standardized + viewModel.contentTextViewFrame = CGRect( + origin: frame.origin, + size: CGSize(width: floor(rect.width), height: floor(rect.height)) + ) + } + ) // poll pollView .padding(.horizontal, ComposeContentView.margin) + // media + mediaView + .padding(.horizontal, ComposeContentView.margin) } .background( GeometryReader { proxy in @@ -124,6 +143,7 @@ public struct ComposeContentView: View { ) Spacer() } // end VStack + .coordinateSpace(name: ComposeContentView.contentViewCoordinateSpace) } // end body } @@ -147,6 +167,8 @@ extension ComposeContentView { } Spacer() } + .accessibilityElement(children: .ignore) + .accessibilityLabel(L10n.Scene.Compose.Accessibility.postingAs([viewModel.name.string, viewModel.username].joined(separator: ", "))) } } @@ -165,7 +187,7 @@ extension ComposeContentView { index: _index, deleteBackwardResponseTextFieldRelayDelegate: viewModel ) { textField in - // viewModel.customEmojiPickerInputViewModel.configure(textInput: textField) + viewModel.customEmojiPickerInputViewModel.configure(textInput: textField) } } if viewModel.maxPollOptionLimit != viewModel.pollOptions.count { @@ -194,6 +216,28 @@ extension ComposeContentView { } } // end VStack } + + // MARK: - media + var mediaView: some View { + VStack(spacing: 16) { + ForEach(viewModel.attachmentViewModels, id: \.self) { attachmentViewModel in + AttachmentView(viewModel: attachmentViewModel) + .clipShape(RoundedRectangle(cornerRadius: 4)) + .badgeView( + Button { + viewModel.attachmentViewModels.removeAll(where: { $0 === attachmentViewModel }) + } label: { + Image(systemName: "minus.circle.fill") + .resizable() + .frame(width: 20, height: 20) + .foregroundColor(.red) + .background(Color.white) + .clipShape(Circle()) + } + ) + } // end ForEach + } // end VStack + } } //private struct ScrollOffsetPreferenceKey: PreferenceKey { diff --git a/MastodonSDK/Sources/MastodonUI/SwiftUI/AnimatedImage.swift b/MastodonSDK/Sources/MastodonUI/SwiftUI/AnimatedImage.swift index 9a0f65108..29dd16549 100644 --- a/MastodonSDK/Sources/MastodonUI/SwiftUI/AnimatedImage.swift +++ b/MastodonSDK/Sources/MastodonUI/SwiftUI/AnimatedImage.swift @@ -37,12 +37,7 @@ final public class FLAnimatedImageViewProxy: UIView { imageView.translatesAutoresizingMaskIntoConstraints = false addSubview(imageView) - NSLayoutConstraint.activate([ - imageView.topAnchor.constraint(equalTo: topAnchor), - imageView.leadingAnchor.constraint(equalTo: leadingAnchor), - imageView.trailingAnchor.constraint(equalTo: trailingAnchor), - imageView.bottomAnchor.constraint(equalTo: bottomAnchor), - ]) + imageView.pinToParent() } required init?(coder: NSCoder) { diff --git a/MastodonSDK/Sources/MastodonUI/Vendor/CircleProgressView.swift b/MastodonSDK/Sources/MastodonUI/Vendor/CircleProgressView.swift new file mode 100644 index 000000000..f9b09e740 --- /dev/null +++ b/MastodonSDK/Sources/MastodonUI/Vendor/CircleProgressView.swift @@ -0,0 +1,29 @@ +// +// CircleProgressView.swift +// +// +// Created by MainasuK on 2022/11/10. +// + +import Foundation +import SwiftUI + +/// https://stackoverflow.com/a/71467536/3797903 +struct CircleProgressView: View { + + let progress: Double + + var body: some View { + let lineWidth: CGFloat = 4 + let tintColor = Color.white + ZStack { + Circle() + .trim(from: 0.0, to: CGFloat(progress)) + .stroke(style: StrokeStyle(lineWidth: lineWidth, lineCap: .butt, lineJoin: .bevel)) + .foregroundColor(tintColor) + .rotationEffect(Angle(degrees: 270.0)) + } + .padding(ceil(lineWidth / 2)) + } + +} diff --git a/MastodonSDK/Sources/MastodonUI/Vendor/MetaTextView+PasteExtensions.swift b/MastodonSDK/Sources/MastodonUI/Vendor/MetaTextView+PasteExtensions.swift new file mode 100644 index 000000000..8fe1949af --- /dev/null +++ b/MastodonSDK/Sources/MastodonUI/Vendor/MetaTextView+PasteExtensions.swift @@ -0,0 +1,29 @@ +// +// MetaTextView+PasteExtensions.swift +// Mastodon +// +// Created by Rick Kerkhof on 30/10/2022. +// + +import Foundation +import MetaTextKit +import UIKit + +extension MetaTextView { + public override func paste(_ sender: Any?) { + super.paste(sender) + + var nextResponder = self.next; + + // Force the event to bubble through ALL responders + // This is a workaround as somewhere down the chain the paste event gets eaten + while (nextResponder != nil) { + if let nextResponder = nextResponder { + if (nextResponder.responds(to: #selector(UIResponderStandardEditActions.paste(_:)))) { + nextResponder.perform(#selector(UIResponderStandardEditActions.paste(_:)), with: sender) + } + } + nextResponder = nextResponder?.next; + } + } +} diff --git a/MastodonSDK/Sources/MastodonUI/Vendor/VisualEffectView.swift b/MastodonSDK/Sources/MastodonUI/Vendor/VisualEffectView.swift new file mode 100644 index 000000000..fe89b0457 --- /dev/null +++ b/MastodonSDK/Sources/MastodonUI/Vendor/VisualEffectView.swift @@ -0,0 +1,15 @@ +// +// VisualEffectView.swift +// +// +// Created by MainasuK on 2022/11/8. +// + +import SwiftUI + +// ref: https://stackoverflow.com/a/59111492/3797903 +public struct VisualEffectView: UIViewRepresentable { + public var effect: UIVisualEffect? + public func makeUIView(context: UIViewRepresentableContext) -> UIVisualEffectView { UIVisualEffectView() } + public func updateUIView(_ uiView: UIVisualEffectView, context: UIViewRepresentableContext) { uiView.effect = effect } +} diff --git a/MastodonSDK/Sources/MastodonUI/View/Button/AvatarButton.swift b/MastodonSDK/Sources/MastodonUI/View/Button/AvatarButton.swift index 57257fd89..d970ac69c 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Button/AvatarButton.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Button/AvatarButton.swift @@ -32,12 +32,7 @@ open class AvatarButton: UIControl { avatarImageView.frame = bounds avatarImageView.translatesAutoresizingMaskIntoConstraints = false addSubview(avatarImageView) - NSLayoutConstraint.activate([ - avatarImageView.topAnchor.constraint(equalTo: topAnchor), - avatarImageView.leadingAnchor.constraint(equalTo: leadingAnchor), - avatarImageView.trailingAnchor.constraint(equalTo: trailingAnchor), - avatarImageView.bottomAnchor.constraint(equalTo: bottomAnchor), - ]) + avatarImageView.pinToParent() isAccessibilityElement = true accessibilityLabel = L10n.Common.Controls.Status.showUserProfile diff --git a/MastodonSDK/Sources/MastodonUI/View/Container/MediaGridContainerView.swift b/MastodonSDK/Sources/MastodonUI/View/Container/MediaGridContainerView.swift index e3359fb58..b28f63942 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Container/MediaGridContainerView.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Container/MediaGridContainerView.swift @@ -136,12 +136,7 @@ extension MediaGridContainerView { private func layoutContentWarningOverlay() { contentWarningOverlay.translatesAutoresizingMaskIntoConstraints = false addSubview(contentWarningOverlay) - NSLayoutConstraint.activate([ - contentWarningOverlay.topAnchor.constraint(equalTo: topAnchor), - contentWarningOverlay.leadingAnchor.constraint(equalTo: leadingAnchor), - contentWarningOverlay.trailingAnchor.constraint(equalTo: trailingAnchor), - contentWarningOverlay.bottomAnchor.constraint(equalTo: bottomAnchor), - ]) + contentWarningOverlay.pinToParent() } } @@ -208,12 +203,7 @@ extension MediaGridContainerView { let containerVerticalStackView = createStackView(axis: .vertical) containerVerticalStackView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(containerVerticalStackView) - NSLayoutConstraint.activate([ - containerVerticalStackView.topAnchor.constraint(equalTo: view.topAnchor), - containerVerticalStackView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - containerVerticalStackView.trailingAnchor.constraint(equalTo: view.trailingAnchor), - containerVerticalStackView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - ]) + containerVerticalStackView.pinToParent() let count = mediaViews.count switch count { diff --git a/MastodonSDK/Sources/MastodonUI/View/Content/FamiliarFollowersDashboardView.swift b/MastodonSDK/Sources/MastodonUI/View/Content/FamiliarFollowersDashboardView.swift index c15f8878a..32d9bce96 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Content/FamiliarFollowersDashboardView.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Content/FamiliarFollowersDashboardView.swift @@ -45,12 +45,7 @@ extension FamiliarFollowersDashboardView { stackView.translatesAutoresizingMaskIntoConstraints = false addSubview(stackView) - NSLayoutConstraint.activate([ - stackView.topAnchor.constraint(equalTo: topAnchor), - stackView.leadingAnchor.constraint(equalTo: leadingAnchor), - stackView.trailingAnchor.constraint(equalTo: trailingAnchor), - stackView.bottomAnchor.constraint(equalTo: bottomAnchor), - ]) + stackView.pinToParent() avatarContainerView.translatesAutoresizingMaskIntoConstraints = false stackView.addArrangedSubview(avatarContainerView) diff --git a/MastodonSDK/Sources/MastodonUI/View/Content/MediaView.swift b/MastodonSDK/Sources/MastodonUI/View/Content/MediaView.swift index f4cee0922..54560a8ce 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Content/MediaView.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Content/MediaView.swift @@ -138,12 +138,7 @@ extension MediaView { private func layoutImage() { imageView.translatesAutoresizingMaskIntoConstraints = false container.addSubview(imageView) - NSLayoutConstraint.activate([ - imageView.topAnchor.constraint(equalTo: container.topAnchor), - imageView.leadingAnchor.constraint(equalTo: container.leadingAnchor), - imageView.trailingAnchor.constraint(equalTo: container.trailingAnchor), - imageView.bottomAnchor.constraint(equalTo: container.bottomAnchor), - ]) + imageView.pinToParent() } private func bindImage(configuration: Configuration, info: Configuration.ImageInfo) { @@ -168,12 +163,7 @@ extension MediaView { // use view controller as View here playerViewController.view.translatesAutoresizingMaskIntoConstraints = false container.addSubview(playerViewController.view) - NSLayoutConstraint.activate([ - playerViewController.view.topAnchor.constraint(equalTo: container.topAnchor), - playerViewController.view.leadingAnchor.constraint(equalTo: container.leadingAnchor), - playerViewController.view.trailingAnchor.constraint(equalTo: container.trailingAnchor), - playerViewController.view.bottomAnchor.constraint(equalTo: container.bottomAnchor), - ]) + playerViewController.view.pinToParent() setupIndicatorViewHierarchy() playerIndicatorLabel.attributedText = NSAttributedString(string: "GIF") @@ -213,12 +203,7 @@ extension MediaView { private func layoutBlurhash() { blurhashImageView.translatesAutoresizingMaskIntoConstraints = false container.addSubview(blurhashImageView) - NSLayoutConstraint.activate([ - blurhashImageView.topAnchor.constraint(equalTo: container.topAnchor), - blurhashImageView.leadingAnchor.constraint(equalTo: container.leadingAnchor), - blurhashImageView.trailingAnchor.constraint(equalTo: container.trailingAnchor), - blurhashImageView.bottomAnchor.constraint(equalTo: container.bottomAnchor), - ]) + blurhashImageView.pinToParent() } private func bindBlurhash(configuration: Configuration) { @@ -304,12 +289,7 @@ extension MediaView { guard container.superview == nil else { return } container.translatesAutoresizingMaskIntoConstraints = false addSubview(container) - NSLayoutConstraint.activate([ - container.topAnchor.constraint(equalTo: topAnchor), - container.leadingAnchor.constraint(equalTo: leadingAnchor), - container.trailingAnchor.constraint(equalTo: trailingAnchor), - container.bottomAnchor.constraint(equalTo: bottomAnchor), - ]) + container.pinToParent() } private func setupIndicatorViewHierarchy() { @@ -329,12 +309,7 @@ extension MediaView { if vibrancyEffectView.superview == nil { vibrancyEffectView.translatesAutoresizingMaskIntoConstraints = false blurEffectView.contentView.addSubview(vibrancyEffectView) - NSLayoutConstraint.activate([ - vibrancyEffectView.topAnchor.constraint(equalTo: blurEffectView.contentView.topAnchor), - vibrancyEffectView.leadingAnchor.constraint(equalTo: blurEffectView.contentView.leadingAnchor), - vibrancyEffectView.trailingAnchor.constraint(equalTo: blurEffectView.contentView.trailingAnchor), - vibrancyEffectView.bottomAnchor.constraint(equalTo: blurEffectView.contentView.bottomAnchor), - ]) + vibrancyEffectView.pinToParent() } if playerIndicatorLabel.superview == nil { diff --git a/MastodonSDK/Sources/MastodonUI/View/Content/NewsView.swift b/MastodonSDK/Sources/MastodonUI/View/Content/NewsView.swift index 0d4298035..304bcebc4 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Content/NewsView.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Content/NewsView.swift @@ -79,12 +79,7 @@ extension NewsView { container.spacing = 8 container.translatesAutoresizingMaskIntoConstraints = false addSubview(container) - NSLayoutConstraint.activate([ - container.topAnchor.constraint(equalTo: topAnchor), - container.leadingAnchor.constraint(equalTo: leadingAnchor), - container.trailingAnchor.constraint(equalTo: trailingAnchor), - container.bottomAnchor.constraint(equalTo: bottomAnchor), - ]) + container.pinToParent() // textContainer: V - [ providerContainer | headlineLabel | (spacer) | footnoteLabel ] let textContainer = UIStackView() diff --git a/MastodonSDK/Sources/MastodonUI/View/Content/NotificationView+ViewModel.swift b/MastodonSDK/Sources/MastodonUI/View/Content/NotificationView+ViewModel.swift index d7ba51e17..714cf676d 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Content/NotificationView+ViewModel.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Content/NotificationView+ViewModel.swift @@ -25,7 +25,8 @@ extension NotificationView { let logger = Logger(subsystem: "NotificationView", category: "ViewModel") @Published public var authContext: AuthContext? - + + @Published public var type: MastodonNotificationType? @Published public var notificationIndicatorText: MetaContent? @Published public var authorAvatarImage: UIImage? @@ -54,7 +55,7 @@ extension NotificationView.ViewModel { bindAuthor(notificationView: notificationView) bindAuthorMenu(notificationView: notificationView) bindFollowRequest(notificationView: notificationView) - + $authContext .assign(to: \.authContext, on: notificationView.statusView.viewModel) .store(in: &disposeBag) @@ -100,21 +101,21 @@ extension NotificationView.ViewModel { } .store(in: &disposeBag) // timestamp - Publishers.CombineLatest( + let formattedTimestamp = Publishers.CombineLatest( $timestamp, timestampUpdatePublisher.prepend(Date()).eraseToAnyPublisher() ) - .sink { [weak self] timestamp, _ in - guard let self = self else { return } - guard let timestamp = timestamp else { - notificationView.dateLabel.configure(content: PlaintextMetaContent(string: "")) - return - } - - let text = timestamp.localizedTimeAgoSinceNow - notificationView.dateLabel.configure(content: PlaintextMetaContent(string: text)) + .map { timestamp, _ in + timestamp?.localizedTimeAgoSinceNow ?? "" } - .store(in: &disposeBag) + .removeDuplicates() + + formattedTimestamp + .sink { timestamp in + notificationView.dateLabel.configure(content: PlaintextMetaContent(string: timestamp)) + } + .store(in: &disposeBag) + // notification type indicator $notificationIndicatorText .sink { text in @@ -125,6 +126,76 @@ extension NotificationView.ViewModel { } } .store(in: &disposeBag) + + Publishers.CombineLatest4( + $authorName, + $authorUsername, + $notificationIndicatorText, + formattedTimestamp + ) + .sink { name, username, type, timestamp in + notificationView.accessibilityLabel = [ + "\(name?.string ?? "") \(type?.string ?? "")", + username.map { "@\($0)" } ?? "", + timestamp + ].joined(separator: ", ") + if !notificationView.statusView.isHidden { + notificationView.accessibilityLabel! += ", " + (notificationView.statusView.accessibilityLabel ?? "") + } + if !notificationView.quoteStatusViewContainerView.isHidden { + notificationView.accessibilityLabel! += ", " + (notificationView.quoteStatusView.accessibilityLabel ?? "") + } + } + .store(in: &disposeBag) + + Publishers.CombineLatest( + $authorAvatarImage, + $type + ) + .sink { avatarImage, type in + var actions = [UIAccessibilityCustomAction]() + + // these notifications can be directly actioned to view the profile + if type != .follow, type != .followRequest { + actions.append( + UIAccessibilityCustomAction( + name: L10n.Common.Controls.Status.showUserProfile, + image: avatarImage + ) { [weak notificationView] _ in + guard let notificationView = notificationView, let delegate = notificationView.delegate else { return false } + delegate.notificationView(notificationView, authorAvatarButtonDidPressed: notificationView.avatarButton) + return true + } + ) + } + + if type == .followRequest { + actions.append( + UIAccessibilityCustomAction( + name: L10n.Common.Controls.Actions.confirm, + image: Asset.Editing.checkmark20.image + ) { [weak notificationView] _ in + guard let notificationView = notificationView, let delegate = notificationView.delegate else { return false } + delegate.notificationView(notificationView, acceptFollowRequestButtonDidPressed: notificationView.acceptFollowRequestButton) + return true + } + ) + + actions.append( + UIAccessibilityCustomAction( + name: L10n.Common.Controls.Actions.delete, + image: Asset.Circles.forbidden20.image + ) { [weak notificationView] _ in + guard let notificationView = notificationView, let delegate = notificationView.delegate else { return false } + delegate.notificationView(notificationView, rejectFollowRequestButtonDidPressed: notificationView.rejectFollowRequestButton) + return true + } + ) + } + + notificationView.notificationActions = actions + } + .store(in: &disposeBag) } private func bindAuthorMenu(notificationView: NotificationView) { @@ -147,7 +218,9 @@ extension NotificationView.ViewModel { isMyself: isMyself, isBookmarking: false // no bookmark action display for notification item ) - notificationView.menuButton.menu = notificationView.setupAuthorMenu(menuContext: menuContext) + let (menu, actions) = notificationView.setupAuthorMenu(menuContext: menuContext) + notificationView.menuButton.menu = menu + notificationView.authorActions = actions notificationView.menuButton.showsMenuAsPrimaryAction = true notificationView.menuButton.isHidden = menuContext.isMyself @@ -207,5 +280,5 @@ extension NotificationView.ViewModel { } .store(in: &disposeBag) } - + } diff --git a/MastodonSDK/Sources/MastodonUI/View/Content/NotificationView.swift b/MastodonSDK/Sources/MastodonUI/View/Content/NotificationView.swift index e52422770..ddc1add5c 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Content/NotificationView.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Content/NotificationView.swift @@ -46,7 +46,10 @@ public final class NotificationView: UIView { var _disposeBag = Set() public var disposeBag = Set() - + + var notificationActions = [UIAccessibilityCustomAction]() + var authorActions = [UIAccessibilityCustomAction]() + public private(set) lazy var viewModel: ViewModel = { let viewModel = ViewModel() viewModel.bind(notificationView: self) @@ -292,21 +295,11 @@ extension NotificationView { acceptFollowRequestButton.translatesAutoresizingMaskIntoConstraints = false acceptFollowRequestButtonShadowBackgroundContainer.addSubview(acceptFollowRequestButton) - NSLayoutConstraint.activate([ - acceptFollowRequestButton.topAnchor.constraint(equalTo: acceptFollowRequestButtonShadowBackgroundContainer.topAnchor), - acceptFollowRequestButton.leadingAnchor.constraint(equalTo: acceptFollowRequestButtonShadowBackgroundContainer.leadingAnchor), - acceptFollowRequestButton.trailingAnchor.constraint(equalTo: acceptFollowRequestButtonShadowBackgroundContainer.trailingAnchor), - acceptFollowRequestButton.bottomAnchor.constraint(equalTo: acceptFollowRequestButtonShadowBackgroundContainer.bottomAnchor), - ]) + acceptFollowRequestButton.pinToParent() rejectFollowRequestButton.translatesAutoresizingMaskIntoConstraints = false rejectFollowRequestButtonShadowBackgroundContainer.addSubview(rejectFollowRequestButton) - NSLayoutConstraint.activate([ - rejectFollowRequestButton.topAnchor.constraint(equalTo: rejectFollowRequestButtonShadowBackgroundContainer.topAnchor), - rejectFollowRequestButton.leadingAnchor.constraint(equalTo: rejectFollowRequestButtonShadowBackgroundContainer.leadingAnchor), - rejectFollowRequestButton.trailingAnchor.constraint(equalTo: rejectFollowRequestButtonShadowBackgroundContainer.trailingAnchor), - rejectFollowRequestButton.bottomAnchor.constraint(equalTo: rejectFollowRequestButtonShadowBackgroundContainer.bottomAnchor), - ]) + rejectFollowRequestButton.pinToParent() followRequestContainerView.axis = .horizontal followRequestContainerView.distribution = .fillEqually @@ -382,6 +375,30 @@ extension NotificationView { statusView.delegate = self quoteStatusView.delegate = self + + isAccessibilityElement = true + } +} + +extension NotificationView { + public override var accessibilityElements: [Any]? { + get { [] } + set {} + } + + public override var accessibilityCustomActions: [UIAccessibilityCustomAction]? { + get { + var actions = notificationActions + actions += authorActions + if !statusView.isHidden { + actions += statusView.accessibilityCustomActions ?? [] + } + if !quoteStatusViewContainerView.isHidden { + actions += quoteStatusView.accessibilityCustomActions ?? [] + } + return actions + } + set {} } } @@ -440,7 +457,7 @@ extension NotificationView: AdaptiveContainerView { extension NotificationView { public typealias AuthorMenuContext = StatusAuthorView.AuthorMenuContext - public func setupAuthorMenu(menuContext: AuthorMenuContext) -> UIMenu { + public func setupAuthorMenu(menuContext: AuthorMenuContext) -> (UIMenu, [UIAccessibilityCustomAction]) { var actions: [MastodonMenu.Action] = [] actions = [ @@ -466,8 +483,13 @@ extension NotificationView { actions: actions, delegate: self ) - - return menu + + let accessibilityActions = MastodonMenu.setupAccessibilityActions( + actions: actions, + delegate: self + ) + + return (menu, accessibilityActions) } } diff --git a/MastodonSDK/Sources/MastodonUI/View/Content/PollOptionView.swift b/MastodonSDK/Sources/MastodonUI/View/Content/PollOptionView.swift index 04a032563..514657e62 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Content/PollOptionView.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Content/PollOptionView.swift @@ -110,12 +110,7 @@ extension PollOptionView { voteProgressStripView.translatesAutoresizingMaskIntoConstraints = false roundedBackgroundView.addSubview(voteProgressStripView) - NSLayoutConstraint.activate([ - voteProgressStripView.topAnchor.constraint(equalTo: roundedBackgroundView.topAnchor), - voteProgressStripView.leadingAnchor.constraint(equalTo: roundedBackgroundView.leadingAnchor), - voteProgressStripView.trailingAnchor.constraint(equalTo: roundedBackgroundView.trailingAnchor), - voteProgressStripView.bottomAnchor.constraint(equalTo: roundedBackgroundView.bottomAnchor), - ]) + voteProgressStripView.pinToParent() checkmarkBackgroundView.translatesAutoresizingMaskIntoConstraints = false roundedBackgroundView.addSubview(checkmarkBackgroundView) @@ -138,12 +133,7 @@ extension PollOptionView { plusCircleImageView.translatesAutoresizingMaskIntoConstraints = false addSubview(plusCircleImageView) - NSLayoutConstraint.activate([ - plusCircleImageView.topAnchor.constraint(equalTo: checkmarkBackgroundView.topAnchor), - plusCircleImageView.leadingAnchor.constraint(equalTo: checkmarkBackgroundView.leadingAnchor), - plusCircleImageView.trailingAnchor.constraint(equalTo: checkmarkBackgroundView.trailingAnchor), - plusCircleImageView.bottomAnchor.constraint(equalTo: checkmarkBackgroundView.bottomAnchor), - ]) + plusCircleImageView.pinTo(to: checkmarkBackgroundView) optionTextField.translatesAutoresizingMaskIntoConstraints = false roundedBackgroundView.addSubview(optionTextField) diff --git a/MastodonSDK/Sources/MastodonUI/View/Content/ProfileCardView.swift b/MastodonSDK/Sources/MastodonUI/View/Content/ProfileCardView.swift index b93d44b73..cb7d8f839 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Content/ProfileCardView.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Content/ProfileCardView.swift @@ -137,12 +137,7 @@ extension ProfileCardView { container.spacing = 8 container.translatesAutoresizingMaskIntoConstraints = false addSubview(container) - NSLayoutConstraint.activate([ - container.topAnchor.constraint(equalTo: topAnchor), - container.leadingAnchor.constraint(equalTo: leadingAnchor), - container.trailingAnchor.constraint(equalTo: trailingAnchor), - container.bottomAnchor.constraint(equalTo: bottomAnchor), - ]) + container.pinToParent() // bannerContainer let bannerContainer = UIView() @@ -237,11 +232,8 @@ extension ProfileCardView { relationshipActionButton.translatesAutoresizingMaskIntoConstraints = false relationshipActionButtonShadowContainer.addSubview(relationshipActionButton) + relationshipActionButton.pinToParent() NSLayoutConstraint.activate([ - relationshipActionButton.topAnchor.constraint(equalTo: relationshipActionButtonShadowContainer.topAnchor), - relationshipActionButton.leadingAnchor.constraint(equalTo: relationshipActionButtonShadowContainer.leadingAnchor), - relationshipActionButton.trailingAnchor.constraint(equalTo: relationshipActionButtonShadowContainer.trailingAnchor), - relationshipActionButton.bottomAnchor.constraint(equalTo: relationshipActionButtonShadowContainer.bottomAnchor), relationshipActionButtonShadowContainer.widthAnchor.constraint(greaterThanOrEqualToConstant: ProfileCardView.friendshipActionButtonSize.width).priority(.required - 1), relationshipActionButtonShadowContainer.heightAnchor.constraint(equalToConstant: ProfileCardView.friendshipActionButtonSize.height).priority(.required - 1), ]) diff --git a/MastodonSDK/Sources/MastodonUI/View/Content/StatusAuthorView.swift b/MastodonSDK/Sources/MastodonUI/View/Content/StatusAuthorView.swift index e2879d1e8..0631875c0 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Content/StatusAuthorView.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Content/StatusAuthorView.swift @@ -152,25 +152,30 @@ extension StatusAuthorView { } public func setupAuthorMenu(menuContext: AuthorMenuContext) -> (UIMenu, [UIAccessibilityCustomAction]) { - var actions: [MastodonMenu.Action] = [] + var actions = [MastodonMenu.Action]() - actions = [ - .muteUser(.init( - name: menuContext.name, - isMuting: menuContext.isMuting - )), - .blockUser(.init( - name: menuContext.name, - isBlocking: menuContext.isBlocking - )), - .reportUser( - .init(name: menuContext.name) - ), + if !menuContext.isMyself { + actions.append(contentsOf: [ + .muteUser(.init( + name: menuContext.name, + isMuting: menuContext.isMuting + )), + .blockUser(.init( + name: menuContext.name, + isBlocking: menuContext.isBlocking + )), + .reportUser( + .init(name: menuContext.name) + ) + ]) + } + + actions.append(contentsOf: [ .bookmarkStatus( .init(isBookmarking: menuContext.isBookmarking) ), .shareStatus - ] + ]) if menuContext.isMyself { actions.append(.deleteStatus) diff --git a/MastodonSDK/Sources/MastodonUI/View/Content/StatusView+Configuration.swift b/MastodonSDK/Sources/MastodonUI/View/Content/StatusView+Configuration.swift index 353dfc097..47e4f18ff 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Content/StatusView+Configuration.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Content/StatusView+Configuration.swift @@ -130,6 +130,7 @@ extension StatusView { authorization: authenticationBox.userAuthorization ).singleOutput() } + .receive(on: DispatchQueue.main) .sink { completion in // do nothing } receiveValue: { [weak self] response in diff --git a/MastodonSDK/Sources/MastodonUI/View/Content/StatusView+ViewModel.swift b/MastodonSDK/Sources/MastodonUI/View/Content/StatusView+ViewModel.swift index 416226cbb..597239812 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Content/StatusView+ViewModel.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Content/StatusView+ViewModel.swift @@ -203,6 +203,7 @@ extension StatusView.ViewModel { statusView.headerInfoLabel.configure(content: info.header) statusView.setHeaderDisplay() case .reply(let info): + assert(Thread.isMainThread) statusView.headerIconImageView.image = UIImage(systemName: "arrowshape.turn.up.left.fill") statusView.headerInfoLabel.configure(content: info.header) statusView.setHeaderDisplay() @@ -238,12 +239,11 @@ extension StatusView.ViewModel { } .store(in: &disposeBag) // username - let usernamePublisher = $authorUsername + $authorUsername .map { text -> String in guard let text = text else { return "" } return "@\(text)" } - usernamePublisher .sink { username in let metaContent = PlaintextMetaContent(string: username) authorView.authorUsernameLabel.configure(content: metaContent) @@ -270,18 +270,6 @@ extension StatusView.ViewModel { authorView.dateLabel.configure(content: PlaintextMetaContent(string: text)) } .store(in: &disposeBag) - - // accessibility label - Publishers.CombineLatest4($authorName, usernamePublisher, $timestampText, $timestamp) - .map { name, username, timestampText, timestamp in - let formatter = DateFormatter() - formatter.dateStyle = .medium - formatter.timeStyle = .short - let longTimestamp = timestamp.map { formatter.string(from: $0) } ?? "" - return "\(name?.string ?? "") \(username), \(timestampText). \(longTimestamp)" - } - .assign(to: \.accessibilityLabel, on: authorView) - .store(in: &disposeBag) } private func bindContent(statusView: StatusView) { @@ -634,7 +622,7 @@ extension StatusView.ViewModel { } private func bindAccessibility(statusView: StatusView) { - let authorAccessibilityLabel = Publishers.CombineLatest3( + let shortAuthorAccessibilityLabel = Publishers.CombineLatest3( $header, $authorName, $timestampText @@ -644,19 +632,56 @@ extension StatusView.ViewModel { switch header { case .none: - break + strings.append(authorName?.string) case .reply(let info): + strings.append(authorName?.string) strings.append(info.header.string) case .repost(let info): strings.append(info.header.string) + strings.append(authorName?.string) } - strings.append(authorName?.string) strings.append(timestamp) return strings.compactMap { $0 }.joined(separator: ", ") } - + + let longTimestampFormatter = DateFormatter() + longTimestampFormatter.dateStyle = .medium + longTimestampFormatter.timeStyle = .short + let longTimestampLabel = Publishers.CombineLatest( + $timestampText, + $timestamp.map { timestamp in + if let timestamp { + return longTimestampFormatter.string(from: timestamp) + } + return "" + } + ) + .map { timestampText, longTimestamp in + "\(timestampText). \(longTimestamp)" + } + + Publishers.CombineLatest4( + $header, + $authorName, + $authorUsername, + longTimestampLabel + ) + .map { header, name, username, timestamp in + let nameAndUsername = "\(name?.string ?? "") @\(username ?? "")" + switch header { + case .none: + return "\(nameAndUsername), \(timestamp)" + case .repost(info: let info): + return "\(info.header.string) \(nameAndUsername), \(timestamp)" + case .reply(info: let info): + return "\(nameAndUsername) \(info.header.string), \(timestamp)" + } + } + .assign(to: \.accessibilityLabel, on: statusView.authorView) + .store(in: &disposeBag) + let contentAccessibilityLabel = Publishers.CombineLatest3( $isContentReveal, $spoilerContent, @@ -694,8 +719,8 @@ extension StatusView.ViewModel { statusView.spoilerOverlayView.accessibilityLabel = contentAccessibilityLabel } .store(in: &disposeBag) - - let meidaAccessibilityLabel = $mediaViewConfigurations + + let mediaAccessibilityLabel = $mediaViewConfigurations .map { configurations -> String? in let count = configurations.count return L10n.Plural.Count.media(count) @@ -704,18 +729,18 @@ extension StatusView.ViewModel { // TODO: Toolbar Publishers.CombineLatest3( - authorAccessibilityLabel, + shortAuthorAccessibilityLabel, contentAccessibilityLabel, - meidaAccessibilityLabel + mediaAccessibilityLabel ) .map { author, content, media in - let group = [ - author, - content, - media - ] - - return group + var labels: [String?] = [content, media] + + if statusView.style != .notification { + labels.insert(author, at: 0) + } + + return labels .compactMap { $0 } .joined(separator: ", ") } diff --git a/MastodonSDK/Sources/MastodonUI/View/Content/StatusView.swift b/MastodonSDK/Sources/MastodonUI/View/Content/StatusView.swift index 563bc7e3d..30f62eaf7 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Content/StatusView.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Content/StatusView.swift @@ -236,16 +236,12 @@ extension StatusView { // container containerStackView.translatesAutoresizingMaskIntoConstraints = false addSubview(containerStackView) - NSLayoutConstraint.activate([ - containerStackView.topAnchor.constraint(equalTo: topAnchor), - containerStackView.leadingAnchor.constraint(equalTo: leadingAnchor), - containerStackView.trailingAnchor.constraint(equalTo: trailingAnchor), - containerStackView.bottomAnchor.constraint(equalTo: bottomAnchor), - ]) + containerStackView.pinToParent() // header headerIconImageView.isUserInteractionEnabled = false headerInfoLabel.isUserInteractionEnabled = false + headerInfoLabel.isAccessibilityElement = false let headerTapGestureRecognizer = UITapGestureRecognizer.singleTapGestureRecognizer headerTapGestureRecognizer.addTarget(self, action: #selector(StatusView.headerDidPressed(_:))) headerContainerView.addGestureRecognizer(headerTapGestureRecognizer) @@ -392,12 +388,7 @@ extension StatusView.Style { statusView.spoilerOverlayView.translatesAutoresizingMaskIntoConstraints = false statusView.containerStackView.addSubview(statusView.spoilerOverlayView) - NSLayoutConstraint.activate([ - statusView.contentContainer.topAnchor.constraint(equalTo: statusView.spoilerOverlayView.topAnchor), - statusView.contentContainer.leadingAnchor.constraint(equalTo: statusView.spoilerOverlayView.leadingAnchor), - statusView.contentContainer.trailingAnchor.constraint(equalTo: statusView.spoilerOverlayView.trailingAnchor), - statusView.contentContainer.bottomAnchor.constraint(equalTo: statusView.spoilerOverlayView.bottomAnchor), - ]) + statusView.contentContainer.pinTo(to: statusView.spoilerOverlayView) // media container: V - [ mediaGridContainerView ] statusView.mediaContainerView.translatesAutoresizingMaskIntoConstraints = false @@ -409,12 +400,7 @@ extension StatusView.Style { statusView.mediaGridContainerView.translatesAutoresizingMaskIntoConstraints = false statusView.mediaContainerView.addSubview(statusView.mediaGridContainerView) - NSLayoutConstraint.activate([ - statusView.mediaGridContainerView.topAnchor.constraint(equalTo: statusView.mediaContainerView.topAnchor), - statusView.mediaGridContainerView.leadingAnchor.constraint(equalTo: statusView.mediaContainerView.leadingAnchor), - statusView.mediaGridContainerView.trailingAnchor.constraint(equalTo: statusView.mediaContainerView.trailingAnchor), - statusView.mediaGridContainerView.bottomAnchor.constraint(equalTo: statusView.mediaContainerView.bottomAnchor), - ]) + statusView.mediaGridContainerView.pinToParent() // pollContainerView: V - [ pollTableView | pollStatusStackView ] statusView.pollAdaptiveMarginContainerView.contentView = statusView.pollContainerView diff --git a/MastodonSDK/Sources/MastodonUI/View/Content/UserView.swift b/MastodonSDK/Sources/MastodonUI/View/Content/UserView.swift index cb066abfd..901a6547f 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Content/UserView.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Content/UserView.swift @@ -66,12 +66,7 @@ extension UserView { // container containerStackView.translatesAutoresizingMaskIntoConstraints = false addSubview(containerStackView) - NSLayoutConstraint.activate([ - containerStackView.topAnchor.constraint(equalTo: topAnchor), - containerStackView.leadingAnchor.constraint(equalTo: leadingAnchor), - containerStackView.trailingAnchor.constraint(equalTo: trailingAnchor), - containerStackView.bottomAnchor.constraint(equalTo: bottomAnchor) - ]) + containerStackView.pinToParent() avatarButton.translatesAutoresizingMaskIntoConstraints = false containerStackView.addArrangedSubview(avatarButton) diff --git a/MastodonSDK/Sources/MastodonUI/View/Control/SpoilerOverlayView.swift b/MastodonSDK/Sources/MastodonUI/View/Control/SpoilerOverlayView.swift index 98139b00e..c9074f9b5 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Control/SpoilerOverlayView.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Control/SpoilerOverlayView.swift @@ -48,12 +48,7 @@ extension SpoilerOverlayView { private func _init() { containerStackView.translatesAutoresizingMaskIntoConstraints = false addSubview(containerStackView) - NSLayoutConstraint.activate([ - containerStackView.topAnchor.constraint(equalTo: topAnchor), - containerStackView.leadingAnchor.constraint(equalTo: leadingAnchor), - containerStackView.trailingAnchor.constraint(equalTo: trailingAnchor), - containerStackView.bottomAnchor.constraint(equalTo: bottomAnchor), - ]) + containerStackView.pinToParent() let topPaddingView = UIView() topPaddingView.translatesAutoresizingMaskIntoConstraints = false diff --git a/MastodonSDK/Sources/MastodonUI/View/TableViewCell/PollOptionTableViewCell.swift b/MastodonSDK/Sources/MastodonUI/View/TableViewCell/PollOptionTableViewCell.swift index 6ae6ea0b5..d1e1a90f4 100644 --- a/MastodonSDK/Sources/MastodonUI/View/TableViewCell/PollOptionTableViewCell.swift +++ b/MastodonSDK/Sources/MastodonUI/View/TableViewCell/PollOptionTableViewCell.swift @@ -53,12 +53,7 @@ extension PollOptionTableViewCell { pollOptionView.translatesAutoresizingMaskIntoConstraints = false contentView.addSubview(pollOptionView) - NSLayoutConstraint.activate([ - pollOptionView.topAnchor.constraint(equalTo: contentView.topAnchor), - pollOptionView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor), - pollOptionView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor), - pollOptionView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor), - ]) + pollOptionView.pinToParent() pollOptionView.setup(style: .plain) } diff --git a/MastodonSDK/Sources/MastodonUI/View/TableViewCell/ProfileCardTableViewCell.swift b/MastodonSDK/Sources/MastodonUI/View/TableViewCell/ProfileCardTableViewCell.swift index 2d210f20c..a14028ea2 100644 --- a/MastodonSDK/Sources/MastodonUI/View/TableViewCell/ProfileCardTableViewCell.swift +++ b/MastodonSDK/Sources/MastodonUI/View/TableViewCell/ProfileCardTableViewCell.swift @@ -67,12 +67,7 @@ extension ProfileCardTableViewCell { profileCardView.translatesAutoresizingMaskIntoConstraints = false contentView.addSubview(profileCardView) - NSLayoutConstraint.activate([ - profileCardView.topAnchor.constraint(equalTo: shadowBackgroundContainer.topAnchor), - profileCardView.leadingAnchor.constraint(equalTo: shadowBackgroundContainer.leadingAnchor), - profileCardView.trailingAnchor.constraint(equalTo: shadowBackgroundContainer.trailingAnchor), - profileCardView.bottomAnchor.constraint(equalTo: shadowBackgroundContainer.bottomAnchor), - ]) + profileCardView.pinTo(to: shadowBackgroundContainer) profileCardView.delegate = self diff --git a/MastodonSDK/Sources/MastodonUI/View/TableViewCell/TimelineLoaderTableViewCell.swift b/MastodonSDK/Sources/MastodonUI/View/TableViewCell/TimelineLoaderTableViewCell.swift index 6e396dc6d..7f5b355d3 100644 --- a/MastodonSDK/Sources/MastodonUI/View/TableViewCell/TimelineLoaderTableViewCell.swift +++ b/MastodonSDK/Sources/MastodonUI/View/TableViewCell/TimelineLoaderTableViewCell.swift @@ -96,12 +96,7 @@ open class TimelineLoaderTableViewCell: UITableViewCell { stackView.translatesAutoresizingMaskIntoConstraints = false stackView.isUserInteractionEnabled = false contentView.addSubview(stackView) - NSLayoutConstraint.activate([ - stackView.topAnchor.constraint(equalTo: loadMoreButton.topAnchor), - stackView.leadingAnchor.constraint(equalTo: loadMoreButton.leadingAnchor), - stackView.trailingAnchor.constraint(equalTo: loadMoreButton.trailingAnchor), - stackView.bottomAnchor.constraint(equalTo: loadMoreButton.bottomAnchor), - ]) + stackView.pinTo(to: loadMoreButton) let leftPaddingView = UIView() leftPaddingView.translatesAutoresizingMaskIntoConstraints = false stackView.addArrangedSubview(leftPaddingView) diff --git a/MastodonTests/MastodonTests.swift b/MastodonTests/MastodonTests.swift index 7264dde64..ec572fd92 100644 --- a/MastodonTests/MastodonTests.swift +++ b/MastodonTests/MastodonTests.swift @@ -7,6 +7,7 @@ import XCTest @testable import Mastodon +import MastodonCore @MainActor class MastodonTests: XCTestCase { diff --git a/Podfile b/Podfile index 28757d528..4df2d4d7c 100644 --- a/Podfile +++ b/Podfile @@ -8,11 +8,10 @@ target 'Mastodon' do # Pods for Mastodon # UI - pod 'UITextField+Shake', '~> 1.2' pod 'XLPagerTabStrip', '~> 9.0.0' # misc - pod 'SwiftGen', '~> 6.4.0' + pod 'SwiftGen', '~> 6.6.2' pod 'DateToolsSwift', '~> 5.0.0' pod 'Kanna', '~> 5.2.2' pod 'Sourcery', '~> 1.6.1' diff --git a/Podfile.lock b/Podfile.lock index 12680db21..c7220b00a 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -5,8 +5,7 @@ PODS: - Sourcery (1.6.1): - Sourcery/CLI-Only (= 1.6.1) - Sourcery/CLI-Only (1.6.1) - - SwiftGen (6.4.0) - - "UITextField+Shake (1.2.1)" + - SwiftGen (6.6.2) - XLPagerTabStrip (9.0.0) DEPENDENCIES: @@ -14,8 +13,7 @@ DEPENDENCIES: - FLEX (~> 4.4.0) - Kanna (~> 5.2.2) - Sourcery (~> 1.6.1) - - SwiftGen (~> 6.4.0) - - "UITextField+Shake (~> 1.2)" + - SwiftGen (~> 6.6.2) - XLPagerTabStrip (~> 9.0.0) SPEC REPOS: @@ -25,7 +23,6 @@ SPEC REPOS: - Kanna - Sourcery - SwiftGen - - "UITextField+Shake" - XLPagerTabStrip SPEC CHECKSUMS: @@ -33,10 +30,9 @@ SPEC CHECKSUMS: FLEX: 7ca2c8cd3a435ff501ff6d2f2141e9bdc934eaab Kanna: 01cfbddc127f5ff0963692f285fcbc8a9d62d234 Sourcery: f3759f803bd0739f74fc92a4341eed0473ce61ac - SwiftGen: 67860cc7c3cfc2ed25b9b74cfd55495fc89f9108 - "UITextField+Shake": 298ac5a0f239d731bdab999b19b628c956ca0ac3 + SwiftGen: 1366a7f71aeef49954ca5a63ba4bef6b0f24138c XLPagerTabStrip: 61c57fd61f611ee5f01ff1495ad6fbee8bf496c5 -PODFILE CHECKSUM: 8b15fb6d4e801b7a7e7761a2e2fe40a89b1da4ff +PODFILE CHECKSUM: 7499a197793f73c4dcf1d16a315434baaa688873 COCOAPODS: 1.11.3 diff --git a/README.md b/README.md index d2a19e715..f28caf8bd 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Read this blog post for this app to learn more. ## Acknowledgments -Thanks to these open-sources projects listed [here](./Documentation/Acknowledgments.md). +Thanks to these open-source projects listed [here](./Documentation/Acknowledgments.md). ## License diff --git a/ShareActionExtension/Scene/ComposeViewController.swift b/ShareActionExtension/Scene/ComposeViewController.swift deleted file mode 100644 index a7605da17..000000000 --- a/ShareActionExtension/Scene/ComposeViewController.swift +++ /dev/null @@ -1,326 +0,0 @@ -// -// ComposeViewController.swift -// MastodonShareAction -// -// Created by MainasuK Cirno on 2021-7-16. -// - -import os.log -import UIKit -import Combine -import SwiftUI -import MastodonAsset -import MastodonLocalization -import MastodonCore -import MastodonUI - -class ComposeViewController: UIViewController { - - let logger = Logger(subsystem: "ComposeViewController", category: "ViewController") - - let context = AppContext() - - var disposeBag = Set() - private(set) lazy var viewModel = ComposeViewModel(context: context) - - let publishButton: UIButton = { - let button = RoundedEdgesButton(type: .custom) - button.setTitle(L10n.Scene.Compose.composeAction, for: .normal) - button.titleLabel?.font = .systemFont(ofSize: 14, weight: .bold) - button.setBackgroundImage(.placeholder(color: Asset.Colors.brand.color), for: .normal) - button.setBackgroundImage(.placeholder(color: Asset.Colors.brand.color.withAlphaComponent(0.5)), for: .highlighted) - button.setBackgroundImage(.placeholder(color: Asset.Colors.Button.disabled.color), for: .disabled) - button.setTitleColor(.white, for: .normal) - button.contentEdgeInsets = UIEdgeInsets(top: 6, left: 16, bottom: 5, right: 16) // set 28pt height - button.adjustsImageWhenHighlighted = false - return button - }() - - private(set) lazy var cancelBarButtonItem = UIBarButtonItem(title: L10n.Common.Controls.Actions.cancel, style: .plain, target: self, action: #selector(ComposeViewController.cancelBarButtonItemPressed(_:))) - private(set) lazy var publishBarButtonItem: UIBarButtonItem = { - let barButtonItem = UIBarButtonItem(customView: publishButton) - publishButton.addTarget(self, action: #selector(ComposeViewController.publishBarButtonItemPressed(_:)), for: .touchUpInside) - return barButtonItem - }() - - let activityIndicatorBarButtonItem: UIBarButtonItem = { - let indicatorView = UIActivityIndicatorView(style: .medium) - let barButtonItem = UIBarButtonItem(customView: indicatorView) - indicatorView.startAnimating() - return barButtonItem - }() - - -// let viewSafeAreaDidChange = PassthroughSubject() -// let composeToolbarView = ComposeToolbarView() -// var composeToolbarViewBottomLayoutConstraint: NSLayoutConstraint! -// let composeToolbarBackgroundView = UIView() -} - -extension ComposeViewController { - - override func viewDidLoad() { - super.viewDidLoad() - -// navigationController?.presentationController?.delegate = self -// -// setupBackgroundColor(theme: ThemeService.shared.currentTheme.value) -// ThemeService.shared.currentTheme -// .receive(on: DispatchQueue.main) -// .sink { [weak self] theme in -// guard let self = self else { return } -// self.setupBackgroundColor(theme: theme) -// } -// .store(in: &disposeBag) -// -// navigationItem.leftBarButtonItem = cancelBarButtonItem -// viewModel.isBusy -// .receive(on: DispatchQueue.main) -// .sink { [weak self] isBusy in -// guard let self = self else { return } -// self.navigationItem.rightBarButtonItem = isBusy ? self.activityIndicatorBarButtonItem : self.publishBarButtonItem -// } -// .store(in: &disposeBag) -// -// let hostingViewController = UIHostingController( -// rootView: ComposeView().environmentObject(viewModel.composeViewModel) -// ) -// addChild(hostingViewController) -// view.addSubview(hostingViewController.view) -// hostingViewController.view.translatesAutoresizingMaskIntoConstraints = false -// view.addSubview(hostingViewController.view) -// NSLayoutConstraint.activate([ -// hostingViewController.view.topAnchor.constraint(equalTo: view.topAnchor), -// hostingViewController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor), -// hostingViewController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor), -// hostingViewController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor), -// ]) -// hostingViewController.didMove(toParent: self) -// -// composeToolbarView.translatesAutoresizingMaskIntoConstraints = false -// view.addSubview(composeToolbarView) -// composeToolbarViewBottomLayoutConstraint = view.bottomAnchor.constraint(equalTo: composeToolbarView.bottomAnchor) -// NSLayoutConstraint.activate([ -// composeToolbarView.leadingAnchor.constraint(equalTo: view.leadingAnchor), -// composeToolbarView.trailingAnchor.constraint(equalTo: view.trailingAnchor), -// composeToolbarViewBottomLayoutConstraint, -// composeToolbarView.heightAnchor.constraint(equalToConstant: ComposeToolbarView.toolbarHeight), -// ]) -// composeToolbarView.preservesSuperviewLayoutMargins = true -// composeToolbarView.delegate = self -// -// composeToolbarBackgroundView.translatesAutoresizingMaskIntoConstraints = false -// view.insertSubview(composeToolbarBackgroundView, belowSubview: composeToolbarView) -// NSLayoutConstraint.activate([ -// composeToolbarBackgroundView.topAnchor.constraint(equalTo: composeToolbarView.topAnchor), -// composeToolbarBackgroundView.leadingAnchor.constraint(equalTo: composeToolbarView.leadingAnchor), -// composeToolbarBackgroundView.trailingAnchor.constraint(equalTo: composeToolbarView.trailingAnchor), -// view.bottomAnchor.constraint(equalTo: composeToolbarBackgroundView.bottomAnchor), -// ]) -// -// // FIXME: using iOS 15 toolbar for .keyboard placement -// let keyboardEventPublishers = Publishers.CombineLatest3( -// KeyboardResponderService.shared.isShow, -// KeyboardResponderService.shared.state, -// KeyboardResponderService.shared.endFrame -// ) -// -// Publishers.CombineLatest( -// keyboardEventPublishers, -// viewSafeAreaDidChange -// ) -// .sink(receiveValue: { [weak self] keyboardEvents, _ in -// guard let self = self else { return } -// -// let (isShow, state, endFrame) = keyboardEvents -// guard isShow, state == .dock else { -// UIView.animate(withDuration: 0.3) { -// self.composeToolbarViewBottomLayoutConstraint.constant = self.view.safeAreaInsets.bottom -// self.view.layoutIfNeeded() -// } -// return -// } -// // isShow AND dock state -// -// UIView.animate(withDuration: 0.3) { -// self.composeToolbarViewBottomLayoutConstraint.constant = endFrame.height -// self.view.layoutIfNeeded() -// } -// }) -// .store(in: &disposeBag) -// -// // bind visibility toolbar UI -// Publishers.CombineLatest( -// viewModel.selectedStatusVisibility, -// viewModel.traitCollectionDidChangePublisher -// ) -// .receive(on: DispatchQueue.main) -// .sink { [weak self] type, _ in -// guard let self = self else { return } -// let image = type.image(interfaceStyle: self.traitCollection.userInterfaceStyle) -// self.composeToolbarView.visibilityButton.setImage(image, for: .normal) -// self.composeToolbarView.activeVisibilityType.value = type -// } -// .store(in: &disposeBag) -// -// // bind counter -// viewModel.characterCount -// .receive(on: DispatchQueue.main) -// .sink { [weak self] characterCount in -// guard let self = self else { return } -// let count = ShareViewModel.composeContentLimit - characterCount -// self.composeToolbarView.characterCountLabel.text = "\(count)" -// switch count { -// case _ where count < 0: -// self.composeToolbarView.characterCountLabel.font = .monospacedDigitSystemFont(ofSize: 24, weight: .bold) -// self.composeToolbarView.characterCountLabel.textColor = Asset.Colors.danger.color -// self.composeToolbarView.characterCountLabel.accessibilityLabel = L10n.A11y.Plural.Count.inputLimitExceeds(abs(count)) -// default: -// self.composeToolbarView.characterCountLabel.font = .monospacedDigitSystemFont(ofSize: 15, weight: .regular) -// self.composeToolbarView.characterCountLabel.textColor = Asset.Colors.Label.secondary.color -// self.composeToolbarView.characterCountLabel.accessibilityLabel = L10n.A11y.Plural.Count.inputLimitRemains(count) -// } -// } -// .store(in: &disposeBag) -// -// // bind valid -// viewModel.isValid -// .receive(on: DispatchQueue.main) -// .assign(to: \.isEnabled, on: publishButton) -// .store(in: &disposeBag) - } - - override func viewDidAppear(_ animated: Bool) { - super.viewDidAppear(animated) - -// viewModel.viewDidAppear.value = true -// viewModel.inputItems.value = extensionContext?.inputItems.compactMap { $0 as? NSExtensionItem } ?? [] -// -// viewModel.composeViewModel.viewDidAppear = true - } - - override func viewSafeAreaInsetsDidChange() { - super.viewSafeAreaInsetsDidChange() - -// viewSafeAreaDidChange.send() - } - - override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { - super.traitCollectionDidChange(previousTraitCollection) - -// viewModel.traitCollectionDidChangePublisher.send() - } - -} - -//extension ComposeViewController { -// private func setupBackgroundColor(theme: Theme) { -// view.backgroundColor = theme.systemElevatedBackgroundColor -// viewModel.composeViewModel.backgroundColor = theme.systemElevatedBackgroundColor -// composeToolbarBackgroundView.backgroundColor = theme.composeToolbarBackgroundColor -// -// let barAppearance = UINavigationBarAppearance() -// barAppearance.configureWithDefaultBackground() -// barAppearance.backgroundColor = theme.navigationBarBackgroundColor -// navigationItem.standardAppearance = barAppearance -// navigationItem.compactAppearance = barAppearance -// navigationItem.scrollEdgeAppearance = barAppearance -// } -// -// private func showDismissConfirmAlertController() { -// let alertController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet) // can not use alert in extension -// let discardAction = UIAlertAction(title: L10n.Common.Controls.Actions.discard, style: .destructive) { _ in -// self.extensionContext?.cancelRequest(withError: ShareViewModel.ShareError.userCancelShare) -// } -// alertController.addAction(discardAction) -// let okAction = UIAlertAction(title: L10n.Common.Controls.Actions.ok, style: .cancel, handler: nil) -// alertController.addAction(okAction) -// self.present(alertController, animated: true, completion: nil) -// } -//} -// -extension ComposeViewController { - @objc private func cancelBarButtonItemPressed(_ sender: UIBarButtonItem) { - logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public)") - -// showDismissConfirmAlertController() - } - - @objc private func publishBarButtonItemPressed(_ sender: UIBarButtonItem) { - logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public)") - -// viewModel.isPublishing.value = true -// -// viewModel.publish() -// .delay(for: 2, scheduler: DispatchQueue.main) -// .receive(on: DispatchQueue.main) -// .sink { [weak self] completion in -// guard let self = self else { return } -// self.viewModel.isPublishing.value = false -// -// switch completion { -// case .failure: -// let alertController = UIAlertController( -// title: L10n.Common.Alerts.PublishPostFailure.title, -// message: L10n.Common.Alerts.PublishPostFailure.message, -// preferredStyle: .actionSheet // can not use alert in extension -// ) -// let okAction = UIAlertAction( -// title: L10n.Common.Controls.Actions.ok, -// style: .cancel, -// handler: nil -// ) -// alertController.addAction(okAction) -// self.present(alertController, animated: true, completion: nil) -// case .finished: -// self.publishButton.setTitle(L10n.Common.Controls.Actions.done, for: .normal) -// self.publishButton.isUserInteractionEnabled = false -// DispatchQueue.main.asyncAfter(deadline: .now() + 1) { [weak self] in -// guard let self = self else { return } -// self.extensionContext?.completeRequest(returningItems: nil, completionHandler: nil) -// } -// } -// } receiveValue: { response in -// // do nothing -// } -// .store(in: &disposeBag) - } -} - -//// MARK - ComposeToolbarViewDelegate -//extension ComposeViewController: ComposeToolbarViewDelegate { -// -// func composeToolbarView(_ composeToolbarView: ComposeToolbarView, contentWarningButtonDidPressed sender: UIButton) { -// logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public)") -// -// withAnimation { -// viewModel.composeViewModel.isContentWarningComposing.toggle() -// } -// } -// -// func composeToolbarView(_ composeToolbarView: ComposeToolbarView, visibilityButtonDidPressed sender: UIButton, visibilitySelectionType type: ComposeToolbarView.VisibilitySelectionType) { -// logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public)") -// -// viewModel.selectedStatusVisibility.value = type -// } -// -//} -// -//// MARK: - UIAdaptivePresentationControllerDelegate -//extension ComposeViewController: UIAdaptivePresentationControllerDelegate { -// -// func presentationControllerShouldDismiss(_ presentationController: UIPresentationController) -> Bool { -// return viewModel.shouldDismiss.value -// } -// -// func presentationControllerDidAttemptToDismiss(_ presentationController: UIPresentationController) { -// os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) -// showDismissConfirmAlertController() -// -// } -// -// func presentationControllerDidDismiss(_ presentationController: UIPresentationController) { -// os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) -// } -// -//} diff --git a/ShareActionExtension/Scene/ComposeViewModel.swift b/ShareActionExtension/Scene/ComposeViewModel.swift deleted file mode 100644 index 93515b7dc..000000000 --- a/ShareActionExtension/Scene/ComposeViewModel.swift +++ /dev/null @@ -1,416 +0,0 @@ -// -// ComposeViewModel.swift -// MastodonShareAction -// -// Created by MainasuK Cirno on 2021-7-16. -// - -import os.log -import Foundation -import Combine -import CoreData -import CoreDataStack -import MastodonSDK -import SwiftUI -import UniformTypeIdentifiers -import MastodonAsset -import MastodonLocalization -import MastodonUI -import MastodonCore - -final class ComposeViewModel { - - let logger = Logger(subsystem: "ComposeViewModel", category: "ViewModel") - - var disposeBag = Set() - - static let composeContentLimit: Int = 500 - - // input - let context: AppContext - -// private var coreDataStack: CoreDataStack? -// var managedObjectContext: NSManagedObjectContext? -// var api: APIService? -// -// var inputItems = CurrentValueSubject<[NSExtensionItem], Never>([]) -// let viewDidAppear = CurrentValueSubject(false) -// let traitCollectionDidChangePublisher = CurrentValueSubject(Void()) // use CurrentValueSubject to make initial event emit -// let selectedStatusVisibility = CurrentValueSubject(.public) -// -// // output -// let authentication = CurrentValueSubject?, Never>(nil) -// let isFetchAuthentication = CurrentValueSubject(true) -// let isPublishing = CurrentValueSubject(false) -// let isBusy = CurrentValueSubject(true) -// let isValid = CurrentValueSubject(false) -// let shouldDismiss = CurrentValueSubject(true) -// let composeViewModel = ComposeViewModel() -// let characterCount = CurrentValueSubject(0) - - init(context: AppContext) { - self.context = context - // end init - -// viewDidAppear.receive(on: DispatchQueue.main) -// .removeDuplicates() -// .sink { [weak self] viewDidAppear in -// guard let self = self else { return } -// guard viewDidAppear else { return } -// self.setupCoreData() -// } -// .store(in: &disposeBag) -// -// Publishers.CombineLatest( -// inputItems.removeDuplicates(), -// viewDidAppear.removeDuplicates() -// ) -// .receive(on: DispatchQueue.main) -// .sink { [weak self] inputItems, _ in -// guard let self = self else { return } -// self.parse(inputItems: inputItems) -// } -// .store(in: &disposeBag) -// -// // bind authentication loading state -// authentication -// .map { result in result == nil } -// .assign(to: \.value, on: isFetchAuthentication) -// .store(in: &disposeBag) -// -// // bind user locked state -// authentication -// .compactMap { result -> Bool? in -// guard let result = result else { return nil } -// switch result { -// case .success(let authentication): -// return authentication.user.locked -// case .failure: -// return nil -// } -// } -// .map { locked -> ComposeToolbarView.VisibilitySelectionType in -// locked ? .private : .public -// } -// .assign(to: \.value, on: selectedStatusVisibility) -// .store(in: &disposeBag) -// -// // bind author -// authentication -// .receive(on: DispatchQueue.main) -// .sink { [weak self] result in -// guard let self = self else { return } -// guard let result = result else { return } -// switch result { -// case .success(let authentication): -// self.composeViewModel.avatarImageURL = authentication.user.avatarImageURL() -// self.composeViewModel.authorName = authentication.user.displayNameWithFallback -// self.composeViewModel.authorUsername = "@" + authentication.user.username -// case .failure: -// self.composeViewModel.avatarImageURL = nil -// self.composeViewModel.authorName = " " -// self.composeViewModel.authorUsername = " " -// } -// } -// .store(in: &disposeBag) -// -// // bind authentication to compose view model -// authentication -// .map { result -> MastodonAuthentication? in -// guard let result = result else { return nil } -// switch result { -// case .success(let authentication): -// return authentication -// case .failure: -// return nil -// } -// } -// .assign(to: &composeViewModel.$authentication) -// -// // bind isBusy -// Publishers.CombineLatest( -// isFetchAuthentication, -// isPublishing -// ) -// .receive(on: DispatchQueue.main) -// .map { $0 || $1 } -// .assign(to: \.value, on: isBusy) -// .store(in: &disposeBag) -// -// // pass initial i18n string -// composeViewModel.statusPlaceholder = L10n.Scene.Compose.contentInputPlaceholder -// composeViewModel.contentWarningPlaceholder = L10n.Scene.Compose.ContentWarning.placeholder -// composeViewModel.toolbarHeight = ComposeToolbarView.toolbarHeight -// -// // bind compose bar button item UI state -// let isComposeContentEmpty = composeViewModel.$statusContent -// .map { $0.isEmpty } -// -// isComposeContentEmpty -// .assign(to: \.value, on: shouldDismiss) -// .store(in: &disposeBag) -// -// let isComposeContentValid = composeViewModel.$characterCount -// .map { characterCount -> Bool in -// return characterCount <= ShareViewModel.composeContentLimit -// } -// let isMediaEmpty = composeViewModel.$attachmentViewModels -// .map { $0.isEmpty } -// let isMediaUploadAllSuccess = composeViewModel.$attachmentViewModels -// .map { viewModels in -// viewModels.allSatisfy { $0.uploadStateMachineSubject.value is StatusAttachmentViewModel.UploadState.Finish } -// } -// -// let isPublishBarButtonItemEnabledPrecondition1 = Publishers.CombineLatest4( -// isComposeContentEmpty, -// isComposeContentValid, -// isMediaEmpty, -// isMediaUploadAllSuccess -// ) -// .map { isComposeContentEmpty, isComposeContentValid, isMediaEmpty, isMediaUploadAllSuccess -> Bool in -// if isMediaEmpty { -// return isComposeContentValid && !isComposeContentEmpty -// } else { -// return isComposeContentValid && isMediaUploadAllSuccess -// } -// } -// .eraseToAnyPublisher() -// -// let isPublishBarButtonItemEnabledPrecondition2 = Publishers.CombineLatest( -// isComposeContentEmpty, -// isComposeContentValid -// ) -// .map { isComposeContentEmpty, isComposeContentValid -> Bool in -// return isComposeContentValid && !isComposeContentEmpty -// } -// .eraseToAnyPublisher() -// -// Publishers.CombineLatest( -// isPublishBarButtonItemEnabledPrecondition1, -// isPublishBarButtonItemEnabledPrecondition2 -// ) -// .map { $0 && $1 } -// .assign(to: \.value, on: isValid) -// .store(in: &disposeBag) -// -// // bind counter -// composeViewModel.$characterCount -// .assign(to: \.value, on: characterCount) -// .store(in: &disposeBag) -// -// // setup theme -// setupBackgroundColor(theme: ThemeService.shared.currentTheme.value) -// ThemeService.shared.currentTheme -// .receive(on: DispatchQueue.main) -// .sink { [weak self] theme in -// guard let self = self else { return } -// self.setupBackgroundColor(theme: theme) -// } -// .store(in: &disposeBag) - } - - private func setupBackgroundColor(theme: Theme) { -// composeViewModel.contentWarningBackgroundColor = Color(theme.contentWarningOverlayBackgroundColor) - } - -} - -//extension ShareViewModel { -// enum ShareError: Error { -// case `internal`(error: Error) -// case userCancelShare -// case missingAuthentication -// } -//} - -extension ComposeViewModel { -// private func setupCoreData() { -// logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public)") -// DispatchQueue.global().async { -// let _coreDataStack = CoreDataStack() -// self.coreDataStack = _coreDataStack -// self.managedObjectContext = _coreDataStack.persistentContainer.viewContext -// -// _coreDataStack.didFinishLoad -// .receive(on: RunLoop.main) -// .sink { [weak self] didFinishLoad in -// guard let self = self else { return } -// guard didFinishLoad else { return } -// guard let managedObjectContext = self.managedObjectContext else { return } -// -// -// self.api = APIService(backgroundManagedObjectContext: _coreDataStack.newTaskContext()) -// -// self.logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): fetch authentication…") -// managedObjectContext.perform { -// do { -// let request = MastodonAuthentication.sortedFetchRequest -// let authentications = try managedObjectContext.fetch(request) -// let authentication = authentications.sorted(by: { $0.activedAt > $1.activedAt }).first -// guard let activeAuthentication = authentication else { -// self.authentication.value = .failure(ShareError.missingAuthentication) -// return -// } -// self.authentication.value = .success(activeAuthentication) -// self.logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): fetch authentication success \(activeAuthentication.userID)") -// } catch { -// self.authentication.value = .failure(ShareError.internal(error: error)) -// self.logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): fetch authentication fail \(error.localizedDescription)") -// assertionFailure(error.localizedDescription) -// } -// } -// } -// .store(in: &self.disposeBag) -// } -// } -} - -//extension ShareViewModel { -// func parse(inputItems: [NSExtensionItem]) { -// var itemProviders: [NSItemProvider] = [] -// -// for item in inputItems { -// itemProviders.append(contentsOf: item.attachments ?? []) -// } -// -// let _textProvider = itemProviders.first { provider in -// return provider.hasRepresentationConforming(toTypeIdentifier: UTType.plainText.identifier, fileOptions: []) -// } -// -// let _urlProvider = itemProviders.first { provider in -// return provider.hasRepresentationConforming(toTypeIdentifier: UTType.url.identifier, fileOptions: []) -// } -// -// let _movieProvider = itemProviders.first { provider in -// return provider.hasRepresentationConforming(toTypeIdentifier: UTType.movie.identifier, fileOptions: []) -// } -// -// let imageProviders = itemProviders.filter { provider in -// return provider.hasRepresentationConforming(toTypeIdentifier: UTType.image.identifier, fileOptions: []) -// } -// -// Task { @MainActor in -// async let text = ShareViewModel.loadText(textProvider: _textProvider) -// async let url = ShareViewModel.loadURL(textProvider: _urlProvider) -// -// let content = await [text, url] -// .compactMap { $0 } -// .joined(separator: " ") -// self.composeViewModel.statusContent = content -// } -// -// guard let api = self.api else { return } -// -// if let movieProvider = _movieProvider { -// composeViewModel.setupAttachmentViewModels([ -// StatusAttachmentViewModel(api: api, itemProvider: movieProvider) -// ]) -// } else if !imageProviders.isEmpty { -// let viewModels = imageProviders.map { provider in -// StatusAttachmentViewModel(api: api, itemProvider: provider) -// } -// composeViewModel.setupAttachmentViewModels(viewModels) -// } -// -// } -// -// private static func loadText(textProvider: NSItemProvider?) async -> String? { -// guard let textProvider = textProvider else { return nil } -// do { -// let item = try await textProvider.loadItem(forTypeIdentifier: UTType.plainText.identifier) -// guard let text = item as? String else { return nil } -// return text -// } catch { -// return nil -// } -// } -// -// private static func loadURL(textProvider: NSItemProvider?) async -> String? { -// guard let textProvider = textProvider else { return nil } -// do { -// let item = try await textProvider.loadItem(forTypeIdentifier: UTType.url.identifier) -// guard let url = item as? URL else { return nil } -// return url.absoluteString -// } catch { -// return nil -// } -// } -// -//} -// -//extension ShareViewModel { -// func publish() -> AnyPublisher, Error> { -// guard let authentication = composeViewModel.authentication, -// let api = self.api -// else { -// return Fail(error: APIService.APIError.implicit(.authenticationMissing)).eraseToAnyPublisher() -// } -// let authenticationBox = MastodonAuthenticationBox( -// authenticationRecord: .init(objectID: authentication.objectID), -// domain: authentication.domain, -// userID: authentication.userID, -// appAuthorization: Mastodon.API.OAuth.Authorization(accessToken: authentication.appAccessToken), -// userAuthorization: Mastodon.API.OAuth.Authorization(accessToken: authentication.userAccessToken) -// ) -// -// let domain = authentication.domain -// let attachmentViewModels = composeViewModel.attachmentViewModels -// let mediaIDs = attachmentViewModels.compactMap { viewModel in -// viewModel.attachment.value?.id -// } -// let sensitive: Bool = composeViewModel.isContentWarningComposing -// let spoilerText: String? = { -// let text = composeViewModel.contentWarningContent -// guard !text.isEmpty else { return nil } -// return text -// }() -// let visibility = selectedStatusVisibility.value.visibility -// -// let updateMediaQuerySubscriptions: [AnyPublisher, Error>] = { -// var subscriptions: [AnyPublisher, Error>] = [] -// for attachmentViewModel in attachmentViewModels { -// guard let attachmentID = attachmentViewModel.attachment.value?.id else { continue } -// let description = attachmentViewModel.descriptionContent.trimmingCharacters(in: .whitespacesAndNewlines) -// guard !description.isEmpty else { continue } -// let query = Mastodon.API.Media.UpdateMediaQuery( -// file: nil, -// thumbnail: nil, -// description: description, -// focus: nil -// ) -// let subscription = api.updateMedia( -// domain: domain, -// attachmentID: attachmentID, -// query: query, -// mastodonAuthenticationBox: authenticationBox -// ) -// subscriptions.append(subscription) -// } -// return subscriptions -// }() -// -// let status = composeViewModel.statusContent -// -// return Publishers.MergeMany(updateMediaQuerySubscriptions) -// .collect() -// .asyncMap { attachments in -// let query = Mastodon.API.Statuses.PublishStatusQuery( -// status: status, -// mediaIDs: mediaIDs.isEmpty ? nil : mediaIDs, -// pollOptions: nil, -// pollExpiresIn: nil, -// inReplyToID: nil, -// sensitive: sensitive, -// spoilerText: spoilerText, -// visibility: visibility -// ) -// return try await api.publishStatus( -// domain: domain, -// idempotencyKey: nil, // FIXME: -// query: query, -// authenticationBox: authenticationBox -// ) -// } -// .eraseToAnyPublisher() -// } -//} diff --git a/ShareActionExtension/Scene/ShareViewController.swift b/ShareActionExtension/Scene/ShareViewController.swift new file mode 100644 index 000000000..372ce5876 --- /dev/null +++ b/ShareActionExtension/Scene/ShareViewController.swift @@ -0,0 +1,325 @@ +// +// ShareViewController.swift +// ShareActionExtension +// +// Created by MainasuK on 2022/11/13. +// + +import os.log +import UIKit +import Combine +import CoreDataStack +import MastodonCore +import MastodonUI +import MastodonAsset +import MastodonLocalization +import UniformTypeIdentifiers + +final class ShareViewController: UIViewController { + + let logger = Logger(subsystem: "ShareViewController", category: "ViewController") + + var disposeBag = Set() + + let context = AppContext() + private(set) lazy var viewModel = ShareViewModel(context: context) + + let publishButton: UIButton = { + let button = RoundedEdgesButton(type: .custom) + button.cornerRadius = 10 + button.contentEdgeInsets = UIEdgeInsets(top: 6, left: 16, bottom: 5, right: 16) // set 28pt height + button.titleLabel?.font = .systemFont(ofSize: 14, weight: .bold) + button.setTitle(L10n.Scene.Compose.composeAction, for: .normal) + return button + }() + private func configurePublishButtonApperance() { + publishButton.adjustsImageWhenHighlighted = false + publishButton.setBackgroundImage(.placeholder(color: Asset.Colors.Label.primary.color), for: .normal) + publishButton.setBackgroundImage(.placeholder(color: Asset.Colors.Label.primary.color.withAlphaComponent(0.5)), for: .highlighted) + publishButton.setBackgroundImage(.placeholder(color: Asset.Colors.Button.disabled.color), for: .disabled) + publishButton.setTitleColor(Asset.Colors.Label.primaryReverse.color, for: .normal) + } + + private(set) lazy var cancelBarButtonItem = UIBarButtonItem(title: L10n.Common.Controls.Actions.cancel, style: .plain, target: self, action: #selector(ShareViewController.cancelBarButtonItemPressed(_:))) + private(set) lazy var publishBarButtonItem: UIBarButtonItem = { + let barButtonItem = UIBarButtonItem(customView: publishButton) + publishButton.addTarget(self, action: #selector(ShareViewController.publishBarButtonItemPressed(_:)), for: .touchUpInside) + return barButtonItem + }() + let activityIndicatorBarButtonItem: UIBarButtonItem = { + let indicatorView = UIActivityIndicatorView(style: .medium) + let barButtonItem = UIBarButtonItem(customView: indicatorView) + indicatorView.startAnimating() + return barButtonItem + }() + + private var composeContentViewModel: ComposeContentViewModel? + private var composeContentViewController: ComposeContentViewController? + + let notSignInLabel: UILabel = { + let label = UILabel() + label.font = .preferredFont(forTextStyle: .subheadline) + label.textColor = .secondaryLabel + label.text = "No Available Account" // TODO: i18n + return label + }() + +} + +extension ShareViewController { + override func viewDidLoad() { + super.viewDidLoad() + + setupTheme(theme: ThemeService.shared.currentTheme.value) + ThemeService.shared.apply(theme: ThemeService.shared.currentTheme.value) + ThemeService.shared.currentTheme + .receive(on: DispatchQueue.main) + .sink { [weak self] theme in + guard let self = self else { return } + self.setupTheme(theme: theme) + } + .store(in: &disposeBag) + + view.backgroundColor = .systemBackground + title = L10n.Scene.Compose.Title.newPost + + navigationItem.leftBarButtonItem = cancelBarButtonItem + navigationItem.rightBarButtonItem = publishBarButtonItem + + do { + guard let authContext = try setupAuthContext() else { + setupHintLabel() + return + } + viewModel.authContext = authContext + let composeContentViewModel = ComposeContentViewModel( + context: context, + authContext: authContext, + kind: .post + ) + let composeContentViewController = ComposeContentViewController() + composeContentViewController.viewModel = composeContentViewModel + addChild(composeContentViewController) + composeContentViewController.view.translatesAutoresizingMaskIntoConstraints = false + view.addSubview(composeContentViewController.view) + composeContentViewController.view.pinToParent() + composeContentViewController.didMove(toParent: self) + + self.composeContentViewModel = composeContentViewModel + self.composeContentViewController = composeContentViewController + + Task { @MainActor in + let inputItems = self.extensionContext?.inputItems.compactMap { $0 as? NSExtensionItem } ?? [] + await load(inputItems: inputItems) + } // end Task + } catch { + logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): error: \(error.localizedDescription)") + } + + viewModel.$isPublishing + .receive(on: DispatchQueue.main) + .sink { [weak self] isBusy in + guard let self = self else { return } + self.navigationItem.rightBarButtonItem = isBusy ? self.activityIndicatorBarButtonItem : self.publishBarButtonItem + } + .store(in: &disposeBag) + } + + override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { + super.traitCollectionDidChange(previousTraitCollection) + + configurePublishButtonApperance() + } +} + +extension ShareViewController { + @objc private func cancelBarButtonItemPressed(_ sender: UIBarButtonItem) { + logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public)") + + extensionContext?.cancelRequest(withError: NSError(domain: "org.joinmastodon.app.ShareActionExtension", code: -1)) + } + + @objc private func publishBarButtonItemPressed(_ sender: UIBarButtonItem) { + logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public)") + + + Task { @MainActor in + viewModel.isPublishing = true + do { + guard let statusPublisher = try composeContentViewModel?.statusPublisher(), + let authContext = viewModel.authContext + else { + throw AppError.badRequest + } + + _ = try await statusPublisher.publish(api: context.apiService, authContext: authContext) + + self.publishButton.setTitle(L10n.Common.Controls.Actions.done, for: .normal) + try await Task.sleep(nanoseconds: 1 * .second) + + self.extensionContext?.completeRequest(returningItems: nil, completionHandler: nil) + + } catch { + let alertController = UIAlertController.standardAlert(of: error) + present(alertController, animated: true) + return + } + viewModel.isPublishing = false + + } + } +} + +extension ShareViewController { + private func setupAuthContext() throws -> AuthContext? { + let request = MastodonAuthentication.activeSortedFetchRequest // use active order + let _authentication = try context.managedObjectContext.fetch(request).first + let _authContext = _authentication.flatMap { AuthContext(authentication: $0) } + return _authContext + } + + private func setupHintLabel() { + notSignInLabel.translatesAutoresizingMaskIntoConstraints = false + view.addSubview(notSignInLabel) + NSLayoutConstraint.activate([ + notSignInLabel.centerXAnchor.constraint(equalTo: view.centerXAnchor), + notSignInLabel.centerYAnchor.constraint(equalTo: view.centerYAnchor), + ]) + } + + private func setupTheme(theme: Theme) { + view.backgroundColor = theme.systemElevatedBackgroundColor + + let barAppearance = UINavigationBarAppearance() + barAppearance.configureWithDefaultBackground() + barAppearance.backgroundColor = theme.navigationBarBackgroundColor + navigationItem.standardAppearance = barAppearance + navigationItem.compactAppearance = barAppearance + navigationItem.scrollEdgeAppearance = barAppearance + } + + private func showDismissConfirmAlertController() { + let alertController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet) // can not use alert in extension + let discardAction = UIAlertAction(title: L10n.Common.Controls.Actions.discard, style: .destructive) { _ in + self.extensionContext?.cancelRequest(withError: ShareError.userCancelShare) + } + alertController.addAction(discardAction) + let okAction = UIAlertAction(title: L10n.Common.Controls.Actions.ok, style: .cancel, handler: nil) + alertController.addAction(okAction) + self.present(alertController, animated: true, completion: nil) + } +} + +// MARK: - UIAdaptivePresentationControllerDelegate +extension ShareViewController: UIAdaptivePresentationControllerDelegate { + + func presentationControllerShouldDismiss(_ presentationController: UIPresentationController) -> Bool { + return composeContentViewModel?.shouldDismiss ?? true + } + + func presentationControllerDidAttemptToDismiss(_ presentationController: UIPresentationController) { + os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) + showDismissConfirmAlertController() + } + + func presentationControllerDidDismiss(_ presentationController: UIPresentationController) { + os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) + } + +} + +extension ShareViewController { + + private func load(inputItems: [NSExtensionItem]) async { + guard let composeContentViewModel = self.composeContentViewModel, + let authContext = viewModel.authContext + else { + assertionFailure() + return + } + var itemProviders: [NSItemProvider] = [] + + for item in inputItems { + itemProviders.append(contentsOf: item.attachments ?? []) + } + + let _textProvider = itemProviders.first { provider in + return provider.hasRepresentationConforming(toTypeIdentifier: UTType.plainText.identifier, fileOptions: []) + } + + let _urlProvider = itemProviders.first { provider in + return provider.hasRepresentationConforming(toTypeIdentifier: UTType.url.identifier, fileOptions: []) + } + + let _movieProvider = itemProviders.first { provider in + return provider.hasRepresentationConforming(toTypeIdentifier: UTType.movie.identifier, fileOptions: []) + } + + let imageProviders = itemProviders.filter { provider in + return provider.hasRepresentationConforming(toTypeIdentifier: UTType.image.identifier, fileOptions: []) + } + + async let text = ShareViewController.loadText(textProvider: _textProvider) + async let url = ShareViewController.loadURL(textProvider: _urlProvider) + + let content = await [text, url] + .compactMap { $0 } + .joined(separator: " ") + // passby the viewModel `content` value + if !content.isEmpty { + composeContentViewModel.content = content + " " + composeContentViewModel.contentMetaText?.textView.insertText(content + " ") + } + + if let movieProvider = _movieProvider { + let attachmentViewModel = AttachmentViewModel( + api: context.apiService, + authContext: authContext, + input: .itemProvider(movieProvider), + delegate: composeContentViewModel + ) + composeContentViewModel.attachmentViewModels.append(attachmentViewModel) + } else if !imageProviders.isEmpty { + let attachmentViewModels = imageProviders.map { provider in + AttachmentViewModel( + api: context.apiService, + authContext: authContext, + input: .itemProvider(provider), + delegate: composeContentViewModel + ) + } + composeContentViewModel.attachmentViewModels.append(contentsOf: attachmentViewModels) + } + } + + private static func loadText(textProvider: NSItemProvider?) async -> String? { + guard let textProvider = textProvider else { return nil } + do { + let item = try await textProvider.loadItem(forTypeIdentifier: UTType.plainText.identifier) + guard let text = item as? String else { return nil } + return text + } catch { + return nil + } + } + + private static func loadURL(textProvider: NSItemProvider?) async -> String? { + guard let textProvider = textProvider else { return nil } + do { + let item = try await textProvider.loadItem(forTypeIdentifier: UTType.url.identifier) + guard let url = item as? URL else { return nil } + return url.absoluteString + } catch { + return nil + } + } + +} + +extension ShareViewController { + enum ShareError: Error { + case `internal`(error: Error) + case userCancelShare + case missingAuthentication + } +} diff --git a/ShareActionExtension/Scene/ShareViewModel.swift b/ShareActionExtension/Scene/ShareViewModel.swift new file mode 100644 index 000000000..ef8e200a6 --- /dev/null +++ b/ShareActionExtension/Scene/ShareViewModel.swift @@ -0,0 +1,43 @@ +// +// ShareViewModel.swift +// MastodonShareAction +// +// Created by MainasuK Cirno on 2021-7-16. +// + +import os.log +import Foundation +import Combine +import CoreData +import CoreDataStack +import MastodonSDK +import SwiftUI +import UniformTypeIdentifiers +import MastodonAsset +import MastodonLocalization +import MastodonUI +import MastodonCore + +final class ShareViewModel { + + let logger = Logger(subsystem: "ComposeViewModel", category: "ViewModel") + + var disposeBag = Set() + + // input + let context: AppContext + @Published var authContext: AuthContext? + + @Published var isPublishing = false + + // output + + init( + context: AppContext + ) { + self.context = context + // end init + + } + +} diff --git a/ShareActionExtension/Scene/View/ComposeToolbarView.swift b/ShareActionExtension/Scene/View/ComposeToolbarView.swift deleted file mode 100644 index 07833ac90..000000000 --- a/ShareActionExtension/Scene/View/ComposeToolbarView.swift +++ /dev/null @@ -1,262 +0,0 @@ -// -// ComposeToolbarView.swift -// ShareActionExtension -// -// Created by MainasuK Cirno on 2021-7-19. -// - -import os.log -import UIKit -import Combine -import MastodonSDK -import MastodonAsset -import MastodonLocalization -import MastodonCore -import MastodonUI - -protocol ComposeToolbarViewDelegate: AnyObject { - func composeToolbarView(_ composeToolbarView: ComposeToolbarView, contentWarningButtonDidPressed sender: UIButton) - func composeToolbarView(_ composeToolbarView: ComposeToolbarView, visibilityButtonDidPressed sender: UIButton, visibilitySelectionType type: ComposeToolbarView.VisibilitySelectionType) -} - -final class ComposeToolbarView: UIView { - - var disposeBag = Set() - - static let toolbarButtonSize: CGSize = CGSize(width: 44, height: 44) - static let toolbarHeight: CGFloat = 44 - - weak var delegate: ComposeToolbarViewDelegate? - - let contentWarningButton: UIButton = { - let button = HighlightDimmableButton() - ComposeToolbarView.configureToolbarButtonAppearance(button: button) - button.setImage(UIImage(systemName: "exclamationmark.shield", withConfiguration: UIImage.SymbolConfiguration(pointSize: 20, weight: .regular)), for: .normal) - button.accessibilityLabel = L10n.Scene.Compose.Accessibility.enableContentWarning - return button - }() - - let visibilityButton: UIButton = { - let button = HighlightDimmableButton() - ComposeToolbarView.configureToolbarButtonAppearance(button: button) - button.setImage(UIImage(systemName: "person.3", withConfiguration: UIImage.SymbolConfiguration(pointSize: 15, weight: .medium)), for: .normal) - button.accessibilityLabel = L10n.Scene.Compose.Accessibility.postVisibilityMenu - return button - }() - - let characterCountLabel: UILabel = { - let label = UILabel() - label.font = .systemFont(ofSize: 15, weight: .regular) - label.text = "500" - label.textColor = Asset.Colors.Label.secondary.color - label.accessibilityLabel = L10n.A11y.Plural.Count.inputLimitRemains(500) - return label - }() - - let activeVisibilityType = CurrentValueSubject(.public) - - override init(frame: CGRect) { - super.init(frame: frame) - _init() - } - - required init?(coder: NSCoder) { - super.init(coder: coder) - _init() - } - -} - -extension ComposeToolbarView { - - private func _init() { - setupBackgroundColor(theme: ThemeService.shared.currentTheme.value) - ThemeService.shared.currentTheme - .receive(on: DispatchQueue.main) - .sink { [weak self] theme in - guard let self = self else { return } - self.setupBackgroundColor(theme: theme) - } - .store(in: &disposeBag) - - let stackView = UIStackView() - stackView.axis = .horizontal - stackView.spacing = 0 - stackView.distribution = .fillEqually - stackView.translatesAutoresizingMaskIntoConstraints = false - addSubview(stackView) - NSLayoutConstraint.activate([ - stackView.centerYAnchor.constraint(equalTo: centerYAnchor), - layoutMarginsGuide.leadingAnchor.constraint(equalTo: stackView.leadingAnchor, constant: 8), // tweak button margin offset - ]) - - let buttons = [ - contentWarningButton, - visibilityButton, - ] - buttons.forEach { button in - button.translatesAutoresizingMaskIntoConstraints = false - stackView.addArrangedSubview(button) - NSLayoutConstraint.activate([ - button.widthAnchor.constraint(equalToConstant: 44), - button.heightAnchor.constraint(equalToConstant: 44), - ]) - } - - characterCountLabel.translatesAutoresizingMaskIntoConstraints = false - addSubview(characterCountLabel) - NSLayoutConstraint.activate([ - characterCountLabel.topAnchor.constraint(equalTo: topAnchor), - characterCountLabel.leadingAnchor.constraint(greaterThanOrEqualTo: stackView.trailingAnchor, constant: 8), - characterCountLabel.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor), - characterCountLabel.bottomAnchor.constraint(equalTo: bottomAnchor), - ]) - characterCountLabel.setContentHuggingPriority(.defaultHigh, for: .horizontal) - - contentWarningButton.addTarget(self, action: #selector(ComposeToolbarView.contentWarningButtonDidPressed(_:)), for: .touchUpInside) - visibilityButton.menu = createVisibilityContextMenu(interfaceStyle: traitCollection.userInterfaceStyle) - visibilityButton.showsMenuAsPrimaryAction = true - - updateToolbarButtonUserInterfaceStyle() - - // update menu when selected visibility type changed - activeVisibilityType - .receive(on: RunLoop.main) - .sink { [weak self] type in - guard let self = self else { return } - self.visibilityButton.menu = self.createVisibilityContextMenu(interfaceStyle: self.traitCollection.userInterfaceStyle) - } - .store(in: &disposeBag) - } - - override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { - super.traitCollectionDidChange(previousTraitCollection) - - updateToolbarButtonUserInterfaceStyle() - } - -} - -extension ComposeToolbarView { - private func setupBackgroundColor(theme: Theme) { - backgroundColor = theme.composeToolbarBackgroundColor - } -} - -extension ComposeToolbarView { - enum MediaSelectionType: String { - case camera - case photoLibrary - case browse - } - - enum VisibilitySelectionType: String, CaseIterable { - case `public` - // TODO: remove unlisted option from codebase - // case unlisted - case `private` - case direct - - var title: String { - switch self { - case .public: return L10n.Scene.Compose.Visibility.public - // case .unlisted: return L10n.Scene.Compose.Visibility.unlisted - case .private: return L10n.Scene.Compose.Visibility.private - case .direct: return L10n.Scene.Compose.Visibility.direct - } - } - - func image(interfaceStyle: UIUserInterfaceStyle) -> UIImage { - switch self { - case .public: return UIImage(systemName: "globe", withConfiguration: UIImage.SymbolConfiguration(pointSize: 19, weight: .medium))! - // case .unlisted: return UIImage(systemName: "eye.slash", withConfiguration: UIImage.SymbolConfiguration(pointSize: 18, weight: .regular))! - case .private: - switch interfaceStyle { - case .light: return UIImage(systemName: "person.3", withConfiguration: UIImage.SymbolConfiguration(pointSize: 15, weight: .medium))! - default: return UIImage(systemName: "person.3.fill", withConfiguration: UIImage.SymbolConfiguration(pointSize: 15, weight: .medium))! - } - case .direct: return UIImage(systemName: "at", withConfiguration: UIImage.SymbolConfiguration(pointSize: 19, weight: .regular))! - } - } - - var visibility: Mastodon.Entity.Status.Visibility { - switch self { - case .public: return .public - // case .unlisted: return .unlisted - case .private: return .private - case .direct: return .direct - } - } - } -} - -extension ComposeToolbarView { - - private static func configureToolbarButtonAppearance(button: UIButton) { - button.tintColor = ThemeService.tintColor - button.setBackgroundImage(.placeholder(size: ComposeToolbarView.toolbarButtonSize, color: .systemFill), for: .highlighted) - button.layer.masksToBounds = true - button.layer.cornerRadius = 5 - button.layer.cornerCurve = .continuous - } - - private func updateToolbarButtonUserInterfaceStyle() { - switch traitCollection.userInterfaceStyle { - case .light: - contentWarningButton.setImage(UIImage(systemName: "exclamationmark.shield", withConfiguration: UIImage.SymbolConfiguration(pointSize: 20, weight: .regular))!, for: .normal) - - case .dark: - contentWarningButton.setImage(UIImage(systemName: "exclamationmark.shield.fill", withConfiguration: UIImage.SymbolConfiguration(pointSize: 20, weight: .regular))!, for: .normal) - - default: - assertionFailure() - } - - visibilityButton.menu = createVisibilityContextMenu(interfaceStyle: traitCollection.userInterfaceStyle) - } - - private func createVisibilityContextMenu(interfaceStyle: UIUserInterfaceStyle) -> UIMenu { - let children: [UIMenuElement] = VisibilitySelectionType.allCases.map { type in - let state: UIMenuElement.State = activeVisibilityType.value == type ? .on : .off - return UIAction(title: type.title, image: type.image(interfaceStyle: interfaceStyle), identifier: nil, discoverabilityTitle: nil, attributes: [], state: state) { [weak self] action in - guard let self = self else { return } - os_log(.info, "%{public}s[%{public}ld], %{public}s: visibilitySelectionType: %s", ((#file as NSString).lastPathComponent), #line, #function, type.rawValue) - self.delegate?.composeToolbarView(self, visibilityButtonDidPressed: self.visibilityButton, visibilitySelectionType: type) - } - } - return UIMenu(title: "", image: nil, identifier: nil, options: .displayInline, children: children) - } - -} - -extension ComposeToolbarView { - - @objc private func contentWarningButtonDidPressed(_ sender: UIButton) { - os_log(.info, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function) - delegate?.composeToolbarView(self, contentWarningButtonDidPressed: sender) - } - -} - -#if canImport(SwiftUI) && DEBUG -import SwiftUI - -struct ComposeToolbarView_Previews: PreviewProvider { - - static var previews: some View { - UIViewPreview(width: 375) { - let toolbarView = ComposeToolbarView() - toolbarView.translatesAutoresizingMaskIntoConstraints = false - NSLayoutConstraint.activate([ - toolbarView.widthAnchor.constraint(equalToConstant: 375).priority(.defaultHigh), - toolbarView.heightAnchor.constraint(equalToConstant: 64).priority(.defaultHigh), - ]) - return toolbarView - } - .previewLayout(.fixed(width: 375, height: 100)) - } - -} - -#endif - diff --git a/ShareActionExtension/Scene/View/ComposeView.swift b/ShareActionExtension/Scene/View/ComposeView.swift deleted file mode 100644 index a688d6492..000000000 --- a/ShareActionExtension/Scene/View/ComposeView.swift +++ /dev/null @@ -1,151 +0,0 @@ -// -// ComposeView.swift -// -// -// Created by MainasuK Cirno on 2021-7-16. -// - -import UIKit -import SwiftUI - -public struct ComposeView: View { - - @EnvironmentObject var viewModel: ComposeViewModel - @State var statusEditorViewWidth: CGFloat = .zero - - let horizontalMargin: CGFloat = 20 - - public init() { } - - public var body: some View { - GeometryReader { proxy in - List { - // Content Warning - if viewModel.isContentWarningComposing { - ContentWarningEditorView( - contentWarningContent: $viewModel.contentWarningContent, - placeholder: viewModel.contentWarningPlaceholder - ) - .padding(EdgeInsets(top: 6, leading: horizontalMargin, bottom: 6, trailing: horizontalMargin)) - .background(viewModel.contentWarningBackgroundColor) - .transition(.opacity) - .listRow(backgroundColor: Color(viewModel.backgroundColor)) - } - - // Author - StatusAuthorView( - avatarImageURL: viewModel.avatarImageURL, - name: viewModel.authorName, - username: viewModel.authorUsername - ) - .padding(EdgeInsets(top: 20, leading: horizontalMargin, bottom: 16, trailing: horizontalMargin)) - .listRow(backgroundColor: Color(viewModel.backgroundColor)) - - // Editor - StatusEditorView( - string: $viewModel.statusContent, - placeholder: viewModel.statusPlaceholder, - width: statusEditorViewWidth, - attributedString: viewModel.statusContentAttributedString, - keyboardType: .twitter, - viewDidAppear: $viewModel.viewDidAppear - ) - .frame(width: statusEditorViewWidth) - .frame(minHeight: 100) - .padding(EdgeInsets(top: 0, leading: horizontalMargin, bottom: 0, trailing: horizontalMargin)) - .listRow(backgroundColor: Color(viewModel.backgroundColor)) - - // Attachments - ForEach(viewModel.attachmentViewModels) { attachmentViewModel in - let descriptionBinding = Binding { - return attachmentViewModel.descriptionContent - } set: { newValue in - attachmentViewModel.descriptionContent = newValue - } - - StatusAttachmentView( - image: attachmentViewModel.thumbnailImage, - descriptionPlaceholder: attachmentViewModel.descriptionPlaceholder, - description: descriptionBinding, - errorPrompt: attachmentViewModel.errorPrompt, - errorPromptImage: attachmentViewModel.errorPromptImage, - isUploading: attachmentViewModel.isUploading, - progressViewTintColor: attachmentViewModel.progressViewTintColor, - removeButtonAction: { - self.viewModel.removeAttachmentViewModel(attachmentViewModel) - } - ) - } - .padding(EdgeInsets(top: 16, leading: horizontalMargin, bottom: 0, trailing: horizontalMargin)) - .fixedSize(horizontal: false, vertical: true) - .listRow(backgroundColor: Color(viewModel.backgroundColor)) - - // bottom padding - Color.clear - .frame(height: viewModel.toolbarHeight + 20) - .listRow(backgroundColor: Color(viewModel.backgroundColor)) - } // end List - .listStyle(.plain) - .introspectTableView(customize: { tableView in - // tableView.keyboardDismissMode = .onDrag - tableView.verticalScrollIndicatorInsets.bottom = viewModel.toolbarHeight - }) - .preference( - key: ComposeListViewFramePreferenceKey.self, - value: proxy.frame(in: .local) - ) - .onPreferenceChange(ComposeListViewFramePreferenceKey.self) { frame in - var frame = frame - frame.size.width = frame.width - 2 * horizontalMargin - statusEditorViewWidth = frame.width - } // end List - .introspectTableView(customize: { tableView in - tableView.backgroundColor = .clear - }) - .overrideBackground(color: Color(viewModel.backgroundColor)) - } // end GeometryReader - } // end body -} - -struct ComposeListViewFramePreferenceKey: PreferenceKey { - static var defaultValue: CGRect = .zero - static func reduce(value: inout CGRect, nextValue: () -> CGRect) { } -} - -extension View { - // hack for separator line - @ViewBuilder - func listRow(backgroundColor: Color) -> some View { - // expand list row to edge (set inset) - // then hide the separator - if #available(iOS 15, *) { - frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .leading) - .listRowInsets(EdgeInsets(top: -1, leading: -1, bottom: -1, trailing: -1)) - .background(backgroundColor) - .listRowSeparator(.hidden) // new API - } else { - frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .leading) - .listRowInsets(EdgeInsets(top: -1, leading: -1, bottom: -1, trailing: -1)) // separator line hidden magic - .background(backgroundColor) - } - } - - @ViewBuilder - func overrideBackground(color: Color) -> some View { - background(color.ignoresSafeArea()) - } -} - - -struct ComposeView_Previews: PreviewProvider { - - static let viewModel: ComposeViewModel = { - let viewModel = ComposeViewModel() - return viewModel - }() - - static var previews: some View { - ComposeView().environmentObject(viewModel) - } - -} diff --git a/ShareActionExtension/Scene/View/ComposeViewModel.swift b/ShareActionExtension/Scene/View/ComposeViewModel.swift deleted file mode 100644 index 88c2b896f..000000000 --- a/ShareActionExtension/Scene/View/ComposeViewModel.swift +++ /dev/null @@ -1,130 +0,0 @@ -// -// ComposeViewModel.swift -// ShareActionExtension -// -// Created by MainasuK Cirno on 2021-7-16. -// - -import Foundation -import SwiftUI -import Combine -import CoreDataStack - -class ComposeViewModel: ObservableObject { - - var disposeBag = Set() - - @Published var authentication: MastodonAuthentication? - - @Published var backgroundColor: UIColor = .clear - @Published var toolbarHeight: CGFloat = 0 - @Published var viewDidAppear = false - - @Published var avatarImageURL: URL? - @Published var authorName: String = "" - @Published var authorUsername: String = "" - - @Published var statusContent = "" - @Published var statusPlaceholder = "" - @Published var statusContentAttributedString = NSAttributedString() - - @Published var isContentWarningComposing = false - @Published var contentWarningBackgroundColor = Color.secondary - @Published var contentWarningPlaceholder = "" - @Published var contentWarningContent = "" - - @Published private(set) var attachmentViewModels: [StatusAttachmentViewModel] = [] - - @Published var characterCount = 0 - - public init() { - $statusContent - .map { NSAttributedString(string: $0) } - .assign(to: &$statusContentAttributedString) - - Publishers.CombineLatest3( - $statusContent, - $isContentWarningComposing, - $contentWarningContent - ) - .map { statusContent, isContentWarningComposing, contentWarningContent in - var count = statusContent.count - if isContentWarningComposing { - count += contentWarningContent.count - } - return count - } - .assign(to: &$characterCount) - - // setup attribute updater - $attachmentViewModels - .receive(on: DispatchQueue.main) - .debounce(for: 0.3, scheduler: DispatchQueue.main) - .sink { attachmentViewModels in - // drive upload state - // make image upload in the queue - for attachmentViewModel in attachmentViewModels { - // skip when prefix N task when task finish OR fail OR uploading - guard let currentState = attachmentViewModel.uploadStateMachine.currentState else { break } - if currentState is StatusAttachmentViewModel.UploadState.Fail { - continue - } - if currentState is StatusAttachmentViewModel.UploadState.Finish { - continue - } - if currentState is StatusAttachmentViewModel.UploadState.Uploading { - break - } - // trigger uploading one by one - if currentState is StatusAttachmentViewModel.UploadState.Initial { - attachmentViewModel.uploadStateMachine.enter(StatusAttachmentViewModel.UploadState.Uploading.self) - break - } - } - } - .store(in: &disposeBag) - - #if DEBUG - // avatarImageURL = URL(string: "https://upload.wikimedia.org/wikipedia/commons/2/2c/Rotating_earth_%28large%29.gif") - // authorName = "Alice" - // authorUsername = "alice" - #endif - } - -} - -extension ComposeViewModel { - func setupAttachmentViewModels(_ viewModels: [StatusAttachmentViewModel]) { - attachmentViewModels = viewModels - for viewModel in viewModels { - // set delegate - viewModel.delegate = self - // set observed - viewModel.objectWillChange.sink { [weak self] _ in - guard let self = self else { return } - self.objectWillChange.send() - } - .store(in: &viewModel.disposeBag) - // bind authentication - $authentication - .assign(to: \.value, on: viewModel.authentication) - .store(in: &viewModel.disposeBag) - } - } - - func removeAttachmentViewModel(_ viewModel: StatusAttachmentViewModel) { - if let index = attachmentViewModels.firstIndex(where: { $0 === viewModel }) { - attachmentViewModels.remove(at: index) - } - } -} - -// MARK: - StatusAttachmentViewModelDelegate -extension ComposeViewModel: StatusAttachmentViewModelDelegate { - func statusAttachmentViewModel(_ viewModel: StatusAttachmentViewModel, uploadStateDidChange state: StatusAttachmentViewModel.UploadState?) { - // trigger event update - DispatchQueue.main.async { - self.attachmentViewModels = self.attachmentViewModels - } - } -} diff --git a/ShareActionExtension/Scene/View/ContentWarningEditorView.swift b/ShareActionExtension/Scene/View/ContentWarningEditorView.swift deleted file mode 100644 index 833c919fc..000000000 --- a/ShareActionExtension/Scene/View/ContentWarningEditorView.swift +++ /dev/null @@ -1,48 +0,0 @@ -// -// ContentWarningEditorView.swift -// -// -// Created by MainasuK Cirno on 2021-7-19. -// - -import SwiftUI -import Introspect - -struct ContentWarningEditorView: View { - - @Binding var contentWarningContent: String - let placeholder: String - let spacing: CGFloat = 11 - - var body: some View { - HStack(alignment: .center, spacing: spacing) { - Image(systemName: "exclamationmark.shield") - .font(.system(size: 30, weight: .regular)) - Text(contentWarningContent.isEmpty ? " " : contentWarningContent) - .opacity(0) - .padding(.all, 8) - .frame(maxWidth: .infinity) - .overlay( - TextEditor(text: $contentWarningContent) - .introspectTextView { textView in - textView.backgroundColor = .clear - textView.placeholder = placeholder - } - ) - } - } -} - -struct ContentWarningEditorView_Previews: PreviewProvider { - - @State static var content = "" - - static var previews: some View { - ContentWarningEditorView( - contentWarningContent: $content, - placeholder: "Write an accurate warning here..." - ) - .previewLayout(.fixed(width: 375, height: 100)) - } -} - diff --git a/ShareActionExtension/Scene/View/StatusAttachmentView.swift b/ShareActionExtension/Scene/View/StatusAttachmentView.swift deleted file mode 100644 index 90b8aceeb..000000000 --- a/ShareActionExtension/Scene/View/StatusAttachmentView.swift +++ /dev/null @@ -1,126 +0,0 @@ -// -// StatusAttachmentView.swift -// -// -// Created by MainasuK Cirno on 2021-7-19. -// - -import SwiftUI -import Introspect - -struct StatusAttachmentView: View { - - let image: UIImage? - let descriptionPlaceholder: String - @Binding var description: String - let errorPrompt: String? - let errorPromptImage: UIImage - let isUploading: Bool - let progressViewTintColor: UIColor - - let removeButtonAction: () -> Void - - var body: some View { - let image = image ?? UIImage.placeholder(color: .systemFill) - ZStack(alignment: .bottom) { - if let errorPrompt = errorPrompt { - Color.clear - .aspectRatio(CGSize(width: 16, height: 9), contentMode: .fill) - .overlay( - VStack(alignment: .center) { - Image(uiImage: errorPromptImage) - Text(errorPrompt) - .lineLimit(2) - } - ) - .background(Color.gray) - } else { - Color.clear - .aspectRatio(CGSize(width: 16, height: 9), contentMode: .fill) - .overlay( - Image(uiImage: image) - .resizable() - .aspectRatio(contentMode: .fill) - ) - .background(Color.gray) - LinearGradient(gradient: Gradient(colors: [Color(white: 0, opacity: 0.69), Color.clear]), startPoint: .bottom, endPoint: .top) - .frame(maxHeight: 71) - TextField("", text: $description) - .placeholder(when: description.isEmpty) { - Text(descriptionPlaceholder).foregroundColor(Color(white: 1, opacity: 0.6)) - .lineLimit(1) - } - .foregroundColor(.white) - .font(.system(size: 15, weight: .regular, design: .default)) - .padding(EdgeInsets(top: 0, leading: 8, bottom: 7, trailing: 8)) - } - } - .cornerRadius(4) - .badgeView( - Button(action: { - removeButtonAction() - }, label: { - Image(systemName: "minus.circle.fill") - .renderingMode(.original) - .font(.system(size: 22, weight: .bold, design: .default)) - }) - .buttonStyle(BorderlessButtonStyle()) - ) - .overlay( - Group { - if isUploading { - ProgressView() - .progressViewStyle(CircularProgressViewStyle(tint: Color(progressViewTintColor))) - } - } - ) - } -} - -extension View { - func badgeView(_ content: Content) -> some View where Content: View { - overlay( - ZStack { - content - } - .alignmentGuide(.top) { $0.height / 2 } - .alignmentGuide(.trailing) { $0.width / 2 } - .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topTrailing) - ) - } -} - -/// ref: https://stackoverflow.com/a/57715771/3797903 -extension View { - func placeholder( - when shouldShow: Bool, - alignment: Alignment = .leading, - @ViewBuilder placeholder: () -> Content) -> some View { - - ZStack(alignment: alignment) { - placeholder().opacity(shouldShow ? 1 : 0) - self - } - } -} - - -//struct StatusAttachmentView_Previews: PreviewProvider { -// static var previews: some View { -// ScrollView { -// StatusAttachmentView( -// image: UIImage(systemName: "photo"), -// descriptionPlaceholder: "Describe photo", -// description: .constant(""), -// errorPrompt: nil, -// errorPromptImage: StatusAttachmentViewModel.photoFillSplitImage, -// isUploading: true, -// progressViewTintColor: .systemFill, -// removeButtonAction: { -// // do nothing -// } -// ) -// .padding(20) -// } -// } -//} diff --git a/ShareActionExtension/Scene/View/StatusAttachmentViewModel+UploadState.swift b/ShareActionExtension/Scene/View/StatusAttachmentViewModel+UploadState.swift deleted file mode 100644 index 56942cde0..000000000 --- a/ShareActionExtension/Scene/View/StatusAttachmentViewModel+UploadState.swift +++ /dev/null @@ -1,131 +0,0 @@ -// -// StatusAttachmentViewModel+UploadState.swift -// ShareActionExtension -// -// Created by MainasuK Cirno on 2021-7-20. -// - -import os.log -import Foundation -import Combine -import GameplayKit -import MastodonSDK -import MastodonCore - -extension StatusAttachmentViewModel { - class UploadState: GKState { - weak var viewModel: StatusAttachmentViewModel? - - init(viewModel: StatusAttachmentViewModel) { - self.viewModel = viewModel - } - - override func didEnter(from previousState: GKState?) { - os_log("%{public}s[%{public}ld], %{public}s: enter %s, previous: %s", ((#file as NSString).lastPathComponent), #line, #function, self.debugDescription, previousState.debugDescription) - viewModel?.uploadStateMachineSubject.send(self) - } - } -} - -extension StatusAttachmentViewModel.UploadState { - - class Initial: StatusAttachmentViewModel.UploadState { - override func isValidNextState(_ stateClass: AnyClass) -> Bool { - guard viewModel?.authentication.value != nil else { return false } - if stateClass == Initial.self { - return true - } - - if viewModel?.file.value != nil { - return stateClass == Uploading.self - } else { - return stateClass == Fail.self - } - } - } - - class Uploading: StatusAttachmentViewModel.UploadState { - let logger = Logger(subsystem: "StatusAttachmentViewModel.UploadState.Uploading", category: "logic") - var needsFallback = false - - override func isValidNextState(_ stateClass: AnyClass) -> Bool { - return stateClass == Fail.self || stateClass == Finish.self || stateClass == Uploading.self - } - - override func didEnter(from previousState: GKState?) { - super.didEnter(from: previousState) - - guard let viewModel = viewModel, let stateMachine = stateMachine else { return } - guard let authentication = viewModel.authentication.value else { return } - guard let file = viewModel.file.value else { return } - - let description = viewModel.descriptionContent - let query = Mastodon.API.Media.UploadMediaQuery( - file: file, - thumbnail: nil, - description: description, - focus: nil - ) - - let mastodonAuthenticationBox = MastodonAuthenticationBox( - authenticationRecord: .init(objectID: authentication.objectID), - domain: authentication.domain, - userID: authentication.userID, - appAuthorization: Mastodon.API.OAuth.Authorization(accessToken: authentication.appAccessToken), - userAuthorization: Mastodon.API.OAuth.Authorization(accessToken: authentication.userAccessToken) - ) - - // and needs clone the `query` if needs retry - viewModel.api.uploadMedia( - domain: mastodonAuthenticationBox.domain, - query: query, - mastodonAuthenticationBox: mastodonAuthenticationBox, - needsFallback: needsFallback - ) - .receive(on: DispatchQueue.main) - .sink { [weak self] completion in - guard let self = self else { return } - switch completion { - case .failure(let error): - if let apiError = error as? Mastodon.API.Error, - apiError.httpResponseStatus == .notFound, - self.needsFallback == false - { - self.needsFallback = true - stateMachine.enter(Uploading.self) - self.logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): fallback to V1") - } else { - self.logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): fail: \(error.localizedDescription)") - viewModel.error = error - stateMachine.enter(Fail.self) - } - case .finished: - self.logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): upload attachment success") - break - } - } receiveValue: { [weak self] response in - guard let self = self else { return } - self.logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): upload attachment \(response.value.id) success, \(response.value.url ?? "")") - viewModel.attachment.value = response.value - stateMachine.enter(Finish.self) - } - .store(in: &viewModel.disposeBag) - } - - } - - class Fail: StatusAttachmentViewModel.UploadState { - override func isValidNextState(_ stateClass: AnyClass) -> Bool { - // allow discard publishing - return stateClass == Uploading.self || stateClass == Finish.self - } - } - - class Finish: StatusAttachmentViewModel.UploadState { - override func isValidNextState(_ stateClass: AnyClass) -> Bool { - return false - } - } - -} - diff --git a/ShareActionExtension/Scene/View/StatusAttachmentViewModel.swift b/ShareActionExtension/Scene/View/StatusAttachmentViewModel.swift deleted file mode 100644 index 19251d0be..000000000 --- a/ShareActionExtension/Scene/View/StatusAttachmentViewModel.swift +++ /dev/null @@ -1,227 +0,0 @@ -// -// StatusAttachmentViewModel.swift -// ShareActionExtension -// -// Created by MainasuK Cirno on 2021-7-19. -// - -import os.log -import Foundation -import SwiftUI -import Combine -import CoreDataStack -import MastodonSDK -import MastodonUI -import AVFoundation -import GameplayKit -import MobileCoreServices -import UniformTypeIdentifiers -import MastodonAsset -import MastodonCore -import MastodonLocalization - -protocol StatusAttachmentViewModelDelegate: AnyObject { - func statusAttachmentViewModel(_ viewModel: StatusAttachmentViewModel, uploadStateDidChange state: StatusAttachmentViewModel.UploadState?) -} - -final class StatusAttachmentViewModel: ObservableObject, Identifiable { - - static let photoFillSplitImage = Asset.Connectivity.photoFillSplit.image.withRenderingMode(.alwaysTemplate) - static let videoSplashImage: UIImage = { - let image = UIImage(systemName: "video.slash")!.withConfiguration(UIImage.SymbolConfiguration(pointSize: 64)) - return image - }() - - let logger = Logger(subsystem: "StatusAttachmentViewModel", category: "logic") - - weak var delegate: StatusAttachmentViewModelDelegate? - var disposeBag = Set() - - let id = UUID() - let itemProvider: NSItemProvider - - // input - let api: APIService - let file = CurrentValueSubject(nil) - let authentication = CurrentValueSubject(nil) - @Published var descriptionContent = "" - - // output - let attachment = CurrentValueSubject(nil) - @Published var thumbnailImage: UIImage? - @Published var descriptionPlaceholder = "" - @Published var isUploading = true - @Published var progressViewTintColor = UIColor.systemFill - @Published var error: Error? - @Published var errorPrompt: String? - @Published var errorPromptImage: UIImage = StatusAttachmentViewModel.photoFillSplitImage - - private(set) lazy var uploadStateMachine: GKStateMachine = { - // exclude timeline middle fetcher state - let stateMachine = GKStateMachine(states: [ - UploadState.Initial(viewModel: self), - UploadState.Uploading(viewModel: self), - UploadState.Fail(viewModel: self), - UploadState.Finish(viewModel: self), - ]) - stateMachine.enter(UploadState.Initial.self) - return stateMachine - }() - lazy var uploadStateMachineSubject = CurrentValueSubject(nil) - - init( - api: APIService, - itemProvider: NSItemProvider - ) { - self.api = api - self.itemProvider = itemProvider - - // bind attachment from item provider - Just(itemProvider) - .receive(on: DispatchQueue.main) - .flatMap { result -> AnyPublisher in - if itemProvider.hasRepresentationConforming(toTypeIdentifier: UTType.image.identifier, fileOptions: []) { - return ItemProviderLoader.loadImageData(from: result).eraseToAnyPublisher() - } - if itemProvider.hasRepresentationConforming(toTypeIdentifier: UTType.movie.identifier, fileOptions: []) { - return ItemProviderLoader.loadVideoData(from: result).eraseToAnyPublisher() - } - return Fail(error: AttachmentError.invalidAttachmentType).eraseToAnyPublisher() - } - .sink { [weak self] completion in - guard let self = self else { return } - switch completion { - case .failure(let error): - self.error = error - self.uploadStateMachine.enter(UploadState.Fail.self) - case .finished: - break - } - } receiveValue: { [weak self] file in - guard let self = self else { return } - self.file.value = file - self.uploadStateMachine.enter(UploadState.Initial.self) - } - .store(in: &disposeBag) - - // bind progress view tint color - $thumbnailImage - .receive(on: DispatchQueue.main) - .map { image -> UIColor in - guard let image = image else { return .systemFill } - switch image.domainLumaCoefficientsStyle { - case .light: - return UIColor.black.withAlphaComponent(0.8) - default: - return UIColor.white.withAlphaComponent(0.8) - } - } - .assign(to: &$progressViewTintColor) - - // bind description placeholder and error prompt image - file - .receive(on: DispatchQueue.main) - .sink { [weak self] file in - guard let self = self else { return } - guard let file = file else { return } - switch file { - case .jpeg, .png, .gif: - self.descriptionPlaceholder = L10n.Scene.Compose.Attachment.descriptionPhoto - self.errorPromptImage = StatusAttachmentViewModel.photoFillSplitImage - case .other: - self.descriptionPlaceholder = L10n.Scene.Compose.Attachment.descriptionVideo - self.errorPromptImage = StatusAttachmentViewModel.videoSplashImage - } - } - .store(in: &disposeBag) - - // bind thumbnail image - file - .receive(on: DispatchQueue.main) - .map { file -> UIImage? in - guard let file = file else { - return nil - } - - switch file { - case .jpeg(let data), .png(let data): - return data.flatMap { UIImage(data: $0) } - case .gif: - // TODO: - return nil - case .other(let url, _, _): - guard let url = url, FileManager.default.fileExists(atPath: url.path) else { return nil } - let asset = AVURLAsset(url: url) - let assetImageGenerator = AVAssetImageGenerator(asset: asset) - assetImageGenerator.appliesPreferredTrackTransform = true // fix orientation - do { - let cgImage = try assetImageGenerator.copyCGImage(at: CMTimeMake(value: 0, timescale: 1), actualTime: nil) - let image = UIImage(cgImage: cgImage) - return image - } catch { - self.logger.debug("\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): thumbnail generate fail: \(error.localizedDescription)") - return nil - } - } - } - .assign(to: &$thumbnailImage) - - // bind state and error - Publishers.CombineLatest( - uploadStateMachineSubject, - $error - ) - .sink { [weak self] state, error in - guard let self = self else { return } - // trigger delegate - self.delegate?.statusAttachmentViewModel(self, uploadStateDidChange: state) - - // set error prompt - if let error = error { - self.isUploading = false - self.errorPrompt = error.localizedDescription - } else { - guard let state = state else { return } - switch state { - case is UploadState.Finish: - self.isUploading = false - case is UploadState.Fail: - self.isUploading = false - // FIXME: not display - self.errorPrompt = { - guard let file = self.file.value else { - return L10n.Scene.Compose.Attachment.attachmentBroken(L10n.Scene.Compose.Attachment.photo) - } - switch file { - case .jpeg, .png, .gif: - return L10n.Scene.Compose.Attachment.attachmentBroken(L10n.Scene.Compose.Attachment.photo) - case .other: - return L10n.Scene.Compose.Attachment.attachmentBroken(L10n.Scene.Compose.Attachment.video) - } - }() - default: - break - } - } - } - .store(in: &disposeBag) - - // trigger delegate when authentication get new value - authentication - .receive(on: DispatchQueue.main) - .sink { [weak self] authentication in - guard let self = self else { return } - guard authentication != nil else { return } - self.delegate?.statusAttachmentViewModel(self, uploadStateDidChange: self.uploadStateMachineSubject.value) - } - .store(in: &disposeBag) - } - -} - -extension StatusAttachmentViewModel { - enum AttachmentError: Error { - case invalidAttachmentType - case attachmentTooLarge - } -} diff --git a/ShareActionExtension/Scene/View/StatusAuthorView.swift b/ShareActionExtension/Scene/View/StatusAuthorView.swift deleted file mode 100644 index 24453abe2..000000000 --- a/ShareActionExtension/Scene/View/StatusAuthorView.swift +++ /dev/null @@ -1,45 +0,0 @@ -// -// StatusAuthorView.swift -// -// -// Created by MainasuK Cirno on 2021-7-16. -// - -import SwiftUI -import MastodonUI -import Nuke -import FLAnimatedImage - -struct StatusAuthorView: View { - - let avatarImageURL: URL? - let name: String - let username: String - - var body: some View { - HStack(spacing: 5) { - AnimatedImage(imageURL: avatarImageURL) - .frame(width: 42, height: 42) - .background(Color(UIColor.systemFill)) - .cornerRadius(4) - VStack(alignment: .leading) { - Text(name) - .font(.headline) - Text(username) - .font(.subheadline) - .foregroundColor(.secondary) - } - Spacer() - } - } -} - -struct StatusAuthorView_Previews: PreviewProvider { - static var previews: some View { - StatusAuthorView( - avatarImageURL: URL(string: "https://upload.wikimedia.org/wikipedia/commons/2/2c/Rotating_earth_%28large%29.gif"), - name: "Alice", - username: "alice" - ) - } -} diff --git a/ShareActionExtension/Scene/View/StatusEditorView.swift b/ShareActionExtension/Scene/View/StatusEditorView.swift deleted file mode 100644 index f670f6601..000000000 --- a/ShareActionExtension/Scene/View/StatusEditorView.swift +++ /dev/null @@ -1,105 +0,0 @@ -// -// StatusEditorView.swift -// -// -// Created by MainasuK Cirno on 2021-7-16. -// - -import UIKit -import SwiftUI -import UITextView_Placeholder - -public struct StatusEditorView: UIViewRepresentable { - - @Binding var string: String - let placeholder: String - let width: CGFloat - let attributedString: NSAttributedString - let keyboardType: UIKeyboardType - @Binding var viewDidAppear: Bool - - public init( - string: Binding, - placeholder: String, - width: CGFloat, - attributedString: NSAttributedString, - keyboardType: UIKeyboardType, - viewDidAppear: Binding - ) { - self._string = string - self.placeholder = placeholder - self.width = width - self.attributedString = attributedString - self.keyboardType = keyboardType - self._viewDidAppear = viewDidAppear - } - - public func makeUIView(context: Context) -> UITextView { - let textView = UITextView(frame: .zero) - textView.placeholder = placeholder - - textView.isScrollEnabled = false - textView.font = .preferredFont(forTextStyle: .body) - textView.textColor = .label - textView.keyboardType = keyboardType - textView.delegate = context.coordinator - textView.backgroundColor = .clear - - textView.translatesAutoresizingMaskIntoConstraints = false - let widthLayoutConstraint = textView.widthAnchor.constraint(equalToConstant: 100) - widthLayoutConstraint.priority = .required - 1 - context.coordinator.widthLayoutConstraint = widthLayoutConstraint - - return textView - } - - public func updateUIView(_ textView: UITextView, context: Context) { - // preserve currently selected text range to prevent cursor jump - let currentlySelectedRange = textView.selectedRange - - // update content - // textView.attributedText = attributedString - textView.text = string - - // update layout - context.coordinator.updateLayout(width: width) - - // set becomeFirstResponder - if viewDidAppear { - viewDidAppear = false - textView.becomeFirstResponder() - } - - // restore selected text range - textView.selectedRange = currentlySelectedRange - } - - public func makeCoordinator() -> Coordinator { - Coordinator(self) - } - - public class Coordinator: NSObject, UITextViewDelegate { - var parent: StatusEditorView - var widthLayoutConstraint: NSLayoutConstraint? - - init(_ parent: StatusEditorView) { - self.parent = parent - } - - public func textViewDidChange(_ textView: UITextView) { - // prevent break IME input - if textView.markedTextRange == nil { - parent.string = textView.text - } - } - - func updateLayout(width: CGFloat) { - guard let widthLayoutConstraint = widthLayoutConstraint else { return } - widthLayoutConstraint.constant = width - widthLayoutConstraint.isActive = true - } - } - -} - - diff --git a/swiftgen.yml b/swiftgen.yml index e9c21260a..967abe370 100644 --- a/swiftgen.yml +++ b/swiftgen.yml @@ -1,7 +1,7 @@ strings: inputs: - - MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings - - MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.stringsdict + - MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings + - MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.stringsdict outputs: - templateName: structured-swift5 output: MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift diff --git a/update_localization.sh b/update_localization.sh index 09cfc21d6..1a240c893 100755 --- a/update_localization.sh +++ b/update_localization.sh @@ -7,15 +7,29 @@ PODS_ROOT='Pods' echo ${SRCROOT} -# task 1 generate strings file +# Task 1 +# here we use the template source as input to +# generate strings so we could use new strings +# before sync to Crowdin + +# clean Base.lproj +rm -rf ${SRCROOT}/Localization/StringsConvertor/input/Base.lproj +# copy tempate sources +mkdir ${SRCROOT}/Localization/StringsConvertor/input/Base.lproj +cp ${SRCROOT}/Localization/app.json ${SRCROOT}/Localization/StringsConvertor/input/Base.lproj/app.json +cp ${SRCROOT}/Localization/ios-infoPlist.json ${SRCROOT}/Localization/StringsConvertor/input/Base.lproj/ios-infoPlist.json +cp ${SRCROOT}/Localization/Localizable.stringsdict ${SRCROOT}/Localization/StringsConvertor/input/Base.lproj/Localizable.stringsdict + +# Task 2 generate strings file cd ${SRCROOT}/Localization/StringsConvertor sh ./scripts/build.sh -# task 2 copy strings file +# Task 3 copy strings file +cp -R ${SRCROOT}/Localization/StringsConvertor/output/main/ ${SRCROOT}/Mastodon/Resources cp -R ${SRCROOT}/Localization/StringsConvertor/output/module/ ${SRCROOT}/MastodonSDK/Sources/MastodonLocalization/Resources cp -R ${SRCROOT}/Localization/StringsConvertor/Intents/output/ ${SRCROOT}/MastodonIntent -# task 3 swiftgen +# Task 4 swiftgen cd ${SRCROOT} echo "${PODS_ROOT}/SwiftGen/bin/swiftgen" if [[ -f "${PODS_ROOT}/SwiftGen/bin/swiftgen" ]] then @@ -24,6 +38,6 @@ else echo "Run 'bundle exec pod install' or update your CocoaPods installation." fi -#task 4 clean temp file +# Task 5 clean temp file rm -rf ${SRCROOT}/Localization/StringsConvertor/output rm -rf ${SRCROOT}/Localization/StringsConvertor/intents/output