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

Merge branch 'master' into fix-modqueue-counts

Browse Source
This commit is contained in:
Kim Gardner
2018-01-22 11:09:40 -05:00
committed by GitHub
parent bb2ea77008 4be19fd028
commit bdd207524c
3 changed files with 443 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-admin/src/routes/Moderation/containers/Moderation.js
+1 -1
View File
@@ -280,7 +280,7 @@ class ModerationContainer extends Component {
}
}
if (data.loading) {
if (data.loading && data.networkStatus !== 3) {
// loading.
return <Spinner />;
}
client/coral-framework/services/i18n.js
+4
View File
@@ -17,6 +17,7 @@ import frTA from 'timeago.js/locales/fr';
import pt_BRTA from 'timeago.js/locales/pt_BR';
import zh_CNTA from 'timeago.js/locales/zh_CN';
import zh_TWTA from 'timeago.js/locales/zh_TW';
import nl from 'timeago.js/locales/nl';
import en from '../../../locales/en.yml';
import da from '../../../locales/da.yml';
@@ -25,6 +26,7 @@ import fr from '../../../locales/fr.yml';
import pt_BR from '../../../locales/pt_BR.yml';
import zh_CN from '../../../locales/zh_CN.yml';
import zh_TW from '../../../locales/zh_TW.yml';
import nl_NL from '../../../locales/nl_NL.yml';
const defaultLanguage = process.env.TALK_DEFAULT_LANG;
const translations = {
@@ -32,6 +34,7 @@ const translations = {
...da,
...es,
...fr,
...nl_NL,
...pt_BR,
...zh_CN,
...zh_TW,
@@ -87,6 +90,7 @@ export function setupTranslations() {
ta.register('pt_BR', pt_BRTA);
ta.register('zh_CN', zh_CNTA);
ta.register('zh_TW', zh_TWTA);
ta.register('nl_NL', nl);
timeagoInstance = ta();
}