Skip to content

Commit 6c10e68

Browse files
committed
Actually, don't fallback to the email address for the account name
1 parent 7d8644f commit 6c10e68

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

templates/pages/upstream_oauth2/do_register.html

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,6 @@ <h3 class="provider">
7171
<p class="account">
7272
{{- upstream_oauth_link.human_account_name -}}
7373
</p>
74-
{% elif imported_email %}
75-
{# We fallback to the email if we have one #}
76-
<p class="account">
77-
{{- imported_email -}}
78-
</p>
7974
{% endif %}
8075
</div>
8176
</section>

translations/en.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"create_account": "Create Account",
1616
"@create_account": {
17-
"context": "pages/login.html:68:35-61, pages/upstream_oauth2/do_register.html:197:26-52"
17+
"context": "pages/login.html:68:35-61, pages/upstream_oauth2/do_register.html:192:26-52"
1818
},
1919
"sign_in": "Sign in",
2020
"@sign_in": {
@@ -71,19 +71,19 @@
7171
"common": {
7272
"display_name": "Display Name",
7373
"@display_name": {
74-
"context": "pages/upstream_oauth2/do_register.html:151:37-61"
74+
"context": "pages/upstream_oauth2/do_register.html:146:37-61"
7575
},
7676
"email_address": "Email address",
7777
"@email_address": {
78-
"context": "pages/account/emails/add.html:33:33-58, pages/recovery/start.html:34:33-58, pages/register.html:40:35-60, pages/upstream_oauth2/do_register.html:119:37-62"
78+
"context": "pages/account/emails/add.html:33:33-58, pages/recovery/start.html:34:33-58, pages/register.html:40:35-60, pages/upstream_oauth2/do_register.html:114:37-62"
7979
},
8080
"loading": "Loading…",
8181
"@loading": {
8282
"context": "form_post.html:14:27-46"
8383
},
8484
"mxid": "Matrix ID",
8585
"@mxid": {
86-
"context": "pages/upstream_oauth2/do_register.html:98:35-51"
86+
"context": "pages/upstream_oauth2/do_register.html:93:35-51"
8787
},
8888
"password": "Password",
8989
"@password": {
@@ -95,7 +95,7 @@
9595
},
9696
"username": "Username",
9797
"@username": {
98-
"context": "pages/login.html:46:37-57, pages/register.html:36:35-55, pages/upstream_oauth2/do_register.html:106:35-55, pages/upstream_oauth2/do_register.html:111:39-59"
98+
"context": "pages/login.html:46:37-57, pages/register.html:36:35-55, pages/upstream_oauth2/do_register.html:101:35-55, pages/upstream_oauth2/do_register.html:106:39-59"
9999
}
100100
},
101101
"error": {
@@ -519,7 +519,7 @@
519519
},
520520
"terms_of_service": "I agree to the <a href=\"%s\" data-kind=\"primary\" class=\"cpd-link\">Terms and Conditions</a>",
521521
"@terms_of_service": {
522-
"context": "pages/register.html:53:37-97, pages/upstream_oauth2/do_register.html:184:35-95"
522+
"context": "pages/register.html:53:37-97, pages/upstream_oauth2/do_register.html:179:35-95"
523523
}
524524
},
525525
"scope": {
@@ -584,7 +584,7 @@
584584
},
585585
"enforced_by_policy": "Enforced by server policy",
586586
"@enforced_by_policy": {
587-
"context": "pages/upstream_oauth2/do_register.html:102:14-66"
587+
"context": "pages/upstream_oauth2/do_register.html:97:14-66"
588588
},
589589
"forced_display_name": "Will use the following display name",
590590
"@forced_display_name": {
@@ -610,11 +610,11 @@
610610
},
611611
"imported_from_upstream": "Imported from your upstream account",
612612
"@imported_from_upstream": {
613-
"context": "pages/upstream_oauth2/do_register.html:126:18-74, pages/upstream_oauth2/do_register.html:158:18-74"
613+
"context": "pages/upstream_oauth2/do_register.html:121:18-74, pages/upstream_oauth2/do_register.html:153:18-74"
614614
},
615615
"imported_from_upstream_with_name": "Imported from your %(human_name)s account",
616616
"@imported_from_upstream_with_name": {
617-
"context": "pages/upstream_oauth2/do_register.html:124:18-131, pages/upstream_oauth2/do_register.html:156:18-131"
617+
"context": "pages/upstream_oauth2/do_register.html:119:18-131, pages/upstream_oauth2/do_register.html:151:18-131"
618618
},
619619
"link_existing": "Link to an existing account",
620620
"@link_existing": {
@@ -640,7 +640,7 @@
640640
},
641641
"use": "Use",
642642
"@use": {
643-
"context": "pages/upstream_oauth2/do_register.html:142:18-55, pages/upstream_oauth2/do_register.html:175:20-57"
643+
"context": "pages/upstream_oauth2/do_register.html:137:18-55, pages/upstream_oauth2/do_register.html:170:20-57"
644644
}
645645
},
646646
"suggest_link": {

0 commit comments

Comments
 (0)