914820-locale - correctly get current user and use .po files
Merge pull request #2672 from thomasmckay/914820-locale

914820-locale - correctly get current user and use .po files