Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abook_check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_android
abook_check
Commits
ff5f9273
Commit
ff5f9273
authored
Jun 03, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ホスト変更文言反映。
parent
665448d7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
0 deletions
+9
-0
ABVJE_Res_Default_Android/res/values-ja/strings.xml
+1
-0
ABVJE_Res_Default_Android/res/values-ko/strings.xml
+2
-0
ABVJE_Res_Default_Android/res/values/strings.xml
+1
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java
+5
-0
No files found.
ABVJE_Res_Default_Android/res/values-ja/strings.xml
View file @
ff5f9273
...
...
@@ -1482,6 +1482,7 @@
<string
name=
"msg_confirm_send_host_change"
>
ホスト権限変更の依頼があります。変更しますか?
</string>
<string
name=
"msg_confirm_share_image"
>
キャプチャーした写真を共有しますか?
</string>
<string
name=
"msg_invite_collaboration"
>
協業に招待されました。
</string>
<string
name=
"msg_rejected_by_host"
>
ホストの変更依頼は拒否されました。
</string>
<!-- 連続作業 -->
<string
name=
"msg_error_all_process_delete"
>
全削除の送信に失敗しました。
</string>
<string
name=
"msg_ozd_file_could_not_opened"
>
帳票ファイルを開くことができませんでした。
</string>
...
...
ABVJE_Res_Default_Android/res/values-ko/strings.xml
View file @
ff5f9273
...
...
@@ -1490,4 +1490,5 @@
<string
name=
"msg_confirm_send_host_change"
>
방장 권한을 전달 받으시겠습니까?
</string>
<string
name=
"msg_confirm_share_image"
>
캡쳐한 사진을 공유 하시겠습니까?
</string>
<string
name=
"msg_invite_collaboration"
>
협업에 초대되셨습니다.
</string>
<string
name=
"msg_rejected_by_host"
>
호스트가 요청을 거절하셨습니다.
</string>
</resources>
\ No newline at end of file
ABVJE_Res_Default_Android/res/values/strings.xml
View file @
ff5f9273
...
...
@@ -1487,4 +1487,5 @@
<string
name=
"msg_confirm_send_host_change"
>
Do you want to receive host permissions?
</string>
<string
name=
"msg_confirm_share_image"
>
Do you want to share captured image?
</string>
<string
name=
"msg_invite_collaboration"
>
You are invited to collaboration.
</string>
<string
name=
"msg_rejected_by_host"
>
Rejected host request.
</string>
</resources>
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java
View file @
ff5f9273
...
...
@@ -383,6 +383,11 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
mChatWebView
.
loadUrl
(
"javascript:$('#userNameCardInCollaboration').modal('hide');"
);
result
.
confirm
();
return
true
;
}
else
if
(
message
.
contains
(
"REJECT for owner user"
))
{
mChatWebView
.
loadUrl
(
"javascript:$('#userNameCardInCollaboration').modal('hide');"
);
mChatWebView
.
loadUrl
(
"javascript:$('#hostRequestModal').modal('hide');"
);
mChatWebView
.
loadUrl
(
"javascript:$('#userNameCardInCollaboration').modal('hide');"
);
message
=
getString
(
R
.
string
.
msg_rejected_by_host
);
}
final
String
tempMessage
=
message
;
...
...
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