felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-05 15:37:45 +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
Riot/Modules/Home/HomeViewController.m
+7 -7
View File
@@ -102,7 +102,7 @@
{
[super viewWillAppear:animated];
[AppDelegate theDelegate].masterTabBarController.navigationItem.title = NSLocalizedStringFromTable(@"title_home", @"Vector", nil);
[AppDelegate theDelegate].masterTabBarController.navigationItem.title = [VectorL10n titleHome];
[ThemeService.shared.theme applyStyleOnNavigationBar:[AppDelegate theDelegate].masterTabBarController.navigationController.navigationBar];
@@ -274,7 +274,7 @@
currentAlert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
[currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"spaces_explore_rooms", @"Vector", nil)
[currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n spacesExploreRooms]
style:UIAlertActionStyleDefault
handler:^(UIAlertAction * action) {
@@ -288,7 +288,7 @@
}]];
[currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"room_details_people", @"Vector", nil)
[currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n roomDetailsPeople]
style:UIAlertActionStyleDefault
handler:^(UIAlertAction * action) {
@@ -305,7 +305,7 @@
}]];
[currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
[currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
style:UIAlertActionStyleCancel
handler:^(UIAlertAction * action) {
@@ -830,7 +830,7 @@
- (void)showCrossSigningSetup
{
[self setupCrossSigningWithTitle:NSLocalizedStringFromTable(@"cross_signing_setup_banner_title", @"Vector", nil) message:NSLocalizedStringFromTable(@"security_settings_user_password_description", @"Vector", nil) success:^{
[self setupCrossSigningWithTitle:[VectorL10n crossSigningSetupBannerTitle] message:[VectorL10n securitySettingsUserPasswordDescription] success:^{
} failure:^(NSError *error) {
@@ -893,11 +893,11 @@
displayName = displayName ?: @"";
NSString *appName = [[NSBundle mainBundle] infoDictionary][@"CFBundleDisplayName"];
NSString *title = [NSString stringWithFormat:NSLocalizedStringFromTable(@"home_empty_view_title", @"Vector", nil), appName, displayName];
NSString *title = [VectorL10n homeEmptyViewTitle:appName :displayName];
[self.emptyView fillWith:[self emptyViewArtwork]
title:title
informationText:NSLocalizedStringFromTable(@"home_empty_view_information", @"Vector", nil)];
informationText:[VectorL10n homeEmptyViewInformation]];
}
- (UIImage*)emptyViewArtwork