-
-
Notifications
You must be signed in to change notification settings - Fork 598
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Added features to filter chats, edit messages, add users to group chat, share images as messages, and create dedicated group chats for events #2360
base: develop
Are you sure you want to change the base?
Changes from 55 commits
1ca936b
c42da5e
3742346
06f4af4
c18b97b
cbde8f7
9950269
77a392c
eb54545
09427e6
6fbaaa2
8fffdc5
f76dc3e
d4864a8
75fa6c3
58086e2
4d6f9a6
a68dcb4
3df2541
15385ae
65fb52d
6eff29e
e355314
e125d96
1ee07f3
4525924
f4b6fd0
74899fd
450b587
b1790e2
fe66f0a
352b6b5
9a661e5
580260a
a1ea33b
182eded
e6e5c24
789aa19
426f34c
11265e0
bb9ddc8
85f698c
d541812
635a115
9d581e8
4b3850a
da51531
5f463b0
a06cfc0
2abde8c
972ce3e
a552e05
a0afd7c
14a127a
622e2b6
ad599a9
431e77a
e520ed8
6539100
1597197
38426f0
566e8c2
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -396,7 +396,8 @@ | |
"startDate": "Date de début", | ||
"endDate": "Date de fin", | ||
"talawaApiUnavailable": "API Talawa indisponible", | ||
"done": "Fait" | ||
"done": "Fait", | ||
"createChat": "Créer une discussion" | ||
}, | ||
"organizationActionItems": { | ||
"actionItemCategory": "Catégorie d'élément d'action", | ||
|
@@ -531,7 +532,8 @@ | |
"registerEvent": "Inscrire à l'événement", | ||
"close": "Fermer", | ||
"talawaApiUnavailable": "API Talawa non disponible", | ||
"done": "Terminé" | ||
"done": "Terminé", | ||
"createChat": "Créer une discussion" | ||
Comment on lines
+562
to
+563
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fix inconsistent translation for "done". The key "done" is translated differently across sections:
This inconsistency should be resolved by using the same translation throughout. |
||
}, | ||
"funds": { | ||
"title": "Fonds", | ||
|
@@ -1115,7 +1117,8 @@ | |
"eventDescription": "Description de l'événement", | ||
"eventLocation": "Lieu de l'événement", | ||
"startDate": "Date de début", | ||
"endDate": "Date de fin" | ||
"endDate": "Date de fin", | ||
"createChat": "Créer une discussion" | ||
}, | ||
"userEventCard": { | ||
"starts": "Départs", | ||
|
@@ -1159,14 +1162,21 @@ | |
"endOfResults": "Fin des résultats" | ||
}, | ||
"userChat": { | ||
"add": "Ajouter", | ||
"chat": "Chat", | ||
"contacts": "Contacts", | ||
"search": "rechercher", | ||
"messages": "messages" | ||
"messages": "messages", | ||
"create": "créer", | ||
"newChat": "nouvelle discussion", | ||
"newGroupChat": "Nouvelle discussion de groupe", | ||
"groupInfo": "Informations sur le groupe", | ||
"members": "Membres" | ||
}, | ||
"userChatRoom": { | ||
"selectContact": "Sélectionnez un contact pour démarrer la conversation", | ||
"sendMessage": "Envoyer le message" | ||
"sendMessage": "Envoyer le message", | ||
"reply": "répondre" | ||
}, | ||
"orgProfileField": { | ||
"loading": "Chargement...", | ||
|
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
|
@@ -396,7 +396,8 @@ | |||||||||
"startDate": "प्रारंभ तिथि", | ||||||||||
"endDate": "समाप्ति तिथि", | ||||||||||
"talawaApiUnavailable": "Talawa API अनुपलब्ध", | ||||||||||
"done": "पूर्ण" | ||||||||||
"done": "पूर्ण", | ||||||||||
"createChat": "चैट बनाएं" | ||||||||||
Comment on lines
+426
to
+427
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Move chat-related translations to the appropriate section. The translations for "done" and "createChat" appear to be misplaced in the "organizationEvents" section. These strings are related to chat functionality and should be moved to the "userChat" or "userChatRoom" sections for better organization and maintainability. Apply this diff to move the translations to the appropriate section: "organizationEvents": {
- "done": "पूर्ण",
- "createChat": "चैट बनाएं"
},
"userChat": {
+ "done": "पूर्ण",
+ "createChat": "चैट बनाएं"
}
|
||||||||||
}, | ||||||||||
"organizationActionItems": { | ||||||||||
"actionItemCategory": "कार्य आइटम श्रेणी", | ||||||||||
|
@@ -531,7 +532,8 @@ | |||||||||
"registerEvent": "कार्यक्रम के लिए पंजीकरण करें", | ||||||||||
"close": "बंद करें", | ||||||||||
"talawaApiUnavailable": "Talawa API अनुपलब्ध", | ||||||||||
"done": "समाप्त" | ||||||||||
"done": "समाप्त", | ||||||||||
"createChat": "चैट बनाएं" | ||||||||||
Comment on lines
+562
to
+563
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Move chat-related translations to the appropriate section. Similarly, the translations for "done" and "createChat" in the "eventListCard" section should be moved to the "userChat" section to maintain consistency and avoid duplication. Apply this diff to consolidate chat-related translations: "eventListCard": {
- "done": "समाप्त",
- "createChat": "चैट बनाएं"
},
"userChat": {
+ "done": "समाप्त",
+ "createChat": "चैट बनाएं"
} 📝 Committable suggestion
Suggested change
|
||||||||||
}, | ||||||||||
"funds": { | ||||||||||
"title": "फंड", | ||||||||||
|
@@ -1115,7 +1117,8 @@ | |||||||||
"eventDescription": "कार्यक्रम विवरण", | ||||||||||
"eventLocation": "कार्यक्रम स्थान", | ||||||||||
"startDate": "प्रारंभ तिथि", | ||||||||||
"endDate": "समाप्ति तिथि" | ||||||||||
"endDate": "समाप्ति तिथि", | ||||||||||
"createChat": "चैट बनाएं" | ||||||||||
}, | ||||||||||
"userEventCard": { | ||||||||||
"starts": "प्रारंभ होगा", | ||||||||||
|
@@ -1159,14 +1162,21 @@ | |||||||||
"endOfResults": "परिणाम समाप्त" | ||||||||||
}, | ||||||||||
"userChat": { | ||||||||||
"add": "जोड़ें", | ||||||||||
"chat": "बात करना", | ||||||||||
"contacts": "संपर्क", | ||||||||||
"search": "खोज", | ||||||||||
"messages": "संदेश" | ||||||||||
"messages": "संदेश", | ||||||||||
"create": "बनाएं", | ||||||||||
"newChat": "नई चैट", | ||||||||||
"newGroupChat": "नया समूह चैट", | ||||||||||
"groupInfo": "समूह जानकारी", | ||||||||||
"members": "सदस्यों" | ||||||||||
}, | ||||||||||
"userChatRoom": { | ||||||||||
"selectContact": "बातचीत शुरू करने के लिए एक संपर्क चुनें", | ||||||||||
"sendMessage": "मेसेज भेजें" | ||||||||||
"sendMessage": "मेसेज भेजें", | ||||||||||
"reply": "जवाब" | ||||||||||
}, | ||||||||||
"orgProfileField": { | ||||||||||
"loading": "लोड हो रहा है...", | ||||||||||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -396,7 +396,8 @@ | |
"startDate": "开始日期", | ||
"endDate": "结束日期", | ||
"talawaApiUnavailable": "塔拉瓦 API 不可用", | ||
"done": "完成" | ||
"done": "完成", | ||
"createChat": "创建聊天" | ||
Comment on lines
+426
to
+427
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Consolidate redundant "createChat" translations. The translation key Apply this diff: "organizationEvents": {
"done": "完成",
- "createChat": "创建聊天"
},
"eventListCard": {
"done": "完成",
- "createChat": "创建聊天"
},
"userEvents": {
"endDate": "结束日期",
- "createChat": "创建聊天"
},
"userChat": {
"add": "添加",
"chat": "聊天",
...
+ "createChat": "创建聊天"
} Also applies to: 562-563, 1147-1148 |
||
}, | ||
"organizationActionItems": { | ||
"actionItemCategory": "行动项目类别", | ||
|
@@ -531,7 +532,8 @@ | |
"registerEvent": "注册活动", | ||
"close": "关闭", | ||
"talawaApiUnavailable": "塔拉瓦 API 不可用", | ||
"done": "完成" | ||
"done": "完成", | ||
"createChat": "创建聊天" | ||
}, | ||
"funds": { | ||
"title": "基金", | ||
|
@@ -1115,7 +1117,8 @@ | |
"eventDescription": "活动描述", | ||
"eventLocation": "活动位置", | ||
"startDate": "开始日期", | ||
"endDate": "结束日期" | ||
"endDate": "结束日期", | ||
"createChat": "创建聊天" | ||
}, | ||
"userEventCard": { | ||
"starts": "开始", | ||
|
@@ -1159,14 +1162,21 @@ | |
"endOfResults": "结果结束" | ||
}, | ||
"userChat": { | ||
"add": "添加", | ||
"chat": "聊天", | ||
"contacts": "联系方式", | ||
"search": "搜索", | ||
"messages": "消息" | ||
"messages": "消息", | ||
"create": "创造", | ||
"newChat": "新聊天", | ||
"newGroupChat": "新群聊", | ||
"groupInfo": "集团信息", | ||
"members": "会员" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add missing translations for core chat features. While basic chat translations are present, translations for several key features mentioned in the PR objectives are missing:
Add the following translations: "userChat": {
"add": "添加",
"chat": "聊天",
"contacts": "联系方式",
"search": "搜索",
"messages": "消息",
"create": "创造",
"newChat": "新聊天",
"newGroupChat": "新群聊",
"groupInfo": "集团信息",
"members": "会员",
+ "filterChats": "筛选聊天",
+ "editMessage": "编辑消息",
+ "shareImage": "分享图片"
}
|
||
}, | ||
"userChatRoom": { | ||
"selectContact": "选择联系人开始对话", | ||
"sendMessage": "发信息" | ||
"sendMessage": "发信息", | ||
"reply": "回复" | ||
}, | ||
"orgProfileField": { | ||
"loading": "加载中...", | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -555,7 +555,6 @@ type ChatMessage { | |
createdAt: DateTime! | ||
chatMessageBelongsTo: Chat! | ||
messageContent: String! | ||
type: String! | ||
replyTo: ChatMessage | ||
sender: User! | ||
deletedBy: [User] | ||
|
@@ -692,7 +691,6 @@ type Mutation { | |
createAgendaCategory(input: CreateAgendaCategoryInput!): AgendaCategory! | ||
createComment(data: CommentInput!, postId: ID!): Comment | ||
createChat(data: chatInput!): Chat! | ||
createDirectChat(data: createChatInput!): DirectChat! | ||
createDonation( | ||
amount: Float! | ||
nameOfOrg: String! | ||
|
@@ -706,7 +704,6 @@ type Mutation { | |
recurrenceRuleData: RecurrenceRuleInput | ||
): Event! | ||
createEventVolunteer(data: EventVolunteerInput!): EventVolunteer! | ||
createGroupChat(data: createGroupChatInput!): GroupChat! | ||
createMember(input: UserAndOrganizationInput!): Organization! | ||
createMessageChat(data: MessageChatInput!): MessageChat! | ||
createOrganization(data: OrganizationInput, file: String): Organization! | ||
|
@@ -766,15 +763,8 @@ type Mutation { | |
revokeRefreshTokenForUser: Boolean! | ||
saveFcmToken(token: String): Boolean! | ||
sendMembershipRequest(organizationId: ID!): MembershipRequest! | ||
sendMessageToChat(chatId: ID!, messageContent: String!, type: String!, replyTo: ID): ChatMessage! | ||
sendMessageToDirectChat( | ||
chatId: ID! | ||
messageContent: String! | ||
): DirectChatMessage! | ||
sendMessageToGroupChat( | ||
chatId: ID! | ||
messageContent: String! | ||
): GroupChatMessage! | ||
sendMessageToChat(chatId: ID!, messageContent: String!, replyTo: ID): ChatMessage! | ||
markChatMessagesAsRead(chatId: ID!, userId: ID!): Chat | ||
Comment on lines
+766
to
+767
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🛠️ Refactor suggestion Consider enhancing markChatMessagesAsRead mutation. The mutation could be improved by:
Consider this alternative design: type MarkChatMessagesAsReadPayload {
chat: Chat!
markedMessagesCount: Int!
}
extend type Mutation {
markChatMessagesAsRead(input: MarkChatMessagesAsReadInput!): MarkChatMessagesAsReadPayload!
}
input MarkChatMessagesAsReadInput {
chatId: ID!
userId: ID!
"""
Optional: Mark messages as read up to this message ID
If not provided, marks all messages as read
"""
upToMessageId: ID
} |
||
signUp(data: UserInput!, file: String): AuthData! | ||
togglePostPin(id: ID!, title: String): Post! | ||
unassignUserTag(input: ToggleUserTagAssignInput!): User | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing translations for message editing.
While "reply" functionality is supported, the translations don't include strings for editing messages, which was mentioned in the PR objectives.
Add the following translation keys: