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
68e85070
Commit
68e85070
authored
Dec 05, 2016
by
Tiago Cunha
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extracted more strings
parent
ffacfed8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
13 deletions
+16
-13
AddServerActivity.java
.../java/chat/rocket/android/activity/AddServerActivity.java
+1
-1
ServerConfigActivity.java
...va/chat/rocket/android/activity/ServerConfigActivity.java
+1
-1
HomeFragment.java
...a/chat/rocket/android/fragment/chatroom/HomeFragment.java
+2
-2
strings.xml
app/src/main/res/values/strings.xml
+12
-9
No files found.
app/src/main/java/chat/rocket/android/activity/AddServerActivity.java
View file @
68e85070
...
...
@@ -36,7 +36,7 @@ public class AddServerActivity extends AbstractFragmentActivity {
if
(
config
==
null
||
config
.
getState
()
==
ServerConfig
.
STATE_CONNECTION_ERROR
)
{
showFragment
(
new
InputHostnameFragment
());
}
else
{
showFragment
(
WaitingFragment
.
create
(
"Connecting to server..."
));
showFragment
(
WaitingFragment
.
create
(
getString
(
R
.
string
.
add_server_activity_waiting_server
)
));
}
});
...
...
app/src/main/java/chat/rocket/android/activity/ServerConfigActivity.java
View file @
68e85070
...
...
@@ -76,7 +76,7 @@ public class ServerConfigActivity extends AbstractFragmentActivity {
final
String
token
=
session
.
getToken
();
if
(!
TextUtils
.
isEmpty
(
token
))
{
if
(
TextUtils
.
isEmpty
(
session
.
getError
()))
{
showFragment
(
WaitingFragment
.
create
(
"Authenticating..."
));
showFragment
(
WaitingFragment
.
create
(
getString
(
R
.
string
.
server_config_activity_authenticating
)
));
}
else
{
showFragment
(
new
RetryLoginFragment
());
}
...
...
app/src/main/java/chat/rocket/android/fragment/chatroom/HomeFragment.java
View file @
68e85070
...
...
@@ -11,12 +11,12 @@ public class HomeFragment extends AbstractChatRoomFragment {
}
@Override
protected
void
onSetupView
()
{
activityToolbar
.
setTitle
(
"Rocket.Chat - Home"
);
activityToolbar
.
setTitle
(
R
.
string
.
home_fragment_title
);
}
@Override
public
void
onResume
()
{
super
.
onResume
();
activityToolbar
.
setNavigationIcon
(
null
);
activityToolbar
.
setTitle
(
"Rocket.Chat - Home"
);
activityToolbar
.
setTitle
(
R
.
string
.
home_fragment_title
);
}
}
app/src/main/res/values/strings.xml
View file @
68e85070
<resources>
<string
name=
"app_name"
>
Rocket.Chat.Android
</string>
<string
name=
"fragment_sidebar_main_channels_title"
>
CHANNELS
</string>
<string
name=
"fragment_sidebar_main_direct_messages_title"
>
DIRECT MESSAGES
</string>
<string
name=
"user_status_online"
>
Online
</string>
<string
name=
"user_status_away"
>
Away
</string>
<string
name=
"user_status_busy"
>
Busy
</string>
<string
name=
"user_status_invisible"
>
Invisible
</string>
<string
name=
"fragment_sidebar_main_logout_title"
>
Logout
</string>
<string
name=
"app_name"
>
Rocket.Chat.Android
</string>
<string
name=
"fragment_sidebar_main_channels_title"
>
CHANNELS
</string>
<string
name=
"fragment_sidebar_main_direct_messages_title"
>
DIRECT MESSAGES
</string>
<string
name=
"user_status_online"
>
Online
</string>
<string
name=
"user_status_away"
>
Away
</string>
<string
name=
"user_status_busy"
>
Busy
</string>
<string
name=
"user_status_invisible"
>
Invisible
</string>
<string
name=
"fragment_sidebar_main_logout_title"
>
Logout
</string>
<string
name=
"start_of_conversation"
>
Start of conversation
</string>
<string
name=
"users_of_room_title"
>
Members List
</string>
<string
name=
"fmt_room_user_count"
>
Total: %,d users
</string>
<string
name=
"sending"
>
Sending
...
</string>
<string
name=
"sending"
>
Sending
…
</string>
<string
name=
"resend"
>
Resend
</string>
<string
name=
"discard"
>
Discard
</string>
...
...
@@ -25,4 +25,7 @@
<string
name=
"fragment_login_password"
>
Password
</string>
<string
name=
"fragment_retry_login_retry_title"
>
RETRY
</string>
<string
name=
"fragment_retry_login_error_title"
>
Oops…
</string>
<string
name=
"add_server_activity_waiting_server"
>
Connecting to server…
</string>
<string
name=
"server_config_activity_authenticating"
>
Authenticating…
</string>
<string
name=
"home_fragment_title"
>
Rocket.Chat - Home
</string>
</resources>
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