From 7a1da7c2d99fbd1dd324bc7303e664c6d78d7a04 Mon Sep 17 00:00:00 2001 From: privacyguard Date: Sat, 5 Oct 2024 22:03:51 +0300 Subject: [PATCH 1/4] Added translations for the SSO Support --- translations/en.json | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/translations/en.json b/translations/en.json index bd98942..e0a7c95 100644 --- a/translations/en.json +++ b/translations/en.json @@ -46,6 +46,7 @@ "send_message": "Send Message", "message": "Message", "edit": "Edit", + "add": "Add", "reply": "Reply", "more": "More", "cancel": "Cancel", @@ -429,6 +430,7 @@ "invalid_username": "Invalid username.", "admin_already_created": "Sorry, there's already an admin.", "user_already_exists": "User already exists.", + "username_already_exists": "Username already exists.", "email_already_exists": "Email already exists.", "couldnt_update_user": "Couldn't update user.", "system_err_login": "System error. Try logging out and back in.", @@ -596,6 +598,7 @@ "remote_follow": "Remote Follow", "remote_follow_modal_title": "Subscribe from Remote Instance", "blur_nsfw": "Blur NSFW content", + "auto_expand": "Auto expand media", "remote_follow_invalid_instance": "{{instance}} is not a vaild domain.", "remote_follow_local_instance": "Cannot fetch local instance for remote follow", "import_export_section_title": "Import/Export Settings", @@ -611,6 +614,36 @@ "import_success": "Settings successfully imported!", "confirmation_required": "Confirmation Required", "submit": "Submit", + "authentication": "Authentication", + "oauth_config": "OAuth Configuration", + "oauth_providers": "Providers", + "add_oauth_provider": "Add provider", + "oauth_provider_presets": "Preset Providers", + "no_oauth_providers_blurb": "No providers", + "delete_oauth_provider_are_you_sure": "Are you sure you want to delete this provider?", + "deleting_oauth_provider": "Deleting provider...", + "oauth_display_name": "Display Name", + "oauth_issuer": "Issuer", + "oauth_authorization_endpoint": "Authorization Endpoint", + "oauth_token_endpoint": "Token Endpoint", + "oauth_userinfo_endpoint": "User Info Endpoint", + "oauth_id_claim": "ID Claim", + "oauth_client_id": "Client ID", + "oauth_client_secret": "Client Secret", + "oauth_scopes": "OAuth Scopes", + "oauth_auto_verify_email": "Auto-Verify Email", + "oauth_account_linking_enabled": "Account Linking Enabled", + "oauth_enabled": "Enabled", + "couldnt_edit_oauth_provider": "Couldn't edit OAuth provider.", + "couldnt_delete_oauth_provider": "Couldn't delete OAuth provider.", + "couldnt_create_oauth_provider": "Couldn't create OAuth provider.", + "or": "Or", + "available_oauth_providers": "Login with", + "oauth_login_with_provider": "Login with SSO Provider", + "oauth_authorization_invalid": "Login Authorization Failed.", + "oauth_login_failed": "Login Failed.", + "oauth_registration_closed": "Registration closed.", + "oauth_registration": "OAuth Registration", "community_locked_message": "<1>Community locked: only moderators can create posts. You can still comment on posts.", "community_locked": "Community locked", "community_visibility": "Visibility", From c5da3ed122f2e1490b8719235307845613c4ff06 Mon Sep 17 00:00:00 2001 From: privacyguard Date: Sat, 5 Oct 2024 22:10:34 +0300 Subject: [PATCH 2/4] Added "registration_application_is_pending" to allow migrating from "registration_application_pending" --- translations/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/en.json b/translations/en.json index e0a7c95..7204908 100644 --- a/translations/en.json +++ b/translations/en.json @@ -499,7 +499,7 @@ "application_email_admins": "Email admins on receiving new applications", "reports_email_admins": "Email admins on receiving new reports", "private_instance": "Private Instance", - "registration_application_pending": "Registration approval pending.", + "registration_application_is_pending": "Registration approval pending.", "registration_denied": "Registration application denied.", "email_not_verified": "Email not verified.", "email_verified": "Your email has been verified.", From d458bb660007716a3daf662a1c0fdc78c0aa9334 Mon Sep 17 00:00:00 2001 From: privacyguard Date: Sun, 6 Oct 2024 13:04:40 +0300 Subject: [PATCH 3/4] SSO translation improvements --- translations/en.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/translations/en.json b/translations/en.json index 7204908..841ca93 100644 --- a/translations/en.json +++ b/translations/en.json @@ -499,7 +499,7 @@ "application_email_admins": "Email admins on receiving new applications", "reports_email_admins": "Email admins on receiving new reports", "private_instance": "Private Instance", - "registration_application_is_pending": "Registration approval pending.", + "registration_application_pending": "Registration approval pending.", "registration_denied": "Registration application denied.", "email_not_verified": "Email not verified.", "email_verified": "Your email has been verified.", @@ -630,10 +630,11 @@ "oauth_id_claim": "ID Claim", "oauth_client_id": "Client ID", "oauth_client_secret": "Client Secret", + "cannot_view_secret_after_saving": "Cannot view secret after saving", "oauth_scopes": "OAuth Scopes", "oauth_auto_verify_email": "Auto-Verify Email", - "oauth_account_linking_enabled": "Account Linking Enabled", - "oauth_enabled": "Enabled", + "oauth_account_linking_enabled": "Enable Account Linking", + "oauth_enabled": "Enable Provider", "couldnt_edit_oauth_provider": "Couldn't edit OAuth provider.", "couldnt_delete_oauth_provider": "Couldn't delete OAuth provider.", "couldnt_create_oauth_provider": "Couldn't create OAuth provider.", @@ -643,7 +644,7 @@ "oauth_authorization_invalid": "Login Authorization Failed.", "oauth_login_failed": "Login Failed.", "oauth_registration_closed": "Registration closed.", - "oauth_registration": "OAuth Registration", + "oauth_registration": "Allow Registration via OAuth", "community_locked_message": "<1>Community locked: only moderators can create posts. You can still comment on posts.", "community_locked": "Community locked", "community_visibility": "Visibility", From 46b7eef11b171d460d36f37002a6b6a08ee8fb8b Mon Sep 17 00:00:00 2001 From: privacyguard Date: Mon, 7 Oct 2024 10:09:49 +0300 Subject: [PATCH 4/4] removed "available_oauth_providers" previously used by the modal --- translations/en.json | 1 - 1 file changed, 1 deletion(-) diff --git a/translations/en.json b/translations/en.json index 841ca93..c66dfc2 100644 --- a/translations/en.json +++ b/translations/en.json @@ -639,7 +639,6 @@ "couldnt_delete_oauth_provider": "Couldn't delete OAuth provider.", "couldnt_create_oauth_provider": "Couldn't create OAuth provider.", "or": "Or", - "available_oauth_providers": "Login with", "oauth_login_with_provider": "Login with SSO Provider", "oauth_authorization_invalid": "Login Authorization Failed.", "oauth_login_failed": "Login Failed.",