`admin/general` JS translations and misc

public/language/en-GB/admin/general/dashboard.json

@@ -14,6 +14,10 @@
 	"updates": "Updates",
 	"running-version": "You are running <strong>NodeBB v<span id=\"version\">%1</span></strong>.",
 	"keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.",
+	"up-to-date": "<p>You are <strong>up-to-date</strong> <i class=\"fa fa-check\"></i></p>",
+	"upgrade-available": "<p>A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"prerelease-upgrade-available": "<p>This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider <a href=\"https://docs.nodebb.org/en/latest/upgrading/index.html\">upgrading your NodeBB</a>.</p>",
+	"prerelease-warning": "<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class=\"fa fa-exclamation-triangle\"></i></p>",
 
 	"notices": "Notices",
 
@@ -26,6 +30,10 @@
 	"realtime-chart-updates": "Realtime Chart Updates",
 
 	"active-users": "Active Users",
+	"active-users.users": "Users",
+	"active-users.guests": "Guests",
+	"active-users.total": "Total",
+	"active-users.connections": "Connections",
 
 	"anonymous-registered-users": "Anonymous vs Registered Users",
 	"anonymous": "Anonymous",
@@ -38,5 +46,10 @@
 	"recent": "Recent",
 	"unread": "Unread",
 
-	"high-presence-topics": "High Presence Topics"
+	"high-presence-topics": "High Presence Topics",
+
+	"graphs.page-views": "Page Views",
+	"graphs.unique-visitors": "Unique Visitors",
+	"graphs.registered-users": "Registered Users",
+	"graphs.anonymous-users": "Anonymous Users"
 }

public/language/en-GB/admin/general/social.json

@@ -1,4 +1,5 @@
 {
 	"post-sharing": "Post Sharing",
-	"info-plugins-additional": "Plugins can add additional networks for sharing posts."
+	"info-plugins-additional": "Plugins can add additional networks for sharing posts.",
+	"save-success": "Successfully saved Post Sharing Networks!"
 }

public/language/en-GB/admin/general/sounds.json

@@ -4,5 +4,6 @@
 	"play-sound": "Play",
 	"incoming-message": "Incoming Message",
 	"outgoing-message": "Outgoing Message",
-	"upload-new-sound": "Upload New Sound"
+	"upload-new-sound": "Upload New Sound",
+	"saved": "Settings Saved"
 }

public/src/admin/general/dashboard.js

@@ -1,7 +1,7 @@
 "use strict";
 /*global define, ajaxify, app, socket, utils, bootbox, RELATIVE_PATH*/
 
-define('admin/general/dashboard', ['semver', 'Chart'], function (semver, Chart) {
+define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (semver, Chart, translator) {
 	var	Admin = {};
 	var	intervals = {
 		rooms: false,
@@ -53,23 +53,28 @@ define('admin/general/dashboard', ['semver', 'Chart'], function (semver, Chart)
 
 			var	version = $('#version').html(),
 				latestVersion = releases[0].name.slice(1),
-				checkEl = $('.version-check');
+				checkEl = $('.version-check'),
+				text;
 
 			// Alter box colour accordingly
 			if (semver.eq(latestVersion, version)) {
 				checkEl.removeClass('alert-info').addClass('alert-success');
-				checkEl.append('<p>You are <strong>up-to-date</strong> <i class="fa fa-check"></i></p>');
+				text = '[[admin/general/dashboard:up-to-date]]';
 			} else if (semver.gt(latestVersion, version)) {
 				checkEl.removeClass('alert-info').addClass('alert-warning');
 				if (!isPrerelease.test(version)) {
-					checkEl.append('<p>A new version (v' + latestVersion + ') has been released. Consider <a href="https://docs.nodebb.org/en/latest/upgrading/index.html">upgrading your NodeBB</a>.</p>');
+					text = '[[admin/general/dashboard:upgrade-available, ' + latestVersion + ']]';
 				} else {
-					checkEl.append('<p>This is an outdated pre-release version of NodeBB. A new version (v' + latestVersion + ') has been released. Consider <a href="https://docs.nodebb.org/en/latest/upgrading/index.html">upgrading your NodeBB</a>.</p>');
+					text = '[[admin/general/dashboard:prerelease-upgrade-available, ' + latestVersion + ']]';
 				}
 			} else if (isPrerelease.test(version)) {
 				checkEl.removeClass('alert-info').addClass('alert-info');
-				checkEl.append('<p>This is a <strong>pre-release</strong> version of NodeBB. Unintended bugs may occur. <i class="fa fa-exclamation-triangle"></i>.</p>');
+				text = '[[admin/general/dashboard:prerelease-warning]]';
 			}
+
+			translator.translate(text, function (text) {
+				checkEl.append(text);
+			});
 		});
 
 		$('[data-toggle="tooltip"]').tooltip();
@@ -92,26 +97,28 @@ define('admin/general/dashboard', ['semver', 'Chart'], function (semver, Chart)
 
 		var html = '<div class="text-center pull-left">' +
 						'<div>' + data.onlineRegisteredCount + '</div>' +
-						'<div>Users</div>' +
+						'<div>[[admin/general/dashboard:active-users.users]]</div>' +
 					'</div>' +
 					'<div class="text-center pull-left">' +
 						'<div>' + data.onlineGuestCount + '</div>' +
-						'<div>Guests</div>' +
+						'<div>[[admin/general/dashboard:active-users.guests]]</div>' +
 					'</div>' +
 					'<div class="text-center pull-left">' +
 						'<div>' + (data.onlineRegisteredCount + data.onlineGuestCount) + '</div>' +
-						'<div>Total</div>' +
+						'<div>[[admin/general/dashboard:active-users.total]]</div>' +
 					'</div>' +
 					'<div class="text-center pull-left">' +
 						'<div>' + data.socketCount + '</div>' +
-						'<div>Connections</div>' +
+						'<div>[[admin/general/dashboard:active-users.connections]]</div>' +
 					'</div>';
 
 		updateRegisteredGraph(data.onlineRegisteredCount, data.onlineGuestCount);
 		updatePresenceGraph(data.users);
 		updateTopicsGraph(data.topics);
 
+		translator.translate(html, function (html) {
 			$('#active-users').html(html);
+		});
 	};
 
 	var graphs = {
@@ -168,11 +175,23 @@ define('admin/general/dashboard', ['semver', 'Chart'], function (semver, Chart)
 			Chart.defaults.global.tooltips.enabled = false;
 		}
 
+		var t = translator.Translator.create();
+		Promise.all([
+			t.translateKey('admin/general/dashboard:graphs.page-views', []),
+			t.translateKey('admin/general/dashboard:graphs.unique-visitors', []),
+			t.translateKey('admin/general/dashboard:graphs.registered-users', []),
+			t.translateKey('admin/general/dashboard:graphs.anonymous-users', []),
+			t.translateKey('admin/general/dashboard:on-categories', []),
+			t.translateKey('admin/general/dashboard:reading-posts', []),
+			t.translateKey('admin/general/dashboard:browsing-topics', []),
+			t.translateKey('admin/general/dashboard:recent', []),
+			t.translateKey('admin/general/dashboard:unread', []),
+		]).then(function (translations) {
 			var data = {
 				labels: trafficLabels,
 				datasets: [
 					{
-					label: "Page Views",
+						label: translations[0],
 						backgroundColor: "rgba(220,220,220,0.2)",
 						borderColor: "rgba(220,220,220,1)",
 						pointBackgroundColor: "rgba(220,220,220,1)",
@@ -182,7 +201,7 @@ define('admin/general/dashboard', ['semver', 'Chart'], function (semver, Chart)
 						data: [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
 					},
 					{
-					label: "Unique Visitors",
+						label: translations[1],
 						backgroundColor: "rgba(151,187,205,0.2)",
 						borderColor: "rgba(151,187,205,1)",
 						pointBackgroundColor: "rgba(151,187,205,1)",
@@ -216,7 +235,7 @@ define('admin/general/dashboard', ['semver', 'Chart'], function (semver, Chart)
 			graphs.registered = new Chart(registeredCtx, {
 				type: 'doughnut',
 				data: {
-				labels: ["Registered Users", "Anonymous Users"],
+					labels: translations.slice(2, 4),
 					datasets: [{
 						data: [1, 1],
 						backgroundColor: ["#F7464A", "#46BFBD"],
@@ -234,7 +253,7 @@ define('admin/general/dashboard', ['semver', 'Chart'], function (semver, Chart)
 			graphs.presence = new Chart(presenceCtx, {
 				type: 'doughnut',
 				data: {
-				labels: ["On categories list", "Reading posts", "Browsing topics", "Recent", "Unread"],
+					labels: translations.slice(4, 9),
 					datasets: [{
 						data: [1, 1, 1, 1, 1],
 						backgroundColor: ["#F7464A", "#46BFBD", "#FDB45C", "#949FB1", "#9FB194"],
@@ -282,6 +301,7 @@ define('admin/general/dashboard', ['semver', 'Chart'], function (semver, Chart)
 				}
 				updateTrafficGraph($(this).attr('data-units'), until);
 			});
+		});
 	}
 
 	function adjustPieCharts() {

public/src/admin/general/navigation.js

@@ -12,8 +12,8 @@ define('admin/general/navigation', ['translator', 'iconSelect', 'jqueryui'], fun
 			$(this).val(translator.unescape($(this).val()));
 		});
 
-		translator.translate(translator.unescape($('#available').html()), function (html) {
+		translator.translate($('#available').html(), function (html) {
-			$('#available').html(html)
+			$('#available').html(translator.unescape(html))
 				.find('li .drag-item').draggable({
 					connectToSortable: '#active-navigation',
 					helper: 'clone',

public/src/admin/general/social.js

@@ -18,7 +18,7 @@ define('admin/general/social', [], function () {
 					return app.alertError(err);
 				}
 
-				app.alertSuccess('Successfully saved Post Sharing Networks!');
+				app.alertSuccess('[[admin/general/social:save-success]]');
 			});
 		});
 	};

public/src/admin/general/sounds.js

@@ -23,7 +23,7 @@ define('admin/general/sounds', ['sounds', 'settings'], function (Sounds, Setting
 				socket.emit('admin.fireEvent', {
 					name: 'event:sounds.reloadMapping'
 				});
-				app.alertSuccess('Settings Saved');
+				app.alertSuccess('[[admin/general/sounds:saved]]');
 			});
 		});
 	};

src/views/admin/general/dashboard.tpl

@@ -104,7 +104,7 @@
 					[[admin/general/dashboard:restart-warning]]
 				</p>
 				<p>
-					<a href="{config.relative_path}/admin/settings/advanced" class="btn btn-info btn-block" data-placement="bottom" data-toggle="tooltip" title="[[admin/general/dashboard:maintenance-mode-title]]">[[maintenance-mode]]</a>
+					<a href="{config.relative_path}/admin/settings/advanced" class="btn btn-info btn-block" data-placement="bottom" data-toggle="tooltip" title="[[admin/general/dashboard:maintenance-mode-title]]">[[admin/general/dashboard:maintenance-mode]]</a>
 				</p>
 
 				<hr />

src/views/admin/general/navigation.tpl

@@ -127,7 +127,7 @@
 						</div>
 						<p>
 							<strong>{available.text}</strong> {available.route} <br/>
-							<!-- IF available.core --> [[admin/general/navigation:core]] <!-- ELSE --> [[plugin]] <!-- ENDIF available.core -->
+							<!-- IF available.core --> [[admin/general/navigation:core]] <!-- ELSE --> [[admin/general/navigation:plugin]] <!-- ENDIF available.core -->
 						</p>
 					</li>
 					<!-- END available -->