Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'psrpinto-fix/naming' into develop

Browse source
This commit is contained in:
manuroe 2021-10-01 11:52:19 +01:00
commit 9a79fe3bd1
8 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Riot/Assets/en.lproj/Vector.strings
View file

@ -533,7 +533,7 @@ Tap the + to start adding people.";
"settings_calls_stun_server_fallback_description" = "Allow fallback call assist server %@ when your homeserver does not offer one (your IP address would be shared during a call).";
"settings_integrations_allow_button" = "Manage integrations";
"settings_integrations_allow_description" = "Use an Integration Manager (%@) to manage bots, bridges, widgets and sticker packs.\n\nIntegration Managers receive configuration data, and can modify widgets, send room invites and set power levels on your behalf.";
"settings_integrations_allow_description" = "Use an integration manager (%@) to manage bots, bridges, widgets and sticker packs.\n\nIntegration managers receive configuration data, and can modify widgets, send room invites and set power levels on your behalf.";
"settings_ui_language" = "Language";
"settings_ui_theme" = "Theme";
@ -618,7 +618,7 @@ Tap the + to start adding people.";
"settings_devices_description" = "A session's public name is visible to people you communicate with";
"settings_discovery_no_identity_server" = "You are not currently using an identity server. To be discoverable by existing contacts you known, add one.";
"settings_discovery_terms_not_signed" = "Agree to the Identity Server (%@) Terms of Service to allow yourself to be discoverable by email address or phone number.";
"settings_discovery_terms_not_signed" = "Agree to the identity server (%@) Terms of Service to allow yourself to be discoverable by email address or phone number.";
"settings_discovery_three_pids_management_information_part1" = "Manage which email addresses or phone numbers other users can use to discover you and use to invite you to rooms. Add or remove email addresses or phone numbers from this list in ";
"settings_discovery_three_pids_management_information_part2" = "User Settings";
"settings_discovery_three_pids_management_information_part3" = ".";
@ -691,7 +691,7 @@ Tap the + to start adding people.";
"authenticated_session_flow_not_supported" = "This app does not support the authentication mechanism on your homeserver.";
// Identity server settings
"identity_server_settings_title" = "Identity Server";
"identity_server_settings_title" = "Identity server";
"identity_server_settings_description" = "You are currently using %@ to discover and be discoverable by existing contacts you know.";
"identity_server_settings_no_is_description" = "You are not currently using an identity server. To discover and be discoverable by existing contacts, add one above.";
@ -982,7 +982,7 @@ Tap the + to start adding people.";
"widget_integration_missing_room_id" = "Missing room_id in request.";
"widget_integration_missing_user_id" = "Missing user_id in request.";
"widget_integration_room_not_visible" = "Room %@ is not visible.";
"widget_integration_manager_disabled" = "You need to enable Integration Manager in settings";
"widget_integration_manager_disabled" = "You need to enable integration manager in settings";
// Widget Picker
"widget_picker_title" = "Integrations";

8
Riot/Generated/Strings.swift
View file

@ -1595,7 +1595,7 @@ public class VectorL10n: NSObject {
public static var identityServerSettingsPlaceHolder: String {
return VectorL10n.tr("Vector", "identity_server_settings_place_holder")
}
/// Identity Server
/// Identity server
public static var identityServerSettingsTitle: String {
return VectorL10n.tr("Vector", "identity_server_settings_title")
}
@ -4207,7 +4207,7 @@ public class VectorL10n: NSObject {
public static var settingsDiscoverySettings: String {
return VectorL10n.tr("Vector", "settings_discovery_settings")
}
/// Agree to the Identity Server (%@) Terms of Service to allow yourself to be discoverable by email address or phone number.
/// Agree to the identity server (%@) Terms of Service to allow yourself to be discoverable by email address or phone number.
public static func settingsDiscoveryTermsNotSigned(_ p1: String) -> String {
return VectorL10n.tr("Vector", "settings_discovery_terms_not_signed", p1)
}
@ -4339,7 +4339,7 @@ public class VectorL10n: NSObject {
public static var settingsIntegrationsAllowButton: String {
return VectorL10n.tr("Vector", "settings_integrations_allow_button")
}
/// Use an Integration Manager (%@) to manage bots, bridges, widgets and sticker packs.\n\nIntegration Managers receive configuration data, and can modify widgets, send room invites and set power levels on your behalf.
/// Use an integration manager (%@) to manage bots, bridges, widgets and sticker packs.\n\nIntegration managers receive configuration data, and can modify widgets, send room invites and set power levels on your behalf.
public static func settingsIntegrationsAllowDescription(_ p1: String) -> String {
return VectorL10n.tr("Vector", "settings_integrations_allow_description", p1)
}
@ -5183,7 +5183,7 @@ public class VectorL10n: NSObject {
public static var widgetIntegrationFailedToSendRequest: String {
return VectorL10n.tr("Vector", "widget_integration_failed_to_send_request")
}
/// You need to enable Integration Manager in settings
/// You need to enable integration manager in settings
public static var widgetIntegrationManagerDisabled: String {
return VectorL10n.tr("Vector", "widget_integration_manager_disabled")
}

6
Riot/Managers/Widgets/WidgetManager.m
View file

@ -262,7 +262,7 @@ NSString *const WidgetManagerErrorDomain = @"WidgetManagerErrorDomain";
WidgetManagerConfig *config = [self configForUser:userId];
if (!config.hasUrls)
{
MXLogDebug(@"[WidgetManager] createJitsiWidgetInRoom: Error: no Integrations Manager API URL for user %@", userId);
MXLogDebug(@"[WidgetManager] createJitsiWidgetInRoom: Error: no integration manager API URL for user %@", userId);
failure(self.errorForNonConfiguredIntegrationManager);
return nil;
}
@ -574,7 +574,7 @@ NSString *const WidgetManagerErrorDomain = @"WidgetManagerErrorDomain";
WidgetManagerConfig *config = [self configForUser:userId];
if (!config.hasUrls)
{
MXLogDebug(@"[WidgetManager] registerForScalarToken: Error: no Integrations Manager API URL for user %@", mxSession.myUser.userId);
MXLogDebug(@"[WidgetManager] registerForScalarToken: Error: no integration manager API URL for user %@", mxSession.myUser.userId);
failure(self.errorForNonConfiguredIntegrationManager);
return nil;
}
@ -654,7 +654,7 @@ NSString *const WidgetManagerErrorDomain = @"WidgetManagerErrorDomain";
WidgetManagerConfig *config = [self configForUser:userId];
if (!config.hasUrls)
{
MXLogDebug(@"[WidgetManager] validateScalarToken: Error: no Integrations Manager API URL for user %@", mxSession.myUser.userId);
MXLogDebug(@"[WidgetManager] validateScalarToken: Error: no integration manager API URL for user %@", mxSession.myUser.userId);
failure(self.errorForNonConfiguredIntegrationManager);
return nil;
}

2
Riot/Modules/Application/LegacyAppDelegate.m
View file

@ -1173,7 +1173,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
return YES;
}
// Manage email validation link from Identity Server v1 or v2
// Manage email validation link from identity server v1 or v2
else if ([webURL.path isEqualToString:validateEmailSubmitTokenAPIPathV1]
|| [webURL.path isEqualToString:validateEmailSubmitTokenAPIPathV2])
{

2
Riot/Modules/Authentication/AuthenticationViewController.xib
View file

@ -294,7 +294,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kjJ-Tb-SIW">
<rect key="frame" x="0.0" y="70" width="375" height="70"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Identity Server:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5CT-Ht-Z3v">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Identity server:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5CT-Ht-Z3v">
<rect key="frame" x="18" y="8" width="339" height="20"/>
<accessibility key="accessibilityConfiguration" identifier="AuthenticationVCISLabel"/>
<constraints>

2
Riot/Modules/Settings/IdentityServer/SettingsIdentityServerViewController.storyboard
View file

@ -28,7 +28,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0W7-LW-UNr">
<rect key="frame" x="0.0" y="40" width="375" height="51"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Identity Server" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g0a-45-iRa">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Identity server" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g0a-45-iRa">
<rect key="frame" x="20" y="16" width="100" height="19"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>

4
Riot/Modules/Settings/SettingsViewController.m
View file

@ -4364,7 +4364,7 @@ TableViewSectionsDelegate>
}
#pragma mark - Identity Server updates
#pragma mark - Identity server updates
- (void)registerAccountDataDidChangeIdentityServerNotification
{
@ -4458,7 +4458,7 @@ TableViewSectionsDelegate>
}
#pragma mark - Identity Server
#pragma mark - Identity server
- (void)showIdentityServerSettingsScreen
{

1
changelog.d/4559.bugfix Normal file
View file

@ -0,0 +1 @@
i18n: Standardise casing of identity server and integration manager.