Merge branch 'master' into 'develop'

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

@@ -2,6 +2,9 @@
 	"forum-traffic": "Forum Traffic",
 	"page-views": "Page Views",
 	"unique-visitors": "Unique Visitors",
+	"users": "Users",
+	"posts": "Posts",
+	"topics": "Topics",
 	"page-views-last-month": "Page views Last Month",
 	"page-views-this-month": "Page views This Month",
 	"page-views-last-day": "Page views in last 24 hours",
@@ -20,6 +23,11 @@
 	"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",
+	"restart-not-required": "Restart not required",
+	"restart-required": "Restart required",
+	"search-plugin-installed": "Search Plugin installed",
+	"search-plugin-not-installed": "Search Plugin not installed",
+	"search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",
 
 	"control-panel": "System Control",
 	"reload": "Reload",
@@ -52,4 +60,4 @@
 	"graphs.unique-visitors": "Unique Visitors",
 	"graphs.registered-users": "Registered Users",
 	"graphs.anonymous-users": "Anonymous Users"
-}
+}

public/language/ja/admin/settings/user.json

@@ -1,6 +1,6 @@
 {
 	"authentication": "認証",
-	"allow-local-login": "Allow local login",
+	"allow-local-login": "ローカルログインを有効にする",
 	"require-email-confirmation": "Eメールの確認が必要です",
 	"email-confirm-interval": "User may not resend a confirmation email until",
 	"email-confirm-email2": "minutes have elapsed",

public/language/sr/topic.json

@@ -48,7 +48,7 @@
     "flag_manage_history_notes": "Белешке статуса су ажуриране",
     "flag_manage_saved": "Детаљи статуса су ажурирани",
     "deleted_message": "Ова тема је избрисана. Само корисници са привилегијама управљања темама је могу видети.",
-    "following_topic.message": "Од сада ће те примати обавештења када неко одговори у теми.",
+    "following_topic.message": "Од сада ће те примати обавештења када неко одговори у овој теми.",
     "not_following_topic.message": "Видећете ову тему у списку непрочитаних тема али нећете примати обавештења када неко одговори у њој.",
     "ignoring_topic.message": "Више нећете видети ову тему у списку непрочитаних тема. Бићете обавештени када вас неко спомене или када неко гласа за вашу поруку.",
     "login_to_subscribe": "Региструјте се или се пријавите да бисте се претплатили на ову тему.",

public/language/zh-CN/admin/admin.json

@@ -1,6 +1,6 @@
 {
-	"alert.confirm-reload": "确认重载NodeBB？",
+	"alert.confirm-reload": "确定要重载NodeBB吗？",
-	"alert.confirm-restart": "确认重启NodeBB？",
+	"alert.confirm-restart": "确定要重启NodeBB吗？",
 
 	"acp-title": "%1 | NodeBB 管理控制面板",
 	"settings-header-contents": "内容"

public/language/zh-CN/admin/appearance/customise.json

@@ -3,7 +3,7 @@
 	"custom-css.description": "在这里输入自定义CSS变量声明，它们将被添加在样式中。",
 	"custom-css.enable": "启用自定义CSS",
 
-	"custom-header": "自定义header",
+	"custom-header": "自定义Header",
 	"custom-header.description": "请输入自定义的HTML代码 (如JavaScript，Meta Tags等)，这些代码会被添加到论坛的<code>&lt;head&gt;</code>部分。",
-	"custom-header.enable": "启用自定义header"
+	"custom-header.enable": "启用自定义Header"
 }

public/language/zh-CN/admin/development/logger.json

@@ -1,6 +1,6 @@
 {
 	"logger-settings": "日志记录器设置",
-	"description": "启用此选项后，日志会在你的终端里显示。如果你著名了文件路径，日志会被保存到该文件中。HTTP日志可以帮助你收集论坛被谁，何时，以及什么内容被访问等统计信息。在此基础上，我们还提供socket.io事件日志。结合socket.io日志和redis-cli监控器，学习NodeBB的内部构造会更加方便。",
+	"description": "启用此选项后，日志会在你的终端里显示。如果你注明了文件路径，日志会被保存到该文件中。HTTP日志可以帮助你收集论坛被谁，何时，以及什么内容被访问等统计信息。在此基础上，我们还提供socket.io事件日志。结合socket.io日志和redis-cli监控器，学习NodeBB的内部构造会更加方便。",
 	"explanation": "勾选或反勾选日志设置项即可启用或禁用相应设置。无需重启。",
 	"enable-http": "启用HTTP日志",
 	"enable-socket": "启用socket.io事件日志",

public/language/zh-CN/admin/extend/plugins.json

@@ -12,9 +12,9 @@
 	"reorder-plugins": "重新排序插件",
 	"order-active": "排序生效插件",
 	"dev-interested": "有兴趣为NodeBB开发插件？",
-	"docs-info": "浏览编写插件相关的文档　<a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB　文档页面</a>。",
+	"docs-info": "浏览编写插件相关的文档：<a target=\"_blank\" href=\"https://docs.nodebb.org/en/latest/plugins/create.html\">NodeBB　文档页面</a>。",
 
-	"order.description": "部分插件需要在其它插件之后启用才能完美运作。",
+	"order.description": "部分插件需要在其它插件启用之后才能完美运作。",
 	"order.explanation": "插件将按照以下顺序载入，从上至下。",
 	
 	"plugin-item.themes": "主题",

public/language/zh-CN/admin/extend/rewards.json

@@ -12,6 +12,6 @@
 	"new-reward": "新奖励",
 
 	"alert.delete-success": "已成功删除奖励",
-	"alert.no-inputs-found": "非法奖励－输入为空！",
+	"alert.no-inputs-found": "非法奖励 － 输入为空！",
 	"alert.save-success": "已成功保存奖励"
 }

public/language/zh-CN/admin/manage/registration.json

@@ -11,7 +11,7 @@
 	"list.ip-spam": "频率：%1 显示： %2",
 
 	"invitations": "邀请",
-	"invitations.description": "下面是一份完整的邀请请求列表。请使用Ctrl-F键以及电子邮件或者用户名以便搜索这个列表。<br><br>那些已经补偿他们邀请的用户的用户名将显示在电子邮箱右边。",
+	"invitations.description": "下面是一份完整的邀请请求列表。请使用Ctrl-F键以及电子邮件或者用户名以便搜索这个列表。<br><br>那些已经接受他们邀请的用户的用户名将显示在电子邮箱右边。",
 	"invitations.inviter-username": "邀请人用户名",
 	"invitations.invitee-email": "受邀请的电子邮箱",
 	"invitations.invitee-username": "受邀请的用户名(如果已经注册)",

public/language/zh-CN/admin/settings/uploads.json

@@ -9,7 +9,7 @@
 	"allow-topic-thumbnails": "允许用户上传主题缩略图",
 	"topic-thumb-size": "主题缩略图大小",
 	"allowed-file-extensions": "允许的文件扩展名",
-	"allowed-file-extensions-help": "在这里输入以逗号分隔的文件扩展名(例如：<code>pdf,xls,doc</code>).\n\\t\\t\\t\\t\\t填写空意味着所有扩展名是允许的。",
+	"allowed-file-extensions-help": "在这里输入以逗号分隔的文件扩展名(例如：<code>pdf,xls,doc</code>)。\n填写空意味着所有扩展名是允许的。",
 	"profile-avatars": "个人头像",
 	"allow-profile-image-uploads": "允许用户上传个人资料照片",
 	"convert-profile-image-png": "转换个人资料照片为PNG再上传",

public/language/zh-CN/admin/settings/user.json

@@ -18,7 +18,7 @@
 	"disable-user-skins": "阻止用户选择自定义皮肤",
 	"account-protection": "帐号保护",
 	"login-attempts": "每小时尝试登录次数",
-	"login-attempts-help": "如果 user's 尝试登录次数超过此界限，该帐号将会被被锁定预设的时间。",
+	"login-attempts-help": "如果用户的尝试登录次数超过此界限，该帐号将会被被锁定预设的时间。",
 	"lockout-duration": "帐户锁定时间(分钟)",
 	"login-days": "记录用户会话天数",
 	"password-expiry-days": "强制重置密码天数",

public/language/zh-TW/global.json

@@ -99,7 +99,7 @@
     "allowed-file-types": "允許的檔案類型是 %1",
     "unsaved-changes": "你還沒有儲存更動。你確定想要離開這個頁面？",
     "reconnecting-message": "看起來你的連線到 %1 已經遺失，請稍等一下我們嘗試重新連線。",
-    "play": "Play",
+    "play": "播放",
     "cookies.message": "This website uses cookies to ensure you get the best experience on our website.",
     "cookies.accept": "Got it!",
     "cookies.learn_more": "Learn More",

public/src/ajaxify.js

@@ -93,10 +93,7 @@ $(document).ready(function () {
 			retry = true;
 			app.template = data.template.name;
 
-			require(['translator'], function (translator) {
+			renderTemplate(url, data.template.name, data, callback);
-				translator.load(translator.getLanguage(), data.template.name);
-				renderTemplate(url, data.template.name, data, callback);
-			});
 		});
 
 		return true;

src/controllers/admin/blacklist.js

@@ -9,7 +9,10 @@ blacklistController.get = function (req, res, next) {
 		if (err) {
 			return next(err);
 		}
-		res.render('admin/manage/ip-blacklist', { rules: rules });
+		res.render('admin/manage/ip-blacklist', {
+			rules: rules,
+			title: '[[pages:ip-blacklist]]'
+		});
 	});
 };
 

src/controllers/admin/dashboard.js

@@ -19,14 +19,14 @@ dashboardController.get = function (req, res, next) {
 			var notices = [
 				{
 					done: !meta.reloadRequired,
-					doneText: 'Restart not required',
+					doneText: '[[admin/general/dashboard:restart-not-required]]',
-					notDoneText:'Restart required'
+					notDoneText:'[[admin/general/dashboard:restart-required]]'
 				},
 				{
 					done: plugins.hasListeners('filter:search.query'),
-					doneText: 'Search Plugin Installed',
+					doneText: '[[admin/general/dashboard:search-plugin-installed]]',
-					notDoneText:'Search Plugin not installed',
+					notDoneText:'[[admin/general/dashboard:search-plugin-not-installed]]',
-					tooltip: 'Install a search plugin from the plugin page in order to activate search functionality',
+					tooltip: '[[admin/general/dashboard:search-plugin-tooltip]]',
 					link:'/admin/extend/plugins'
 				}
 			];
@@ -62,10 +62,10 @@ function getStats(callback) {
 		if (err) {
 			return callback(err);
 		}
-		results[0].name = 'Unique Visitors';
+		results[0].name = '[[admin/general/dashboard:unique-visitors]]';
-		results[1].name = 'Users';
+		results[1].name = '[[admin/general/dashboard:users]]';
-		results[2].name = 'Posts';
+		results[2].name = '[[admin/general/dashboard:posts]]';
-		results[3].name = 'Topics';
+		results[3].name = '[[admin/general/dashboard:topics]]';
 
 		callback(null, results);
 	});
@@ -101,4 +101,4 @@ function getGlobalField(field, callback) {
 	});
 }
 
-module.exports = dashboardController;
+module.exports = dashboardController;