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

DEV-49149 Localizable server error message for Display Names 

Try to look up a specific translation for the error in the viewer,
but failing that, try to use a message sent by the server.
Reviewed with Simon.
master
James Cook 2010-04-19 13:54:50 -07:00
parent d38727e47b
commit 16aa2a2a0f
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
indra/newview/llpanelme.cpp
View File

@ -45,8 +45,8 @@
// Linden libraries
#include "llavatarnamecache.h" // IDEVO
#include "llchat.h" // IDEVO HACK
#include "lliconctrl.h"
#include "llnotifications.h"
#include "llnotificationsutil.h" // IDEVO
#include "lltabcontainer.h"
#include "lltexturectrl.h"
@ -298,9 +298,6 @@ void LLPanelMyProfileEdit::onTexturePickerMouseLeave(LLUICtrl* ctrl)
mTextureEditIconMap[ctrl->getName()]->setVisible(FALSE);
}
// IDEVO HACK
extern void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel);
void LLPanelMyProfileEdit::onCacheSetName(bool success,
const std::string& reason,
const LLSD& content)
@ -310,15 +307,34 @@ void LLPanelMyProfileEdit::onCacheSetName(bool success,
// Re-fetch my name, as it may have been sanitized by the service
LLAvatarNameCache::get(getAvatarId(),
boost::bind(&LLPanelMyProfileEdit::onNameCache, this, _1, _2));
return;
}
else
// Request failed, notify the user
std::string error_tag = content["error_tag"].asString();
llinfos << "set name failure error_tag " << error_tag << llendl;
// We might have a localized string for this message
if (!error_tag.empty()
&& LLNotifications::getInstance()->templateExists(error_tag))
{
// JAMESDEBUG TODO: localize strings for reasons we couldn't
// change the name
LLNotificationsUtil::add("SetDisplayNameFailedGeneric");
// TODO: SetDisplayNameFailedThrottle with [FREQUENCY]
// TODO: SetDisplayNameFailedUnavailable
LLNotificationsUtil::add(error_tag);
return;
}
// The server error might have a localized message for us
std::string lang_code = LLUI::getLanguage();
LLSD error_desc = content["error_description"];
if (error_desc.has( lang_code ))
{
LLSD args;
args["MESSAGE"] = error_desc[lang_code].asString();
LLNotificationsUtil::add("GenericAlert", args);
return;
}
// No specific error, throw a generic one
LLNotificationsUtil::add("SetDisplayNameFailedGeneric");
}
void LLPanelMyProfileEdit::onDialogSetName(const LLSD& notification, const LLSD& response)

9
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -3060,6 +3060,15 @@ Change your display name?
Sorry, we could not set your display name. Please try again later.
</notification>
<notification
icon="alertmodal.tga"
name="AgentDisplayNameSetLindenFailed"
type="alertmodal">
Sorry, your display name cannot contain the word 'Linden'.
Please try a different name.
</notification>
<notification
icon="alertmodal.tga"
name="SetDisplayNameFailedThrottle"