summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/user_profile.jsx18
-rw-r--r--webapp/i18n/en.json1
-rw-r--r--webapp/i18n/es.json1
-rw-r--r--webapp/i18n/fr.json1
-rw-r--r--webapp/i18n/ja.json1
-rw-r--r--webapp/i18n/pt-BR.json1
6 files changed, 3 insertions, 20 deletions
diff --git a/webapp/components/user_profile.jsx b/webapp/components/user_profile.jsx
index e68ff7eab..ee876347b 100644
--- a/webapp/components/user_profile.jsx
+++ b/webapp/components/user_profile.jsx
@@ -4,8 +4,6 @@
import * as Utils from 'utils/utils.jsx';
import Client from 'utils/web_client.jsx';
-import {FormattedMessage} from 'react-intl';
-
import {Popover, OverlayTrigger} from 'react-bootstrap';
var id = 0;
@@ -22,6 +20,7 @@ export default class UserProfile extends React.Component {
super(props);
this.uniqueId = nextId();
}
+
shouldComponentUpdate(nextProps) {
if (!Utils.areObjectsEqual(nextProps.user, this.props.user)) {
return true;
@@ -45,6 +44,7 @@ export default class UserProfile extends React.Component {
return false;
}
+
render() {
let name = '...';
let email = '';
@@ -78,19 +78,7 @@ export default class UserProfile extends React.Component {
/>
);
- if (!global.window.mm_config.ShowEmailAddress === 'true') {
- dataContent.push(
- <div
- className='text-nowrap'
- key='user-popover-no-email'
- >
- <FormattedMessage
- id='user_profile.notShared'
- defaultMessage='Email not shared'
- />
- </div>
- );
- } else {
+ if (global.window.mm_config.ShowEmailAddress === 'true') {
dataContent.push(
<div
data-toggle='tooltip'
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index b1ab4964f..51e702361 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1455,7 +1455,6 @@
"user.settings.security.title": "Security Settings",
"user.settings.security.viewHistory": "View Access History",
"user_list.notFound": "No users found",
- "user_profile.notShared": "Email not shared",
"view_image.loading": "Loading ",
"view_image_popover.download": "Download",
"view_image_popover.file": "File {count} of {total}",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index 6ce2e77c3..33e58eea6 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -1444,7 +1444,6 @@
"user.settings.security.title": "Configuración de Seguridad",
"user.settings.security.viewHistory": "Visualizar historial de acceso",
"user_list.notFound": "No se encontraron usuarios",
- "user_profile.notShared": "Correo no compartido",
"view_image.loading": "Cargando ",
"view_image_popover.download": "Descargar",
"view_image_popover.file": "Archivo {count} de {total}",
diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json
index a3ab8375d..0941b747d 100644
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -1442,7 +1442,6 @@
"user.settings.security.title": "Paramètres de sécurité",
"user.settings.security.viewHistory": "Voir l'historique des accès",
"user_list.notFound": "Aucun utilisateur trouvé.",
- "user_profile.notShared": "L'adresse électronique n'est pas partagée",
"view_image.loading": "Chargement ",
"view_image_popover.download": "Télécharger",
"view_image_popover.file": "Fichier {count} sur {total}",
diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json
index 80ffd3bf7..4bd7dc834 100644
--- a/webapp/i18n/ja.json
+++ b/webapp/i18n/ja.json
@@ -1442,7 +1442,6 @@
"user.settings.security.title": "セキュリティーの設定",
"user.settings.security.viewHistory": "アクセス履歴を見る",
"user_list.notFound": "ユーザーが見付かりません",
- "user_profile.notShared": "電子メールは共有されません",
"view_image.loading": "読み込み中です ",
"view_image_popover.download": "ダウンロードする",
"view_image_popover.file": "ファイル {count} / {total}",
diff --git a/webapp/i18n/pt-BR.json b/webapp/i18n/pt-BR.json
index ca0fd2dd7..117ccc93f 100644
--- a/webapp/i18n/pt-BR.json
+++ b/webapp/i18n/pt-BR.json
@@ -1442,7 +1442,6 @@
"user.settings.security.title": "Configurações de Segurança",
"user.settings.security.viewHistory": "Ver Histórico de Acesso",
"user_list.notFound": "Nenhum usuário encontrado",
- "user_profile.notShared": "E-mail não compartilhado",
"view_image.loading": "Carregando ",
"view_image_popover.download": "Download",
"view_image_popover.file": "Arquivo {count} de {total}",