Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
uphrh-SunbirdEd-portal-old
Commits
b44e08af
Commit
b44e08af
authored
5 years ago
by
Devesh
Browse files
Options
Download
Patches
Plain Diff
Issue #SB-13773 fix:Secure auto migration language changes
parent
479755d2
master
Dark_theme
SB-25589
SB-28090
aws_fileRead
contributions
dependabot/npm_and_yarn/src/app/client/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/app/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/app/express-4.17.3
dependabot/npm_and_yarn/src/app/jsonwebtoken-9.0.0
dependabot/npm_and_yarn/src/desktop/OpenRAP/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/desktop/OpenRAP/express-4.17.3
dependabot/npm_and_yarn/src/desktop/OpenRAP/jsonwebtoken-9.0.0
dependabot/npm_and_yarn/src/desktop/OpenRAP/qs-6.5.3
dependabot/npm_and_yarn/src/desktop/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/desktop/express-4.17.3
dependabot/npm_and_yarn/src/desktop/jsonwebtoken-9.0.0
dependabot/npm_and_yarn/src/desktop/qs-6.10.3
desktop-common-consumption
filters_5.1.1
gcp
gcp_test
keshavprasadms-patch-1
keshavprasadms-patch-2
release-2.10.0
release-2.10.1
release-2.10.2
release-2.10.3
release-2.4.0
release-2.4.1
release-2.4.2
release-2.5.0
release-2.5.1
release-2.6.0
release-2.6.0-loadtest
release-2.6.5
release-2.6.6
release-2.7.0
release-2.8.0
release-2.8.1
release-2.8.10
release-2.8.11
release-2.8.12
release-2.8.2
release-2.8.3
release-2.8.4
release-2.8.5
release-2.8.6
release-2.8.7
release-2.8.8
release-2.8.9
release-2.9.0
release-3.0
release-3.0-merge
release-3.0.0
release-3.0.1
release-3.0.2
release-3.0.3
release-3.0.4
release-3.0.4-sso
release-3.1.0
release-3.1.1
release-3.1.2
release-3.2.0
release-3.2.1
release-3.2.10
release-3.2.11
release-3.2.12
release-3.2.13
release-3.2.14
release-3.2.2
release-3.2.3
release-3.2.4
release-3.3.0
release-3.3.0-telemetry-fix
release-3.3.1
release-3.3.2
release-3.4.0
release-3.4.1
release-3.4.2
release-3.4.3
release-3.4.4
release-3.4.5
release-3.4.6
release-3.4.7
release-3.5.0
release-3.5.1
release-3.5.2
release-3.5.3
release-3.6.0
release-3.6.1
release-3.6.5
release-3.6.6
release-3.7.0
release-3.7.1
release-3.7.2
release-3.8.0
release-3.8.1
release-3.8.2
release-3.8.3
release-3.9.0
release-3.9.1
release-3.9.2
release-3.9.3
release-4.0.0
release-4.0.1
release-4.0.2
release-4.1
release-4.1.0
release-4.1.1
release-4.10.0
release-4.10.0.1
release-4.10.1
release-4.10.2
release-4.10.2.1
release-4.10.2.2
release-4.10.3
release-4.2.0
release-4.2.1
release-4.3.0
release-4.3.1
release-4.4.0
release-4.4.1
release-4.5.0
release-4.5.1
release-4.5.2
release-4.6.0
release-4.7.0
release-4.7.1
release-4.8.0
release-4.8.5
release-4.9.0
release-4.9.1
release-5.0.0
release-5.0.0.1
release-5.0.0.2
release-5.0.0.3
release-5.0.1
release-5.0.2
release-5.1.0
release-5.1.1
release-sonarcloud
revert-3718-copypi
revert-3842-release-2.8.7
revert-3890-release-2.8.9
revert-4427-player-cache-issue
revert-4537-SB-19763
revert-5244-sh-809
revert-5260-SB-table-3.3.0
revert-8284-release-5.0.0
sharathkashyap-patch-1
Tags unavailable
No related merge requests found
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/app/client/src/app/modules/public/module/sign-in/sso/components/auth-failed/auth-failed.component.html
+2
-2
...-in/sso/components/auth-failed/auth-failed.component.html
src/app/client/src/app/modules/public/module/sign-in/sso/components/auth-failed/auth-failed.component.ts
+3
-0
...gn-in/sso/components/auth-failed/auth-failed.component.ts
src/app/resourcebundles/data/consumption/en.properties
+2
-0
src/app/resourcebundles/data/consumption/en.properties
src/app/resourcebundles/json/en.json
+1
-2
src/app/resourcebundles/json/en.json
with
8 additions
and
4 deletions
+8
-4
src/app/client/src/app/modules/public/module/sign-in/sso/components/auth-failed/auth-failed.component.html
+
2
−
2
View file @
b44e08af
...
...
@@ -7,8 +7,8 @@
<div
class=
"sb-merged-account-content text-center"
>
<h3
class=
"sb-merged-account-body-header my-24 font-weight-bold f-18"
>
{{resourceService.frmelmnts?.lbl?.mergeAccount}}
</h3>
<p
class=
"py-8 m-0 failed-message font-weight-bold"
>
Could not merge accounts because the password entered is incorrect.
Click OK to create a new DIKSHA account
</p>
<p
class=
"py-8 m-0 failed-message font-weight-bold"
>
{{resourceService.messages?.imsg?.m0072}}
{{resourceService.messages?.imsg?.m0073 | interpolate:'{instance}': instance }}
</p>
</div>
<div
class=
"d-flex flex-jc-center mt-40"
>
<button
class=
"sb-btn sb-btn-secondary sb-btn-md w-100"
...
...
This diff is collapsed.
Click to expand it.
src/app/client/src/app/modules/public/module/sign-in/sso/components/auth-failed/auth-failed.component.ts
+
3
−
0
View file @
b44e08af
...
...
@@ -8,8 +8,11 @@ import {ActivatedRoute} from '@angular/router';
styleUrls
:
[
'
./auth-failed.component.scss
'
]
})
export
class
AuthFailedComponent
implements
OnInit
{
instance
:
string
;
constructor
(
public
activatedRoute
:
ActivatedRoute
,
public
resourceService
:
ResourceService
)
{
this
.
instance
=
(
<
HTMLInputElement
>
document
.
getElementById
(
'
instance
'
))
?
(
<
HTMLInputElement
>
document
.
getElementById
(
'
instance
'
)).
value
.
toUpperCase
()
:
'
SUNBIRD
'
;
}
queryParam
:
any
;
...
...
This diff is collapsed.
Click to expand it.
src/app/resourcebundles/data/consumption/en.properties
+
2
−
0
View file @
b44e08af
...
...
@@ -685,6 +685,8 @@ messages.imsg.m0066 = You will be notified once it is complete
messages.imsg.m0067
=
Account merge has not been initiated. Please try again later
messages.imsg.m0070
=
Account already exists On {instance}, If this is your account, click Merge to
messages.imsg.m0071
=
Cancel to create new {instance} Account
messages.imsg.m0072
=
Could not merge accounts because the password entered is incorrect.
messages.imsg.m0073
=
Click OK to create a new {instance} account.
messages.imsg.m0017
=
Profile Completeness.
messages.imsg.m0022
=
Stats for last 7 days
messages.imsg.m0023
=
Stats for last 14 days
...
...
This diff is collapsed.
Click to expand it.
src/app/resourcebundles/json/en.json
+
1
−
2
View file @
b44e08af
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets