File tree Expand file tree Collapse file tree 4 files changed +12
-7
lines changed Expand file tree Collapse file tree 4 files changed +12
-7
lines changed Original file line number Diff line number Diff line change 1
1
ACCESS_TOKEN_COOKIE_NAME = edx-jwt-cookie-header-payload
2
2
ACCOUNT_PROFILE_URL = http://localhost:1995
3
- ACCOUNT_SETTINGS_LABEL =
4
3
ACCOUNT_SETTINGS_URL = http://localhost:1997
5
4
BASE_URL = localhost:8080
6
5
CREDENTIALS_BASE_URL = http://localhost:18150
@@ -18,6 +17,7 @@ ORDER_HISTORY_URL=localhost:1996/orders
18
17
REFRESH_ACCESS_TOKEN_ENDPOINT = http://localhost:18000/login_refresh
19
18
SEGMENT_KEY = null
20
19
SHOW_FULLNAME = false
20
+ SHOW_SETTINGS_LABEL = false
21
21
SITE_NAME = Open edX
22
22
USER_INFO_COOKIE_NAME = edx-user-info
23
23
LOGO_URL = https://edx-cdn.org/v3/default/logo.svg
Original file line number Diff line number Diff line change @@ -26,11 +26,11 @@ ensureConfig([
26
26
27
27
subscribe ( APP_CONFIG_INITIALIZED , ( ) => {
28
28
mergeConfig ( {
29
- ACCOUNT_SETTINGS_LABEL : process . env . ACCOUNT_SETTINGS_LABEL ,
30
29
AUTHN_MINIMAL_HEADER : ! ! process . env . AUTHN_MINIMAL_HEADER ,
31
30
DASHBOARD_URL : process . env . DASHBOARD_URL ,
32
31
EXTERNAL_ACCOUNT_PROFILE_URL : process . env . EXTERNAL_ACCOUNT_PROFILE_URL ,
33
32
SHOW_FULLNAME : process . env . SHOW_FULLNAME ,
33
+ SHOW_SETTINGS_LABEL : process . env . SHOW_SETTINGS_LABEL ,
34
34
} , 'Header additional config' ) ;
35
35
} ) ;
36
36
@@ -66,7 +66,7 @@ const Header = ({ intl }) => {
66
66
{
67
67
type : 'item' ,
68
68
href : config . ACCOUNT_SETTINGS_URL ,
69
- content : config . ACCOUNT_SETTINGS_LABEL ? config . ACCOUNT_SETTINGS_LABEL : intl . formatMessage ( messages [ 'header.user.menu.account.settings ' ] ) ,
69
+ content : config . SHOW_SETTINGS_LABEL ? intl . formatMessage ( messages [ 'header.user.menu.settings' ] ) : intl . formatMessage ( messages [ 'header.user.menu.account' ] ) ,
70
70
} ,
71
71
{
72
72
type : 'item' ,
Original file line number Diff line number Diff line change @@ -31,11 +31,16 @@ const messages = defineMessages({
31
31
defaultMessage : 'Profile' ,
32
32
description : 'Link to the user profile' ,
33
33
} ,
34
- 'header.user.menu.account.settings ' : {
35
- id : 'header.user.menu.account.settings ' ,
34
+ 'header.user.menu.account' : {
35
+ id : 'header.user.menu.account' ,
36
36
defaultMessage : 'Account' ,
37
37
description : 'Link to account settings' ,
38
38
} ,
39
+ 'header.user.menu.settings' : {
40
+ id : 'header.user.menu.settings' ,
41
+ defaultMessage : 'Settings' ,
42
+ description : 'Link to account settings' ,
43
+ } ,
39
44
'header.user.menu.order.history' : {
40
45
id : 'header.user.menu.order.history' ,
41
46
defaultMessage : 'Order History' ,
Original file line number Diff line number Diff line change @@ -28,11 +28,11 @@ const AuthenticatedUserDropdown = ({ intl, name }) => {
28
28
</ Dropdown . Toggle >
29
29
< Dropdown . Menu className = "dropdown-menu-right" >
30
30
{ dashboardMenuItem }
31
- < Dropdown . Item href = { `${ getConfig ( ) . ACCOUNT_PROFILE_URL } /u/${ username } ` } >
31
+ < Dropdown . Item href = { getConfig ( ) . EXTERNAL_ACCOUNT_PROFILE_URL ? getConfig ( ) . EXTERNAL_ACCOUNT_PROFILE_URL : `${ getConfig ( ) . ACCOUNT_PROFILE_URL } /u/${ username } ` } >
32
32
{ intl . formatMessage ( messages . profile ) }
33
33
</ Dropdown . Item >
34
34
< Dropdown . Item href = { getConfig ( ) . ACCOUNT_SETTINGS_URL } >
35
- { intl . formatMessage ( messages . settings ) }
35
+ { getConfig ( ) . SHOW_SETTINGS_LABEL ? intl . formatMessage ( messages . settings ) : intl . formatMessage ( messages . account ) }
36
36
</ Dropdown . Item >
37
37
{ getConfig ( ) . ORDER_HISTORY_URL && (
38
38
< Dropdown . Item href = { getConfig ( ) . ORDER_HISTORY_URL } >
You can’t perform that action at this time.
0 commit comments