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

Set version in VIEWER_GENERATION default substitute automatically based on major version number

master
Ansariel 2018-09-27 14:12:12 +02:00
parent 95aa7f7583
commit fcbbd2b6ca
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llappviewer.cpp
View File

@ -3455,6 +3455,12 @@ void LLAppViewer::initStrings()
// translation strings into this one.
LLTrans::setDefaultArg(brackets, LLTrans::getString(nobrackets));
}
// <FS:Ansariel> Set version number in VIEWER_GENERATION default substitute automatically
LLStringUtil:: format_map_t gen_args;
gen_args["[VERSION]"] = llformat("%d", LLVersionInfo::getMajor());
LLTrans::setDefaultArg("[VIEWER_GENERATION]", LLTrans::getString("VIEWER_GENERATION", gen_args));
// </FS:Ansariel>
}
//

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

@ -13,7 +13,7 @@
<string name="SUPPORT_SITE">Second Life Support Portal</string>
<string name="DOWNLOAD_URL">https://www.firestormviewer.org/downloads</string>
<string name="CURRENT_GRID"/> <!-- Will be set in fsgridhandler.cpp / llviewernetwork.cpp -->
<string name="VIEWER_GENERATION">Viewer 5</string>
<string name="VIEWER_GENERATION">Viewer [VERSION]</string>
<!-- starting up -->
<string name="StartupDetectingHardware">Detecting hardware...</string>