diff --git a/public/src/forum/accountheader.js b/public/src/forum/accountheader.js index d865a83b1b..14719d03f2 100644 --- a/public/src/forum/accountheader.js +++ b/public/src/forum/accountheader.js @@ -29,11 +29,11 @@ define(function() { AccountHeader.createMenu = function() { var userslug = $('.account-username-box').attr('data-userslug'); var links = $(''); $('.account-username-box').append(links); diff --git a/public/src/forum/category.js b/public/src/forum/category.js index 0472569989..c01a22b226 100644 --- a/public/src/forum/category.js +++ b/public/src/forum/category.js @@ -53,8 +53,8 @@ define(['composer'], function(composer) { li.setAttribute('data-pid', posts[i].pid); - li.innerHTML = '' + - '' + + li.innerHTML = '' + + '' + ''+ posts[i].username + '' + '

' + posts[i].content + diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js index 8d1f466293..6e622c4a96 100644 --- a/public/src/forum/footer.js +++ b/public/src/forum/footer.js @@ -39,7 +39,7 @@ if (userLabel.length) { if (data['userslug']) - userLabel.find('#user-profile-link').attr('href', '/user/' + data['userslug']); + userLabel.find('#user-profile-link').attr('href', RELATIVE_PATH + '/user/' + data['userslug']); if (data['picture']) userLabel.find('img').attr('src', data['picture']); if (data['username']) diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js index 788a0c1718..0a64153249 100644 --- a/public/src/forum/topic.js +++ b/public/src/forum/topic.js @@ -406,10 +406,10 @@ define(['composer'], function(composer) { var activeEl = $('.thread_active_users'); function createUserIcon(uid, picture, userslug, username) { - if(!activeEl.find("[href='/user/"+ data.users[i].userslug + "']").length) { + if(!activeEl.find('[href="'+ RELATIVE_PATH +'/user/' + data.users[i].userslug + '"]').length) { var userIcon = $(''); - var userLink = $('').append(userIcon); + var userLink = $('').append(userIcon); userLink.attr('data-uid', uid); var div = $('

'); diff --git a/public/src/translator.js b/public/src/translator.js index 22de13a045..7f87402557 100644 --- a/public/src/translator.js +++ b/public/src/translator.js @@ -25,6 +25,15 @@ module.exports = translator; + // Use this in plugins to add your own translation files. + translator.addTranslation = function(filename, translations) { + files.loaded[filename] = translations; + }; + + translator.getLanguage = function() { + return DEFAULT_LANGUAGE; + }; + translator.get = function (key, callback) { var parsedKey = key.split(':'), languageFile = parsedKey[0]; diff --git a/public/templates/account.tpl b/public/templates/account.tpl index e1ddded78a..9b5eae3519 100644 --- a/public/templates/account.tpl +++ b/public/templates/account.tpl @@ -3,7 +3,7 @@
- {username} + {username}
diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl index 0c4f8ca196..09b1cc5461 100644 --- a/public/templates/accountedit.tpl +++ b/public/templates/accountedit.tpl @@ -32,8 +32,8 @@
- {username} - [[user:edit]] + {username} + [[user:edit]]
diff --git a/public/templates/accountsettings.tpl b/public/templates/accountsettings.tpl index f3987b69cc..f90b978973 100644 --- a/public/templates/accountsettings.tpl +++ b/public/templates/accountsettings.tpl @@ -2,8 +2,8 @@
- {username} - [[user:settings]] + {username} + [[user:settings]]
diff --git a/public/templates/admin/header.tpl b/public/templates/admin/header.tpl index b468df62ea..7253ea07df 100644 --- a/public/templates/admin/header.tpl +++ b/public/templates/admin/header.tpl @@ -8,10 +8,10 @@ - + - - + + @@ -33,8 +33,8 @@ } }); - - + + @@ -49,18 +49,18 @@ - NodeBB ACP + NodeBB ACP