Skip to content
Snippets Groups Projects
Commit 68b956b0 authored by Lynx Linden's avatar Lynx Linden
Browse files
parents ca211101 d4232e4a
No related branches found
No related tags found
No related merge requests found
...@@ -135,10 +135,10 @@ BOOL LLFloaterAbout::postBuild() ...@@ -135,10 +135,10 @@ BOOL LLFloaterAbout::postBuild()
// Render the LLSD from getInfo() as a format_map_t // Render the LLSD from getInfo() as a format_map_t
LLStringUtil::format_map_t args; LLStringUtil::format_map_t args;
// For reasons I don't yet understand, [ReleaseNotes] is not part of the
// default substitution strings whereas [APP_NAME] is. But it works to // allow the "Release Notes" URL label to be localized
// simply copy it into these specific args.
args["ReleaseNotes"] = LLTrans::getString("ReleaseNotes"); args["ReleaseNotes"] = LLTrans::getString("ReleaseNotes");
for (LLSD::map_const_iterator ii(info.beginMap()), iend(info.endMap()); for (LLSD::map_const_iterator ii(info.beginMap()), iend(info.endMap());
ii != iend; ++ii) ii != iend; ++ii)
{ {
...@@ -293,14 +293,14 @@ LLSD LLFloaterAbout::getInfo() ...@@ -293,14 +293,14 @@ LLSD LLFloaterAbout::getInfo()
static std::string get_viewer_release_notes_url() static std::string get_viewer_release_notes_url()
{ {
LLSD query; // return a URL to the release notes for this viewer, such as:
query["channel"] = gSavedSettings.getString("VersionChannelName"); // http://wiki.secondlife.com/wiki/Release_Notes/Second Life Beta Viewer/2.1.0
query["version"] = LLVersionInfo::getVersion(); std::string url = LLTrans::getString("RELEASE_NOTES_BASE_URL");
if (! LLStringUtil::endsWith(url, "/"))
std::ostringstream url; url += "/";
url << LLTrans::getString("RELEASE_NOTES_BASE_URL") << LLURI::mapToQueryString(query); url += gSavedSettings.getString("VersionChannelName") + "/";
url += LLVersionInfo::getShortVersion();
return LLWeb::escapeURL(url.str()); return LLWeb::escapeURL(url);
} }
class LLFloaterAboutListener: public LLEventAPI class LLFloaterAboutListener: public LLEventAPI
......
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
<string name="RetrievingData">Retrieving...</string> <string name="RetrievingData">Retrieving...</string>
<string name="ReleaseNotes">Release Notes</string> <string name="ReleaseNotes">Release Notes</string>
<string name="RELEASE_NOTES_BASE_URL">http://secondlife.com/app/releasenotes/</string> <string name="RELEASE_NOTES_BASE_URL">http://wiki.secondlife.com/wiki/Release_Notes/</string>
<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData --> <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
<string name="LoadingData">Loading...</string> <string name="LoadingData">Loading...</string>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment