github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14503 from overleaf/mf-change-copy-restricted-to-join-another-group

Browse source 
Update copy when managed user member tries to accept group invitation from another group

GitOrigin-RevId: 1d08135176a9ab5ef3bec0924ba62a9268eb1ac8
This commit is contained in:
Alexandre Bourdin 2023-08-25 10:54:42 +02:00 committed by Copybot
parent 0c5ba1e96e
commit f024f63d0f
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
services/web/app/views/subscriptions/team/invite.pug
View file

@ -19,8 +19,9 @@ block content
h1.text-centered(ng-non-bindable) #{translate("invited_to_group", {inviterName: inviterName, appName: appName})}
div(ng-show="view =='restrictedByManagedGroup'")
.alert.alert-info #{translate("restricted")}
p #{translate("account_managed_by_group_administrator", {admin: currentManagedUserAdminEmail})}
.alert.alert-info
strong #{translate("you_cant_join_this_group_subscription")}
p !{translate("your_account_is_managed_by_admin_cant_join_additional_group", {admin: currentManagedUserAdminEmail}, [{name: 'a', attrs: {href: '/learn/how-to/Understanding_Managed_Overleaf_Accounts'}}])}
div(ng-show="view =='hasIndividualRecurlySubscription'")
p #{translate("cancel_personal_subscription_first")}

2
services/web/locales/en.json
View file

@ -1907,6 +1907,7 @@
"you_can_opt_in_and_out_of_overleaf_labs_at_any_time_on_this_page": "You can <0>opt in and out</0> of Overleaf Labs at any time on this page",
"you_can_opt_in_and_out_of_the_program_at_any_time_on_this_page": "You can <0>opt in and out</0> of the program at any time on this page",
"you_can_opt_in_to_individual_experiments": "You will be asked to opt in and out of individual experiments; each experiment may have unique partners, requirements, terms and conditions, etc. that must be opted in to for that specific experiment",
"you_cant_join_this_group_subscription": "You can’t join this group subscription",
"you_dont_have_any_repositories": "You don’t have any repositories",
"you_get_access_to": "You get access to",
"you_get_access_to_info": "These features are available only to you (the subscriber).",
@ -1921,6 +1922,7 @@
"you_plus_6": "You + 6",
"you_will_be_able_to_contact_us_any_time_to_share_your_feedback": "<0>You will be able to contact us</0> any time to share your feedback",
"you_will_be_able_to_reassign_subscription": "You will be able to reassign their subscription membership to another person in your organization",
"your_account_is_managed_by_admin_cant_join_additional_group": "Your __appName__ account is managed by your current group admin (__admin__). This means you can’t join additional group subscriptions. <0>Read more about Managed Users.</0>",
"your_affiliation_is_confirmed": "Your <0>__institutionName__</0> affiliation is confirmed.",
"your_browser_does_not_support_this_feature": "Sorry, your browser doesn’t support this feature. Please update your browser to its latest version.",
"your_git_access_info": "Your Git authentication tokens should be entered whenever you’re prompted for a password.",