wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-06-29 02:00:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into simplified-chinese-merge-fixes

Browse Source
This commit is contained in:
Kim Gardner
2018-01-04 16:48:46 -05:00
committed by GitHub
parent bf1fbfe03f 1125351cd1
commit 4eaa234dd8
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-framework/services/i18n.js
+1 -3
View File
@@ -52,11 +52,9 @@ function init() {
ta.register('da', daTA);
ta.register('fr', frTA);
ta.register('pt_BR', pt_BRTA);
<<<<<<< HEAD
ta.register('zh_CN', zh_CNTA);
=======
ta.register('zh_TW', zh_TWTA);
>>>>>>> 1125351cd1e39fefd7160930896c4f7118a611c6
timeagoInstance = ta();
}
plugins/talk-plugin-love/client/translations.yml
+1 -1
View File
@@ -10,7 +10,7 @@ zh_CN:
talk-plugin-love:
love: "爱"
loved: "已爱"
en:
zh_TW:
talk-plugin-love:
love: 喜歡
loved: 已喜歡