Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-12 00:45:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #920'

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-31 11:59:35 -05:00
parent 267e7a3d5b
commit bdd4bb0003
5 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/language/en_GB/global.json
View File

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

1
public/language/en_GB/topic.json
View File

@@ -41,7 +41,6 @@
"favourites.not_logged_in.message": "Please log in in order to favourite this post", "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!", "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", "loading_more_posts": "Loading More Posts",
"move_topic": "Move Topic", "move_topic": "Move Topic",
"move_post": "Move Post", "move_post": "Move Post",

3
public/language/en_GB/user.json
View File

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

19
public/src/forum/accountheader.js
View File

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

6
public/templates/account.tpl
View File

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