felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-05 07:27:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

vector-im/element-ios/issues/4899 - Fixed various localization issues.

Browse Source
This commit is contained in:
Stefan Ceriu
2021-09-28 08:47:47 +03:00
committed by Stefan Ceriu
parent 7b75dec011
commit 313e666017
14 changed files with 35 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Integrations/IntegrationManagerViewController.m
+14 -14
View File
@@ -196,7 +196,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
}
else
{
[self sendLocalisedError:@"widget_integration_missing_room_id" toRequest:requestId];
[self sendError:[VectorL10n widgetIntegrationMissingRoomId] toRequest:requestId];
return;
}
}
@@ -249,7 +249,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
if (!userId)
{
[self sendLocalisedError:@"widget_integration_missing_user_id" toRequest:requestId];
[self sendError:[VectorL10n widgetIntegrationMissingUserId] toRequest:requestId];
return;
}
@@ -292,7 +292,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
}
else
{
[self sendLocalisedError:@"widget_integration_room_not_recognised" toRequest:requestId];
[self sendError:[VectorL10n widgetIntegrationRoomNotRecognised] toRequest:requestId];
}
}
@@ -324,7 +324,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
} failure:^(NSError *error) {
MXStrongifyAndReturnIfNil(self);
[self sendLocalisedError:@"widget_integration_need_to_be_able_to_invite" toRequest:requestId];
[self sendError:[VectorL10n widgetIntegrationNeedToBeAbleToInvite] toRequest:requestId];
}];
}
}];
@@ -348,13 +348,13 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
if (!widget_id)
{
[self sendLocalisedError:@"widget_integration_unable_to_create" toRequest:requestId];
[self sendError:[VectorL10n widgetIntegrationUnableToCreate] toRequest:requestId];
return;
}
if (!widgetType)
{
[self sendLocalisedError:@"widget_integration_unable_to_create" toRequest:requestId];
[self sendError:[VectorL10n widgetIntegrationUnableToCreate] toRequest:requestId];
return;
}
@@ -412,7 +412,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
typeof(self) self = weakSelf;
if (self)
{
[self sendLocalisedError:@"widget_integration_unable_to_create" toRequest:requestId];
[self sendError:[VectorL10n widgetIntegrationUnableToCreate] toRequest:requestId];
}
}];
}
@@ -441,7 +441,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
typeof(self) self = weakSelf;
if (self)
{
[self sendLocalisedError:@"widget_integration_failed_to_send_request" toRequest:requestId];
[self sendError:[VectorL10n widgetIntegrationFailedToSendRequest] toRequest:requestId];
}
}];
}];
@@ -490,7 +490,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
if (room.summary.membership != MXMembershipJoin)
{
[self sendLocalisedError:@"widget_integration_must_be_in_room" toRequest:requestId];
[self sendError:[VectorL10n widgetIntegrationMustBeInRoom] toRequest:requestId];
return;
}
@@ -517,7 +517,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
}
else
{
[self sendLocalisedError:@"widget_integration_no_permission_in_room" toRequest:requestId];
[self sendError:[VectorL10n widgetIntegrationNoPermissionInRoom] toRequest:requestId];
}
}];
@@ -576,7 +576,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
typeof(self) self = weakSelf;
if (self)
{
[self sendLocalisedError:@"widget_integration_failed_to_send_request" toRequest:requestId];
[self sendError:[VectorL10n widgetIntegrationFailedToSendRequest] toRequest:requestId];
}
}];
}
@@ -648,7 +648,7 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
typeof(self) self = weakSelf;
if (self)
{
[self sendLocalisedError:@"widget_integration_failed_to_send_request" toRequest:requestId];
[self sendError:[VectorL10n widgetIntegrationFailedToSendRequest] toRequest:requestId];
}
}];
}
@@ -687,14 +687,14 @@ NSString *const kIntegrationManagerAddIntegrationScreen = @"add_integ";
typeof(self) self = weakSelf;
if (self)
{
[self sendLocalisedError:@"widget_integration_failed_to_send_request" toRequest:requestId];
[self sendError:[VectorL10n widgetIntegrationFailedToSendRequest] toRequest:requestId];
}
}];
}
else
{
MXLogDebug(@"[IntegrationManagerVC] setBotPower. Power level must be positive integer.");
[self sendLocalisedError:@"widget_integration_positive_power_level" toRequest:requestId];
[self sendError:[VectorL10n widgetIntegrationPositivePowerLevel] toRequest:requestId];
}
}];
}
Riot/Modules/Integrations/Widgets/WidgetViewController.h
-8
View File
@@ -99,12 +99,4 @@
*/
- (void)sendError:(NSString*)message toRequest:(NSString*)requestId;
/**
Send a localised message error to a request from the widget.
@param errorKey the string id of the message error.
@param requestId the id of the widget request.
*/
- (void)sendLocalisedError:(NSString*)errorKey toRequest:(NSString*)requestId;
@end
Riot/Modules/Integrations/Widgets/WidgetViewController.m
-6
View File
@@ -582,12 +582,6 @@ NSString *const kJavascriptSendResponseToPostMessageAPI = @"riotIOS.sendResponse
toRequest:requestId];
}
- (void)sendLocalisedError:(NSString*)errorKey toRequest:(NSString*)requestId
{
[self sendError:NSLocalizedStringFromTable(errorKey, @"Vector", nil) toRequest:requestId];
}
#pragma mark - Private methods
- (NSString *)stringByReplacingScalarTokenInString:(NSString*)string byScalarToken:(NSString*)scalarToken