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

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 d0c989d72e 92c2a9488f
commit 1c4b09b813
414 changed files with 14789 additions and 4140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.m
+3 -3
View File
@@ -44,7 +44,7 @@
mxSession = theMXSession;
roomId = theRoomId;
_alertController = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"widget_picker_title", @"Vector", nil)
_alertController = [UIAlertController alertControllerWithTitle:[VectorL10n widgetPickerTitle]
message:nil
preferredStyle:UIAlertControllerStyleAlert];
}
@@ -80,7 +80,7 @@
// Link to the integration manager
if (RiotSettings.shared.roomInfoScreenShowIntegrations)
{
alertAction = [UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"widget_picker_manage_integrations", @"Vector", nil)
alertAction = [UIAlertAction actionWithTitle:[VectorL10n widgetPickerManageIntegrations]
style:UIAlertActionStyleDefault
handler:^(UIAlertAction * _Nonnull action)
{
@@ -95,7 +95,7 @@
}
// Cancel
alertAction = [UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
alertAction = [UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
style:UIAlertActionStyleCancel
handler:nil];
[self.alertController addAction:alertAction];