Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stringtables #84

Merged
merged 36 commits into from
Mar 26, 2020
Merged
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
748a95c
Add First Stringtable work
jokoho48 Mar 16, 2020
f502be7
move more strings to stringtable
jokoho48 Mar 16, 2020
e647997
Merge branch 'master' into Stringtables
jokoho48 Mar 17, 2020
0ab377f
Merge branch 'master' into Stringtables
jokoho48 Mar 18, 2020
d235e7e
add Localization support to showDialog
jokoho48 Mar 18, 2020
4ee2021
move some more stuff to stringtables
jokoho48 Mar 19, 2020
8216332
move some more stuff to stringtables
jokoho48 Mar 19, 2020
4b0ca10
fix a regex issue
jokoho48 Mar 19, 2020
91b5c29
Merge branch 'master' into Stringtables
jokoho48 Mar 20, 2020
a555e3c
Merge branch 'master' into Stringtables
jokoho48 Mar 22, 2020
ccd46e5
add some more L10n
jokoho48 Mar 22, 2020
9e895b6
add some more L10n
jokoho48 Mar 22, 2020
c6a31c7
add some more L10n
jokoho48 Mar 22, 2020
0d789d9
add stringtable_validator
jokoho48 Mar 22, 2020
e3f3786
add StringtableValidator to github Actions
jokoho48 Mar 22, 2020
c9f79be
update step name
jokoho48 Mar 22, 2020
897591d
add translation issue autoupdate
jokoho48 Mar 22, 2020
3d39e26
update
jokoho48 Mar 22, 2020
afbcee4
move stringtables to main workflow
jokoho48 Mar 22, 2020
0627a89
STRINGTABLES
jokoho48 Mar 24, 2020
584e826
STRINGTABLES
jokoho48 Mar 24, 2020
111bdaa
STRINGTABLES
jokoho48 Mar 24, 2020
ffb8d29
STRINGTABLES
jokoho48 Mar 24, 2020
f738040
STRINGTABLES
jokoho48 Mar 24, 2020
8fa87a9
STRINGTABLES
jokoho48 Mar 24, 2020
819ee3e
STRINGTABLES
jokoho48 Mar 24, 2020
2b4aa20
STRINGTABLES
jokoho48 Mar 24, 2020
3bec511
STRINGTABLES
jokoho48 Mar 24, 2020
1f5a697
STRINGTABLES
jokoho48 Mar 24, 2020
d65eec9
linter fix
jokoho48 Mar 24, 2020
b58d48d
STRINGTABLES
jokoho48 Mar 25, 2020
e409294
STRINGTABLES
jokoho48 Mar 25, 2020
9f99082
add CfgSettings for CBA min Version Requirment
jokoho48 Mar 23, 2020
d838735
- Fixed missing module descriptions (damned brs!)
nk3nny Mar 26, 2020
b7a1d8b
add 2 missed Strings
jokoho48 Mar 26, 2020
97bcddb
update Arma Workflow
jokoho48 Mar 26, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI
name: Arma

on: [push]

Expand Down Expand Up @@ -43,3 +43,22 @@ jobs:
with:
name: '@LambsDanger'
path: 'releases/@LambsDanger.zip'

stringtables:
runs-on: ubuntu-latest
steps:
- name: Install Python packages
run: |
pip3 install wheel
pip3 install setuptools
pip3 install pygithub
pip3 install pygithub3
- name: Checkout the source code
uses: actions/checkout@master
- name: Validate Stringtables
run: python3 tools/stringtable_validator.py
- name: Update Translation issue
if: github.repository == 'nk3nny/LambsDanger' && ! contains(github.event.head_commit.message, '[ci skip]')
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: python3 tools/stringtableDeploy.py
8 changes: 4 additions & 4 deletions addons/danger/Cfg3DEN.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ class Cfg3DEN {
class GVAR(disableAI) {
property = QGVAR(disableAI);
control = "Checkbox";
displayName = "AI Disabled";
tooltip = "Unit has advanced danger.fsm features disabled\n\nWARNING checking this will add mod dependency";
displayName = CSTRING(3DEN_Attributes_DisableAI_DisplayName);
tooltip = CSTRING(3DEN_Attributes_DisableAI_ToolTip);
expression = "if (_value) then { _this setVariable ['%s', _value, true]; }";
typeName = "BOOL";
condition = "objectBrain";
Expand All @@ -18,8 +18,8 @@ class Cfg3DEN {
class GVAR(dangerRadio) {
property = QGVAR(dangerRadio);
control = "Checkbox";
displayName = "Has Radio";
tooltip = "Unit counts as carrying backpack radio for information sharing\n\nWARNING checking this will add mod dependency";
displayName = CSTRING(3DEN_Attributes_HasRadio_DisplayName);
tooltip = CSTRING(3DEN_Attributes_HasRadio_ToolTip);
expression = "if (_value) then { _this setVariable ['%s', _value, true]; }";
typeName = "BOOL";
condition = "objectBrain";
Expand Down
6 changes: 3 additions & 3 deletions addons/danger/CfgVehicles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ class CfgVehicles {
_generalMacro = QGVAR(SetRadio);
scope = 1;
scopeCurator = 2;
displayName = CSTRING(Module_SetRadio_DisplayName);
isGlobal = 0;
displayName = "Configure Long-range Radio";
category = "Lambs_Danger_Cat";
icon = "\A3\ui_f\data\igui\cfg\simpleTasks\types\intel_ca.paa";
function = QFUNC(moduleSetRadio);
Expand All @@ -39,8 +39,8 @@ class CfgVehicles {
_generalMacro = QGVAR(DisableAI);
scope = 1;
scopeCurator = 2;
displayName = CSTRING(Module_DisableAI_DisplayName);
isGlobal = 0;
displayName = "Disable Unit AI";
category = "Lambs_Danger_Cat";
icon = "\A3\ui_f\data\igui\cfg\simpleTasks\types\intel_ca.paa";
function = QFUNC(moduleDisableAI);
Expand All @@ -56,8 +56,8 @@ class CfgVehicles {
_generalMacro = QGVAR(DisableGroupAI);
scope = 1;
scopeCurator = 2;
displayName = CSTRING(Module_DisableGroupAI_DisplayName);
isGlobal = 0;
displayName = "Configure Group AI";
category = "Lambs_Danger_Cat";
icon = "\A3\ui_f\data\igui\cfg\simpleTasks\types\intel_ca.paa";
function = QFUNC(moduleDisableGroupAI);
Expand Down
2 changes: 1 addition & 1 deletion addons/danger/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"lambs_main"};
author = "LAMBS Dev Team";
author = ECSTRING(main,Team);
VERSION_CONFIG;
};
};
Expand Down
10 changes: 5 additions & 5 deletions addons/danger/functions/ZeusModules/fnc_moduleDisableAI.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ if (_activated && local _logic) then {
//--- Check if the unit is suitable
private _error = "";
if (isNull _unit) then {
_error = "No Unit Selected";
_error = ELSTRING(main,NoUnitSelected);
};
if (isPlayer _unit) then {
_error = "Players are not Valid Selections";
_error = ELSTRING(main,PlayerNotValid);
};
if (_error == "") then {
["Disable Unit AI",
[LSTRING(Module_DisableAI_DisplayName),
[
["Disable LAMBS unit AI", "BOOLEAN", "Toggle advanced danger.fsm features on this unit", _unit getVariable [QGVAR(disableAI), false]]
[LSTRING(Module_DisableAI_SettingName), "BOOLEAN", LSTRING(Module_DisableAI_SettingToolTip), _unit getVariable [QGVAR(disableAI), false]]
], {
params ["_data", "_args"];
_args params ["_unit", "_logic"];
Expand All @@ -34,7 +34,7 @@ if (_activated && local _logic) then {
}, [_unit, _logic]
] call EFUNC(main,showDialog);
} else {
[objNull, _error] call BIS_fnc_showCuratorFeedbackMessage;
[objNull, localize _error] call BIS_fnc_showCuratorFeedbackMessage;
deleteVehicle _logic;
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ if (_activated && local _logic) then {
//--- Check if the unit is suitable
private _error = "";
if (isNull _group) then {
_error = "No Group Selected";
_error = ELSTRING(main,NoGroupSelected);
};

if (_error == "") then {
["Configure Group AI",
[LSTRING(Module_DisableGroupAI_DisplayName),
[
["Disable LAMBS group AI", "BOOLEAN", "Disables LAMBS group AI\nDisabling this feature prevents autonomous building assaults and clearing, as well as hiding from aircraft and tanks", _group getVariable [QGVAR(disableGroupAI), false], ""]
[LSTRING(Module_DisableGroupAI_SettingName), "BOOLEAN", LSTRING(Module_DisableGroupAI_SettingToolTip), _group getVariable [QGVAR(disableGroupAI), false], ""]
], {
params ["_data", "_args"];
_args params ["_group", "_logic"];
Expand All @@ -32,7 +32,7 @@ if (_activated && local _logic) then {
}, [_group, _logic]
] call EFUNC(main,showDialog);
} else {
[objNull, _error] call BIS_fnc_showCuratorFeedbackMessage;
[objNull, localize _error] call BIS_fnc_showCuratorFeedbackMessage;
deleteVehicle _logic;
};
};
10 changes: 5 additions & 5 deletions addons/danger/functions/ZeusModules/fnc_moduleSetRadio.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ if (_activated && local _logic) then {
//--- Check if the unit is suitable
private _error = "";
if (isNull _unit) then {
_error = "No Unit Seleted";
_error = ELSTRING(main,NoUnitSelected);
};
if (isPlayer _unit) then {
_error = "Players are not Valid Selections";
_error = ELSTRING(main,PlayerNotValid);
};
if (_error == "") then {
["Configure Long-range Radio",
[LSTRING(Module_SetRadio_DisplayName),
[
["Toggle boosted communication range on unit", "BOOLEAN", "Unit with radio toggled have boosted communications range when sharing information\nThis effect is also achieved by equipping the unit with a Vanilla Radio Backpack or TFAR-mod enabled radio.", _unit getVariable [QGVAR(dangerRadio), false]]
[LSTRING(Module_SetRadio_SettingName), "BOOLEAN", LSTRING(Module_SetRadio_SettingToolTip), _unit getVariable [QGVAR(dangerRadio), false]]
], {
params ["_data", "_args"];
_args params ["_unit", "_logic"];
Expand All @@ -34,7 +34,7 @@ if (_activated && local _logic) then {
}, [_unit, _logic]
] call EFUNC(main,showDialog);
} else {
[objNull, _error] call BIS_fnc_showCuratorFeedbackMessage;
[objNull, localize _error] call BIS_fnc_showCuratorFeedbackMessage;
deleteVehicle _logic;
};
};
Loading