Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
RocketChat
Rocket.Chat.ReactNative
Commits
1d79746e
Unverified
Commit
1d79746e
authored
Feb 11, 2020
by
Djorkaeff Alexandre
Committed by
GitHub
Feb 11, 2020
Browse files
[IMPROVEMENT] Reset app when language is changed (#1702)
parent
42a53b4c
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/views/LanguageView/index.js
View file @
1d79746e
...
...
@@ -2,7 +2,7 @@ import React from 'react';
import
PropTypes
from
'
prop-types
'
;
import
{
FlatList
}
from
'
react-native
'
;
import
{
connect
}
from
'
react-redux
'
;
import
{
SafeAreaView
,
NavigationActions
}
from
'
react-navigation
'
;
import
{
SafeAreaView
}
from
'
react-navigation
'
;
import
RocketChat
from
'
../../lib/rocketchat
'
;
import
I18n
from
'
../../i18n
'
;
...
...
@@ -18,7 +18,9 @@ import Separator from '../../containers/Separator';
import
{
themes
}
from
'
../../constants/colors
'
;
import
{
withTheme
}
from
'
../../theme
'
;
import
{
themedHeader
}
from
'
../../utils/navigation
'
;
import
{
appStart
as
appStartAction
}
from
'
../../actions
'
;
import
{
getUserSelector
}
from
'
../../selectors/login
'
;
import
database
from
'
../../lib/database
'
;
const
LANGUAGES
=
[
{
...
...
@@ -58,23 +60,23 @@ class LanguageView extends React.Component {
})
static
propTypes
=
{
userLanguage
:
PropTypes
.
string
,
navigation
:
PropTypes
.
object
,
user
:
PropTypes
.
object
,
setUser
:
PropTypes
.
func
,
appStart
:
PropTypes
.
func
,
theme
:
PropTypes
.
string
}
constructor
(
props
)
{
super
(
props
);
this
.
state
=
{
language
:
props
.
user
Language
?
props
.
user
L
anguage
:
'
en
'
,
language
:
props
.
user
?
props
.
user
.
l
anguage
:
'
en
'
,
saving
:
false
};
}
shouldComponentUpdate
(
nextProps
,
nextState
)
{
const
{
language
,
saving
}
=
this
.
state
;
const
{
user
Language
,
theme
}
=
this
.
props
;
const
{
user
,
theme
}
=
this
.
props
;
if
(
nextProps
.
theme
!==
theme
)
{
return
true
;
}
...
...
@@ -84,15 +86,15 @@ class LanguageView extends React.Component {
if
(
nextState
.
saving
!==
saving
)
{
return
true
;
}
if
(
nextProps
.
user
L
anguage
!==
user
L
anguage
)
{
if
(
nextProps
.
user
.
l
anguage
!==
user
.
l
anguage
)
{
return
true
;
}
return
false
;
}
formIsChanged
=
(
language
)
=>
{
const
{
user
Language
}
=
this
.
props
;
return
(
user
L
anguage
!==
language
);
const
{
user
}
=
this
.
props
;
return
(
user
.
l
anguage
!==
language
);
}
submit
=
async
(
language
)
=>
{
...
...
@@ -102,12 +104,12 @@ class LanguageView extends React.Component {
this
.
setState
({
saving
:
true
});
const
{
user
Language
,
setUser
,
navigation
}
=
this
.
props
;
const
{
user
,
setUser
,
appStart
}
=
this
.
props
;
const
params
=
{};
// language
if
(
user
L
anguage
!==
language
)
{
if
(
user
.
l
anguage
!==
language
)
{
params
.
language
=
language
;
}
...
...
@@ -115,18 +117,27 @@ class LanguageView extends React.Component {
await
RocketChat
.
saveUserPreferences
(
params
);
setUser
({
language
:
params
.
language
});
this
.
setState
({
saving
:
false
});
setTimeout
(()
=>
{
navigation
.
reset
([
NavigationActions
.
navigate
({
routeName
:
'
SettingsView
'
})],
0
);
navigation
.
navigate
(
'
RoomsListView
'
);
},
300
);
const
serversDB
=
database
.
servers
;
const
usersCollection
=
serversDB
.
collections
.
get
(
'
users
'
);
await
serversDB
.
action
(
async
()
=>
{
try
{
const
userRecord
=
await
usersCollection
.
find
(
user
.
id
);
await
userRecord
.
update
((
record
)
=>
{
record
.
language
=
params
.
language
;
});
}
catch
(
e
)
{
// do nothing
}
});
await
appStart
(
'
loading
'
);
await
appStart
(
'
inside
'
);
}
catch
(
e
)
{
this
.
setState
({
saving
:
false
});
setTimeout
(()
=>
{
showErrorAlert
(
I18n
.
t
(
'
There_was_an_error_while_action
'
,
{
action
:
I18n
.
t
(
'
saving_preferences
'
)
}));
log
(
e
);
},
300
);
showErrorAlert
(
I18n
.
t
(
'
There_was_an_error_while_action
'
,
{
action
:
I18n
.
t
(
'
saving_preferences
'
)
}));
log
(
e
);
}
this
.
setState
({
saving
:
false
});
}
renderSeparator
=
()
=>
{
...
...
@@ -186,11 +197,12 @@ class LanguageView extends React.Component {
}
const
mapStateToProps
=
state
=>
({
user
Language
:
getUserSelector
(
state
)
.
language
user
:
getUserSelector
(
state
)
});
const
mapDispatchToProps
=
dispatch
=>
({
setUser
:
params
=>
dispatch
(
setUserAction
(
params
))
setUser
:
params
=>
dispatch
(
setUserAction
(
params
)),
appStart
:
params
=>
dispatch
(
appStartAction
(
params
))
});
export
default
connect
(
mapStateToProps
,
mapDispatchToProps
)(
withTheme
(
LanguageView
));
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment