diff --git a/public/language/en-GB/admin/general/dashboard.json b/public/language/en-GB/admin/general/dashboard.json index ed74742f32..282b7409e8 100644 --- a/public/language/en-GB/admin/general/dashboard.json +++ b/public/language/en-GB/admin/general/dashboard.json @@ -68,5 +68,6 @@ "graphs.unique-visitors": "Unique Visitors", "graphs.registered-users": "Registered Users", "graphs.anonymous-users": "Anonymous Users", - "last-restarted-by": "Last restarted by" + "last-restarted-by": "Last restarted by", + "no-users-browsing": "No users browsing" } diff --git a/public/language/en-GB/admin/manage/privileges.json b/public/language/en-GB/admin/manage/privileges.json index b5b4f35885..6c840d0bd6 100644 --- a/public/language/en-GB/admin/manage/privileges.json +++ b/public/language/en-GB/admin/manage/privileges.json @@ -1,4 +1,27 @@ { "global": "Global", - "global.no-users": "No user-specific global privileges." + "global.no-users": "No user-specific global privileges.", + + "chat": "Chat", + "upload-images": "Upload Images", + "upload-files": "Upload Files", + "signature": "Signature", + "ban": "Ban", + "search-content": "Search Content", + "search-users": "Search Users", + "search-tags": "Search Tags", + + "find-category": "Find Category", + "access-category": "Access Category", + "access-topics": "Access Topics", + "create-topics": "Create Topics", + "reply-to-topics": "Reply to Topics", + "tag-topics": "Tag Topics", + "edit-posts": "Edit Posts", + "delete-posts": "Delete Posts", + "upvote-posts": "Upvote Posts", + "downvote-posts": "Downvote Posts", + "delete-topics": "Delete Topics", + "purge": "Purge", + "moderator": "Moderate" } \ No newline at end of file diff --git a/public/src/admin/general/dashboard.js b/public/src/admin/general/dashboard.js index b12b8ad632..207676e430 100644 --- a/public/src/admin/general/dashboard.js +++ b/public/src/admin/general/dashboard.js @@ -444,7 +444,7 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator', 'benchpress' function updateTopicsGraph(topics) { if (!topics.length) { topics = [{ - title: 'No users browsing', + title: '[[admin/general/dashboard:no-users-browsing]]', count: 1, }]; } @@ -463,15 +463,16 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator', 'benchpress' function buildTopicsLegend() { var legend = $('#topics-legend').html(''); - + var html = ''; topics.forEach(function (topic, i) { var label = topic.count === '0' ? topic.title : ' ' + topic.title + ''; - legend.append('
  • ' + + html += '
  • ' + '
    ' + '' + label + '' + - '
  • '); + ''; }); + legend.translateHtml(html); } buildTopicsLegend(); diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index a84f6023de..0951801b54 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -18,7 +18,7 @@ $(document).ready(function () { // When ajaxify is migrated to a require.js module, then this can be merged into the "define" call require(['translator', 'benchpress'], function (_translator, _Benchpress) { translator = _translator; - translator.translate('[[error:no-connection]]', app.inAdmin ? config.acpLang : config.userLang); + translator.translate('[[error:no-connection]]'); Benchpress = _Benchpress; }); @@ -183,7 +183,7 @@ $(document).ready(function () { $(window).trigger('action:ajaxify.loadingTemplates', {}); Benchpress.parse(tpl_url, data, function (template) { - translator.translate(template, app.inAdmin ? config.acpLang : config.userLang, function (translatedTemplate) { + translator.translate(template, function (translatedTemplate) { translatedTemplate = translator.unescape(translatedTemplate); $('body').removeClass(previousBodyClass).addClass(data.bodyClass); $('#content').html(translatedTemplate); diff --git a/src/middleware/admin.js b/src/middleware/admin.js index 1c72a31906..d3d73b30ad 100644 --- a/src/middleware/admin.js +++ b/src/middleware/admin.js @@ -82,6 +82,7 @@ module.exports = function (middleware) { var version = nconf.get('version'); + res.locals.config.userLang = res.locals.config.acpLang || res.locals.config.userLang; var templateValues = { config: res.locals.config, configJSON: jsesc(JSON.stringify(res.locals.config), { isScriptContext: true }), diff --git a/src/privileges.js b/src/privileges.js index b42a20e13c..8ea2939bba 100644 --- a/src/privileges.js +++ b/src/privileges.js @@ -3,19 +3,19 @@ var privileges = module.exports; privileges.privilegeLabels = [ - { name: 'Find Category' }, - { name: 'Access Category' }, - { name: 'Access Topics' }, - { name: 'Create Topics' }, - { name: 'Reply to Topics' }, - { name: 'Tag Topics' }, - { name: 'Edit Posts' }, - { name: 'Delete Posts' }, - { name: 'Upvote Posts' }, - { name: 'Downvote Posts' }, - { name: 'Delete Topics' }, - { name: 'Purge' }, - { name: 'Moderate' }, + { name: '[[admin/manage/privileges:find-category]]' }, + { name: '[[admin/manage/privileges:access-category]]' }, + { name: '[[admin/manage/privileges:access-topics]]' }, + { name: '[[admin/manage/privileges:create-topics]]' }, + { name: '[[admin/manage/privileges:reply-to-topics]]' }, + { name: '[[admin/manage/privileges:tag-topics]]' }, + { name: '[[admin/manage/privileges:edit-posts]]' }, + { name: '[[admin/manage/privileges:delete-posts]]' }, + { name: '[[admin/manage/privileges:upvote-posts]]' }, + { name: '[[admin/manage/privileges:downvote-posts]]' }, + { name: '[[admin/manage/privileges:delete-topics]]' }, + { name: '[[admin/manage/privileges:purge]]' }, + { name: '[[admin/manage/privileges:moderate]]' }, ]; privileges.userPrivilegeList = [ diff --git a/src/privileges/global.js b/src/privileges/global.js index cabfd69d59..554adf0bed 100644 --- a/src/privileges/global.js +++ b/src/privileges/global.js @@ -13,14 +13,14 @@ module.exports = function (privileges) { privileges.global = {}; privileges.global.privilegeLabels = [ - { name: 'Chat' }, - { name: 'Upload Images' }, - { name: 'Upload Files' }, - { name: 'Signature' }, - { name: 'Ban' }, - { name: 'Search Content' }, - { name: 'Search Users' }, - { name: 'Search Tags' }, + { name: '[[admin/manage/privileges:chat]]' }, + { name: '[[admin/manage/privileges:upload-images]]' }, + { name: '[[admin/manage/privileges:upload-files]]' }, + { name: '[[admin/manage/privileges:signature]]' }, + { name: '[[admin/manage/privileges:ban]]' }, + { name: '[[admin/manage/privileges:search-content]]' }, + { name: '[[admin/manage/privileges:search-users]]' }, + { name: '[[admin/manage/privileges:search-tags]]' }, ]; privileges.global.userPrivilegeList = [