livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-7887 FIXED Release note URL updated. 

We now point directly to the wiki for Viewer release notes and we
include three digits in the version number. E.g.,

http://wiki.secondlife.com/wiki/Release_Notes/Second Life Beta Viewer/2.1.0
meow-7.2.2
Lynx Linden 2010-06-17 13:08:59 +01:00
parent 599a9a97b4
commit d4232e4ae1
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/llfloaterabout.cpp
View File

@ -135,10 +135,10 @@ BOOL LLFloaterAbout::postBuild()
// Render the LLSD from getInfo() as a format_map_t
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
// simply copy it into these specific args.
// allow the "Release Notes" URL label to be localized
args["ReleaseNotes"] = LLTrans::getString("ReleaseNotes");
for (LLSD::map_const_iterator ii(info.beginMap()), iend(info.endMap());
ii != iend; ++ii)
{
@ -293,14 +293,14 @@ LLSD LLFloaterAbout::getInfo()
static std::string get_viewer_release_notes_url()
{
LLSD query;
query["channel"] = gSavedSettings.getString("VersionChannelName");
query["version"] = LLVersionInfo::getVersion();
std::ostringstream url;
url << LLTrans::getString("RELEASE_NOTES_BASE_URL") << LLURI::mapToQueryString(query);
return LLWeb::escapeURL(url.str());
// return a URL to the release notes for this viewer, such as:
// http://wiki.secondlife.com/wiki/Release_Notes/Second Life Beta Viewer/2.1.0
std::string url = LLTrans::getString("RELEASE_NOTES_BASE_URL");
if (! LLStringUtil::endsWith(url, "/"))
url += "/";
url += gSavedSettings.getString("VersionChannelName") + "/";
url += LLVersionInfo::getShortVersion();
return LLWeb::escapeURL(url);
}
class LLFloaterAboutListener: public LLEventAPI

2
indra/newview/skins/default/xui/en/strings.xml
View File

@ -136,7 +136,7 @@
<string name="RetrievingData">Retrieving...</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 -->
<string name="LoadingData">Loading...</string>