Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
5703d571
Commit
5703d571
authored
Aug 10, 2018
by
Lucio Maciel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improved RU localization and Localize "Done" button
parent
691b8109
Changes
10
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
72 additions
and
56 deletions
+72
-56
AppLifecycleObserver.kt
...main/java/chat/rocket/android/app/AppLifecycleObserver.kt
+3
-0
ChatRoomsFragment.kt
...ava/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
+1
-1
ConnectionManager.kt
...ocket/android/server/infraestructure/ConnectionManager.kt
+8
-0
strings.xml
app/src/main/res/values-de/strings.xml
+1
-0
strings.xml
app/src/main/res/values-es/strings.xml
+1
-0
strings.xml
app/src/main/res/values-fr/strings.xml
+1
-0
strings.xml
app/src/main/res/values-hi-rIN/strings.xml
+1
-0
strings.xml
app/src/main/res/values-pt-rBR/strings.xml
+1
-0
strings.xml
app/src/main/res/values-ru/strings.xml
+54
-55
strings.xml
app/src/main/res/values/strings.xml
+1
-0
No files found.
app/src/main/java/chat/rocket/android/app/AppLifecycleObserver.kt
View file @
5703d571
...
...
@@ -22,6 +22,9 @@ class AppLifecycleObserver @Inject constructor(
@OnLifecycleEvent
(
Lifecycle
.
Event
.
ON_START
)
fun
onEnterForeground
()
{
changeTemporaryStatus
(
UserStatus
.
Online
())
serverInteractor
.
get
()
?.
let
{
currentServer
->
factory
.
create
(
currentServer
).
resetReconnectionTimer
()
}
}
@OnLifecycleEvent
(
Lifecycle
.
Event
.
ON_STOP
)
...
...
app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
View file @
5703d571
...
...
@@ -216,7 +216,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
AlertDialog
.
Builder
(
context
)
.
setTitle
(
R
.
string
.
dialog_sort_title
)
.
setView
(
dialogLayout
)
.
setPositiveButton
(
"Done"
)
{
dialog
,
_
->
.
setPositiveButton
(
R
.
string
.
dialog_button_done
)
{
dialog
,
_
->
invalidateQueryOnSearch
()
updateSort
()
dialog
.
dismiss
()
...
...
app/src/main/java/chat/rocket/android/server/infraestructure/ConnectionManager.kt
View file @
5703d571
...
...
@@ -193,6 +193,14 @@ class ConnectionManager(
client
.
setTemporaryStatus
(
userStatus
)
}
fun
resetReconnectionTimer
()
{
// if we are waiting to reconnect, immediately try to reconnect
// and reset the reconnection counter
if
(
client
.
state
is
State
.
Waiting
)
{
client
.
connect
(
resetCounter
=
true
)
}
}
private
fun
resubscribeRooms
()
{
roomMessagesChannels
.
toList
().
map
{
(
roomId
,
channel
)
->
client
.
subscribeRoomMessages
(
roomId
)
{
_
,
id
->
...
...
app/src/main/res/values-de/strings.xml
View file @
5703d571
...
...
@@ -258,6 +258,7 @@
<string
name=
"dialog_sort_by_activity"
>
Aktivität
</string>
<string
name=
"dialog_group_by_type"
>
Räume nach Typ
</string>
<string
name=
"dialog_group_favourites"
>
Räume nach Favoriten
</string>
<string
name=
"dialog_button_done"
>
Done
</string>
<!-- TODO Add translation -->
<string
name=
"chatroom_header"
>
Kopf
</string>
<!--ChatRooms Headers-->
...
...
app/src/main/res/values-es/strings.xml
View file @
5703d571
...
...
@@ -253,6 +253,7 @@
<string
name=
"dialog_sort_by_activity"
>
Actividad
</string>
<string
name=
"dialog_group_by_type"
>
Agrupar por tipo
</string>
<string
name=
"dialog_group_favourites"
>
Agrupar favoritos
</string>
<string
name=
"dialog_button_done"
>
Done
</string>
<!-- TODO Add translation -->
<string
name=
"chatroom_header"
>
Cabezazo
</string>
<!--ChatRooms Headers-->
...
...
app/src/main/res/values-fr/strings.xml
View file @
5703d571
...
...
@@ -278,6 +278,7 @@
<string
name=
"dialog_sort_by_activity"
>
Activité
</string>
<string
name=
"dialog_group_by_type"
>
Grouper par type
</string>
<string
name=
"dialog_group_favourites"
>
Grouper favoris
</string>
<string
name=
"dialog_button_done"
>
Done
</string>
<!-- TODO Add translation -->
<string
name=
"chatroom_header"
>
Entête
</string>
<!--ChatRooms Headers-->
...
...
app/src/main/res/values-hi-rIN/strings.xml
View file @
5703d571
...
...
@@ -260,6 +260,7 @@
<string
name=
"dialog_sort_by_activity"
>
गतिविधि
</string>
<string
name=
"dialog_group_by_type"
>
प्रकार के आधार पर समूह
</string>
<string
name=
"dialog_group_favourites"
>
पसंदीदा समूह
</string>
<string
name=
"dialog_button_done"
>
Done
</string>
<!-- TODO Add translation -->
<string
name=
"chatroom_header"
>
हैडर
</string>
<!--ChatRooms Headers-->
...
...
app/src/main/res/values-pt-rBR/strings.xml
View file @
5703d571
...
...
@@ -259,6 +259,7 @@
<string
name=
"dialog_sort_by_activity"
>
Atividade
</string>
<string
name=
"dialog_group_by_type"
>
Agrupar por tipo
</string>
<string
name=
"dialog_group_favourites"
>
Grupos favoritos
</string>
<string
name=
"dialog_button_done"
>
Done
</string>
<!-- TODO Add translation -->
<string
name=
"chatroom_header"
>
Cabeçalho
</string>
<!--ChatRooms Headers-->
...
...
app/src/main/res/values-ru/strings.xml
View file @
5703d571
This diff is collapsed.
Click to expand it.
app/src/main/res/values/strings.xml
View file @
5703d571
...
...
@@ -261,6 +261,7 @@
<string
name=
"dialog_sort_by_activity"
>
Activity
</string>
<string
name=
"dialog_group_by_type"
>
Group by type
</string>
<string
name=
"dialog_group_favourites"
>
Group favourites
</string>
<string
name=
"dialog_button_done"
>
Done
</string>
<string
name=
"chatroom_header"
>
Header
</string>
<!--ChatRooms Headers-->
...
...
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