Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
21d4ce26
Commit
21d4ce26
authored
6 years ago
by
AndreyL ProductEngine
Browse files
Options
Downloads
Patches
Plain Diff
INTL-324 added support for TLS failure dialog localization
parent
c658e891
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llxmlrpctransaction.cpp
+7
-24
7 additions, 24 deletions
indra/newview/llxmlrpctransaction.cpp
indra/newview/skins/default/xui/en/strings.xml
+25
-0
25 additions, 0 deletions
indra/newview/skins/default/xui/en/strings.xml
with
32 additions
and
24 deletions
indra/newview/llxmlrpctransaction.cpp
+
7
−
24
View file @
21d4ce26
...
...
@@ -483,42 +483,25 @@ void LLXMLRPCTransaction::Impl::setHttpStatus(const LLCore::HttpStatus &status)
{
CURLcode
code
=
static_cast
<
CURLcode
>
(
status
.
toULong
());
std
::
string
message
;
std
::
string
uri
=
"http://secondlife.com
/community/support.php
"
;
std
::
string
uri
=
"http://
support.
secondlife.com"
;
LLURI
failuri
(
mURI
);
LLStringUtil
::
format_map_t
args
;
switch
(
code
)
{
case
CURLE_COULDNT_RESOLVE_HOST
:
message
=
std
::
string
(
"DNS could not resolve the host name("
)
+
failuri
.
hostName
()
+
").
\n
"
"Please verify that you can connect to the www.secondlife.com
\n
"
"web site. If you can, but continue to receive this error,
\n
"
"please go to the support section and report this problem."
;
args
[
"[HOSTNAME]"
]
=
failuri
.
hostName
();
message
=
LLTrans
::
getString
(
"couldnt_resolve_host"
,
args
);
break
;
case
CURLE_SSL_PEER_CERTIFICATE
:
message
=
"The login server couldn't verify itself via SSL.
\n
"
"If you continue to receive this error, please go
\n
"
"to the Support section of the SecondLife.com web site
\n
"
"and report the problem."
;
message
=
LLTrans
::
getString
(
"ssl_peer_certificate"
);
break
;
case
CURLE_SSL_CACERT
:
case
CURLE_SSL_CONNECT_ERROR
:
{
std
::
string
uri_base
=
"https://community.secondlife.com/knowledgebase/english/error-messages-r520/#Section__3"
;
message
=
"Often this means that your computer
\'
s clock is set incorrectly.
\n
"
"Please go to Control Panels and make sure the time and date
\n
"
"are set correctly.
\n
"
"Also check that your network and firewall are set up correctly.
\n
"
"If you continue to receive this error, please go
\n
"
"to the Support section of the SecondLife.com web site
\n
"
"and report the problem.
\n\n
["
+
uri_base
+
" Knowledge Base]"
;
message
=
LLTrans
::
getString
(
"ssl_connect_error"
);
break
;
}
default:
break
;
...
...
This diff is collapsed.
Click to expand it.
indra/newview/skins/default/xui/en/strings.xml
+
25
−
0
View file @
21d4ce26
...
...
@@ -4233,4 +4233,29 @@ Try enclosing path to the editor with double quotes.
The physics shape does not have correct version. Set the correct version for the physics model.
</string>
<!-- CURL error messages -->
<string
name=
"couldnt_resolve_host"
>
DNS could not resolve the host name([HOSTNAME]).
Please verify that you can connect to the www.secondlife.com
web site. If you can, but continue to receive this error,
please go to the support section and report this problem.
</string>
<string
name=
"ssl_peer_certificate"
>
The login server couldn't verify itself via SSL.
If you continue to receive this error, please go
to the Support section of the SecondLife.com web site
and report the problem.
</string>
<string
name=
"ssl_connect_error"
>
Often this means that your computer's clock is set incorrectly.
Please go to Control Panels and make sure the time and date
are set correctly.
Also check that your network and firewall are set up correctly.
If you continue to receive this error, please go
to the Support section of the SecondLife.com web site
and report the problem.
[https://community.secondlife.com/knowledgebase/english/error-messages-r520/#Section__3 Knowledge Base]
</string>
</strings>
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment