diff --git a/package.json b/package.json
index 5ba0ddfbd4..1cb47da746 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
"prompt": "~0.2.11",
"uglify-js": "~2.4.0",
"validator": "~1.5.1",
- "nodebb-plugin-mentions": "~0.2",
+ "nodebb-plugin-mentions": "~0.3",
"nodebb-plugin-markdown": "~0.3",
"nodebb-theme-vanilla": "~0.0.13",
"nodebb-theme-cerulean": "~0.0.12",
diff --git a/public/src/forum/admin/themes.js b/public/src/forum/admin/themes.js
index 5163f0df1d..7c0baaa568 100644
--- a/public/src/forum/admin/themes.js
+++ b/public/src/forum/admin/themes.js
@@ -114,7 +114,7 @@ define(function() {
for (var x = 0; x < numThemes; x++) {
var theme = bootswatch.themes[x];
- themeEl.setAttribute('data-css', theme.cssMin);
+ themeEl.setAttribute('data-css', theme.cssCdn);
themeEl.setAttribute('data-theme', theme.name);
themeEl.innerHTML = '
' +
'' +
diff --git a/public/src/translator.js b/public/src/translator.js
index afc726d446..2cebc85fc7 100644
--- a/public/src/translator.js
+++ b/public/src/translator.js
@@ -39,6 +39,10 @@
languageCode = 'cz';
break;
+ case 'zh_cn':
+ languageCode = 'zh-CN';
+ break;
+
default:
languageCode = config.defaultLang;
break;
diff --git a/public/templates/admin/header.tpl b/public/templates/admin/header.tpl
index ee3b7f2339..05159da6d0 100644
--- a/public/templates/admin/header.tpl
+++ b/public/templates/admin/header.tpl
@@ -37,7 +37,7 @@
-
+