mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-23 17:56:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Put flair into labs

Browse source
This commit is contained in:
Luke Barnard 2017-09-18 14:38:41 +01:00
parent 5087da9247
commit 548e5f516c
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/UserSettingsStore.js
View file

@ -33,11 +33,17 @@ export default {
// XXX: Always use default, ignore localStorage and remove from labs
override: true,
},
{
name: "-",
id: 'feature_flair',
default: false,
},
],
// horrible but it works. The locality makes this somewhat more palatable.
doTranslations: function() {
this.LABS_FEATURES[0].name = _t("Matrix Apps");
this.LABS_FEATURES[1].name = _t("Flair");
},
loadProfileInfo: function() {

5
src/components/views/elements/Flair.js
View file

@ -19,6 +19,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import {MatrixClient} from 'matrix-js-sdk';
import UserSettingsStore from '../../../UserSettingsStore';
const BULK_REQUEST_DEBOUNCE_MS = 200;
@ -132,7 +133,9 @@ export default class Flair extends React.Component {
componentWillMount() {
this._unmounted = false;
this._generateAvatars();
if (UserSettingsStore.isFeatureEnabled('feature_flair')) {
this._generateAvatars();
}
}
async _getAvatarUrls(groups) {

3
src/i18n/strings/en_EN.json
View file

@ -872,5 +872,6 @@
"Leave Group": "Leave Group",
"Leave %(groupName)s?": "Leave %(groupName)s?",
"%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget modified by %(senderName)s",
"Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot check is currently unavailable on desktop - please use a <a>web browser</a>"
"Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot check is currently unavailable on desktop - please use a <a>web browser</a>",
"Flair"
}