mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2026-05-12 06:34:59 +00:00
ui: different preference texts for channels (#6889)
* ios: different preference texts for channels * fix * ios translations * export localizations * restore translations * fix ExternalLink, process localizations * kotlin: different strings for channel preferences * add translations * different strings for channels * export localizations --------- Co-authored-by: Evgeny Poberezkin <evgeny@poberezkin.com>
This commit is contained in:
Evgeny @ SimpleX Chat
committed by
GitHub
GitHub
parent
63c278818e
commit
3d04ff9560
+22
-21
@@ -5715,8 +5715,9 @@ enum class GroupFeature: Feature {
|
||||
Support -> false
|
||||
}
|
||||
|
||||
override val text: String
|
||||
get() = when(this) {
|
||||
override val text: String get() = text(isChannel = false)
|
||||
|
||||
fun text(isChannel: Boolean): String = when(this) {
|
||||
TimedMessages -> generalGetString(MR.strings.timed_messages)
|
||||
DirectMessages -> generalGetString(MR.strings.direct_messages)
|
||||
FullDelete -> generalGetString(MR.strings.full_deletion)
|
||||
@@ -5724,7 +5725,7 @@ enum class GroupFeature: Feature {
|
||||
Voice -> generalGetString(MR.strings.voice_messages)
|
||||
Files -> generalGetString(MR.strings.files_and_media)
|
||||
SimplexLinks -> generalGetString(MR.strings.simplex_links)
|
||||
Reports -> generalGetString(MR.strings.group_reports_member_reports)
|
||||
Reports -> generalGetString(if (isChannel) MR.strings.group_reports_subscriber_reports else MR.strings.group_reports_member_reports)
|
||||
History -> generalGetString(MR.strings.recent_history)
|
||||
Support -> generalGetString(MR.strings.chat_with_admins)
|
||||
}
|
||||
@@ -5757,7 +5758,7 @@ enum class GroupFeature: Feature {
|
||||
Support -> painterResource(MR.images.ic_help_filled)
|
||||
}
|
||||
|
||||
fun enableDescription(enabled: GroupFeatureEnabled, canEdit: Boolean): String =
|
||||
fun enableDescription(enabled: GroupFeatureEnabled, canEdit: Boolean, isChannel: Boolean = false): String =
|
||||
if (canEdit) {
|
||||
when(this) {
|
||||
TimedMessages -> when(enabled) {
|
||||
@@ -5765,8 +5766,8 @@ enum class GroupFeature: Feature {
|
||||
GroupFeatureEnabled.OFF -> generalGetString(MR.strings.prohibit_sending_disappearing)
|
||||
}
|
||||
DirectMessages -> when(enabled) {
|
||||
GroupFeatureEnabled.ON -> generalGetString(MR.strings.allow_direct_messages)
|
||||
GroupFeatureEnabled.OFF -> generalGetString(MR.strings.prohibit_direct_messages)
|
||||
GroupFeatureEnabled.ON -> generalGetString(if (isChannel) MR.strings.allow_direct_messages_channel else MR.strings.allow_direct_messages)
|
||||
GroupFeatureEnabled.OFF -> generalGetString(if (isChannel) MR.strings.prohibit_direct_messages_channel else MR.strings.prohibit_direct_messages)
|
||||
}
|
||||
FullDelete -> when(enabled) {
|
||||
GroupFeatureEnabled.ON -> generalGetString(MR.strings.allow_to_delete_messages)
|
||||
@@ -5793,54 +5794,54 @@ enum class GroupFeature: Feature {
|
||||
GroupFeatureEnabled.OFF -> generalGetString(MR.strings.disable_sending_member_reports)
|
||||
}
|
||||
History -> when(enabled) {
|
||||
GroupFeatureEnabled.ON -> generalGetString(MR.strings.enable_sending_recent_history)
|
||||
GroupFeatureEnabled.OFF -> generalGetString(MR.strings.disable_sending_recent_history)
|
||||
GroupFeatureEnabled.ON -> generalGetString(if (isChannel) MR.strings.enable_sending_recent_history_channel else MR.strings.enable_sending_recent_history)
|
||||
GroupFeatureEnabled.OFF -> generalGetString(if (isChannel) MR.strings.disable_sending_recent_history_channel else MR.strings.disable_sending_recent_history)
|
||||
}
|
||||
Support -> when(enabled) {
|
||||
GroupFeatureEnabled.ON -> generalGetString(MR.strings.allow_chat_with_admins)
|
||||
GroupFeatureEnabled.ON -> generalGetString(if (isChannel) MR.strings.allow_chat_with_admins_channel else MR.strings.allow_chat_with_admins)
|
||||
GroupFeatureEnabled.OFF -> generalGetString(MR.strings.prohibit_chat_with_admins)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
when(this) {
|
||||
TimedMessages -> when(enabled) {
|
||||
GroupFeatureEnabled.ON -> generalGetString(MR.strings.group_members_can_send_disappearing)
|
||||
GroupFeatureEnabled.ON -> generalGetString(if (isChannel) MR.strings.group_members_can_send_disappearing_channel else MR.strings.group_members_can_send_disappearing)
|
||||
GroupFeatureEnabled.OFF -> generalGetString(MR.strings.disappearing_messages_are_prohibited)
|
||||
}
|
||||
DirectMessages -> when(enabled) {
|
||||
GroupFeatureEnabled.ON -> generalGetString(MR.strings.group_members_can_send_dms)
|
||||
GroupFeatureEnabled.OFF -> generalGetString(MR.strings.direct_messages_are_prohibited)
|
||||
GroupFeatureEnabled.ON -> generalGetString(if (isChannel) MR.strings.group_members_can_send_dms_channel else MR.strings.group_members_can_send_dms)
|
||||
GroupFeatureEnabled.OFF -> generalGetString(if (isChannel) MR.strings.direct_messages_are_prohibited_channel else MR.strings.direct_messages_are_prohibited)
|
||||
}
|
||||
FullDelete -> when(enabled) {
|
||||
GroupFeatureEnabled.ON -> generalGetString(MR.strings.group_members_can_delete)
|
||||
GroupFeatureEnabled.ON -> generalGetString(if (isChannel) MR.strings.group_members_can_delete_channel else MR.strings.group_members_can_delete)
|
||||
GroupFeatureEnabled.OFF -> generalGetString(MR.strings.message_deletion_prohibited_in_chat)
|
||||
}
|
||||
Reactions -> when(enabled) {
|
||||
GroupFeatureEnabled.ON -> generalGetString(MR.strings.group_members_can_add_message_reactions)
|
||||
GroupFeatureEnabled.ON -> generalGetString(if (isChannel) MR.strings.group_members_can_add_message_reactions_channel else MR.strings.group_members_can_add_message_reactions)
|
||||
GroupFeatureEnabled.OFF -> generalGetString(MR.strings.message_reactions_are_prohibited)
|
||||
}
|
||||
Voice -> when(enabled) {
|
||||
GroupFeatureEnabled.ON -> generalGetString(MR.strings.group_members_can_send_voice)
|
||||
GroupFeatureEnabled.ON -> generalGetString(if (isChannel) MR.strings.group_members_can_send_voice_channel else MR.strings.group_members_can_send_voice)
|
||||
GroupFeatureEnabled.OFF -> generalGetString(MR.strings.voice_messages_are_prohibited)
|
||||
}
|
||||
Files -> when(enabled) {
|
||||
GroupFeatureEnabled.ON -> generalGetString(MR.strings.group_members_can_send_files)
|
||||
GroupFeatureEnabled.ON -> generalGetString(if (isChannel) MR.strings.group_members_can_send_files_channel else MR.strings.group_members_can_send_files)
|
||||
GroupFeatureEnabled.OFF -> generalGetString(MR.strings.files_are_prohibited_in_group)
|
||||
}
|
||||
SimplexLinks -> when(enabled) {
|
||||
GroupFeatureEnabled.ON -> generalGetString(MR.strings.group_members_can_send_simplex_links)
|
||||
GroupFeatureEnabled.ON -> generalGetString(if (isChannel) MR.strings.group_members_can_send_simplex_links_channel else MR.strings.group_members_can_send_simplex_links)
|
||||
GroupFeatureEnabled.OFF -> generalGetString(MR.strings.simplex_links_are_prohibited_in_group)
|
||||
}
|
||||
Reports -> when(enabled) {
|
||||
GroupFeatureEnabled.ON -> generalGetString(MR.strings.group_members_can_send_reports)
|
||||
GroupFeatureEnabled.ON -> generalGetString(if (isChannel) MR.strings.group_members_can_send_reports_channel else MR.strings.group_members_can_send_reports)
|
||||
GroupFeatureEnabled.OFF -> generalGetString(MR.strings.member_reports_are_prohibited)
|
||||
}
|
||||
History -> when(enabled) {
|
||||
GroupFeatureEnabled.ON -> generalGetString(MR.strings.recent_history_is_sent_to_new_members)
|
||||
GroupFeatureEnabled.OFF -> generalGetString(MR.strings.recent_history_is_not_sent_to_new_members)
|
||||
GroupFeatureEnabled.ON -> generalGetString(if (isChannel) MR.strings.recent_history_is_sent_to_new_members_channel else MR.strings.recent_history_is_sent_to_new_members)
|
||||
GroupFeatureEnabled.OFF -> generalGetString(if (isChannel) MR.strings.recent_history_is_not_sent_to_new_members_channel else MR.strings.recent_history_is_not_sent_to_new_members)
|
||||
}
|
||||
Support -> when(enabled) {
|
||||
GroupFeatureEnabled.ON -> generalGetString(MR.strings.members_can_chat_with_admins)
|
||||
GroupFeatureEnabled.ON -> generalGetString(if (isChannel) MR.strings.members_can_chat_with_admins_channel else MR.strings.members_can_chat_with_admins)
|
||||
GroupFeatureEnabled.OFF -> generalGetString(MR.strings.chat_with_admins_is_prohibited)
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -267,7 +267,7 @@ private fun FeatureSection(
|
||||
val timedOn = feature == GroupFeature.TimedMessages && enableFeature.value == GroupFeatureEnabled.ON
|
||||
if (groupInfo.isOwner) {
|
||||
PreferenceToggleWithIcon(
|
||||
feature.text,
|
||||
feature.text(groupInfo.isChannel),
|
||||
icon,
|
||||
iconTint,
|
||||
disabled = disabled,
|
||||
@@ -299,7 +299,7 @@ private fun FeatureSection(
|
||||
}
|
||||
} else {
|
||||
InfoRow(
|
||||
feature.text,
|
||||
feature.text(groupInfo.isChannel),
|
||||
enableFeature.value.text,
|
||||
icon = icon,
|
||||
iconTint = iconTint,
|
||||
@@ -317,7 +317,7 @@ private fun FeatureSection(
|
||||
onSelected(enableFeature.value, null)
|
||||
}
|
||||
}
|
||||
SectionTextFooter(feature.enableDescription(enableFeature.value, groupInfo.isOwner))
|
||||
SectionTextFooter(feature.enableDescription(enableFeature.value, groupInfo.isOwner, groupInfo.isChannel))
|
||||
if (notice != null) {
|
||||
SectionTextFooter(notice)
|
||||
}
|
||||
|
||||
@@ -2345,6 +2345,27 @@
|
||||
<string name="chat_with_admins_relay_note">Chats with admins in public channels have no E2E encryption - use only with trusted chat relays.</string>
|
||||
<string name="enable_chats_with_admins_question">Enable chats with admins?</string>
|
||||
<string name="enable_chats_with_admins">Enable</string>
|
||||
|
||||
<!-- channel preference descriptions (subscribers) -->
|
||||
<string name="group_reports_subscriber_reports">Subscriber reports</string>
|
||||
<string name="allow_direct_messages_channel">Allow sending direct messages to subscribers.</string>
|
||||
<string name="prohibit_direct_messages_channel">Prohibit sending direct messages to subscribers.</string>
|
||||
<string name="enable_sending_recent_history_channel">Send up to 100 last messages to new subscribers.</string>
|
||||
<string name="disable_sending_recent_history_channel">Do not send history to new subscribers.</string>
|
||||
<string name="group_members_can_send_disappearing_channel">Subscribers can send disappearing messages.</string>
|
||||
<string name="group_members_can_send_dms_channel">Subscribers can send direct messages.</string>
|
||||
<string name="direct_messages_are_prohibited_channel">Direct messages between subscribers are prohibited.</string>
|
||||
<string name="group_members_can_delete_channel">Subscribers can irreversibly delete sent messages. (24 hours)</string>
|
||||
<string name="group_members_can_add_message_reactions_channel">Subscribers can add message reactions.</string>
|
||||
<string name="group_members_can_send_voice_channel">Subscribers can send voice messages.</string>
|
||||
<string name="group_members_can_send_files_channel">Subscribers can send files and media.</string>
|
||||
<string name="group_members_can_send_simplex_links_channel">Subscribers can send SimpleX links.</string>
|
||||
<string name="group_members_can_send_reports_channel">Subscribers can report messsages to moderators.</string>
|
||||
<string name="recent_history_is_sent_to_new_members_channel">Up to 100 last messages are sent to new subscribers.</string>
|
||||
<string name="recent_history_is_not_sent_to_new_members_channel">History is not sent to new subscribers.</string>
|
||||
<string name="allow_chat_with_admins_channel">Allow subscribers to chat with admins.</string>
|
||||
<string name="members_can_chat_with_admins_channel">Subscribers can chat with admins.</string>
|
||||
|
||||
<string name="delete_after">Delete after</string>
|
||||
<string name="ttl_sec">%d sec</string>
|
||||
<string name="ttl_s">%ds</string>
|
||||
|
||||
@@ -2821,4 +2821,22 @@
|
||||
<string name="onboarding_post_address">Diese Adresse in Ihrem Social‑Media‑Profil, auf Ihrer Webseite oder in Ihrer E‑Mail‑Signatur verwenden.</string>
|
||||
<string name="v6_5_invite_friends_descr">Wir haben das Verbinden für neue Nutzer vereinfacht.</string>
|
||||
<string name="your_public_address">Ihre öffentliche Adresse</string>
|
||||
|
||||
<!-- channel preferences (subscribers) -->
|
||||
<string name="group_reports_subscriber_reports">Abonnenten-Meldungen</string>
|
||||
<string name="allow_direct_messages_channel">Das Senden von Direktnachrichten an Abonnenten erlauben.</string>
|
||||
<string name="prohibit_direct_messages_channel">Das Senden von Direktnachrichten an Abonnenten nicht erlauben.</string>
|
||||
<string name="enable_sending_recent_history_channel">Bis zu 100 der letzten Nachrichten an neue Abonnenten senden.</string>
|
||||
<string name="disable_sending_recent_history_channel">Den Nachrichtenverlauf nicht an neue Abonnenten senden.</string>
|
||||
<string name="group_members_can_send_disappearing_channel">Abonnenten können verschwindende Nachrichten versenden.</string>
|
||||
<string name="group_members_can_send_dms_channel">Abonnenten können Direktnachrichten versenden.</string>
|
||||
<string name="direct_messages_are_prohibited_channel">Direktnachrichten zwischen Abonnenten sind nicht erlaubt.</string>
|
||||
<string name="group_members_can_delete_channel">Abonnenten können gesendete Nachrichten unwiederbringlich löschen. (24 Stunden)</string>
|
||||
<string name="group_members_can_add_message_reactions_channel">Abonnenten können eine Reaktion auf Nachrichten geben.</string>
|
||||
<string name="group_members_can_send_voice_channel">Abonnenten können Sprachnachrichten versenden.</string>
|
||||
<string name="group_members_can_send_files_channel">Abonnenten können Dateien und Medien versenden.</string>
|
||||
<string name="group_members_can_send_simplex_links_channel">Abonnenten können SimpleX-Links versenden.</string>
|
||||
<string name="group_members_can_send_reports_channel">Abonnenten können Nachrichten an Moderatoren melden.</string>
|
||||
<string name="recent_history_is_sent_to_new_members_channel">Bis zu 100 der letzten Nachrichten werden an neue Abonnenten gesendet.</string>
|
||||
<string name="recent_history_is_not_sent_to_new_members_channel">Der Nachrichtenverlauf wird nicht an neue Abonnenten gesendet.</string>
|
||||
</resources>
|
||||
|
||||
@@ -2680,4 +2680,22 @@
|
||||
<string name="your_relay_name">Tu nombre del servidor</string>
|
||||
<string name="you_will_stop_receiving_messages_from_this_channel_chat_history_will_be_preserved">Dejarás de recibir mensajes de este canal. El historial del chat se conservará.</string>
|
||||
<string name="member_info_member_failed">fallo</string>
|
||||
|
||||
<!-- channel preferences (subscribers) -->
|
||||
<string name="group_reports_subscriber_reports">Informes de suscriptores</string>
|
||||
<string name="allow_direct_messages_channel">Se permiten mensajes directos entre suscriptores.</string>
|
||||
<string name="prohibit_direct_messages_channel">No se permiten mensajes directos entre suscriptores.</string>
|
||||
<string name="enable_sending_recent_history_channel">Se envían hasta 100 mensajes más recientes a los suscriptores nuevos.</string>
|
||||
<string name="disable_sending_recent_history_channel">No se envía el historial a los suscriptores nuevos.</string>
|
||||
<string name="group_members_can_send_disappearing_channel">Los suscriptores del canal pueden enviar mensajes temporales.</string>
|
||||
<string name="group_members_can_send_dms_channel">Los suscriptores del canal pueden enviar mensajes directos.</string>
|
||||
<string name="direct_messages_are_prohibited_channel">Los mensajes directos entre suscriptores del canal no están permitidos.</string>
|
||||
<string name="group_members_can_delete_channel">Los suscriptores del canal pueden eliminar mensajes de forma irreversible. (24 horas)</string>
|
||||
<string name="group_members_can_add_message_reactions_channel">Los suscriptores pueden añadir reacciones a los mensajes.</string>
|
||||
<string name="group_members_can_send_voice_channel">Los suscriptores del canal pueden enviar mensajes de voz.</string>
|
||||
<string name="group_members_can_send_files_channel">Los suscriptores del canal pueden enviar archivos y multimedia.</string>
|
||||
<string name="group_members_can_send_simplex_links_channel">Los suscriptores del canal pueden enviar enlaces SimpleX.</string>
|
||||
<string name="group_members_can_send_reports_channel">Los suscriptores pueden informar de mensajes a los moderadores.</string>
|
||||
<string name="recent_history_is_sent_to_new_members_channel">Hasta 100 últimos mensajes son enviados a los suscriptores nuevos.</string>
|
||||
<string name="recent_history_is_not_sent_to_new_members_channel">El historial no se envía a suscriptores nuevos.</string>
|
||||
</resources>
|
||||
|
||||
@@ -2714,4 +2714,22 @@
|
||||
<string name="v6_5_security">Biztonság: a csatornák kulcsait a tulajdonosok őrzik.</string>
|
||||
<string name="v6_5_non_profit_governance_descr">A SimpleX hálózat hosszú távú működésének biztosítása érdekében.</string>
|
||||
<string name="v6_5_invite_friends_descr">Az új felhasználók számára egyszerűbbé tettük a kapcsolatok létrehozását.</string>
|
||||
|
||||
<!-- channel preferences (subscribers) -->
|
||||
<string name="group_reports_subscriber_reports">Feliratkozók jelentései</string>
|
||||
<string name="allow_direct_messages_channel">A közvetlen üzenetek küldése a feliratkozók között engedélyezve van.</string>
|
||||
<string name="prohibit_direct_messages_channel">A közvetlen üzenetek küldése a feliratkozók között le van tiltva.</string>
|
||||
<string name="enable_sending_recent_history_channel">Legfeljebb az utolsó 100 üzenet elküldése az új feliratkozók számára.</string>
|
||||
<string name="disable_sending_recent_history_channel">Az előzmények ne legyenek elküldve az új feliratkozók számára.</string>
|
||||
<string name="group_members_can_send_disappearing_channel">A feliratkozók küldhetnek eltűnő üzeneteket.</string>
|
||||
<string name="group_members_can_send_dms_channel">A feliratkozók küldhetnek egymásnak közvetlen üzeneteket.</string>
|
||||
<string name="direct_messages_are_prohibited_channel">A feliratkozók közötti közvetlen üzenetek le vannak tiltva.</string>
|
||||
<string name="group_members_can_delete_channel">A feliratkozók véglegesen törölhetik az elküldött üzeneteiket. (24 óra)</string>
|
||||
<string name="group_members_can_add_message_reactions_channel">A feliratkozók reakciókat adhatnak hozzá az üzenetekhez.</string>
|
||||
<string name="group_members_can_send_voice_channel">A feliratkozók küldhetnek hangüzeneteket.</string>
|
||||
<string name="group_members_can_send_files_channel">A feliratkozók küldhetnek fájlokat és médiatartalmakat.</string>
|
||||
<string name="group_members_can_send_simplex_links_channel">A feliratkozók küldhetnek SimpleX-hivatkozásokat.</string>
|
||||
<string name="group_members_can_send_reports_channel">A feliratkozók jelenthetik az üzeneteket a moderátorok felé.</string>
|
||||
<string name="recent_history_is_sent_to_new_members_channel">Legfeljebb az utolsó 100 üzenet lesz elküldve az új feliratkozók számára.</string>
|
||||
<string name="recent_history_is_not_sent_to_new_members_channel">Az előzmények nem lesznek elküldve az új feliratkozók számára.</string>
|
||||
</resources>
|
||||
|
||||
@@ -2750,4 +2750,22 @@
|
||||
<string name="v6_5_safe_web_links">Link web sicuri</string>
|
||||
<string name="v6_5_security">Sicurezza: solo i proprietari hanno le chiavi del canale.</string>
|
||||
<string name="v6_5_invite_friends_descr">Abbiamo semplificato la connessione per i nuovi utenti.</string>
|
||||
|
||||
<!-- channel preferences (subscribers) -->
|
||||
<string name="group_reports_subscriber_reports">Segnalazioni degli iscritti</string>
|
||||
<string name="allow_direct_messages_channel">Permetti l\'invio di messaggi diretti agli iscritti.</string>
|
||||
<string name="prohibit_direct_messages_channel">Proibisci l\'invio di messaggi diretti agli iscritti.</string>
|
||||
<string name="enable_sending_recent_history_channel">Invia fino a 100 ultimi messaggi ai nuovi iscritti.</string>
|
||||
<string name="disable_sending_recent_history_channel">Non inviare la cronologia ai nuovi iscritti.</string>
|
||||
<string name="group_members_can_send_disappearing_channel">Gli iscritti al canale possono inviare messaggi a tempo.</string>
|
||||
<string name="group_members_can_send_dms_channel">Gli iscritti al canale possono inviare messaggi diretti.</string>
|
||||
<string name="direct_messages_are_prohibited_channel">I messaggi diretti tra gli iscritti sono vietati.</string>
|
||||
<string name="group_members_can_delete_channel">Gli iscritti al canale possono eliminare irreversibilmente i messaggi inviati. (24 ore)</string>
|
||||
<string name="group_members_can_add_message_reactions_channel">Gli iscritti al canale possono aggiungere reazioni ai messaggi.</string>
|
||||
<string name="group_members_can_send_voice_channel">Gli iscritti al canale possono inviare messaggi vocali.</string>
|
||||
<string name="group_members_can_send_files_channel">Gli iscritti al canale possono inviare file e contenuti multimediali.</string>
|
||||
<string name="group_members_can_send_simplex_links_channel">Gli iscritti al canale possono inviare link di Simplex.</string>
|
||||
<string name="group_members_can_send_reports_channel">Gli iscritti possono segnalare messaggi ai moderatori.</string>
|
||||
<string name="recent_history_is_sent_to_new_members_channel">Vengono inviati ai nuovi iscritti fino a 100 ultimi messaggi.</string>
|
||||
<string name="recent_history_is_not_sent_to_new_members_channel">La cronologia non viene inviata ai nuovi iscritti.</string>
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user