diff --git a/composeApp/src/commonMain/composeResources/values/strings.xml b/composeApp/src/commonMain/composeResources/values/strings.xml index a333d26aa..41ee9af6e 100644 --- a/composeApp/src/commonMain/composeResources/values/strings.xml +++ b/composeApp/src/commonMain/composeResources/values/strings.xml @@ -475,5 +475,6 @@ Polski Português Română + Русский Українська diff --git a/composeApp/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/resources/SharedStrings.kt b/composeApp/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/resources/SharedStrings.kt index c0e2d0bf3..305e6bcd3 100644 --- a/composeApp/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/resources/SharedStrings.kt +++ b/composeApp/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/resources/SharedStrings.kt @@ -228,6 +228,7 @@ import raccoonforfriendica.composeapp.generated.resources.language_it import raccoonforfriendica.composeapp.generated.resources.language_pl import raccoonforfriendica.composeapp.generated.resources.language_pt import raccoonforfriendica.composeapp.generated.resources.language_ro +import raccoonforfriendica.composeapp.generated.resources.language_ru import raccoonforfriendica.composeapp.generated.resources.language_ua import raccoonforfriendica.composeapp.generated.resources.login_friendica_header import raccoonforfriendica.composeapp.generated.resources.login_mastodon_header @@ -872,6 +873,8 @@ class SharedStrings : Strings { @Composable get() = stringResource(Res.string.language_pt) override val languageRo: String @Composable get() = stringResource(Res.string.language_ro) + override val languageRu: String + @Composable get() = stringResource(Res.string.language_ru) override val languageUa: String @Composable get() = stringResource(Res.string.language_ua) override val loginFriendicaHeader: String diff --git a/core/l10n/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/Extensions.kt b/core/l10n/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/Extensions.kt index 25a19a875..0caa3ae06 100644 --- a/core/l10n/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/Extensions.kt +++ b/core/l10n/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/Extensions.kt @@ -15,6 +15,7 @@ fun String?.toLanguageName(): String? = Locales.PL -> LocalStrings.current.languagePl Locales.PT -> LocalStrings.current.languagePt Locales.RO -> LocalStrings.current.languageRo + Locales.RU -> LocalStrings.current.languageRu Locales.UA -> LocalStrings.current.languageUa else -> null } @@ -36,6 +37,7 @@ fun String?.toLanguageFlag(): String? = Locales.PL -> "🇵🇱" Locales.PT -> "🇵🇹" Locales.RO -> "🇷🇴" + Locales.RU -> "🇷🇺" Locales.UA -> "🇺🇦" else -> null } diff --git a/core/l10n/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/Locales.kt b/core/l10n/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/Locales.kt index a1ad8135d..8f61d933e 100644 --- a/core/l10n/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/Locales.kt +++ b/core/l10n/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/Locales.kt @@ -10,6 +10,7 @@ object Locales { const val PL = "pl" const val PT = "pt" const val RO = "ro" + const val RU = "ru" const val UA = "ua" val AVAILABLE_LANGUAGES = @@ -23,6 +24,7 @@ object Locales { PL, PT, RO, + RU, UA, ) } diff --git a/core/l10n/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/Strings.kt b/core/l10n/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/Strings.kt index 70707642a..cbb2b2e56 100644 --- a/core/l10n/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/Strings.kt +++ b/core/l10n/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/Strings.kt @@ -216,6 +216,7 @@ interface Strings { val languagePl: String @Composable get val languagePt: String @Composable get val languageRo: String @Composable get + val languageRu: String @Composable get val languageUa: String @Composable get val loginFriendicaHeader: String @Composable get val loginMastodonHeader: String @Composable get diff --git a/core/l10n/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/testutils/MockStrings.kt b/core/l10n/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/testutils/MockStrings.kt index 9623cff65..a0b861cc2 100644 --- a/core/l10n/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/testutils/MockStrings.kt +++ b/core/l10n/src/commonMain/kotlin/com/livefast/eattrash/raccoonforfriendica/core/l10n/testutils/MockStrings.kt @@ -439,6 +439,8 @@ class MockStrings : Strings { @Composable get() = retrieve("languagePt") override val languageRo: String @Composable get() = retrieve("languageRo") + override val languageRu: String + @Composable get() = retrieve("languageRu") override val languageUa: String @Composable get() = retrieve("languageUa") override val loginFriendicaHeader: String diff --git a/docs/index.md b/docs/index.md index c33262b5a..e6a824cdb 100644 --- a/docs/index.md +++ b/docs/index.md @@ -98,7 +98,9 @@ A special thanks goes to all those who contributed so far: - [N7-X](https://github.com/N7-X) - [pvagner](https://github.com/pvagner) - [toas-koas](https://github.com/toas-koas) +- [gnu-ewm](https://hosted.weblate.org/user/gnu-ewm) - [ktlinux](https://hosted.weblate.org/user/ktlinux) +- [Fitik](https://hosted.weblate.org/user/11mancookie11/) - all those who reported feedback and ideas through Friendica, Mastodon, GitHub, emails, private messages, homing pigeons and every possibly imaginable medium. diff --git a/docs/static/acknowledgements.json b/docs/static/acknowledgements.json index 54a775d9c..e58ecd800 100644 --- a/docs/static/acknowledgements.json +++ b/docs/static/acknowledgements.json @@ -40,5 +40,11 @@ "avatar": "https://hosted.weblate.org/avatar/128/ktlinux.png", "subtitle": "Translator (ro)", "url": "https://hosted.weblate.org/user/ktlinux/" + }, + { + "title": "Fitik", + "avatar": "https://hosted.weblate.org/avatar/128/11mancookie11.png", + "subtitle": "Translator (ru)", + "url": "https://hosted.weblate.org/user/11mancookie11/" } ]