Some refactoring of repeated code in I18N

We need to add tests for this class:
- To ensure that the 4 levels of .properties works properly
- That m works with and without args