Merge branch 'master' into master

client/coral-framework/services/i18n.js

@@ -54,6 +54,7 @@ function init() {
   ta.register('pt_BR', pt_BRTA);
   ta.register('zh_CN', zh_CNTA);
   ta.register('zh_TW', zh_TWTA);
+
   timeagoInstance = ta();
 }
 

plugins/talk-plugin-love/client/translations.yml

@@ -10,7 +10,7 @@ zh_CN:
   talk-plugin-love:
     love: "爱"
     loved: "已爱"
-en:
+zh_TW:
   talk-plugin-love:
     love: 喜歡
     loved: 已喜歡

plugins/talk-plugin-offtopic/client/translations.json

@@ -7,6 +7,7 @@
   },
   "zh_CN": {
     "off_topic": "无关主题"
+  },
   "zh_TW": {
     "off_topic": "無關主題"
   }