summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2010-06-17 13:08:59 +0100
committerLynx Linden <lynx@lindenlab.com>2010-06-17 13:08:59 +0100
commitd4232e4ae1d83b068352dc00cfda90d1692a16f2 (patch)
tree3d845065149b9563b4df7e5407c1a920ab85e0b6 /indra
parent599a9a97b42626f2e45d4a9bf8e2dc297b3c31b1 (diff)
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
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloaterabout.cpp22
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml2
2 files changed, 12 insertions, 12 deletions
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index 56bc4a7933..4bd3151f2e 100644
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -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
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 294267d43b..68eea8dc9a 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -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>