felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-18 07:28:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into ismail/4384_room_summary_store

Browse Source
This commit is contained in:
ismailgulek
2021-09-30 12:35:46 +03:00
parent 1b15786228 92c2a9488f
commit cc46decec2
113 changed files with 1613 additions and 1421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
View File

@@ -641,12 +641,12 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
if (section == favoritesSection)
{
count = self.favoriteCellDataArray.count;
title = NSLocalizedStringFromTable(@"room_recents_favourites_section", @"Vector", nil);
title = [VectorL10n roomRecentsFavouritesSection];
}
else if (section == peopleSection)
{
count = self.peopleCellDataArray.count;
title = NSLocalizedStringFromTable(@"room_recents_people_section", @"Vector", nil);
title = [VectorL10n roomRecentsPeopleSection];
}
else if (section == conversationSection)
{
@@ -654,26 +654,26 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
if (_recentsDataSourceMode == RecentsDataSourceModePeople)
{
title = NSLocalizedStringFromTable(@"people_conversation_section", @"Vector", nil);
title = [VectorL10n peopleConversationSection];
}
else
{
title = NSLocalizedStringFromTable(@"room_recents_conversations_section", @"Vector", nil);
title = [VectorL10n roomRecentsConversationsSection];
}
}
else if (section == directorySection)
{
title = NSLocalizedStringFromTable(@"room_recents_directory_section", @"Vector", nil);
title = [VectorL10n roomRecentsDirectorySection];
}
else if (section == lowPrioritySection)
{
count = self.lowPriorityCellDataArray.count;
title = NSLocalizedStringFromTable(@"room_recents_low_priority_section", @"Vector", nil);
title = [VectorL10n roomRecentsLowPrioritySection];
}
else if (section == serverNoticeSection)
{
count = self.serverNoticeCellDataArray.count;
title = NSLocalizedStringFromTable(@"room_recents_server_notice_section", @"Vector", nil);
title = [VectorL10n roomRecentsServerNoticeSection];
}
else if (section == invitesSection)
{
@@ -681,17 +681,17 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
if (_recentsDataSourceMode == RecentsDataSourceModePeople)
{
title = NSLocalizedStringFromTable(@"people_invites_section", @"Vector", nil);
title = [VectorL10n peopleInvitesSection];
}
else
{
title = NSLocalizedStringFromTable(@"room_recents_invites_section", @"Vector", nil);
title = [VectorL10n roomRecentsInvitesSection];
}
}
else if (section == suggestedRoomsSection)
{
count = self.suggestedRoomCellDataArray.count;
title = NSLocalizedStringFromTable(@"room_recents_suggested_rooms_section", @"Vector", nil);
title = [VectorL10n roomRecentsSuggestedRoomsSection];
}
if (count)
@@ -762,8 +762,8 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
missedNotifAndUnreadBadgeLabel.font = [UIFont boldSystemFontOfSize:14];
if (totalNotificationCount > 1000)
{
CGFloat value = totalNotificationCount / 1000.0;
missedNotifAndUnreadBadgeLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"large_badge_value_k_format", @"Vector", nil), value];
CGFloat value = count / 1000.0;
missedNotifAndUnreadBadgeLabel.text = [VectorL10n largeBadgeValueKFormat:value];
}
else
{
@@ -959,15 +959,15 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
// Check whether a search session is in progress
if (self.searchPatternsList)
{
tableViewCell.textLabel.text = NSLocalizedStringFromTable(@"search_no_result", @"Vector", nil);
tableViewCell.textLabel.text = [VectorL10n searchNoResult];
}
else if (_recentsDataSourceMode == RecentsDataSourceModePeople || indexPath.section == peopleSection)
{
tableViewCell.textLabel.text = NSLocalizedStringFromTable(@"people_no_conversation", @"Vector", nil);
tableViewCell.textLabel.text = [VectorL10n peopleNoConversation];
}
else
{
tableViewCell.textLabel.text = NSLocalizedStringFromTable(@"room_recents_no_conversation", @"Vector", nil);
tableViewCell.textLabel.text = [VectorL10n roomRecentsNoConversation];
}
return tableViewCell;