github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-01-19 18:12:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't override username if already set

Browse Source
This commit is contained in:
Toby Zerner 2015-07-20 18:13:56 +09:30
parent ae18e30063
commit 2f3569bed5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/core/js/lib/Translator.js
View File

@ -61,7 +61,9 @@ export default class Translator {
// translation key. This will allow a gender property to determine which
// translation key is used.
if (input.user instanceof User) {
input.username = username(extract(input, 'user'));
const user = extract(input, 'user');
if (!input.username) input.username = username(user);
}
// If we've found the appropriate translation string, then we'll sub in the