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

Fixed bug EXT-6007 ([STRING IN EN] - While loading Second Life several messages need to be localized). 

Reviewed by Richard: https://codereview.productengine.com/secondlife/r/31/

--HG--
branch : product-engine
meow-7.2.2
Vadim Savchuk 2010-03-16 14:45:12 +02:00
parent 5bfb3d5c26
commit 04e692b3f1
4 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llappviewer.cpp
View File

@ -2199,10 +2199,12 @@ bool LLAppViewer::initConfiguration()
// Display splash screen. Must be after above check for previous
// crash as this dialog is always frontmost.
std::ostringstream splash_msg;
splash_msg << "Loading " << LLTrans::getString("SECOND_LIFE") << "...";
std::string splash_msg;
LLStringUtil::format_map_t args;
args["[APP_NAME]"] = LLTrans::getString("SECOND_LIFE");
splash_msg = LLTrans::getString("StartupLoading", args);
LLSplashScreen::show();
LLSplashScreen::update(splash_msg.str());
LLSplashScreen::update(splash_msg);
//LLVolumeMgr::initClass();
LLVolumeMgr* volume_manager = new LLVolumeMgr();
@ -3066,11 +3068,11 @@ bool LLAppViewer::initCache()
if (mPurgeCache)
{
LLSplashScreen::update("Clearing cache...");
LLSplashScreen::update(LLTrans::getString("StartupClearingCache"));
purgeCache();
}
LLSplashScreen::update("Initializing Texture Cache...");
LLSplashScreen::update(LLTrans::getString("StartupInitializingTextureCache"));
// Init the texture cache
// Allocate 80% of the cache size for textures
@ -3083,7 +3085,7 @@ bool LLAppViewer::initCache()
S64 extra = LLAppViewer::getTextureCache()->initCache(LL_PATH_CACHE, texture_cache_size, read_only);
texture_cache_size -= extra;
LLSplashScreen::update("Initializing VFS...");
LLSplashScreen::update(LLTrans::getString("StartupInitializingVFS"));
// Init the VFS
S64 vfs_size = cache_size - texture_cache_size;
@ -3852,7 +3854,7 @@ void LLAppViewer::idleShutdown()
S32 finished_uploads = total_uploads - pending_uploads;
F32 percent = 100.f * finished_uploads / total_uploads;
gViewerWindow->setProgressPercent(percent);
gViewerWindow->setProgressString("Saving your settings...");
gViewerWindow->setProgressString(LLTrans::getString("SavingSettings"));
return;
}
@ -3864,7 +3866,7 @@ void LLAppViewer::idleShutdown()
// Wait for a LogoutReply message
gViewerWindow->setShowProgress(TRUE);
gViewerWindow->setProgressPercent(100.f);
gViewerWindow->setProgressString("Logging out...");
gViewerWindow->setProgressString(LLTrans::getString("LoggingOut"));
return;
}

8
indra/newview/llappviewerwin32.cpp
View File

@ -480,10 +480,12 @@ bool LLAppViewerWin32::initHardwareTest()
gSavedSettings.setBOOL("ProbeHardwareOnStartup", FALSE);
// Disable so debugger can work
std::ostringstream splash_msg;
splash_msg << LLTrans::getString("StartupLoading") << " " << LLAppViewer::instance()->getSecondLifeTitle() << "...";
std::string splash_msg;
LLStringUtil::format_map_t args;
args["[APP_NAME]"] = LLAppViewer::instance()->getSecondLifeTitle();
splash_msg = LLTrans::getString("StartupLoading", args);
LLSplashScreen::update(splash_msg.str());
LLSplashScreen::update(splash_msg);
}
if (!restoreErrorTrap())

8
indra/newview/llviewerwindow.cpp
View File

@ -1124,7 +1124,7 @@ BOOL LLViewerWindow::handleActivate(LLWindow *window, BOOL activated)
{
// if we're in world, show a progress bar to hide reloading of textures
llinfos << "Restoring GL during activate" << llendl;
restoreGL("Restoring...");
restoreGL(LLTrans::getString("ProgressRestoring"));
}
else
{
@ -1384,7 +1384,7 @@ LLViewerWindow::LLViewerWindow(
if (NULL == mWindow)
{
LLSplashScreen::update("Shutting down...");
LLSplashScreen::update(LLTrans::getString("ShuttingDown"));
#if LL_LINUX || LL_SOLARIS
llwarns << "Unable to create window, be sure screen is set at 32-bit color and your graphics driver is configured correctly. See README-linux.txt or README-solaris.txt for further information."
<< llendl;
@ -4758,7 +4758,7 @@ void LLViewerWindow::restartDisplay(BOOL show_progress_bar)
stopGL();
if (show_progress_bar)
{
restoreGL("Changing Resolution...");
restoreGL(LLTrans::getString("ProgressChangingResolution"));
}
else
{
@ -4845,7 +4845,7 @@ BOOL LLViewerWindow::changeDisplaySettings(BOOL fullscreen, LLCoordScreen size,
llinfos << "Restoring GL during resolution change" << llendl;
if (show_progress_bar)
{
restoreGL("Changing Resolution...");
restoreGL(LLTrans::getString("ProgressChangingResolution"));
}
else
{

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

@ -14,7 +14,14 @@
<!-- starting up -->
<string name="StartupDetectingHardware">Detecting hardware...</string>
<string name="StartupLoading">Loading</string>
<string name="StartupLoading">Loading [APP_NAME]...</string>
<string name="StartupClearingCache">Clearing cache...</string>
<string name="StartupInitializingTextureCache">Initializing Texture Cache...</string>
<string name="StartupInitializingVFS">Initializing VFS...</string>
<!-- progress -->
<string name="ProgressRestoring">Restoring...</string>
<string name="ProgressChangingResolution">Changing Resolution...</string>
<!-- Legacy strings, almost never used -->
<string name="Fullbright">Fullbright (Legacy)</string> <!-- used in the Build > materials dropdown-->
@ -45,6 +52,9 @@
<!-- Disconnection -->
<string name="AgentLostConnection">This region may be experiencing trouble. Please check your connection to the Internet.</string>
<string name="SavingSettings">Saving your settings...</string>
<string name="LoggingOut">Logging out...</string>
<string name="ShuttingDown">Shutting down...</string>
<!-- Tooltip, lltooltipview.cpp -->