I initially had the same idea, but finally I thought that we can keep it as it is and we can add a simpler hierarchy for the per language hierarchy cf {CLI-15|https://jira.xwiki.org/browse/CLI-15]
Following some re-factoring that I did on the dev_jti branch it might be easier to implement.
This message was sent by Atlassian Jira (v9.3.0#930000-sha1:287aeb6)
If image attachments aren't displayed, see this article.