diff --git a/ryzom/client/data/gamedev/interfaces_v3/bg_downloader.lua b/ryzom/client/data/gamedev/interfaces_v3/bg_downloader.lua
index 161012d9e..f133eae27 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/bg_downloader.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/bg_downloader.lua
@@ -48,7 +48,7 @@ function bgdownloader:setProgressText(ucstr, color, progress, ellipsis)
local text = self:getProgressGroup():find("text")
local ellipsisTxt = self:getProgressGroup():find("ellipsis")
text.color = color
- text.uc_hardtext = ucstr
+ text.text = ucstr
if ellipsis then
ellipsisTxt.hardtext = ellipsis
else
@@ -60,7 +60,7 @@ function bgdownloader:setProgressText(ucstr, color, progress, ellipsis)
-- any current download to finish, otherwise connection may be lost)
self:setIcon("bgd_pause.tga")
ellipsisTxt.hardtext = ""
- text.uc_hardtext = pausedText
+ text.text = pausedText
else
self:setIcon("")
local progressCtrl = self:getProgressBar()
@@ -88,7 +88,7 @@ function bgdownloader:setPatchProgress(progress)
local progressDate = nltime.getLocalTime() / 500
local colValue = math.floor(230 + 24 * math.sin(progressDate))
local color = string.format("%d %d %d %d", colValue, colValue, colValue, 255)
- self:setProgressText(concatUCString(i18n.get("uiBGD_Progress"), ucstring(progressPercentText)), color, progress, progressSymbol[progressPostfix + 1])
+ self:setProgressText(concatString(i18n.get("uiBGD_Progress"), progressPercentText), color, progress, progressSymbol[progressPostfix + 1])
end
------------------------------------------------------------------------------------------------------------
@@ -110,7 +110,7 @@ function bgdownloader:setPatchError()
self:getProgressGroup().active = true
end
local errMsg = getPatchLastErrorMessage()
- if errMsg == ucstring() then
+ if errMsg == "" then
self:setProgressText(i18n.get("uiBGD_PatchError"), "255 0 0 255", 0)
else
self:setProgressText(errMsg, "255 0 0 255", 0)
diff --git a/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml b/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml
index f3e3e7899..efca1e889 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml
@@ -366,7 +366,7 @@
-
+
@@ -376,7 +376,7 @@
-
+
diff --git a/ryzom/client/data/gamedev/interfaces_v3/game_r2_loading.lua b/ryzom/client/data/gamedev/interfaces_v3/game_r2_loading.lua
index 33a3810d3..6ebb82bf0 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/game_r2_loading.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/game_r2_loading.lua
@@ -100,7 +100,7 @@ function GameR2Loading:setScenarioLanguage(header)
local lvlWidget = win:find("Language")
if header.Language then
local language = "uiR2ED"..header.Language
- lvlWidget.hardtext = i18n.get(language):toUtf8()
+ lvlWidget.hardtext = i18n.get(language)
else
lvlWidget.hardtext = ""
end
@@ -124,7 +124,7 @@ function GameR2Loading:setScenarioRingAccess(header)
local okButton = win:find("validate")
if getDbProp("SERVER:USER:IS_NEWBIE") == 1 and isPlayerFreeTrial() and not header.OtherCharAccess or header.OtherCharAccess ~= "RoSOnly" then
- accessWidget.hardtext = i18n.get("uiR2EDLoadScenario_No"):toUtf8()
+ accessWidget.hardtext = i18n.get("uiR2EDLoadScenario_No")
okButton.frozen = true
end
@@ -132,9 +132,9 @@ function GameR2Loading:setScenarioRingAccess(header)
self.RingAccess = game.checkRingAccess(header.RingPointLevel)
if self.RingAccess == true then
- accessWidget.hardtext = i18n.get("uiR2EDLoadScenario_Yes"):toUtf8()
+ accessWidget.hardtext = i18n.get("uiR2EDLoadScenario_Yes")
else
- accessWidget.hardtext = i18n.get("uiR2EDLoadScenario_No"):toUtf8()
+ accessWidget.hardtext = i18n.get("uiR2EDLoadScenario_No")
end
okButton.frozen = not self.RingAccess
@@ -561,9 +561,9 @@ function GameR2Loading:getTreeTooltip()
local isInNoobLand = getDbProp("SERVER:USER:IS_NEWBIE")
if isInNoobLand == 1 and isPlayerFreeTrial() then
- tree.tooltip = i18n.get("uiR2EdPropertyToolTip_LoadScenario_LoadScenario_NewbieTreeInfo"):toUtf8()
+ tree.tooltip = i18n.get("uiR2EdPropertyToolTip_LoadScenario_LoadScenario_NewbieTreeInfo")
else
- tree.tooltip = i18n.get("uiR2EdPropertyToolTip_LoadScenario_LoadScenario_TreeInfo"):toUtf8()
+ tree.tooltip = i18n.get("uiR2EdPropertyToolTip_LoadScenario_LoadScenario_TreeInfo")
end
end
diff --git a/ryzom/client/data/gamedev/interfaces_v3/guild.lua b/ryzom/client/data/gamedev/interfaces_v3/guild.lua
index 4c3bc0646..06a804cfd 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/guild.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/guild.lua
@@ -61,13 +61,13 @@ function game:guildBuildInterface()
uiMember.name.hardtext = getGuildMemberName(i);
local memberGrade = getGuildMemberGrade(i);
if (memberGrade == 'Leader') then
- uiMember.grade.uc_hardtext = i18n.get('uiGuildLeader');
+ uiMember.grade.text = i18n.get('uiGuildLeader');
elseif (memberGrade == 'HighOfficer') then
- uiMember.grade.uc_hardtext = i18n.get('uiGuildHighOfficer');
+ uiMember.grade.text = i18n.get('uiGuildHighOfficer');
elseif (memberGrade == 'Officer') then
- uiMember.grade.uc_hardtext = i18n.get('uiGuildOfficer');
+ uiMember.grade.text = i18n.get('uiGuildOfficer');
else
- uiMember.grade.uc_hardtext = i18n.get('uiGuildMember');
+ uiMember.grade.text = i18n.get('uiGuildMember');
end
uiMemberList:addChild(uiMember);
end
diff --git a/ryzom/client/data/gamedev/interfaces_v3/info_player.lua b/ryzom/client/data/gamedev/interfaces_v3/info_player.lua
index beefdcab7..9ee0416ed 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/info_player.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/info_player.lua
@@ -121,7 +121,7 @@ function game:displayMagicProtect(dbVal)
local uiText= ui.val;
-- set the text (percentage)
- uiText.uc_hardtext= tostring(val) .. "%";
+ uiText.text= tostring(val) .. "%";
-- set color and global color according to maximum reached or not
if(val >= vMax) then
@@ -215,7 +215,7 @@ function game:displayMagicResist(dbVal)
local uiText= ui.val;
-- set the text (final value)
- uiText.uc_hardtext= tostring(val);
+ uiText.text= tostring(val);
-- set color and global color according to maximum reached or not
if(val >= vMax) then
@@ -273,14 +273,14 @@ function game:onDrawNpcWebPage()
if(available) then
local ucUrl
if config.Local == 1 then
- ucUrl = ucstring(NicoMagicURL) -- for test in local mode
+ ucUrl = NicoMagicURL -- for test in local mode
else
ucUrl = getDynString(self.NpcWebPage.UrlTextId);
end
-- browse
local uiStr= getUIId(getUICaller());
-- if the url
- local utf8Url = ucUrl:toUtf8()
+ local utf8Url = ucUrl
local isRing = string.find(utf8Url, "ring_access_point=1") ~= nil
if isRing then
-- when in ring mode, add the parameters ourselves. 60 sec timeout because of zope...
@@ -585,30 +585,30 @@ function game:getPvpEffects()
fmt = i18n.get('uiPvPEffect_' .. getRegionByAlias(id) .. '_Bonus');
fmt = replacePvpEffectParam(fmt, param);
if (textBonus ~= '') then
- textBonus = concatUCString(textBonus, '\n\n');
+ textBonus = concatString(textBonus, '\n\n');
end
- textBonus = concatUCString(textBonus, fmt);
+ textBonus = concatString(textBonus, fmt);
else
hasMalus = true;
fmt = i18n.get('uiPvPEffect_' .. getRegionByAlias(id) .. '_Malus');
fmt = replacePvpEffectParam(fmt, param);
if (textMalus ~= '') then
- textMalus = concatUCString(textMalus, '\n\n');
+ textMalus = concatString(textMalus, '\n\n');
end
- textMalus = concatUCString(textMalus, fmt);
+ textMalus = concatString(textMalus, fmt);
end;
end
end
if (hasBonus) then
- uiGroup.pvpEffectsBonusMalusInfo.uc_hardtext_format = i18n.get('uiPvpEffectBonus');
- uiGroup.pvpEffectsBonusMalus.uc_hardtext_format = textBonus;
+ uiGroup.pvpEffectsBonusMalusInfo.text_format = i18n.get('uiPvpEffectBonus');
+ uiGroup.pvpEffectsBonusMalus.text_format = textBonus;
elseif (hasMalus) then
- uiGroup.pvpEffectsBonusMalusInfo.uc_hardtext_format = i18n.get('uiPvpEffectMalus');
- uiGroup.pvpEffectsBonusMalus.uc_hardtext_format = textMalus;
+ uiGroup.pvpEffectsBonusMalusInfo.text_format = i18n.get('uiPvpEffectMalus');
+ uiGroup.pvpEffectsBonusMalus.text_format = textMalus;
else
- uiGroup.pvpEffectsBonusMalusInfo.uc_hardtext_format = '';
- uiGroup.pvpEffectsBonusMalus.uc_hardtext_format = '';
+ uiGroup.pvpEffectsBonusMalusInfo.text_format = '';
+ uiGroup.pvpEffectsBonusMalus.text_format = '';
end
end
@@ -651,7 +651,7 @@ function game:getAllegiancePoints()
text = findReplaceAll(text, '%faction', self:getFactionName(civ));
text = findReplaceAll(text, '%points', tostring(civPoints));
end
- uiGroup.civ_allegiance_pts.uc_hardtext_format = text;
+ uiGroup.civ_allegiance_pts.text_format = text;
-- cult allegiance
if (cult == self.TPVPClan.None or cult == self.TPVPClan.Neutral) then
@@ -661,7 +661,7 @@ function game:getAllegiancePoints()
text = findReplaceAll(text, '%faction', self:getFactionName(cult));
text = findReplaceAll(text, '%points', tostring(cultPoints));
end
- uiGroup.cult_allegiance_pts.uc_hardtext_format = text;
+ uiGroup.cult_allegiance_pts.text_format = text;
end
------------------------------------------------------------------------------------------------------------
@@ -669,7 +669,7 @@ function game:updateAllegiance(path, uiText)
local alleg = getDbProp(path);
local text = i18n.get('uiFameAllegiance' .. tostring(alleg) );
- getUICaller()[uiText].uc_hardtext= text;
+ getUICaller()[uiText].text= text;
end
------------------------------------------------------------------------------------------------------------
@@ -708,28 +708,28 @@ function game:tooltipDeltaValue(base, max)
local text;
if (val == 0) then
- text = concatUCString('@{FFFF}', tostring(max));
+ text = concatString('@{FFFF}', tostring(max));
else
if (val > 0) then
-- bonus
- text = concatUCString('@{FFFF}', tostring(max));
- text = concatUCString(text, ' (');
- text = concatUCString(text, tostring(base));
- text = concatUCString(text, '@{0F0F}');
- text = concatUCString(text, ' + ');
- text = concatUCString(text, tostring(val));
- text = concatUCString(text, '@{FFFF}');
- text = concatUCString(text, ')');
+ text = concatString('@{FFFF}', tostring(max));
+ text = concatString(text, ' (');
+ text = concatString(text, tostring(base));
+ text = concatString(text, '@{0F0F}');
+ text = concatString(text, ' + ');
+ text = concatString(text, tostring(val));
+ text = concatString(text, '@{FFFF}');
+ text = concatString(text, ')');
else
-- malus
- text = concatUCString('@{FFFF}', tostring(max));
- text = concatUCString(text, ' (');
- text = concatUCString(text, tostring(base));
- text = concatUCString(text, '@{E42F}');
- text = concatUCString(text, ' - ');
- text = concatUCString(text, tostring(math.abs(val)));
- text = concatUCString(text, '@{FFFF}');
- text = concatUCString(text, ')');
+ text = concatString('@{FFFF}', tostring(max));
+ text = concatString(text, ' (');
+ text = concatString(text, tostring(base));
+ text = concatString(text, '@{E42F}');
+ text = concatString(text, ' - ');
+ text = concatString(text, tostring(math.abs(val)));
+ text = concatString(text, '@{FFFF}');
+ text = concatString(text, ')');
end
end
@@ -958,7 +958,7 @@ function RingPlayerInfo:updateRRPSLevel(dbVal, tooltip)
local uiText= ui.val;
-- set the text
- uiText.uc_hardtext= tostring(val)
+ uiText.text= tostring(val)
self:tooltipRRPs(dbVal, tooltip)
end
@@ -1299,10 +1299,10 @@ function game:updateMissionJournalHeader()
win.header_active = headerActive
win.right_button_enabled = headerActive
if headerActive then
- win.uc_title_opened = i18n.get("uiJournalTitle")
+ win.title_opened = i18n.get("uiJournalTitle")
win.content_y_offset = 0
else
- win.uc_title_opened = ucstring("")
+ win.title_opened = ""
win.content_y_offset = win.header_opened.h_real + 3
end
end
@@ -1336,8 +1336,8 @@ function game:updateMissionJournalFixedEntry()
id = id .. "_Mainland_" .. getUserRace()
end
end
- fixedEntryMain.uc_hardtext = i18n.get(id)
- fixedEntryRing.uc_hardtext = i18n.get(id)
+ fixedEntryMain.text = i18n.get(id)
+ fixedEntryRing.text = i18n.get(id)
self:updateMissionWindowLayout()
end
diff --git a/ryzom/client/data/gamedev/interfaces_v3/info_player.xml b/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
index 98dab16a8..4e4ba4a53 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
@@ -796,7 +796,7 @@
-
+
@@ -884,7 +884,7 @@
-
+
diff --git a/ryzom/client/data/gamedev/interfaces_v3/interaction.lua b/ryzom/client/data/gamedev/interfaces_v3/interaction.lua
index bdf838f88..526852420 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/interaction.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/interaction.lua
@@ -60,12 +60,12 @@ function game:updateEmoteMenu(prop, tooltip, tooltip_pushed, name, param)
if (key ~= nil and key ~= '') then
key = ' @{T25}@{2F2F}(' .. key .. ')';
- text = concatUCString(text, key);
+ text = concatString(text, key);
end
-- if we don't do the full getUI, it doesn't work (don't understand why)
local uiQC= getUI("ui:interface:user_chat_emote_menu:quick_chat:" .. "qc" .. i);
- uiQC.uc_hardtext_format= text;
+ uiQC.text_format= text;
end
end
@@ -358,7 +358,7 @@ function game:updateTargetConsiderUI()
end
if impossible then
- wgToolTip.tooltip = concatUCString(wgToolTip.tooltip, ucstring("\n"), i18n.get("uittConsiderUnknownLevel"))
+ wgToolTip.tooltip = concatString(wgToolTip.tooltip, "\n", i18n.get("uittConsiderUnknownLevel"))
end
end
diff --git a/ryzom/client/data/gamedev/interfaces_v3/interaction.xml b/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
index 2140e5f80..b323813a3 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
@@ -28,7 +28,7 @@
-
+
@@ -469,7 +469,7 @@
-
+
-
-
+
+
diff --git a/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml b/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml
index e2dd4b881..d80d16fdc 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml
@@ -67,7 +67,7 @@
id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true" on_focus="" on_focus_params=""
enter_loose_focus="true" prompt=">"
enter_recover_focus="true"
- max_num_chars="256"
+ max_num_chars="255"
menu_r=""
onchange=""
onchange_params=""
@@ -404,7 +404,7 @@
sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true"
enter_loose_focus="true" prompt=">"
enter_recover_focus="true"
- max_num_chars="256"
+ max_num_chars="255"
menu_r=""
onchange=""
onchange_params=""
@@ -447,7 +447,7 @@
sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true"
enter_loose_focus="true" prompt=">"
enter_recover_focus="true"
- max_num_chars="256"
+ max_num_chars="255"
menu_r=""
onchange=""
onchange_params=""
diff --git a/ryzom/client/data/gamedev/interfaces_v3/map.xml b/ryzom/client/data/gamedev/interfaces_v3/map.xml
index b93028b82..88a633878 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/map.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/map.xml
@@ -456,8 +456,8 @@
-
-
+
+
diff --git a/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua b/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua
index 43727200a..605a5be18 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua
@@ -353,7 +353,7 @@ end
-- local text = self:getProgressGroup():find("text")
-- local ellipsisTxt = self:getProgressGroup():find("ellipsis")
-- text.color = color
--- text.uc_hardtext = ucstr
+-- text.text = ucstr
-- if ellipsis then
-- ellipsisTxt.hardtext = ellipsis
-- else
@@ -378,7 +378,7 @@ end
-- local progressDate = nltime.getLocalTime() / 500
-- local colValue = math.floor(230 + 24 * math.sin(progressDate))
-- local color = string.format("%d %d %d %d", colValue, colValue, colValue, 255)
--- self:setProgressText(concatUCString(i18n.get("uiBGD_Progress"), ucstring(progressPercentText)), color, progress, progressSymbol[progressPostfix + 1])
+-- self:setProgressText(concatString(i18n.get("uiBGD_Progress"), progressPercentText), color, progress, progressSymbol[progressPostfix + 1])
--end
--
--function outgame:setPatchSuccess()
diff --git a/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml b/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
index e03027d54..d009d9c62 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
@@ -1560,7 +1560,7 @@
-
+
diff --git a/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml b/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml
index 50655a82b..b52674ba6 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml
@@ -146,7 +146,7 @@
-
+
diff --git a/ryzom/client/data/gamedev/interfaces_v3/outgame_select.xml b/ryzom/client/data/gamedev/interfaces_v3/outgame_select.xml
index 55bb28abc..34df347eb 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/outgame_select.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/outgame_select.xml
@@ -109,11 +109,11 @@
-
-
+
+
-
+
@@ -160,11 +160,11 @@
used to change at the end of full_to_full_1 anim the 3D view of the character and launch the second part
-->
-
-
+
+
-
+
diff --git a/ryzom/client/data/gamedev/interfaces_v3/outgame_summary.xml b/ryzom/client/data/gamedev/interfaces_v3/outgame_summary.xml
index 34004be1f..beef8bd96 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/outgame_summary.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/outgame_summary.xml
@@ -184,12 +184,12 @@
-
+
-
+
diff --git a/ryzom/client/data/gamedev/interfaces_v3/outgame_widgets.xml b/ryzom/client/data/gamedev/interfaces_v3/outgame_widgets.xml
index b1f4b5716..0774c4de8 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/outgame_widgets.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/outgame_widgets.xml
@@ -90,7 +90,8 @@
-
+
diff --git a/ryzom/client/data/gamedev/interfaces_v3/outpost.lua b/ryzom/client/data/gamedev/interfaces_v3/outpost.lua
index 77f1b1125..3c884a680 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/outpost.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/outpost.lua
@@ -45,7 +45,7 @@ end
function game:outpostDisplayTimeZone(uiLocal)
local tz= getDbProp('UI:SAVE:OUTPOST:TIME_ZONE');
local uiGroup= getUICaller();
- uiGroup[uiLocal].uc_hardtext= 'GMT ' .. string.format('%+d', tz);
+ uiGroup[uiLocal].text= 'GMT ' .. string.format('%+d', tz);
end
------------------------------------------------------------------------------------------------------------
@@ -57,7 +57,7 @@ function game:outpostAdjustHour(uiLocal, prop)
-- add time zone and clamp hour
h = math.fmod(h + tz + 24, 24);
- uiGroup[uiLocal].uc_hardtext = string.format('%02d:00', h);
+ uiGroup[uiLocal].text = string.format('%02d:00', h);
end
------------------------------------------------------------------------------------------------------------
@@ -220,9 +220,9 @@ function game:outpostInfoOnDraw()
-- readable form
if (status == self.OutpostEnums.Peace) then
- uiGroup.Env.Timer.uc_hardtext= '';
+ uiGroup.Env.Timer.text= '';
else
- uiGroup.Env.Timer.uc_hardtext= '(' .. runFct('secondsToTimeString', timeSec) .. ')';
+ uiGroup.Env.Timer.text= '(' .. runFct('secondsToTimeString', timeSec) .. ')';
end
end
@@ -448,7 +448,7 @@ end
function game:outpostDisplayStatusInfo(statusExpr, id)
local uiGroup = getUICaller();
local text = self:outpostGetStatusInfo(statusExpr, -1, 'no');
- uiGroup[id].uc_hardtext_format = text;
+ uiGroup[id].text_format = text;
end
------------------------------------------------------------------------------------------------------------
@@ -487,7 +487,7 @@ function game:outpostChangeRoundLvlThreshold()
local val= getDbProp(path .. ':ROUND_LVL_THRESHOLD');
-- setup text
- uiGroup.outpost_lvl_thre.uc_hardtext= tostring(val);
+ uiGroup.outpost_lvl_thre.text= tostring(val);
end
@@ -504,9 +504,9 @@ function game:outpostChangeRoundLvlMaxAtt()
-- setup text (only relevant when attack period has begun)
if(status>=self.OutpostEnums.AttackRound) then
- uiGroup.outpost_lvl_max_att.uc_hardtext= tostring(val);
+ uiGroup.outpost_lvl_max_att.text= tostring(val);
else
- uiGroup.outpost_lvl_max_att.uc_hardtext= '- ';
+ uiGroup.outpost_lvl_max_att.text= '- ';
end
end
@@ -524,9 +524,9 @@ function game:outpostChangeRoundLvlMaxDef()
-- setup text (only relevant in War)
if(status>=self.OutpostEnums.DefenseRound) then
- uiGroup.outpost_lvl_max_def.uc_hardtext= tostring(val);
+ uiGroup.outpost_lvl_max_def.text= tostring(val);
else
- uiGroup.outpost_lvl_max_def.uc_hardtext= '- ';
+ uiGroup.outpost_lvl_max_def.text= '- ';
end
end
@@ -546,9 +546,9 @@ function game:outpostChangeRoundLvlCur()
-- setup text (only in a Attack/Defense Round)
if(self:outpostIsStatusWarRound(status)) then
- uiGroup.outpost_lvl_cur.uc_hardtext= tostring(val);
+ uiGroup.outpost_lvl_cur.text= tostring(val);
else
- uiGroup.outpost_lvl_cur.uc_hardtext= '- ';
+ uiGroup.outpost_lvl_cur.text= '- ';
end
end
@@ -569,9 +569,9 @@ function game:outpostChangeRoundId()
-- setup text (only in a Attack/Defense Round)
if(self:outpostIsStatusWarRound(status)) then
- uiGroup.outpost_round_cur.uc_hardtext= tostring(val) .. ' / ' .. tostring(maxRound);
+ uiGroup.outpost_round_cur.text= tostring(val) .. ' / ' .. tostring(maxRound);
else
- uiGroup.outpost_round_cur.uc_hardtext= '- ';
+ uiGroup.outpost_round_cur.text= '- ';
end
end
@@ -607,7 +607,7 @@ function game:outpostPvpJoinTimerOnDraw()
-- replace in str
local text= i18n.get('uiOutpostJoinPVPTimer');
text= findReplaceAll(text, "%time", tostring(timeSec));
- uiGroup.Env.Timer.uc_hardtext_format= text;
+ uiGroup.Env.Timer.text_format= text;
end
diff --git a/ryzom/client/data/gamedev/interfaces_v3/outpost.xml b/ryzom/client/data/gamedev/interfaces_v3/outpost.xml
index 8888d9e18..0e0d0c155 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/outpost.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/outpost.xml
@@ -145,7 +145,7 @@
-
+
@@ -338,13 +338,13 @@
-
+
-
+
@@ -443,14 +443,14 @@
+ target="outpost_att_period:hardtext" />
+ target="outpost_def_period:hardtext" />
@@ -500,9 +500,9 @@
-
+
-
+
@@ -530,14 +530,14 @@
-
+
-
+
-
+
@@ -572,8 +572,8 @@
-
-
+
+
@@ -631,7 +631,7 @@
+ target="explain_edit:hardtext_format" />
@@ -665,7 +665,7 @@
-
+
-
+
@@ -689,7 +689,7 @@
+ target="building_info:hardtext" />
@@ -773,12 +773,12 @@
-
+
-
+
@@ -804,7 +804,7 @@
+ target="outpost_att_period:hardtext" />
@@ -966,9 +966,9 @@
-
+
-
+
@@ -1005,7 +1005,7 @@
+ getSquadDesc(@%outpost_selected:SQUAD_SHOP:[UI:TEMP:OUTPOST:SQUAD_TO_BUY]:SHEET))" target="squad_desc:hardtext" />
-
+
-
+
@@ -291,7 +291,7 @@
-
+
diff --git a/ryzom/client/data/gamedev/interfaces_v3/r2ed.xml b/ryzom/client/data/gamedev/interfaces_v3/r2ed.xml
index a522c9df0..eef554572 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/r2ed.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/r2ed.xml
@@ -1227,7 +1227,7 @@
@@ -3019,7 +3019,7 @@ text_y="-2"
diff --git a/ryzom/client/data/gamedev/interfaces_v3/r2ed_scenario.xml b/ryzom/client/data/gamedev/interfaces_v3/r2ed_scenario.xml
index 3095cbc48..d95833ea6 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/r2ed_scenario.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/r2ed_scenario.xml
@@ -667,7 +667,7 @@
-
+
diff --git a/ryzom/client/data/gamedev/interfaces_v3/reset.xml b/ryzom/client/data/gamedev/interfaces_v3/reset.xml
index 6cdeac1ff..c83eb141c 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/reset.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/reset.xml
@@ -446,7 +446,7 @@
-
+
diff --git a/ryzom/client/data/gamedev/interfaces_v3/ring_access_point.lua b/ryzom/client/data/gamedev/interfaces_v3/ring_access_point.lua
index 0cfd27fee..92573ef38 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/ring_access_point.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/ring_access_point.lua
@@ -200,7 +200,7 @@ end
--***********************************************************************
function RingAccessPoint:initScenarioTypes()
for k = 0, 6 do
- self.ScenarioTypeToUtf8[k] = i18n.get("uiRAP_ST_" .. tostring(k)):toUtf8()
+ self.ScenarioTypeToUtf8[k] = i18n.get("uiRAP_ST_" .. tostring(k))
end
end
@@ -227,16 +227,12 @@ function RingAccessPoint:getColumn(name)
return getUI("ui:interface:ring_sessions:content:main:enclosing:columns:getw:column_group:" .. name .. ":values")
end
-
--***********************************************************************
function RingAccessPoint:getSelectList()
return getUI("ui:interface:ring_sessions:content:main:enclosing:columns:getw:select")
--return getUI("ui:interface:checkpass:content:enclosing:select")
end
-
-local scratchUCStr = ucstring()
-
--***********************************************************************
function RingAccessPoint:newTemplate(name, cache)
local group
@@ -249,16 +245,15 @@ function RingAccessPoint:newTemplate(name, cache)
return group
end
-local lineFeed = ucstring("\n")
-local lineEnd = ucstring(". ")
+local lineFeed = "\n"
+local lineEnd = ". "
--***********************************************************************
-- build a new text group from utf8 text
function RingAccessPoint:newTextLabel(value)
local group = self:newTemplate("rap_text", self.TextCache)
- scratchUCStr:fromUtf8(value)
- scratchUCStr = findReplaceAll(scratchUCStr, lineFeed, lineEnd)
- group:find("t").uc_hardtext_single_line_format = scratchUCStr
+ local str = findReplaceAll(value, lineFeed, lineEnd)
+ group:find("t").text_single_line_format = str
return group
end
@@ -266,15 +261,14 @@ end
-- build a new text group from utf8 text
function RingAccessPoint:newCenteredTextLabel(value)
local group = self:newTemplate("rap_text_centered", self.CenteredTextCache)
- scratchUCStr:fromUtf8(value)
- group:find("t").uc_hardtext_single_line_format = scratchUCStr
+ group:find("t").text_single_line_format = value
return group
end
--***********************************************************************
function RingAccessPoint:newNumberLabel(value)
local group = self:newTemplate("rap_number", self.NumberCache)
- group:find("t").uc_hardtext_single_line_format = tostring(value)
+ group:find("t").text_single_line_format = tostring(value)
return group
end
@@ -324,7 +318,7 @@ function RingAccessPoint:addLine(line)
local level = line.Level-1
if level >= 0 and level <= 5 then
- self:getColumn("level"):addChild(self:newNumberLabel(i18n.get("uiRAP_Level" .. tostring(level)):toUtf8()))
+ self:getColumn("level"):addChild(self:newNumberLabel(i18n.get("uiRAP_Level" .. tostring(level))))
else
self:getColumn("level"):addChild(self:newNumberLabel("?"))
end
@@ -333,7 +327,7 @@ function RingAccessPoint:addLine(line)
if self.LangToTex[line.Language] ~= nil then
self:getColumn("language"):addChild(self:newBitmap(self.LangToTex[line.Language]))
elseif i18n.hasTranslation("uiR2ED" .. line.Language) then
- self:getColumn("language"):addChild(self:newCenteredTextLabel(i18n.get("uiR2ED" .. line.Language):toUtf8()))
+ self:getColumn("language"):addChild(self:newCenteredTextLabel(i18n.get("uiR2ED" .. line.Language)))
else
self:getColumn("language"):addChild(self:newCenteredTextLabel(line.Language))
end
@@ -527,7 +521,7 @@ function RingAccessPoint:setMessage(msg, color)
-- The version below set the msg in the middle of the window
--local errorTxt = self:getWindow():find("errorMsg")
- errorTxt.uc_hardtext = msg
+ errorTxt.text = msg
errorTxt.color = color
errorTxt.active=true
--self:getWindow():invalidateCoords()
@@ -631,20 +625,20 @@ function RingAccessPoint:onLineSessionTooltip()
local activeLine = self.CurrActiveList[self:getSelectList():getElementIndex(getUICaller().parent) + 1]
local contextHelpText
if self:isInvited(activeLine.Flags) then
- contextHelpText = i18n.get("uiRAP_HowToJoin"):toUtf8()
+ contextHelpText = i18n.get("uiRAP_HowToJoin")
else
- contextHelpText = i18n.get("uiRAP_HowToBeInvited"):toUtf8()
+ contextHelpText = i18n.get("uiRAP_HowToBeInvited")
end
local desc = activeLine.Desc
if desc=="" then desc="-" end
- contextHelpText = contextHelpText .. "\n\n@{6F6F}" .. i18n.get("uiR2EDProp_LoadScenario_Description"):toUtf8() .. " : @{FFFF}" .. ucstring(desc):toUtf8() .. "\n\n"
+ contextHelpText = contextHelpText .. "\n\n@{6F6F}" .. i18n.get("uiR2EDProp_LoadScenario_Description") .. " : @{FFFF}" .. desc .. "\n\n"
- local rateFun = "@{6F6F}" .. i18n.get("uiRAP_RateFun"):toUtf8() .. " : @{FFFF}"
- local rateDiff = "@{6F6F}" .. i18n.get("uiRAP_RateDifficulty"):toUtf8() .. " : @{FFFF}"
- local rateAccess = "@{6F6F}" .. i18n.get("uiRAP_RateAccessibility"):toUtf8() .. " : @{FFFF}"
- local rateOrig = "@{6F6F}" .. i18n.get("uiRAP_RateOriginality"):toUtf8() .. " : @{FFFF}"
- local rateDirection = "@{6F6F}" .. i18n.get("uiRAP_RateDirection"):toUtf8() .. " : @{FFFF}"
+ local rateFun = "@{6F6F}" .. i18n.get("uiRAP_RateFun") .. " : @{FFFF}"
+ local rateDiff = "@{6F6F}" .. i18n.get("uiRAP_RateDifficulty") .. " : @{FFFF}"
+ local rateAccess = "@{6F6F}" .. i18n.get("uiRAP_RateAccessibility") .. " : @{FFFF}"
+ local rateOrig = "@{6F6F}" .. i18n.get("uiRAP_RateOriginality") .. " : @{FFFF}"
+ local rateDirection = "@{6F6F}" .. i18n.get("uiRAP_RateDirection") .. " : @{FFFF}"
if activeLine.NbRating>0 then
rateFun = rateFun .. tostring(math.min(100, activeLine.RateFun)) .. "/100"
@@ -653,11 +647,11 @@ function RingAccessPoint:onLineSessionTooltip()
rateOrig = rateOrig .. tostring(math.min(100, activeLine.RateOriginality)) .. "/100"
rateDirection = rateDirection .. tostring(math.min(100, activeLine.RateDirection)) .. "/100"
else
- rateFun = rateFun .. i18n.get("uiRAP_NoRate"):toUtf8()
- rateDiff = rateDiff .. i18n.get("uiRAP_NoRate"):toUtf8()
- rateAccess = rateAccess .. i18n.get("uiRAP_NoRate"):toUtf8()
- rateOrig = rateOrig .. i18n.get("uiRAP_NoRate"):toUtf8()
- rateDirection = rateDirection .. i18n.get("uiRAP_NoRate"):toUtf8()
+ rateFun = rateFun .. i18n.get("uiRAP_NoRate")
+ rateDiff = rateDiff .. i18n.get("uiRAP_NoRate")
+ rateAccess = rateAccess .. i18n.get("uiRAP_NoRate")
+ rateOrig = rateOrig .. i18n.get("uiRAP_NoRate")
+ rateDirection = rateDirection .. i18n.get("uiRAP_NoRate")
end
-- contextHelpText = contextHelpText .. rateFun .. "\n"
@@ -666,9 +660,7 @@ function RingAccessPoint:onLineSessionTooltip()
-- contextHelpText = contextHelpText .. rateOrig .. "\n"
-- contextHelpText = contextHelpText .. rateDirection .. "\n"
- local uc_contextHelpText = ucstring()
- uc_contextHelpText:fromUtf8(contextHelpText)
- setContextHelpText(uc_contextHelpText)
+ setContextHelpText(contextHelpText)
end
@@ -724,10 +716,9 @@ end
--***********************************************************************
function RingAccessPoint:onTell()
--debugInfo("tell to owner of session" .. self.SelectedSessionId)
- player = ucstring()
- player:fromUtf8(self:getSessionFromId(self.SelectedSessionId).Owner)
+ player = self:getSessionFromId(self.SelectedSessionId).Owner
tell(player, i18n.get("uiRAP_AskForInvite"))
- displaySystemInfo(concatUCString(i18n.get("uiRAP_TellSentTo"), player), "BC")
+ displaySystemInfo(concatString(i18n.get("uiRAP_TellSentTo"), player), "BC")
end
--***********************************************************************
@@ -915,7 +906,7 @@ function RingAccessPoint:onDraw()
-- refreshText.active = false
--else
-- refreshText.active = true
- -- refreshText.uc_hardtext = waitText
+ -- refreshText.text = waitText
--end
end
else
diff --git a/ryzom/client/data/gamedev/interfaces_v3/ring_access_point_filter.lua b/ryzom/client/data/gamedev/interfaces_v3/ring_access_point_filter.lua
index 44a0451d7..372db9d42 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/ring_access_point_filter.lua
+++ b/ryzom/client/data/gamedev/interfaces_v3/ring_access_point_filter.lua
@@ -45,24 +45,24 @@ function game.RingAccessPointFilter:init()
local levelCB = filterScenarioWnd:find("level"):find("combo_box")
assert(levelCB)
levelCB:resetTexts()
- levelCB:addText(ucstring(i18n.get("uiScenarioLevel_Any")))
- levelCB:addText(ucstring("1-50"))
- levelCB:addText(ucstring("51-100"))
- levelCB:addText(ucstring("101-150"))
- levelCB:addText(ucstring("151-200"))
- levelCB:addText(ucstring("201-250"))
+ levelCB:addText(i18n.get("uiScenarioLevel_Any"))
+ levelCB:addText("1-50")
+ levelCB:addText("51-100")
+ levelCB:addText("101-150")
+ levelCB:addText("151-200")
+ levelCB:addText("201-250")
levelCB.selection = 0
local genreCB = filterScenarioWnd:find("genre"):find("combo_box")
assert(genreCB)
genreCB:resetTexts()
- genreCB:addText(ucstring(i18n.get("uiScenarioOrient_Any")))
- genreCB:addText(ucstring(i18n.get("uiScenarioOrient_NewbieTraining")))
- genreCB:addText(ucstring(i18n.get("uiScenarioOrient_StoryTelling")))
- genreCB:addText(ucstring(i18n.get("uiScenarioOrient_Mistery")))
- genreCB:addText(ucstring(i18n.get("uiScenarioOrient_HackSlash")))
- genreCB:addText(ucstring(i18n.get("uiScenarioOrient_GuildTraining")))
- genreCB:addText(ucstring(i18n.get("uiScenarioOrient_Other")))
+ genreCB:addText(i18n.get("uiScenarioOrient_Any"))
+ genreCB:addText(i18n.get("uiScenarioOrient_NewbieTraining"))
+ genreCB:addText(i18n.get("uiScenarioOrient_StoryTelling"))
+ genreCB:addText(i18n.get("uiScenarioOrient_Mistery"))
+ genreCB:addText(i18n.get("uiScenarioOrient_HackSlash"))
+ genreCB:addText(i18n.get("uiScenarioOrient_GuildTraining"))
+ genreCB:addText(i18n.get("uiScenarioOrient_Other"))
genreCB.selection = 0
local name = filterScenarioWnd:find("name"):find("edit_box_group")
@@ -85,10 +85,10 @@ function game.RingAccessPointFilter:getURLParameters()
local filterScenarioWnd = self:getWnd()
assert(filterScenarioWnd)
- local owner = filterScenarioWnd:find("owner"):find("edit_box_group").uc_input_string
+ local owner = filterScenarioWnd:find("owner"):find("edit_box_group").input_string
local level = self.LevelToURLParam[filterScenarioWnd:find("level"):find("combo_box").selection]
local orientation = self.OrientationToURLParam[filterScenarioWnd:find("genre"):find("combo_box").selection]
- local name = filterScenarioWnd:find("name"):find("edit_box_group").uc_input_string
+ local name = filterScenarioWnd:find("name"):find("edit_box_group").input_string
local charSlot = getCharSlot()
local result = string.format("&owner=%s&level=%s&orientation=%s&name=%s&charSlot=%u", encodeURLUnicodeParam(owner), level, orientation, encodeURLUnicodeParam(name), charSlot)
@@ -107,12 +107,12 @@ function game.RingAccessPointFilter:validate()
end
local ucUrl
if config.Local == 1 then
- ucUrl = ucstring(NicoMagicURL) -- for test in local mode
+ ucUrl = NicoMagicURL -- for test in local mode
else
ucUrl = getDynString(game.NpcWebPage.UrlTextId)
end
debugInfo(tostring(ucUrl))
- local utf8Url = ucUrl:toUtf8()
+ local utf8Url = ucUrl
local browser = getUI("ui:interface:npc_web_browser"):find("html")
-- when in ring mode, add the parameters ourselves. 60 second is the timout for zope....
browseNpcWebPage(getUIId(browser), utf8Url .. self:getURLParameters(), false, 60)
diff --git a/ryzom/client/data/gamedev/interfaces_v3/ring_window.xml b/ryzom/client/data/gamedev/interfaces_v3/ring_window.xml
index b92614e31..c9c505f4c 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/ring_window.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/ring_window.xml
@@ -621,7 +621,7 @@
-
+
-
+
-
+
diff --git a/ryzom/common/data_common/r2/r2_activities.lua b/ryzom/common/data_common/r2/r2_activities.lua
index 0a2675e75..b91189dae 100644
--- a/ryzom/common/data_common/r2/r2_activities.lua
+++ b/ryzom/common/data_common/r2/r2_activities.lua
@@ -19,8 +19,8 @@ eltTemplateParams = {
multiMaxLine="3"
},
elementEditorTemplate = "template_edit_activity",
-elementInitialName=i18n.get("uiR2EdActivity"):toUtf8(),
-sequenceInitialName=i18n.get("uiR2EdSeq"):toUtf8(),
+elementInitialName=i18n.get("uiR2EdActivity"),
+sequenceInitialName=i18n.get("uiR2EdSeq"),
isInitialized = false,
@@ -37,33 +37,33 @@ updatedEltUIID = nil, -- creation or update of element
activityTypeTranslation = {
- ["Stand Still"] ={trans=i18n.get("uiR2EdStandStill"):toUtf8(), zone=""},
- ["Follow Route"] ={trans=i18n.get("uiR2EdFollowRoad"):toUtf8(), zone="Road"},
- ["Patrol"] ={trans=i18n.get("uiR2EdPatrol"):toUtf8(), zone="Road"},
- ["Repeat Road"] ={trans=i18n.get("uiR2EdRepeatRoad"):toUtf8(), zone="Road"},
- ["Wander"] ={trans=i18n.get("uiR2EdWander"):toUtf8(), zone="Region"},
- ["Stand On Start Point"] ={trans=i18n.get("uiR2EdStandOnStartPoint"):toUtf8(), zone=""},
- ["Go To Start Point"] ={trans=i18n.get("uiR2EdGoToStartPoint"):toUtf8(), zone=""},
- ["Go To Zone"] ={trans=i18n.get("uiR2EdGoToZone"):toUtf8(), zone="Region"},
- ["Sit Down"] ={trans=i18n.get("uiR2EdSitDown"):toUtf8(), zone=""},
- ["Stand Up"] ={trans=i18n.get("uiR2EdStandUp"):toUtf8(), zone=""},
- ["Rest In Zone"] ={trans=i18n.get("uiR2EDRest"):toUtf8(), zone="Region"},
- ["Feed In Zone"] ={trans=i18n.get("uiR2EDFeed"):toUtf8(), zone="Region"},
- ["Work In Zone"] ={trans=i18n.get("uiR2EDWork"):toUtf8(), zone="Region"},
- ["Hunt In Zone"] ={trans=i18n.get("uiR2EDHunt"):toUtf8(), zone="Region"},
- ["Guard Zone"] ={trans=i18n.get("uiR2EDGuard"):toUtf8(), zone="Region"},
+ ["Stand Still"] ={trans=i18n.get("uiR2EdStandStill"), zone=""},
+ ["Follow Route"] ={trans=i18n.get("uiR2EdFollowRoad"), zone="Road"},
+ ["Patrol"] ={trans=i18n.get("uiR2EdPatrol"), zone="Road"},
+ ["Repeat Road"] ={trans=i18n.get("uiR2EdRepeatRoad"), zone="Road"},
+ ["Wander"] ={trans=i18n.get("uiR2EdWander"), zone="Region"},
+ ["Stand On Start Point"] ={trans=i18n.get("uiR2EdStandOnStartPoint"), zone=""},
+ ["Go To Start Point"] ={trans=i18n.get("uiR2EdGoToStartPoint"), zone=""},
+ ["Go To Zone"] ={trans=i18n.get("uiR2EdGoToZone"), zone="Region"},
+ ["Sit Down"] ={trans=i18n.get("uiR2EdSitDown"), zone=""},
+ ["Stand Up"] ={trans=i18n.get("uiR2EdStandUp"), zone=""},
+ ["Rest In Zone"] ={trans=i18n.get("uiR2EDRest"), zone="Region"},
+ ["Feed In Zone"] ={trans=i18n.get("uiR2EDFeed"), zone="Region"},
+ ["Work In Zone"] ={trans=i18n.get("uiR2EDWork"), zone="Region"},
+ ["Hunt In Zone"] ={trans=i18n.get("uiR2EDHunt"), zone="Region"},
+ ["Guard Zone"] ={trans=i18n.get("uiR2EDGuard"), zone="Region"},
},
timeLimitsTranslation = {
- ["No Limit"] =i18n.get("uiR2EdNoTimeLimit"):toUtf8(),
- ["Chat"] =i18n.get("uiR2EdWhileChat"):toUtf8(),
- ["Few Sec"] =i18n.get("uiR2EdForCertainTime"):toUtf8(),
+ ["No Limit"] =i18n.get("uiR2EdNoTimeLimit"),
+ ["Chat"] =i18n.get("uiR2EdWhileChat"),
+ ["Few Sec"] =i18n.get("uiR2EdForCertainTime"),
},
timeLimitsProperties = {
- [i18n.get("uiR2EdNoTimeLimit"):toUtf8()] ="No Limit",
- [i18n.get("uiR2EdWhileChat"):toUtf8()] ="Chat",
- [i18n.get("uiR2EdForCertainTime"):toUtf8()] ="Few Sec"
+ [i18n.get("uiR2EdNoTimeLimit")] ="No Limit",
+ [i18n.get("uiR2EdWhileChat")] ="Chat",
+ [i18n.get("uiR2EdForCertainTime")] ="Few Sec"
},
}
@@ -192,9 +192,8 @@ function r2.activities:initEditorAfterFirstCall()
self:triggerSelectSequence(activitySequences[selectedSequenceIndex].InstanceId)
end
- local uc_title = ucstring()
- uc_title:fromUtf8(i18n.get("uiR2EDActivitySequenceEditor"):toUtf8() .. entity.Name)
- ui.uc_title = uc_title
+ local title = i18n.get("uiR2EDActivitySequenceEditor")..entity.Name
+ ui.title = title
self.isInitialized = true
end
@@ -261,9 +260,7 @@ function r2.activities:openSequenceEditor()
end
end
- local uc_sequ = ucstring()
- uc_sequ:fromUtf8(tabName)
- editName.uc_input_string = uc_sequ
+ editName.input_string = tabName
end
@@ -279,7 +276,7 @@ function r2.activities:setSequenceName()
assert(editName)
local sequenceInstId = self:currentSequInstId()
- r2.requestSetNode(sequenceInstId, "Name", editName.uc_input_string:toUtf8())
+ r2.requestSetNode(sequenceInstId, "Name", editName.input_string)
sequenceEditor.active = false
end
@@ -318,8 +315,8 @@ function r2.activities:newSequenceUI(activitySequence)
local templateParams = {
newElt="r2.activities:newElementInst()",
- newEltText=i18n.get("uiR2EdNewActivity"):toUtf8(),
- eltOrderText=i18n.get("uiR2EdActivityOrder"):toUtf8(),
+ newEltText=i18n.get("uiR2EdNewActivity"),
+ eltOrderText=i18n.get("uiR2EdActivityOrder"),
upElt="r2.activities:upElementInst()",
downElt="r2.activities:downElementInst()",
maxMinElts="r2.activities:maximizeMinimizeElements()",
@@ -433,9 +430,7 @@ function r2.activities:newSequenceUI(activitySequence)
sequName = self.sequenceInitialName .. (i+1)
end
- local uc_name = ucstring()
- uc_name:fromUtf8(sequName)
- tabButton.uc_hardtext = uc_name
+ tabButton.text = sequName
end
end
@@ -476,7 +471,7 @@ function r2.activities:removeSequenceUI(instance)
local buttonTab = tab:find("tab"..i)
assert(buttonTab)
if buttonTab.hardtext == self.sequenceInitialName..(i+1) then
- buttonTab.uc_hardtext = self.sequenceInitialName..i
+ buttonTab.text = self.sequenceInitialName..i
end
end
end
@@ -544,9 +539,7 @@ function r2.activities:updateSequenceUI(instance, attributeName)
local buttonTab = tab:find("tab"..tabId)
assert(buttonTab)
- local uc_name = ucstring()
- uc_name:fromUtf8(name)
- buttonTab.uc_hardtext = uc_name
+ buttonTab.text = name
local viewText = buttonTab:getViewText()
assert(viewText)
@@ -742,7 +735,7 @@ function r2.activities:createElementEditor()
local i = 0
while i < 20 do
i = i + 1
- cb:addText(ucstring(tostring(i)))
+ cb:addText(tostring(i))
end
end
@@ -784,7 +777,7 @@ function r2.activities:updateElementEditor()
assert(comboBox)
local value = select(instanceActivity.RoadCountLimit, instanceActivity.RoadCountLimit, "0")
if value == "0" then
- value = i18n.get("uiR2EdNoRoadCountLimit"):toUtf8()
+ value = i18n.get("uiR2EdNoRoadCountLimit")
end
comboBox.Env.locked = true
comboBox.selection_text = value
@@ -797,11 +790,11 @@ function r2.activities:updateElementEditor()
assert(comboBox)
local index = r2.logicComponents:searchElementIndex(instanceActivity)
- local uc_activityName = ucstring(self.elementInitialName.." : ")
if index~= nil then
- uc_activityName:fromUtf8(self.elementInitialName.." "..index.." : ")
+ activityName.text = self.elementInitialName.." "..index.." : "
+ else
+ activityName.text = self.elementInitialName.." : "
end
- activityName.uc_hardtext = uc_activityName
-- activity type
local activityText = instanceActivity:getVerb()
@@ -812,9 +805,7 @@ function r2.activities:updateElementEditor()
activityText = activityText .. " " .. place.Name
end
if activityText then
- local uc_activityText = ucstring()
- uc_activityText:fromUtf8(activityText)
- activityButtonText.uc_hardtext = uc_activityText
+ activityButtonText.text = activityText
end
-- time limit
@@ -832,27 +823,25 @@ function r2.activities:updateElementEditor()
local hoursNb, minNb, secNb = r2.logicComponents:calculHourMinSec(timeLimitValue)
- local timeLimitText = i18n.get("uiR2EdFor"):toUtf8() .. " "
- if hoursNb ~= 0 then timeLimitText = timeLimitText .. hoursNb .. i18n.get("uiR2EdShortHours"):toUtf8() .. " " end
- if minNb ~= 0 then timeLimitText = timeLimitText .. minNb .. i18n.get("uiR2EdShortMinutes"):toUtf8() .. " " end
- timeLimitText = timeLimitText .. secNb .. i18n.get("uiR2EdShortSeconds"):toUtf8()
+ local timeLimitText = i18n.get("uiR2EdFor") .. " "
+ if hoursNb ~= 0 then timeLimitText = timeLimitText .. hoursNb .. i18n.get("uiR2EdShortHours") .. " " end
+ if minNb ~= 0 then timeLimitText = timeLimitText .. minNb .. i18n.get("uiR2EdShortMinutes") .. " " end
+ timeLimitText = timeLimitText .. secNb .. i18n.get("uiR2EdShortSeconds")
certainTime.active = true
local hoursMenu = certainTime:find("hours"):find("text")
assert(hoursMenu)
- hoursMenu.uc_hardtext = tostring(hoursNb)
+ hoursMenu.text = tostring(hoursNb)
local minutesMenu = certainTime:find("minutes"):find("text")
assert(minutesMenu)
- minutesMenu.uc_hardtext = tostring(minNb)
+ minutesMenu.text = tostring(minNb)
local secondsMenu = certainTime:find("seconds"):find("text")
assert(secondsMenu)
- secondsMenu.uc_hardtext = tostring(secNb)
+ secondsMenu.text = tostring(secNb)
- local uc_time = ucstring()
- uc_time:fromUtf8(timeLimitText)
- comboBox.view_text = uc_time
+ comboBox.view_text = timeLimitText
end
else
certainTime.active = false
@@ -959,14 +948,14 @@ function r2.activities:newElementInst(tableInit)
end
if roadAct then
- actionToInitDefaultActivity = i18n.get("uiR2EdRoad"):toUtf8() .. " "
+ actionToInitDefaultActivity = i18n.get("uiR2EdRoad") .. " "
end
if regionAct then
if actionToInitDefaultActivity~="" then
- actionToInitDefaultActivity = actionToInitDefaultActivity .. i18n.get("uiR2EdOr"):toUtf8().. " "
+ actionToInitDefaultActivity = actionToInitDefaultActivity .. i18n.get("uiR2EdOr").. " "
end
- actionToInitDefaultActivity = actionToInitDefaultActivity .. i18n.get("uiR2EdRegion"):toUtf8() .. " "
+ actionToInitDefaultActivity = actionToInitDefaultActivity .. i18n.get("uiR2EdRegion") .. " "
end
end
@@ -978,10 +967,8 @@ function r2.activities:newElementInst(tableInit)
r2.logicComponents:newElementInst(r2.activities)
elseif not existZone then
- local message = i18n.get("uiR2EdCreateZone"):toUtf8() .. actionToInitDefaultActivity .. i18n.get("uiR2EdFor"):toUtf8() .. " " .. selectedInst.Name
- local uc_message = ucstring()
- uc_message:fromUtf8(message)
- messageBox(uc_message)
+ local message = i18n.get("uiR2EdCreateZone") .. actionToInitDefaultActivity .. i18n.get("uiR2EdFor") .. " " .. selectedInst.Name
+ messageBox(message)
end
r2.requestForceEndMultiAction()
end
@@ -1049,22 +1036,19 @@ function r2.activities:initActivityMenu()
local activityMenu = activityMenu:getRootMenu()
assert(activityMenu)
activityMenu:reset()
- local uc_activity = ucstring()
local activitiesTable = {}
r2:getSelectedInstance():getAvailableActivities(activitiesTable)
local activitiesNb = 0
for k, actType in pairs(activitiesTable) do
- local uc_activity = ucstring()
local translation = self.activityTypeTranslation[actType].trans
- uc_activity:fromUtf8(translation)
local zone = self.activityTypeTranslation[actType].zone
if zone == "" then
- activityMenu:addLine(uc_activity, "lua", "r2.activities:setActivityType('"..actType.."')", actType)
+ activityMenu:addLine(translation, "lua", "r2.activities:setActivityType('"..actType.."')", actType)
else
- activityMenu:addLine(uc_activity, "", "", actType)
+ activityMenu:addLine(translation, "", "", actType)
local textureName = ""
if zone == "Road" then
@@ -1079,8 +1063,7 @@ function r2.activities:initActivityMenu()
local zonesMenu = activityMenu:getSubMenu(activitiesNb)
local zonesTable = r2.Scenario:getAllInstancesByType(zone)
for key, z in pairs(zonesTable) do
- uc_activity:fromUtf8(z.Name)
- zonesMenu:addLine(uc_activity, "lua", "r2.activities:setActivityType('"..actType.."', '".. z.InstanceId .."')", z.InstanceId)
+ zonesMenu:addLine(z.Name, "lua", "r2.activities:setActivityType('"..actType.."', '".. z.InstanceId .."')", z.InstanceId)
end
if table.getn(zonesTable) == 0 then
zonesMenu:addLine(i18n.get("uiR2EdNoSelelection"), "lua", "r2.activities:setActivityType()", "")
@@ -1126,7 +1109,7 @@ function r2.activities:setTimeLimit(timeLimit)
assert(activityInstId)
-- TimeLimitValue
- if timeLimit == i18n.get("uiR2EdForCertainTime"):toUtf8() then
+ if timeLimit == i18n.get("uiR2EdForCertainTime") then
r2.requestSetNode(activityInstId, "TimeLimitValue", tostring(20))
else
r2.requestSetNode(activityInstId, "TimeLimitValue", "")
@@ -1152,7 +1135,7 @@ function r2.activities:setRoadCountLimit(limit)
assert(activityInstId)
-- RoadCountLimit
- if limit == i18n.get("uiR2EdNoRoadCountLimit"):toUtf8() then
+ if limit == i18n.get("uiR2EdNoRoadCountLimit") then
r2.requestSetNode(activityInstId, "RoadCountLimit", "0")
else
r2.requestSetNode(activityInstId, "RoadCountLimit", timeLimit)
@@ -1171,17 +1154,17 @@ function r2.activities:initTimeMenu(timeFunction, isHours)
timeMenu:reset()
for i=0,9 do
- timeMenu:addLine(ucstring(tostring(i)), "lua", timeFunction .. "(" .. tostring(i) .. ")", tostring(i))
+ timeMenu:addLine(tostring(i), "lua", timeFunction .. "(" .. tostring(i) .. ")", tostring(i))
end
if isHours == true then
- timeMenu:addLine(ucstring(tostring(10)), "lua", timeFunction .. "(" .. tostring(10) .. ")", tostring(10))
+ timeMenu:addLine(tostring(10), "lua", timeFunction .. "(" .. tostring(10) .. ")", tostring(10))
else
local lineNb = 9
for i=10, 50, 10 do
local lineStr = tostring(i).."/"..tostring(i+9)
- timeMenu:addLine(ucstring(lineStr), "", "", tostring(i))
+ timeMenu:addLine(lineStr, "", "", tostring(i))
lineNb = lineNb+1
timeMenu:addSubMenu(lineNb)
@@ -1189,7 +1172,7 @@ function r2.activities:initTimeMenu(timeFunction, isHours)
for s=0,9 do
lineStr = tostring(i+s)
- subMenu:addLine(ucstring(lineStr), "lua", timeFunction .. "(" .. tostring(i+s) .. ")", lineStr)
+ subMenu:addLine(lineStr, "lua", timeFunction .. "(" .. tostring(i+s) .. ")", lineStr)
end
end
end
diff --git a/ryzom/common/data_common/r2/r2_base_class.lua b/ryzom/common/data_common/r2/r2_base_class.lua
index 9b053e26e..49cefea2b 100644
--- a/ryzom/common/data_common/r2/r2_base_class.lua
+++ b/ryzom/common/data_common/r2/r2_base_class.lua
@@ -336,7 +336,7 @@ end
-- helper : add "delete : name_of_the_thing_being_deleted" in the action historic as the name of the delete action that is about
-- to be done
function baseClass.setDeleteActionName(this)
- r2.requestNewAction(concatUCString(i18n.get("uiR2EDDeleteAction"), this:getDisplayName()))
+ r2.requestNewAction(concatString(i18n.get("uiR2EDDeleteAction"), this:getDisplayName()))
end
@@ -456,9 +456,9 @@ end
---------------------------------------------------------------------------------------------------------
-- Get the display name (in i18n format). This name will be displayed in the property sheet or inthe instance tree
function baseClass.getDisplayName(this)
- local displayName = ucstring()
+ local displayName = ""
if this.Name ~= nil and this.Name ~= "" then
- displayName:fromUtf8(this.Name)
+ displayName = this.Name
else
return i18n.get("uiR2EDNoName")
-- local className = this.Class
@@ -469,15 +469,15 @@ function baseClass.getDisplayName(this)
-- end
-- end
-- className = className .. " : " .. this.InstanceId
- -- displayName:fromUtf8(className)
+ -- displayName = className
end
return displayName
end
---------------------------------------------------------------------------------------------------------
--- Get the base name for instance name generation (should return a ucstring)
+-- Get the base name for instance name generation (should return a utf-8 string)
function baseClass.getBaseName(this)
- return ucstring("")
+ return ""
end
@@ -576,7 +576,7 @@ function baseClass.onSetupMenu(this)
-- for i = 1,9 do
-- if parent == nil or parent.Parent == nil then break end
-- menu["selectParent" .. tostring(i)].active = true
- -- menu["selectParent" .. tostring(i)].uc_hardtext = i18n.get("uimR2EDSelectParent") + (parent.InstanceId .. " (" .. parent.Class .. ")")
+ -- menu["selectParent" .. tostring(i)].text = i18n.get("uimR2EDSelectParent") + (parent.InstanceId .. " (" .. parent.Class .. ")")
-- --debugInfo(colorTag(0, 255, 255) .. tostring(i))
-- parent = parent.ParentInstance
-- end
@@ -764,11 +764,11 @@ function baseClass.setRefIdValue(this, refIdName, targetId)
local name = this:getDisplayName()
local refIdUCName = r2:getPropertyTranslation(this:getClass().NameToProp[refIdName])
if targetId == "" then
- r2.requestNewAction(concatUCString(i18n.get("uiR2EDRemovingTargetAction"), name,
+ r2.requestNewAction(concatString(i18n.get("uiR2EDRemovingTargetAction"), name,
i18n.get("uiR2EDAddingReferenceSeparator"), refIdname))
else
local targetName = r2:getInstanceFromId(targetId):getDisplayName()
- r2.requestNewAction(concatUCString(i18n.get("uiR2EDAddingReferenceAction"), name,
+ r2.requestNewAction(concatString(i18n.get("uiR2EDAddingReferenceAction"), name,
i18n.get("uiR2EDAddingReferenceSeparator"), refIdUCName,
i18n.get("uiR2EDAddingReferenceToAction"), targetName))
end
diff --git a/ryzom/common/data_common/r2/r2_base_class_private.lua b/ryzom/common/data_common/r2/r2_base_class_private.lua
index 9d51c3596..b9f01c722 100644
--- a/ryzom/common/data_common/r2/r2_base_class_private.lua
+++ b/ryzom/common/data_common/r2/r2_base_class_private.lua
@@ -134,8 +134,8 @@ function baseClass.newCopy(this)
local result = cloneNode(this, srcToCopyMapping)
renameRefIds(result, srcToCopyMapping)
-- if the name is a generated one, create a new name
- if result.Name ~= nil and r2:isPostFixedByNumber(ucstring(result.Name)) then
- result.Name = r2:genInstanceName(ucstring(result.Name)):toUtf8()
+ if result.Name ~= nil and r2:isPostFixedByNumber(result.Name) then
+ result.Name = r2:genInstanceName(result.Name)
end
-- the copy of a undeletable object is a deltable object
diff --git a/ryzom/common/data_common/r2/r2_components.lua b/ryzom/common/data_common/r2/r2_components.lua
index fcb68f24b..df6379806 100644
--- a/ryzom/common/data_common/r2/r2_components.lua
+++ b/ryzom/common/data_common/r2/r2_components.lua
@@ -298,9 +298,8 @@ r2.registerHighLevel = function()
----------------------------------------------------------------------------
-- add a line to the event sub menu
function classScenario.initLogicEntitiesInstancesMenu(this, subMenu, calledFunction)
- local uc_name = ucstring()
- uc_name:fromUtf8(r2.Scenario:getName())
- subMenu:addLine(uc_name, "lua", calledFunction.."('".. r2.Scenario.InstanceId .."')", r2.Scenario.InstanceId)
+ local name = r2.Scenario:getName()
+ subMenu:addLine(name, "lua", calledFunction.."('".. r2.Scenario.InstanceId .."')", r2.Scenario.InstanceId)
end
----------------------------------------------------------------------------
@@ -308,24 +307,24 @@ r2.registerHighLevel = function()
function classScenario:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- --["Start Scenario Timing"] = { menu=i18n.get( "uiR2AA0ScenarioStartTiming" ):toUtf8(),
- -- text=i18n.get( "uiR2AA1ScenarioStartTiming" ):toUtf8()},
- --["Stop Scenario Timing"] = { menu=i18n.get( "uiR2AA0ScenarioStopTiming" ):toUtf8(),
- -- text=i18n.get( "uiR2AA1ScenarioStopTiming" ):toUtf8()},
- --["add scenario points"] = { menu=i18n.get( "uiR2AA0ScenarioAddPoints" ):toUtf8(),
- -- text=i18n.get( "uiR2AA1ScenarioAddPoints" ):toUtf8()},
- --["succeed scenario"] = { menu=i18n.get( "uiR2AA0ScenarioSucceed" ):toUtf8(),
- -- text=i18n.get( "uiR2AA1ScenarioSucceed" ):toUtf8()},
- --["fail scenario"] = { menu=i18n.get( "uiR2AA0ScenarioFail" ):toUtf8(),
- -- text=i18n.get( "uiR2AA1ScenarioFail" ):toUtf8()},
+ --["Start Scenario Timing"] = { menu=i18n.get( "uiR2AA0ScenarioStartTiming" ),
+ -- text=i18n.get( "uiR2AA1ScenarioStartTiming" )},
+ --["Stop Scenario Timing"] = { menu=i18n.get( "uiR2AA0ScenarioStopTiming" ),
+ -- text=i18n.get( "uiR2AA1ScenarioStopTiming" )},
+ --["add scenario points"] = { menu=i18n.get( "uiR2AA0ScenarioAddPoints" ),
+ -- text=i18n.get( "uiR2AA1ScenarioAddPoints" )},
+ --["succeed scenario"] = { menu=i18n.get( "uiR2AA0ScenarioSucceed" ),
+ -- text=i18n.get( "uiR2AA1ScenarioSucceed" )},
+ --["fail scenario"] = { menu=i18n.get( "uiR2AA0ScenarioFail" ),
+ -- text=i18n.get( "uiR2AA1ScenarioFail" )},
},
["Events"] = {
- --["On Scenario Started"] = { menu=i18n.get( "uiR2Event0ScenarioStart" ):toUtf8(),
- -- text=i18n.get( "uiR2Event1ScenarioStart" ):toUtf8()},
- --["on scenario succeeded"] = { menu=i18n.get( "uiR2Event0ScenarioSucceed" ):toUtf8(),
- -- text=i18n.get( "uiR2Event1ScenarioSucceed" ):toUtf8()},
- --["on scenario failed"] = { menu=i18n.get( "uiR2Event0ScenarioFailed" ):toUtf8(),
- -- text=i18n.get( "uiR2Event1ScenarioFailed" ):toUtf8()},
+ --["On Scenario Started"] = { menu=i18n.get( "uiR2Event0ScenarioStart" ),
+ -- text=i18n.get( "uiR2Event1ScenarioStart" )},
+ --["on scenario succeeded"] = { menu=i18n.get( "uiR2Event0ScenarioSucceed" ),
+ -- text=i18n.get( "uiR2Event1ScenarioSucceed" )},
+ --["on scenario failed"] = { menu=i18n.get( "uiR2Event0ScenarioFailed" ),
+ -- text=i18n.get( "uiR2Event1ScenarioFailed" )},
},
["Conditions"] = {
}
@@ -346,14 +345,14 @@ r2.registerHighLevel = function()
local lineNb = 0
for i=1, 100, 20 do
local lineStr = tostring(i).."/"..tostring(i+19)
- subMenu:addLine(ucstring(lineStr), "", "", tostring(i))
+ subMenu:addLine(lineStr, "", "", tostring(i))
subMenu:addSubMenu(lineNb)
local subMenu2= subMenu:getSubMenu(lineNb)
for s=0, 19 do
lineStr = tostring(i+s)
local func = "r2.events:setEventValue('','" .. categoryEvent .."','".. lineStr.."')"
- subMenu2:addLine(ucstring(lineStr), "lua", func, lineStr)
+ subMenu2:addLine(lineStr, "lua", func, lineStr)
end
lineNb = lineNb+1
end
@@ -733,8 +732,8 @@ r2.registerHighLevel = function()
local name = this.Name
local actNb = r2.logicComponents:searchElementIndex(this)-1
- local firstPart = i18n.get("uiR2EDDefaultActTitle"):toUtf8().. actNb
- local firstPartSpace = i18n.get("uiR2EDDefaultActTitle"):toUtf8().. " " .. actNb
+ local firstPart = i18n.get("uiR2EDDefaultActTitle").. actNb
+ local firstPartSpace = i18n.get("uiR2EDDefaultActTitle").. " " .. actNb
if name=="" then
name = firstPartSpace
elseif string.lower(name)==string.lower(firstPart) or string.lower(name)==string.lower(firstPartSpace) then
@@ -754,9 +753,7 @@ r2.registerHighLevel = function()
if this:isBaseAct() then
return i18n.get("uiR2EDBaseAct")
end
- local result = ucstring()
- result:fromUtf8(this:getName())
- return result
+ return this:getName()
end,
-----------------------------------------------------------------------------
-- from baseClass
@@ -819,9 +816,7 @@ r2.registerHighLevel = function()
for i=0, r2.Scenario.Acts.Size-1 do
local act = r2.Scenario.Acts[i]
if not act:isBaseAct() then
- local uc_name = ucstring()
- uc_name:fromUtf8(act.Name)
- subMenu:addLine(uc_name, "lua", calledFunction.."('".. act.InstanceId .."')", act.InstanceId)
+ subMenu:addLine(act.Name, "lua", calledFunction.."('".. act.InstanceId .."')", act.InstanceId)
empty = false
end
end
@@ -836,12 +831,12 @@ r2.registerHighLevel = function()
function classAct:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["Start Act"] = { menu=i18n.get( "uiR2AA0ActStart" ):toUtf8(),
- text=i18n.get( "uiR2AA1ActStart" ):toUtf8()},
+ ["Start Act"] = { menu=i18n.get( "uiR2AA0ActStart" ),
+ text=i18n.get( "uiR2AA1ActStart" )},
},
["Events"] = {
- ["On Act Started"] = { menu=i18n.get( "uiR2Event0ActStart" ):toUtf8(),
- text=i18n.get( "uiR2Event1ActStart" ):toUtf8()},
+ ["On Act Started"] = { menu=i18n.get( "uiR2Event0ActStart" ),
+ text=i18n.get( "uiR2Event1ActStart" )},
},
["Conditions"] = {
}
@@ -1088,10 +1083,10 @@ end
-- -- register trad
-- local localLogicEntityAttributes = {
-- ["ApplicableActions"] = {
--- ["Start Act"] = i18n.get("uiR2EdStartAct"):toUtf8(),
+-- ["Start Act"] = i18n.get("uiR2EdStartAct"),
-- },
-- ["Events"] = {
--- ["On Act Started"] = i18n.get("uiR2EdOnActStarted"):toUtf8(),
+-- ["On Act Started"] = i18n.get("uiR2EdOnActStarted"),
-- },
-- ["Conditions"] = {
-- }
diff --git a/ryzom/common/data_common/r2/r2_core_user_component_manager.lua b/ryzom/common/data_common/r2/r2_core_user_component_manager.lua
index 4aa445484..de12fe12b 100644
--- a/ryzom/common/data_common/r2/r2_core_user_component_manager.lua
+++ b/ryzom/common/data_common/r2/r2_core_user_component_manager.lua
@@ -465,7 +465,7 @@ local generatePreCode = function(fName)
.."local comp = r2.newComponent('UserComponentHolder')\n\t"
.."assert(comp)\n\n\t"
.."comp.Base = \"palette.entities.botobjects.user_event\"\n\t"
- .."comp.Name = r2:genInstanceName(ucstring('"..featureName.."')):toUtf8()\n\t"
+ .."comp.Name = r2:genInstanceName('"..featureName.."')\n\t"
.."comp.Position.x = x\n\t"
.."comp.Position.y = y\n\t"
.."comp.Position.z = r2:snapZToGround(x, y)\n\n\t"
diff --git a/ryzom/common/data_common/r2/r2_dialogs.lua b/ryzom/common/data_common/r2/r2_dialogs.lua
index 06d72d258..53eee3f40 100644
--- a/ryzom/common/data_common/r2/r2_dialogs.lua
+++ b/ryzom/common/data_common/r2/r2_dialogs.lua
@@ -17,17 +17,17 @@ eltTemplateParams = {
multiMaxLine="3"
},
elementEditorTemplate = "template_edit_chat",
-elementInitialName=i18n.get("uiR2EdChat"):toUtf8(),
-sequenceInitialName=i18n.get("uiR2EDDialog"):toUtf8(),
+elementInitialName=i18n.get("uiR2EdChat"),
+sequenceInitialName=i18n.get("uiR2EDDialog"),
keepOpenedEditor = false,
currentEltUIID = nil, -- initialisé quand l'editeur est ouvert ou fermé
whoToWhoTranslation = {
- ["_DM"] = i18n.get("uiR2EdDonjonMaster"):toUtf8(),
- ["_System"] = i18n.get("uiR2EdSystem"):toUtf8(),
- ["_Nobody"] = i18n.get("uiR2EdNobody"):toUtf8(),
+ ["_DM"] = i18n.get("uiR2EdDonjonMaster"),
+ ["_System"] = i18n.get("uiR2EdSystem"),
+ ["_Nobody"] = i18n.get("uiR2EdNobody"),
},
maxVisibleLine = 10,
@@ -154,7 +154,7 @@ function r2.dialogs:openEditor()
sequenceUI.active = false
local dialogName = dialogUI:find("dialogMenu"):find("menu"):find("text")
assert(dialogName)
- dialogName.uc_hardtext = i18n.get("uiR2EdNoSelelection")
+ dialogName.text = i18n.get("uiR2EdNoSelelection")
end
-- active editor
@@ -180,7 +180,7 @@ function r2.dialogs:newSequenceInst(x, y, z)
assert(dialog)
dialog.Base = r2.Translator.getDebugBase("palette.entities.botobjects.dialog")
- dialog.Name = r2:genInstanceName(i18n.get("uiR2EDDialog")):toUtf8()
+ dialog.Name = r2:genInstanceName(i18n.get("uiR2EDDialog"))
dialog.Position.x = x
dialog.Position.y = y
dialog.Position.z = r2:snapZToGround(x, y)
@@ -245,10 +245,8 @@ function r2.dialogs:initDialogsMenu()
local allDialogs = {}
r2:getCurrentAct():appendInstancesByType(allDialogs, "ChatSequence")
- local uc_dialog = ucstring()
for k, dialog in pairs(allDialogs) do
- uc_dialog:fromUtf8(dialog.Name)
- dialogMenu:addLine(uc_dialog, "lua", "r2:setSelectedInstanceId('" .. dialog.InstanceId .."')", dialog.InstanceId)
+ dialogMenu:addLine(dialog.Name, "lua", "r2:setSelectedInstanceId('" .. dialog.InstanceId .."')", dialog.InstanceId)
end
dialogMenu:setMaxVisibleLine(self.maxVisibleLine)
@@ -308,15 +306,12 @@ function r2.dialogs:selectSequence(dialogId)
repeatButton.pushed = (sequenceInst.Repeating == 0)
-- dialog editor title
- local uc_dialog = ucstring()
- uc_dialog:fromUtf8(i18n.get("uiR2EDChatSequenceEditor"):toUtf8() .. sequenceInst.Name)
- ui.uc_title = uc_dialog
+ ui.title = i18n.get("uiR2EDChatSequenceEditor")..sequenceInst.Name
-- dialog name in menu box
local dialogName = ui:find("dialogMenu"):find("menu"):find("text")
assert(dialogName)
- uc_dialog:fromUtf8(sequenceInst.Name)
- dialogName.uc_hardtext = uc_dialog
+ dialogName.text = sequenceInst.Name
-- initialize maximize/minimize
local maxElts = sequenceUI:find("maximize_elements")
@@ -386,49 +381,47 @@ function r2.dialogs:updateElementEditor()
if instanceChat then
- local uc_chat = ucstring()
+ local chat = ""
local index = r2.logicComponents:searchElementIndex(instanceChat)
if index~= nil then
- uc_chat:fromUtf8(self.elementInitialName.." "..index.." : ")
+ chat = self.elementInitialName.." "..index.." : "
else
- uc_chat:fromUtf8(self.elementInitialName.." : ")
+ chat = self.elementInitialName.." : "
end
- chatName.uc_hardtext = uc_chat
+ chatName.text = uc_chat
-- after value
local time = instanceChat.Time
assert(time)
local minNb, secNb = self:calculMinSec(time)
- minutesText.uc_hardtext = tostring(minNb)
- secondsText.uc_hardtext = tostring(secNb)
+ minutesText.text = tostring(minNb)
+ secondsText.text = tostring(secNb)
-- who
local whoInst = r2:getInstanceFromId(tostring(instanceChat.Actions[0].Who))
local hideToWhoAndEmote = false
if whoInst then
- uc_chat:fromUtf8(whoInst.Name)
+ chat = whoInst.Name
elseif instanceChat.Actions[0].WhoNoEntity=="_System" then
- uc_chat = i18n.get("uiR2EdSystem")
+ chat = i18n.get("uiR2EdSystem")
hideToWhoAndEmote = true
elseif instanceChat.Actions[0].WhoNoEntity=="_DM" then
- uc_chat = i18n.get("uiR2EdDonjonMaster")
+ chat = i18n.get("uiR2EdDonjonMaster")
hideToWhoAndEmote = true
else
- uc_chat = ucstring("")
+ chat = ""
end
- whoMenuText.uc_hardtext = uc_chat
+ whoMenuText.text = chat
-- says what
editBox:cancelFocusOnText()
local textID = instanceChat.Actions[0].Says
if textID ~= "" and r2:getInstanceFromId(textID) then
- local uc_says_what = ucstring()
- uc_says_what:fromUtf8(r2:getInstanceFromId(textID).Text)
- editBox.uc_input_string = uc_says_what
+ editBox.input_string = r2:getInstanceFromId(textID).Text
else
- editBox.uc_input_string = ""
+ editBox.input_string = ""
end
local breakAtEnd = 0
@@ -449,37 +442,33 @@ function r2.dialogs:updateElementEditor()
-- to who
local toWhoInst = r2:getInstanceFromId(tostring(instanceChat.Actions[0].Facing))
if toWhoInst then
- uc_chat = ucstring()
- uc_chat:fromUtf8(toWhoInst.Name)
+ chat = toWhoInst.Name
else
- uc_chat = i18n.get("uiR2EdNobody")
+ chat = i18n.get("uiR2EdNobody")
end
- toWhoMenuText.uc_hardtext = uc_chat
+ toWhoMenuText.text = chat
-- emote
local emoteName = self.fromEmoteIdToName[instanceChat.Actions[0].Emote]
if emoteName then
- uc_chat = ucstring()
- uc_chat:fromUtf8(emoteName)
+ chat = emoteName
else
- uc_chat = i18n.get("uiR2EdNoElt")
+ chat = i18n.get("uiR2EdNoElt")
end
- emoteButtonText.uc_hardtext = uc_chat
+ emoteButtonText.text = chat
else
- local uc_chat = ucstring()
- uc_chat:fromUtf8(self.elementInitialName.." : ")
- chatName.uc_hardtext = uc_chat
+ chatName.text = self.elementInitialName.." : "
- minutesText.uc_hardtext = "0"
- secondsText.uc_hardtext = "0"
+ minutesText.text = "0"
+ secondsText.text = "0"
- whoMenuText.uc_hardtext = ""
+ whoMenuText.text = ""
- editBox.uc_input_string = ""
+ editBox.input_string = ""
- toWhoMenuText.uc_hardtext = ""
- emoteButtonText.uc_hardtext = i18n.get("uiR2EdNoElt")
+ toWhoMenuText.text = ""
+ emoteButtonText.text = i18n.get("uiR2EdNoElt")
end
end
@@ -577,14 +566,12 @@ function r2.dialogs:updateSequenceUI(sequenceInst)
repeatButton.pushed = (sequenceInst.Repeating == 0)
-- dialog editor title
- local uc_title = ucstring()
- uc_title:fromUtf8(i18n.get("uiR2EDChatSequenceEditor"):toUtf8() .. sequenceInst.Name)
- ui.uc_title = uc_title
+ ui.title = i18n.get("uiR2EDChatSequenceEditor")..sequenceInst.Name
-- dialog name in menu box
local dialogName = ui:find("dialogMenu"):find("menu"):find("text")
assert(dialogName)
- dialogName.uc_hardtext = sequenceInst.Name
+ dialogName.text = sequenceInst.Name
end
------ UP ELEMENT INST -------------------------------------------
@@ -646,7 +633,7 @@ function r2.dialogs:updateElementUI(elementUI)
-- Add a white line that indicate that the dialog pause at end (ChatStep) in reduced view
chatText:addColoredTextChild(text, 220, 140, 100, 255)
if chatStep.BreakAtEnd and chatStep.BreakAtEnd == 1 then
- chatText:addColoredTextChild("\n"..i18n.get("uiR2EDThenPause"):toUtf8(), 255, 255, 255, 255)
+ chatText:addColoredTextChild("\n"..i18n.get("uiR2EDThenPause"), 255, 255, 255, 255)
end
local sep = elementUI:find("sep")
@@ -674,17 +661,17 @@ function r2.dialogs:initTimeMenu(timeFunction, isHours)
timeMenu:reset()
for i=0,9 do
- timeMenu:addLine(ucstring(tostring(i)), "lua", timeFunction .. "(" .. tostring(i) .. ")", tostring(i))
+ timeMenu:addLine(tostring(i), "lua", timeFunction .. "(" .. tostring(i) .. ")", tostring(i))
end
if isHours then
- timeMenu:addLine(ucstring(tostring(10)), "lua", timeFunction .. "(" .. tostring(10) .. ")", tostring(10))
+ timeMenu:addLine(tostring(10), "lua", timeFunction .. "(" .. tostring(10) .. ")", tostring(10))
else
local lineNb = 9
for i=10, 50, 10 do
local lineStr = tostring(i).."/"..tostring(i+9)
- timeMenu:addLine(ucstring(lineStr), "", "", tostring(i))
+ timeMenu:addLine(lineStr, "", "", tostring(i))
lineNb = lineNb+1
timeMenu:addSubMenu(lineNb)
@@ -692,7 +679,7 @@ function r2.dialogs:initTimeMenu(timeFunction, isHours)
for s=0,9 do
lineStr = tostring(i+s)
- subMenu:addLine(ucstring(lineStr), "lua", timeFunction .. "(" .. tostring(i+s) .. ")", lineStr)
+ subMenu:addLine(lineStr, "lua", timeFunction .. "(" .. tostring(i+s) .. ")", lineStr)
end
timeMenu:setMaxVisibleLine(self.maxVisibleLine)
@@ -768,13 +755,12 @@ function r2.dialogs:initWhoMenu(whoFunction, towho)
local npcTable = r2.Scenario:getAllInstancesByType("Npc")
if towho == true then
- whoMenu:addLine(i18n.get("uiR2EdNobody"), "lua", whoFunction.."('" ..i18n.get("uiR2EdNobody"):toUtf8().. "')", "Nobody")
+ whoMenu:addLine(i18n.get("uiR2EdNobody"), "lua", whoFunction.."('" ..i18n.get("uiR2EdNobody").. "')", "Nobody")
else
whoMenu:addLine(i18n.get("uiR2EdSystem"), "lua", whoFunction.."('_System')", "System")
whoMenu:addLine(i18n.get("uiR2EdDonjonMaster"), "lua", whoFunction.."('_DM')", "DonjonMaster")
end
- local uc_who = ucstring()
for key, npc in pairs(npcTable) do
local addLine = true
@@ -789,8 +775,7 @@ function r2.dialogs:initWhoMenu(whoFunction, towho)
end
end
if addLine then
- uc_who:fromUtf8(npc.Name)
- whoMenu:addLine(uc_who, "lua", whoFunction.."('" ..npc.InstanceId.. "')", npc.InstanceId)
+ whoMenu:addLine(npc.Name, "lua", whoFunction.."('" ..npc.InstanceId.. "')", npc.InstanceId)
end
end
end
@@ -808,7 +793,7 @@ function r2.dialogs:updateSaysWhat()
if sequenceUI then
local chatEditor = sequenceUI:find("edit_element")
if chatEditor then
- local saysWhat = chatEditor:find("says"):find("edit_box_group").uc_input_string:toUtf8()
+ local saysWhat = chatEditor:find("says"):find("edit_box_group").input_string
self:setSaysWhat(saysWhat)
end
end
@@ -830,7 +815,7 @@ function r2.dialogs:setWho(who)
r2.requestSetNode(chatStep.Actions[0].InstanceId, "WhoNoEntity", "")
if who == chatStep.Actions[0].Facing then
- self:setToWho(i18n.get("uiR2EdNobody"):toUtf8())
+ self:setToWho(i18n.get("uiR2EdNobody"))
end
else
r2.requestSetNode(chatStep.Actions[0].InstanceId, "Who", r2.RefId(""))
@@ -851,7 +836,7 @@ function r2.dialogs:setToWho(toWho)
local chatStep = self:currentEltInst()
assert(chatStep)
- if toWho == i18n.get("uiR2EdNobody"):toUtf8() then toWho="" end
+ if toWho == i18n.get("uiR2EdNobody") then toWho="" end
r2.requestSetNode(chatStep.Actions[0].InstanceId, "Facing", r2.RefId(toWho))
end
@@ -859,7 +844,7 @@ end
function r2.dialogs:setSaysWhat(whatText)
if whatText == nil then
- whatText = getUICaller().uc_input_string:toUtf8()
+ whatText = getUICaller().input_string
end
r2.requestNewAction(i18n.get("uiR2EDChatSetSayWhatAction"))
diff --git a/ryzom/common/data_common/r2/r2_environment.lua b/ryzom/common/data_common/r2/r2_environment.lua
index 3764c710d..7a19e4ab7 100644
--- a/ryzom/common/data_common/r2/r2_environment.lua
+++ b/ryzom/common/data_common/r2/r2_environment.lua
@@ -35,13 +35,13 @@ function r2:getPropertyTranslationId(prop)
end
-------------------------------------------------------------------------------------
--- get translation id for a property, as an ucstring
+-- get translation id for a property, as an utf-8 string
function r2:getPropertyTranslation(prop)
- local translationId = r2:getPropertyTranslationId(prop)
+ local translationId = r2:getPropertyTranslationId(prop)
if (i18n.hasTranslation(translationId)) then
return i18n.get(translationId)
else
- return ucstring(translationId)
+ return translationId
end
end
@@ -149,12 +149,6 @@ if r2 == nil then
r2 = {} -- for vianney's tests (is initialized by the caller otherwise)
end
-------------------
--- MISC GLOBALS --
-------------------
-
-r2.ScratchUCStr = ucstring() -- scratch ucstring, useful to do call from utf8 without to create a new object
-
---------------------
-- EDITION GLOBALS --
---------------------
diff --git a/ryzom/common/data_common/r2/r2_events.lua b/ryzom/common/data_common/r2/r2_events.lua
index beb45f75d..db1f70f82 100644
--- a/ryzom/common/data_common/r2/r2_events.lua
+++ b/ryzom/common/data_common/r2/r2_events.lua
@@ -19,7 +19,7 @@ eltTemplateParams = {
},
elementEditorTemplate = "template_edit_events",
-elementInitialName=i18n.get("uiR2EdAction"):toUtf8(),
+elementInitialName=i18n.get("uiR2EdAction"),
currentEltUIID = nil, -- initialisé quand l'editeur est ouvert ou fermé
@@ -158,10 +158,10 @@ end
------------------ TRANSLATION IN MENU ------------------------
function r2.events:getTranslationMenu(eventCategory, eventType)
if self.logicTranslations[eventCategory][eventType] then
- return ucstring(self.logicTranslations[eventCategory][eventType].menu)
+ return self.logicTranslations[eventCategory][eventType].menu
else
debugInfo(eventType .. " is not translated")
- return ucstring(eventType)
+ return eventType
end
end
@@ -305,7 +305,7 @@ function r2.events:updateSequenceUI()
local logicEntity = r2:getInstanceFromId(self.filteredLogicEntityId)
assert(logicEntity)
- filterMenuText.uc_hardtext = logicEntity:getDisplayName()
+ filterMenuText.text = logicEntity:getDisplayName()
local currentSequ = self:currentSequUI()
assert(currentSequ)
@@ -365,7 +365,7 @@ function r2.events:filterEvents(logicEntityId)
-- update filter text
local filterMenuText = ui:find("filterMenu"):find("menu"):find("text")
assert(filterMenuText)
- filterMenuText.uc_hardtext = logicEntity:getDisplayName()
+ filterMenuText.text = logicEntity:getDisplayName()
self.filteredLogicEntityId = logicEntityId
@@ -561,10 +561,8 @@ function r2.events:updateElementEditor()
eventType = eventType .. " '" .. instanceEvent.Event.ValueString .. "'"
end
- local uc_when_text = ucstring()
- uc_when_text:fromUtf8(eventType)
- whenMenuText.uc_hardtext_single_line_format = uc_when_text
- editorTitleText.uc_hardtext = whenMenuText.hardtext .. " ..."
+ whenMenuText.text_single_line_format = eventType
+ editorTitleText.text = whenMenuText.hardtext .. " ..."
-- actions
local actionsList = eventEditor:find("actions_list")
@@ -619,9 +617,7 @@ function r2.events:updateElementEditor()
end
end
- local uc_action_text = ucstring()
- uc_action_text:fromUtf8(actionType)
- actionMenuText.uc_hardtext_single_line_format = uc_action_text
+ actionMenuText.text_single_line_format = actionType
end
end
else
@@ -666,9 +662,7 @@ function r2.events:updateElementEditor()
conditionType = conditionType .. " '" .. instance:getShortName() .."'"
end
- local uc_condition_text = ucstring()
- uc_condition_text:fromUtf8(conditionType)
- conditionMenuText.uc_hardtext_single_line_format = uc_condition_text
+ conditionMenuText.text_single_line_format = conditionType
end
end
@@ -858,9 +852,7 @@ function r2.events:updateValiditySymbol(elementUI, eventInst)
invalidEvent.active = (logicAct==nil)
validEvent.active = (logicAct~=nil and logicAct~=r2:getCurrentAct())
if validEvent.active then
- local uc_other_act = ucstring()
- uc_other_act:fromUtf8(i18n.get("uiR2EDEventNotInCurrentAct"):toUtf8() .. "'" .. logicAct.Name .. "'")
- validEvent.tooltip = uc_other_act
+ validEvent.tooltip = i18n.get("uiR2EDEventNotInCurrentAct").."'"..logicAct.Name.."'"
end
end
@@ -970,9 +962,7 @@ function r2.events:initEventMenu(categoryEvent)
if logicEntity then
firstLine = 2
- local uc_name = ucstring()
- uc_name:fromUtf8(logicEntity.Name)
- logicEntityMenu:addLine(uc_name, "lua", "r2.events:setLogicEntity('".. logicEntity.InstanceId .."')", logicEntity.InstanceId)
+ logicEntityMenu:addLine(logicEntity.Name, "lua", "r2.events:setLogicEntity('".. logicEntity.InstanceId .."')", logicEntity.InstanceId)
logicEntityMenu:addSeparator()
logicEntityMenu:addSubMenu(0)
diff --git a/ryzom/common/data_common/r2/r2_features.lua b/ryzom/common/data_common/r2/r2_features.lua
index 53a63f6d9..233239733 100644
--- a/ryzom/common/data_common/r2/r2_features.lua
+++ b/ryzom/common/data_common/r2/r2_features.lua
@@ -309,8 +309,8 @@ r2.initBaseScenario = function()
end
- act.Name = i18n.get("uiR2EDAct1"):toUtf8()
- act.Title = i18n.get("uiR2EDAct1"):toUtf8() -- obsolete
+ act.Name = i18n.get("uiR2EDAct1")
+ act.Title = i18n.get("uiR2EDAct1") -- obsolete
local features = act.Features
local tmpDefault = r2.newComponent("DefaultFeature")
@@ -347,7 +347,7 @@ end
-- local features = act.Features
-- local tmpDefault = r2.newComponent("DefaultFeature")
-- r2.ActUIDisplayer.LastSelfCreatedActInstanceId = act.InstanceId
--- act.Title = i18n.get("uiR2EDAct1"):toUtf8()
+-- act.Title = i18n.get("uiR2EDAct1")
-- table.insert(features, tmpDefault)
-- table.insert(acts, act)
-- -- table.insert(scenario.Acts, act)
@@ -364,14 +364,11 @@ end
function r2.onScheduleStartAct(errorId, actId, nbSeconds)
if (r2.Mode == "DM" or r2.Mode == "AnimationModeDm") then
if errorId == 0 then
- local ucStringMsg = ucstring()
-
local str = "Act " .. actId
if nbSeconds ~= 0 then
str = str .. " will start in " .. nbSeconds .. " seconds"
end
- ucStringMsg:fromUtf8(str)
- displaySystemInfo(ucStringMsg, "BC")
+ displaySystemInfo(str, "BC")
elseif errorId == 1 then
messageBox("Act ".. actId .." can not be started because another act is already starting.")
elseif errorId == 2 then
@@ -382,26 +379,20 @@ end
function r2.onDisconnected()
local str = "You have been disconnected by the server."
- local ucStringMsg = ucstring()
- messageBox(str)
- ucStringMsg:fromUtf8(str)
- displaySystemInfo(ucStringMsg, "BC")
+ messageBox(str)
+ displaySystemInfo(str, "BC")
end
function r2.onKicked(timeBeforeDisconnection, kicked)
if kicked then
local str = "You have been kicked. You must come back to mainland or leave this session otherwise you will be disconnected in "
.. tostring(timeBeforeDisconnection) .. " secondes."
- local ucStringMsg = ucstring()
- messageBox(str)
- ucStringMsg:fromUtf8(str)
- displaySystemInfo(ucStringMsg, "BC")
+ messageBox(str)
+ displaySystemInfo(str, "BC")
else
- local str = "You have been unkicked."
- local ucStringMsg = ucstring()
- messageBox(str)
- ucStringMsg:fromUtf8(str)
- displaySystemInfo(ucStringMsg, "BC")
+ local str = "You have been unkicked."
+ messageBox(str)
+ displaySystemInfo(str, "BC")
end
end
@@ -437,12 +428,8 @@ function r2.onScenarioHeaderUpdated(scenario)
end
function r2.onSystemMessageReceived(msgType, msgWho, msg)
-
- local ucStringMsg = ucstring()
- ucStringMsg:fromUtf8(msg)
if string.len(msg) > 2 and string.sub(msg, 1, 2) == "ui" then
- ucStringMsg = i18n.get(msg)
- msg = ucStringMsg:toString()
+ msg = i18n.get(msg)
end
if msgType == "BC" or msgType == "BC_ML" then
printMsgML(msg)
@@ -1056,10 +1043,10 @@ r2.displayFeatureHelp = function(className)
uiInfo:invalidateCoords()
uiInfo:updateCoords()
uiInfo.title = title
- uiInfo.Env.uc_title = title
+ uiInfo.Env.title = title
local uiText = getUI("ui:interface:feature_help:content:enclosing:help_text_enclosed:help_text")
assert(uiText)
- uiText.uc_hardtext_format = ucstring(i18n.get(help))
+ uiText.text_format = i18n.get(help)
uiInfo:invalidateCoords()
uiInfo:updateCoords()
@@ -1088,7 +1075,7 @@ function r2.setFeatureDisplayHelp()
--debugInfo("checked: " ..tostring(showAgain))
local ui = getUI("ui:interface:feature_help")
- local name = ui.Env.uc_title
+ local name = ui.Env.title
local len = string.len(name) - 10 - 6
local className = string.sub(name, -10-len, 6+len) --removing uiR2Ed and _HelpTitle
--formName = formName .."Form"
diff --git a/ryzom/common/data_common/r2/r2_features_ambush.lua b/ryzom/common/data_common/r2/r2_features_ambush.lua
index 7d8087f61..daee8d592 100644
--- a/ryzom/common/data_common/r2/r2_features_ambush.lua
+++ b/ryzom/common/data_common/r2/r2_features_ambush.lua
@@ -397,13 +397,13 @@ component.createComponent = function(x, y)
assert(comp.Position)
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.user_event")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdAmbush")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdAmbush"))
comp.Position.x = x
comp.Position.y = y
comp.Position.z = r2:snapZToGround(x, y)
local zoneTrigger = r2.Features["ZoneTrigger"].Components.ZoneTrigger.createComponent(x + 3, y + 3)
- zoneTrigger.Name = comp.Name.." "..i18n.get("uiR2EDZoneTrigger"):toUtf8()--r2:genInstanceName(i18n.get("uiR2EdZoneTrigger")):toUtf8()
+ zoneTrigger.Name = comp.Name.." "..i18n.get("uiR2EDZoneTrigger")--r2:genInstanceName(i18n.get("uiR2EdZoneTrigger"))
zoneTrigger.InheritPos = 0
zoneTrigger.Deletable = false
table.insert(comp.Components, zoneTrigger)
@@ -439,26 +439,26 @@ function component:getLogicTranslations()
-- register trad
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
- ["trigger"] = { menu=i18n.get( "uiR2AA0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2AA1Trigger" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
+ ["trigger"] = { menu=i18n.get( "uiR2AA0Trigger" ),
+ text=i18n.get( "uiR2AA1Trigger" )},
},
["Events"] = {
- ["trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2Event1Trigger" ):toUtf8()},
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
+ ["trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ),
+ text=i18n.get( "uiR2Event1Trigger" )},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()}
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )}
}
}
diff --git a/ryzom/common/data_common/r2/r2_features_bandits_camp.lua b/ryzom/common/data_common/r2/r2_features_bandits_camp.lua
index d7e11a0bd..ed68802b1 100644
--- a/ryzom/common/data_common/r2/r2_features_bandits_camp.lua
+++ b/ryzom/common/data_common/r2/r2_features_bandits_camp.lua
@@ -186,51 +186,51 @@ function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Spawn" ):toUtf8(),
- text=i18n.get( "uiR2AA1Spawn" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Despawn" ):toUtf8(),
- text=i18n.get( "uiR2AA1Despawn" ):toUtf8()},
- ["Wander"] = { menu=i18n.get( "uiR2AA0BanditWander" ):toUtf8(),
- text=i18n.get( "uiR2AA1BanditWander" ):toUtf8()},
- ["Sit Down"] = { menu=i18n.get( "uiR2AA0BanditSitDown" ):toUtf8(),
- text=i18n.get( "uiR2AA1BanditSitDown" ):toUtf8()},
- ["Kill"] = { menu=i18n.get( "uiR2AA0BanditKill" ):toUtf8(),
- text=i18n.get( "uiR2AA1BanditKill" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Spawn" ),
+ text=i18n.get( "uiR2AA1Spawn" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Despawn" ),
+ text=i18n.get( "uiR2AA1Despawn" )},
+ ["Wander"] = { menu=i18n.get( "uiR2AA0BanditWander" ),
+ text=i18n.get( "uiR2AA1BanditWander" )},
+ ["Sit Down"] = { menu=i18n.get( "uiR2AA0BanditSitDown" ),
+ text=i18n.get( "uiR2AA1BanditSitDown" )},
+ ["Kill"] = { menu=i18n.get( "uiR2AA0BanditKill" ),
+ text=i18n.get( "uiR2AA1BanditKill" )},
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Spawn" ):toUtf8(),
- text=i18n.get( "uiR2Event1Spawn" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Despawn" ):toUtf8(),
- text=i18n.get( "uiR2Event1Despawn" ):toUtf8()},
- ["member death"] = { menu=i18n.get( "uiR2Event0MemberDeath" ):toUtf8(),
- text=i18n.get( "uiR2Event1MemberDeath" ):toUtf8()},
- ["group death"] = { menu=i18n.get( "uiR2Event0GroupDeath" ):toUtf8(),
- text=i18n.get( "uiR2Event1GroupDeath" ):toUtf8()},
- ["head to wander zone"] = { menu=i18n.get( "uiR2Event0BanditHeadWander" ):toUtf8(),
- text=i18n.get( "uiR2Event1BanditHeadWander" ):toUtf8()},
- ["arrive at wander zone"] = { menu=i18n.get( "uiR2Event0BanditArriveWander" ):toUtf8(),
- text=i18n.get( "uiR2Event1BanditArriveWander" ):toUtf8()},
- ["head to camp"] = { menu=i18n.get( "uiR2Event0BanditHeadCamp" ):toUtf8(),
- text=i18n.get( "uiR2Event1BanditHeadCamp" ):toUtf8()},
- ["arrive at camp"] = { menu=i18n.get( "uiR2Event0BanditArriveCamp" ):toUtf8(),
- text=i18n.get( "uiR2Event1BanditArriveCamp" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Spawn" ),
+ text=i18n.get( "uiR2Event1Spawn" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Despawn" ),
+ text=i18n.get( "uiR2Event1Despawn" )},
+ ["member death"] = { menu=i18n.get( "uiR2Event0MemberDeath" ),
+ text=i18n.get( "uiR2Event1MemberDeath" )},
+ ["group death"] = { menu=i18n.get( "uiR2Event0GroupDeath" ),
+ text=i18n.get( "uiR2Event1GroupDeath" )},
+ ["head to wander zone"] = { menu=i18n.get( "uiR2Event0BanditHeadWander" ),
+ text=i18n.get( "uiR2Event1BanditHeadWander" )},
+ ["arrive at wander zone"] = { menu=i18n.get( "uiR2Event0BanditArriveWander" ),
+ text=i18n.get( "uiR2Event1BanditArriveWander" )},
+ ["head to camp"] = { menu=i18n.get( "uiR2Event0BanditHeadCamp" ),
+ text=i18n.get( "uiR2Event1BanditHeadCamp" )},
+ ["arrive at camp"] = { menu=i18n.get( "uiR2Event0BanditArriveCamp" ),
+ text=i18n.get( "uiR2Event1BanditArriveCamp" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Spawned" ):toUtf8(),
- text=i18n.get( "uiR2Test1Spawned" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Despawned" ):toUtf8(),
- text=i18n.get( "uiR2Test1Despawned" ):toUtf8()},
- ["is dead"] = { menu=i18n.get( "uiR2Test0BanditDead" ):toUtf8(),
- text=i18n.get( "uiR2Test1BanditDead" ):toUtf8()},
- ["is wandering"] = { menu=i18n.get( "uiR2Test0BanditPatrolZone" ):toUtf8(),
- text=i18n.get( "uiR2Test1BanditPatrolZone" ):toUtf8()},
- ["is sitting"] = { menu=i18n.get( "uiR2Test0BanditAtCamp" ):toUtf8(),
- text=i18n.get( "uiR2Test1BanditAtCamp" ):toUtf8()},
- ["is heading to wander zone"]= {menu=i18n.get( "uiR2Test0BanditHeadPatrolZone" ):toUtf8(),
- text=i18n.get( "uiR2Test1BanditHeadPatrolZone" ):toUtf8()},
- ["is heading to camp"] = { menu=i18n.get( "uiR2Test0BanditHeadCamp" ):toUtf8(),
- text=i18n.get( "uiR2Test1BanditHeadCamp" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Spawned" ),
+ text=i18n.get( "uiR2Test1Spawned" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Despawned" ),
+ text=i18n.get( "uiR2Test1Despawned" )},
+ ["is dead"] = { menu=i18n.get( "uiR2Test0BanditDead" ),
+ text=i18n.get( "uiR2Test1BanditDead" )},
+ ["is wandering"] = { menu=i18n.get( "uiR2Test0BanditPatrolZone" ),
+ text=i18n.get( "uiR2Test1BanditPatrolZone" )},
+ ["is sitting"] = { menu=i18n.get( "uiR2Test0BanditAtCamp" ),
+ text=i18n.get( "uiR2Test1BanditAtCamp" )},
+ ["is heading to wander zone"]= {menu=i18n.get( "uiR2Test0BanditHeadPatrolZone" ),
+ text=i18n.get( "uiR2Test1BanditHeadPatrolZone" )},
+ ["is heading to camp"] = { menu=i18n.get( "uiR2Test0BanditHeadCamp" ),
+ text=i18n.get( "uiR2Test1BanditHeadCamp" )},
}
}
return logicTranslations
@@ -360,7 +360,7 @@ component.createComponent = function(x, y, banditsCount, race, banditsLevel, Zon
--feature.BanditCount = feature.BanditCount + 1
--comp.Name = "BanditCampFeature[".. feature.BanditCount .."]"
- comp.Name = r2:genInstanceName(i18n.get("uiR2EDNameBanditCampFeature")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EDNameBanditCampFeature"))
local fire = comp.Fire
@@ -394,7 +394,7 @@ component.createComponent = function(x, y, banditsCount, race, banditsLevel, Zon
zone.Position.y = comp.Position.y
zone.Position.z = comp.Position.z
zone.InheritPos = 0 -- don't inherit position of parents
- zone.Name = r2:genInstanceName(i18n.get("uiR2EDNameWanderRegion")):toUtf8()
+ zone.Name = r2:genInstanceName(i18n.get("uiR2EDNameWanderRegion"))
comp._Zone = zone.InstanceId
table.insert(comp.Components, zone)
comp._Seed = os.time()
@@ -435,7 +435,7 @@ function updateBanditCampEnum()
local paletteElt = r2.getPaletteElement(elementName)
if paletteElt and paletteElt.RingAccess and r2.RingAccess.testAccess(paletteElt.RingAccess) then
- formLevel:addText(ucstring(tostring(level)))
+ formLevel:addText(tostring(level))
ok = true
-- local levelEnum = currentForm:find(creature.."Level")
@@ -569,7 +569,7 @@ component.createGhostComponents = function(comp, act)
table.insert(npcGroup.Components, npc)
end
- npcGroup.Name = r2:genInstanceName(i18n.get("uiR2EDNameBanditCamp")):toUtf8()
+ npcGroup.Name = r2:genInstanceName(i18n.get("uiR2EDNameBanditCamp"))
bandits = npcGroup
bandits.Position.x = x
bandits.Position.y = y
diff --git a/ryzom/common/data_common/r2/r2_features_boss_spawner.lua b/ryzom/common/data_common/r2/r2_features_boss_spawner.lua
index d99fc59c1..367692e89 100644
--- a/ryzom/common/data_common/r2/r2_features_boss_spawner.lua
+++ b/ryzom/common/data_common/r2/r2_features_boss_spawner.lua
@@ -466,7 +466,7 @@ component.createComponent = function(x, y)
assert(comp)
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.user_event")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdBossSpawner")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdBossSpawner"))
comp.Position.x = x
comp.Position.y = y
@@ -542,7 +542,7 @@ component.create = function()
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EdBossSpawner")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "BossSpawner")
+ logicEntityMenu:addLine(name, "lua", "", "BossSpawner")
end
diff --git a/ryzom/common/data_common/r2/r2_features_counter.lua b/ryzom/common/data_common/r2/r2_features_counter.lua
index 6a0863833..9776f9688 100644
--- a/ryzom/common/data_common/r2/r2_features_counter.lua
+++ b/ryzom/common/data_common/r2/r2_features_counter.lua
@@ -204,7 +204,7 @@ component.createComponent = function(x, y, value, tvalue)
assert(comp)
comp.Base = "palette.entities.botobjects.milestone"
- comp.Name = r2:genInstanceName(i18n.get("uiR2EDRollout_CounterFeature")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EDRollout_CounterFeature"))
comp.Position.x = x
comp.Position.y = y
@@ -256,32 +256,32 @@ end
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EDRollout_CounterFeature")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "CounterFeature")
+ logicEntityMenu:addLine(name, "lua", "", "CounterFeature")
end
function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["Activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["Desactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
- ["Increment"] = { menu=i18n.get( "uiR2AA0CounterIncrement" ):toUtf8(),
- text=i18n.get( "uiR2AA1CounterIncrement" ):toUtf8()},
- ["Decrement"] = { menu=i18n.get( "uiR2AA0CounterDecrement" ):toUtf8(),
- text=i18n.get( "uiR2AA1CounterDecrement" ):toUtf8()},
+ ["Activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["Desactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
+ ["Increment"] = { menu=i18n.get( "uiR2AA0CounterIncrement" ),
+ text=i18n.get( "uiR2AA1CounterIncrement" )},
+ ["Decrement"] = { menu=i18n.get( "uiR2AA0CounterDecrement" ),
+ text=i18n.get( "uiR2AA1CounterDecrement" )},
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["desactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2Event1Trigger" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["desactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ),
+ text=i18n.get( "uiR2Event1Trigger" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()}
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )}
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_default.lua b/ryzom/common/data_common/r2/r2_features_default.lua
index d6cbd7bda..088267961 100644
--- a/ryzom/common/data_common/r2/r2_features_default.lua
+++ b/ryzom/common/data_common/r2/r2_features_default.lua
@@ -181,7 +181,7 @@ local registerFeature = function ()
getUI(class.Menu .. ":activities").active = not isBO and not isPlant
if not isBO and not isPlant then
- getUI(class.Menu .. ":activities").uc_hardtext = i18n.get("uimR2EDNewActivity")
+ getUI(class.Menu .. ":activities").text = i18n.get("uimR2EDNewActivity")
end
end,
--------------------------------------------------------------------------------------------
@@ -247,10 +247,8 @@ local registerFeature = function ()
local subMenu = menu:getSubMenu(ev)
local func = ""
for i=0, 9 do
- local uc_name = ucstring()
- uc_name:fromUtf8( tostring(i) )
func = "r2.events:setEventValue('','" .. categoryEvent .."','".. tostring(i).."')"
- subMenu:addLine(uc_name, "lua", func, tostring(i))
+ subMenu:addLine(tostring(i), "lua", func, tostring(i))
end
elseif r2.events.eventTypeWithValue[eventType]~=nil then
@@ -264,9 +262,7 @@ local registerFeature = function ()
func = "r2.events:setEventValue('".. sequence.InstanceId .."','" .. categoryEvent .."')"
end
- local uc_name = ucstring()
- uc_name:fromUtf8(sequence:getName())
- subMenu:addLine(uc_name, "lua", func, sequence.InstanceId)
+ subMenu:addLine(sequence:getName(), "lua", func, sequence.InstanceId)
end
if this:getBehavior().Activities.Size==0 then
@@ -285,9 +281,7 @@ local registerFeature = function ()
for a=0, sequence.Components.Size-1 do
local activity = sequence.Components[a]
- local uc_name = ucstring()
- uc_name:fromUtf8(activity:getShortName())
- activitiesMenu:addLine(uc_name, "lua",
+ activitiesMenu:addLine(activity:getShortName(), "lua",
"r2.events:setEventValue('".. activity.InstanceId .."','" .. categoryEvent .."')", activity.InstanceId)
end
@@ -449,9 +443,9 @@ local registerFeature = function ()
-- get select bar type
SelectBarType = function(this)
if not this:isBotObject() then
- return i18n.get("uiR2EDScene"):toUtf8()
+ return i18n.get("uiR2EDScene")
else
- return i18n.get("uiR2EDbotObjects"):toUtf8()
+ return i18n.get("uiR2EDbotObjects")
end
end,
@@ -1121,7 +1115,7 @@ local registerFeature = function ()
---------------------------------------------------------------------------------------------------------
-- get select bar type
SelectBarType = function(this)
- return i18n.get("uiR2EDbotObjects"):toUtf8()
+ return i18n.get("uiR2EDbotObjects")
end,
--------------------------------------------------------------------------------------------
-- from 'BaseClass'
@@ -1172,7 +1166,7 @@ local registerFeature = function ()
---------------------------------------------------------------------------------------------------------
-- get select bar type
SelectBarType = function(this)
- return i18n.get("uiR2EDbotObjects"):toUtf8()
+ return i18n.get("uiR2EDbotObjects")
end,
--------------------------------------------------------------------------------------------
-- from 'BaseClass'
@@ -1461,7 +1455,7 @@ local registerFeature = function ()
function userComponentHolder:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EdUserComponent")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "uiR2EdUserComponent")
+ logicEntityMenu:addLine(name, "lua", "", "uiR2EdUserComponent")
end
@@ -1503,7 +1497,7 @@ local registerFeature = function ()
end
local component = r2.newComponent("UserComponentHolder")
component.Base = r2.Translator.getDebugBase("palette.entities.botobjects.user_event")
- component.Name = r2:genInstanceName(i18n.get("uiR2EdUserComponent")):toUtf8()
+ component.Name = r2:genInstanceName(i18n.get("uiR2EdUserComponent"))
component.Position.x = x
component.Position.y = y
@@ -1522,7 +1516,7 @@ local registerFeature = function ()
function userComponentHolder:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EdUserComponent")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "uiR2EdUserComponent")
+ logicEntityMenu:addLine(name, "lua", "", "uiR2EdUserComponent")
end
function userComponentHolder.onPickAddEntity(this)
@@ -1576,7 +1570,7 @@ local registerFeature = function ()
end
local component = r2.newComponent("UserComponentHolder")
component.Base = r2.Translator.getDebugBase("palette.entities.botobjects.user_event")
- component.Name = r2:genInstanceName(i18n.get("uiR2EdUserComponent")):toUtf8()
+ component.Name = r2:genInstanceName(i18n.get("uiR2EdUserComponent"))
component.Position.x = x
component.Position.y = y
@@ -1693,9 +1687,7 @@ local registerFeature = function ()
addLine = not (entity:isKindOf("NpcCreature") or entity:isBotObject() or entity:isPlant() or entity:isGrouped()) --TEMP
end --TEMP
if addLine then
- local uc_name = ucstring()
- uc_name:fromUtf8(entity.Name)
- subMenu:addLine(uc_name, "lua", calledFunction.."('".. entity.InstanceId .."')", entity.InstanceId)
+ subMenu:addLine(entity.Name, "lua", calledFunction.."('".. entity.InstanceId .."')", entity.InstanceId)
empty = false
end
end
@@ -1711,64 +1703,64 @@ local registerFeature = function ()
local logicTranslations = {
["ApplicableActions"] = {
- ["Activate"] = {menu=i18n.get("uiR2EdActivates"):toUtf8(),
+ ["Activate"] = {menu=i18n.get("uiR2EdActivates"),
text=r2:lowerTranslate("uiR2EdActivates")},
- ["Deactivate"] = {menu=i18n.get("uiR2EdDeactivates"):toUtf8(),
+ ["Deactivate"] = {menu=i18n.get("uiR2EdDeactivates"),
text=r2:lowerTranslate("uiR2EdDeactivates")},
- ["Sit Down"] = {menu=i18n.get("uiR2EdSitDown"):toUtf8(),
+ ["Sit Down"] = {menu=i18n.get("uiR2EdSitDown"),
text=r2:lowerTranslate("uiR2EdSitsDown")},
- ["Stand Up"] = {menu=i18n.get("uiR2EdStandUp"):toUtf8(),
+ ["Stand Up"] = {menu=i18n.get("uiR2EdStandUp"),
text=r2:lowerTranslate("uiR2EdStandsUp")},
- ["Kill"] = {menu=i18n.get("uiR2EdKill"):toUtf8(),
+ ["Kill"] = {menu=i18n.get("uiR2EdKill"),
text=r2:lowerTranslate("uiR2EdKills")},
- ["begin activity sequence"] = {menu=i18n.get("uiR2EdBeginActivitySequ"):toUtf8(),
+ ["begin activity sequence"] = {menu=i18n.get("uiR2EdBeginActivitySequ"),
text=r2:lowerTranslate("uiR2EdSequenceStarts")},
- ["Fight with player"] = {menu=i18n.get("uiR2EdFightWithPlayer"):toUtf8(),
+ ["Fight with player"] = {menu=i18n.get("uiR2EdFightWithPlayer"),
text=r2:lowerTranslate("uiR2EdFightWithPlayer")},
- ["Fight with Npcs"] = {menu=i18n.get("uiR2EdFightWithNpcs"):toUtf8(),
+ ["Fight with Npcs"] = {menu=i18n.get("uiR2EdFightWithNpcs"),
text=r2:lowerTranslate("uiR2EdFightWithNpcs")},
- ["Dont fight with player"] = {menu=i18n.get("uiR2EdDontFightWithPlayer"):toUtf8(),
+ ["Dont fight with player"] = {menu=i18n.get("uiR2EdDontFightWithPlayer"),
text=r2:lowerTranslate("uiR2EdDontFightWithPlayer")},
- ["Dont fight with Npcs"] = {menu=i18n.get("uiR2EdDontFightWithNpcs"):toUtf8(),
+ ["Dont fight with Npcs"] = {menu=i18n.get("uiR2EdDontFightWithNpcs"),
text=r2:lowerTranslate("uiR2EdDontFightWithNpcs")},
- ["Run"] = {menu=i18n.get("uiR2EdRun"):toUtf8(),
+ ["Run"] = {menu=i18n.get("uiR2EdRun"),
text=r2:lowerTranslate("uiR2EdRun")},
- ["Dont run"] = {menu=i18n.get("uiR2EdDontRun"):toUtf8(),
+ ["Dont run"] = {menu=i18n.get("uiR2EdDontRun"),
text=r2:lowerTranslate("uiR2EdDontRun")},
},
["Events"] = {
- ["activation"] = {menu=i18n.get("uiR2EdActivation"):toUtf8(),
+ ["activation"] = {menu=i18n.get("uiR2EdActivation"),
text=r2:lowerTranslate("uiR2EdActivation")},
- ["desactivation"] = {menu=i18n.get("uiR2EdDeactivation"):toUtf8(),
+ ["desactivation"] = {menu=i18n.get("uiR2EdDeactivation"),
text=r2:lowerTranslate("uiR2EdDeactivation")},
- ["death"] = {menu=i18n.get("uiR2EdDeath"):toUtf8(),
+ ["death"] = {menu=i18n.get("uiR2EdDeath"),
text=r2:lowerTranslate("uiR2EdDeath")},
- ["end of activity step"] = {menu=i18n.get("uiR2EdEndActivityStep"):toUtf8(),
+ ["end of activity step"] = {menu=i18n.get("uiR2EdEndActivityStep"),
text=r2:lowerTranslate("uiR2EdEndActivityStep")},
- ["end of activity sequence"] = {menu=i18n.get("uiR2EdEndActivitySequ"):toUtf8(),
+ ["end of activity sequence"] = {menu=i18n.get("uiR2EdEndActivitySequ"),
text=r2:lowerTranslate("uiR2EdEndActivitySequ")},
- ["begin of activity step"] = {menu=i18n.get("uiR2EdBeginActivityStep"):toUtf8(),
+ ["begin of activity step"] = {menu=i18n.get("uiR2EdBeginActivityStep"),
text=r2:lowerTranslate("uiR2EdBeginActivityStep")},
- ["begin of activity sequence"] = {menu=i18n.get("uiR2EdBeginOfActivitySequ"):toUtf8(),
+ ["begin of activity sequence"] = {menu=i18n.get("uiR2EdBeginOfActivitySequ"),
text=r2:lowerTranslate("uiR2EdBeginOfActivitySequ")},
- ["targeted by player"] = {menu=i18n.get("uiR2EdTargetedByplayer"):toUtf8(),
+ ["targeted by player"] = {menu=i18n.get("uiR2EdTargetedByplayer"),
text=r2:lowerTranslate("uiR2EdTargetedByplayer")}
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Spawned" ):toUtf8(),
- text=i18n.get( "uiR2Test1Spawned" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Despawned" ):toUtf8(),
- text=i18n.get( "uiR2Test1Despawned" ):toUtf8()},
- ["is dead"] = { menu=i18n.get( "uiR2Test0Dead" ):toUtf8(),
- text=i18n.get( "uiR2Test1Dead" ):toUtf8()},
- ["is alive"] = { menu=i18n.get( "uiR2Test0Alive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Alive" ):toUtf8()},
- ["is in activity sequence"] = { menu=i18n.get( "uiR2Test0Seq" ):toUtf8(),
- text=i18n.get( "uiR2Test1Seq" ):toUtf8()},
- ["is in activity step"] = { menu=i18n.get( "uiR2Test0Step" ):toUtf8(),
- text=i18n.get( "uiR2Test1Step" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Spawned" ),
+ text=i18n.get( "uiR2Test1Spawned" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Despawned" ),
+ text=i18n.get( "uiR2Test1Despawned" )},
+ ["is dead"] = { menu=i18n.get( "uiR2Test0Dead" ),
+ text=i18n.get( "uiR2Test1Dead" )},
+ ["is alive"] = { menu=i18n.get( "uiR2Test0Alive" ),
+ text=i18n.get( "uiR2Test1Alive" )},
+ ["is in activity sequence"] = { menu=i18n.get( "uiR2Test0Seq" ),
+ text=i18n.get( "uiR2Test1Seq" )},
+ ["is in activity step"] = { menu=i18n.get( "uiR2Test0Step" ),
+ text=i18n.get( "uiR2Test1Step" )},
}
}
return logicTranslations
@@ -1924,9 +1916,7 @@ local registerFeature = function ()
addLine = not (entity:isKindOf("NpcPlant") or entity:isGrouped())
end
if addLine then
- local uc_name = ucstring()
- uc_name:fromUtf8(entity.Name)
- subMenu:addLine(uc_name, "lua", calledFunction.."('".. entity.InstanceId .."')", entity.InstanceId)
+ subMenu:addLine(entity.Name, "lua", calledFunction.."('".. entity.InstanceId .."')", entity.InstanceId)
empty = false
end
end
@@ -1957,32 +1947,32 @@ local registerFeature = function ()
function componentNpcPlant:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["Activate"] = {menu=i18n.get("uiR2EdActivates"):toUtf8(),
+ ["Activate"] = {menu=i18n.get("uiR2EdActivates"),
text=r2:lowerTranslate("uiR2EdActivates")},
- ["Deactivate"] = {menu=i18n.get("uiR2EdDeactivates"):toUtf8(),
+ ["Deactivate"] = {menu=i18n.get("uiR2EdDeactivates"),
text=r2:lowerTranslate("uiR2EdDeactivates")},
- ["Kill"] = {menu=i18n.get("uiR2EdKill"):toUtf8(),
+ ["Kill"] = {menu=i18n.get("uiR2EdKill"),
text=r2:lowerTranslate("uiR2EdKills")},
},
["Events"] = {
- ["activation"] = {menu=i18n.get("uiR2EdActivation"):toUtf8(),
+ ["activation"] = {menu=i18n.get("uiR2EdActivation"),
text=r2:lowerTranslate("uiR2EdActivation")},
- ["desactivation"] = {menu=i18n.get("uiR2EdDeactivation"):toUtf8(),
+ ["desactivation"] = {menu=i18n.get("uiR2EdDeactivation"),
text=r2:lowerTranslate("uiR2EdDeactivation")},
- ["death"] = {menu=i18n.get("uiR2EdDeath"):toUtf8(),
+ ["death"] = {menu=i18n.get("uiR2EdDeath"),
text=r2:lowerTranslate("uiR2EdDeath")},
- ["targeted by player"] = {menu=i18n.get("uiR2EdTargetedByplayer"):toUtf8(),
+ ["targeted by player"] = {menu=i18n.get("uiR2EdTargetedByplayer"),
text=r2:lowerTranslate("uiR2EdTargetedByplayer")}
},
["Conditions"] = {
- ["is active"] = {menu=i18n.get("uiR2EdIsActive"):toUtf8(),
+ ["is active"] = {menu=i18n.get("uiR2EdIsActive"),
text=r2:lowerTranslate("uiR2EdIsActive")},
- ["is dead"] = {menu=i18n.get("uiR2EdIsDead"):toUtf8(),
+ ["is dead"] = {menu=i18n.get("uiR2EdIsDead"),
text=r2:lowerTranslate("uiR2EdIsDead")},
- ["is alive"] = {menu=i18n.get("uiR2EdIsAlive"):toUtf8(),
+ ["is alive"] = {menu=i18n.get("uiR2EdIsAlive"),
text=r2:lowerTranslate("uiR2EdIsAlive")},
- ["is inactive"] = {menu=i18n.get("uiR2EdIsInactive"):toUtf8(),
+ ["is inactive"] = {menu=i18n.get("uiR2EdIsInactive"),
text=r2:lowerTranslate("uiR2EdIsInactive")},
}
}
@@ -2076,8 +2066,8 @@ function activeLogicEntityPropertySheetDisplayerTable:onAttrModified(instance, a
local dialogsUI = getUI(r2.dialogs.uiId)
assert(dialogsUI)
- activitiesUI.uc_title = i18n.get("uiR2EDActivitySequenceEditor"):toUtf8() .. instance[attributeName]
- dialogsUI.uc_title = i18n.get("uiR2EDChatSequenceEditor"):toUtf8() .. instance[attributeName]
+ activitiesUI.title = i18n.get("uiR2EDActivitySequenceEditor") .. instance[attributeName]
+ dialogsUI.title = i18n.get("uiR2EDChatSequenceEditor") .. instance[attributeName]
end
end
diff --git a/ryzom/common/data_common/r2/r2_features_delivery_task.lua b/ryzom/common/data_common/r2/r2_features_delivery_task.lua
index cd2590236..08722c7d2 100644
--- a/ryzom/common/data_common/r2/r2_features_delivery_task.lua
+++ b/ryzom/common/data_common/r2/r2_features_delivery_task.lua
@@ -533,14 +533,14 @@ component.createComponent = function(x, y)
local comp = r2.newComponent("DeliveryTask")
assert(comp)
- local contextualText = i18n.get("uiR2EdDeliveryTask_ContextualText"):toUtf8()
- local missionText = i18n.get("uiR2EdDeliveryTask_MissionText"):toUtf8()
- local missionSucceedText = i18n.get("uiR2EdDeliveryTask_MissionSucceededText"):toUtf8()
- local waitValidationText = i18n.get("uiR2EdDeliveryTask_WaitValidationText"):toUtf8()
- local broadcastText = i18n.get("uiR2EdDeliveryTask_BroadcastText"):toUtf8()
+ local contextualText = i18n.get("uiR2EdDeliveryTask_ContextualText")
+ local missionText = i18n.get("uiR2EdDeliveryTask_MissionText")
+ local missionSucceedText = i18n.get("uiR2EdDeliveryTask_MissionSucceededText")
+ local waitValidationText = i18n.get("uiR2EdDeliveryTask_WaitValidationText")
+ local broadcastText = i18n.get("uiR2EdDeliveryTask_BroadcastText")
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.bot_request_item")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EDDeliveryTask")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EDDeliveryTask"))
comp.ContextualText = contextualText
comp.MissionText = missionText
@@ -581,39 +581,39 @@ end
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EdDeliveryTask")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "DeliveryTask")
+ logicEntityMenu:addLine(name, "lua", "", "DeliveryTask")
end
function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()}
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )}
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["mission asked"] = { menu=i18n.get( "uiR2Event0MissionGiven" ):toUtf8(),
- text=i18n.get( "uiR2Event1MissionGiven" ):toUtf8()},
--- ["wait validation"] = { menu=i18n.get( "uiR2Event0TaskWaitValidation" ):toUtf8(),
--- text=i18n.get( "uiR2Event1TaskWaitValidation" ):toUtf8()},
- ["delivered"] = { menu=i18n.get( "uiR2Event0Delivered" ):toUtf8(),
- text=i18n.get( "uiR2Event1Delivered" ):toUtf8()},
- ["succeeded"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Event1TaskSuccess" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["mission asked"] = { menu=i18n.get( "uiR2Event0MissionGiven" ),
+ text=i18n.get( "uiR2Event1MissionGiven" )},
+-- ["wait validation"] = { menu=i18n.get( "uiR2Event0TaskWaitValidation" ),
+-- text=i18n.get( "uiR2Event1TaskWaitValidation" )},
+ ["delivered"] = { menu=i18n.get( "uiR2Event0Delivered" ),
+ text=i18n.get( "uiR2Event1Delivered" )},
+ ["succeeded"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ),
+ text=i18n.get( "uiR2Event1TaskSuccess" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )},
- ["is succeeded"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Test1TaskSuccess" ):toUtf8()},
+ ["is succeeded"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ),
+ text=i18n.get( "uiR2Test1TaskSuccess" )},
}
}
diff --git a/ryzom/common/data_common/r2/r2_features_easter_egg.lua b/ryzom/common/data_common/r2/r2_features_easter_egg.lua
index c613a8ddd..7884c326f 100644
--- a/ryzom/common/data_common/r2/r2_features_easter_egg.lua
+++ b/ryzom/common/data_common/r2/r2_features_easter_egg.lua
@@ -363,7 +363,7 @@ function component.createComponent(x, y)
assert(comp)
comp.Base = "palette.entities.botobjects.chest_wisdom_std_sel"
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdEasterEgg")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdEasterEgg"))
comp.Position.x = x
comp.Position.y = y
@@ -459,25 +459,25 @@ function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Spawn" ):toUtf8(),
- text=i18n.get( "uiR2AA1Spawn" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Despawn" ):toUtf8(),
- text=i18n.get( "uiR2AA1Despawn" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Spawn" ),
+ text=i18n.get( "uiR2AA1Spawn" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Despawn" ),
+ text=i18n.get( "uiR2AA1Despawn" )},
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Spawn" ):toUtf8(),
- text=i18n.get( "uiR2Event1Spawn" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Despawn" ):toUtf8(),
- text=i18n.get( "uiR2Event1Despawn" ):toUtf8()},
- ["opened"] = { menu=i18n.get( "uiR2Event0ChestOpened" ):toUtf8(),
- text=i18n.get( "uiR2Event1ChestOpened" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Spawn" ),
+ text=i18n.get( "uiR2Event1Spawn" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Despawn" ),
+ text=i18n.get( "uiR2Event1Despawn" )},
+ ["opened"] = { menu=i18n.get( "uiR2Event0ChestOpened" ),
+ text=i18n.get( "uiR2Event1ChestOpened" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Spawned" ):toUtf8(),
- text=i18n.get( "uiR2Test1Spawned" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Despawned" ):toUtf8(),
- text=i18n.get( "uiR2Test1Despawned" ):toUtf8()}
+ ["is active"] = { menu=i18n.get( "uiR2Test0Spawned" ),
+ text=i18n.get( "uiR2Test1Spawned" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Despawned" ),
+ text=i18n.get( "uiR2Test1Despawned" )}
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_empty.lua b/ryzom/common/data_common/r2/r2_features_empty.lua
index 7c745bef6..b61b2b247 100644
--- a/ryzom/common/data_common/r2/r2_features_empty.lua
+++ b/ryzom/common/data_common/r2/r2_features_empty.lua
@@ -172,7 +172,7 @@ component.createComponent = function(x, y)
assert(comp)
comp.Base = "palette.entities.botobjects.milestone"
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdEmptyFeature")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdEmptyFeature"))
comp.Position.x = x
comp.Position.y = y
@@ -252,7 +252,7 @@ end
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EdEmptyFeature")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "EmptyFeature")
+ logicEntityMenu:addLine(name, "lua", "", "EmptyFeature")
end
function component:getLogicTranslations()
diff --git a/ryzom/common/data_common/r2/r2_features_fauna.lua b/ryzom/common/data_common/r2/r2_features_fauna.lua
index 3a58d95b9..fbceabf1d 100644
--- a/ryzom/common/data_common/r2/r2_features_fauna.lua
+++ b/ryzom/common/data_common/r2/r2_features_fauna.lua
@@ -60,7 +60,7 @@ local function reinit(form, creature)
r2.RingAccess.testAccess(paletteElt.RingAccess) then
if paletteElt.Ecosystem == "Desert" and paletteElt.Level >= 1 and paletteElt.Level <= 50 then
- creatureEnum:addText(ucstring(i18n.get(v.Translation)))
+ creatureEnum:addText(i18n.get(v.Translation))
end
end
end
@@ -87,7 +87,7 @@ local function getBase(creature, form)
local k, v = next(creaturePalette, nil)
while k do
- local name = i18n.get(v.Translation):toUtf8()
+ local name = i18n.get(v.Translation)
if name == race then
return v.Id, name
end
@@ -138,7 +138,7 @@ end
if paletteElt and paletteElt.RingAccess and
r2.RingAccess.testAccess(paletteElt.RingAccess) then
if paletteElt.Ecosystem == currentEco and paletteElt.Level >= levelMin and paletteElt.Level <= levelMax then
- creatureEnum:addText(ucstring(i18n.get(v.Translation)))
+ creatureEnum:addText(i18n.get(v.Translation))
end
end
end
@@ -459,7 +459,7 @@ component.createGhostComponents= function(this, act)
if act then
comp.User._Herd = herd.InstanceId
- --herd.Name = r2:genInstanceName(i18n.get("uiR2EdFaunaFeature")):toUtf8()
+ --herd.Name = r2:genInstanceName(i18n.get("uiR2EdFaunaFeature"))
herd.InheritPos = 0
herd.Position.x = comp.Position.x
herd.Position.y = comp.Position.y
@@ -478,7 +478,7 @@ component.createComponent = function(x, y, nbcritters, raceBase, raceName,
--comp.Base = "palette.entities.botobjects.user_event"
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.user_event")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdCreatureComponent")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdCreatureComponent"))
comp.Position.x = x
comp.Position.y = y
@@ -688,7 +688,7 @@ component.createComponent = function(x, y, carnCount, carnivoreBase, carnivoresN
--TODO: replace this milestone base by some default feature base
comp.Base = "palette.entities.botobjects.user_event"
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdFaunaFeature")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdFaunaFeature"))
comp.Position.x = x
comp.Position.y = y
@@ -715,7 +715,7 @@ component.createComponent = function(x, y, carnCount, carnivoreBase, carnivoresN
zoneSleep1.Position.y = comp.Position.y + FaunaRegionOffsets[1].y
zoneSleep1.Position.z = comp.Position.z
zoneSleep1.InheritPos = 0
- zoneSleep1.Name = r2:genInstanceName(i18n.get("uiR2EDNameSleepRegion")):toUtf8()
+ zoneSleep1.Name = r2:genInstanceName(i18n.get("uiR2EDNameSleepRegion"))
table.insert(comp.Components, zoneSleep1)
-- Carnivore sleep zone
@@ -726,7 +726,7 @@ component.createComponent = function(x, y, carnCount, carnivoreBase, carnivoresN
zoneSleep2.Position.y = comp.Position.y + FaunaRegionOffsets[2].y
zoneSleep2.Position.z = comp.Position.z
zoneSleep2.InheritPos = 0
- zoneSleep2.Name = r2:genInstanceName(i18n.get("uiR2EDNameSleepRegion")):toUtf8()
+ zoneSleep2.Name = r2:genInstanceName(i18n.get("uiR2EDNameSleepRegion"))
table.insert(comp.Components, zoneSleep2)
--Herbivore sleep zone
@@ -737,13 +737,13 @@ component.createComponent = function(x, y, carnCount, carnivoreBase, carnivoresN
zoneFood.Position.y = comp.Position.y + FaunaRegionOffsets[3].y
zoneFood.Position.z = comp.Position.z
zoneFood.InheritPos = 0
- zoneFood.Name = r2:genInstanceName(i18n.get("uiR2EDNameFoodRegion")):toUtf8()
+ zoneFood.Name = r2:genInstanceName(i18n.get("uiR2EDNameFoodRegion"))
table.insert(comp.Components, zoneFood)
-- Herd of herbivores
local herbivores = feature.Components.Creature.createComponent(zoneSleep1.Position.x, zoneSleep1.Position.y, herbCount, herbivoreBase,
herbivoresName, zoneSleep1.InstanceId, zoneFood.InstanceId)
- herbivores.Name = i18n.get("uiR2EdHerbivores"):toUtf8()
+ herbivores.Name = i18n.get("uiR2EdHerbivores")
--herbivores.Position.x = zoneSleep1.Position.x--comp.Position.x + 10
--herbivores.Position.y = zoneSleep1.Position.y--comp.Position.y + 10
herbivores.InheritPos = 0
@@ -755,7 +755,7 @@ component.createComponent = function(x, y, carnCount, carnivoreBase, carnivoresN
-- Pack of carnivores
local carnivores = feature.Components.Creature.createComponent(zoneSleep2.Position.x, zoneSleep2.Position.y, carnCount, carnivoreBase,
carnivoresName, zoneSleep2.InstanceId, zoneSleep1.InstanceId)
- carnivores.Name = i18n.get("uiR2EdCarnivores"):toUtf8()
+ carnivores.Name = i18n.get("uiR2EdCarnivores")
carnivores.InheritPos = 0
carnivores.ManagerId = comp.InstanceId
table.insert(comp.Components, carnivores)
@@ -833,7 +833,7 @@ end
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EdFaunaFeature")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "FaunaFeature")
+ logicEntityMenu:addLine(name, "lua", "", "FaunaFeature")
end
r2.Features["FaunaFeature"] = feature
diff --git a/ryzom/common/data_common/r2/r2_features_get_item_from_scenery.lua b/ryzom/common/data_common/r2/r2_features_get_item_from_scenery.lua
index dfcf5546c..53a559c25 100644
--- a/ryzom/common/data_common/r2/r2_features_get_item_from_scenery.lua
+++ b/ryzom/common/data_common/r2/r2_features_get_item_from_scenery.lua
@@ -375,10 +375,10 @@ component.createComponent = function(x, y)
local comp = r2.newComponent("GetItemFromSceneryObject")
assert(comp)
- local contextualText = i18n.get("uiR2EdGetItemFromSceneryObject_ContextualText"):toUtf8()
+ local contextualText = i18n.get("uiR2EdGetItemFromSceneryObject_ContextualText")
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.bot_request_item")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EDGetItemFromSceneryObject")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EDGetItemFromSceneryObject"))
comp.ItemNumber = 0
comp.ContextualText = contextualText
@@ -444,35 +444,35 @@ end
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EdGetItemFromSceneryObject")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "GetItemFromSceneryObject")
+ logicEntityMenu:addLine(name, "lua", "", "GetItemFromSceneryObject")
end
function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2Event1Trigger" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ),
+ text=i18n.get( "uiR2Event1Trigger" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()},
- ["has triggered"] = { menu=i18n.get( "uiR2Test0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2Test1Trigger" ):toUtf8()},
- ["has not triggered"] = { menu=i18n.get( "uiR2Test0NotTrigger" ):toUtf8(),
- text=i18n.get( "uiR2Test1NotTrigger" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )},
+ ["has triggered"] = { menu=i18n.get( "uiR2Test0Trigger" ),
+ text=i18n.get( "uiR2Test1Trigger" )},
+ ["has not triggered"] = { menu=i18n.get( "uiR2Test0NotTrigger" ),
+ text=i18n.get( "uiR2Test1NotTrigger" )},
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_get_item_from_scenery_task.lua b/ryzom/common/data_common/r2/r2_features_get_item_from_scenery_task.lua
index 9f07b9433..7d13b859b 100644
--- a/ryzom/common/data_common/r2/r2_features_get_item_from_scenery_task.lua
+++ b/ryzom/common/data_common/r2/r2_features_get_item_from_scenery_task.lua
@@ -452,13 +452,13 @@ component.createComponent = function(x, y)
local comp = r2.newComponent("GetItemFromSceneryObjectTaskStep")
assert(comp)
- local contextualText = i18n.get("uiR2EdGetItemFromSceneryObjectTaskStep_ContextualText"):toUtf8()
- local missionText = i18n.get("uiR2EdGetItemFromSceneryObjectTaskStep_MissionText"):toUtf8()
- local notValidatedText = i18n.get("uiR2EdGetItemFromSceneryObjectTaskStep_NotValidatedText"):toUtf8()
- local broadcastText = i18n.get("uiR2EdGetItemFromSceneryObjectTaskStep_BroadcastText"):toUtf8()
+ local contextualText = i18n.get("uiR2EdGetItemFromSceneryObjectTaskStep_ContextualText")
+ local missionText = i18n.get("uiR2EdGetItemFromSceneryObjectTaskStep_MissionText")
+ local notValidatedText = i18n.get("uiR2EdGetItemFromSceneryObjectTaskStep_NotValidatedText")
+ local broadcastText = i18n.get("uiR2EdGetItemFromSceneryObjectTaskStep_BroadcastText")
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.bot_request_item")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EDGetItemFromSceneryObjectTaskStep")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EDGetItemFromSceneryObjectTaskStep"))
comp.ItemNumber = 0
comp.ContextualText = contextualText
@@ -500,35 +500,35 @@ end
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EdGetItemFromSceneryObjectTaskStep")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "GetItemFromSceneryObjectTaskStep")
+ logicEntityMenu:addLine(name, "lua", "", "GetItemFromSceneryObjectTaskStep")
end
function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["success"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Event1TaskSuccess" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["success"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ),
+ text=i18n.get( "uiR2Event1TaskSuccess" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()},
- ["is succeeded"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Test1TaskSuccess" ):toUtf8()},
- ["in progress"] = { menu=i18n.get( "uiR2Test0InProgress" ):toUtf8(),
- text=i18n.get( "uiR2Test1InProgress" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )},
+ ["is succeeded"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ),
+ text=i18n.get( "uiR2Test1TaskSuccess" )},
+ ["in progress"] = { menu=i18n.get( "uiR2Test0InProgress" ),
+ text=i18n.get( "uiR2Test1InProgress" )},
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_give_item.lua b/ryzom/common/data_common/r2/r2_features_give_item.lua
index 9fbe91ebd..96f141148 100644
--- a/ryzom/common/data_common/r2/r2_features_give_item.lua
+++ b/ryzom/common/data_common/r2/r2_features_give_item.lua
@@ -396,13 +396,13 @@ component.createComponent = function(x, y)
local comp = r2.newComponent("GiveItem")
assert(comp)
- local contextualText = i18n.get("uiR2EdGiveItem_ContextualText"):toUtf8()
- local missionText = i18n.get("uiR2EdGiveItem_MissionText"):toUtf8()
- local missionSucceedText = i18n.get("uiR2EdGiveItem_MissionSucceededText"):toUtf8()
- local broadcastText = i18n.get("uiR2EdGiveItem_BroadcastText"):toUtf8()
+ local contextualText = i18n.get("uiR2EdGiveItem_ContextualText")
+ local missionText = i18n.get("uiR2EdGiveItem_MissionText")
+ local missionSucceedText = i18n.get("uiR2EdGiveItem_MissionSucceededText")
+ local broadcastText = i18n.get("uiR2EdGiveItem_BroadcastText")
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.bot_request_item")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EDGiveItem")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EDGiveItem"))
comp.ItemNumber = 0
@@ -471,36 +471,36 @@ end
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EdGiveItem")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "GiveItem")
+ logicEntityMenu:addLine(name, "lua", "", "GiveItem")
end
function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()}
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )}
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["mission asked"] = { menu=i18n.get( "uiR2Event0MissionGiven" ):toUtf8(),
- text=i18n.get( "uiR2Event1MissionGiven" ):toUtf8()},
- ["wait validation"] = { menu=i18n.get( "uiR2Event0TaskWaitValidation" ):toUtf8(),
- text=i18n.get( "uiR2Event1TaskWaitValidation" ):toUtf8()},
- ["succeeded"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Event1TaskSuccess" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["mission asked"] = { menu=i18n.get( "uiR2Event0MissionGiven" ),
+ text=i18n.get( "uiR2Event1MissionGiven" )},
+ ["wait validation"] = { menu=i18n.get( "uiR2Event0TaskWaitValidation" ),
+ text=i18n.get( "uiR2Event1TaskWaitValidation" )},
+ ["succeeded"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ),
+ text=i18n.get( "uiR2Event1TaskSuccess" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()},
- ["is succeeded"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Test1TaskSuccess" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )},
+ ["is succeeded"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ),
+ text=i18n.get( "uiR2Test1TaskSuccess" )},
}
}
diff --git a/ryzom/common/data_common/r2/r2_features_hidden_chest.lua b/ryzom/common/data_common/r2/r2_features_hidden_chest.lua
index 55ce70b03..4f9c5d573 100644
--- a/ryzom/common/data_common/r2/r2_features_hidden_chest.lua
+++ b/ryzom/common/data_common/r2/r2_features_hidden_chest.lua
@@ -198,7 +198,7 @@ component.createComponent = function(x, y)
assert(comp)
assert(comp.Position)
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdHiddenChest")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdHiddenChest"))
comp.Base = "palette.entities.botobjects.chest_wisdom_std_sel"
comp.Position.x = x
comp.Position.y = y
@@ -209,7 +209,7 @@ component.createComponent = function(x, y)
comp.ItemNumber = 0
local zoneTrigger = r2.Features["ZoneTrigger"].Components.ZoneTrigger.createComponent(x + 3, y + 3)
- zoneTrigger.Name = comp.Name.." "..i18n.get("uiR2EdZoneTrigger"):toUtf8()--r2:genInstanceName(i18n.get("uiR2EdZoneTrigger")):toUtf8()
+ zoneTrigger.Name = comp.Name.." "..i18n.get("uiR2EdZoneTrigger")--r2:genInstanceName(i18n.get("uiR2EdZoneTrigger"))
zoneTrigger.InheritPos = 0
zoneTrigger.Deletable = false
table.insert(comp.Components, zoneTrigger)
@@ -243,9 +243,7 @@ component.initLogicEntitiesInstancesMenu = function(this, subMenu, calledFunctio
local entitiesTable = r2.Scenario:getAllInstancesByType(this.Name)
for key, entity in pairs(entitiesTable) do
- local uc_name = ucstring()
- uc_name:fromUtf8(entity.Name)
- subMenu:addLine(uc_name, "lua", calledFunction.."('".. entity.InstanceId .."')", entity.InstanceId)
+ subMenu:addLine(entity.Name, "lua", calledFunction.."('".. entity.InstanceId .."')", entity.InstanceId)
end
if table.getn(entitiesTable)==0 then
@@ -259,26 +257,26 @@ function component:getLogicTranslations()
-- register trad
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
- ["trigger"] = { menu=i18n.get( "uiR2AA0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2AA1Trigger" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
+ ["trigger"] = { menu=i18n.get( "uiR2AA0Trigger" ),
+ text=i18n.get( "uiR2AA1Trigger" )},
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2Event1Trigger" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ),
+ text=i18n.get( "uiR2Event1Trigger" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()}
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )}
}
}
diff --git a/ryzom/common/data_common/r2/r2_features_hunt_task.lua b/ryzom/common/data_common/r2/r2_features_hunt_task.lua
index f4e3954ed..f32bd1f0f 100644
--- a/ryzom/common/data_common/r2/r2_features_hunt_task.lua
+++ b/ryzom/common/data_common/r2/r2_features_hunt_task.lua
@@ -581,18 +581,18 @@ end
component.createComponent = function(x, y)
- local contextualText = i18n.get("uiR2EdHuntTask_ContextualText"):toUtf8()
- local missionText = i18n.get("uiR2EdHuntTask_MissionText"):toUtf8()
- local waitValidationText = i18n.get("uiR2EdHuntTask_WaitValidationText"):toUtf8()
- local missionSucceededText = i18n.get("uiR2EdHuntTask_MissionSucceededText"):toUtf8()
- local broadcastText = i18n.get("uiR2EdHuntTask_BroadcastText"):toUtf8()
+ local contextualText = i18n.get("uiR2EdHuntTask_ContextualText")
+ local missionText = i18n.get("uiR2EdHuntTask_MissionText")
+ local waitValidationText = i18n.get("uiR2EdHuntTask_WaitValidationText")
+ local missionSucceededText = i18n.get("uiR2EdHuntTask_MissionSucceededText")
+ local broadcastText = i18n.get("uiR2EdHuntTask_BroadcastText")
local comp = r2.newComponent("HuntTask")
assert(comp)
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.bot_chat")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdHuntTask")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdHuntTask"))
comp.ContextualText = contextualText
comp.MissionText = missionText
@@ -660,40 +660,40 @@ end
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EdHuntTask")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "HuntTask")
+ logicEntityMenu:addLine(name, "lua", "", "HuntTask")
end
function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
- ["succeed"] = { menu=i18n.get( "uiR2AA0SucceedTask" ):toUtf8(),
- text=i18n.get( "uiR2AA1SucceedTask" ):toUtf8()},
- ["succeedStep"] = { menu=i18n.get( "uiR2AA0SucceedStep" ):toUtf8(),
- text=i18n.get( "uiR2AA1SucceedStep" ):toUtf8()}
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
+ ["succeed"] = { menu=i18n.get( "uiR2AA0SucceedTask" ),
+ text=i18n.get( "uiR2AA1SucceedTask" )},
+ ["succeedStep"] = { menu=i18n.get( "uiR2AA0SucceedStep" ),
+ text=i18n.get( "uiR2AA1SucceedStep" )}
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["mission asked"] = { menu=i18n.get( "uiR2Event0MissionGiven" ):toUtf8(),
- text=i18n.get( "uiR2Event1MissionGiven" ):toUtf8()},
- ["wait validation"] = { menu=i18n.get( "uiR2Event0TaskWaitValidation" ):toUtf8(),
- text=i18n.get( "uiR2Event1TaskWaitValidation" ):toUtf8()},
- ["succeeded"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Event1TaskSuccess" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["mission asked"] = { menu=i18n.get( "uiR2Event0MissionGiven" ),
+ text=i18n.get( "uiR2Event1MissionGiven" )},
+ ["wait validation"] = { menu=i18n.get( "uiR2Event0TaskWaitValidation" ),
+ text=i18n.get( "uiR2Event1TaskWaitValidation" )},
+ ["succeeded"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ),
+ text=i18n.get( "uiR2Event1TaskSuccess" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()},
- ["is succeeded"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Test1TaskSuccess" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )},
+ ["is succeeded"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ),
+ text=i18n.get( "uiR2Test1TaskSuccess" )},
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_kill_npc.lua b/ryzom/common/data_common/r2/r2_features_kill_npc.lua
index c1eb50dc2..091662150 100644
--- a/ryzom/common/data_common/r2/r2_features_kill_npc.lua
+++ b/ryzom/common/data_common/r2/r2_features_kill_npc.lua
@@ -357,17 +357,17 @@ end
component.createComponent = function(x, y)
- local contextualText = i18n.get("uiR2EdKillNpc_ContextualText"):toUtf8()
- local missionText = i18n.get("uiR2EdKillNpc_MissionText"):toUtf8()
- local waitValidationText = i18n.get("uiR2EdKillNpc_WaitValidationText"):toUtf8()
- local missionSucceededText = i18n.get("uiR2EdKillNpc_MissionSucceededText"):toUtf8()
- local broadcastText = i18n.get("uiR2EdKillNpc_BroadcastText"):toUtf8()
+ local contextualText = i18n.get("uiR2EdKillNpc_ContextualText")
+ local missionText = i18n.get("uiR2EdKillNpc_MissionText")
+ local waitValidationText = i18n.get("uiR2EdKillNpc_WaitValidationText")
+ local missionSucceededText = i18n.get("uiR2EdKillNpc_MissionSucceededText")
+ local broadcastText = i18n.get("uiR2EdKillNpc_BroadcastText")
local comp = r2.newComponent("KillNpc")
assert(comp)
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.bot_chat")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdKillNpc")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdKillNpc"))
comp.ContextualText = contextualText
comp.MissionText = missionText
@@ -435,36 +435,36 @@ end
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EdKillNpc")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "KillNpc")
+ logicEntityMenu:addLine(name, "lua", "", "KillNpc")
end
function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()}
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )}
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["mission asked"] = { menu=i18n.get( "uiR2Event0MissionGiven" ):toUtf8(),
- text=i18n.get( "uiR2Event1MissionGiven" ):toUtf8()},
- ["wait validation"] = { menu=i18n.get( "uiR2Event0TaskWaitValidation" ):toUtf8(),
- text=i18n.get( "uiR2Event1TaskWaitValidation" ):toUtf8()},
- ["succeeded"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Event1TaskSuccess" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["mission asked"] = { menu=i18n.get( "uiR2Event0MissionGiven" ),
+ text=i18n.get( "uiR2Event1MissionGiven" )},
+ ["wait validation"] = { menu=i18n.get( "uiR2Event0TaskWaitValidation" ),
+ text=i18n.get( "uiR2Event1TaskWaitValidation" )},
+ ["succeeded"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ),
+ text=i18n.get( "uiR2Event1TaskSuccess" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()},
- ["is completed"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Test1TaskSuccess" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )},
+ ["is completed"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ),
+ text=i18n.get( "uiR2Test1TaskSuccess" )},
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_loot_spawner.lua b/ryzom/common/data_common/r2/r2_features_loot_spawner.lua
index 19b0901b1..5115c6f44 100644
--- a/ryzom/common/data_common/r2/r2_features_loot_spawner.lua
+++ b/ryzom/common/data_common/r2/r2_features_loot_spawner.lua
@@ -405,7 +405,7 @@ component.createComponent = function(x, y, tvalue)
assert(comp)
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.user_event")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EDRollout_LootSpawner")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EDRollout_LootSpawner"))
comp.Position.x = x
comp.Position.y = y
@@ -485,7 +485,7 @@ end
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EDRollout_RewardChest")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "RewardChest")
+ logicEntityMenu:addLine(name, "lua", "", "RewardChest")
end
diff --git a/ryzom/common/data_common/r2/r2_features_man_hunt.lua b/ryzom/common/data_common/r2/r2_features_man_hunt.lua
index 6cd0953dc..2bda67509 100644
--- a/ryzom/common/data_common/r2/r2_features_man_hunt.lua
+++ b/ryzom/common/data_common/r2/r2_features_man_hunt.lua
@@ -377,7 +377,7 @@ component.createComponent = function(x, y)
assert(comp)
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.user_event")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdManHunt")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdManHunt"))
comp.Position.x = x
comp.Position.y = y
@@ -427,7 +427,7 @@ component.create = function()
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EdManHunt")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "ManHunt")
+ logicEntityMenu:addLine(name, "lua", "", "ManHunt")
end
diff --git a/ryzom/common/data_common/r2/r2_features_npc_groups.lua b/ryzom/common/data_common/r2/r2_features_npc_groups.lua
index 20658dcfd..8b919e38a 100644
--- a/ryzom/common/data_common/r2/r2_features_npc_groups.lua
+++ b/ryzom/common/data_common/r2/r2_features_npc_groups.lua
@@ -96,7 +96,7 @@ local registerFeature = function ()
---------------------------------------------------------------------------------------------------------
-- get select bar type
SelectBarType = function(this)
- return i18n.get("uiR2EDScene"):toUtf8()
+ return i18n.get("uiR2EDScene")
end,
updateVersion = function(this, scenarioValue, currentValue )
@@ -246,10 +246,8 @@ local registerFeature = function ()
local baseName = r2.PaletteIdToTranslation[this.Components[k-1].Base]
if counterNames[baseName]==nil then
- local uc_name = ucstring()
- uc_name:fromUtf8(baseName)
- local name = r2:genInstanceName(uc_name):toUtf8()
- counterName = string.gsub(name, tostring(uc_name), "")
+ local name = r2:genInstanceName(baseName)
+ counterName = string.gsub(name, tostring(baseName), "")
counterNames[baseName] = tonumber(counterName)
else
counterNames[baseName] = counterNames[baseName]+1
@@ -431,66 +429,66 @@ local registerFeature = function ()
local logicTranslations = {
["ApplicableActions"] = {
- ["Activate"] = { menu=i18n.get( "uiR2AA0Spawn" ):toUtf8(),
- text=i18n.get( "uiR2AA1Spawn" ):toUtf8()},
- ["Deactivate"] = { menu=i18n.get( "uiR2AA0Despawn" ):toUtf8(),
- text=i18n.get( "uiR2AA1Despawn" ):toUtf8()},
- ["Sit Down"] = { menu=i18n.get( "uiR2AA0NpcSit" ):toUtf8(),
- text=i18n.get( "uiR2AA1NpcSit" ):toUtf8(),
+ ["Activate"] = { menu=i18n.get( "uiR2AA0Spawn" ),
+ text=i18n.get( "uiR2AA1Spawn" )},
+ ["Deactivate"] = { menu=i18n.get( "uiR2AA0Despawn" ),
+ text=i18n.get( "uiR2AA1Despawn" )},
+ ["Sit Down"] = { menu=i18n.get( "uiR2AA0NpcSit" ),
+ text=i18n.get( "uiR2AA1NpcSit" ),
groupIndependant=true},
- ["Stand Up"] = { menu=i18n.get( "uiR2AA0NpcStand" ):toUtf8(),
- text=i18n.get( "uiR2AA1NpcStand" ):toUtf8(),
+ ["Stand Up"] = { menu=i18n.get( "uiR2AA0NpcStand" ),
+ text=i18n.get( "uiR2AA1NpcStand" ),
groupIndependant=true},
- ["Kill"] = { menu=i18n.get( "uiR2AA0Kill" ):toUtf8(),
- text=i18n.get( "uiR2AA1Kill" ):toUtf8()},
- ["begin activity sequence"] = { menu=i18n.get( "uiR2AA0BeginSeq" ):toUtf8(),
- text=i18n.get( "uiR2AA1BeginSeq" ):toUtf8()},
- ["Fight with player"] = { menu=i18n.get( "uiR2AA0FlagFightPlayersOn" ):toUtf8(),
- text=i18n.get( "uiR2AA1FlagFightPlayersOn" ):toUtf8()},
- ["Dont fight with player"] = { menu=i18n.get( "uiR2AA0FlagFightPlayersOff" ):toUtf8(),
- text=i18n.get( "uiR2AA1FlagFightPlayersOff" ):toUtf8()},
- ["Fight with Npcs"] = { menu=i18n.get( "uiR2AA0FlagFightNpcsOn" ):toUtf8(),
- text=i18n.get( "uiR2AA1FlagFightNpcsOn" ):toUtf8()},
- ["Dont fight with Npcs"] = { menu=i18n.get( "uiR2AA0FlagFightNpcsOff" ):toUtf8(),
- text=i18n.get( "uiR2AA1FlagFightNpcsOff" ):toUtf8()},
- ["Run"] = { menu=i18n.get( "uiR2AA0FlagRunOn" ):toUtf8(),
- text=i18n.get( "uiR2AA1FlagRunOn" ):toUtf8()},
- ["Dont run"] = { menu=i18n.get( "uiR2AA0FlagRunOff" ):toUtf8(),
- text=i18n.get( "uiR2AA1FlagRunOff" ):toUtf8()},
+ ["Kill"] = { menu=i18n.get( "uiR2AA0Kill" ),
+ text=i18n.get( "uiR2AA1Kill" )},
+ ["begin activity sequence"] = { menu=i18n.get( "uiR2AA0BeginSeq" ),
+ text=i18n.get( "uiR2AA1BeginSeq" )},
+ ["Fight with player"] = { menu=i18n.get( "uiR2AA0FlagFightPlayersOn" ),
+ text=i18n.get( "uiR2AA1FlagFightPlayersOn" )},
+ ["Dont fight with player"] = { menu=i18n.get( "uiR2AA0FlagFightPlayersOff" ),
+ text=i18n.get( "uiR2AA1FlagFightPlayersOff" )},
+ ["Fight with Npcs"] = { menu=i18n.get( "uiR2AA0FlagFightNpcsOn" ),
+ text=i18n.get( "uiR2AA1FlagFightNpcsOn" )},
+ ["Dont fight with Npcs"] = { menu=i18n.get( "uiR2AA0FlagFightNpcsOff" ),
+ text=i18n.get( "uiR2AA1FlagFightNpcsOff" )},
+ ["Run"] = { menu=i18n.get( "uiR2AA0FlagRunOn" ),
+ text=i18n.get( "uiR2AA1FlagRunOn" )},
+ ["Dont run"] = { menu=i18n.get( "uiR2AA0FlagRunOff" ),
+ text=i18n.get( "uiR2AA1FlagRunOff" )},
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Spawn" ):toUtf8(),
- text=i18n.get( "uiR2Event1Spawn" ):toUtf8()},
- ["desactivation"] = { menu=i18n.get( "uiR2Event0Despawn" ):toUtf8(),
- text=i18n.get( "uiR2Event1Despawn" ):toUtf8()},
- ["member death"] = { menu=i18n.get( "uiR2Event0MemberDeath" ):toUtf8(),
- text=i18n.get( "uiR2Event1MemberDeath" ):toUtf8()},
- ["group death"] = { menu=i18n.get( "uiR2Event0GroupDeath" ):toUtf8(),
- text=i18n.get( "uiR2Event1GroupDeath" ):toUtf8()},
- ["end of activity step"] = { menu=i18n.get( "uiR2Event0EndActivityStep" ):toUtf8(),
- text=i18n.get( "uiR2Event1EndActivityStep" ):toUtf8()},
- ["end of activity sequence"] = { menu=i18n.get( "uiR2Event0EndActivitySeq" ):toUtf8(),
- text=i18n.get( "uiR2Event1EndActivitySeq" ):toUtf8()},
- ["begin of activity step"] = { menu=i18n.get( "uiR2Event0BeginActivityStep" ):toUtf8(),
- text=i18n.get( "uiR2Event1BeginActivityStep" ):toUtf8()},
- ["begin of activity sequence"] = { menu=i18n.get( "uiR2Event0BeginOfActivitySeq" ):toUtf8(),
- text=i18n.get( "uiR2Event1BeginOfActivitySeq" ):toUtf8()},
- ["targeted by player"] = { menu=i18n.get( "uiR2Event0TargetedByPlayer" ):toUtf8(),
- text=i18n.get( "uiR2Event1TargetedByPlayer" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Spawn" ),
+ text=i18n.get( "uiR2Event1Spawn" )},
+ ["desactivation"] = { menu=i18n.get( "uiR2Event0Despawn" ),
+ text=i18n.get( "uiR2Event1Despawn" )},
+ ["member death"] = { menu=i18n.get( "uiR2Event0MemberDeath" ),
+ text=i18n.get( "uiR2Event1MemberDeath" )},
+ ["group death"] = { menu=i18n.get( "uiR2Event0GroupDeath" ),
+ text=i18n.get( "uiR2Event1GroupDeath" )},
+ ["end of activity step"] = { menu=i18n.get( "uiR2Event0EndActivityStep" ),
+ text=i18n.get( "uiR2Event1EndActivityStep" )},
+ ["end of activity sequence"] = { menu=i18n.get( "uiR2Event0EndActivitySeq" ),
+ text=i18n.get( "uiR2Event1EndActivitySeq" )},
+ ["begin of activity step"] = { menu=i18n.get( "uiR2Event0BeginActivityStep" ),
+ text=i18n.get( "uiR2Event1BeginActivityStep" )},
+ ["begin of activity sequence"] = { menu=i18n.get( "uiR2Event0BeginOfActivitySeq" ),
+ text=i18n.get( "uiR2Event1BeginOfActivitySeq" )},
+ ["targeted by player"] = { menu=i18n.get( "uiR2Event0TargetedByPlayer" ),
+ text=i18n.get( "uiR2Event1TargetedByPlayer" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Spawned" ):toUtf8(),
- text=i18n.get( "uiR2Test1Spawned" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Despawned" ):toUtf8(),
- text=i18n.get( "uiR2Test1Despawned" ):toUtf8()},
- ["is dead"] = { menu=i18n.get( "uiR2Test0Dead" ):toUtf8(),
- text=i18n.get( "uiR2Test1Dead" ):toUtf8()},
- ["is alive"] = { menu=i18n.get( "uiR2Test0Alive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Alive" ):toUtf8()},
- ["is in activity sequence"] = { menu=i18n.get( "uiR2Test0Seq" ):toUtf8(),
- text=i18n.get( "uiR2Test1Seq" ):toUtf8()},
- ["is in activity step"] = { menu=i18n.get( "uiR2Test0Step" ):toUtf8(),
- text=i18n.get( "uiR2Test1Step" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Spawned" ),
+ text=i18n.get( "uiR2Test1Spawned" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Despawned" ),
+ text=i18n.get( "uiR2Test1Despawned" )},
+ ["is dead"] = { menu=i18n.get( "uiR2Test0Dead" ),
+ text=i18n.get( "uiR2Test1Dead" )},
+ ["is alive"] = { menu=i18n.get( "uiR2Test0Alive" ),
+ text=i18n.get( "uiR2Test1Alive" )},
+ ["is in activity sequence"] = { menu=i18n.get( "uiR2Test0Seq" ),
+ text=i18n.get( "uiR2Test1Seq" )},
+ ["is in activity step"] = { menu=i18n.get( "uiR2Test0Step" ),
+ text=i18n.get( "uiR2Test1Step" )},
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_npc_interaction.lua b/ryzom/common/data_common/r2/r2_features_npc_interaction.lua
index 86d39c87b..4cdd90e5d 100644
--- a/ryzom/common/data_common/r2/r2_features_npc_interaction.lua
+++ b/ryzom/common/data_common/r2/r2_features_npc_interaction.lua
@@ -297,15 +297,15 @@ end
component.createComponent = function(x, y)
- local contextualText = i18n.get("uiR2EdNpcInteraction_ContextualText"):toUtf8()
- local preInteractionText = i18n.get("uiR2EdNpcInteraction_PreInteractionText"):toUtf8()
- local postInteractionText = i18n.get("uiR2EdNpcInteraction_PostInteractionText"):toUtf8()
+ local contextualText = i18n.get("uiR2EdNpcInteraction_ContextualText")
+ local preInteractionText = i18n.get("uiR2EdNpcInteraction_PreInteractionText")
+ local postInteractionText = i18n.get("uiR2EdNpcInteraction_PostInteractionText")
local comp = r2.newComponent("NpcInteraction")
assert(comp)
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.bot_chat")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdNpcInteraction")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdNpcInteraction"))
comp.ContextualText = contextualText
comp.PreInteractionText = preInteractionText
@@ -370,33 +370,33 @@ end
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EdNpcInteraction")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "NpcInteraction")
+ logicEntityMenu:addLine(name, "lua", "", "NpcInteraction")
end
function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2Event1Trigger" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ),
+ text=i18n.get( "uiR2Event1Trigger" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()},
- ["has triggered"] = { menu=i18n.get( "uiR2Test0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2Test1Trigger" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )},
+ ["has triggered"] = { menu=i18n.get( "uiR2Test0Trigger" ),
+ text=i18n.get( "uiR2Test1Trigger" )},
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_proximity_dialog.lua b/ryzom/common/data_common/r2/r2_features_proximity_dialog.lua
index f6c115879..6bcae188c 100644
--- a/ryzom/common/data_common/r2/r2_features_proximity_dialog.lua
+++ b/ryzom/common/data_common/r2/r2_features_proximity_dialog.lua
@@ -158,7 +158,7 @@ function onComponentCreated(this)
local y = this.Position.y + 3
local zoneTrigger = r2.Features["ZoneTrigger"].Components.ZoneTrigger.createComponent(x, y)
assert(zoneTrigger)
- zoneTrigger.Name = this.Name.." "..i18n.get("uiR2EdZoneTrigger"):toUtf8()
+ zoneTrigger.Name = this.Name.." "..i18n.get("uiR2EdZoneTrigger")
zoneTrigger.InheritPos = 0
zoneTrigger.Deletable = false
table.insert(this.SubComponents, zoneTrigger)
@@ -175,7 +175,7 @@ component.create = function()
r2.requestNewAction(i18n.get("uiR2EDNewProximityDialogAction"))
local proxDialog = r2.newComponent("ProximityDialog")
assert(proxDialog)
- proxDialog.Name = r2:genInstanceName(i18n.get("uiR2EDProximityDialog")):toUtf8()
+ proxDialog.Name = r2:genInstanceName(i18n.get("uiR2EDProximityDialog"))
proxDialog.Base = r2.Translator.getDebugBase("palette.entities.botobjects.dialog")
proxDialog.Position.x = x
proxDialog.Position.y = y
@@ -249,9 +249,7 @@ end
function component.initLogicEntitiesInstancesMenu(this, subMenu, calledFunction)
local entitiesTable = r2.Scenario:getAllInstancesByType(this.Name)
for key, entity in pairs(entitiesTable) do
- local uc_name = ucstring()
- uc_name:fromUtf8(entity.Name)
- subMenu:addLine(uc_name, "lua", calledFunction.."('".. entity.InstanceId .."')", entity.InstanceId)
+ subMenu:addLine(entity.Name, "lua", calledFunction.."('".. entity.InstanceId .."')", entity.InstanceId)
end
if table.getn(entitiesTable)==0 then
@@ -262,38 +260,38 @@ end
function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["starts dialog"] = { menu=i18n.get( "uiR2AA0ChatSeqStart" ):toUtf8(),
- text=i18n.get( "uiR2AA1ChatSeqStart" ):toUtf8()},
- ["stops dialog"] = { menu=i18n.get( "uiR2AA0ChatSeqStop" ):toUtf8(),
- text=i18n.get( "uiR2AA1ChatSeqStop" ):toUtf8()},
- ["starts chat"] = { menu=i18n.get( "uiR2AA0ChatStepStart" ):toUtf8(),
- text=i18n.get( "uiR2AA1ChatStepStart" ):toUtf8()},
- ["trigger"] = { menu=i18n.get( "uiR2AA0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2AA1Trigger" ):toUtf8()},
+ ["starts dialog"] = { menu=i18n.get( "uiR2AA0ChatSeqStart" ),
+ text=i18n.get( "uiR2AA1ChatSeqStart" )},
+ ["stops dialog"] = { menu=i18n.get( "uiR2AA0ChatSeqStop" ),
+ text=i18n.get( "uiR2AA1ChatSeqStop" )},
+ ["starts chat"] = { menu=i18n.get( "uiR2AA0ChatStepStart" ),
+ text=i18n.get( "uiR2AA1ChatStepStart" )},
+ ["trigger"] = { menu=i18n.get( "uiR2AA0Trigger" ),
+ text=i18n.get( "uiR2AA1Trigger" )},
},
["Events"] = {
- ["start of dialog"] = { menu=i18n.get( "uiR2Event0ChatSeqStart" ):toUtf8(),
- text=i18n.get( "uiR2Event1ChatSeqStart" ):toUtf8()},
- ["end of dialog"] = { menu=i18n.get( "uiR2Event0ChatSeqEnd" ):toUtf8(),
- text=i18n.get( "uiR2Event1ChatSeqEnd" ):toUtf8()},
- ["start of chat"] = { menu=i18n.get( "uiR2Event0ChatStepStart" ):toUtf8(),
- text=i18n.get( "uiR2Event1ChatStepStart" ):toUtf8()},
- ["end of chat"] = { menu=i18n.get( "uiR2Event0ChatStepEnd" ):toUtf8(),
- text=i18n.get( "uiR2Event1ChatStepEnd" ):toUtf8()},
- ["trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2Event1Trigger" ):toUtf8()},
+ ["start of dialog"] = { menu=i18n.get( "uiR2Event0ChatSeqStart" ),
+ text=i18n.get( "uiR2Event1ChatSeqStart" )},
+ ["end of dialog"] = { menu=i18n.get( "uiR2Event0ChatSeqEnd" ),
+ text=i18n.get( "uiR2Event1ChatSeqEnd" )},
+ ["start of chat"] = { menu=i18n.get( "uiR2Event0ChatStepStart" ),
+ text=i18n.get( "uiR2Event1ChatStepStart" )},
+ ["end of chat"] = { menu=i18n.get( "uiR2Event0ChatStepEnd" ),
+ text=i18n.get( "uiR2Event1ChatStepEnd" )},
+ ["trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ),
+ text=i18n.get( "uiR2Event1Trigger" )},
},
["Conditions"] = {
- ["is in dialog"] = { menu=i18n.get( "uiR2Test0ChatSeq" ):toUtf8(),
- text=i18n.get( "uiR2Test1ChatSeq" ):toUtf8()},
- ["is not in dialog"] = { menu=i18n.get( "uiR2Test0ChatNotSeq" ):toUtf8(),
- text=i18n.get( "uiR2Test1ChatNotSeq" ):toUtf8()},
- ["is in chat"] = { menu=i18n.get( "uiR2Test0ChatStep" ):toUtf8(),
- text=i18n.get( "uiR2Test1ChatStep" ):toUtf8()},
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()},
+ ["is in dialog"] = { menu=i18n.get( "uiR2Test0ChatSeq" ),
+ text=i18n.get( "uiR2Test1ChatSeq" )},
+ ["is not in dialog"] = { menu=i18n.get( "uiR2Test0ChatNotSeq" ),
+ text=i18n.get( "uiR2Test1ChatNotSeq" )},
+ ["is in chat"] = { menu=i18n.get( "uiR2Test0ChatStep" ),
+ text=i18n.get( "uiR2Test1ChatStep" )},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )},
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_quest.lua b/ryzom/common/data_common/r2/r2_features_quest.lua
index be10e81f2..e6ce8452e 100644
--- a/ryzom/common/data_common/r2/r2_features_quest.lua
+++ b/ryzom/common/data_common/r2/r2_features_quest.lua
@@ -475,13 +475,13 @@ end
component.createComponent = function(x, y)
- local questCompletedText = i18n.get("uiR2EdQuest_QuestCompletedText"):toUtf8()
+ local questCompletedText = i18n.get("uiR2EdQuest_QuestCompletedText")
local comp = r2.newComponent("Quest")
assert(comp)
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.bot_chat")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdQuest")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdQuest"))
comp.QuestCompletedText = questCompletedText
comp.TaskNumber = 0
@@ -545,36 +545,36 @@ end
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EdQuest")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "Quest")
+ logicEntityMenu:addLine(name, "lua", "", "Quest")
end
function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
- ["validate current task"] = { menu=i18n.get( "uiR2AA0ValidateCurrentTask" ):toUtf8(),
- text=i18n.get( "uiR2AA1ValidateCurrentTask" ):toUtf8()},
- ["complete"] = { menu=i18n.get( "uiR2AA0CompleteQuest" ):toUtf8(),
- text=i18n.get( "uiR2AA1CompleteQuest" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
+ ["validate current task"] = { menu=i18n.get( "uiR2AA0ValidateCurrentTask" ),
+ text=i18n.get( "uiR2AA1ValidateCurrentTask" )},
+ ["complete"] = { menu=i18n.get( "uiR2AA0CompleteQuest" ),
+ text=i18n.get( "uiR2AA1CompleteQuest" )},
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["success"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Event1TaskSuccess" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["success"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ),
+ text=i18n.get( "uiR2Event1TaskSuccess" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()},
- ["is finished"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Test1TaskSuccess" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )},
+ ["is finished"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ),
+ text=i18n.get( "uiR2Test1TaskSuccess" )},
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_random_chest.lua b/ryzom/common/data_common/r2/r2_features_random_chest.lua
index e7aef9918..881c51291 100644
--- a/ryzom/common/data_common/r2/r2_features_random_chest.lua
+++ b/ryzom/common/data_common/r2/r2_features_random_chest.lua
@@ -348,7 +348,7 @@ function component.createComponent(x, y)
assert(comp)
comp.Base = "palette.entities.botobjects.chest_wisdom_std_sel"
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdRandomChest")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdRandomChest"))
comp.Position.x = x
comp.Position.y = y
@@ -443,24 +443,24 @@ function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Spawn" ):toUtf8(),
- text=i18n.get( "uiR2AA1Spawn" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Despawn" ):toUtf8(),
- text=i18n.get( "uiR2AA1Despawn" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Spawn" ),
+ text=i18n.get( "uiR2AA1Spawn" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Despawn" ),
+ text=i18n.get( "uiR2AA1Despawn" )},
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Spawn" ):toUtf8(),
- text=i18n.get( "uiR2Event1Spawn" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Despawn" ):toUtf8(),
- text=i18n.get( "uiR2Event1Despawn" ):toUtf8()},
- ["opened"] = { menu=i18n.get( "uiR2Event0ChestOpened" ):toUtf8(),
- text=i18n.get( "uiR2Event1ChestOpened" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Spawn" ),
+ text=i18n.get( "uiR2Event1Spawn" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Despawn" ),
+ text=i18n.get( "uiR2Event1Despawn" )},
+ ["opened"] = { menu=i18n.get( "uiR2Event0ChestOpened" ),
+ text=i18n.get( "uiR2Event1ChestOpened" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Spawned" ):toUtf8(),
- text=i18n.get( "uiR2Test1Spawned" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Despawned" ):toUtf8(),
- text=i18n.get( "uiR2Test1Despawned" ):toUtf8()}
+ ["is active"] = { menu=i18n.get( "uiR2Test0Spawned" ),
+ text=i18n.get( "uiR2Test1Spawned" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Despawned" ),
+ text=i18n.get( "uiR2Test1Despawned" )}
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_request_item.lua b/ryzom/common/data_common/r2/r2_features_request_item.lua
index bc292785a..efe59b818 100644
--- a/ryzom/common/data_common/r2/r2_features_request_item.lua
+++ b/ryzom/common/data_common/r2/r2_features_request_item.lua
@@ -439,14 +439,14 @@ component.createComponent = function(x, y)
local comp = r2.newComponent("RequestItem")
assert(comp)
- local contextualText = i18n.get("uiR2EdRequestItem_ContextualText"):toUtf8()
- local missionText = i18n.get("uiR2EdRequestItem_MissionText"):toUtf8()
- local waitValidationText = i18n.get("uiR2EdRequestItem_WaitValidationText"):toUtf8()
- local missionSucceededText = i18n.get("uiR2EdRequestItem_MissionSucceededText"):toUtf8()
- local broadcastText = i18n.get("uiR2EdRequestItem_BroadcastText"):toUtf8()
+ local contextualText = i18n.get("uiR2EdRequestItem_ContextualText")
+ local missionText = i18n.get("uiR2EdRequestItem_MissionText")
+ local waitValidationText = i18n.get("uiR2EdRequestItem_WaitValidationText")
+ local missionSucceededText = i18n.get("uiR2EdRequestItem_MissionSucceededText")
+ local broadcastText = i18n.get("uiR2EdRequestItem_BroadcastText")
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.bot_request_item")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EDRequestItem")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EDRequestItem"))
comp.ContextualText = contextualText
comp.MissionText = missionText
@@ -517,36 +517,36 @@ end
--function component:registerMenu(logicEntityMenu)
-- local name = i18n.get("uiR2EDRequestItem")
--- logicEntityMenu:addLine(ucstring(name), "lua", "", "RequestItem")
+-- logicEntityMenu:addLine(name, "lua", "", "RequestItem")
--end
function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["mission asked"] = { menu=i18n.get( "uiR2Event0MissionGiven" ):toUtf8(),
- text=i18n.get( "uiR2Event1MissionGiven" ):toUtf8()},
- ["wait validation"] = { menu=i18n.get( "uiR2Event0TaskWaitValidation" ):toUtf8(),
- text=i18n.get( "uiR2Event1TaskWaitValidation" ):toUtf8()},
- ["succeeded"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Event1TaskSuccess" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["mission asked"] = { menu=i18n.get( "uiR2Event0MissionGiven" ),
+ text=i18n.get( "uiR2Event1MissionGiven" )},
+ ["wait validation"] = { menu=i18n.get( "uiR2Event0TaskWaitValidation" ),
+ text=i18n.get( "uiR2Event1TaskWaitValidation" )},
+ ["succeeded"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ),
+ text=i18n.get( "uiR2Event1TaskSuccess" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()},
- ["is succeeded"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Test1TaskSuccess" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )},
+ ["is succeeded"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ),
+ text=i18n.get( "uiR2Test1TaskSuccess" )},
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_reward_provider.lua b/ryzom/common/data_common/r2/r2_features_reward_provider.lua
index cf2d44b3b..bbd13c86d 100644
--- a/ryzom/common/data_common/r2/r2_features_reward_provider.lua
+++ b/ryzom/common/data_common/r2/r2_features_reward_provider.lua
@@ -306,18 +306,18 @@ end
component.createComponent = function(x, y)
- local contextualText = i18n.get("uiR2EdRewardProvider_ContextualText"):toUtf8()
- local onTargetText = i18n.get("uiR2EdRewardProvider_OnTargetText"):toUtf8()
- local rewardText = i18n.get("uiR2EdRewardProvider_RewardText"):toUtf8()
- local rareRewardText = i18n.get("uiR2EdRewardProvider_RareRewardText"):toUtf8()
- local inventoryFullText = i18n.get("uiR2EdRewardProvider_InventoryFullText"):toUtf8()
- local notEnoughPointsText = i18n.get("uiR2EdRewardProvider_NotEnoughPointsText"):toUtf8()
+ local contextualText = i18n.get("uiR2EdRewardProvider_ContextualText")
+ local onTargetText = i18n.get("uiR2EdRewardProvider_OnTargetText")
+ local rewardText = i18n.get("uiR2EdRewardProvider_RewardText")
+ local rareRewardText = i18n.get("uiR2EdRewardProvider_RareRewardText")
+ local inventoryFullText = i18n.get("uiR2EdRewardProvider_InventoryFullText")
+ local notEnoughPointsText = i18n.get("uiR2EdRewardProvider_NotEnoughPointsText")
local comp = r2.newComponent("RewardProvider")
assert(comp)
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.bot_chat")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EDRewardProvider")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EDRewardProvider"))
comp.ContextualText = contextualText
comp.OnTargetText = onTargetText
@@ -388,30 +388,30 @@ end
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EDRollout_RewardProvider")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "RewardProvider")
+ logicEntityMenu:addLine(name, "lua", "", "RewardProvider")
end
function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["reward given"] = { menu=i18n.get( "uiR2Event0RewardGiven" ):toUtf8(),
- text=i18n.get( "uiR2Event1RewardGiven" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["reward given"] = { menu=i18n.get( "uiR2Event0RewardGiven" ),
+ text=i18n.get( "uiR2Event1RewardGiven" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )},
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_scenery_object_interaction.lua b/ryzom/common/data_common/r2/r2_features_scenery_object_interaction.lua
index 6d2628144..5952d97ab 100644
--- a/ryzom/common/data_common/r2/r2_features_scenery_object_interaction.lua
+++ b/ryzom/common/data_common/r2/r2_features_scenery_object_interaction.lua
@@ -325,13 +325,13 @@ end
component.createComponent = function(x, y)
- local contextualText = i18n.get("uiR2EdSceneryObjectInteraction_ContextualText"):toUtf8()
+ local contextualText = i18n.get("uiR2EdSceneryObjectInteraction_ContextualText")
local comp = r2.newComponent("SceneryObjectInteraction")
assert(comp)
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.bot_chat")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdSceneryObjectInteraction")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdSceneryObjectInteraction"))
comp.ContextualText = contextualText
@@ -395,35 +395,35 @@ end
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EdSceneryObjectInteraction")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "SceneryObjectInteraction")
+ logicEntityMenu:addLine(name, "lua", "", "SceneryObjectInteraction")
end
function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2Event1Trigger" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ),
+ text=i18n.get( "uiR2Event1Trigger" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()},
- ["has triggered"] = { menu=i18n.get( "uiR2Test0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2Test1Trigger" ):toUtf8()},
- ["has not triggered"] = { menu=i18n.get( "uiR2Test0NotTrigger" ):toUtf8(),
- text=i18n.get( "uiR2Test1NotTrigger" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )},
+ ["has triggered"] = { menu=i18n.get( "uiR2Test0Trigger" ),
+ text=i18n.get( "uiR2Test1Trigger" )},
+ ["has not triggered"] = { menu=i18n.get( "uiR2Test0NotTrigger" ),
+ text=i18n.get( "uiR2Test1NotTrigger" )},
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_scenery_object_interaction_task.lua b/ryzom/common/data_common/r2/r2_features_scenery_object_interaction_task.lua
index d830378fa..7a17bee04 100644
--- a/ryzom/common/data_common/r2/r2_features_scenery_object_interaction_task.lua
+++ b/ryzom/common/data_common/r2/r2_features_scenery_object_interaction_task.lua
@@ -453,18 +453,18 @@ end
component.createComponent = function(x, y)
- local contextualText = i18n.get("uiR2EdSceneryObjectInteractionTaskStep_ContextualText"):toUtf8()
- local missionText = i18n.get("uiR2EdSceneryObjectInteractionTaskStep_MissionText"):toUtf8()
- local notValidatedText = i18n.get("uiR2EdSceneryObjectInteractionTaskStep_NotValidatedText"):toUtf8()
- local broadcastText = i18n.get("uiR2EdSceneryObjectInteractionTaskStep_BroadcastText"):toUtf8()
- local missionSucceedText = i18n.get("uiR2EdSceneryObjectInteractionTaskStep_MissionSucceedTextText"):toUtf8()
+ local contextualText = i18n.get("uiR2EdSceneryObjectInteractionTaskStep_ContextualText")
+ local missionText = i18n.get("uiR2EdSceneryObjectInteractionTaskStep_MissionText")
+ local notValidatedText = i18n.get("uiR2EdSceneryObjectInteractionTaskStep_NotValidatedText")
+ local broadcastText = i18n.get("uiR2EdSceneryObjectInteractionTaskStep_BroadcastText")
+ local missionSucceedText = i18n.get("uiR2EdSceneryObjectInteractionTaskStep_MissionSucceedTextText")
local comp = r2.newComponent("SceneryObjectInteractionTaskStep")
assert(comp)
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.bot_chat")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdSceneryObjectInteractionTaskStep")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdSceneryObjectInteractionTaskStep"))
comp.ContextualText = contextualText
comp.MissionText = missionText
@@ -506,35 +506,35 @@ end
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EdSceneryObjectInteractionTaskStep")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "SceneryObjectInteractionTaskStep")
+ logicEntityMenu:addLine(name, "lua", "", "SceneryObjectInteractionTaskStep")
end
function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["succeeded"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Event1TaskSuccess" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["succeeded"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ),
+ text=i18n.get( "uiR2Event1TaskSuccess" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()},
- ["is succeeded"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Test1TaskSuccess" ):toUtf8()},
- ["in progress"] = { menu=i18n.get( "uiR2Test0InProgress" ):toUtf8(),
- text=i18n.get( "uiR2Test1InProgress" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )},
+ ["is succeeded"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ),
+ text=i18n.get( "uiR2Test1TaskSuccess" )},
+ ["in progress"] = { menu=i18n.get( "uiR2Test0InProgress" ),
+ text=i18n.get( "uiR2Test1InProgress" )},
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_scenery_object_remover.lua b/ryzom/common/data_common/r2/r2_features_scenery_object_remover.lua
index 64a899a47..c2b7ebf3b 100644
--- a/ryzom/common/data_common/r2/r2_features_scenery_object_remover.lua
+++ b/ryzom/common/data_common/r2/r2_features_scenery_object_remover.lua
@@ -344,7 +344,7 @@ component.createComponent = function(x, y, tvalue)
assert(comp)
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.user_event")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EDRollout_SceneryObjectRemover")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EDRollout_SceneryObjectRemover"))
comp.Position.x = x
comp.Position.y = y
@@ -412,33 +412,33 @@ end
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EDRollout_SceneryObjectRemover")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "SceneryObject")
+ logicEntityMenu:addLine(name, "lua", "", "SceneryObject")
end
function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
- ["remove objects"] = { menu=i18n.get( "uiR2AA0RemoveObject" ):toUtf8(),
- text=i18n.get( "uiR2AA1RemoveObject" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
+ ["remove objects"] = { menu=i18n.get( "uiR2AA0RemoveObject" ),
+ text=i18n.get( "uiR2AA1RemoveObject" )},
},
["Events"] = {
- ["removed objects"] = { menu=i18n.get( "uiR2Event0RemovedObjects" ):toUtf8(),
- text=i18n.get( "uiR2Event1RemovedObjects" ):toUtf8()},
+ ["removed objects"] = { menu=i18n.get( "uiR2Event0RemovedObjects" ),
+ text=i18n.get( "uiR2Event1RemovedObjects" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()},
- ["has removed objects"] = { menu=i18n.get( "uiR2Test0HasRemoved" ):toUtf8(),
- text=i18n.get( "uiR2Test1HasRemoved" ):toUtf8()},
- ["has not removed objects"] = { menu=i18n.get( "uiR2Test0HasNotRemoved" ):toUtf8(),
- text=i18n.get( "uiR2Test1HasNotRemoved" ):toUtf8()}
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )},
+ ["has removed objects"] = { menu=i18n.get( "uiR2Test0HasRemoved" ),
+ text=i18n.get( "uiR2Test1HasRemoved" )},
+ ["has not removed objects"] = { menu=i18n.get( "uiR2Test0HasNotRemoved" ),
+ text=i18n.get( "uiR2Test1HasNotRemoved" )}
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_talk_to.lua b/ryzom/common/data_common/r2/r2_features_talk_to.lua
index ebcede5bc..c1630800b 100644
--- a/ryzom/common/data_common/r2/r2_features_talk_to.lua
+++ b/ryzom/common/data_common/r2/r2_features_talk_to.lua
@@ -407,17 +407,17 @@ end
component.createComponent = function(x, y)
- local contextualText = i18n.get("uiR2EdTalkTo_ContextualText"):toUtf8()
- local missionText = i18n.get("uiR2EdTalkTo_MissionText"):toUtf8()
- local waitValidationText = i18n.get("uiR2EdTalkTo_WaitValidationText"):toUtf8()
- local missionSucceededText = i18n.get("uiR2EdTalkTo_MissionSucceededText"):toUtf8()
- local broadcastText = i18n.get("uiR2EdTalkTo_BroadcastText"):toUtf8()
+ local contextualText = i18n.get("uiR2EdTalkTo_ContextualText")
+ local missionText = i18n.get("uiR2EdTalkTo_MissionText")
+ local waitValidationText = i18n.get("uiR2EdTalkTo_WaitValidationText")
+ local missionSucceededText = i18n.get("uiR2EdTalkTo_MissionSucceededText")
+ local broadcastText = i18n.get("uiR2EdTalkTo_BroadcastText")
local comp = r2.newComponent("TalkTo")
assert(comp)
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.bot_chat")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdTalkTo")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdTalkTo"))
comp.ContextualText = contextualText
comp.MissionText = missionText
@@ -485,36 +485,36 @@ end
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EdTalkTo")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "TalkTo")
+ logicEntityMenu:addLine(name, "lua", "", "TalkTo")
end
function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["mission asked"] = { menu=i18n.get( "uiR2Event0MissionGiven" ):toUtf8(),
- text=i18n.get( "uiR2Event1MissionGiven" ):toUtf8()},
- ["wait validation"] = { menu=i18n.get( "uiR2Event0TaskWaitValidation" ):toUtf8(),
- text=i18n.get( "uiR2Event1TaskWaitValidation" ):toUtf8()},
- ["succeeded"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Event1TaskSuccess" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["mission asked"] = { menu=i18n.get( "uiR2Event0MissionGiven" ),
+ text=i18n.get( "uiR2Event1MissionGiven" )},
+ ["wait validation"] = { menu=i18n.get( "uiR2Event0TaskWaitValidation" ),
+ text=i18n.get( "uiR2Event1TaskWaitValidation" )},
+ ["succeeded"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ),
+ text=i18n.get( "uiR2Event1TaskSuccess" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()},
- ["is succeeded"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Test1TaskSuccess" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )},
+ ["is succeeded"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ),
+ text=i18n.get( "uiR2Test1TaskSuccess" )},
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_target_mob.lua b/ryzom/common/data_common/r2/r2_features_target_mob.lua
index 31d783e3a..911c7e218 100644
--- a/ryzom/common/data_common/r2/r2_features_target_mob.lua
+++ b/ryzom/common/data_common/r2/r2_features_target_mob.lua
@@ -314,17 +314,17 @@ end
component.createComponent = function(x, y)
- local contextualText = i18n.get("uiR2EdTargetMob_ContextualText"):toUtf8()
- local missionText = i18n.get("uiR2EdTargetMob_MissionText"):toUtf8()
- local waitValidationText = i18n.get("uiR2EdTargetMob_WaitValidationText"):toUtf8()
- local missionSucceededText = i18n.get("uiR2EdTargetMob_MissionSucceededText"):toUtf8()
- local broadcastText = i18n.get("uiR2EdTargetMob_BroadcastText"):toUtf8()
+ local contextualText = i18n.get("uiR2EdTargetMob_ContextualText")
+ local missionText = i18n.get("uiR2EdTargetMob_MissionText")
+ local waitValidationText = i18n.get("uiR2EdTargetMob_WaitValidationText")
+ local missionSucceededText = i18n.get("uiR2EdTargetMob_MissionSucceededText")
+ local broadcastText = i18n.get("uiR2EdTargetMob_BroadcastText")
local comp = r2.newComponent("TargetMob")
assert(comp)
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.bot_chat")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdTargetMob")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdTargetMob"))
comp.ContextualText = contextualText
comp.MissionText = missionText
@@ -392,36 +392,36 @@ end
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EdTargetMob")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "TargetMob")
+ logicEntityMenu:addLine(name, "lua", "", "TargetMob")
end
function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["mission asked"] = { menu=i18n.get( "uiR2Event0MissionGiven" ):toUtf8(),
- text=i18n.get( "uiR2Event1MissionGiven" ):toUtf8()},
- ["wait validation"] = { menu=i18n.get( "uiR2Event0TaskWaitValidation" ):toUtf8(),
- text=i18n.get( "uiR2Event1TaskWaitValidation" ):toUtf8()},
- ["succeeded"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Event1TaskSuccess" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["mission asked"] = { menu=i18n.get( "uiR2Event0MissionGiven" ),
+ text=i18n.get( "uiR2Event1MissionGiven" )},
+ ["wait validation"] = { menu=i18n.get( "uiR2Event0TaskWaitValidation" ),
+ text=i18n.get( "uiR2Event1TaskWaitValidation" )},
+ ["succeeded"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ),
+ text=i18n.get( "uiR2Event1TaskSuccess" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()},
- ["is succeeded"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Test1TaskSuccess" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )},
+ ["is succeeded"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ),
+ text=i18n.get( "uiR2Test1TaskSuccess" )},
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_time_trigger.lua b/ryzom/common/data_common/r2/r2_features_time_trigger.lua
index bf31226ca..5110072f1 100644
--- a/ryzom/common/data_common/r2/r2_features_time_trigger.lua
+++ b/ryzom/common/data_common/r2/r2_features_time_trigger.lua
@@ -249,7 +249,7 @@ feature.createComponent = function(x, y, hours, minutes, cyclic)
assert(comp)
comp.Base = "palette.entities.botobjects.time_trigger"
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdNameTimeTriggerFeature")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdNameTimeTriggerFeature"))
comp.Position.x = x
comp.Position.y = y
@@ -406,26 +406,26 @@ function component:getLogicTranslations()
-- register trad
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
- ["trigger"] = { menu=i18n.get( "uiR2AA0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2AA1Trigger" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
+ ["trigger"] = { menu=i18n.get( "uiR2AA0Trigger" ),
+ text=i18n.get( "uiR2AA1Trigger" )},
},
["Events"] = {
- ["On Activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["On Desactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["On Trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2Event1Trigger" ):toUtf8()},
+ ["On Activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["On Desactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["On Trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ),
+ text=i18n.get( "uiR2Event1Trigger" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is finished"] = { menu=i18n.get( "uiR2Test0TimerFinished" ):toUtf8(),
- text=i18n.get( "uiR2Test1TimerFinished" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is finished"] = { menu=i18n.get( "uiR2Test0TimerFinished" ),
+ text=i18n.get( "uiR2Test1TimerFinished" )},
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_timed_spawn.lua b/ryzom/common/data_common/r2/r2_features_timed_spawn.lua
index 0e9372b17..86a75e873 100644
--- a/ryzom/common/data_common/r2/r2_features_timed_spawn.lua
+++ b/ryzom/common/data_common/r2/r2_features_timed_spawn.lua
@@ -303,7 +303,7 @@ component.createGhostComponents= function(this, act)
local timer = r2.newComponent("Timer")
assert(timer)
- timer.Name = r2:genInstanceName(i18n.get("uiR2EdTimer")):toUtf8()
+ timer.Name = r2:genInstanceName(i18n.get("uiR2EdTimer"))
timer.InheritPos = 0
timer.Position.x = comp.Position.x
timer.Position.y = comp.Position.y
@@ -384,7 +384,7 @@ component.createComponent = function(x, y)
assert(comp.Position)
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.user_event")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdTimedSpawner")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdTimedSpawner"))
comp.Position.x = x
comp.Position.y = y
comp.Position.z = r2:snapZToGround(x, y)
@@ -422,26 +422,26 @@ function component:getLogicTranslations()
-- register trad
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
- ["trigger"] = { menu=i18n.get( "uiR2AA0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2AA1Trigger" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
+ ["trigger"] = { menu=i18n.get( "uiR2AA0Trigger" ),
+ text=i18n.get( "uiR2AA1Trigger" )},
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2Event1Trigger" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ),
+ text=i18n.get( "uiR2Event1Trigger" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()}
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )}
}
}
diff --git a/ryzom/common/data_common/r2/r2_features_timer.lua b/ryzom/common/data_common/r2/r2_features_timer.lua
index 82b87d3f5..00157baec 100644
--- a/ryzom/common/data_common/r2/r2_features_timer.lua
+++ b/ryzom/common/data_common/r2/r2_features_timer.lua
@@ -365,7 +365,7 @@ component.createComponent = function(x, y, secondes, minutes, cyclic)
assert(comp)
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.timer")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdNameTimerFeature")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdNameTimerFeature"))
comp.Position.x = x
comp.Position.y = y
@@ -455,52 +455,52 @@ function component:getLogicTranslations()
-- register trad
local logicTranslations = {
["ApplicableActions"] = {
- ["Activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["Deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
- ["Trigger"] = { menu=i18n.get( "uiR2AA0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2AA1Trigger" ):toUtf8()},
- ["Pause"] = { menu=i18n.get( "uiR2AA0TimerPause" ):toUtf8(),
- text=i18n.get( "uiR2AA1TimerPause" ):toUtf8()},
- ["Resume"] = { menu=i18n.get( "uiR2AA0TimerResume" ):toUtf8(),
- text=i18n.get( "uiR2AA1TimerResume" ):toUtf8()},
- ["Add 10 Seconds"] = { menu=i18n.get( "uiR2AA0TimerAdd10s" ):toUtf8(),
- text=i18n.get( "uiR2AA1TimerAdds10s" ):toUtf8()},
- ["Add 1 minute"] = { menu=i18n.get( "uiR2AA0TimerAdd1m" ):toUtf8(),
- text=i18n.get( "uiR2AA1TimerAdds1m" ):toUtf8()},
- ["Sub 10 seconds"] = { menu=i18n.get( "uiR2AA0TimerSub10s" ):toUtf8(),
- text=i18n.get( "uiR2AA1TimerSubs10s" ):toUtf8()},
- ["Sub 1 minute"] = { menu=i18n.get( "uiR2AA0TimerSub1m" ):toUtf8(),
- text=i18n.get( "uiR2AA1TimerSubs1m" ):toUtf8()},
- ["add seconds"] = { menu=i18n.get( "uiR2AA0TimerAddNSeconds" ):toUtf8(),
- text=i18n.get( "uiR2AA1TimerAddNSeconds" ):toUtf8()},
- ["sub seconds"] = { menu=i18n.get( "uiR2AA0TimerSubNSeconds" ):toUtf8(),
- text=i18n.get( "uiR2AA1TimerSubNSeconds" ):toUtf8()},
+ ["Activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["Deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
+ ["Trigger"] = { menu=i18n.get( "uiR2AA0Trigger" ),
+ text=i18n.get( "uiR2AA1Trigger" )},
+ ["Pause"] = { menu=i18n.get( "uiR2AA0TimerPause" ),
+ text=i18n.get( "uiR2AA1TimerPause" )},
+ ["Resume"] = { menu=i18n.get( "uiR2AA0TimerResume" ),
+ text=i18n.get( "uiR2AA1TimerResume" )},
+ ["Add 10 Seconds"] = { menu=i18n.get( "uiR2AA0TimerAdd10s" ),
+ text=i18n.get( "uiR2AA1TimerAdds10s" )},
+ ["Add 1 minute"] = { menu=i18n.get( "uiR2AA0TimerAdd1m" ),
+ text=i18n.get( "uiR2AA1TimerAdds1m" )},
+ ["Sub 10 seconds"] = { menu=i18n.get( "uiR2AA0TimerSub10s" ),
+ text=i18n.get( "uiR2AA1TimerSubs10s" )},
+ ["Sub 1 minute"] = { menu=i18n.get( "uiR2AA0TimerSub1m" ),
+ text=i18n.get( "uiR2AA1TimerSubs1m" )},
+ ["add seconds"] = { menu=i18n.get( "uiR2AA0TimerAddNSeconds" ),
+ text=i18n.get( "uiR2AA1TimerAddNSeconds" )},
+ ["sub seconds"] = { menu=i18n.get( "uiR2AA0TimerSubNSeconds" ),
+ text=i18n.get( "uiR2AA1TimerSubNSeconds" )},
},
["Events"] = {
- ["On Activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["On Desactivation"]= { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["On Trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2Event1Trigger" ):toUtf8()},
- ["On Pause"] = { menu=i18n.get( "uiR2Event0TimerPause" ):toUtf8(),
- text=i18n.get( "uiR2Event1TimerPause" ):toUtf8()},
- ["On Resume"] = { menu=i18n.get( "uiR2Event0TimerResume" ):toUtf8(),
- text=i18n.get( "uiR2Event1TimerResume" ):toUtf8()},
+ ["On Activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["On Desactivation"]= { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["On Trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ),
+ text=i18n.get( "uiR2Event1Trigger" )},
+ ["On Pause"] = { menu=i18n.get( "uiR2Event0TimerPause" ),
+ text=i18n.get( "uiR2Event1TimerPause" )},
+ ["On Resume"] = { menu=i18n.get( "uiR2Event0TimerResume" ),
+ text=i18n.get( "uiR2Event1TimerResume" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()},
- ["is paused"] = { menu=i18n.get( "uiR2Test0TimerPaused" ):toUtf8(),
- text=i18n.get( "uiR2Test1TimerPaused" ):toUtf8()},
- ["is running"] = { menu=i18n.get( "uiR2Test0TimerRunning" ):toUtf8(),
- text=i18n.get( "uiR2Test1TimerRunning" ):toUtf8()},
- ["is finished"] = { menu=i18n.get( "uiR2Test0TimerFinished" ):toUtf8(),
- text=i18n.get( "uiR2Test1TimerFinished" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )},
+ ["is paused"] = { menu=i18n.get( "uiR2Test0TimerPaused" ),
+ text=i18n.get( "uiR2Test1TimerPaused" )},
+ ["is running"] = { menu=i18n.get( "uiR2Test0TimerRunning" ),
+ text=i18n.get( "uiR2Test1TimerRunning" )},
+ ["is finished"] = { menu=i18n.get( "uiR2Test0TimerFinished" ),
+ text=i18n.get( "uiR2Test1TimerFinished" )},
}
}
return logicTranslations
@@ -521,10 +521,8 @@ function component.initEventValuesMenu(this, menu, categoryEvent)
local subMenu = menu:getSubMenu(ev)
local func = ""
-- for i=0, 9 do
- -- local uc_name = ucstring()
- -- uc_name:fromUtf8( tostring(i) )
-- func = "r2.events:setEventValue('','" .. categoryEvent .."','".. tostring(i).."')"
- -- subMenu:addLine(uc_name, "lua", func, tostring(i))
+ -- subMenu:addLine(tostring(i), "lua", func, tostring(i))
-- end
--endTime = nltime.getPreciseLocalTime()
@@ -534,7 +532,7 @@ function component.initEventValuesMenu(this, menu, categoryEvent)
local lineNb = 0
for i=0, 50, 10 do
local lineStr = tostring(i).."/"..tostring(i+9)
- subMenu:addLine(ucstring(lineStr), "", "", tostring(i))
+ subMenu:addLine(lineStr, "", "", tostring(i))
--endTime = nltime.getPreciseLocalTime()
--debugInfo(string.format("time for 12 is %f", endTime - startTime))
@@ -545,7 +543,7 @@ function component.initEventValuesMenu(this, menu, categoryEvent)
for s=0,9 do
lineStr = tostring(i+s)
local func = "r2.events:setEventValue('','" .. categoryEvent .."','".. lineStr.."')"
- subMenu2:addLine(ucstring(lineStr), "lua", func, lineStr)
+ subMenu2:addLine(lineStr, "lua", func, lineStr)
end
lineNb = lineNb+1
@@ -556,7 +554,7 @@ function component.initEventValuesMenu(this, menu, categoryEvent)
for i=0, 50, 10 do
local lineStr = tostring(i).." m /"..tostring(i+9).." m"
- subMenu:addLine(ucstring(lineStr), "", "", tostring(i))
+ subMenu:addLine(lineStr, "", "", tostring(i))
subMenu:addSubMenu(lineNb)
local subMenu2= subMenu:getSubMenu(lineNb)
@@ -569,14 +567,14 @@ function component.initEventValuesMenu(this, menu, categoryEvent)
for m=0,9 do
lineStr = tostring( (i+m)*60)
-- local func = "r2.events:setEventValue('','" .. categoryEvent .."','".. lineStr.."')"
- subMenu2:addLine(ucstring(tostring(i+m) .. "m"), "", "", lineStr)
+ subMenu2:addLine(tostring(i+m) .. "m", "", "", lineStr)
subMenu2:addSubMenu(index)
local subMenu3= subMenu2:getSubMenu(index)
index = index + 1
for s=0, 55, 5 do
lineStr = tostring( (i+m)*60 + s)
local func = "r2.events:setEventValue('','" .. categoryEvent .."','".. lineStr.."')"
- subMenu3:addLine(ucstring(tostring(i+m) .. "m ".. s .. "s"), "lua", func, lineStr)
+ subMenu3:addLine(tostring(i+m) .. "m ".. s .. "s", "lua", func, lineStr)
end
end
lineNb = lineNb+1
diff --git a/ryzom/common/data_common/r2/r2_features_user_item.lua b/ryzom/common/data_common/r2/r2_features_user_item.lua
index fd70d75cb..69b7b5dc6 100644
--- a/ryzom/common/data_common/r2/r2_features_user_item.lua
+++ b/ryzom/common/data_common/r2/r2_features_user_item.lua
@@ -140,7 +140,7 @@ component.createComponent = function(x, y)
assert(comp)
comp.Base = "palette.entities.botobjects.milestone"
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdUserItemFeature")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdUserItemFeature"))
comp.Position.x = x
comp.Position.y = y
@@ -191,7 +191,7 @@ end
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EdUserItemFeature")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "UserItemFeature")
+ logicEntityMenu:addLine(name, "lua", "", "UserItemFeature")
end
function component:getLogicEntityAttributes()
diff --git a/ryzom/common/data_common/r2/r2_features_user_trigger.lua b/ryzom/common/data_common/r2/r2_features_user_trigger.lua
index bbd1b24c9..503f3ffc2 100644
--- a/ryzom/common/data_common/r2/r2_features_user_trigger.lua
+++ b/ryzom/common/data_common/r2/r2_features_user_trigger.lua
@@ -222,7 +222,7 @@ function component.createComponent(x, y)
assert(comp)
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.user_event")
- comp.Name = r2:genInstanceName(i18n.get("uiR2ED" .. component.Name)):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2ED" .. component.Name))
comp.Position.x = x
comp.Position.y = y
@@ -315,12 +315,12 @@ function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["trigger"] = { menu=i18n.get( "uiR2AA0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2AA1Trigger" ):toUtf8()},
+ ["trigger"] = { menu=i18n.get( "uiR2AA0Trigger" ),
+ text=i18n.get( "uiR2AA1Trigger" )},
},
["Events"] = {
- ["triggered"] = { menu=i18n.get( "uiR2Event0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2Event1Trigger" ):toUtf8()},
+ ["triggered"] = { menu=i18n.get( "uiR2Event0Trigger" ),
+ text=i18n.get( "uiR2Event1Trigger" )},
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_visit_zone.lua b/ryzom/common/data_common/r2/r2_features_visit_zone.lua
index f7d5a19a2..6b290ff56 100644
--- a/ryzom/common/data_common/r2/r2_features_visit_zone.lua
+++ b/ryzom/common/data_common/r2/r2_features_visit_zone.lua
@@ -372,17 +372,17 @@ end
component.createComponent = function(x, y)
- local contextualText = i18n.get("uiR2EdVisitZone_ContextualText"):toUtf8()
- local missionText = i18n.get("uiR2EdVisitZone_MissionText"):toUtf8()
- local waitValidationText = i18n.get("uiR2EdVisitZone_WaitValidationText"):toUtf8()
- local missionSucceededText = i18n.get("uiR2EdVisitZone_MissionSucceededText"):toUtf8()
- local broadcastText = i18n.get("uiR2EdVisitZone_BroadcastText"):toUtf8()
+ local contextualText = i18n.get("uiR2EdVisitZone_ContextualText")
+ local missionText = i18n.get("uiR2EdVisitZone_MissionText")
+ local waitValidationText = i18n.get("uiR2EdVisitZone_WaitValidationText")
+ local missionSucceededText = i18n.get("uiR2EdVisitZone_MissionSucceededText")
+ local broadcastText = i18n.get("uiR2EdVisitZone_BroadcastText")
local comp = r2.newComponent("VisitZone")
assert(comp)
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.bot_chat")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EdVisitZone")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EdVisitZone"))
comp.ContextualText = contextualText
comp.MissionText = missionText
@@ -395,7 +395,7 @@ component.createComponent = function(x, y)
comp.Position.z = r2:snapZToGround(x, y)
local zoneTrigger = r2.Features["ZoneTrigger"].Components.ZoneTrigger.createComponent(x + 3, y + 3)
- zoneTrigger.Name = comp.Name.." "..i18n.get("uiR2EdZoneTrigger"):toUtf8() --r2:genInstanceName(i18n.get("uiR2EdZoneTrigger")):toUtf8()
+ zoneTrigger.Name = comp.Name.." "..i18n.get("uiR2EdZoneTrigger") --r2:genInstanceName(i18n.get("uiR2EdZoneTrigger"))
zoneTrigger.InheritPos = 0
zoneTrigger.Deletable = false
table.insert(comp.Components, zoneTrigger)
@@ -456,38 +456,38 @@ end
function component:registerMenu(logicEntityMenu)
local name = i18n.get("uiR2EdVisitZone")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "VisitZone")
+ logicEntityMenu:addLine(name, "lua", "", "VisitZone")
end
function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
- ["succeed"] = { menu=i18n.get( "uiR2AA0SucceedTask" ):toUtf8(),
- text=i18n.get( "uiR2AA1SucceedTask" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
+ ["succeed"] = { menu=i18n.get( "uiR2AA0SucceedTask" ),
+ text=i18n.get( "uiR2AA1SucceedTask" )},
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["mission asked"] = { menu=i18n.get( "uiR2Event0MissionGiven" ):toUtf8(),
- text=i18n.get( "uiR2Event1MissionGiven" ):toUtf8()},
- ["wait validation"] = { menu=i18n.get( "uiR2Event0TaskWaitValidation" ):toUtf8(),
- text=i18n.get( "uiR2Event1TaskWaitValidation" ):toUtf8()},
- ["succeeded"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Event1TaskSuccess" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["mission asked"] = { menu=i18n.get( "uiR2Event0MissionGiven" ),
+ text=i18n.get( "uiR2Event1MissionGiven" )},
+ ["wait validation"] = { menu=i18n.get( "uiR2Event0TaskWaitValidation" ),
+ text=i18n.get( "uiR2Event1TaskWaitValidation" )},
+ ["succeeded"] = { menu=i18n.get( "uiR2Event0TaskSuccess" ),
+ text=i18n.get( "uiR2Event1TaskSuccess" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()},
- ["is succeeded"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ):toUtf8(),
- text=i18n.get( "uiR2Test1TaskSuccess" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )},
+ ["is succeeded"] = { menu=i18n.get( "uiR2Test0TaskSuccess" ),
+ text=i18n.get( "uiR2Test1TaskSuccess" )},
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_features_zone_triggers.lua b/ryzom/common/data_common/r2/r2_features_zone_triggers.lua
index cdf83235d..0e467a1f1 100644
--- a/ryzom/common/data_common/r2/r2_features_zone_triggers.lua
+++ b/ryzom/common/data_common/r2/r2_features_zone_triggers.lua
@@ -260,7 +260,7 @@ component.createComponent = function(x, y)
assert(comp.Position)
comp.Base = r2.Translator.getDebugBase("palette.entities.botobjects.trigger_zone")
- comp.Name = r2:genInstanceName(i18n.get("uiR2EDRollout_ZoneTrigger")):toUtf8()
+ comp.Name = r2:genInstanceName(i18n.get("uiR2EDRollout_ZoneTrigger"))
comp.Position.x = x
comp.Position.y = y
@@ -273,7 +273,7 @@ component.createComponent = function(x, y)
zone.Position.y = 0 -- comp.Position.y
zone.Position.z = 0 -- comp.Position.z
zone.InheritPos = 1 -- don't inherit position of parents
- zone.Name = r2:genInstanceName(i18n.get("uiR2EDPlaces")):toUtf8()
+ zone.Name = r2:genInstanceName(i18n.get("uiR2EDPlaces"))
comp._Zone = zone.InstanceId
table.insert(comp.Components, zone)
@@ -361,34 +361,34 @@ function component:getLogicTranslations()
-- register trad
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
- ["simulate on enter"] = { menu=i18n.get( "uiR2AA0ZoneTriggerSimEnter" ):toUtf8(),
- text=i18n.get( "uiR2AA1ZoneTriggerSimEnter" ):toUtf8()},
- ["simulate on leave"] = { menu=i18n.get( "uiR2AA0ZoneTriggerSimExit" ):toUtf8(),
- text=i18n.get( "uiR2AA1ZoneTriggerSimExit" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
+ ["simulate on enter"] = { menu=i18n.get( "uiR2AA0ZoneTriggerSimEnter" ),
+ text=i18n.get( "uiR2AA1ZoneTriggerSimEnter" )},
+ ["simulate on leave"] = { menu=i18n.get( "uiR2AA0ZoneTriggerSimExit" ),
+ text=i18n.get( "uiR2AA1ZoneTriggerSimExit" )},
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["On Player Arrived"] = { menu=i18n.get( "uiR2Event0ZoneTriggerEntry" ):toUtf8(),
- text=i18n.get( "uiR2Event1ZoneTriggerEntry" ):toUtf8()},
- ["On Player Left"] = { menu=i18n.get( "uiR2Event0ZoneTriggerExit" ):toUtf8(),
- text=i18n.get( "uiR2Event1ZoneTriggerExit" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["On Player Arrived"] = { menu=i18n.get( "uiR2Event0ZoneTriggerEntry" ),
+ text=i18n.get( "uiR2Event1ZoneTriggerEntry" )},
+ ["On Player Left"] = { menu=i18n.get( "uiR2Event0ZoneTriggerExit" ),
+ text=i18n.get( "uiR2Event1ZoneTriggerExit" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()},
- ["is empty"] = { menu=i18n.get( "uiR2Test0ZoneTriggerEmpty" ):toUtf8(),
- text=i18n.get( "uiR2Test1ZoneTriggerEmpty" ):toUtf8()},
- ["is full"] = { menu=i18n.get( "uiR2Test0ZoneTriggerFull" ):toUtf8(),
- text=i18n.get( "uiR2Test1ZoneTriggerFull" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )},
+ ["is empty"] = { menu=i18n.get( "uiR2Test0ZoneTriggerEmpty" ),
+ text=i18n.get( "uiR2Test1ZoneTriggerEmpty" )},
+ ["is full"] = { menu=i18n.get( "uiR2Test0ZoneTriggerFull" ),
+ text=i18n.get( "uiR2Test1ZoneTriggerFull" )},
}
diff --git a/ryzom/common/data_common/r2/r2_logic.lua b/ryzom/common/data_common/r2/r2_logic.lua
index 9d0f67a16..d8b26cec7 100644
--- a/ryzom/common/data_common/r2/r2_logic.lua
+++ b/ryzom/common/data_common/r2/r2_logic.lua
@@ -61,7 +61,7 @@ Logic.Components.LogicEntityAction =
local coloredName = (logicEntity.InstanceId == r2.events.filteredLogicEntityId)
- local eventType = r2.events.keyWordsColor .. i18n.get("uiR2EdEventTxtPreEvent"):toUtf8() .. " "
+ local eventType = r2.events.keyWordsColor .. i18n.get("uiR2EdEventTxtPreEvent") .. " "
if coloredName then
eventType = eventType .. r2.events.filterWordColor
@@ -106,7 +106,7 @@ Logic.Components.LogicEntityAction =
if conditionInst.Entity~="" and conditionInst.Condition.Type~="" then
conditionsList = conditionsList .. "\n" .. r2.events.keyWordsColor
- ..string.upper(i18n.get("uiR2EdEventTxtPreCondition"):toUtf8()).." "
+ ..string.upper(i18n.get("uiR2EdEventTxtPreCondition")).." "
.. r2.events.communWordsColor
local conditionLogicEntity = r2:getInstanceFromId(tostring(conditionInst.Entity))
@@ -141,7 +141,7 @@ Logic.Components.LogicEntityAction =
if actionInst.Entity~="" and actionInst.Action.Type~="" then
actionsList = actionsList .. "\n" .. r2.events.keyWordsColor
- ..string.upper(i18n.get("uiR2EdEventTxtPreActions"):toUtf8()).." "
+ ..string.upper(i18n.get("uiR2EdEventTxtPreActions")).." "
.. r2.events.communWordsColor
local actionLogicEntity = r2:getInstanceFromId(tostring(actionInst.Entity))
@@ -511,10 +511,10 @@ Logic.Components.ChatStep = {
local minNb, secNb = r2.dialogs:calculMinSec(this.Time)
local time = ""
if minNb ~= 0 then
- time = tostring(minNb)..i18n.get("uiR2EdShortMinutes"):toUtf8()
+ time = tostring(minNb)..i18n.get("uiR2EdShortMinutes")
end
- time = time.." " ..tostring(secNb)..i18n.get("uiR2EdShortSeconds"):toUtf8()
- local afterTime = "(" ..i18n.get("uiR2EdAfter"):toUtf8().." ".. time..") "
+ time = time.." " ..tostring(secNb)..i18n.get("uiR2EdShortSeconds")
+ local afterTime = "(" ..i18n.get("uiR2EdAfter").." ".. time..") "
-- says
local whoToWho = ""
@@ -533,7 +533,7 @@ Logic.Components.ChatStep = {
local facing = action.Facing
if facing~="" then
- whoToWho = whoToWho ..i18n.get("uiR2EdSaysTo"):toUtf8().. " " .. r2:getInstanceFromId(facing).Name .. " "
+ whoToWho = whoToWho ..i18n.get("uiR2EdSaysTo").. " " .. r2:getInstanceFromId(facing).Name .. " "
end
local emote = action.Emote
@@ -557,22 +557,22 @@ Logic.Components.ChatStep = {
if who then
saysWhat = who.Name
elseif action.WhoNoEntity=="_System" then
- saysWhat = i18n.get("uiR2EdSystem"):toUtf8()
+ saysWhat = i18n.get("uiR2EdSystem")
elseif action.WhoNoEntity=="_DM" then
- saysWhat = i18n.get("uiR2EdDonjonMaster"):toUtf8()
+ saysWhat = i18n.get("uiR2EdDonjonMaster")
end
- saysWhat = saysWhat .. " " ..i18n.get("uiR2EdSays"):toUtf8().. " "
+ saysWhat = saysWhat .. " " ..i18n.get("uiR2EdSays").. " "
local says = action.Says
if says ~= "" then
local inst=r2:getInstanceFromId(says)
if inst then
says = inst.Text
- local uc_says = ucstring()
- uc_says:fromUtf8(says)
- uc_says = uc_says:substr(0, 4)
- says = uc_says:toUtf8()
+ --local uc_says = ucstring() ???
+ --uc_says:fromUtf8(says)
+ --uc_says = uc_says:substr(0, 4) ???
+ --says = uc_says
end
end
@@ -688,7 +688,7 @@ Logic.Components.ChatSequence = {
local index = r2.logicComponents:searchElementIndex(this)
if index >= 0 then
- name = i18n.get("uiR2EDDialog"):toUtf8() .. index
+ name = i18n.get("uiR2EDDialog") .. index
end
end
@@ -723,10 +723,8 @@ Logic.Components.ChatSequence = {
local subMenu = menu:getSubMenu(ev)
local func = ""
for i=0, 9 do
- local uc_name = ucstring()
- uc_name:fromUtf8( tostring(i) )
func = "r2.events:setEventValue('','" .. categoryEvent .."','".. tostring(i).."')"
- subMenu:addLine(uc_name, "lua", func, tostring(i))
+ subMenu:addLine(tostring(i), "lua", func, tostring(i))
end
elseif r2.events.eventTypeWithValue[eventType]=="ChatStep" then
@@ -736,9 +734,7 @@ Logic.Components.ChatSequence = {
for c=0, this.Components.Size-1 do
local chat = this.Components[c]
- local uc_name = ucstring()
- uc_name:fromUtf8(chat:getShortName())
- subMenu:addLine(uc_name, "lua",
+ subMenu:addLine(chat:getShortName(), "lua",
"r2.events:setEventValue('".. chat.InstanceId .."','" .. categoryEvent .. "')", chat.InstanceId)
end
@@ -787,9 +783,7 @@ Logic.Components.ChatSequence = {
local entitiesTable = r2.Scenario:getAllInstancesByType(this.Name)
for key, entity in pairs(entitiesTable) do
- local uc_name = ucstring()
- uc_name:fromUtf8(entity.Name)
- subMenu:addLine(uc_name, "lua", calledFunction.."('".. entity.InstanceId .."')", entity.InstanceId)
+ subMenu:addLine(entity.Name, "lua", calledFunction.."('".. entity.InstanceId .."')", entity.InstanceId)
end
if table.getn(entitiesTable)==0 then
@@ -870,7 +864,7 @@ Logic.Components.ActivityStep = {
local result = this:doLookupFromVerb(r2.activities.activityTypeTranslation)
if result then result = result.trans end
if result then return result end
- return ucstring("Activity not registered : " .. lookupString)
+ return "Activity not registered : " .. lookupString
end,
-- element name
getName = function(this)
@@ -888,10 +882,10 @@ Logic.Components.ActivityStep = {
local hourNb, minNb, secNb = r2.logicComponents:calculHourMinSec(tonumber(this.TimeLimitValue))
- local timeLimitText = i18n.get("uiR2EdFor"):toUtf8() .. " "
- if hourNb ~= 0 then timeLimitText = timeLimitText .. hourNb .. i18n.get("uiR2EdShortHours"):toUtf8() .. " " end
- if minNb ~= 0 then timeLimitText = timeLimitText .. minNb .. i18n.get("uiR2EdShortMinutes"):toUtf8() .. " " end
- timeLimitText = timeLimitText .. secNb .. i18n.get("uiR2EdShortSeconds"):toUtf8()
+ local timeLimitText = i18n.get("uiR2EdFor") .. " "
+ if hourNb ~= 0 then timeLimitText = timeLimitText .. hourNb .. i18n.get("uiR2EdShortHours") .. " " end
+ if minNb ~= 0 then timeLimitText = timeLimitText .. minNb .. i18n.get("uiR2EdShortMinutes") .. " " end
+ timeLimitText = timeLimitText .. secNb .. i18n.get("uiR2EdShortSeconds")
activityTime = timeLimitText
@@ -966,7 +960,7 @@ Logic.Components.ActivitySequence = {
local index = r2.logicComponents:searchElementIndex(this)
if index >= 0 then
- name = i18n.get("uiR2EdSeq"):toUtf8() .. index
+ name = i18n.get("uiR2EdSeq") .. index
end
end
@@ -2601,32 +2595,32 @@ function component:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["starts dialog"] = { menu=i18n.get( "uiR2AA0ChatSeqStart" ):toUtf8(),
- text=i18n.get( "uiR2AA1ChatSeqStart" ):toUtf8()},
- ["stops dialog"] = { menu=i18n.get( "uiR2AA0ChatSeqStop" ):toUtf8(),
- text=i18n.get( "uiR2AA1ChatSeqStop" ):toUtf8()},
- ["starts chat"] = { menu=i18n.get( "uiR2AA0ChatStepStart" ):toUtf8(),
- text=i18n.get( "uiR2AA1ChatStepStart" ):toUtf8()},
- ["continues dialog"] = { menu=i18n.get( "uiR2AA0ChatStepContinue" ):toUtf8(),
- text=i18n.get( "uiR2AA1ChatStepContinue" ):toUtf8()},
+ ["starts dialog"] = { menu=i18n.get( "uiR2AA0ChatSeqStart" ),
+ text=i18n.get( "uiR2AA1ChatSeqStart" )},
+ ["stops dialog"] = { menu=i18n.get( "uiR2AA0ChatSeqStop" ),
+ text=i18n.get( "uiR2AA1ChatSeqStop" )},
+ ["starts chat"] = { menu=i18n.get( "uiR2AA0ChatStepStart" ),
+ text=i18n.get( "uiR2AA1ChatStepStart" )},
+ ["continues dialog"] = { menu=i18n.get( "uiR2AA0ChatStepContinue" ),
+ text=i18n.get( "uiR2AA1ChatStepContinue" )},
},
["Events"] = {
- ["start of dialog"] = { menu=i18n.get( "uiR2Event0ChatSeqStart" ):toUtf8(),
- text=i18n.get( "uiR2Event1ChatSeqStart" ):toUtf8()},
- ["end of dialog"] = { menu=i18n.get( "uiR2Event0ChatSeqEnd" ):toUtf8(),
- text=i18n.get( "uiR2Event1ChatSeqEnd" ):toUtf8()},
- ["start of chat"] = { menu=i18n.get( "uiR2Event0ChatStepStart" ):toUtf8(),
- text=i18n.get( "uiR2Event1ChatStepStart" ):toUtf8()},
- ["end of chat"] = { menu=i18n.get( "uiR2Event0ChatStepEnd" ):toUtf8(),
- text=i18n.get( "uiR2Event1ChatStepEnd" ):toUtf8()},
+ ["start of dialog"] = { menu=i18n.get( "uiR2Event0ChatSeqStart" ),
+ text=i18n.get( "uiR2Event1ChatSeqStart" )},
+ ["end of dialog"] = { menu=i18n.get( "uiR2Event0ChatSeqEnd" ),
+ text=i18n.get( "uiR2Event1ChatSeqEnd" )},
+ ["start of chat"] = { menu=i18n.get( "uiR2Event0ChatStepStart" ),
+ text=i18n.get( "uiR2Event1ChatStepStart" )},
+ ["end of chat"] = { menu=i18n.get( "uiR2Event0ChatStepEnd" ),
+ text=i18n.get( "uiR2Event1ChatStepEnd" )},
},
["Conditions"] = {
- ["is in dialog"] = { menu=i18n.get( "uiR2Test0ChatSeq" ):toUtf8(),
- text=i18n.get( "uiR2Test1ChatSeq" ):toUtf8()},
- ["is not in dialog"] = { menu=i18n.get( "uiR2Test0ChatNotSeq" ):toUtf8(),
- text=i18n.get( "uiR2Test1ChatNotSeq" ):toUtf8()},
- ["is in chat"] = { menu=i18n.get( "uiR2Test0ChatStep" ):toUtf8(),
- text=i18n.get( "uiR2Test1ChatStep" ):toUtf8()},
+ ["is in dialog"] = { menu=i18n.get( "uiR2Test0ChatSeq" ),
+ text=i18n.get( "uiR2Test1ChatSeq" )},
+ ["is not in dialog"] = { menu=i18n.get( "uiR2Test0ChatNotSeq" ),
+ text=i18n.get( "uiR2Test1ChatNotSeq" )},
+ ["is in chat"] = { menu=i18n.get( "uiR2Test0ChatStep" ),
+ text=i18n.get( "uiR2Test1ChatStep" )},
}
}
return logicTranslations
diff --git a/ryzom/common/data_common/r2/r2_logic_comp.lua b/ryzom/common/data_common/r2/r2_logic_comp.lua
index 85a37a47e..1a1695bde 100644
--- a/ryzom/common/data_common/r2/r2_logic_comp.lua
+++ b/ryzom/common/data_common/r2/r2_logic_comp.lua
@@ -204,9 +204,7 @@ function r2.logicComponents:updateElementTitle(classUI, eltUI, showPartIndex)
-- title
local title = eltUI:find("title")
assert(title)
- local uc_title = ucstring()
- uc_title:fromUtf8(partIndex..eltName)
- title.uc_hardtext_format = uc_title
+ title.text_format = partIndex..eltName
end
------ REMOVE ELEMENT INST ----------------------------------------
diff --git a/ryzom/common/data_common/r2/r2_logic_entities.lua b/ryzom/common/data_common/r2/r2_logic_entities.lua
index 26b39193a..ab3f950a7 100644
--- a/ryzom/common/data_common/r2/r2_logic_entities.lua
+++ b/ryzom/common/data_common/r2/r2_logic_entities.lua
@@ -16,7 +16,7 @@ local logicEntity =
DisplayerPropertiesParams = "logicEntityPropertySheetDisplayer",
PermanentTreeIcon = "r2ed_icon_permanent_macro_components.tga",
TreeIcon = "r2ed_icon_macro_components.tga",
- SelectBarType = i18n.get("uiR2EDMacroComponents"):toUtf8(),
+ SelectBarType = i18n.get("uiR2EDMacroComponents"),
Prop =
{
@@ -229,7 +229,6 @@ local logicEntity =
assert(r2.getLogicAttribute(this.Class, eventCategory, eventType))
end
- local uc_eventType = ucstring()
local menuTitle = r2.getLogicAttribute(this.Class, eventCategory, eventType)
local addLine = true
@@ -238,8 +237,7 @@ local logicEntity =
end
if addLine then
- uc_eventType:fromUtf8(menuTitle.menu)
- subMenu:addLine(uc_eventType, "lua",
+ subMenu:addLine(menuTitle.menu, "lua",
"r2.events:setEventType('".. eventType .."','" .. tostring(endRequest) .. "','" .. eventCategory .. "')", eventType)
end
end
@@ -254,26 +252,26 @@ local logicEntity =
function logicEntity:getLogicTranslations()
local logicTranslations = {
["ApplicableActions"] = {
- ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Activate" ):toUtf8()},
- ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ):toUtf8(),
- text=i18n.get( "uiR2AA1Deactivate" ):toUtf8()},
- ["trigger"] = { menu=i18n.get( "uiR2AA0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2AA1Trigger" ):toUtf8()},
+ ["activate"] = { menu=i18n.get( "uiR2AA0Activate" ),
+ text=i18n.get( "uiR2AA1Activate" )},
+ ["deactivate"] = { menu=i18n.get( "uiR2AA0Deactivate" ),
+ text=i18n.get( "uiR2AA1Deactivate" )},
+ ["trigger"] = { menu=i18n.get( "uiR2AA0Trigger" ),
+ text=i18n.get( "uiR2AA1Trigger" )},
},
["Events"] = {
- ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Activation" ):toUtf8()},
- ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ):toUtf8(),
- text=i18n.get( "uiR2Event1Deactivation" ):toUtf8()},
- ["trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ):toUtf8(),
- text=i18n.get( "uiR2Event1Trigger" ):toUtf8()},
+ ["activation"] = { menu=i18n.get( "uiR2Event0Activation" ),
+ text=i18n.get( "uiR2Event1Activation" )},
+ ["deactivation"] = { menu=i18n.get( "uiR2Event0Deactivation" ),
+ text=i18n.get( "uiR2Event1Deactivation" )},
+ ["trigger"] = { menu=i18n.get( "uiR2Event0Trigger" ),
+ text=i18n.get( "uiR2Event1Trigger" )},
},
["Conditions"] = {
- ["is active"] = { menu=i18n.get( "uiR2Test0Active" ):toUtf8(),
- text=i18n.get( "uiR2Test1Active" ):toUtf8()},
- ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ):toUtf8(),
- text=i18n.get( "uiR2Test1Inactive" ):toUtf8()},
+ ["is active"] = { menu=i18n.get( "uiR2Test0Active" ),
+ text=i18n.get( "uiR2Test1Active" )},
+ ["is inactive"] = { menu=i18n.get( "uiR2Test0Inactive" ),
+ text=i18n.get( "uiR2Test1Inactive" )},
}
}
return logicTranslations
@@ -299,9 +297,7 @@ end
--
-- local entitiesTable = r2.Scenario:getAllInstancesByType(this.Name)
-- for key, entity in pairs(entitiesTable) do
--- local uc_name = ucstring()
--- uc_name:fromUtf8(entity.Name)
--- subMenu:addLine(uc_name, "lua", calledFunction.."('".. entity.InstanceId .."')", entity.InstanceId)
+-- subMenu:addLine(entity.Name, "lua", calledFunction.."('".. entity.InstanceId .."')", entity.InstanceId)
-- end
--
-- if table.getn(entitiesTable)==0 then
@@ -338,9 +334,7 @@ function logicEntity.initLogicEntitiesInstancesMenu(this, subMenu, calledFunctio
local entity = enumerator:next()
if not entity then break end
found= true
- local uc_name = ucstring()
- uc_name:fromUtf8(entity.Name)
- subMenu:addLine(uc_name, "lua", calledFunction.."('".. entity.InstanceId .."')", entity.InstanceId)
+ subMenu:addLine(entity.Name, "lua", calledFunction.."('".. entity.InstanceId .."')", entity.InstanceId)
end
if not found then
subMenu:addLine(i18n.get("uiR2EdNoSelelection"), "", "", "")
diff --git a/ryzom/common/data_common/r2/r2_mini_activities.lua b/ryzom/common/data_common/r2/r2_mini_activities.lua
index 716b8e74b..1d07134d8 100644
--- a/ryzom/common/data_common/r2/r2_mini_activities.lua
+++ b/ryzom/common/data_common/r2/r2_mini_activities.lua
@@ -66,13 +66,13 @@ function r2.miniActivities:updateSequenceButtonBar()
end
end
- local uc_sequ = ucstring()
+ local sequ = ""
if sequenceInst and sequenceInst.User.Deleted~=true then
- uc_sequ:fromUtf8(sequenceInst:getName())
+ sequ = sequenceInst:getName()
else
- uc_sequ = i18n.get("uiR2EDSequences")
+ sequ = i18n.get("uiR2EDSequences")
end
- sequencesButton.uc_hardtext = uc_sequ
+ sequencesButton.text = sequ
end
@@ -145,9 +145,7 @@ function r2.miniActivities:updateMiniActivityView()
assert(place)
activityType = activityType .. " '" .. place.Name .."'"
end
- local uc_type = ucstring()
- uc_type:fromUtf8(activityType)
- activityText.uc_hardtext = uc_type
+ activityText.text = activityType
else
decalErased = decalErased+1
end
@@ -159,7 +157,7 @@ function r2.miniActivities:updateMiniActivityView()
if (sequenceInst.Components.Size==0) or (sequenceInst.Components.Size==1 and erasedInstId~=nil)
or (startCount == 0) then
noActivityLabel.active = true
- noActivityLabel.uc_hardtext = i18n.get("uiR2EdNoActivity")
+ noActivityLabel.text = i18n.get("uiR2EdNoActivity")
else
noActivityLabel.active = false
end
@@ -167,7 +165,7 @@ function r2.miniActivities:updateMiniActivityView()
else
noActivityLabel.active = true
- noActivityLabel.uc_hardtext = i18n.get("uiR2EdNoSequence")
+ noActivityLabel.text = i18n.get("uiR2EdNoSequence")
end
-- hide remaining mini activity templates
diff --git a/ryzom/common/data_common/r2/r2_plot_item.lua b/ryzom/common/data_common/r2/r2_plot_item.lua
index da6530169..6fbe4a783 100644
--- a/ryzom/common/data_common/r2/r2_plot_item.lua
+++ b/ryzom/common/data_common/r2/r2_plot_item.lua
@@ -48,8 +48,7 @@ local plotItemNamePrefix = i18n.get("uiR2EDPlotItemNamePrefix")
function plotItem.getDisplayName(this)
- r2.ScratchUCStr:fromUtf8(this.Name)
- return concatUCString(plotItemNamePrefix, r2.ScratchUCStr)
+ return plotItemNamePrefix..this.Name
end
function plotItem.isNextSelectable(this)
@@ -59,7 +58,7 @@ end
---------------------------------------------------------------------------------------------------------
-- get select bar type
function plotItem.SelectBarType(this)
- return i18n.get("uiR2EDPlotItems"):toUtf8()
+ return i18n.get("uiR2EDPlotItems")
end
---------------------------------------------------------------------------------------------------------
@@ -80,10 +79,6 @@ r2.registerComponent(plotItem)
-- // PRIVATE //
-- /////////////
-local itemUCName = ucstring() -- keep a ucstring to avoid creation of string on the fly
-local itemUCDesc = ucstring() -- keep a ucstring to avoid creation of string on the fly
-local itemUCComment = ucstring() -- keep a ucstring to avoid creation of string on the fly
-
local plotItemSheetToDBPath = {}
local plotItemSheetNbRef = {} -- for each plot item sheet, store the number of references on it
@@ -107,18 +102,15 @@ r2.PlotItemDisplayerCommon = {}
-- update name for tooltip display + availability
function r2.PlotItemDisplayerCommon:updateNameAndAvailability(instance, sheetId)
if plotItemSheetNbRef[sheetId] == 0 then
- r2:setPlotItemInfos(sheetId, i18n.get("uiR2EDPlotItemDefaultName"), ucstring(), ucstring())
+ r2:setPlotItemInfos(sheetId, i18n.get("uiR2EDPlotItemDefaultName"), "", "")
setDbProp(plotItemSheetToDBPath[sheetId], sheetId) -- available again
elseif plotItemSheetNbRef[sheetId] > 1 then
-- duplicated slot, may happen during concurrent edition (bad luck)
- r2:setPlotItemInfos(sheetId, i18n.get("uiR2EDDuplicatedPlotItemName"), ucstring(), ucstring())
+ r2:setPlotItemInfos(sheetId, i18n.get("uiR2EDDuplicatedPlotItemName"), "", "")
setDbProp(plotItemSheetToDBPath[sheetId], 0) -- available again
r2.PlotItemDisplayerCommon:touch() -- force to refresh the icon display
else
- itemUCName:fromUtf8(instance.Name)
- itemUCDesc:fromUtf8(instance.Desc)
- itemUCComment:fromUtf8(instance.Comment)
- r2:setPlotItemInfos(sheetId, itemUCName, itemUCDesc, itemUCComment)
+ r2:setPlotItemInfos(sheetId, instance.Name, instance.Desc, instance.Comment)
setDbProp(plotItemSheetToDBPath[sheetId], 0) -- available again
end
end
@@ -260,9 +252,8 @@ function r2.PlotItemDisplayerCommon:updateAll()
setDbProp("LOCAL:R2:PLOT_ITEMS:" .. tostring(index) ..":SHEET", v.SheetId)
local slot = groupListSheet["item_" .. tostring(index)]
slot.but.pushed = (v == r2:getSelectedInstance()) -- update selection
- itemUCName:fromUtf8(v.Name)
self:updateSheetColor(slot.sheet, v.SheetId)
- slot.t.uc_hardtext = itemUCName
+ slot.t.text = v.Name
slot.t.global_color = true
slot.active=true
index = index + 1
@@ -275,7 +266,7 @@ function r2.PlotItemDisplayerCommon:updateAll()
local slot = groupListSheet["item_" .. tostring(index)]
slot.but.pushed = false
slot.active=true
- slot.t.uc_hardtext = i18n.get("uiR2EDCreateNewItem")
+ slot.t.text = i18n.get("uiR2EDCreateNewItem")
slot.t.global_color = false
slot.sheet.color = validItemColor
window:find("new_plot_item").frozen = false
@@ -422,7 +413,7 @@ function r2.PlotItemsPanel:requestNewItem(sheetId)
r2.requestNewAction(i18n.get("uiR2EDCreateNewPlotItemAction"))
local newItem = r2.newComponent("PlotItem")
newItem.SheetId = sheetId
- newItem.Name = i18n.get("uiR2EDPlotItemDefaultName"):toUtf8()
+ newItem.Name = i18n.get("uiR2EDPlotItemDefaultName")
newItem.Desc = ""
newItem.Comment = ""
r2.requestInsertNode(r2.Scenario.InstanceId, "PlotItems", -1, "", newItem)
@@ -444,7 +435,7 @@ function r2.PlotItemsPanel:reinit()
if sheetId ~= 0 then
plotItemSheetToDBPath[sheetId] = availableDbPath
plotItemSheetNbRef[sheetId] = 0
- r2:setPlotItemInfos(sheetId, defaultPlotItemName, ucstring(), ucstring())
+ r2:setPlotItemInfos(sheetId, defaultPlotItemName, "", "")
setDbProp(availableDbPath, getDbProp(refDbPath))
end
--local slot = groupListSheet["item_" .. tostring(k)]
diff --git a/ryzom/common/data_common/r2/r2_translator.lua b/ryzom/common/data_common/r2/r2_translator.lua
index 2ef91ff3f..a495a9a7e 100644
--- a/ryzom/common/data_common/r2/r2_translator.lua
+++ b/ryzom/common/data_common/r2/r2_translator.lua
@@ -13,18 +13,14 @@ Translator.PredatorEnemyFaction = "Player|guard|bandit|herbivore|karavan";
function printMsg(str)
messageBox(str)
debugInfo(colorTag(255,255,0)..str)
- local ucStringMsg = ucstring()
- ucStringMsg:fromUtf8(str)
- displaySystemInfo(ucStringMsg, "BC")
+ displaySystemInfo(str, "BC")
messageBox(str)
end
function printError( str)
local msg = "Translation WRN:"
debugInfo(colorTag(255,0,0)..msg..str)
--- local ucStringMsg = ucstring()
--- ucStringMsg:fromUtf8(str)
--- displaySystemInfo(ucStringMsg, "BC")
+-- displaySystemInfo(str, "BC")
--messageBox(str)
assert(nil)
end
@@ -34,10 +30,8 @@ r2.Translator.MultilineBc = {}
function Translator.updateEachSecond()
if table.getn( Translator.MultilineBc ) > 0 then
local msg=table.remove(Translator.MultilineBc, 1)
- if msg then
- local ucStringMsg = ucstring()
- ucStringMsg:fromUtf8(msg)
- displaySystemInfo(ucStringMsg, "BC")
+ if msg then
+ displaySystemInfo(msg, "BC")
end
end
end
@@ -60,9 +54,8 @@ function printWarning( str)
-- Just report the last error
if (r2.LastTranslationErrorMsg == nil) then
r2.LastTranslationErrorMsg = str
- local ucStringMsg = ucstring("Translation Error")
- -- ucStringMsg:fromUtf8(r2.LastTranslationErrorMsg)
- displaySystemInfo(ucStringMsg, "BC")
+ --displaySystemInfo(str, "BC")
+ displaySystemInfo("Translation Error", "BC")
messageBox(str)
end
if devMode then
@@ -4384,18 +4377,18 @@ end
function Translator.addActivationToTranslations(logicTranslations)
if logicTranslations.ApplicableActions == nil then logicTranslations.ApplicableActions = {} end
- --logicTranslations.ApplicableActions.activate = {menu=i18n.get("uiR2EdActivate"):toUtf8(), text="activates"}
- --logicTranslations.ApplicableActions.deactivate = {menu=i18n.get("uiR2EdDesactivate"):toUtf8(), text="deactivates"}
- --logicTranslations.ApplicableActions.trigger = {menu=i18n.get("uiR2EdTrigger"):toUtf8(), text="triggers"}
+ --logicTranslations.ApplicableActions.activate = {menu=i18n.get("uiR2EdActivate"), text="activates"}
+ --logicTranslations.ApplicableActions.deactivate = {menu=i18n.get("uiR2EdDesactivate"), text="deactivates"}
+ --logicTranslations.ApplicableActions.trigger = {menu=i18n.get("uiR2EdTrigger"), text="triggers"}
if logicTranslations.Events == nil then logicTranslations.Events = {} end
- --logicTranslations.Events.activation = {menu=i18n.get("uiR2EdActivation"):toUtf8(), text=r2:lowerTranslate("uiR2EdActivation")}
- --logicTranslations.Events.deactivation = {menu=i18n.get("uiR2EdDesactivation"):toUtf8(), text=r2:lowerTranslate("uiR2EdDesactivation")}
- --logicTranslations.Events.trigger = {menu=i18n.get("uiR2EdTrigger"):toUtf8(), text=r2:lowerTranslate("uiR2EdTrigger")}
+ --logicTranslations.Events.activation = {menu=i18n.get("uiR2EdActivation"), text=r2:lowerTranslate("uiR2EdActivation")}
+ --logicTranslations.Events.deactivation = {menu=i18n.get("uiR2EdDesactivation"), text=r2:lowerTranslate("uiR2EdDesactivation")}
+ --logicTranslations.Events.trigger = {menu=i18n.get("uiR2EdTrigger"), text=r2:lowerTranslate("uiR2EdTrigger")}
if logicTranslations.Conditions == nil then logicTranslations.Conditions = {} end
- --logicTranslations.Conditions["is active"] = {menu=i18n.get("uiR2EdIsActive"):toUtf8(), text=r2:lowerTranslate("uiR2EdIsActive")}
- --logicTranslations.Conditions["is inactive"] = {menu=i18n.get("uiR2EdIsInactive"):toUtf8(), text=r2:lowerTranslate("uiR2EdIsInactive")}
+ --logicTranslations.Conditions["is active"] = {menu=i18n.get("uiR2EdIsActive"), text=r2:lowerTranslate("uiR2EdIsActive")}
+ --logicTranslations.Conditions["is inactive"] = {menu=i18n.get("uiR2EdIsInactive"), text=r2:lowerTranslate("uiR2EdIsInactive")}
return logicTranslations
end
diff --git a/ryzom/common/data_common/r2/r2_ui_acts.lua b/ryzom/common/data_common/r2/r2_ui_acts.lua
index 37edb9325..4aa0b176d 100644
--- a/ryzom/common/data_common/r2/r2_ui_acts.lua
+++ b/ryzom/common/data_common/r2/r2_ui_acts.lua
@@ -33,11 +33,11 @@ r2.acts = {
ecosystemNames =
{
- ["r2_desert"] = i18n.get("uiR2EDEcosystemDesert"):toUtf8(),
- ["r2_jungle"] = i18n.get("uiR2EDEcosystemJungle"):toUtf8(),
- ["r2_forest"] = i18n.get("uiR2EDEcosystemForest"):toUtf8(),
- ["r2_lakes"] = i18n.get("uiR2EDEcosystemLacustre"):toUtf8(),
- ["r2_roots"] = i18n.get("uiR2EDEcosystemPrimeRoots"):toUtf8(),
+ ["r2_desert"] = i18n.get("uiR2EDEcosystemDesert"),
+ ["r2_jungle"] = i18n.get("uiR2EDEcosystemJungle"),
+ ["r2_forest"] = i18n.get("uiR2EDEcosystemForest"),
+ ["r2_lakes"] = i18n.get("uiR2EDEcosystemLacustre"),
+ ["r2_roots"] = i18n.get("uiR2EDEcosystemPrimeRoots"),
},
selectedIslandButtonId = nil,
@@ -78,7 +78,7 @@ r2.acts = {
-------------------------- to sort islands in function of their translated name -----------
function r2.acts:getIslandNb(islandName)
- local islandTrans = i18n.get(islandName):toUtf8()
+ local islandTrans = i18n.get(islandName)
local islandNb = string.sub(islandTrans, -5)
local endLen = 6
if string.sub(islandNb, 1, 1) ~= " " then
@@ -155,9 +155,7 @@ function r2.acts:initActsEditor()
local ecoButton = ecoButtonsGr:find(ecoSysName):find("eco_button")
assert(ecoButton)
- local uc_package = ucstring()
- uc_package:fromUtf8(i18n.get("uiR2EDEcosystemPackage"):toUtf8().." : "..maxPackage)
- ecoButton.tooltip = uc_package
+ ecoButton.tooltip = i18n.get("uiR2EDEcosystemPackage").." : "..maxPackage
for i=0, nbLines-1 do
local lineGr = createGroupInstance("template_line", ecoGr.id, {id="line"..i, h=buttonDim})
@@ -319,14 +317,14 @@ function r2.acts:openScenarioActEditor(newScenario, noCancelOption, rebuildFirst
-- act and scenario names
if self.createNewScenario or rebuildFirstAct then
- self.currentAct.name = i18n.get("uiR2EDDefaultActTitle"):toUtf8() .. " 1"
+ self.currentAct.name = i18n.get("uiR2EDDefaultActTitle") .. " 1"
else
local actNb = r2.Scenario.Acts.Size
- self.currentAct.name = i18n.get("uiR2EDDefaultActTitle"):toUtf8() .. " " .. actNb
+ self.currentAct.name = i18n.get("uiR2EDDefaultActTitle") .. " " .. actNb
end
if self.createNewScenario == true then
- self.currentScenario.name = i18n.get("uiR2EDNewScenario"):toUtf8()
+ self.currentScenario.name = i18n.get("uiR2EDNewScenario")
else
r2.ScenarioWindow:setActNotes()
@@ -497,10 +495,8 @@ function r2.acts:openPreviousIslandsActs()
locationList:addChild(buttonIsland)
buttonIsland.Env.InstanceId = location.InstanceId
- local uc_island = ucstring()
- uc_island:fromUtf8(location.Name)
- buttonIsland:find("button"):find("center_button").tooltip = uc_island
- buttonIsland:find("selected_button"):find("center_button").tooltip = uc_island
+ buttonIsland:find("button"):find("center_button").tooltip = location.Name
+ buttonIsland:find("selected_button"):find("center_button").tooltip = location.Name
-- init text
local textList = buttonIsland:find("text_list")
@@ -523,10 +519,7 @@ function r2.acts:openPreviousIslandsActs()
prevText:addColoredTextChild(act_text, 200, 120, 0, 255)
if act.ShortDescription~="" then
- act_text = act.ShortDescription
- local uc_act = ucstring()
- uc_act:fromUtf8(act_text)
- prevText:addTextChild(uc_act)
+ prevText:addTextChild(act_text)
end
end
@@ -687,11 +680,9 @@ function r2.acts:openEcosystemIslands(ecoSystemName)
-- "choose island" title
local title = actsUI:find("choose_island"):find("choose_island_title")
assert(title)
- -- doesn't work in all language local titleText = " " .. i18n.get("uiR2EDChooseIsland"):toUtf8() .." " .. self.ecosystemNames[self.ecoSystemName] .. " " .. i18n.get("uiR2EDEcosystem"):toUtf8() .. " "
- local titleText = " " .. i18n.get("uiR2EDChooseIsland"):toUtf8() .. self.ecosystemNames[self.ecoSystemName] .. " "
- local uc_title = ucstring()
- uc_title:fromUtf8(titleText)
- title.uc_hardtext = uc_title
+ -- doesn't work in all language local titleText = " " .. i18n.get("uiR2EDChooseIsland") .." " .. self.ecosystemNames[self.ecoSystemName] .. " " .. i18n.get("uiR2EDEcosystem") .. " "
+ local titleText = " " .. i18n.get("uiR2EDChooseIsland") .. self.ecosystemNames[self.ecoSystemName] .. " "
+ title.text = titleText
end
--------------------------------------------------------------------------------------
@@ -752,11 +743,9 @@ function r2.acts:openIslandCard(islandName)
-- card title
local title = actsUI:find("island_images"):find("card_title")
assert(title)
- -- doesn't work in all language local titleText = " " .. i18n.get("uiR2EDZoomOn"):toUtf8() .." '" .. i18n.get(islandName):toUtf8() .. "' " .. i18n.get("uiR2EDIsland"):toUtf8() .. " "
- local titleText = " " .. i18n.get("uiR2EDZoomOn"):toUtf8() .. i18n.get(islandName):toUtf8() .. " "
- local uc_title = ucstring()
- uc_title:fromUtf8(titleText)
- title.uc_hardtext = uc_title
+ -- doesn't work in all language local titleText = " " .. i18n.get("uiR2EDZoomOn") .." '" .. i18n.get(islandName) .. "' " .. i18n.get("uiR2EDIsland") .. " "
+ local titleText = " " .. i18n.get("uiR2EDZoomOn") .. i18n.get(islandName) .. " "
+ title.text = titleText
local islandTable = self.islands[self.ecoSystemName][self:getIslandNb(islandName)].table
local islandW, islandH = (islandTable.xmax - islandTable.xmin)*enlargingFactor, (islandTable.ymax - islandTable.ymin)*enlargingFactor
@@ -866,7 +855,7 @@ function r2.acts:chooseLocationName()
local editText = chooseNamePopup:find("edit_box_group")
assert(editText)
- local name = editText.uc_input_string:toUtf8()
+ local name = editText.input_string
-- check location name duplication
if not self.createNewScenario then
@@ -914,7 +903,7 @@ function r2.acts:chooseScenarioActName()
assert(actGr)
local actEditText = actGr:find("edit_box_group")
assert(actEditText)
- local actName = actEditText.uc_input_string:toUtf8()
+ local actName = actEditText.input_string
local scenarioName = ""
local scenarioEditText
@@ -926,7 +915,7 @@ function r2.acts:chooseScenarioActName()
scenarioEditText = scenarioGr:find("edit_box_group")
assert(scenarioEditText)
- scenarioName = scenarioEditText.uc_input_string:toUtf8()
+ scenarioName = scenarioEditText.input_string
end
if (self.createNewScenario and scenarioName~="" and actName~="") or (not self.createNewScenario and actName~="") then
@@ -997,7 +986,7 @@ function r2.acts:createScenario()
local act =r2.newComponent("Act")
local features = act.Features
local tmpDefault = r2.newComponent("DefaultFeature")
- act.Name = i18n.get("uiR2EDBaseAct"):toUtf8()
+ act.Name = i18n.get("uiR2EDBaseAct")
table.insert(features, tmpDefault)
table.insert(scenario.Acts, act)
@@ -1006,7 +995,7 @@ function r2.acts:createScenario()
local features = act.Features
local tmpDefault = r2.newComponent("DefaultFeature")
r2.ActUIDisplayer.LastSelfCreatedActInstanceId = act.InstanceId
- --act.Name = i18n.get("uiR2EDAct1"):toUtf8() .. ":" .. r2.currentAct.name
+ --act.Name = i18n.get("uiR2EDAct1") .. ":" .. r2.currentAct.name
act.Name = self.currentAct.name
act.WeatherValue = self.currentAct.weather
local manualWeather = 0
@@ -1054,7 +1043,7 @@ function r2.acts:createAct()
end
r2.ActUIDisplayer.LastSelfCreatedActInstanceId = act.InstanceId
local actNb = r2.Scenario.Acts.Size
- --act.Name = i18n.get("uiR2EDDefaultActTitle"):toUtf8() .. actNb .. ":" .. r2.currentAct.name
+ --act.Name = i18n.get("uiR2EDDefaultActTitle") .. actNb .. ":" .. r2.currentAct.name
act.Name = self.currentAct.name
act.WeatherValue = self.currentAct.weather
local manualWeather = 0
@@ -1108,7 +1097,7 @@ function r2.acts:openLocationName()
local editText = chooseNamePopup:find("edit_box_group")
assert(editText)
- editText.uc_input_string = i18n.get(self.currentLocation.islandName)
+ editText.input_string = i18n.get(self.currentLocation.islandName)
editText:setFocusOnText()
end
diff --git a/ryzom/common/data_common/r2/r2_ui_anim_acts.lua b/ryzom/common/data_common/r2/r2_ui_anim_acts.lua
index 8e83d0398..33718c3d7 100644
--- a/ryzom/common/data_common/r2/r2_ui_anim_acts.lua
+++ b/ryzom/common/data_common/r2/r2_ui_anim_acts.lua
@@ -25,12 +25,13 @@ function r2.ui.AnimActs:popMenu()
--
if not acts then return end
for k = 2, table.getn(acts) do
+ local str = ""
if acts[k].Name == "" then
- r2.ScratchUCStr = i18n.get("uiR2EDUnamedAct")
+ str = i18n.get("uiR2EDUnamedAct")
else
- r2.ScratchUCStr:fromUtf8(acts[k].Name)
+ str = acts[k].Name
end
- rootMenu:addLine(r2.ScratchUCStr, "lua", "r2.ui.AnimActs:chooseAct(" .. tostring(k) .. ")", "")
+ rootMenu:addLine(str, "lua", "r2.ui.AnimActs:chooseAct(" .. tostring(k) .. ")", "")
end
launchContextMenuInGame(menuName)
local but = getUI("ui:interface:r2ed_testbar"):find("r2ed_anim_acts")
diff --git a/ryzom/common/data_common/r2/r2_ui_anim_user_triggers.lua b/ryzom/common/data_common/r2/r2_ui_anim_user_triggers.lua
index 25d0b8a5b..a8a286bb1 100644
--- a/ryzom/common/data_common/r2/r2_ui_anim_user_triggers.lua
+++ b/ryzom/common/data_common/r2/r2_ui_anim_user_triggers.lua
@@ -22,8 +22,7 @@ function r2.ui.AnimUserTriggers:popMenu()
if not triggers then return end
for k = 1, table.getn(triggers) do
if triggers[k].Act == 0 or triggers[k].Act == r2.getCurrentActIndex() then
- r2.ScratchUCStr:fromUtf8(triggers[k].Name)
- rootMenu:addLine(r2.ScratchUCStr, "lua",
+ rootMenu:addLine(triggers[k].Name, "lua",
string.format("r2.ui.AnimUserTriggers:fireTrigger(%d, %d)", triggers[k].Act, triggers[k].Id), "")
end
end
@@ -46,8 +45,7 @@ function r2.ui.AnimUserTriggers:fireTrigger(triggerAct, triggerId)
r2.triggerUserTrigger(triggerAct, triggerId)
local trig = self:findTrigger(triggerAct, triggerId)
if trig then
- r2.ScratchUCStr:fromUtf8(trig.Name)
- displaySystemInfo(concatUCString(i18n.get("uiR2EDTriggering"), r2.ScratchUCStr), "BC")
+ displaySystemInfo(concatString(i18n.get("uiR2EDTriggering"), trig.Name), "BC")
end
end
diff --git a/ryzom/common/data_common/r2/r2_ui_char_tracking.lua b/ryzom/common/data_common/r2/r2_ui_char_tracking.lua
index aa92ed669..562c234a0 100644
--- a/ryzom/common/data_common/r2/r2_ui_char_tracking.lua
+++ b/ryzom/common/data_common/r2/r2_ui_char_tracking.lua
@@ -113,21 +113,21 @@ end
--***********************************************************************
function CharTracking:initRaceTypes()
for k = 0, 3 do
- self.RaceTypeToUtf8[k] = i18n.get("uiRAP_CharRace_" .. tostring(k)):toUtf8()
+ self.RaceTypeToUtf8[k] = i18n.get("uiRAP_CharRace_" .. tostring(k))
end
end
--***********************************************************************
function CharTracking:initReligionTypes()
for k = 0, 2 do
- self.ReligionTypeToUtf8[k] = i18n.get("uiRAP_CharReligion_" .. tostring(k)):toUtf8()
+ self.ReligionTypeToUtf8[k] = i18n.get("uiRAP_CharReligion_" .. tostring(k))
end
end
--***********************************************************************
function CharTracking:initLevelTypes()
for k = 0, 5 do
- self.LevelTypeToUtf8[k] = i18n.get("uiRAP_CharLevel_" .. tostring(k)):toUtf8()
+ self.LevelTypeToUtf8[k] = i18n.get("uiRAP_CharLevel_" .. tostring(k))
end
end
@@ -147,15 +147,11 @@ function CharTracking:getColumn(name)
return getUI("ui:interface:ring_chars_tracking:content:main:enclosing:columns:getw:column_group:" .. name .. ":values")
end
-
--***********************************************************************
function CharTracking:getSelectList()
return getUI("ui:interface:ring_chars_tracking:content:main:enclosing:columns:getw:select")
end
-
-local scratchUCStr = ucstring()
-
--***********************************************************************
function CharTracking:newTemplate(name, cache)
local group
@@ -172,8 +168,7 @@ end
-- build a new text group from utf8 text
function CharTracking:newTextLabel(value)
local group = self:newTemplate("rap_text", self.TextCache)
- scratchUCStr:fromUtf8(value)
- group:find("t").uc_hardtext_single_line_format = scratchUCStr
+ group:find("t").text_single_line_format = value
return group
end
@@ -181,15 +176,14 @@ end
-- build a new text group from utf8 text
function CharTracking:newCenteredTextLabel(value)
local group = self:newTemplate("rap_text_centered", self.CenteredTextCache)
- scratchUCStr:fromUtf8(value)
- group:find("t").uc_hardtext_single_line_format = scratchUCStr
+ group:find("t").text_single_line_format = value
return group
end
--***********************************************************************
function CharTracking:newNumberLabel(value)
local group = self:newTemplate("rap_number", self.NumberCache)
- group:find("t").uc_hardtext_single_line_format = tostring(value)
+ group:find("t").text_single_line_format = tostring(value)
return group
end
@@ -381,7 +375,7 @@ function CharTracking:setMessage(msg, color)
-- The version below set the msg in the middle of the window
--local errorTxt = self:getWindow():find("errorMsg")
- errorTxt.uc_hardtext = msg
+ errorTxt.text = msg
errorTxt.color = color
errorTxt.active=true
--self:getWindow():invalidateCoords()
@@ -493,10 +487,10 @@ function CharTracking:onLineRightClick()
self:onLineLeftClick()
local menu = getUI("ui:interface:ring_char_menu")
- menu:find("tell").uc_hardtext = ucstring(i18n.get("uiRAP_MenuCharTell"):toUtf8() .. "'" .. self:getCharFromId(self.SelectedCharId).Char .."'")
- menu:find("teleport").uc_hardtext = ucstring(i18n.get("uiRAP_MenuTeleportTo"):toUtf8() .. "'" .. self:getCharFromId(self.SelectedCharId).Char.."'")
- menu:find("kick").uc_hardtext = ucstring(i18n.get("uiRAP_MenuKick"):toUtf8() .. "'" .. self:getCharFromId(self.SelectedCharId).Char.."'")
- menu:find("unkick").uc_hardtext = ucstring(i18n.get("uiRAP_MenuUnkick"):toUtf8() .. "'" .. self:getCharFromId(self.SelectedCharId).Char.."'")
+ menu:find("tell").text = i18n.get("uiRAP_MenuCharTell") .. "'" .. self:getCharFromId(self.SelectedCharId).Char .."'"
+ menu:find("teleport").text = i18n.get("uiRAP_MenuTeleportTo") .. "'" .. self:getCharFromId(self.SelectedCharId).Char.."'"
+ menu:find("kick").text = i18n.get("uiRAP_MenuKick") .. "'" .. self:getCharFromId(self.SelectedCharId).Char.."'"
+ menu:find("unkick").text = i18n.get("uiRAP_MenuUnkick") .. "'" .. self:getCharFromId(self.SelectedCharId).Char.."'"
menu:find("unkick").grayed = not self:isKicked(self:getCharFromId(self.SelectedCharId).Flags)
menu:find("kick").grayed = not self:isConnected(self:getCharFromId(self.SelectedCharId).Flags)
@@ -507,9 +501,7 @@ end
--***********************************************************************
function CharTracking:onTell()
debugInfo("tell to owner of session" .. self.SelectedCharId)
- char = ucstring()
- char:fromUtf8(self:getCharFromId(self.SelectedCharId).Char)
- tell(char, i18n.get("uiRAP_AskForTall"))
+ tell(self:getCharFromId(self.SelectedCharId).Char, i18n.get("uiRAP_AskForTall"))
end
--***********************************************************************
@@ -646,7 +638,7 @@ function CharTracking:onDraw()
-- refreshText.active = false
--else
-- refreshText.active = true
- -- refreshText.uc_hardtext = waitText
+ -- refreshText.text = waitText
--end
end
else
diff --git a/ryzom/common/data_common/r2/r2_ui_contextual_commands_new.lua b/ryzom/common/data_common/r2/r2_ui_contextual_commands_new.lua
index 1b87fcd85..debedcf41 100644
--- a/ryzom/common/data_common/r2/r2_ui_contextual_commands_new.lua
+++ b/ryzom/common/data_common/r2/r2_ui_contextual_commands_new.lua
@@ -85,12 +85,12 @@ end
function r2:updateContextualCommandTooltip(index)
local command = r2.ContextualCommands.ToolbarCommands[index + 1]
assert(command)
- local keyName = ucstring(runExpr(string.format("getKey('r2ed_context_command', 'commandId=%s')", command.Id)))
+ local keyName = runExpr(string.format("getKey('r2ed_context_command', 'commandId=%s')", command.Id))
if keyName == i18n.get("uiNotAssigned") then
-- no associated key
setContextHelpText(i18n.get(command.TextId))
else
- setContextHelpText(concatUCString(i18n.get(command.TextId), " (", keyName, ")"))
+ setContextHelpText(concatString(i18n.get(command.TextId), " (", keyName, ")"))
end
end
@@ -111,13 +111,13 @@ function r2.ContextualCommands:setupMenu(instance, menu)
-- end
-- debugInfo("Line with id 'dynamic_content_start' has index " .. tostring(rm:getLineFromId('dynamic_content_start')))
-- debugInfo("Line 6 is separator = " .. tostring(rm:isSeparator(6)))
- -- rm:addLine(ucstring("toto"), "lua", "debugInfo('pouet')", "toto")
+ -- rm:addLine("toto", "lua", "debugInfo('pouet')", "toto")
-- rm:addSeparator()
- -- rm:addLine(ucstring("tutu"), "lua", "debugInfo('pouet')", "tutu")
- -- rm:addLine(ucstring("titi"), "lua", "debugInfo('pouet')", "titi")
+ -- rm:addLine("tutu", "lua", "debugInfo('pouet')", "tutu")
+ -- rm:addLine("titi", "lua", "debugInfo('pouet')", "titi")
-- local titiIndex = rm:getLineFromId('titi')
-- rm:addSeparatorAtIndex(titiIndex)
- -- rm:addLine(ucstring("bidon"), "lua", "debugInfo('pouet')", "titi")
+ -- rm:addLine("bidon", "lua", "debugInfo('pouet')", "titi")
-- debugInfo("################################")
-- end
@@ -181,12 +181,12 @@ function r2.ContextualCommands:setupMenu(instance, menu)
end
local keyNameGroup = createGroupInstance("r2_keyname", "", { id = command.Id })
if keyNameGroup then
- local keyName = ucstring(runExpr(string.format("getKey('r2ed_context_command', 'commandId=%s')", command.Id)))
+ local keyName = runExpr(string.format("getKey('r2ed_context_command', 'commandId=%s')", command.Id))
if keyName == i18n.get("uiNotAssigned") then
-- no associated key
- keyNameGroup:find("t").uc_hardtext = keyName
+ keyNameGroup:find("t").text = keyName
else
- keyNameGroup:find("t").uc_hardtext = concatUCString(ucstring("(") , keyName, ucstring(")"))
+ keyNameGroup:find("t").text = "(" ..keyName..")"
end
destNode:setUserGroupRight(line, keyNameGroup)
end
diff --git a/ryzom/common/data_common/r2/r2_ui_displayer_npc.lua b/ryzom/common/data_common/r2/r2_ui_displayer_npc.lua
index 5bc08e502..52c1203ec 100644
--- a/ryzom/common/data_common/r2/r2_ui_displayer_npc.lua
+++ b/ryzom/common/data_common/r2/r2_ui_displayer_npc.lua
@@ -236,7 +236,7 @@ function npcCustomPropertySheetDisplayerTable:updateAllPrivate(instance)
local propWnd = r2:getPropertySheet(instance)
if propWnd.active then
local nameEBox = propWnd:find("Name"):find("eb")
- local name = nameEBox.uc_input_string:toUtf8()
+ local name = nameEBox.input_string
r2:setNpcAttribute(instance.InstanceId, "Name", name)
end
@@ -279,8 +279,8 @@ function npcCustomPropertySheetDisplayerTable:updateAllPrivate(instance)
-- update name
local editName = npcUI:find("name").edit_box_group
assert(editName)
- editName.uc_input_string = instance:getDisplayName()
- npcUI.uc_title = concatUCString(i18n.get("uiRE2DPropertiesOf"), instance:getDisplayName())
+ editName.input_string = instance:getDisplayName()
+ npcUI.title = concatString(i18n.get("uiRE2DPropertiesOf"), instance:getDisplayName())
-- update notes
local editNotes = npcUI:find("small_description")
@@ -487,8 +487,8 @@ function npcCustomPropertySheetDisplayerTable:onAttrModified(instance, attribute
if attributeName == "Name" then
local editName = npcUI:find("name").edit_box_group
assert(editName)
- editName.uc_input_string = instance:getDisplayName()
- npcUI.uc_title = concatUCString(i18n.get("uiRE2DPropertiesOf"), instance:getDisplayName())
+ editName.input_string = instance:getDisplayName()
+ npcUI.title = concatString(i18n.get("uiRE2DPropertiesOf"), instance:getDisplayName())
editName:cancelFocusOnText()
return
end
@@ -806,17 +806,17 @@ function r2:initNpcEditor()
local raceCB = npcUI:find("race").combo_box
assert(raceCB)
raceCB:resetTexts()
- raceCB:addText(ucstring("Fyros"))
- raceCB:addText(ucstring("Matis"))
- raceCB:addText(ucstring("Tryker"))
- raceCB:addText(ucstring("Zorai"))
+ raceCB:addText("Fyros")
+ raceCB:addText("Matis")
+ raceCB:addText("Tryker")
+ raceCB:addText("Zorai")
-- sex
local sexCB = npcUI:find("sex").combo_box
assert(sexCB)
sexCB:resetTexts()
- sexCB:addText(ucstring(r2.female))
- sexCB:addText(ucstring(r2.male))
+ sexCB:addText(r2.female)
+ sexCB:addText(r2.male)
-- Equipment
r2:initEquipmentEnv()
@@ -832,8 +832,8 @@ function r2:initNpcEditor()
updateBodySetsCB:resetTexts()
for k, v in pairs(r2.tableBodySets) do
- bodySetsCB:addText(ucstring(k))
- updateBodySetsCB:addText(ucstring(k))
+ bodySetsCB:addText(k)
+ updateBodySetsCB:addText(k)
end
-- face sets
@@ -845,8 +845,8 @@ function r2:initNpcEditor()
updateFaceSetsCB:resetTexts()
for k, v in pairs(r2.tableFaceSets) do
- faceSetsCB:addText(ucstring(k))
- updateFaceSetsCB:addText(ucstring(k))
+ faceSetsCB:addText(k)
+ updateFaceSetsCB:addText(k)
end
-- face morph
@@ -858,8 +858,8 @@ function r2:initNpcEditor()
updateFaceMorphCB:resetTexts()
for k, v in pairs(r2.tableFaceMorph) do
- faceMorphCB:addText(ucstring(k))
- updateFaceMorphCB:addText(ucstring(k))
+ faceMorphCB:addText(k)
+ updateFaceMorphCB:addText(k)
end
bodySetsCB.view_text = r2.emptyComboLine
@@ -1090,14 +1090,14 @@ function r2:updateName()
local editName = npcUI:find("name").edit_box_group
assert(editName)
- local newString = editName.uc_input_string:toUtf8()
+ local newString = editName.input_string
local oldString = defaulting(selection.Name, "")
if newString ~= oldString then
r2.requestNewAction(i18n.get("uiR2EDUpdateNpcNameAction"))
r2:setNpcAttribute(selection.InstanceId, "Name", newString)
end
- return editName.uc_input_string:toUtf8()
+ return editName.input_string
end
-- UPDATE NOTES --------------------------------------------------------------------------------
@@ -1112,7 +1112,7 @@ function r2:updateNotes()
local editNotes = npcUI:find("small_description")
assert(editNotes)
- local newString = editNotes.uc_input_string:toUtf8()
+ local newString = editNotes.input_string
local oldString = defaulting(selection.Notes, "")
if newString ~= oldString then
r2.requestNewAction(i18n.get("uiR2EDUpdateNpcNotesAction"))
@@ -1344,10 +1344,10 @@ function r2:updateType(existingAction)
r2:setNpcAttribute(selection.InstanceId, "SheetClient", typeElement.SheetClient)
-- Name
- local oldName = i18n.get(r2.sheetTypeCB[oldTypeNPC].Translation):toUtf8()
+ local oldName = i18n.get(r2.sheetTypeCB[oldTypeNPC].Translation)
if selection.Class == "Npc" and string.find(selection.Name, oldName) then
local ucNewName = getUICaller():getText(typeNPC)
- local newName = r2:genInstanceName(ucNewName):toUtf8()
+ local newName = r2:genInstanceName(ucNewName)
r2:setNpcAttribute(selection.InstanceId, "Name", newName)
elseif selection.Name == oldName then
@@ -1577,8 +1577,8 @@ function r2:addBodySets()
local bodySetsCombo = npcUI:find("body_sets").combo_box
assert(bodySetsCombo)
- bodySetsCombo:addText(editText.uc_input_string)
- updateBodySetsCombo:addText(editText.uc_input_string)
+ bodySetsCombo:addText(editText.input_string)
+ updateBodySetsCombo:addText(editText.input_string)
-- add new sets in table
local bodySets = npcUI:find("body_sets_scroll_target")
@@ -1732,8 +1732,8 @@ function r2:addFaceSets()
local faceSetsCombo = npcUI:find("face_sets").combo_box
assert(faceSetsCombo)
- faceSetsCombo:addText(editText.uc_input_string)
- updateFaceSetsCombo:addText(editText.uc_input_string)
+ faceSetsCombo:addText(editText.input_string)
+ updateFaceSetsCombo:addText(editText.input_string)
-- add new sets in table
local faceSets = npcUI:find("face_sets_scroll_target")
@@ -1886,8 +1886,8 @@ function r2:addFaceMorph()
local faceMorphCombo = npcUI:find("face_morph").combo_box
assert(faceMorphCombo)
- faceMorphCombo:addText(editText.uc_input_string)
- updateFaceMorphCombo:addText(editText.uc_input_string)
+ faceMorphCombo:addText(editText.input_string)
+ updateFaceMorphCombo:addText(editText.input_string)
-- add new sets in table
local faceMorph = npcUI:find("face_morph_scroll_target")
@@ -2041,7 +2041,7 @@ end
r2.equipmentPalette = {}
r2.itemIndexEquipmentToSelectionText = {}
r2.equipmentEnv = {}
-r2.noPiece = i18n.get("uiR2EdNoPiece"):toUtf8()
+r2.noPiece = i18n.get("uiR2EdNoPiece")
r2.equipmentAttNb = 6
@@ -2146,7 +2146,7 @@ function r2.addR2PlayerEquipment(paletteElt, equipmentTable)
tempTable[equType] = {}
for equName, equFile in pairs(v) do
- local tradEquName = i18n.get(equName):toUtf8()
+ local tradEquName = i18n.get(equName)
if tostring(equType) ~= "hands" then
if equName == "uiR2EDequipment_none" then
table.insert(tempTable[equType], 1, {["trad"]=tradEquName, ["itemFile"]=equFile})
@@ -2203,7 +2203,7 @@ function r2:updateEquipment(instance, init)
comboBox:resetTexts()
for k1, v1 in pairs(v) do
- comboBox:addText(ucstring(v1.trad))
+ comboBox:addText(v1.trad)
end
end
@@ -2222,8 +2222,8 @@ function r2:updateEquipment(instance, init)
if r2.equipmentSets[equipmentId] then
for k1, v1 in pairs(r2.equipmentSets[equipmentId]) do
- comboBox:addText(ucstring(k1))
- comboBoxPopup:addText(ucstring(k1))
+ comboBox:addText(k1)
+ comboBoxPopup:addText(k1)
end
end
comboBox.view_text = r2.emptyComboLine
@@ -2433,8 +2433,8 @@ function r2:addEquipmentSet()
local equSetCombo = npcUI:find("equipment_sets").combo_box
assert(equSetCombo)
- updateEquSetCombo:addText(editText.uc_input_string)
- equSetCombo:addText(editText.uc_input_string)
+ updateEquSetCombo:addText(editText.input_string)
+ equSetCombo:addText(editText.input_string)
if r2.equipmentSets[selection.Equipment] == nil then
r2.equipmentSets[selection.Equipment] = {}
diff --git a/ryzom/common/data_common/r2/r2_ui_displayers.lua b/ryzom/common/data_common/r2/r2_ui_displayers.lua
index 45fd1d14e..41a7a33c5 100644
--- a/ryzom/common/data_common/r2/r2_ui_displayers.lua
+++ b/ryzom/common/data_common/r2/r2_ui_displayers.lua
@@ -601,11 +601,9 @@ r2.ActUIDisplayer.LastSelfCreatedActInstanceId = nil -- id of the last act creat
local actTitle = act:getName()
if act==r2.Scenario:getCurrentAct() then
- actTitle = actTitle .. " [" .. i18n.get("uiR2EDCurrentActComboBox"):toUtf8() .."]"
+ actTitle = actTitle .. " [" .. i18n.get("uiR2EDCurrentActComboBox") .."]"
end
- local text = ucstring()
- text:fromUtf8(actTitle)
- comboBox:setText(index - 1, text)
+ comboBox:setText(index - 1, actTitle)
return
end
end
@@ -636,16 +634,13 @@ r2.ActUIDisplayer.LastSelfCreatedActInstanceId = nil -- id of the last act creat
local comboBox = self:getActComboBox()
local tree, macroTree
- if not act:isBaseAct() then
- local text = ucstring()
+ if not act:isBaseAct() then
local index = r2.logicComponents:searchElementIndex(act)-2
local actTitle = act:getName()
if type(actTitle) ~= "string" then
- text:fromUtf8("bad type for title : " .. type(actTitle))
- comboBox:insertText(index, text)
+ comboBox:insertText("index, bad type for title : " .. type(actTitle))
else
- text:fromUtf8(actTitle)
- comboBox:insertText(index, text)
+ comboBox:insertText(index, actTitle)
end
tree = self:findFreeTreeCtrl()
diff --git a/ryzom/common/data_common/r2/r2_ui_event_handlers.lua b/ryzom/common/data_common/r2/r2_ui_event_handlers.lua
index f043db5d9..322aa2ec8 100644
--- a/ryzom/common/data_common/r2/r2_ui_event_handlers.lua
+++ b/ryzom/common/data_common/r2/r2_ui_event_handlers.lua
@@ -133,9 +133,7 @@ function r2:group(src, target)
-- create a new group
-- debugInfo(colorTag(255, 255, 0) .. "Creating new group")
local newGroup = r2.newComponent("NpcGrpFeature")
- local uc_groupName = ucstring()
- uc_groupName:fromUtf8(r2.PaletteIdToGroupTranslation[src.Base].. " " .. i18n.get("uiR2EDNameGroup"):toUtf8())
- local groupName = r2:genInstanceName(uc_groupName):toUtf8()
+ local groupName = r2:genInstanceName(r2.PaletteIdToGroupTranslation[src.Base].. " " .. i18n.get("uiR2EDNameGroup"))
newGroup.Name = groupName
--r2.requestSetNode(target.Behavior.InstanceId, "Type", "")
@@ -546,20 +544,20 @@ function r2:copy()
r2.ClipBoard = selection:copy()
r2.ClipBoardSrcInstanceId = selection.InstanceId
r2.ClipBoardDisplayName = selection:getDisplayName()
- displaySystemInfo(concatUCString(selection:getDisplayName(), i18n.get("uiR2EDSelectionCopied")), "BC")
+ displaySystemInfo(concatString(selection:getDisplayName(), i18n.get("uiR2EDSelectionCopied")), "BC")
end
------------------------------------------------------------------------------------
-- called by C++ when copy has been pressed (key or ui button)
function r2:paste()
- r2.requestNewAction(concatUCString(i18n.get("uiR2EDPasteAction"), r2.ClipBoardDisplayName))
+ r2.requestNewAction(concatString(i18n.get("uiR2EDPasteAction"), r2.ClipBoardDisplayName))
if r2.ClipBoard == nil then
displaySystemInfo(i18n.get("uiR2EDEmptyClipBoard"), "BC")
return
end
-- call the paste function (not a method here)
local newCopy = r2.Classes[r2.ClipBoard.Class].newCopy(r2.ClipBoard)
- r2.requestNewAction(concatUCString(i18n.get("uiR2EDPasteAction"), r2.ClipBoardDisplayName))
+ r2.requestNewAction(concatString(i18n.get("uiR2EDPasteAction"), r2.ClipBoardDisplayName))
r2.Classes[r2.ClipBoard.Class].paste(newCopy, true, r2.ClipBoardSrcInstanceId)
r2.requestEndAction()
end
@@ -704,33 +702,32 @@ function r2:popMainMenu()
local menu = getUI(menuName)
assert(menu)
local function buildKeyName(action, params)
- local keyName = ucstring(runExpr(string.format("getKey('%s', '%s')", action, params)))
- assert(isUCString(keyName))
+ local keyName = runExpr(string.format("getKey('%s', '%s')", action, params))
if keyName == i18n.get("uiNotAssigned") then
-- no associated key...
return keyName
else
- local result = concatUCString(ucstring("(") , keyName, ucstring(")"))
- --debugInfo(result:toUtf8())
+ local result = "("..keyName..")"
+ --debugInfo(result)
return result
end
end
-- fill menu entries common to edition & test
- menu:find("preferences_key").t.uc_hardtext = buildKeyName("show_hide", "game_config")
- menu:find("keys_key").t.uc_hardtext = buildKeyName("show_hide", "keys")
- --menu:find("debug_console_key").t.uc_hardtext = buildKeyName("show_hide", "debug_info")
- menu:find("chat_window_key").t.uc_hardtext = buildKeyName("show_hide", "main_chat")
- menu:find("quit_key").t.uc_hardtext = buildKeyName("quit_ryzom_now", "")
- menu:find("mail_box_key").t.uc_hardtext = buildKeyName("show_hide", "mailbox")
- menu:find("guild_forum_key").t.uc_hardtext = buildKeyName("show_hide", "guild_forum")
+ menu:find("preferences_key").t.text = buildKeyName("show_hide", "game_config")
+ menu:find("keys_key").t.text = buildKeyName("show_hide", "keys")
+ --menu:find("debug_console_key").t.text = buildKeyName("show_hide", "debug_info")
+ menu:find("chat_window_key").t.text = buildKeyName("show_hide", "main_chat")
+ menu:find("quit_key").t.text = buildKeyName("quit_ryzom_now", "")
+ menu:find("mail_box_key").t.text = buildKeyName("show_hide", "mailbox")
+ menu:find("guild_forum_key").t.text = buildKeyName("show_hide", "guild_forum")
-- fill name of key for each menu entry
if r2.Mode == "Edit" then
- menu:find("go_test_key").t.uc_hardtext = buildKeyName("r2ed_try_go_test", "")
- menu:find("palette_key").t.uc_hardtext = buildKeyName("show_hide", "r2ed_palette")
- menu:find("scenario_key").t.uc_hardtext = buildKeyName("show_hide", "r2ed_scenario")
+ menu:find("go_test_key").t.text = buildKeyName("r2ed_try_go_test", "")
+ menu:find("palette_key").t.text = buildKeyName("show_hide", "r2ed_palette")
+ menu:find("scenario_key").t.text = buildKeyName("show_hide", "r2ed_scenario")
menu:find("cust_bbox").active = (config.R2EDExtendedDebug == 1)
else
- menu:find("stop_test_key").t.uc_hardtext = buildKeyName("r2ed_stop_test", "")
+ menu:find("stop_test_key").t.text = buildKeyName("r2ed_stop_test", "")
menu:find("stop_test").active = (r2.AccessMode == "Editor")
end
@@ -740,7 +737,7 @@ function r2:popMainMenu()
menu:find("player_admin").active = not (r2.AccessMode == "Editor")
end
- menu:find("map_key").t.uc_hardtext = buildKeyName("show_hide", "map")
+ menu:find("map_key").t.text = buildKeyName("show_hide", "map")
menu:find("debug_console").active = (config.R2EDExtendedDebug == 1)
menu:find("fixed_lighting_bm").bm.texture = select(r2:getFixedLighting(), "r2_icon_light_on_small.tga", "r2_icon_light_off_small.tga")
@@ -904,9 +901,8 @@ function r2:onModeChanged()
if r2.Mode == "Edit" and r2.LastTranslationErrorMsg ~= nil then
local str = r2.LastTranslationErrorMsg
assert(type(str) == "string")
- local ucStringMsg = ucstring("Translation Error")
- --ucStringMsg:fromUtf8(r2.LastTranslationErrorMsg)
- displaySystemInfo(ucStringMsg, "BC")
+ --displaySystemInfo(str, "BC")
+ displaySystemInfo("Translation Error", "BC")
messageBox(str)
r2.LastTranslationErrorMsg = nil
end
@@ -1006,7 +1002,7 @@ end
function r2:setToolContextHelp(ucHelp)
--debugInfo(tostring(ucHelp))
local helpGroup = getUI("ui:interface:r2ed_tool_context_help")
- helpGroup.t.uc_hardtext = ucHelp
+ helpGroup.t.text = ucHelp
helpGroup.t:updateCoords()
helpGroup.w = helpGroup.t.w
helpGroup:invalidateCoords()
@@ -1015,8 +1011,8 @@ end
-- call by C++ to display a message saying that the max number of points has been reached
-- while drawing a primitive
function r2:noMoreRoomLeftInPrimitveMsg()
- local keyName = ucstring(runExpr("getKey('r2ed_context_command', 'commandId=delete')"))
- local msg = concatUCString(i18n.get("uiR2EDNoMoreRoomInPrimStart"),
+ local keyName = runExpr("getKey('r2ed_context_command', 'commandId=delete')")
+ local msg = concatString(i18n.get("uiR2EDNoMoreRoomInPrimStart"),
keyName,
i18n.get("uiR2EDNoMoreRoomInPrimEnd"))
displaySystemInfo(msg, "TAGBC")
@@ -1046,14 +1042,14 @@ end
-- called by C++ when an action has been undone
function r2:onUndo(actionUCName)
debugInfo("*undo*")
- displaySystemInfo(concatUCString(i18n.get("uiR2EDUndoing"), actionUCName), "BC")
+ displaySystemInfo(concatString(i18n.get("uiR2EDUndoing"), actionUCName), "BC")
r2.ToolUI:updateUndoRedo()
end
-- called by C++ when an action has been redone
function r2:onRedo(actionUCName)
debugInfo("*redo*")
- displaySystemInfo(concatUCString(i18n.get("uiR2EDRedoing"), actionUCName), "BC")
+ displaySystemInfo(concatString(i18n.get("uiR2EDRedoing"), actionUCName), "BC")
r2.ToolUI:updateUndoRedo()
end
@@ -1252,7 +1248,7 @@ function r2:setDisplayMode(filter, displayMode, contextualVisibility)
v.DisplayerVisual.ContextualVisibilityActive = contextualVisibility
end
--if v.DisplayMode == srcDisplayMode or (srcDisplayMode == nil and v.DisplayMode ~= displayModeValue) then
- --debugInfo("Changing display mode for " .. v:getDisplayName():toUtf8())
+ --debugInfo("Changing display mode for " .. v:getDisplayName())
--r2.requestSetNode(v.InstanceId, "DisplayMode", displayModeValue)
-- now a local property
--end
@@ -1311,9 +1307,9 @@ function r2:onMessageSendingStart(messageName, nbPacket, size)
local msg = nil
if lastMessage.MessageName == "SSUA" then
- msg = i18n.get("uiR2EDUploadScenario"):toUtf8()
+ msg = i18n.get("uiR2EDUploadScenario")
elseif lastMessage.MessageName == "RSS2" then
- msg = i18n.get("uimR2EDGoToDMMode"):toUtf8()
+ msg = i18n.get("uimR2EDGoToDMMode")
else
return
@@ -1340,10 +1336,10 @@ function r2:onMessageSendingUpdate(packetId, packetSize)
debugInfo("--- " .. tostring( math.floor( (100*lastMessage.Received) / lastMessage.Size) ) )
if lastMessage.MessageName == "SSUA" then
- msg = i18n.get("uiR2EDUploadScenario"):toUtf8()
+ msg = i18n.get("uiR2EDUploadScenario")
elseif lastMessage.MessageName == "RSS2" then
- msg = i18n.get("uimR2EDGoToDMMode"):toUtf8()
+ msg = i18n.get("uimR2EDGoToDMMode")
else
return
diff --git a/ryzom/common/data_common/r2/r2_ui_forms.lua b/ryzom/common/data_common/r2/r2_ui_forms.lua
index 587581f26..1df1da775 100644
--- a/ryzom/common/data_common/r2/r2_ui_forms.lua
+++ b/ryzom/common/data_common/r2/r2_ui_forms.lua
@@ -208,15 +208,15 @@ function r2.setCurrSelectedFile(filename, path)
r2.CurrentForm.Env.FormInstance.LoadScenario_Level = ""
end
if header.Language then
- r2.CurrentForm.Env.FormInstance.LoadScenario_Language = i18n.get("uiR2ED"..header.Language):toUtf8()
+ r2.CurrentForm.Env.FormInstance.LoadScenario_Language = i18n.get("uiR2ED"..header.Language)
elseif r2.CurrentForm.Env.FormInstance.LoadScenario_Language then
r2.CurrentForm.Env.FormInstance.LoadScenario_Language = ""
end
if header.RingPointLevel then
if r2.checkRingAccess(header.RingPointLevel) == true then
- r2.CurrentForm.Env.FormInstance.LoadScenario_RingPointsLevel = i18n.get("uiR2EDLoadScenario_Yes"):toUtf8()
+ r2.CurrentForm.Env.FormInstance.LoadScenario_RingPointsLevel = i18n.get("uiR2EDLoadScenario_Yes")
else
- r2.CurrentForm.Env.FormInstance.LoadScenario_RingPointsLevel = i18n.get("uiR2EDLoadScenario_No"):toUtf8()
+ r2.CurrentForm.Env.FormInstance.LoadScenario_RingPointsLevel = i18n.get("uiR2EDLoadScenario_No")
end
elseif r2.CurrentForm.Env.FormInstance.LoadScenario_RingPointsLevel then
r2.CurrentForm.Env.FormInstance.LoadScenario_RingPointsLevel = ""
@@ -243,7 +243,7 @@ function r2.setCurrSelectedFileToLoad(filename, path)
getUICaller().pushed = true
end
formInstance.LastFileButton = getUICaller()
- r2.CurrentForm.Env.FormInstance.LoadScenario_Name = ucstring(filename):toUtf8()
+ r2.CurrentForm.Env.FormInstance.LoadScenario_Name = filename
if path ~= nil and r2.CurrentForm.Env.FormInstance.Path then
r2.CurrentForm.Env.FormInstance.Path = path
@@ -271,17 +271,17 @@ function r2.setCurrSelectedFileToLoad(filename, path)
r2.CurrentForm.Env.FormInstance.LoadScenario_Level = ""
end
if header.Language then
- r2.CurrentForm.Env.FormInstance.LoadScenario_Language = i18n.get("uiR2ED"..header.Language):toUtf8()
+ r2.CurrentForm.Env.FormInstance.LoadScenario_Language = i18n.get("uiR2ED"..header.Language)
elseif r2.CurrentForm.Env.FormInstance.LoadScenario_Language then
r2.CurrentForm.Env.FormInstance.LoadScenario_Language = ""
end
if header.RingPointLevel then
if r2.checkRingAccess(header.RingPointLevel) == true then
r2.CurrentForm.Env.FormInstance.RingAccess = 1
- r2.CurrentForm.Env.FormInstance.LoadScenario_RingPointsLevel = i18n.get("uiR2EDLoadScenario_Yes"):toUtf8()
+ r2.CurrentForm.Env.FormInstance.LoadScenario_RingPointsLevel = i18n.get("uiR2EDLoadScenario_Yes")
else
r2.CurrentForm.Env.FormInstance.RingAccess = 0
- r2.CurrentForm.Env.FormInstance.LoadScenario_RingPointsLevel = i18n.get("uiR2EDLoadScenario_No"):toUtf8()
+ r2.CurrentForm.Env.FormInstance.LoadScenario_RingPointsLevel = i18n.get("uiR2EDLoadScenario_No")
end
elseif r2.CurrentForm.Env.FormInstance.LoadScenario_RingPointsLevel then
r2.CurrentForm.Env.FormInstance.RingAccess = 0
@@ -311,8 +311,8 @@ local function showFileList(formInstance)
local shortFilename = nlfile.getFilename(v)
local shortFileEscape=string.gsub(shortFilename, "'", "\\'")
- local shortFilename2 = ucstring(shortFilename):toUtf8()
- local shortFileEscape2 = ucstring(shortFileEscape):toUtf8()
+ local shortFilename2 = shortFilename
+ local shortFileEscape2 = shortFileEscape
local entry = createGroupInstance("r2ed_filelist_entry", "",
diff --git a/ryzom/common/data_common/r2/r2_ui_logic_entities.lua b/ryzom/common/data_common/r2/r2_ui_logic_entities.lua
index a8a12d9ad..cfc44e8a4 100644
--- a/ryzom/common/data_common/r2/r2_ui_logic_entities.lua
+++ b/ryzom/common/data_common/r2/r2_ui_logic_entities.lua
@@ -14,52 +14,52 @@ r2.logicEntityAttributes = {
["ApplicableActions"] = {
--- ["Activate"] = tostring(i18n.get( "uiR2EdActivate" ):toUtf8()),
--- ["Deactivate"] = tostring(i18n.get( "uiR2EdDeactivate" ):toUtf8()),
--- ["Wander"] = tostring(i18n.get( "uiR2EdWander" ):toUtf8()),
--- ["Sit Down"] = tostring(i18n.get( "uiR2EdSitDown" ):toUtf8()),
--- ["Stand Up"] = tostring(i18n.get( "uiR2EdStandUp" ):toUtf8()),
--- ["Respawn"] = tostring(i18n.get( "uiR2EdRespawn" ):toUtf8()),
--- ["Kill"] = tostring(i18n.get( "uiR2EdKill" ):toUtf8()),
--- ["begin activity sequence"] = tostring(i18n.get( "uiR2EdBeginActivitySequ" ):toUtf8()),
+-- ["Activate"] = tostring(i18n.get( "uiR2EdActivate" )),
+-- ["Deactivate"] = tostring(i18n.get( "uiR2EdDeactivate" )),
+-- ["Wander"] = tostring(i18n.get( "uiR2EdWander" )),
+-- ["Sit Down"] = tostring(i18n.get( "uiR2EdSitDown" )),
+-- ["Stand Up"] = tostring(i18n.get( "uiR2EdStandUp" )),
+-- ["Respawn"] = tostring(i18n.get( "uiR2EdRespawn" )),
+-- ["Kill"] = tostring(i18n.get( "uiR2EdKill" )),
+-- ["begin activity sequence"] = tostring(i18n.get( "uiR2EdBeginActivitySequ" )),
-- ["begin chat sequence"] = tostring(i18n.get( "uiR2EdBeginChatSequ" ))
},
["Events"] = {
--- ["activation"] = tostring(i18n.get( "uiR2EdActivation" ):toUtf8()),
--- ["desactivation"] = tostring(i18n.get( "uiR2EdDesactivation" ):toUtf8()),
--- ["a member death"] = tostring(i18n.get( "uiR2EdAMemberDeath" ):toUtf8()),
--- ["member death"] = tostring(i18n.get( "uiR2EdMemberDeath" ):toUtf8()),
--- ["group death"] = tostring(i18n.get( "uiR2EdGroupDeath" ):toUtf8()),
--- ["head to wander zone"] = tostring(i18n.get( "uiR2EdHeadWanderZone" ):toUtf8()),
--- ["arrive at wander zone"] = tostring(i18n.get( "uiR2EdArriveWanderZone" ):toUtf8()),
--- ["head to camp"] = tostring(i18n.get( "uiR2EdHeadCamp" ):toUtf8()),
--- ["arrive at camp"] = tostring(i18n.get( "uiR2EdArriveCamp" ):toUtf8()),
--- ["death"] = tostring(i18n.get( "uiR2EdDeath" ):toUtf8()),
--- ["end of activity step"] = tostring(i18n.get( "uiR2EdEndActivityStep" ):toUtf8()),
--- ["begin of activity step"] = tostring(i18n.get( "uiR2EdBeginActivityStep" ):toUtf8()),
--- ["end of activity sequence"] = tostring(i18n.get( "uiR2EdEndActivitySequ" ):toUtf8()),
--- ["begin of activity sequence"] = tostring(i18n.get( "uiR2EdBeginOfActivitySequ" ):toUtf8()),
-
--- ["end of chat step"] = tostring(i18n.get( "uiR2EdEndChatStep" ):toUtf8()),
--- ["end of chat sequence"] = tostring(i18n.get( "uiR2EdEndChatSequ" ):toUtf8()),
--- ["group death"] = tostring(i18n.get( "uiR2EdGroupDeath" ):toUtf8()),
+-- ["activation"] = tostring(i18n.get( "uiR2EdActivation" )),
+-- ["desactivation"] = tostring(i18n.get( "uiR2EdDesactivation" )),
+-- ["a member death"] = tostring(i18n.get( "uiR2EdAMemberDeath" )),
+-- ["member death"] = tostring(i18n.get( "uiR2EdMemberDeath" )),
+-- ["group death"] = tostring(i18n.get( "uiR2EdGroupDeath" )),
+-- ["head to wander zone"] = tostring(i18n.get( "uiR2EdHeadWanderZone" )),
+-- ["arrive at wander zone"] = tostring(i18n.get( "uiR2EdArriveWanderZone" )),
+-- ["head to camp"] = tostring(i18n.get( "uiR2EdHeadCamp" )),
+-- ["arrive at camp"] = tostring(i18n.get( "uiR2EdArriveCamp" )),
+-- ["death"] = tostring(i18n.get( "uiR2EdDeath" )),
+-- ["end of activity step"] = tostring(i18n.get( "uiR2EdEndActivityStep" )),
+-- ["begin of activity step"] = tostring(i18n.get( "uiR2EdBeginActivityStep" )),
+-- ["end of activity sequence"] = tostring(i18n.get( "uiR2EdEndActivitySequ" )),
+-- ["begin of activity sequence"] = tostring(i18n.get( "uiR2EdBeginOfActivitySequ" )),
+
+-- ["end of chat step"] = tostring(i18n.get( "uiR2EdEndChatStep" )),
+-- ["end of chat sequence"] = tostring(i18n.get( "uiR2EdEndChatSequ" )),
+-- ["group death"] = tostring(i18n.get( "uiR2EdGroupDeath" )),
},
["Conditions"] = {
--- ["is active"] = tostring(i18n.get( "uiR2EdIsActive" ):toUtf8()),
--- ["is inactive"] = tostring(i18n.get( "uiR2EdIsInactive" ):toUtf8()),
--- ["is dead"] = tostring(i18n.get( "uiR2EdIsDead" ):toUtf8()),
--- ["is alive"] = tostring(i18n.get( "uiR2EdIsAlive" ):toUtf8()),
--- ["is wandering"] = tostring(i18n.get( "uiR2EdIsWandering" ):toUtf8()),
--- ["is sitting"] = tostring(i18n.get( "uiR2EdIsSitting" ):toUtf8()),
--- ["is heading to wander zone"] = tostring(i18n.get( "uiR2EdIsHeadingWanderZone" ):toUtf8()),
--- ["is heading to camp"] = tostring(i18n.get( "uiR2EdIsHeadingCamp" ):toUtf8()),
--- ["is in activity sequence"] = tostring(i18n.get( "uiR2EdIsInActivitySequ" ):toUtf8()),
--- ["is in activity step"] = tostring(i18n.get( "uiR2EdIsInActivityStep" ):toUtf8()),
--- ["is in chat sequence"] = tostring(i18n.get( "uiR2EdIsInChatSequ" ):toUtf8()),
--- ["is in chat step"] = tostring(i18n.get( "uiR2EdIsInChatStep" ):toUtf8()),
+-- ["is active"] = tostring(i18n.get( "uiR2EdIsActive" )),
+-- ["is inactive"] = tostring(i18n.get( "uiR2EdIsInactive" )),
+-- ["is dead"] = tostring(i18n.get( "uiR2EdIsDead" )),
+-- ["is alive"] = tostring(i18n.get( "uiR2EdIsAlive" )),
+-- ["is wandering"] = tostring(i18n.get( "uiR2EdIsWandering" )),
+-- ["is sitting"] = tostring(i18n.get( "uiR2EdIsSitting" )),
+-- ["is heading to wander zone"] = tostring(i18n.get( "uiR2EdIsHeadingWanderZone" )),
+-- ["is heading to camp"] = tostring(i18n.get( "uiR2EdIsHeadingCamp" )),
+-- ["is in activity sequence"] = tostring(i18n.get( "uiR2EdIsInActivitySequ" )),
+-- ["is in activity step"] = tostring(i18n.get( "uiR2EdIsInActivityStep" )),
+-- ["is in chat sequence"] = tostring(i18n.get( "uiR2EdIsInChatSequ" )),
+-- ["is in chat step"] = tostring(i18n.get( "uiR2EdIsInChatStep" )),
},
}
@@ -313,13 +313,13 @@ function r2:initWhichEntityMenu()
logicEntityMenu:reset()
local name = i18n.get("uiR2EdBanditCamps")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "BanditCampFeature")
+ logicEntityMenu:addLine(name, "lua", "", "BanditCampFeature")
name = i18n.get("uiR2EdGroups")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "NpcGrpFeature")
+ logicEntityMenu:addLine(name, "lua", "", "NpcGrpFeature")
name = i18n.get("uiR2EdNPCs")
- logicEntityMenu:addLine(ucstring(name), "lua", "", "Npc")
+ logicEntityMenu:addLine(name, "lua", "", "Npc")
r2:registerFeaturesMenu(logicEntityMenu)
@@ -345,7 +345,7 @@ function r2:initWhichEntityMenu()
addLine = false
end
if addLine then
- subMenu:addLine(ucstring(entity.Name), "lua", "r2:selectWhichEntity(".. tostring(i) .. "," .. tostring(count) .. ")", entity.InstanceId)
+ subMenu:addLine(entity.Name, "lua", "r2:selectWhichEntity(".. tostring(i) .. "," .. tostring(count) .. ")", entity.InstanceId)
count=count+1
end
end
@@ -500,7 +500,7 @@ function r2:updateActionText(actionUI)
totalText = totalText.."\n"
end
- actionText:addTextChild(ucstring(totalText))
+ actionText:addTextChild(totalText)
sep.active = true
else
sep.active = false
@@ -575,7 +575,7 @@ function r2:updateReactionText(reactionUI)
end
end
- reactionText:addTextChild(ucstring(totalText))
+ reactionText:addTextChild(totalText)
sep.active = true
else
@@ -986,7 +986,7 @@ function r2:openRightMenu(isEntityOfLeftMenu, loadTable, selectLineFunction)
local openSequencesMenu = r2.openSequencesMenu[action]
local actionName = r2.logicEntityAttributes[loadTable][action]
if actionName == nil then actionName = "?"..action.."?" end
- local actionText = ucstring(actionName)
+ local actionText = actionName
if openSequencesMenu ~= nil then
-- first line
@@ -1013,8 +1013,8 @@ function r2:openRightMenu(isEntityOfLeftMenu, loadTable, selectLineFunction)
if not openSequencesMenu.singleSubMenu then
- --subMenu:addLine(ucstring(sequence.Name), "", "", sequence.InstanceId)
- subMenu:addLine(ucstring(r2:getSequenceName(sequence)), "", "", sequence.InstanceId)
+ --subMenu:addLine(sequence.Name, "", "", sequence.InstanceId)
+ subMenu:addLine(r2:getSequenceName(sequence), "", "", sequence.InstanceId)
-- steps sub menu
subMenu:addSubMenu(s)
@@ -1029,13 +1029,13 @@ function r2:openRightMenu(isEntityOfLeftMenu, loadTable, selectLineFunction)
for s = 0, steps.Size - 1 do
local step = steps[s]
local stepName = r2:getElementName(step)
- stepsMenu:addLine(ucstring(stepName), "lua",
+ stepsMenu:addLine(stepName, "lua",
selectLineFunction.. "('".. action .. "','" .. step.InstanceId .."')", step.InstanceId)
count2=count2+1
end
else
- --subMenu:addLine(ucstring(sequence.Name), "lua",
- subMenu:addLine(ucstring(r2:getSequenceName(sequence)), "lua",
+ --subMenu:addLine(sequence.Name, "lua",
+ subMenu:addLine(r2:getSequenceName(sequence), "lua",
selectLineFunction.. "('".. action .. "','" .. sequence.InstanceId .. "')", sequence.InstanceId)
end
@@ -1321,7 +1321,7 @@ function r2:buildActionTitle(actionUI, erase)
-- title
local title = actionUI:find("title")
assert(title)
- title.uc_hardtext= part1..part2
+ title.text= part1..part2
end
function r2:getActionName(actionInst)
@@ -1621,15 +1621,15 @@ function r2:updateActionEditor()
local whichEventNameText = whichEventLabel:find("name_text")
assert(whichEventNameText)
text = r2:getSelectedInstance().Name
- whichEventNameText.uc_hardtext = text
+ whichEventNameText.text = text
if actionInst ~= nil then
local index = r2:searchElementIndex(actionInst)
if index~= nil then
- actionName.uc_hardtext = tostring(i18n.get("uiR2EdAction")).." "..index.." : "
+ actionName.text = tostring(i18n.get("uiR2EdAction")).." "..index.." : "
else
- actionName.uc_hardtext = tostring(i18n.get("uiR2EdAction")).." : "
+ actionName.text = tostring(i18n.get("uiR2EdAction")).." : "
end
-- which event text
@@ -1641,7 +1641,7 @@ function r2:updateActionEditor()
assert(inst)
text = text .. " : " .. r2:getElementName(inst)
end
- whichEventText.uc_hardtext = text
+ whichEventText.text = text
local previousButtonPair = actionsList:getChild(0)
-- ActionStep list
@@ -1659,7 +1659,7 @@ function r2:updateActionEditor()
local whichEntityText = whichEntityMenu:find("text")
assert(whichEntityText)
text = r2:getInstanceFromId(tostring(actionStepInst.Entity)).Name
- whichEntityText.uc_hardtext = text
+ whichEntityText.text = text
local whatActionMenu = previousButtonPair:find("right_menu")
@@ -1674,7 +1674,7 @@ function r2:updateActionEditor()
assert(inst)
text = text .. " : " .. r2:getElementName(inst)
end
- whatActionText.uc_hardtext = text
+ whatActionText.text = text
previousButtonPair.Env.entityId = tostring(actionStepInst.Entity)
previousButtonPair = newButtonPair
@@ -1696,7 +1696,7 @@ function r2:updateActionEditor()
local whichEntityText = whichEntityMenu:find("text")
assert(whichEntityText)
text = r2:getInstanceFromId(tostring(conditionInst.Entity)).Name
- whichEntityText.uc_hardtext = text
+ whichEntityText.text = text
local whatConditionMenu = previousButtonPair:find("right_menu")
assert(whatConditionMenu)
@@ -1710,7 +1710,7 @@ function r2:updateActionEditor()
assert(inst)
text = text .. " : " .. r2:getElementName(inst)
end
- whatConditionText.uc_hardtext = text
+ whatConditionText.text = text
previousButtonPair.Env.entityId = tostring(conditionInst.Entity)
previousButtonPair = newButtonPair
@@ -1718,9 +1718,9 @@ function r2:updateActionEditor()
else
local name = tostring(i18n.get("uiR2EdAction")).." : "
- actionName.uc_hardtext = name
+ actionName.text = name
- whichEventText.uc_hardtext = ""
+ whichEventText.text = ""
end
end
@@ -1834,12 +1834,12 @@ function r2:buildReactionTitle(reactionUI, erase)
local part3 = tostring(i18n.get("uiR2EdEventTxtPreEvent")).." '".. eventType .."' "..tostring(i18n.get("uiR2EdEventOf")).." ".. whichEntity.Name
-- title
- title.uc_hardtext= part1..part2..part3
+ title.text= part1..part2..part3
elseif erase==true then
local eltsList = reactionUI.parent
local indexReactionUI = eltsList:getElementIndex(reactionUI) - 1
- title.uc_hardtext = tostring(i18n.get("uiR2EdReaction")).." "..indexReactionUI.." : "
+ title.text = tostring(i18n.get("uiR2EdReaction")).." "..indexReactionUI.." : "
end
end
@@ -2091,7 +2091,7 @@ function r2:updateReactionEditor()
local whatActionText = whatActionLabel:find("name_text")
assert(whatActionText)
local text = " " .. r2:getSelectedInstance().Name
- whatActionText.uc_hardtext = text
+ whatActionText.text = text
local conditions = reactionEditor:find("conditions_list")
assert(conditions)
@@ -2119,9 +2119,9 @@ function r2:updateReactionEditor()
actions.active = false
conditions.active = false
- whatActionText.uc_hardtext = ""
- whatTriggersText.uc_hardtext = ""
- whichEventText.uc_hardtext = ""
+ whatActionText.text = ""
+ whatTriggersText.text = ""
+ whichEventText.text = ""
if reactionEditor.Env.minimize ~= true then
reactionEditor.h = reactionEditor.h - 320
@@ -2162,7 +2162,7 @@ function r2:updateReactionEditor()
assert(inst)
text = text .. " : " .. r2:getElementName(inst)
end
- whatActionText.uc_hardtext = text
+ whatActionText.text = text
-- "what triggers..." and "which event" buttons text
local entityName = actionInst.ParentInstance.Parent.Name
@@ -2175,9 +2175,9 @@ function r2:updateReactionEditor()
text = text .. " : " .. r2:getElementName(inst)
end
- whatTriggersText.uc_hardtext = entityName
+ whatTriggersText.text = entityName
- whichEventText.uc_hardtext = text
+ whichEventText.text = text
menuPair.Env.entityId = actionInst.ParentInstance.Parent.InstanceId
@@ -2200,7 +2200,7 @@ function r2:updateReactionEditor()
local whichEntityText = whichEntityMenu:find("text")
assert(whichEntityText)
text = r2:getInstanceFromId(tostring(actionStepInst.Entity)).Name
- whichEntityText.uc_hardtext = text
+ whichEntityText.text = text
local whatActionMenu = previousButtonPair:find("right_menu")
assert(whatActionMenu)
@@ -2215,7 +2215,7 @@ function r2:updateReactionEditor()
assert(inst)
text = text .. " : " .. r2:getElementName(inst)
end
- whatActionText.uc_hardtext = text
+ whatActionText.text = text
previousButtonPair.Env.entityId = tostring(actionStepInst.Entity)
previousButtonPair = newButtonPair
@@ -2239,7 +2239,7 @@ function r2:updateReactionEditor()
local whichEntityText = whichEntityMenu:find("text")
assert(whichEntityText)
text = r2:getInstanceFromId(tostring(conditionInst.Entity)).Name
- whichEntityText.uc_hardtext = text
+ whichEntityText.text = text
local whatConditionMenu = previousButtonPair:find("right_menu")
assert(whatConditionMenu)
@@ -2252,14 +2252,14 @@ function r2:updateReactionEditor()
assert(inst)
text = text .. " : " .. r2:getElementName(inst)
end
- whatConditionText.uc_hardtext = text
+ whatConditionText.text = text
previousButtonPair.Env.entityId = tostring(conditionInst.Entity)
previousButtonPair = newButtonPair
end
end
- reactionName.uc_hardtext = name
+ reactionName.text = name
end
---------------------------- new element --------------------------------------------------------------
@@ -2408,7 +2408,7 @@ function r2:updateLogicEntityUI(instance)
r2:updateReactionEditor()
end
- logicEntityUI.uc_title = tostring(i18n.get("uiR2EDEventsTriggersEditor")) .. r2:getSelectedInstance().Name
+ logicEntityUI.title = tostring(i18n.get("uiR2EDEventsTriggersEditor")) .. r2:getSelectedInstance().Name
end
----------------------------- CLOSE ACTION / REACTION EDITOR ------------------------------------
@@ -2485,7 +2485,7 @@ r2.logicEntityUIUpdated = false
-- local logicEntityWnd = getUI("ui:interface:r2ed_logic_entities")
-- assert(logicEntityWnd)
--- logicEntityWnd.uc_title = tostring(i18n.get("uiR2EDEventsTriggersEditor")) .. instance[attributeName]
+-- logicEntityWnd.title = tostring(i18n.get("uiR2EDEventsTriggersEditor")) .. instance[attributeName]
-- end
--end
diff --git a/ryzom/common/data_common/r2/r2_ui_palette.lua b/ryzom/common/data_common/r2/r2_ui_palette.lua
index 16e28b0dd..c36cb34ab 100644
--- a/ryzom/common/data_common/r2/r2_ui_palette.lua
+++ b/ryzom/common/data_common/r2/r2_ui_palette.lua
@@ -52,8 +52,8 @@ function r2:buildPaletteUI()
subNode.Text = i18n.get(instValue.Translation)
end
- r2.PaletteIdToTranslation[instValue.Id] = subNode.Text:toUtf8()
- r2.PaletteIdToGroupTranslation[instValue.Id] = newNode.Text:toUtf8()
+ r2.PaletteIdToTranslation[instValue.Id] = subNode.Text
+ r2.PaletteIdToGroupTranslation[instValue.Id] = newNode.Text
r2.PaletteIdToType[instValue.Id] = v
subNode.Id = tostring(shortElementId)
diff --git a/ryzom/common/data_common/r2/r2_ui_player_tracking.lua b/ryzom/common/data_common/r2/r2_ui_player_tracking.lua
index b9f6a3672..c2f2d9cfe 100644
--- a/ryzom/common/data_common/r2/r2_ui_player_tracking.lua
+++ b/ryzom/common/data_common/r2/r2_ui_player_tracking.lua
@@ -112,28 +112,28 @@ end
--***********************************************************************
function PlayerTracking:initRaceTypes()
for k = 0, 3 do
- self.RaceTypeToUtf8[math.pow(2, k)] = i18n.get("uiRAP_PlayerRace_" .. tostring(k)):toUtf8()
+ self.RaceTypeToUtf8[math.pow(2, k)] = i18n.get("uiRAP_PlayerRace_" .. tostring(k))
end
end
--***********************************************************************
function PlayerTracking:initReligionTypes()
for k = 0, 2 do
- self.ReligionTypeToUtf8[math.pow(2, k)] = i18n.get("uiRAP_PlayerReligion_" .. tostring(k)):toUtf8()
+ self.ReligionTypeToUtf8[math.pow(2, k)] = i18n.get("uiRAP_PlayerReligion_" .. tostring(k))
end
end
--***********************************************************************
function PlayerTracking:initShardTypes()
for k = 0, 2 do
- self.ShardTypeToUtf8[math.pow(2, k)] = i18n.get("uiRAP_PlayerShard_" .. tostring(k)):toUtf8()
+ self.ShardTypeToUtf8[math.pow(2, k)] = i18n.get("uiRAP_PlayerShard_" .. tostring(k))
end
end
--***********************************************************************
function PlayerTracking:initLevelTypes()
for k = 0, 5 do
- self.LevelTypeToUtf8[math.pow(2, k)] = i18n.get("uiRAP_PlayerLevel_" .. tostring(k)):toUtf8()
+ self.LevelTypeToUtf8[math.pow(2, k)] = i18n.get("uiRAP_PlayerLevel_" .. tostring(k))
end
end
@@ -154,9 +154,6 @@ function PlayerTracking:getSelectList()
return getUI("ui:login:ring_players_tracking:content:main:enclosing:columns:getw:select")
end
-
-local scratchUCStr = ucstring()
-
--***********************************************************************
function PlayerTracking:newTemplate(name, cache)
local group
@@ -173,8 +170,7 @@ end
-- build a new text group from utf8 text
function PlayerTracking:newTextLabel(value)
local group = self:newTemplate("rap_text", self.TextCache)
- scratchUCStr:fromUtf8(value)
- group:find("t").uc_hardtext_single_line_format = scratchUCStr
+ group:find("t").text_single_line_format = value
return group
end
@@ -182,15 +178,14 @@ end
-- build a new text group from utf8 text
function PlayerTracking:newCenteredTextLabel(value)
local group = self:newTemplate("rap_text_centered", self.CenteredTextCache)
- scratchUCStr:fromUtf8(value)
- group:find("t").uc_hardtext_single_line_format = scratchUCStr
+ group:find("t").text_single_line_format = value
return group
end
--***********************************************************************
function PlayerTracking:newNumberLabel(value)
local group = self:newTemplate("rap_number", self.NumberCache)
- group:find("t").uc_hardtext_single_line_format = tostring(value)
+ group:find("t").text_single_line_format = tostring(value)
return group
end
@@ -358,7 +353,7 @@ function PlayerTracking:fill(list)
self:setErrorMessage("uiRAP_NoSessionForLangFilter")
else
--self:setErrorMessage(i18n.get("uiRAP_NoSessionFound"))
- self:setErrorMessage(ucstring())
+ self:setErrorMessage("")
self:enableButtons(false)
end
else
@@ -372,7 +367,7 @@ end
--***********************************************************************
function PlayerTracking:setMessage(msg, color)
local errorTxt = self:getWindow():find("errorMsg")
- errorTxt.uc_hardtext = msg
+ errorTxt.text = msg
errorTxt.color = color
errorTxt.active=true
end
@@ -463,9 +458,9 @@ function PlayerTracking:onLineRightClick()
self:onLineLeftClick()
local menu = getUI("ui:login:ring_player_menu")
- menu:find("tell").uc_hardtext = ucstring(i18n.get("uiRAP_MenuPlayerTell"):toUtf8() .. "'" .. self:getPlayerFromId(self.SelectedPlayerId).Player .."'")
- menu:find("teleport").uc_hardtext = ucstring(i18n.get("uiRAP_MenuTeleportTo"):toUtf8() .. "'" .. self:getPlayerFromId(self.SelectedPlayerId).Player.."'")
- menu:find("kick").uc_hardtext = ucstring(i18n.get("uiRAP_MenuKick"):toUtf8() .. "'" .. self:getPlayerFromId(self.SelectedPlayerId).Player.."'")
+ menu:find("tell").text = i18n.get("uiRAP_MenuPlayerTell") .. "'" .. self:getPlayerFromId(self.SelectedPlayerId).Player .."'"
+ menu:find("teleport").text = i18n.get("uiRAP_MenuTeleportTo") .. "'" .. self:getPlayerFromId(self.SelectedPlayerId).Player.."'"
+ menu:find("kick").text = i18n.get("uiRAP_MenuKick") .. "'" .. self:getPlayerFromId(self.SelectedPlayerId).Player.."'"
menu:find("kick").grayed = not self:isConnected(self:getPlayerFromId(self.SelectedPlayerId).Flags)
menu:find("teleport").grayed = not self:isConnected(self:getPlayerFromId(self.SelectedPlayerId).Flags)
@@ -481,9 +476,7 @@ end
--***********************************************************************
function PlayerTracking:onTell()
debugInfo("tell to owner of session" .. self.SelectedPlayerId)
- player = ucstring()
- player:fromUtf8(self:getPlayerFromId(self.SelectedPlayerId).Player)
- tell(player)
+ tell(self:getPlayerFromId(self.SelectedPlayerId).Player)
end
--***********************************************************************
diff --git a/ryzom/common/data_common/r2/r2_ui_property_sheet.lua b/ryzom/common/data_common/r2/r2_ui_property_sheet.lua
index 65f351d4a..880d8f67a 100644
--- a/ryzom/common/data_common/r2/r2_ui_property_sheet.lua
+++ b/ryzom/common/data_common/r2/r2_ui_property_sheet.lua
@@ -34,13 +34,13 @@ r2.DefaultPropertySheetTitleClampSize = -28
local eventArgs = {} -- static table here to avoid costly allocs with the ellipsis ...
local emptyArgs = {}
-- build an edit box for an arbitrary type
-function r2:buildEditBox(prop, textRef, entryType, multiLine, maxNumChars, onChangeAction, onFocusLostAction)
+function r2:buildEditBox(prop, textRef, entryType, multiLine, maxNumBytes, onChangeAction, onFocusLostAction)
local result =
[["
@@ -148,22 +149,20 @@ r2.WidgetStyles.String =
ok = r2.assert(loadstring('return '.. prop.ValidationFun))()(value)
end
if ok then
- local ucValue = ucstring()
--debugInfo("value = " .. tostring(value))
- ucValue:fromUtf8(value)
- widget.eb.uc_input_string = ucValue
- widget.eb.Env.CurrString = ucValue
+ widget.eb.input_string = value
+ widget.eb.Env.CurrString = value
--debugInfo("setting" .. widget.eb.id .. " to " .. tostring(value))
else
- widget.eb.uc_input_string = widget.eb.Env.CurrString
- widget.eb.input_string = widget.eb.uc_input_string:toUtf8()
+ widget.eb.input_string = widget.eb.Env.CurrString
+ widget.eb.input_string = widget.eb.input_string
end
end
local validation = ""
if prop.ValidationFun then
- validation = string.format([[ if not %s(utf8Value) then editBox.uc_input_string = editBox.Env.CurrString; return end]], prop.ValidationFun)
+ validation = string.format([[ if not %s(utf8Value) then editBox.input_string = editBox.Env.CurrString; return end]], prop.ValidationFun)
end
local onChangeAction =
@@ -174,7 +173,7 @@ r2.WidgetStyles.String =
return
end
- local utf8Value = editBox.uc_input_string:toUtf8()
+ local utf8Value = editBox.input_string
%s
editBox.Env.CurrString = editBox.input_string
r2:requestSetObjectProperty('%s', utf8Value)
@@ -184,7 +183,7 @@ r2.WidgetStyles.String =
if prop.ValidateOnEnter then
onChangeAction = onChangeAction .. "r2:validateForm(r2.CurrentForm)"
end
- return r2:buildEditBox(prop, "TL TL", defaulting(prop.EntryType, "text"), true, defaulting(prop.MaxNumChar, 256), onChangeAction, onFocusLostAction),
+ return r2:buildEditBox(prop, "TL TL", defaulting(prop.EntryType, "text"), true, defaulting(prop.MaxNumChar, 255), onChangeAction, onFocusLostAction),
setter,
nil
end,
@@ -193,9 +192,7 @@ r2.WidgetStyles.String =
--debugInfo("Building static text")
local function setter(widget, prop, value)
--debugInfo("value = " .. tostring(value))
- local ucValue = ucstring()
- ucValue:fromUtf8(value)
- widget.uc_hardtext = ucValue
+ widget.text = value
end
local widgetXml =
string.format([[ ]], prop.Name)
@@ -206,9 +203,7 @@ r2.WidgetStyles.String =
--debugInfo("Building static text")
local function setter(widget, prop, value)
--debugInfo("value = " .. tostring(value))
- local ucValue = ucstring()
- ucValue:fromUtf8(value)
- widget.uc_hardtext = ucValue
+ widget.text = value
end
local widgetXml =
string.format([[ ]], prop.Name)
@@ -281,12 +276,10 @@ end
--
function refIdDefaultEventHandler:update(widget, value, target)
local text = widget:find("name")
- if target then
- local newName = ucstring()
- newName:fromUtf8(target.Name)
- text.uc_hardtext = newName
+ if target then
+ text.text = target.Name
else
- text.uc_hardtext = i18n.get("uiR2EDNone")
+ text.text = i18n.get("uiR2EDNone")
end
end
--
@@ -623,8 +616,7 @@ function refIdPlotItemEventHandler:updateSheet(widget, targetPlotItem)
local dbPath = "LOCAL:R2:PLOT_ITEMS:" .. tostring(k)
if getDbProp(dbPath .. ":SHEET") == targetPlotItem.SheetId then
widget.sheet.sheet = dbPath
- r2.ScratchUCStr:fromUtf8(targetPlotItem.Name)
- widget.t.uc_hardtext = r2.ScratchUCStr
+ widget.t.text = targetPlotItem.Name
return true
end
end
@@ -644,7 +636,7 @@ function refIdPlotItemEventHandler:update(widget, value, target)
end
widget.sheet.sheet = ""
- widget.t.uc_hardtext = i18n.get("uiR2EDChooseItem")
+ widget.t.text = i18n.get("uiR2EDChooseItem")
end
-- ui handling for selection of plot items from the scenario
@@ -787,7 +779,7 @@ function r2:requestSetObjectProperty(propName, value, isLocal)
return -- not really modified -> no op
end
local ucActionName = r2:getPropertyTranslation(prop)
- r2.requestNewAction(concatUCString(i18n.get("uiR2EDChangePropertyAction"), ucActionName, i18n.get("uiR2EDChangePropertyOf"), target:getDisplayName()))
+ r2.requestNewAction(concatString(i18n.get("uiR2EDChangePropertyAction"), ucActionName, i18n.get("uiR2EDChangePropertyOf"), target:getDisplayName()))
-- this is a property sheet
@@ -1915,7 +1907,7 @@ function r2:buildAllPropertySheetsAndForms()
--f:write(r2:encloseXmlScript(xmlScript))
--f:flush()
--f:close()
- parseInterfaceFromString(ucstring(r2:encloseXmlScript(xmlScript)):toUtf8())
+ parseInterfaceFromString(r2:encloseXmlScript(xmlScript))
local endTime = nltime.getLocalTime()
debugInfo(string.format("Reparsing generated xml took %f second", (endTime - startTime) / 1000))
end
@@ -2055,7 +2047,7 @@ function propertySheetDisplayerTable:onAttrModified(instance, attributeName, ind
local propertySheet = r2:getPropertySheet(instance)
if propertySheet then
if attributeName == "Name" and instance == r2:getSelectedInstance() then
- propertySheet.uc_title = concatUCString(i18n.get("uiRE2DPropertiesOf"), instance:getDisplayName())
+ propertySheet.title = concatString(i18n.get("uiRE2DPropertiesOf"), instance:getDisplayName())
end
propertySheet.Env.updatePropVisibility()
end
@@ -2164,7 +2156,7 @@ function r2:showProperties(instance)
end
end
if instance and instance:getClass().BuildPropertySheet then
- newPropWindow.uc_title = concatUCString(i18n.get("uiRE2DPropertiesOf"), instance:getDisplayName())
+ newPropWindow.title = concatString(i18n.get("uiRE2DPropertiesOf"), instance:getDisplayName())
end
end
r2.CurrentPropertyWindow = newPropWindow
@@ -2225,9 +2217,9 @@ function r2:doForm(formName, initialTable, validateCallback, cancelCallback)
formUI:center()
formUI:updateCoords()
if form.Caption ~= nil then
- formUI.uc_title = i18n.get(form.Caption)
+ formUI.title = i18n.get(form.Caption)
else
- formUI.uc_title = i18n.get("uiR2EDForm")
+ formUI.title = i18n.get("uiR2EDForm")
end
r2.CurrentForm = formUI
if type(form.onShow) == "function" then
diff --git a/ryzom/common/data_common/r2/r2_ui_reset.lua b/ryzom/common/data_common/r2/r2_ui_reset.lua
index aca6a351b..d21684f39 100644
--- a/ryzom/common/data_common/r2/r2_ui_reset.lua
+++ b/ryzom/common/data_common/r2/r2_ui_reset.lua
@@ -385,7 +385,7 @@ function r2:onChangeDesktop(desktopIndex)
-- set new title for th "keys" window
local keys = getUI("ui:interface:keys")
if keys then
- keys.uc_title = i18n.get("uiR2EDEditingKeys")
+ keys.title = i18n.get("uiR2EDEditingKeys")
end
if r2.UserComponentsManager then
@@ -426,7 +426,7 @@ function r2:onChangeDesktop(desktopIndex)
local keys = getUI("ui:interface:keys")
if keys then
- keys.uc_title = i18n.get("uiR2EDTestOrDMKeys")
+ keys.title = i18n.get("uiR2EDTestOrDMKeys")
end
----------------------------------------------------------------------------------------------------------
@@ -473,7 +473,7 @@ function r2:onChangeDesktop(desktopIndex)
r2.ui.AnimBar:updateDMControlledEntitiesWindow()
local keys = getUI("ui:interface:keys")
if keys then
- keys.uc_title = i18n.get("uiR2EDTestOrDMKeys")
+ keys.title = i18n.get("uiR2EDTestOrDMKeys")
end
end
diff --git a/ryzom/common/data_common/r2/r2_ui_scenario.lua b/ryzom/common/data_common/r2/r2_ui_scenario.lua
index 4ed11ec63..4e78263dd 100644
--- a/ryzom/common/data_common/r2/r2_ui_scenario.lua
+++ b/ryzom/common/data_common/r2/r2_ui_scenario.lua
@@ -42,7 +42,7 @@ function r2.ScenarioWindow:initScenarioWindow()
local languages2 = {}
for k, lang in pairs(languages) do
- self.Languages[i18n.get("uiR2ED"..lang):toUtf8()] = lang
+ self.Languages[i18n.get("uiR2ED"..lang)] = lang
table.insert(languages2, i18n.get("uiR2ED"..lang))
end
table.sort(languages2)
@@ -53,7 +53,7 @@ function r2.ScenarioWindow:initScenarioWindow()
local types2 = {}
for k, type in pairs(types) do
- self.Types[i18n.get("uiR2ED"..type):toUtf8()] = type
+ self.Types[i18n.get("uiR2ED"..type)] = type
table.insert(types2, i18n.get("uiR2ED"..type))
end
table.sort(types2)
@@ -70,7 +70,7 @@ function r2.ScenarioWindow:initScenarioWindow()
table.insert(locked, "RoSOnly")
end
for k, type in pairs(locked) do
- self.Locked[i18n.get("uiR2ED"..type):toUtf8()] = type
+ self.Locked[i18n.get("uiR2ED"..type)] = type
table.insert(tmp, i18n.get("uiR2ED"..type))
end
-- table.sort(tmp)
@@ -183,17 +183,13 @@ function r2.ScenarioWindow:updateLeftQuota()
self.LeftQuota, self.LeftStaticQuota = act:getLeftQuota()
- local uc_tooltip = ucstring()
quotaViewText.hardtext = string.format("(%d)", self.LeftQuota)
- uc_tooltip:fromUtf8(i18n.get("uiR2EDScene"):toUtf8() .. " (" .. self.LeftQuota .. ")")
- quotaTooltip.tooltip = uc_tooltip
- quotaMacroViewText.hardtext = string.format("(%d)", self.LeftQuota)
- uc_tooltip:fromUtf8(i18n.get("uiR2EDMacroComponents"):toUtf8() .. " (" .. self.LeftQuota .. ")")
- quotaMacroTooltip.tooltip = uc_tooltip
+ quotaTooltip.tooltip = i18n.get("uiR2EDScene") .. " (" .. self.LeftQuota .. ")"
+ quotaMacroViewText.hardtext = string.format("(%d)", self.LeftQuota)
+ quotaMacroTooltip.tooltip = i18n.get("uiR2EDMacroComponents") .. " (" .. self.LeftQuota .. ")"
quotaViewTextMisc.hardtext = string.format("(%d)", self.LeftStaticQuota)
quotaViewTextMisc2.hardtext = string.format("(%d)", self.LeftStaticQuota)
- uc_tooltip:fromUtf8(i18n.get("uiR2EDbotObjects"):toUtf8() .. " (" .. self.LeftStaticQuota .. ")")
- quotaMiscTooltip.tooltip = uc_tooltip
+ quotaMiscTooltip.tooltip = i18n.get("uiR2EDbotObjects") .. " (" .. self.LeftStaticQuota .. ")"
quotaViewText.color_rgba = select(self.LeftQuota >= 0, CRGBA(255, 255, 255), CRGBA(255, 0, 0))
quotaViewTextMisc.color_rgba = select(self.LeftStaticQuota >= 0, CRGBA(255, 255, 255), CRGBA(255, 0, 0))
@@ -218,7 +214,7 @@ function r2.ScenarioWindow:setAct(act)
r2:setCurrentActFromId(act.InstanceId) -- will also trigger ui update (called by C++)
if act.InstanceId~=self.setActId then
if not r2:isClearingContent() then
- displaySystemInfo(concatUCString(i18n.get("uiR2EDCurrentActNotify"), act:getDisplayName()), "BC")
+ displaySystemInfo(concatString(i18n.get("uiR2EDCurrentActNotify"), act:getDisplayName()), "BC")
end
self.setActId = act.InstanceId
end
@@ -230,20 +226,17 @@ end
function r2.ScenarioWindow:updateComboBoxCurrentAct(newAct)
local comboB = self:getActComboBox()
- local text = ucstring()
local currentAct = r2:getCurrentAct()
if not (currentAct==nil or currentAct.isNil) then
local currentActIndex = r2.ScenarioWindow:findComboBoxLineFromAct(currentAct)
if currentActIndex then
- text:fromUtf8(currentAct:getName())
- comboB:setText(currentActIndex, text)
+ comboB:setText(currentActIndex, currentAct:getName())
end
end
local newActIndex = r2.ScenarioWindow:findComboBoxLineFromAct(newAct)
if newActIndex then
- text:fromUtf8(newAct:getName() .. " [" .. i18n.get("uiR2EDCurrentActComboBox"):toUtf8() .."]")
- comboB:setText(newActIndex, text)
+ comboB:setText(newActIndex, newAct:getName() .. " [" .. i18n.get("uiR2EDCurrentActComboBox") .."]")
end
end
@@ -316,11 +309,11 @@ function r2.ScenarioWindow:confirmDeleteAct()
local name = act.Name
- local firstPart = i18n.get("uiR2EDDefaultActTitle"):toUtf8() .. i
- local firstPartSpace = i18n.get("uiR2EDDefaultActTitle"):toUtf8().. " " .. i
+ local firstPart = i18n.get("uiR2EDDefaultActTitle") .. i
+ local firstPartSpace = i18n.get("uiR2EDDefaultActTitle").. " " .. i
if name == firstPart or name == firstPartSpace then
- name = i18n.get("uiR2EDDefaultActTitle"):toUtf8() .. " " .. (i-1)
+ name = i18n.get("uiR2EDDefaultActTitle") .. " " .. (i-1)
r2.requestSetNode(act.InstanceId, "Name", name)
end
@@ -527,8 +520,8 @@ function r2.ScenarioWindow:setActNotes()
local actGr = scenarioUI:find("act_properties")
assert(actGr)
- local preActNotes = actGr:find("pre_act_notes"):find("small_description").uc_input_string:toUtf8()
- local actNotes = actGr:find("act_notes"):find("small_description").uc_input_string:toUtf8()
+ local preActNotes = actGr:find("pre_act_notes"):find("small_description").input_string
+ local actNotes = actGr:find("act_notes"):find("small_description").input_string
if act==nil then act = r2:getCurrentAct() end
if actNotes~=act.ShortDescription then
@@ -585,9 +578,7 @@ function r2.ScenarioWindow:updateActProperties()
if location==nil then return end
local locationName = actGr:find("location_name")
assert(locationName)
- local uc_location = ucstring()
- uc_location:fromUtf8(location.Name)
- locationName.uc_hardtext = uc_location
+ locationName.text = location.Name
-- season
local seasons = {
@@ -600,7 +591,7 @@ function r2.ScenarioWindow:updateActProperties()
assert(season)
local seasonStr = seasons[location.Season]
local uc_season = i18n.get(seasonStr)
- season.uc_hardtext = uc_season
+ season.text = uc_season
-- manual weather
local weatherGr = actGr:find("weather")
@@ -624,9 +615,7 @@ function r2.ScenarioWindow:updateActProperties()
assert(notesGr)
local notesAct = notesGr:find("small_description")
assert(notesAct)
- local uc_notes = ucstring()
- uc_notes:fromUtf8(act.ShortDescription)
- notesAct.uc_input_string = uc_notes
+ notesAct.input_string = act.ShortDescription
end
-- pre act notes
@@ -635,9 +624,7 @@ function r2.ScenarioWindow:updateActProperties()
assert(notesGr)
local notesAct = notesGr:find("small_description")
assert(notesAct)
- local uc_notes = ucstring()
- uc_notes:fromUtf8(act.PreActDescription)
- notesAct.uc_input_string = uc_notes
+ notesAct.input_string = act.PreActDescription
end
@@ -645,11 +632,8 @@ function r2.ScenarioWindow:updateActProperties()
if act==r2:getCurrentAct() then
local entityBudgetText = scenarioUI:find("entity_budget_text")
local macroBudgetText = scenarioUI:find("macro_budget_text")
- local ucBudget = ucstring()
- ucBudget:fromUtf8(i18n.get("uiR2EDMacroComponentsInAct"):toUtf8() .. act:getName())
- macroBudgetText.uc_hardtext = ucBudget
- ucBudget:fromUtf8(i18n.get("uiR2EDEntitiesInAct"):toUtf8() .. act:getName())
- entityBudgetText.uc_hardtext = ucBudget
+ macroBudgetText.text = i18n.get("uiR2EDMacroComponentsInAct") .. act:getName()
+ entityBudgetText.text = i18n.get("uiR2EDEntitiesInAct") .. act:getName()
end
end
@@ -677,9 +661,9 @@ function r2.ScenarioWindow:updateScenarioProperties()
assert(cb)
if r2.Scenario.Description.OtherCharAccess then
local access = r2.Scenario.Description.OtherCharAccess
- cb.selection_text = i18n.get("uiR2ED".. access):toUtf8()
+ cb.selection_text = i18n.get("uiR2ED".. access)
else
- cb.selection_text = i18n.get("uiR2EDFull"):toUtf8()
+ cb.selection_text = i18n.get("uiR2EDFull")
end
end
@@ -707,9 +691,7 @@ function r2.ScenarioWindow:updateScenarioProperties()
assert(ui)
local widget = ui:find("mission_tag")
assert(widget)
- local uc = ucstring()
- uc:fromUtf8(scenario.Description.MissionTag)
- widget:find("mission_tag_eb").eb.uc_input_string = uc
+ widget:find("mission_tag_eb").eb.input_string = scenario.Description.MissionTag
end
-- scenario rules
@@ -723,39 +705,33 @@ function r2.ScenarioWindow:updateScenarioProperties()
-- scenario language
local languageCB = scenarioGr:find("language_combo_box")
assert(languageCB)
- languageCB.selection_text = i18n.get("uiR2ED"..r2.Scenario.Language):toUtf8()
+ languageCB.selection_text = i18n.get("uiR2ED"..r2.Scenario.Language)
-- scenario type
local typeCB = scenarioGr:find("type_combo_box")
assert(typeCB)
-- special case for old enums
if r2.Scenario.Type =="Combat" then
- typeCB.selection_text = i18n.get("uiR2EDso_hack_slash"):toUtf8()
+ typeCB.selection_text = i18n.get("uiR2EDso_hack_slash")
elseif r2.Scenario.Type =="Roleplay" then
- typeCB.selection_text = i18n.get("uiR2EDso_story_telling"):toUtf8()
+ typeCB.selection_text = i18n.get("uiR2EDso_story_telling")
else
- typeCB.selection_text = i18n.get("uiR2ED"..r2.Scenario.Type):toUtf8()
+ typeCB.selection_text = i18n.get("uiR2ED"..r2.Scenario.Type)
end
-- scenario title
- local ucTitle = ucstring()
- ucTitle:fromUtf8(scenario.Description.Title)
- getUI("ui:interface:r2ed_scenario"):find("title_eb").eb.uc_input_string = ucTitle
+ getUI("ui:interface:r2ed_scenario"):find("title_eb").eb.input_string = scenario.Description.Title
-- scenario notes
local notesGr = scenarioGr:find("scenario_notes")
assert(notesGr)
local notesScenario = notesGr:find("small_description")
assert(notesScenario)
- local uc_notes = ucstring()
- uc_notes:fromUtf8(scenario.Description.ShortDescription)
- notesScenario.uc_input_string = uc_notes
+ notesScenario.input_string = scenario.Description.ShortDescription
-- scenario name
local scenarioName = scenarioUI:find("scenario_name_text")
- local uc_name = ucstring()
- uc_name:fromUtf8(i18n.get("uiR2EDScenarioFilename"):toUtf8() .. " " ..ucstring(scenario:getName()):toUtf8())
- scenarioName.uc_hardtext = uc_name
+ scenarioName.text = i18n.get("uiR2EDScenarioFilename") .. " " ..scenario:getName()
self.lockComboBoxes = false
end
@@ -769,7 +745,7 @@ function r2.ScenarioWindow:setScenarioNotes()
local scenarioGr = scenarioUI:find("scenario_properties")
assert(scenarioGr)
- local scenarioNotes = scenarioGr:find("scenario_notes"):find("small_description").uc_input_string:toUtf8()
+ local scenarioNotes = scenarioGr:find("scenario_notes"):find("small_description").input_string
if r2.Scenario and scenarioNotes~= r2.Scenario.Description.ShortDescription then
r2.requestNewAction(i18n.get("uiR2EDChangeScenarioDescription"))
@@ -865,7 +841,7 @@ end
-- the scenario title was changed by the user
function r2.ScenarioWindow:onTitleChanged()
if self.lockComboBoxes then return end
- local newTitle = getUI("ui:interface:r2ed_scenario"):find("title_eb").eb.uc_input_string:toUtf8()
+ local newTitle = getUI("ui:interface:r2ed_scenario"):find("title_eb").eb.input_string
if newTitle ~= r2.Scenario.Description.Title then
r2.requestNewAction(i18n.get("uiR2EDChangeScenarioTitle"))
r2.requestSetNode(r2.Scenario.Description.InstanceId, "Title", newTitle)
@@ -936,7 +912,7 @@ end
function r2.ScenarioWindow:onScenarioMissionTagChanged()
if self.lockComboBoxes then return end
if config.R2EDExtendedDebug ~= 1 then return end
- local newTag = getUI("ui:interface:r2ed_palette"):find("mission_tag"):find("mission_tag_eb").eb.uc_input_string:toUtf8()
+ local newTag = getUI("ui:interface:r2ed_palette"):find("mission_tag"):find("mission_tag_eb").eb.input_string
self:setScenarioNotes()
self:onTitleChanged()
diff --git a/ryzom/common/data_common/r2/r2_ui_scenario_scores.lua b/ryzom/common/data_common/r2/r2_ui_scenario_scores.lua
index d8f9de85a..9ebb1744e 100644
--- a/ryzom/common/data_common/r2/r2_ui_scenario_scores.lua
+++ b/ryzom/common/data_common/r2/r2_ui_scenario_scores.lua
@@ -97,9 +97,9 @@ function ScenarioScores:initScenarioScoresOLD()
-- windows title
if ratingsGr.active then
- ui.uc_title = i18n.get("uiR2EDMyScenarioScores")
+ ui.title = i18n.get("uiR2EDMyScenarioScores")
else
- ui.uc_title = i18n.get("uiR2EDScenarioScores")
+ ui.title = i18n.get("uiR2EDScenarioScores")
end
end
diff --git a/ryzom/common/data_common/r2/r2_ui_select_bar.lua b/ryzom/common/data_common/r2/r2_ui_select_bar.lua
index 6dab1505a..972958d20 100644
--- a/ryzom/common/data_common/r2/r2_ui_select_bar.lua
+++ b/ryzom/common/data_common/r2/r2_ui_select_bar.lua
@@ -112,7 +112,7 @@ function r2.SelectBar:update()
local function setupButton(butt, instance)
butt.active = true
butt.b.pushed = (instance == selection)
- butt.b.uc_hardtext = instance:getDisplayName()
+ butt.b.text = instance:getDisplayName()
local icon = instance:getSelectBarIcon()
if icon ~= "" and icon ~= nil then
butt.icon.texture = icon
@@ -323,7 +323,7 @@ function r2.SelectBar:browseSequences()
r2:clearMenu(rm)
for s = 0, activitySequences.Size - 1 do
local sequence = activitySequences[s]
- rm:addLine(ucstring(r2:getSequenceName(sequence)), "lua", "r2:selectActivitiesSequence(".. tostring(s) .. ")", "s")
+ rm:addLine(r2:getSequenceName(sequence), "lua", "r2:selectActivitiesSequence(".. tostring(s) .. ")", "s")
end
rm:addSeparator()
r2:addMenuLine(rm, i18n.get("uiR2EDNewSequence"), "lua", "r2:newMiniActivitySequence()", "new_sequence", "r2_icon_create.tga", 14)
diff --git a/ryzom/common/data_common/r2/r2_ui_select_bar_2.lua b/ryzom/common/data_common/r2/r2_ui_select_bar_2.lua
index 92a299c83..9955a34ec 100644
--- a/ryzom/common/data_common/r2/r2_ui_select_bar_2.lua
+++ b/ryzom/common/data_common/r2/r2_ui_select_bar_2.lua
@@ -10,10 +10,10 @@ r2.SelectBar =
LastMenuHideTrigger = nil, -- last element that triggered the disparition of the select bar menu
InstancesType = "",
InstancesTypes = {
- {["type"]=i18n.get("uiR2EDScene"):toUtf8(), ["icon"]="r2_palette_entities.tga" },
- {["type"]=i18n.get("uiR2EDMacroComponents"):toUtf8(), ["icon"]="r2_palette_components.tga" },
- {["type"]=i18n.get("uiR2EDbotObjects"):toUtf8(), ["icon"]="r2_palette_objets.tga" },
- {["type"]=i18n.get("uiR2EDPlotItems"):toUtf8(), ["icon"]="ICO_mission_purse.tga" }
+ {["type"]=i18n.get("uiR2EDScene"), ["icon"]="r2_palette_entities.tga" },
+ {["type"]=i18n.get("uiR2EDMacroComponents"), ["icon"]="r2_palette_components.tga" },
+ {["type"]=i18n.get("uiR2EDbotObjects"), ["icon"]="r2_palette_objets.tga" },
+ {["type"]=i18n.get("uiR2EDPlotItems"), ["icon"]="ICO_mission_purse.tga" }
},
}
@@ -143,7 +143,7 @@ function r2.SelectBar:update()
local function setupButtonWithIconAndText(butt, text, icon, buttIndex)
butt.active = true
- butt.b.uc_hardtext = text
+ butt.b.text = text
local icon = icon
if icon ~= "" and icon ~= nil then
butt.icon.texture = icon
@@ -176,7 +176,7 @@ function r2.SelectBar:update()
break
end
end
- setupButtonWithIconAndText(butt, ucstring(type), icon, buttIndex)
+ setupButtonWithIconAndText(butt, type, icon, buttIndex)
butt.Env.Types = true
end
@@ -250,9 +250,7 @@ function r2.SelectBar:update()
if self.InstancesType~="" then
-- special button for different types
- local ucname = ucstring()
- ucname:fromUtf8(self.InstancesType)
- setupButtonType(self:getButton(buttIndex), ucname, buttIndex)
+ setupButtonType(self:getButton(buttIndex), self.InstancesType, buttIndex)
self.Content[buttIndex] = currElem
buttIndex = buttIndex - 1
end
@@ -305,7 +303,7 @@ function r2.SelectBar:update()
if buttIndex <= self:getMaxNumEntries() then
local butt = self:getButton(buttIndex)
butt.active = true
- butt.b.uc_hardtext = i18n.get("uiR2EDSelectSubObject")
+ butt.b.text = i18n.get("uiR2EDSelectSubObject")
butt.icon.active = false
butt.b.text_x = 12
butt.b.wmargin = 12
@@ -511,9 +509,7 @@ function r2.SelectBar:popMenu(index)
-- special case for act
if index==2 then
for k, v in pairs(self.InstancesTypes) do
- local ucname = ucstring()
- ucname:fromUtf8(v.type)
- r2:addMenuLine(rm, ucname, "lua", "r2.SelectBar:openInstancesOfType('".. v.type .."','" .. v.icon .."')", v.type, v.icon, 14)
+ r2:addMenuLine(rm, v.type, "lua", "r2.SelectBar:openInstancesOfType('".. v.type .."','" .. v.icon .."')", v.type, v.icon, 14)
end
else
for k, v in pairs(sons) do
@@ -528,7 +524,7 @@ function r2.SelectBar:popMenu(index)
if self.Content[index] and self.Content[index].InstanceId == r2:getSelectedInstance().InstanceId then
if r2:getSelectedInstance().BuildPropertySheet then
rm:addSeparator()
- r2:addMenuLine(rm, concatUCString(i18n.get("uiRE2DPropertiesOf"), r2:getSelectedInstance():getDisplayName()), "lua", "r2:showProperties(r2:getSelectedInstance())", "prop", "r2_icon_properties.tga", 14)
+ r2:addMenuLine(rm, concatString(i18n.get("uiRE2DPropertiesOf"), r2:getSelectedInstance():getDisplayName()), "lua", "r2:showProperties(r2:getSelectedInstance())", "prop", "r2_icon_properties.tga", 14)
end
end
et = os.clock()
@@ -562,9 +558,7 @@ function r2.SelectBar:browseSequences()
r2:clearMenu(rm)
for s = 0, activitySequences.Size - 1 do
local sequence = activitySequences[s]
- local uc_sequ = ucstring()
- uc_sequ:fromUtf8(sequence:getName())
- rm:addLine(uc_sequ, "lua", "r2.activities:triggerSelectSequence('".. sequence.InstanceId .. "')", sequence.InstanceId)
+ rm:addLine(sequence:getName(), "lua", "r2.activities:triggerSelectSequence('".. sequence.InstanceId .. "')", sequence.InstanceId)
end
rm:addSeparator()
r2:addMenuLine(rm, i18n.get("uiR2EDNewSequence"), "lua", "r2.activities:newSequenceInst()", "new_sequence", "r2_icon_create.tga", 14)
diff --git a/ryzom/common/data_common/r2/r2_ui_tools.lua b/ryzom/common/data_common/r2/r2_ui_tools.lua
index 8b2c75143..7f0624fda 100644
--- a/ryzom/common/data_common/r2/r2_ui_tools.lua
+++ b/ryzom/common/data_common/r2/r2_ui_tools.lua
@@ -100,12 +100,12 @@ function r2.ToolUI:updateTooltip(onClickL, paramsL)
onClickL = defaulting(onClickL, getUICaller().onclick_l)
paramsL = defaulting(paramsL, getUICaller().params_l)
local expr = string.format("getKey('%s', '%s')", onClickL, paramsL)
- local keyName = ucstring(runExpr(expr))
+ local keyName = runExpr(expr)
if keyName == i18n.get("uiNotAssigned") then
-- no associated key
setContextHelpText(getUICaller().tooltip)
else
- setContextHelpText(concatUCString(getUICaller().tooltip, "@{6F6F} (", keyName, ")"))
+ setContextHelpText(concatString(getUICaller().tooltip, "@{6F6F} (", keyName, ")"))
end
end
diff --git a/ryzom/common/data_common/r2/r2_ui_triggers.lua b/ryzom/common/data_common/r2/r2_ui_triggers.lua
index 72a5e9cf5..f9c6bd930 100644
--- a/ryzom/common/data_common/r2/r2_ui_triggers.lua
+++ b/ryzom/common/data_common/r2/r2_ui_triggers.lua
@@ -59,10 +59,10 @@ function r2:initActivityEditor(activityEditor)
local timeLimitCB = activityEditor:find("time_limit"):find("combo_box")
assert(timeLimitCB)
timeLimitCB:resetTexts()
- timeLimitCB:addText(ucstring(i18n.get("uiR2EdNoTimeLimit")))
- --timeLimitCB:addText(ucstring("Until a certain time"))
- timeLimitCB:addText(ucstring(i18n.get("uiR2EdForCertainTime")))
- timeLimitCB:addText(ucstring(i18n.get("uiR2EdWhileChat")))
+ timeLimitCB:addText(i18n.get("uiR2EdNoTimeLimit"))
+ --timeLimitCB:addText("Until a certain time")
+ timeLimitCB:addText(i18n.get("uiR2EdForCertainTime"))
+ timeLimitCB:addText(i18n.get("uiR2EdWhileChat"))
end
----------------------------------------------------------------------------------------------------
@@ -424,7 +424,7 @@ function r2:buildActivityTitle(activityUI, erase)
-- title
local title = activityUI:find("title")
assert(title)
- title.uc_hardtext= part1..part2..part3
+ title.text= part1..part2..part3
end
function r2:getActivityName(activityInst)
@@ -541,7 +541,7 @@ function r2:updateActivityChatSequence(elementUI, canceledChatStepId)
activityText:addColoredTextChild(countInfo, 220, 140, 100, 255)
firstLine = false
end
- activityText:addTextChild(ucstring(facing))
+ activityText:addTextChild(facing)
emptyText = false
end
if r2.fromEmoteIdToName[emote] ~= nil then
@@ -550,7 +550,7 @@ function r2:updateActivityChatSequence(elementUI, canceledChatStepId)
activityText:addColoredTextChild(countInfo, 220, 140, 100, 255)
firstLine = false
end
- activityText:addTextChild(ucstring(emote))
+ activityText:addTextChild(emote)
emptyText = false
end
if r2:getInstanceFromId(says)~=nil and r2:getInstanceFromId(says).Text ~= "" then
@@ -559,7 +559,7 @@ function r2:updateActivityChatSequence(elementUI, canceledChatStepId)
activityText:addColoredTextChild(countInfo, 220, 140, 100, 255)
firstLine = false
end
- activityText:addTextChild(ucstring(says))
+ activityText:addTextChild(says)
emptyText = false
end
end
@@ -706,21 +706,21 @@ function r2:updateActivityEditor()
local index = r2:searchElementIndex(instanceActivity)
if index~= nil then
- activityName.uc_hardtext = tostring(i18n.get("uiR2EdActivity")).." "..index.." : "
+ activityName.text = tostring(i18n.get("uiR2EdActivity")).." "..index.." : "
else
- activityName.uc_hardtext = tostring(i18n.get("uiR2EdActivity")).." : "
+ activityName.text = tostring(i18n.get("uiR2EdActivity")).." : "
end
-- activity type
local activityText = r2.activityTypeMenu[instanceActivity.Activity]
if activityText then
- activityButtonText.uc_hardtext = activityText
+ activityButtonText.text = activityText
end
if instanceActivity.ActivityZoneId ~= "" then
local place = r2:getInstanceFromId(instanceActivity.ActivityZoneId)
assert(place)
- activityButtonText.uc_hardtext = activityButtonText.hardtext .. " " .. place.Name
+ activityButtonText.text = activityButtonText.hardtext .. " " .. place.Name
end
-- time limit
@@ -745,15 +745,15 @@ function r2:updateActivityEditor()
certainTime.active = true
local hoursMenu = certainTime:find("hours"):find("text")
assert(hoursMenu)
- hoursMenu.uc_hardtext = tostring(hoursNb)
+ hoursMenu.text = tostring(hoursNb)
local minutesMenu = certainTime:find("minutes"):find("text")
assert(minutesMenu)
- minutesMenu.uc_hardtext = tostring(minNb)
+ minutesMenu.text = tostring(minNb)
local secondsMenu = certainTime:find("seconds"):find("text")
assert(secondsMenu)
- secondsMenu.uc_hardtext = tostring(secNb)
+ secondsMenu.text = tostring(secNb)
comboBox.view_text = timeLimitText
end
@@ -772,8 +772,8 @@ function r2:updateActivityEditor()
assert(repeatLabelButton)
if sequenceChat ~= nil then
- --chatMenuButton.uc_hardtext = sequenceChat.Name
- chatMenuButton.uc_hardtext = r2:getSequenceName(sequenceChat)
+ --chatMenuButton.text = sequenceChat.Name
+ chatMenuButton.text = r2:getSequenceName(sequenceChat)
repeatLabelButton.active = true
local repeatButton = repeatLabelButton:find("toggle_butt")
@@ -783,7 +783,7 @@ function r2:updateActivityEditor()
chatButtonEditor.active = true
else
repeatLabelButton.active = false
- chatMenuButton.uc_hardtext = i18n.get("uiR2EdNoElt")
+ chatMenuButton.text = i18n.get("uiR2EdNoElt")
chatButtonEditor.active = false
end
@@ -792,11 +792,11 @@ function r2:updateActivityEditor()
else
local name = tostring(i18n.get("uiR2EdActivity")).." : "
- activityName.uc_hardtext = name
+ activityName.text = name
- activityButtonText.uc_hardtext = i18n.get("uiR2EdStandStill")
+ activityButtonText.text = i18n.get("uiR2EdStandStill")
comboBox.selection_text = i18n.get("uiR2EdNoTimeLimit")
- chatMenuButton.uc_hardtext = i18n.get("uiR2EdNoElt")
+ chatMenuButton.text = i18n.get("uiR2EdNoElt")
chatButtonEditor.active = false
end
@@ -837,77 +837,77 @@ function r2:openActivityMenu()
activityMenu:reset()
-- Inactive
--- activityMenu:addLine(ucstring(i18n.get("uiR2EdInactive")), "lua", "r2:setActivity('Inactive')", "Inactive")
+-- activityMenu:addLine(i18n.get("uiR2EdInactive"), "lua", "r2:setActivity('Inactive')", "Inactive")
-- Stand still
- activityMenu:addLine(ucstring(i18n.get("uiR2EdStandStill")), "lua", "r2:setActivity('Stand Still')", "Stand Still")
+ activityMenu:addLine(i18n.get("uiR2EdStandStill"), "lua", "r2:setActivity('Stand Still')", "Stand Still")
-- Follow route
- activityMenu:addLine(ucstring(i18n.get("uiR2EdFollowRoad")), "", "", "Follow Route")
+ activityMenu:addLine(i18n.get("uiR2EdFollowRoad"), "", "", "Follow Route")
local menuButton = createGroupInstance("r2_menu_button", "", { bitmap = "r2ed_icon_road.tga", size="14" })
activityMenu:setUserGroupLeft(1, menuButton)
activityMenu:addSubMenu(1)
local roadsMenu = activityMenu:getSubMenu(1)
local roadsTable = r2.Scenario:getAllInstancesByType("Road")
for key, road in pairs(roadsTable) do
- roadsMenu:addLine(ucstring(road.Name), "lua", "r2:setActivity('Follow Route', '".. road.InstanceId .."')", road.InstanceId)
+ roadsMenu:addLine(road.Name, "lua", "r2:setActivity('Follow Route', '".. road.InstanceId .."')", road.InstanceId)
end
if table.getn(roadsTable) == 0 then
- roadsMenu:addLine(ucstring(i18n.get("uiR2EdNoSelelection")), "lua", "r2:setActivity()", "")
+ roadsMenu:addLine(i18n.get("uiR2EdNoSelelection"), "lua", "r2:setActivity()", "")
end
-- Patrol
- activityMenu:addLine(ucstring(i18n.get("uiR2EdPatrol")), "", "", "Patrol")
+ activityMenu:addLine(i18n.get("uiR2EdPatrol"), "", "", "Patrol")
menuButton = createGroupInstance("r2_menu_button", "", { bitmap = "r2ed_icon_road.tga", size="14"})
activityMenu:setUserGroupLeft(2, menuButton)
activityMenu:addSubMenu(2)
roadsMenu = activityMenu:getSubMenu(2)
for key, road in pairs(roadsTable) do
- roadsMenu:addLine(ucstring(road.Name), "lua", "r2:setActivity('Patrol', '".. road.InstanceId .."')", road.InstanceId)
+ roadsMenu:addLine(road.Name, "lua", "r2:setActivity('Patrol', '".. road.InstanceId .."')", road.InstanceId)
end
if table.getn(roadsTable) == 0 then
- roadsMenu:addLine(ucstring(i18n.get("uiR2EdNoSelelection")), "lua", "r2:setActivity()", "")
+ roadsMenu:addLine(i18n.get("uiR2EdNoSelelection"), "lua", "r2:setActivity()", "")
end
-- Repeat Road
- activityMenu:addLine(ucstring(i18n.get("uiR2EdRepeatRoad")), "", "", "Repeat Road")
+ activityMenu:addLine(i18n.get("uiR2EdRepeatRoad"), "", "", "Repeat Road")
menuButton = createGroupInstance("r2_menu_button", "", { bitmap = "r2ed_icon_road.tga", size="14"})
activityMenu:setUserGroupLeft(3, menuButton)
activityMenu:addSubMenu(3)
roadsMenu = activityMenu:getSubMenu(3)
for key, road in pairs(roadsTable) do
- roadsMenu:addLine(ucstring(road.Name), "lua", "r2:setActivity('Repeat Road', '".. road.InstanceId .."')", road.InstanceId)
+ roadsMenu:addLine(road.Name, "lua", "r2:setActivity('Repeat Road', '".. road.InstanceId .."')", road.InstanceId)
end
if table.getn(roadsTable) == 0 then
- roadsMenu:addLine(ucstring(i18n.get("uiR2EdNoSelelection")), "lua", "r2:setActivity()", "")
+ roadsMenu:addLine(i18n.get("uiR2EdNoSelelection"), "lua", "r2:setActivity()", "")
end
-- Wander
- activityMenu:addLine(ucstring(i18n.get("uiR2EdWander")), "", "", "Wander")
+ activityMenu:addLine(i18n.get("uiR2EdWander"), "", "", "Wander")
menuButton = createGroupInstance("r2_menu_button", "", { bitmap = "r2ed_icon_region.tga", size="14"})
activityMenu:setUserGroupLeft(4, menuButton)
activityMenu:addSubMenu(4)
local regionsMenu = activityMenu:getSubMenu(4)
local regionsTable = r2.Scenario:getAllInstancesByType("Region")
for key, region in pairs(regionsTable) do
- regionsMenu:addLine(ucstring(region.Name), "lua", "r2:setActivity('Wander', '".. region.InstanceId .."')", region.InstanceId)
+ regionsMenu:addLine(region.Name, "lua", "r2:setActivity('Wander', '".. region.InstanceId .."')", region.InstanceId)
end
if table.getn(regionsTable) == 0 then
- regionsMenu:addLine(ucstring(i18n.get("uiR2EdNoSelelection")), "lua", "r2:setActivity()", "")
+ regionsMenu:addLine(i18n.get("uiR2EdNoSelelection"), "lua", "r2:setActivity()", "")
end
-- Deploy
--- activityMenu:addLine(ucstring(i18n.get("uiR2EdDeploy")), "", "", "Deploy")
+-- activityMenu:addLine(i18n.get("uiR2EdDeploy"), "", "", "Deploy")
-- menuButton = createGroupInstance("r2_menu_button", "", { bitmap = "r2ed_icon_region.tga", size="14"})
-- activityMenu:setUserGroupLeft(6, menuButton)
-- activityMenu:addSubMenu(6)
-- local regionsMenu = activityMenu:getSubMenu(6)
-- local regionsTable = r2.Scenario:getAllInstancesByType("Region")
-- for key, region in pairs(regionsTable) do
--- regionsMenu:addLine(ucstring(region.Name), "lua", "r2:setActivity('Deploy', '".. region.InstanceId .."')", region.InstanceId)
+-- regionsMenu:addLine(region.Name, "lua", "r2:setActivity('Deploy', '".. region.InstanceId .."')", region.InstanceId)
-- end
-- if table.getn(regionsTable) == 0 then
--- regionsMenu:addLine(ucstring(i18n.get("uiR2EdNoSelelection")), "lua", "r2:setActivity()", "")
+-- regionsMenu:addLine(i18n.get("uiR2EdNoSelelection"), "lua", "r2:setActivity()", "")
-- end
r2:openTriggersMenu(getUICaller())
@@ -1050,10 +1050,10 @@ function r2:openSelectChatMenu()
chatMenu:reset()
-- first line "None"
- chatMenu:addLine(ucstring(i18n.get("uiR2EdNoElt")), "lua", "r2:selectChatSequence('None')", "None")
+ chatMenu:addLine(i18n.get("uiR2EdNoElt"), "lua", "r2:selectChatSequence('None')", "None")
-- second line "More"
- chatMenu:addLine(ucstring(i18n.get("uiR2EdMore")), "lua", "r2:openChatSequences()", "More")
+ chatMenu:addLine(i18n.get("uiR2EdMore"), "lua", "r2:openChatSequences()", "More")
local entityInst = r2:getSelectedInstance()
assert(entityInst)
@@ -1063,8 +1063,8 @@ function r2:openSelectChatMenu()
for i=0, chatSequences.Size-1 do
local chatS = chatSequences[i]
assert(chatS)
- --chatMenu:addLine(ucstring(chatS.Name), "lua", "r2:selectChatSequence('" .. chatS.InstanceId .. "')", chatS.InstanceId)
- chatMenu:addLine(ucstring(r2:getSequenceName(chatS)), "lua", "r2:selectChatSequence('" .. chatS.InstanceId .. "')", chatS.InstanceId)
+ --chatMenu:addLine(chatS.Name, "lua", "r2:selectChatSequence('" .. chatS.InstanceId .. "')", chatS.InstanceId)
+ chatMenu:addLine(r2:getSequenceName(chatS), "lua", "r2:selectChatSequence('" .. chatS.InstanceId .. "')", chatS.InstanceId)
end
r2:openTriggersMenu(getUICaller())
@@ -1273,61 +1273,61 @@ function r2:updateChatEditor()
local index = r2:searchElementIndex(instanceChat)
if index~= nil then
- chatName.uc_hardtext = tostring(i18n.get("uiR2EdChat")).." "..index.." : "
+ chatName.text = tostring(i18n.get("uiR2EdChat")).." "..index.." : "
else
- chatName.uc_hardtext = tostring(i18n.get("uiR2EdChat")).." : "
+ chatName.text = tostring(i18n.get("uiR2EdChat")).." : "
end
-- after value
local time = instanceChat.Time
local minNb, secNb = r2:calculMinSec(time)
- minutesText.uc_hardtext = tostring(minNb)
- secondsText.uc_hardtext = tostring(secNb)
+ minutesText.text = tostring(minNb)
+ secondsText.text = tostring(secNb)
-- who
local whoInst = r2:getInstanceFromId(tostring(instanceChat.Actions[0].Who))
- whoMenuText.uc_hardtext = whoInst.Name
+ whoMenuText.text = whoInst.Name
-- says what
local textID = instanceChat.Actions[0].Says
if textID ~= "" then
- editBox.uc_input_string = r2:getInstanceFromId(textID).Text
+ editBox.input_string = r2:getInstanceFromId(textID).Text
else
- editBox.uc_input_string = ""
+ editBox.input_string = ""
end
-- to who
local toWhoInst = r2:getInstanceFromId(tostring(instanceChat.Actions[0].Facing))
if toWhoInst then
- toWhoMenuText.uc_hardtext = toWhoInst.Name
+ toWhoMenuText.text = toWhoInst.Name
else
- toWhoMenuText.uc_hardtext = tostring(i18n.get("uiR2EdNobody"))
+ toWhoMenuText.text = tostring(i18n.get("uiR2EdNobody"))
end
-- emote
local emoteName = r2.fromEmoteIdToName[instanceChat.Actions[0].Emote]
if emoteName then
- emoteButtonText.uc_hardtext = emoteName
+ emoteButtonText.text = emoteName
else
- emoteButtonText.uc_hardtext = tostring(i18n.get("uiR2EdNoElt"))
+ emoteButtonText.text = tostring(i18n.get("uiR2EdNoElt"))
end
else
local name = tostring(i18n.get("uiR2EdChat")).." : "
- chatName.uc_hardtext = name
+ chatName.text = name
- minutesText.uc_hardtext = tostring(0)
- secondsText.uc_hardtext = tostring(0)
+ minutesText.text = tostring(0)
+ secondsText.text = tostring(0)
- whoMenuText.uc_hardtext = ""
+ whoMenuText.text = ""
- editBox.uc_input_string = ""
+ editBox.input_string = ""
- toWhoMenuText.uc_hardtext = tostring(i18n.get("uiR2EdNobody"))
+ toWhoMenuText.text = tostring(i18n.get("uiR2EdNobody"))
- emoteButtonText.uc_hardtext = tostring(i18n.get("uiR2EdNoElt"))
+ emoteButtonText.text = tostring(i18n.get("uiR2EdNoElt"))
end
end
@@ -1450,7 +1450,7 @@ function r2:buildChatTitle(chatUI, erase)
-- title
local title = chatUI:find("title")
assert(title)
- title.uc_hardtext= part1..part2..part3
+ title.text= part1..part2..part3
end
function r2:getChatName(chatInst)
@@ -1530,7 +1530,7 @@ function r2:updateChatText(elementUI)
end
text = text.."\n"
- chatText:addTextChild(ucstring(text))
+ chatText:addTextChild(text)
local sep = elementUI:find("sep")
assert(sep)
@@ -1595,17 +1595,17 @@ function r2:initTimeMenu(timeFunction, isHours)
timeMenu:reset()
for i=0,9 do
- timeMenu:addLine(ucstring(tostring(i)), "lua", timeFunction .. "(" .. tostring(i) .. ")", tostring(i))
+ timeMenu:addLine(tostring(i), "lua", timeFunction .. "(" .. tostring(i) .. ")", tostring(i))
end
if isHours == true then
- timeMenu:addLine(ucstring(tostring(10)), "lua", timeFunction .. "(" .. tostring(10) .. ")", tostring(10))
+ timeMenu:addLine(tostring(10), "lua", timeFunction .. "(" .. tostring(10) .. ")", tostring(10))
else
local lineNb = 9
for i=10, 50, 10 do
local lineStr = tostring(i).."/"..tostring(i+9)
- timeMenu:addLine(ucstring(lineStr), "", "", tostring(i))
+ timeMenu:addLine(lineStr, "", "", tostring(i))
lineNb = lineNb+1
timeMenu:addSubMenu(lineNb)
@@ -1613,7 +1613,7 @@ function r2:initTimeMenu(timeFunction, isHours)
for s=0,9 do
lineStr = tostring(i+s)
- subMenu:addLine(ucstring(lineStr), "lua", timeFunction .. "(" .. tostring(i+s) .. ")", lineStr)
+ subMenu:addLine(lineStr, "lua", timeFunction .. "(" .. tostring(i+s) .. ")", lineStr)
end
end
end
@@ -1707,7 +1707,7 @@ function r2:openWhoMenu(whoFunction, towho)
local npcTable = r2.Scenario:getAllInstancesByType("Npc")
if towho == true then
- whoMenu:addLine(ucstring(i18n.get("uiR2EdNobody")), "lua", whoFunction.."('" ..tostring(i18n.get("uiR2EdNobody")).. "')", "Nobody")
+ whoMenu:addLine(i18n.get("uiR2EdNobody"), "lua", whoFunction.."('" ..tostring(i18n.get("uiR2EdNobody")).. "')", "Nobody")
end
for key, npc in npcTable do
@@ -1723,7 +1723,7 @@ function r2:openWhoMenu(whoFunction, towho)
end
end
if addLine then
- whoMenu:addLine(ucstring(npc.Name), "lua", whoFunction.."('" ..npc.InstanceId.. "')", npc.InstanceId)
+ whoMenu:addLine(npc.Name, "lua", whoFunction.."('" ..npc.InstanceId.. "')", npc.InstanceId)
end
end
end
@@ -2334,7 +2334,7 @@ function r2:removeElementsSequenceUI(tabIndex, uiName, elementsTable, sequName)
buttonTab.params_l = "r2:selectSequenceTab('"..uiName.."', "..tostring(i-1)..")"
if buttonTab.hardtext == sequName..(i+1) then
- buttonTab.uc_hardtext = sequName..i
+ buttonTab.text = sequName..i
end
end
@@ -2642,7 +2642,7 @@ function r2:openSequenceEditor(uiName, editorName)
local buttonTab = tab:find("tab"..tab.selection)
assert(buttonTab)
- editName.uc_input_string = buttonTab.uc_hardtext
+ editName.input_string = buttonTab.text
end
------------------ SET SEQUENCE NAME -----------------------------------------------------
@@ -2684,7 +2684,7 @@ function r2:updateSequenceName(uiName, instance)
local buttonTab = tab:find("tab"..tabId)
assert(buttonTab)
- buttonTab.uc_hardtext = name
+ buttonTab.text = name
if uiName == "r2ed_triggers" then
r2:updateSequencesButtonBar(tabId, name)
@@ -2884,8 +2884,8 @@ function r2:updateActivitiesAndChatsUI(instance)
end
end
- triggersUI.uc_title = tostring(i18n.get("uiR2EDActivitySequenceEditor")) .. r2:getSelectedInstance().Name
- chatSequencesUI.uc_title = tostring(i18n.get("uiR2EDChatSequenceEditor")) .. r2:getSelectedInstance().Name
+ triggersUI.title = tostring(i18n.get("uiR2EDActivitySequenceEditor")) .. r2:getSelectedInstance().Name
+ chatSequencesUI.title = tostring(i18n.get("uiR2EDChatSequenceEditor")) .. r2:getSelectedInstance().Name
end
end
@@ -2906,8 +2906,8 @@ function activeLogicEntityPropertySheetDisplayerTable:onAttrModified(instance, a
local chatSequencesUI = getUI("ui:interface:r2ed_chat_sequence")
assert(chatSequencesUI)
- triggersUI.uc_title = tostring(i18n.get("uiR2EDActivitySequenceEditor")) .. instance[attributeName]
- chatSequencesUI.uc_title = tostring(i18n.get("uiR2EDChatSequenceEditor")) .. instance[attributeName]
+ triggersUI.title = tostring(i18n.get("uiR2EDActivitySequenceEditor")) .. instance[attributeName]
+ chatSequencesUI.title = tostring(i18n.get("uiR2EDChatSequenceEditor")) .. instance[attributeName]
end
end
@@ -3480,12 +3480,12 @@ function r2:updateSequencesButtonBar(index, sequenceName)
if sequenceName==nil and (index >=0) and (index < activeLogicEntity:getBehavior().Activities.Size) then
local activitySequence = activeLogicEntity:getBehavior().Activities[index]
assert(activitySequence)
- --sequencesButton.uc_hardtext = activitySequence.Name
- sequencesButton.uc_hardtext = r2:getSequenceName(activitySequence)
+ --sequencesButton.text = activitySequence.Name
+ sequencesButton.text = r2:getSequenceName(activitySequence)
elseif sequenceName~= nil then
- sequencesButton.uc_hardtext = sequenceName
+ sequencesButton.text = sequenceName
else
- sequencesButton.uc_hardtext = i18n.get("uiR2EDSequences")
+ sequencesButton.text = i18n.get("uiR2EDSequences")
end
end
end
@@ -3543,7 +3543,7 @@ function r2:updateMiniActivityView(index)
--label "No activity"
if sequence.Components.Size == 0 then
noActivityLabel.active = true
- noActivityLabel.uc_hardtext = tostring(i18n.get("uiR2EdNoActivity"))
+ noActivityLabel.text = tostring(i18n.get("uiR2EdNoActivity"))
else
noActivityLabel.active = false
end
@@ -3592,13 +3592,13 @@ function r2:updateMiniActivityView(index)
-- activity type text
local activityText = miniActivity:find("activity_name")
assert(activityText)
- activityText.uc_hardtext = activityInst.Activity
+ activityText.text = activityInst.Activity
end
end
startCount = sequence.Components.Size
else
noActivityLabel.active = true
- noActivityLabel.uc_hardtext = tostring(i18n.get("uiR2EdNoSequence"))
+ noActivityLabel.text = tostring(i18n.get("uiR2EdNoSequence"))
end
-- hide remaining mini activity templates
@@ -3665,27 +3665,27 @@ function r2:chooseOrOpenSelectedChatSequence()
if chatSequenceId ~= "" then
chatSequence = r2:getInstanceFromId(chatSequenceId)
assert(chatSequence)
- --rootMenu:addLine(ucstring(tostring(i18n.get("uiR2EDChatSequence")).." " .. chatSequence.Name .." : "), "lua", "", "Title")
- rootMenu:addLine(ucstring(tostring(i18n.get("uiR2EDChatSequence")).." " .. r2:getSequenceName(chatSequence) .." : "), "lua", "", "Title")
+ --rootMenu:addLine(i18n.get("uiR2EDChatSequence").." " .. chatSequence.Name .." : ", "lua", "", "Title")
+ rootMenu:addLine(i18n.get("uiR2EDChatSequence").." " .. r2:getSequenceName(chatSequence) .." : ", "lua", "", "Title")
else
- rootMenu:addLine(ucstring(tostring(i18n.get("uiR2EDChatSequence")).." : "), "lua", "", "Title")
+ rootMenu:addLine(i18n.get("uiR2EDChatSequence").." : ", "lua", "", "Title")
end
rootMenu:addSeparator()
-- "Open chat sequence"
if chatSequenceId ~= "" then
- --rootMenu:addLine(ucstring(tostring(i18n.get("uiR2EDOpen")).." "..chatSequence.Name), "lua", "r2:openMiniActivityChatSequence("..tostring(miniActivityNb)..")", "Open")
- rootMenu:addLine(ucstring(tostring(i18n.get("uiR2EDOpen")).." "..r2:getSequenceName(chatSequence)), "lua", "r2:openMiniActivityChatSequence("..tostring(miniActivityNb)..")", "Open")
+ --rootMenu:addLine(i18n.get("uiR2EDOpen").." "..chatSequence.Name, "lua", "r2:openMiniActivityChatSequence("..tostring(miniActivityNb)..")", "Open")
+ rootMenu:addLine(i18n.get("uiR2EDOpen").." "..r2:getSequenceName(chatSequence), "lua", "r2:openMiniActivityChatSequence("..tostring(miniActivityNb)..")", "Open")
newLine = newLine + 1
end
-- "Any chat sequence"
- rootMenu:addLine(ucstring(i18n.get("uiR2EdNoChat")), "lua", "r2:setSequenceChatToMiniActivity("..tostring(miniActivityNb)..")", "None")
+ rootMenu:addLine(i18n.get("uiR2EdNoChat"), "lua", "r2:setSequenceChatToMiniActivity("..tostring(miniActivityNb)..")", "None")
-- "new chat sequence"
- rootMenu:addLine(ucstring(tostring(i18n.get("uiR2EdNewChat")).."..."), "lua", "r2:newChatsSequenceAndSelect("..tostring(miniActivityNb)..")", "None")
+ rootMenu:addLine(i18n.get("uiR2EdNewChat").."...", "lua", "r2:newChatsSequenceAndSelect("..tostring(miniActivityNb)..")", "None")
local menuButton = createGroupInstance("r2_menu_button", "", { bitmap = "r2_icon_create.tga", size="14" })
rootMenu:setUserGroupLeft(newLine, menuButton)
@@ -3698,8 +3698,8 @@ function r2:chooseOrOpenSelectedChatSequence()
local sequence = activeLogicEntity:getBehavior().ChatSequences[i]
assert(sequence)
- --rootMenu:addLine(ucstring(sequence.Name), "lua", "r2:setSequenceChatToMiniActivity("..tostring(miniActivityNb)..", " .. tostring(i)..")", sequence.InstanceId)
- rootMenu:addLine(ucstring(r2:getSequenceName(sequence)), "lua", "r2:setSequenceChatToMiniActivity("..tostring(miniActivityNb)..", " .. tostring(i)..")", sequence.InstanceId)
+ --rootMenu:addLine(sequence.Name, "lua", "r2:setSequenceChatToMiniActivity("..tostring(miniActivityNb)..", " .. tostring(i)..")", sequence.InstanceId)
+ rootMenu:addLine(r2:getSequenceName(sequence), "lua", "r2:setSequenceChatToMiniActivity("..tostring(miniActivityNb)..", " .. tostring(i)..")", sequence.InstanceId)
end
-- display menu
diff --git a/ryzom/common/data_common/r2/r2_utils.lua b/ryzom/common/data_common/r2/r2_utils.lua
index 0c25ba64c..51fbcab1c 100644
--- a/ryzom/common/data_common/r2/r2_utils.lua
+++ b/ryzom/common/data_common/r2/r2_utils.lua
@@ -494,7 +494,7 @@ function r2.testVianney3()
end
function r2:lowerTranslate(uiR2EdStr)
- return string.lower(i18n.get(uiR2EdStr):toUtf8())
+ return string.lower(i18n.get(uiR2EdStr))
end
diff --git a/ryzom/common/data_common/r2/r2_version.lua b/ryzom/common/data_common/r2/r2_version.lua
index 17e709df8..c834d929e 100644
--- a/ryzom/common/data_common/r2/r2_version.lua
+++ b/ryzom/common/data_common/r2/r2_version.lua
@@ -122,9 +122,9 @@ function r2.Version.save(filename)
level = levelToString[tonumber(level)]
rules = string.gsub(r2.Scenario.AccessRules, "\n", "\\n")
if rules=="liberal" then
- rules=i18n.get("uiR2EDliberal"):toUtf8()
+ rules=i18n.get("uiR2EDliberal")
elseif rules == "strict" then
- rules=i18n.get("uiR2EDstrict"):toUtf8()
+ rules=i18n.get("uiR2EDstrict")
end
title = string.gsub(r2.Scenario.Description.Title, "\n", "\\n")
language = r2.Scenario.Language
diff --git a/ryzom/common/data_common/r2/unit_test/r2_unit_test.lua b/ryzom/common/data_common/r2/unit_test/r2_unit_test.lua
index b48e3da5a..e8de6d3ab 100644
--- a/ryzom/common/data_common/r2/unit_test/r2_unit_test.lua
+++ b/ryzom/common/data_common/r2/unit_test/r2_unit_test.lua
@@ -131,9 +131,7 @@ UnitTest.testLoadScenarioUi = function()
return
end
- local ucName = ucstring()
- ucName:fromUtf8(form.LoadScenario_Name)
- local filename = tostring(ucName)
+ local filename = tostring(form.LoadScenario_Name)
if string.find(filename, '.r2', -3) == nil then
messageBox(i18n.get("uiR2EDLoadScenario_InvalidFileName"))
return
@@ -222,7 +220,7 @@ function UnitTest.saveScenario(name, overwrite)
local file = io.open(extendedFilename, "r")
if file ~= nil then
io.close(file)
- validMessageBox(concatUCString(ucstring(name), i18n.get("uiR2EDConfirmOverWrite")), "lua", "UnitTest.saveScenario('" .. name .. "', true )", "", "", "ui:interface")
+ validMessageBox(concatString(name, i18n.get("uiR2EDConfirmOverWrite")), "lua", "UnitTest.saveScenario('" .. name .. "', true )", "", "", "ui:interface")
return
end
end
@@ -230,9 +228,9 @@ function UnitTest.saveScenario(name, overwrite)
local ok, ret = pcall(r2.Version.save, extendedFilename)
local errorMsg = ret
if ok and ret then
- displaySystemInfo(concatUCString(i18n.get("uiR2EDSaveSuccessFull"), ucstring(name)), "BC")
+ displaySystemInfo(concatString(i18n.get("uiR2EDSaveSuccessFull"), name), "BC")
else
- displaySystemInfo(concatUCString(i18n.get("uiR2EDSaveFailure"), ucstring(name)), "BC")
+ displaySystemInfo(concatString(i18n.get("uiR2EDSaveFailure"), name), "BC")
end
end
end
@@ -240,10 +238,7 @@ end
UnitTest.testSaveScenarioUi = function()
local function onOk(form)
local smallName = form.Name
- uc=ucstring()
- uc:fromUtf8(smallName)
- local str = uc:toString()
- UnitTest.saveScenario(str, false)
+ UnitTest.saveScenario(smallName, false)
end
local function onCancel(form)
@@ -372,7 +367,7 @@ function UserComponentsManager:newComponent()
Prop = { }
}
function component:registerMenu(logicEntityMenu)
- logicEntityMenu:addLine(ucstring(self.Name), "lua", "", self.Name)
+ logicEntityMenu:addLine(self.Name, "lua", "", self.Name)
end
function component:createImpl()
@@ -749,7 +744,7 @@ function RingAccess.errorMessageImpl(errorType, name, package, entityLevel, char
if errorType == "InvalidIslandLevel" then
trad = i18n.get("uiR2EDErrMessageNoEnoughRingPointFor".."Island")
- entityName = i18n.get(name):toUtf8()
+ entityName = i18n.get(name)
elseif errorType == "InvalidBotLevel" then
trad = i18n.get("uiR2EDErrMessageNoEnoughRingPointFor".."Bot")
entityName = name
@@ -765,11 +760,11 @@ function RingAccess.errorMessageImpl(errorType, name, package, entityLevel, char
- local str = trad:toUtf8()
+ local str = trad
if package and string.len(package) ~= 0 then
local category = i18n.get(string.format("uiR2EDRingAccessCategory_%s", package))
- str=string.gsub (str, "", category:toUtf8())
+ str=string.gsub (str, "", category)
end
if entityLevel then
str=string.gsub (str, "", tostring(entityLevel))
@@ -1132,9 +1127,7 @@ function r2:dumpDialogsAsText(filename, noMessage)
if tostring(step.Actions[0].Says) ~= "" then
local whatInst = r2:getInstanceFromId(step.Actions[0].Says)
if whatInst then
- local tmp = ucstring()
- tmp:fromUtf8(whatInst.Text)
- what = tmp:toString()
+ what = whatInst.Text
end
end
id = tostring(step.Actions[0].Says)
@@ -1342,10 +1335,7 @@ function r2:updateDialogsFromText(filename, noMessage)
while dialogId do
local textId, text = next(dialog.Texts, nil)
while textId do
- local t = tostring(text.Text)
- local uc=ucstring(t)
- local utf8=uc:toUtf8()
- r2.requestSetNode(tostring(text.Id), "Text", utf8)
+ r2.requestSetNode(tostring(text.Id), "Text", tostring(text.Text))
textId, text = next(dialog.Texts, textId)
end
dialogId, dialog = next(r2.DialogsAsText, dialogId)
@@ -1354,10 +1344,7 @@ function r2:updateDialogsFromText(filename, noMessage)
do
local id, value = next(r2.BotnameAsText, nil)
while id do
- local t = tostring(value.Name)
- local uc=ucstring(t)
- local utf8=uc:toUtf8()
- r2.requestSetNode(tostring(value.Id), "Name", utf8)
+ r2.requestSetNode(tostring(value.Id), "Name", tostring(value.Name))
id, value = next(r2.BotnameAsText, id)
end
end
@@ -1365,10 +1352,7 @@ function r2:updateDialogsFromText(filename, noMessage)
do
local id, value = next(r2.DiversText, nil)
while id do
- local t = tostring(value.Text)
- local uc=ucstring(t)
- local utf8=uc:toUtf8()
- r2.requestSetNode(tostring(value.Id), value.Property, utf8)
+ r2.requestSetNode(tostring(value.Id), value.Property, tostring(value.Text))
id, value = next(r2.DiversText, id)
end
end