Closed KraXen72 closed 5 months ago
i fixed the merge conflict
Shall we set to editor tabSize 2 or 4? Started with 2 then moved to 4 but never managed to change everywhere...
@minibits-cash i think for js/ts it's much better to use tab size 2 or just the tab character, but for html/jsx it's good to use 4 spaces. in my opinion, the best would be, either: 1) tab characters, because you can configure their size in your editor (and it's just 1 setting, dont' have to re-format the codebase) 2) set up prettier to auto-format it so it's 2 spaces for js/ts code and 4 spaces for markup/jsx, if that's even possible.
what do you think?
ok all merge conflicts should be resolved now
Merged
please don't merge yet - i want to finish extracting all the screens before it's merged
the TL;DR
i18n-js
librarytranslate('whatever')
or similar calls - entries in the json get automatically created based on JSON path, for example,payCommon.status.pending
would create{ "payCommon": { "status": { "pending": "value from string" } } }
{lang}.json
for the keystx
,subTx
andtranslate()
function calls!