Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make translation more flexible

Browse Source 
Also in this commit, unrelated updates to the building panel (so git sees the markup "just" move in my next commit)
This commit is contained in:
Lirusaito
2012-09-29 16:59:17 -04:00
parent f311852e9b
commit 1f7ed035d3
9 changed files with 110 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/ascentprefssys.cpp
View File

@@ -103,11 +103,18 @@ LLPrefsAscentSys::LLPrefsAscentSys()
LLUUID itemid = (LLUUID)gSavedPerAccountSettings.getString("EmeraldBuildPrefs_Item");
LLViewerInventoryItem* item = gInventory.getItem(itemid);
if (item) childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("CurrentlySetTo") + LLTrans::getString(":") + "\n" +item->getName());
else if (itemid.isNull()) childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("CurrentlyNotSet"));
else childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("CurrentlySetTo") + "\n" + LLTrans::getString("AnItemNotOnThisAccount"));
if (item)
{
LLStringUtil::format_map_t args;
args["[ITEM]"] = item->getName();
childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("CurrentlySetTo", args));
}
else if (itemid.isNull())
childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("CurrentlyNotSet"));
else
childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("CurrentlySetToAnItemNotOnThisAccount"));
}
else childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("NotLoggedIn"));
else childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("NotLoggedIn"));
refreshValues();
refresh();
@@ -245,10 +252,13 @@ void LLPrefsAscentSys::onCommitTexturePicker(LLUICtrl* ctrl, void* userdata)
if(image_ctrl) gSavedSettings.setString("EmeraldBuildPrefs_Texture", image_ctrl->getImageAssetID().asString());
}
//static
void LLPrefsAscentSys::SinguBuildItemDrop(LLViewerInventoryItem* item)
{
gSavedPerAccountSettings.setString("EmeraldBuildPrefs_Item", item->getUUID().asString());
sInst->childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("CurrentlySetTo") + LLTrans::getString(":") + "\n" + item->getName());
LLStringUtil::format_map_t args;
args["[ITEM]"] = item->getName();
sInst->childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("CurrentlySetTo", args));
}
void LLPrefsAscentSys::refreshValues()