IntenseFinance/simplex-chat
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mobile: change role item texts, uncomment button (#1241)

Browse Source 
* mobile: change role item texts, uncomment button

* Update apps/android/app/src/main/res/values-de/strings.xml

Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>

Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
This commit is contained in:
JRoberts
2022-10-22 18:40:21 +04:00
committed by GitHub
parent 1dca577ca8
commit d0a0a0461f
13 changed files with 180 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt
View File

@@ -1554,8 +1554,8 @@ sealed class RcvGroupEvent() {
is MemberAdded -> String.format(generalGetString(R.string.rcv_group_event_member_added), profile.profileViewName)
is MemberConnected -> generalGetString(R.string.rcv_group_event_member_connected)
is MemberLeft -> generalGetString(R.string.rcv_group_event_member_left)
is MemberRole -> String.format(generalGetString(R.string.member_role), profile.profileViewName, role.text)
is UserRole -> String.format(generalGetString(R.string.your_member_role), role.text)
is MemberRole -> String.format(generalGetString(R.string.rcv_group_event_changed_member_role), profile.profileViewName, role.text)
is UserRole -> String.format(generalGetString(R.string.rcv_group_event_changed_your_role), role.text)
is MemberDeleted -> String.format(generalGetString(R.string.rcv_group_event_member_deleted), profile.profileViewName)
is UserDeleted -> generalGetString(R.string.rcv_group_event_user_deleted)
is GroupDeleted -> generalGetString(R.string.rcv_group_event_group_deleted)
@@ -1573,8 +1573,8 @@ sealed class SndGroupEvent() {
@Serializable @SerialName("groupUpdated") class GroupUpdated(val groupProfile: GroupProfile): SndGroupEvent()
val text: String get() = when (this) {
is MemberRole -> String.format(generalGetString(R.string.member_role), profile.profileViewName, role.text)
is UserRole -> String.format(generalGetString(R.string.your_member_role), role.text)
is MemberRole -> String.format(generalGetString(R.string.snd_group_event_changed_member_role), profile.profileViewName, role.text)
is UserRole -> String.format(generalGetString(R.string.snd_group_event_changed_role_for_yourself), role.text)
is MemberDeleted -> String.format(generalGetString(R.string.snd_group_event_member_deleted), profile.profileViewName)
is UserLeft -> generalGetString(R.string.snd_group_event_user_left)
is GroupUpdated -> generalGetString(R.string.snd_group_event_group_profile_updated)

6
apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupMemberInfoView.kt
View File

@@ -136,14 +136,14 @@ fun GroupMemberInfoLayout(
SectionView(title = stringResource(R.string.member_info_section_title_member)) {
InfoRow(stringResource(R.string.info_row_group), groupInfo.displayName)
SectionDivider()
/*val roles = remember { member.canChangeRoleTo(groupInfo) }
val roles = remember { member.canChangeRoleTo(groupInfo) }
if (roles != null) {
SectionItemView {
RoleSelectionRow(roles, newRole, onRoleSelected)
}
} else {*/
} else {
InfoRow(stringResource(R.string.role_in_group), member.memberRole.text)
//}
}
val conn = member.activeConn
if (conn != null) {
SectionDivider()

18
apps/android/app/src/main/res/values-de/strings.xml
View File

@@ -706,17 +706,21 @@
<string name="group_invitation_expired">Die Gruppeneinladung ist abgelaufen</string>
<!-- Group event chat items -->
<string name="rcv_group_event_member_added">Sie haben <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g> eingeladen.</string>
<string name="rcv_group_event_member_added">***sie haben <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g> eingeladen.</string>
<string name="rcv_group_event_member_connected">verbunden</string>
<string name="rcv_group_event_member_left">verlassen</string>
<string name="rcv_group_event_changed_member_role">***changed role of %s to %s</string>
<string name="rcv_group_event_changed_your_role">***changed your role to %s</string>
<string name="rcv_group_event_member_deleted">entfernte <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g>.</string>
<string name="rcv_group_event_user_deleted">hat Sie entfernt</string>
<string name="rcv_group_event_group_deleted">Gruppe gelöscht</string>
<string name="rcv_group_event_updated_group_profile">aktualisiertes Gruppenprofil</string>
<string name="rcv_group_event_group_deleted">gruppe gelöscht</string>
<string name="rcv_group_event_updated_group_profile">aktualisiertes gruppenprofil</string>
<string name="rcv_group_event_invited_via_your_group_link">***invited via your group link</string>
<string name="snd_group_event_member_deleted">Sie haben <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g> entfernt.</string>
<string name="snd_group_event_user_left">Sie haben verlassen</string>
<string name="snd_group_event_group_profile_updated">Gruppenprofil aktualisiert</string>
<string name="snd_group_event_changed_member_role">***you changed role of %s to %s</string>
<string name="snd_group_event_changed_role_for_yourself">***you changed role for yourself to %s</string>
<string name="snd_group_event_member_deleted">sie haben <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g> entfernt.</string>
<string name="snd_group_event_user_left">sie haben verlassen</string>
<string name="snd_group_event_group_profile_updated">gruppenprofil aktualisiert</string>
<!-- GroupMemberRole -->
<string name="group_member_role_member">Mitglied</string>
@@ -790,8 +794,6 @@
<string name="member_role_will_be_changed_with_invitation">Die Mitgliederrolle wird auf \"%s\" geändert. Das Mitglied wird eine neue Einladung erhalten.</string>
<string name="error_removing_member">Fehler beim Entfernen des Mitglieds</string>
<string name="error_changing_role">Fehler beim Ändern der Rolle</string>
<string name="member_role">Mitglieder %s Rolle: %s</string>
<string name="your_member_role">Meine Rolle: %s</string>
<string name="info_row_group">Gruppe</string>
<string name="info_row_connection">Verbindung</string>
<string name="conn_level_desc_direct">direkt</string>

6
apps/android/app/src/main/res/values-ru/strings.xml
View File

@@ -709,11 +709,15 @@
<string name="rcv_group_event_member_added">пригласил(а) <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
<string name="rcv_group_event_member_connected">соединен(а)</string>
<string name="rcv_group_event_member_left">покинул(а) группу</string>
<string name="rcv_group_event_changed_member_role">поменял(а) роль члена %s на: %s</string>
<string name="rcv_group_event_changed_your_role">поменял(а) вашу роль на: %s</string>
<string name="rcv_group_event_member_deleted">удалил(а) <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
<string name="rcv_group_event_user_deleted">удалил(а) вас из группы</string>
<string name="rcv_group_event_group_deleted">удалил(а) группу</string>
<string name="rcv_group_event_updated_group_profile">обновил(а) профиль группы</string>
<string name="rcv_group_event_invited_via_your_group_link">приглашен(а) через вашу ссылку группы</string>
<string name="snd_group_event_changed_member_role">вы поменяли роль члена %s на: %s</string>
<string name="snd_group_event_changed_role_for_yourself">вы поменяли роль себе на: %s</string>
<string name="snd_group_event_member_deleted">вы удалили <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
<string name="snd_group_event_user_left">вы покинули группу</string>
<string name="snd_group_event_group_profile_updated">профиль группы обновлен</string>
@@ -790,8 +794,6 @@
<string name="member_role_will_be_changed_with_invitation">Роль будет изменена на \"%s\". Будет отправлено новое приглашение.</string>
<string name="error_removing_member">Ошибка при удалении члена группы</string>
<string name="error_changing_role">Ошибка при изменении роли</string>
<string name="member_role">роль %s: %s</string>
<string name="your_member_role">ваша роль: %s</string>
<string name="info_row_group">Группа</string>
<string name="info_row_connection">Соединение</string>
<string name="conn_level_desc_direct">прямое</string>

6
apps/android/app/src/main/res/values/strings.xml
View File

@@ -709,11 +709,15 @@
<string name="rcv_group_event_member_added">invited <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
<string name="rcv_group_event_member_connected">connected</string>
<string name="rcv_group_event_member_left">left</string>
<string name="rcv_group_event_changed_member_role">changed role of %s to %s</string>
<string name="rcv_group_event_changed_your_role">changed your role to %s</string>
<string name="rcv_group_event_member_deleted">removed <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
<string name="rcv_group_event_user_deleted">removed you</string>
<string name="rcv_group_event_group_deleted">deleted group</string>
<string name="rcv_group_event_updated_group_profile">updated group profile</string>
<string name="rcv_group_event_invited_via_your_group_link">invited via your group link</string>
<string name="snd_group_event_changed_member_role">you changed role of %s to %s</string>
<string name="snd_group_event_changed_role_for_yourself">you changed role for yourself to %s</string>
<string name="snd_group_event_member_deleted">you removed <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
<string name="snd_group_event_user_left">you left</string>
<string name="snd_group_event_group_profile_updated">group profile updated</string>
@@ -790,8 +794,6 @@
<string name="member_role_will_be_changed_with_invitation">The role will be changed to \"%s\". The member will receive a new invitation.</string>
<string name="error_removing_member">Error removing member</string>
<string name="error_changing_role">Error changing role</string>
<string name="member_role">member %s role: %s</string>
<string name="your_member_role">your role: %s</string>
<string name="info_row_group">Group</string>
<string name="info_row_connection">Connection</string>
<string name="conn_level_desc_direct">direct</string>

42
apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift
View File

@@ -48,27 +48,27 @@ struct GroupMemberInfoView: View {
Section("Member") {
infoRow("Group", groupInfo.displayName)
// HStack {
// if let roles = member.canChangeRoleTo(groupInfo: groupInfo) {
// Picker("Change role", selection: $newRole) {
// ForEach(roles) { role in
// Text(role.text)
// .foregroundStyle(.secondary)
// }
// }
// } else {
// Text("Role")
// Spacer()
// Text(member.memberRole.text)
// .foregroundStyle(.secondary)
// }
// }
// .onAppear { newRole = member.memberRole }
// .onChange(of: newRole) { _ in
// if newRole != member.memberRole {
// alert = .changeMemberRoleAlert(role: newRole)
// }
// }
HStack {
if let roles = member.canChangeRoleTo(groupInfo: groupInfo) {
Picker("Change role", selection: $newRole) {
ForEach(roles) { role in
Text(role.text)
.foregroundStyle(.secondary)
}
}
} else {
Text("Role")
Spacer()
Text(member.memberRole.text)
.foregroundStyle(.secondary)
}
}
.onAppear { newRole = member.memberRole }
.onChange(of: newRole) { _ in
if newRole != member.memberRole {
alert = .changeMemberRoleAlert(role: newRole)
}
}
// TODO invited by - need to get contact by contact id
if let conn = member.activeConn {

42
apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff
View File

@@ -368,6 +368,11 @@
<target>Die Mitgliederrolle ändern?</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Change role" xml:space="preserve">
<source>Change role</source>
<target>Rolle ändern</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Chat archive" xml:space="preserve">
<source>Chat archive</source>
<target>Datenbank Archiv</target>
@@ -1968,6 +1973,11 @@ Wir werden Serverredundanzen hinzufügen, um verloren gegangene Nachrichten zu v
<target>Zurückkehren</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Role" xml:space="preserve">
<source>Role</source>
<target>Rolle</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Run chat" xml:space="preserve">
<source>Run chat</source>
<target>Chat starten</target>
@@ -2856,6 +2866,16 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
<target>Anrufen…</target>
<note>call status</note>
</trans-unit>
<trans-unit id="changed role of %@ to %@" xml:space="preserve">
<source>changed role of %1$@ to %2$@</source>
<target>***changed role of %1$@ to %2$@</target>
<note>rcv group event chat item</note>
</trans-unit>
<trans-unit id="changed your role to %@" xml:space="preserve">
<source>changed your role to %@</source>
<target>***changed your role to %@</target>
<note>rcv group event chat item</note>
</trans-unit>
<trans-unit id="colored" xml:space="preserve">
<source>colored</source>
<target>farbig</target>
@@ -3056,12 +3076,6 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
<target>Mitglied</target>
<note>member role</note>
</trans-unit>
<trans-unit id="member %@ role: %@" xml:space="preserve">
<source>member %1$@ role: %2$@</source>
<target>Mitglieder %1$@ Rolle: %2$@</target>
<note>rcv group event chat item
snd group event chat item</note>
</trans-unit>
<trans-unit id="member connected" xml:space="preserve">
<source>connected</source>
<target>verbunden</target>
@@ -3217,6 +3231,16 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
<target>Sie sind zur Gruppe eingeladen</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="you changed role for yourself to %@" xml:space="preserve">
<source>you changed role for yourself to %@</source>
<target>***you changed role for yourself to %@</target>
<note>snd group event chat item</note>
</trans-unit>
<trans-unit id="you changed role of %@ to %@" xml:space="preserve">
<source>you changed role of %1$@ to %2$@</source>
<target>***you changed role of %1$@ to %2$@</target>
<note>snd group event chat item</note>
</trans-unit>
<trans-unit id="you left" xml:space="preserve">
<source>you left</source>
<target>Sie haben verlassen</target>
@@ -3242,12 +3266,6 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
<target>Sie: </target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="your role: %@" xml:space="preserve">
<source>your role: %@</source>
<target>Meine Rolle: %@</target>
<note>rcv group event chat item
snd group event chat item</note>
</trans-unit>
<trans-unit id="~strike~" xml:space="preserve">
<source>\~strike~</source>
<target>\~durchstreichen~</target>

42
apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff
View File

@@ -368,6 +368,11 @@
<target>Change member role?</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Change role" xml:space="preserve">
<source>Change role</source>
<target>Change role</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Chat archive" xml:space="preserve">
<source>Chat archive</source>
<target>Chat archive</target>
@@ -1968,6 +1973,11 @@ We will be adding server redundancy to prevent lost messages.</target>
<target>Revert</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Role" xml:space="preserve">
<source>Role</source>
<target>Role</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Run chat" xml:space="preserve">
<source>Run chat</source>
<target>Run chat</target>
@@ -2856,6 +2866,16 @@ SimpleX servers cannot see your profile.</target>
<target>calling…</target>
<note>call status</note>
</trans-unit>
<trans-unit id="changed role of %@ to %@" xml:space="preserve">
<source>changed role of %1$@ to %2$@</source>
<target>changed role of %1$@ to %2$@</target>
<note>rcv group event chat item</note>
</trans-unit>
<trans-unit id="changed your role to %@" xml:space="preserve">
<source>changed your role to %@</source>
<target>changed your role to %@</target>
<note>rcv group event chat item</note>
</trans-unit>
<trans-unit id="colored" xml:space="preserve">
<source>colored</source>
<target>colored</target>
@@ -3056,12 +3076,6 @@ SimpleX servers cannot see your profile.</target>
<target>member</target>
<note>member role</note>
</trans-unit>
<trans-unit id="member %@ role: %@" xml:space="preserve">
<source>member %1$@ role: %2$@</source>
<target>member %1$@ role: %2$@</target>
<note>rcv group event chat item
snd group event chat item</note>
</trans-unit>
<trans-unit id="member connected" xml:space="preserve">
<source>connected</source>
<target>connected</target>
@@ -3217,6 +3231,16 @@ SimpleX servers cannot see your profile.</target>
<target>you are invited to group</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="you changed role for yourself to %@" xml:space="preserve">
<source>you changed role for yourself to %@</source>
<target>you changed role for yourself to %@</target>
<note>snd group event chat item</note>
</trans-unit>
<trans-unit id="you changed role of %@ to %@" xml:space="preserve">
<source>you changed role of %1$@ to %2$@</source>
<target>you changed role of %1$@ to %2$@</target>
<note>snd group event chat item</note>
</trans-unit>
<trans-unit id="you left" xml:space="preserve">
<source>you left</source>
<target>you left</target>
@@ -3242,12 +3266,6 @@ SimpleX servers cannot see your profile.</target>
<target>you: </target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="your role: %@" xml:space="preserve">
<source>your role: %@</source>
<target>your role: %@</target>
<note>rcv group event chat item
snd group event chat item</note>
</trans-unit>
<trans-unit id="~strike~" xml:space="preserve">
<source>\~strike~</source>
<target>\~strike~</target>

42
apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff
View File

@@ -368,6 +368,11 @@
<target>Поменять роль члена группы?</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Change role" xml:space="preserve">
<source>Change role</source>
<target>Поменять роль</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Chat archive" xml:space="preserve">
<source>Chat archive</source>
<target>Архив чата</target>
@@ -1968,6 +1973,11 @@ We will be adding server redundancy to prevent lost messages.</source>
<target>Отменить изменения</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Role" xml:space="preserve">
<source>Role</source>
<target>Роль</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="Run chat" xml:space="preserve">
<source>Run chat</source>
<target>Запустить chat</target>
@@ -2856,6 +2866,16 @@ SimpleX серверы не могут получить доступ к ваше
<target>входящий звонок…</target>
<note>call status</note>
</trans-unit>
<trans-unit id="changed role of %@ to %@" xml:space="preserve">
<source>changed role of %1$@ to %2$@</source>
<target>поменял(а) роль члена %1$@ на: %2$@</target>
<note>rcv group event chat item</note>
</trans-unit>
<trans-unit id="changed your role to %@" xml:space="preserve">
<source>changed your role to %@</source>
<target>поменял(а) вашу роль на: %@</target>
<note>rcv group event chat item</note>
</trans-unit>
<trans-unit id="colored" xml:space="preserve">
<source>colored</source>
<target>цвет</target>
@@ -3056,12 +3076,6 @@ SimpleX серверы не могут получить доступ к ваше
<target>член группы</target>
<note>member role</note>
</trans-unit>
<trans-unit id="member %@ role: %@" xml:space="preserve">
<source>member %1$@ role: %2$@</source>
<target>роль %1$@: %2$@</target>
<note>rcv group event chat item
snd group event chat item</note>
</trans-unit>
<trans-unit id="member connected" xml:space="preserve">
<source>connected</source>
<target>соединен(а)</target>
@@ -3217,6 +3231,16 @@ SimpleX серверы не могут получить доступ к ваше
<target>вы приглашены в группу</target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="you changed role for yourself to %@" xml:space="preserve">
<source>you changed role for yourself to %@</source>
<target>вы поменяли роль себе на: %@</target>
<note>snd group event chat item</note>
</trans-unit>
<trans-unit id="you changed role of %@ to %@" xml:space="preserve">
<source>you changed role of %1$@ to %2$@</source>
<target>вы поменяли роль члена %1$@ на: %2$@</target>
<note>snd group event chat item</note>
</trans-unit>
<trans-unit id="you left" xml:space="preserve">
<source>you left</source>
<target>вы покинули группу</target>
@@ -3242,12 +3266,6 @@ SimpleX серверы не могут получить доступ к ваше
<target>вы: </target>
<note>No comment provided by engineer.</note>
</trans-unit>
<trans-unit id="your role: %@" xml:space="preserve">
<source>your role: %@</source>
<target>ваша роль: %@</target>
<note>rcv group event chat item
snd group event chat item</note>
</trans-unit>
<trans-unit id="~strike~" xml:space="preserve">
<source>\~strike~</source>
<target>\~зачеркнуть~</target>

8
apps/ios/SimpleXChat/ChatTypes.swift
View File

@@ -1458,9 +1458,9 @@ public enum RcvGroupEvent: Decodable {
case .memberConnected: return NSLocalizedString("member connected", comment: "rcv group event chat item")
case .memberLeft: return NSLocalizedString("left", comment: "rcv group event chat item")
case let .memberRole(_, profile, role):
return String.localizedStringWithFormat(NSLocalizedString("member %@ role: %@", comment: "rcv group event chat item"), profile.profileViewName, role.text)
return String.localizedStringWithFormat(NSLocalizedString("changed role of %@ to %@", comment: "rcv group event chat item"), profile.profileViewName, role.text)
case let .userRole(role):
return String.localizedStringWithFormat(NSLocalizedString("your role: %@", comment: "rcv group event chat item"), role.text)
return String.localizedStringWithFormat(NSLocalizedString("changed your role to %@", comment: "rcv group event chat item"), role.text)
case let .memberDeleted(_, profile):
return String.localizedStringWithFormat(NSLocalizedString("removed %@", comment: "rcv group event chat item"), profile.profileViewName)
case .userDeleted: return NSLocalizedString("removed you", comment: "rcv group event chat item")
@@ -1481,9 +1481,9 @@ public enum SndGroupEvent: Decodable {
var text: String {
switch self {
case let .memberRole(_, profile, role):
return String.localizedStringWithFormat(NSLocalizedString("member %@ role: %@", comment: "snd group event chat item"), profile.profileViewName, role.text)
return String.localizedStringWithFormat(NSLocalizedString("you changed role of %@ to %@", comment: "snd group event chat item"), profile.profileViewName, role.text)
case let .userRole(role):
return String.localizedStringWithFormat(NSLocalizedString("your role: %@", comment: "snd group event chat item"), role.text)
return String.localizedStringWithFormat(NSLocalizedString("you changed role for yourself to %@", comment: "snd group event chat item"), role.text)
case let .memberDeleted(_, profile):
return String.localizedStringWithFormat(NSLocalizedString("you removed %@", comment: "snd group event chat item"), profile.profileViewName)
case .userLeft: return NSLocalizedString("you left", comment: "snd group event chat item")

26
apps/ios/de.lproj/Localizable.strings
View File

@@ -257,6 +257,15 @@
/* No comment provided by engineer. */
"Change member role?" = "Die Mitgliederrolle ändern?";
/* No comment provided by engineer. */
"Change role" = "Rolle ändern";
/* rcv group event chat item */
"changed role of %@ to %@" = "***changed role of %1$@ to %2$@";
/* rcv group event chat item */
"changed your role to %@" = "***changed your role to %@";
/* No comment provided by engineer. */
"Chat archive" = "Datenbank Archiv";
@@ -1064,10 +1073,6 @@
/* No comment provided by engineer. */
"Member" = "Mitglied";
/* rcv group event chat item
snd group event chat item */
"member %@ role: %@" = "Mitglieder %1$@ Rolle: %2$@";
/* rcv group event chat item */
"member connected" = "verbunden";
@@ -1374,6 +1379,9 @@
/* No comment provided by engineer. */
"Revert" = "Zurückkehren";
/* No comment provided by engineer. */
"Role" = "Rolle";
/* No comment provided by engineer. */
"Run chat" = "Chat starten";
@@ -1800,6 +1808,12 @@
/* No comment provided by engineer. */
"You can use markdown to format messages:" = "Um Nachrichteninhalte zu formatieren, können Sie Markdowns verwenden:";
/* snd group event chat item */
"you changed role for yourself to %@" = "***you changed role for yourself to %@";
/* snd group event chat item */
"you changed role of %@ to %@" = "***you changed role of %1$@ to %2$@";
/* No comment provided by engineer. */
"You control through which server(s) **to receive** the messages, your contacts – the servers you use to message them." = "Sie legen fest, über welche Server Sie Ihre Nachrichten **empfangen** und an Ihre Kontakte **senden**.";
@@ -1917,10 +1931,6 @@
/* No comment provided by engineer. */
"Your random profile" = "Ihr Zufallsprofil";
/* rcv group event chat item
snd group event chat item */
"your role: %@" = "Meine Rolle: %@";
/* No comment provided by engineer. */
"Your settings" = "Meine Einstellungen";

26
apps/ios/ru.lproj/Localizable.strings
View File

@@ -257,6 +257,15 @@
/* No comment provided by engineer. */
"Change member role?" = "Поменять роль члена группы?";
/* No comment provided by engineer. */
"Change role" = "Поменять роль";
/* rcv group event chat item */
"changed role of %@ to %@" = "поменял(а) роль члена %1$@ на: %2$@";
/* rcv group event chat item */
"changed your role to %@" = "поменял(а) вашу роль на: %@";
/* No comment provided by engineer. */
"Chat archive" = "Архив чата";
@@ -1064,10 +1073,6 @@
/* No comment provided by engineer. */
"Member" = "Член группы";
/* rcv group event chat item
snd group event chat item */
"member %@ role: %@" = "роль %1$@: %2$@";
/* rcv group event chat item */
"member connected" = "соединен(а)";
@@ -1374,6 +1379,9 @@
/* No comment provided by engineer. */
"Revert" = "Отменить изменения";
/* No comment provided by engineer. */
"Role" = "Роль";
/* No comment provided by engineer. */
"Run chat" = "Запустить chat";
@@ -1800,6 +1808,12 @@
/* No comment provided by engineer. */
"You can use markdown to format messages:" = "Вы можете форматировать сообщения:";
/* snd group event chat item */
"you changed role for yourself to %@" = "вы поменяли роль себе на: %@";
/* snd group event chat item */
"you changed role of %@ to %@" = "вы поменяли роль члена %1$@ на: %2$@";
/* No comment provided by engineer. */
"You control through which server(s) **to receive** the messages, your contacts – the servers you use to message them." = "Вы определяете через какие серверы вы **получаете сообщения**, ваши контакты - серверы, которые вы используете для отправки.";
@@ -1917,10 +1931,6 @@
/* No comment provided by engineer. */
"Your random profile" = "Ваш случайный профиль";
/* rcv group event chat item
snd group event chat item */
"your role: %@" = "ваша роль: %@";
/* No comment provided by engineer. */
"Your settings" = "Настройки";

8
src/Simplex/Chat/Messages.hs
View File

@@ -508,8 +508,8 @@ rcvGroupEventToText = \case
RGEMemberAdded _ p -> "added " <> profileToText p
RGEMemberConnected -> "connected"
RGEMemberLeft -> "left"
RGEMemberRole _ p r -> "role of " <> profileToText p <> ": " <> safeDecodeUtf8 (strEncode r)
RGEUserRole r -> "your role: " <> safeDecodeUtf8 (strEncode r)
RGEMemberRole _ p r -> "changed role of " <> profileToText p <> " to " <> safeDecodeUtf8 (strEncode r)
RGEUserRole r -> "changed your role to " <> safeDecodeUtf8 (strEncode r)
RGEMemberDeleted _ p -> "removed " <> profileToText p
RGEUserDeleted -> "removed you"
RGEGroupDeleted -> "deleted group"
@@ -518,8 +518,8 @@ rcvGroupEventToText = \case
sndGroupEventToText :: SndGroupEvent -> Text
sndGroupEventToText = \case
SGEMemberRole _ p r -> "role of " <> profileToText p <> ": " <> safeDecodeUtf8 (strEncode r)
SGEUserRole r -> "your role " <> safeDecodeUtf8 (strEncode r)
SGEMemberRole _ p r -> "changed role of " <> profileToText p <> " to " <> safeDecodeUtf8 (strEncode r)
SGEUserRole r -> "changed role for yourself to " <> safeDecodeUtf8 (strEncode r)
SGEMemberDeleted _ p -> "removed " <> profileToText p
SGEUserLeft -> "left"
SGEGroupUpdated _ -> "group profile updated"