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

Remove MatrixKitL10n from SwiftGen

Browse Source 
Uses VectorL10n everywhere.
This commit is contained in:
Doug
2022-03-03 09:32:19 +00:00
parent 18bd0b861d
commit 86c2b4ebb5
97 changed files with 2492 additions and 2605 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/MatrixKit/Models/Account/MXKAccount.m
+5 -5
View File
@@ -346,7 +346,7 @@ static NSArray<NSNumber*> *initialSyncSilentErrorsHTTPStatusCodes;
code:0
userInfo:@{
NSLocalizedDescriptionKey:
[MatrixKitL10n accountErrorPushNotAllowed]
[VectorL10n accountErrorPushNotAllowed]
}];
if (failure)
{
@@ -423,7 +423,7 @@ static NSArray<NSNumber*> *initialSyncSilentErrorsHTTPStatusCodes;
code:0
userInfo:@{
NSLocalizedDescriptionKey:
[MatrixKitL10n accountErrorPushNotAllowed]
[VectorL10n accountErrorPushNotAllowed]
}];
failure (error);
}
@@ -558,7 +558,7 @@ static NSArray<NSNumber*> *initialSyncSilentErrorsHTTPStatusCodes;
}
else if (failure)
{
failure ([NSError errorWithDomain:kMXKAccountErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey: [MatrixKitL10n accountErrorMatrixSessionIsNotOpened]}]);
failure ([NSError errorWithDomain:kMXKAccountErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey: [VectorL10n accountErrorMatrixSessionIsNotOpened]}]);
}
}
@@ -578,7 +578,7 @@ static NSArray<NSNumber*> *initialSyncSilentErrorsHTTPStatusCodes;
}
else if (failure)
{
failure ([NSError errorWithDomain:kMXKAccountErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey: [MatrixKitL10n accountErrorMatrixSessionIsNotOpened]}]);
failure ([NSError errorWithDomain:kMXKAccountErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey: [VectorL10n accountErrorMatrixSessionIsNotOpened]}]);
}
}
@@ -599,7 +599,7 @@ static NSArray<NSNumber*> *initialSyncSilentErrorsHTTPStatusCodes;
}
else if (failure)
{
failure ([NSError errorWithDomain:kMXKAccountErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey: [MatrixKitL10n accountErrorMatrixSessionIsNotOpened]}]);
failure ([NSError errorWithDomain:kMXKAccountErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey: [VectorL10n accountErrorMatrixSessionIsNotOpened]}]);
}
}
Riot/Modules/MatrixKit/Models/Contact/MXKContactManager.m
+5 -5
View File
@@ -1176,9 +1176,9 @@ NSString *const MXKContactManagerDataType = @"org.matrix.kit.MXKContactManagerDa
{
NSString *appDisplayName = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleDisplayName"];
[MXKContactManager requestUserConfirmationForLocalContactsSyncWithTitle:[MatrixKitL10n localContactsAccessDiscoveryWarningTitle]
message:[MatrixKitL10n localContactsAccessDiscoveryWarning:appDisplayName]
manualPermissionChangeMessage:[MatrixKitL10n localContactsAccessNotGranted:appDisplayName]
[MXKContactManager requestUserConfirmationForLocalContactsSyncWithTitle:[VectorL10n localContactsAccessDiscoveryWarningTitle]
message:[VectorL10n localContactsAccessDiscoveryWarning:appDisplayName]
manualPermissionChangeMessage:[VectorL10n localContactsAccessNotGranted:appDisplayName]
showPopUpInViewController:viewController
completionHandler:handler];
}
@@ -1197,7 +1197,7 @@ NSString *const MXKContactManagerDataType = @"org.matrix.kit.MXKContactManagerDa
{
UIAlertController *alert = [UIAlertController alertControllerWithTitle:title message:message preferredStyle:UIAlertControllerStyleAlert];
[alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ok]
[alert addAction:[UIAlertAction actionWithTitle:[VectorL10n ok]
style:UIAlertActionStyleDefault
handler:^(UIAlertAction * action) {
@@ -1208,7 +1208,7 @@ NSString *const MXKContactManagerDataType = @"org.matrix.kit.MXKContactManagerDa
}]];
[alert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
[alert addAction:[UIAlertAction actionWithTitle:[VectorL10n cancel]
style:UIAlertActionStyleDefault
handler:^(UIAlertAction * action) {
Riot/Modules/MatrixKit/Models/Group/MXKSessionGroupsDataSource.m
+2 -2
View File
@@ -514,11 +514,11 @@ NSString *const kMXKGroupCellIdentifier = @"kMXKGroupCellIdentifier";
if (section == _groupInvitesSection)
{
sectionTitle = [MatrixKitL10n groupInviteSection];
sectionTitle = [VectorL10n groupInviteSection];
}
else if (section == _joinedGroupsSection)
{
sectionTitle = [MatrixKitL10n groupSection];
sectionTitle = [VectorL10n groupSection];
}
return sectionTitle;
Riot/Modules/MatrixKit/Models/PublicRoomList/DirectoryServerList/MXKDirectoryServerCellData.m
+1 -1
View File
@@ -43,7 +43,7 @@
else
{
// Use the Matrix name and logo when looking for Matrix rooms only
desc = [MatrixKitL10n matrix];
desc = [VectorL10n matrix];
icon = [NSBundle mxk_imageFromMXKAssetsBundleWithName:@"network_matrix"];
}
}
Riot/Modules/MatrixKit/Models/Room/MXKSendReplyEventStringLocalizer.m
+7 -7
View File
@@ -22,37 +22,37 @@
- (NSString *)senderSentAnImage
{
return [MatrixKitL10n messageReplyToSenderSentAnImage];
return [VectorL10n messageReplyToSenderSentAnImage];
}
- (NSString *)senderSentAVideo
{
return [MatrixKitL10n messageReplyToSenderSentAVideo];
return [VectorL10n messageReplyToSenderSentAVideo];
}
- (NSString *)senderSentAnAudioFile
{
return [MatrixKitL10n messageReplyToSenderSentAnAudioFile];
return [VectorL10n messageReplyToSenderSentAnAudioFile];
}
- (NSString *)senderSentAVoiceMessage
{
return [MatrixKitL10n messageReplyToSenderSentAVoiceMessage];
return [VectorL10n messageReplyToSenderSentAVoiceMessage];
}
- (NSString *)senderSentAFile
{
return [MatrixKitL10n messageReplyToSenderSentAFile];
return [VectorL10n messageReplyToSenderSentAFile];
}
- (NSString *)senderSentTheirLocation
{
return [MatrixKitL10n messageReplyToSenderSentTheirLocation];
return [VectorL10n messageReplyToSenderSentTheirLocation];
}
- (NSString *)messageToReplyToPrefix
{
return [MatrixKitL10n messageReplyToMessageToReplyToPrefix];
return [VectorL10n messageReplyToMessageToReplyToPrefix];
}
@end