diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_calcDefaultCurrencyNoImg.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_calcDefaultCurrencyNoImg.sqf
index 9c047644c..292a5e391 100644
--- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_calcDefaultCurrencyNoImg.sqf
+++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_calcDefaultCurrencyNoImg.sqf
@@ -92,27 +92,60 @@ _silver_1oz = (_silver_1oz_a - _silver_1oz_b);
{ //sort gems so they display on total price in order of descending worth
if (!isNil {call compile format["_%1",_x]} && {(call compile format["_%1",_x]) > 0}) then {
_dname = getText (configFile >> 'CfgMagazines' >> _x >> 'displayName');
- _string = format["%2 %1 %3",(call compile format["_%1",_x]), _string,_dname];
+ if (_string == "") then {
+ _string = format["%1 %2",(call compile format["_%1",_x]),_dname];
+ } else {
+ _string = format["%2 %1 %3",(call compile format["_%1",_x]),_string,_dname];
+ };
};
} count DZE_GemList;
-if (_briefcase_100oz >= 2) then {
- _string = format["%2 %1 %3s",_briefcase_100oz,_string,localize "STR_EPOCH_BRIEFCASE"];
+if (_briefcase_100oz >= 2) then {
+ if (_string == "") then {
+ _string = format["%1 %2s",_briefcase_100oz,localize "STR_EPOCH_BRIEFCASE"];
+ } else {
+ _string = format["%2 %1 %3s",_briefcase_100oz,_string,localize "STR_EPOCH_BRIEFCASE"];
+ };
};
+
if (_briefcase_100oz == 1) then {
- _string = format["%2 %1 %3",_briefcase_100oz,_string,localize "STR_EPOCH_BRIEFCASE"];
+ if (_string == "") then {
+ _string = format["%1 %2",_briefcase_100oz,localize "STR_EPOCH_BRIEFCASE"];
+ } else {
+ _string = format["%2 %1 %3",_briefcase_100oz,_string,localize "STR_EPOCH_BRIEFCASE"];
+ };
};
+
if (_gold_10oz > 0) then {
- _string = format["%2 %1 %3",_gold_10oz,_string,localize "STR_EPOCH_10OZGOLD"];
+ if (_string == "") then {
+ _string = format["%1 %2",_gold_10oz,localize "STR_EPOCH_10OZGOLD"];
+ } else {
+ _string = format["%2 %1 %3",_gold_10oz,_string,localize "STR_EPOCH_10OZGOLD"];
+ };
};
+
if (_gold_1oz > 0) then {
- _string = format["%2 %1 %3",_gold_1oz,_string,localize "STR_EPOCH_GOLD"];
+ if (_string == "") then {
+ _string = format["%1 %2",_gold_1oz,localize "STR_EPOCH_GOLD"];
+ } else {
+ _string = format["%2 %1 %3",_gold_1oz,_string,localize "STR_EPOCH_GOLD"];
+ };
};
+
if (_silver_10oz > 0) then {
- _string = format["%2 %1 %3",_silver_10oz,_string,localize "STR_EPOCH_10OZSILVER"];
+ if (_string == "") then {
+ _string = format["%1 %2",_silver_10oz,localize "STR_EPOCH_10OZSILVER"];
+ } else {
+ _string = format["%2 %1 %3",_silver_10oz,_string,localize "STR_EPOCH_10OZSILVER"];
+ };
};
+
if (_silver_1oz > 0) then {
- _string = format["%2 %1 %3",_silver_1oz, _string,localize "STR_EPOCH_SILVER"];
+ if (_string == "") then {
+ _string = format["%1 %2",_silver_1oz,localize "STR_EPOCH_SILVER"];
+ } else {
+ _string = format["%2 %1 %3",_silver_1oz,_string,localize "STR_EPOCH_SILVER"];
+ };
};
_string
diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_logTrade.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_logTrade.sqf
index cf049c0f6..c6b83a76e 100644
--- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_logTrade.sqf
+++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_logTrade.sqf
@@ -25,9 +25,9 @@ _Z_logTrade = {
};
} else {
if (_buyOrSell == "buy") then {
- diag_log format["%5: Bought %4 x %1 into %7 at %2 for%3",_className,inTraderCity,_tcost,_quantity,localize "STR_EPOCH_PLAYER_289",_currency,_container];
+ diag_log format["%5: Bought %4 x %1 into %7 at %2 for %3",_className,inTraderCity,_tcost,_quantity,localize "STR_EPOCH_PLAYER_289",_currency,_container];
} else {
- diag_log format["%5: Sold %4 x %1 from %7 at %2 for%3",_className,inTraderCity,_tcost,_quantity,localize "STR_EPOCH_PLAYER_289",_currency,_container];
+ diag_log format["%5: Sold %4 x %1 from %7 at %2 for %3",_className,inTraderCity,_tcost,_quantity,localize "STR_EPOCH_PLAYER_289",_currency,_container];
};
};
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index d08b11cea..4e50df179 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -16257,12 +16257,12 @@
Продажа завершена.
- Trade successful, you paid:%1.
+ Trade successful, you paid: %1.
Продано! С вас %1.
- Trade successful, you received:%1.
- Продажа завершена. Получено:%1
+ Trade successful, you received: %1.
+ Продажа завершена. Получено: %1
Trade successful, you paid %1 %2.