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

MESSENGER fix some merge issues

Browse Source
This commit is contained in:
Frank Rotermund
2022-09-19 12:05:24 +02:00
parent 5d09c62e90
commit e6854a4e60
8 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Settings/SettingsViewController.m
+2 -2
View File
@@ -2636,7 +2636,7 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
{
MXKTableViewCell *versionCell = [self getDefaultTableViewCell:tableView];
versionCell.textLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"settings_element_version", @"Vector", nil), [BuildSettings elementBaseVersion]];
versionCell.textLabel.text = [BWIL10n settingsElementVersion:[BuildSettings elementBaseVersion]];
versionCell.selectionStyle = UITableViewCellSelectionStyleNone;
@@ -3274,7 +3274,7 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithLocalHTMLFile:htmlFile];
webViewViewController.title = NSLocalizedStringFromTable(@"settings_support", @"Vector", nil);
webViewViewController.title = BWIL10n.settingsSupport;
[self pushViewController:webViewViewController];
}