From 26ccb79e1258a009544a1dd6f9f634d13a32e518 Mon Sep 17 00:00:00 2001
From: ialokim <ialokim@mailbox.org>
Date: Sun, 26 Feb 2023 22:24:31 +0100
Subject: [PATCH] add strings for private groups
---
.../briar/desktop/forums/ForumStrings.kt | 4 +-
.../privategroup/PrivateGroupStrings.kt | 41 +++++++++----------
.../resources/strings/BriarDesktop.properties | 33 +++++++++++++--
3 files changed, 51 insertions(+), 27 deletions(-)
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/ForumStrings.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/ForumStrings.kt
index 49f33dbfa0..f18ba114f9 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/ForumStrings.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/ForumStrings.kt
@@ -35,8 +35,8 @@ object ForumStrings : GroupStrings(
noGroupSelectedTitle = i18n("forum.none_selected.title"),
noGroupSelectedText = i18n("forum.none_selected.hint"),
messageCount = { count ->
- if (count > 0) i18nP("group.card.posts", count)
- else i18n("group.card.no_posts")
+ if (count > 0) i18nP("forum.card.posts", count)
+ else i18n("forum.card.no_posts")
},
unreadCount = { count ->
i18nP("access.forums.unread_count", count)
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/privategroup/PrivateGroupStrings.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/privategroup/PrivateGroupStrings.kt
index f6fc49e2b2..8ecc2adc07 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/privategroup/PrivateGroupStrings.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/privategroup/PrivateGroupStrings.kt
@@ -25,38 +25,37 @@ import org.briarproject.briar.desktop.utils.InternationalizationUtils.i18n
import org.briarproject.briar.desktop.utils.InternationalizationUtils.i18nF
import org.briarproject.briar.desktop.utils.InternationalizationUtils.i18nP
-// todo: replace with strings for private groups
object PrivateGroupStrings : GroupStrings(
- listTitle = i18n("forum.search.title"),
- listDescription = i18n("access.forums.list"),
- addGroupTitle = i18n("forum.add.title"),
- addGroupHint = i18n("forum.add.hint"),
- addGroupButton = i18n("forum.add.button"),
- noGroupsYet = i18n("forum.empty_state.text"),
- noGroupSelectedTitle = i18n("forum.none_selected.title"),
- noGroupSelectedText = i18n("forum.none_selected.hint"),
+ listTitle = i18n("group.search.title"),
+ listDescription = i18n("access.group.list"),
+ addGroupTitle = i18n("group.add.title"),
+ addGroupHint = i18n("group.add.hint"),
+ addGroupButton = i18n("group.add.button"),
+ noGroupsYet = i18n("group.empty_state.text"),
+ noGroupSelectedTitle = i18n("group.none_selected.title"),
+ noGroupSelectedText = i18n("group.none_selected.hint"),
messageCount = { count ->
if (count > 0) i18nP("group.card.posts", count)
else i18n("group.card.no_posts")
},
unreadCount = { count ->
- i18nP("access.forums.unread_count", count)
+ i18nP("access.group.unread_count", count)
},
lastMessage = { timestamp ->
- i18nF("access.forums.last_post_timestamp", timestamp)
+ i18nF("access.group.last_post_timestamp", timestamp)
},
groupNameMaxLength = MAX_GROUP_NAME_LENGTH,
sharedWith = { total, online ->
- i18nF("forum.sharing.status.with", total, online)
+ i18nF("group.sharing.status.with", total, online)
},
- unreadJumpToPrevious = i18n("access.forums.jump_to_prev_unread"),
- unreadJumpToNext = i18n("access.forums.jump_to_next_unread"),
- deleteDialogTitle = i18n("forum.delete.dialog.title"),
- deleteDialogMessage = i18n("forum.delete.dialog.message"),
- deleteDialogButton = i18n("forum.delete.dialog.button"),
+ unreadJumpToPrevious = i18n("access.group.jump_to_prev_unread"),
+ unreadJumpToNext = i18n("access.group.jump_to_next_unread"),
+ deleteDialogTitle = i18n("group.leave.dialog.title"),
+ deleteDialogMessage = i18n("group.leave.dialog.message"),
+ deleteDialogButton = i18n("group.leave.dialog.button"),
messageMaxLength = MAX_GROUP_POST_TEXT_LENGTH,
- messageReplyIntro = i18n("forum.message.reply.intro"),
- messageReplyClose = i18n("access.forums.reply.close"),
- messageReplyHint = i18n("forum.message.reply.hint"),
- messageHint = i18n("forum.message.hint"),
+ messageReplyIntro = i18n("group.message.reply.intro"),
+ messageReplyClose = i18n("access.group.reply.close"),
+ messageReplyHint = i18n("group.message.reply.hint"),
+ messageHint = i18n("group.message.hint"),
)
diff --git a/briar-desktop/src/main/resources/strings/BriarDesktop.properties b/briar-desktop/src/main/resources/strings/BriarDesktop.properties
index a9996e1472..80dd5e2f3a 100644
--- a/briar-desktop/src/main/resources/strings/BriarDesktop.properties
+++ b/briar-desktop/src/main/resources/strings/BriarDesktop.properties
@@ -90,6 +90,13 @@ access.forums.jump_to_next_unread=Jump to next unread post
access.forum.sharing.action.close=Close sharing form
access.forum.sharing.status.close=Close sharing status
+access.group.list=private group list
+access.group.reply.close=Close reply
+access.group.unread_count={0, plural, one {one unread messages} other {{0} unread messages}}
+access.group.last_post_timestamp=last message: {0}
+access.group.jump_to_prev_unread=Jump to previous unread message
+access.group.jump_to_next_unread=Jump to next unread message
+
# Contacts
contacts.none_selected.title=No contact selected
contacts.none_selected.hint=Select a contact to start chatting
@@ -147,8 +154,8 @@ forum.message.hint=New Post
forum.message.reply.hint=New Reply
forum.message.reply.intro=Reply to:
forum.message.new=Unread Post
-group.card.no_posts=No posts
-group.card.posts={0, plural, one {{0} post} other {{0} posts}}
+forum.card.no_posts=No posts
+forum.card.posts={0, plural, one {{0} post} other {{0} posts}}
forum.sharing.status.title=Sharing Status
forum.sharing.status.info=Any member of a forum can share it with their contacts. You are sharing this forum with the following contacts. There may also be other members who you can't see in this list, although you can see their posts in the forum.
forum.sharing.status.with=Shared with {0} ({1} online)
@@ -164,8 +171,26 @@ forum.sharing.action.status.not_supported=Not supported by this contact
forum.sharing.action.status.error=Error. This is a bug and not your fault
# Private Groups
-groups.card.created=Created by {0}
-groups.card.messages={0, plural, one {{0} message} other {{0} messages}}
+group.search.title=Private Groups
+group.add.title=Create Private Group
+group.add.hint=Choose a name for your private group
+group.add.button=Create private group
+group.empty_state.text=You don't have any private groups yet. Tap the + icon to add one:
+group.none_selected.title=No private group selected
+group.none_selected.hint=Select a private group to start chatting
+group.card.no_posts=No messages
+group.card.posts={0, plural, one {{0} post} other {{0} messages}}
+group.card.created=Created by {0}
+group.card.messages={0, plural, one {{0} message} other {{0} messages}}
+group.sharing.status.with=Shared with {0} ({1} online)
+group.message.hint=New Message
+group.message.reply.hint=New Reply
+group.message.reply.intro=Reply to:
+group.leave.title=Leave Group
+group.leave.dialog.title=Confirm Leaving Group
+group.leave.dialog.message=Are you sure that you want to leave this private group?
+group.leave.dialog.button=Leave
+
# Introduction
introduction.introduce=Make Introduction
--
GitLab