closes #920'

public/language/en_GB/global.json

@@ -51,5 +51,10 @@
 	"alert.follow": "You are now following %1!",
 
 	"posts": "Posts",
-	"views": "Views"
+	"views": "Views",
+
+	"posted": "posted",
+	"in": "in",
+
+	"recentposts": "Recent Posts"
 }

public/language/en_GB/topic.json

@@ -41,7 +41,6 @@
 	"favourites.not_logged_in.message": "Please log in in order to favourite this post",
 	"favourites.has_no_favourites": "You don't have any favourites, favourite some posts to see them here!",
 
-	"posted_by": "posted by",
 	"loading_more_posts": "Loading More Posts",
 	"move_topic": "Move Topic",
 	"move_post": "Move Post",

public/language/en_GB/user.json

@@ -12,6 +12,7 @@
 	"profile_views": "Profile views",
 	"reputation": "Reputation",
 	"posts": "Posts",
+	"favourites":"Favourites",
 	"followers": "Followers",
 	"following": "Following",
 	"signature": "Signature",
@@ -30,7 +31,7 @@
 	"upload_a_picture": "Upload a picture",
 	"image_spec": "You may only upload PNG, JPG, or GIF files under 256kb.",
 
-	"settings": "settings",
+	"settings": "Settings",
 	"show_email": "Show My Email",
 
 	"has_no_follower": "This user doesn't have any followers :(",

public/src/forum/accountheader.js

@@ -28,15 +28,18 @@ define(function() {
 
 	AccountHeader.createMenu = function() {
 		var userslug = $('.account-username-box').attr('data-userslug');
-		var links = $('<div class="account-sub-links inline-block pull-right">\
+
-			<span id="settingsLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/settings">settings</a></span>\
+		var html = '<div class="account-sub-links inline-block pull-right">\
-			<span id="favouritesLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/favourites">favourites</a></span>\
+			<span id="settingsLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/settings">[[user:settings]]</a></span>\
-			<span class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/followers">followers</a></span>\
+			<span id="favouritesLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/favourites">[[user:favourites]]</a></span>\
-			<span class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/following">following</a></span>\
+			<span class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/followers">[[user:followers]]</a></span>\
-			<span id="editLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/edit">edit</a></span>\
+			<span class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/following">[[user:following]]</a></span>\
-		</div>');
+			<span id="editLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/edit">[[user:edit]]</a></span>\
-
+		</div>'
-		$('.account-username-box').append(links);
+
+		translator.translate(html, function(translatedHtml) {
+			$('.account-username-box').append(translatedHtml);
+		});
 	}
 
 	return AccountHeader;

public/templates/account.tpl

@@ -110,7 +110,7 @@
 		<div class="col-md-6 user-recent-posts">
 			<div class="topic-row panel panel-default clearfix">
 				<div class="panel-heading">
-					<h3 class="panel-title">Recent Posts</h3>
+					<h3 class="panel-title">[[global:recentposts]]</h3>
 				</div>
 				<div class="panel-body">
 					<!-- BEGIN posts -->
@@ -118,8 +118,8 @@
 						<p>{posts.content}</p>
 						<small>
 							<span class="pull-right">
-								<a href="../../topic/{posts.tid}/#{posts.pid}">posted</a>
+								<a href="../../topic/{posts.tid}/#{posts.pid}">[[global:posted]]</a>
-								in
+								[[global:in]]
 								<a href="../../category/{posts.categorySlug}">
 									<i class="fa {posts.categoryIcon}"></i> {posts.categoryName}
 								</a>