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

Merge branch 'develop' into doug/4484_contacts_access

Browse Source 
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Settings/SettingsViewController.m
This commit is contained in:
Doug
2021-09-30 11:14:02 +01:00
parent 5d3c3cf5d7 313e666017
commit 997ee54f20
414 changed files with 14789 additions and 4140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
+7 -7
View File
@@ -77,25 +77,25 @@
NSMutableArray* viewControllers = [[NSMutableArray alloc] init];
NSMutableArray* titles = [[NSMutableArray alloc] init];
[titles addObject: NSLocalizedStringFromTable(@"search_rooms", @"Vector", nil)];
[titles addObject:[VectorL10n searchRooms]];
recentsViewController = [RecentsViewController recentListViewController];
recentsViewController.enableSearchBar = NO;
recentsViewController.screenName = @"UnifiedSearchRooms";
[viewControllers addObject:recentsViewController];
[titles addObject: NSLocalizedStringFromTable(@"search_messages", @"Vector", nil)];
[titles addObject:[VectorL10n searchMessages]];
messagesSearchViewController = [HomeMessagesSearchViewController searchViewController];
[viewControllers addObject:messagesSearchViewController];
// Add search People tab
[titles addObject: NSLocalizedStringFromTable(@"search_people", @"Vector", nil)];
[titles addObject:[VectorL10n searchPeople]];
peopleSearchViewController = [ContactsTableViewController contactsTableViewController];
peopleSearchViewController.contactsTableViewControllerDelegate = self;
peopleSearchViewController.disableFindYourContactsFooter = YES;
[viewControllers addObject:peopleSearchViewController];
// add Files tab
[titles addObject: NSLocalizedStringFromTable(@"search_files", @"Vector", nil)];
[titles addObject:[VectorL10n searchFiles]];
filesSearchViewController = [HomeFilesSearchViewController searchViewController];
[viewControllers addObject:filesSearchViewController];
@@ -110,7 +110,7 @@
[self initializeDataSources];
self.searchBar.autocapitalizationType = UITextAutocapitalizationTypeNone;
self.searchBar.placeholder = NSLocalizedStringFromTable(@"search_default_placeholder", @"Vector", nil);
self.searchBar.placeholder = [VectorL10n searchDefaultPlaceholder];
[super showSearch:NO];
}
@@ -410,11 +410,11 @@
if (self.selectedViewController == peopleSearchViewController)
{
self.searchBar.placeholder = NSLocalizedStringFromTable(@"search_people_placeholder", @"Vector", nil);
self.searchBar.placeholder = [VectorL10n searchPeoplePlaceholder];
}
else
{
self.searchBar.placeholder = NSLocalizedStringFromTable(@"search_default_placeholder", @"Vector", nil);
self.searchBar.placeholder = [VectorL10n searchDefaultPlaceholder];
}
[self updateSearch];