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

DD-19 : WIP : Cleaned up marketplace validation UI as requested per Producer

meow-7.2.2
Merov Linden 2014-08-23 14:46:59 -07:00
parent 6ab1e773d5
commit c4ad85ecb9
3 changed files with 26 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/llinventoryfunctions.cpp
View File

@ -1364,7 +1364,7 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_
{
if (cb)
{
std::string message = LLTrans::getString("Marketplace Validation Intro") + cat->getName();
std::string message = cat->getName() + LLTrans::getString("Marketplace Validation Intro");
cb(message,LLError::LEVEL_INFO);
}
std::string message;
@ -1373,7 +1373,7 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_
result = false;
if (cb)
{
message = LLTrans::getString("Marketplace Validation Error") + message;
message = cat->getName() + LLTrans::getString("Marketplace Validation Error") + message;
cb(message,LLError::LEVEL_ERROR);
}
}
@ -1393,7 +1393,7 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_
LLUUID folder_uuid = gInventory.createNewCategory(parent_uuid, LLFolderType::FT_NONE, cat->getName());
if (cb)
{
std::string message = indent + LLTrans::getString("Marketplace Validation Warning Stock") + cat->getName();
std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Warning Stock");
cb(message,LLError::LEVEL_WARN);
}
LLInventoryCategory* new_cat = gInventory.getCategory(folder_uuid);
@ -1429,7 +1429,7 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_
result = false;
if (cb)
{
std::string message = indent + LLTrans::getString("Marketplace Validation Error") + error_msg + " : " + viewer_inv_item->getName();
std::string message = indent + viewer_inv_item->getName() + LLTrans::getString("Marketplace Validation Error") + error_msg;
cb(message,LLError::LEVEL_ERROR);
}
continue;
@ -1465,7 +1465,7 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_
result = false;
if (cb)
{
std::string message = indent + LLTrans::getString("Marketplace Validation Error Empty Version") + cat->getName();
std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Error Empty Version");
cb(message,LLError::LEVEL_ERROR);
}
}
@ -1475,14 +1475,14 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_
result = false;
if (cb)
{
std::string message = indent + LLTrans::getString("Marketplace Validation Error Empty Stock") + cat->getName();
std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Error Empty Stock");
cb(message,LLError::LEVEL_ERROR);
}
}
else if (cb)
{
// We warn if there's nothing in a regular folder (may be it's an under construction listing)
std::string message = indent + LLTrans::getString("Marketplace Validation Warning Empty") + cat->getName();
std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Warning Empty");
cb(message,LLError::LEVEL_WARN);
}
}
@ -1493,7 +1493,7 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_
// Done with that folder!
if (cb)
{
std::string message = indent + LLTrans::getString("Marketplace Validation Log") + cat->getName();
std::string message = indent + cat->getName() + LLTrans::getString("Marketplace Validation Log");
cb(message,LLError::LEVEL_INFO);
}
}
@ -1512,11 +1512,11 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_
std::string message = "";
if (new_folder_type == LLFolderType::FT_MARKETPLACE_STOCK)
{
message = indent + LLTrans::getString("Marketplace Validation Warning Create Stock") + viewer_cat->getName();
message = indent + viewer_cat->getName() + LLTrans::getString("Marketplace Validation Warning Create Stock");
}
else
{
message = indent + LLTrans::getString("Marketplace Validation Warning Create Version") + viewer_cat->getName();
message = indent + viewer_cat->getName() + LLTrans::getString("Marketplace Validation Warning Create Version");
}
cb(message,LLError::LEVEL_WARN);
}
@ -1527,7 +1527,7 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_
LLViewerInventoryItem* viewer_inv_item = items_vector[i].back();
if (cb)
{
std::string message = indent + LLTrans::getString("Marketplace Validation Warning Move") + viewer_inv_item->getName();
std::string message = indent + viewer_inv_item->getName() + LLTrans::getString("Marketplace Validation Warning Move");
cb(message,LLError::LEVEL_WARN);
}
gInventory.changeItemParent(viewer_inv_item, folder_uuid, true);
@ -1543,7 +1543,7 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_
// Remove the current folder if it ends up empty
if (cb)
{
std::string message = indent + LLTrans::getString("Marketplace Validation Warning Delete") + viewer_cat->getName();
std::string message = indent + viewer_cat->getName() + LLTrans::getString("Marketplace Validation Warning Delete");
cb(message,LLError::LEVEL_WARN);
}
gInventory.removeCategory(cat->getUUID());

17
indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
title="MARKETPLACE VALIDATION LOG"
title="Audit Marketplace Listings"
name="floater_marketplace_validation"
help_topic="floater_marketplace_validation"
layout="topleft"
@ -26,19 +26,6 @@
width="100"
height="20"
left="484"/>
<text
name="tos_heading"
type="string"
font="SansSerif"
length="1"
layout="topleft"
follows="left|top"
width="552"
height="20"
left="20"
top="20">
The Marketplace Validation reported the following:
</text>
<text_editor
name="validation_text"
type="string"
@ -49,7 +36,7 @@
follows="all"
bg_readonly_color="TextBgReadOnlyColor"
text_readonly_color="TextFgReadOnlyColor"
top="45"
top="25"
bottom="455"
left="20"
right="-20"

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

@ -2292,18 +2292,18 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace].
</string>
<string name="Marketplace Validation Intro">Validation Listing : </string>
<string name="Marketplace Validation Log">Log : folder validates, all items of compatible types : </string>
<string name="Marketplace Validation Warning Stock">Warning : creating wrapping folder for stock folder : </string>
<string name="Marketplace Validation Warning Empty">Warning : folder doesn't contain any item : </string>
<string name="Marketplace Validation Warning Create Stock">Warning : creating stock folder : </string>
<string name="Marketplace Validation Warning Create Version">Warning : creating version folder : </string>
<string name="Marketplace Validation Warning Move">Warning : moving item : </string>
<string name="Marketplace Validation Warning Delete">Warning : folder content completely transfered to stock folder, removing empty folder : </string>
<string name="Marketplace Validation Error">Error : </string>
<string name="Marketplace Validation Error Empty Version">Error : cannot list empty version folder : </string>
<string name="Marketplace Validation Error Empty Stock">Error : cannot list empty stock folder : </string>
<string name="Marketplace Error None">No error</string>
<string name="Marketplace Validation Intro"></string>
<string name="Marketplace Validation Log">: No errors</string>
<string name="Marketplace Validation Warning Stock">: Warning: creating wrapping folder for stock folder</string>
<string name="Marketplace Validation Warning Empty">: Warning: folder doesn't contain any item</string>
<string name="Marketplace Validation Warning Create Stock">: Warning: creating stock folder</string>
<string name="Marketplace Validation Warning Create Version">: Warning: creating version folder</string>
<string name="Marketplace Validation Warning Move">: Warning : moving items</string>
<string name="Marketplace Validation Warning Delete">: Warning: folder content transfered to stock folder, removing empty folder</string>
<string name="Marketplace Validation Error">: Error: </string>
<string name="Marketplace Validation Error Empty Version">: Error: cannot list empty version folder</string>
<string name="Marketplace Validation Error Empty Stock">: Error: cannot list empty stock folder</string>
<string name="Marketplace Error None">No errors</string>
<string name="Marketplace Error Prefix">Error: </string>
<string name="Marketplace Error Not Merchant">Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge).</string>
<string name="Marketplace Error Not Accepted">Cannot move item in that folder.</string>