From 37897e6283c693352c0d1ff0af8c06617c2b7b8d Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Mon, 7 Mar 2016 09:41:38 -0500 Subject: Changed 'Remove Member' to 'Remove' in Channel Members modal --- web/react/components/channel_members_modal.jsx | 4 ++-- web/static/i18n/en.json | 4 ++-- web/static/i18n/es.json | 3 +-- web/static/i18n/pt.json | 3 +-- 4 files changed, 6 insertions(+), 8 deletions(-) (limited to 'web') diff --git a/web/react/components/channel_members_modal.jsx b/web/react/components/channel_members_modal.jsx index 688ab7dd2..d67ebf7d4 100644 --- a/web/react/components/channel_members_modal.jsx +++ b/web/react/components/channel_members_modal.jsx @@ -130,8 +130,8 @@ export default class ChannelMembersModal extends React.Component { onClick={this.handleRemove.bind(this, user)} > ); diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index 114b6bdb5..6e472b8a0 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -561,7 +561,7 @@ "channel_loader.wrote": " wrote: ", "channel_members_modal.addNew": " Add New Members", "channel_members_modal.close": "Close", - "channel_members_modal.removeMember": "Remove Member", + "channel_members_modal.remove": "Remove", "channel_memebers_modal.members": " Members", "channel_modal.cancel": "Cancel", "channel_modal.channel": "Channel", @@ -1289,4 +1289,4 @@ "view_image_popover.download": "Download", "view_image_popover.file": "File {count} of {total}", "view_image_popover.publicLink": "Get Public Link" -} \ No newline at end of file +} diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json index 77779847f..091b1e846 100644 --- a/web/static/i18n/es.json +++ b/web/static/i18n/es.json @@ -561,7 +561,6 @@ "channel_loader.wrote": " escribió: ", "channel_members_modal.addNew": " Agregar nuevos Miembros", "channel_members_modal.close": "Cerrar", - "channel_members_modal.removeMember": "Elminar Miembro", "channel_memebers_modal.members": " Miembros", "channel_modal.cancel": "Cancelar", "channel_modal.channel": "Canal", @@ -1289,4 +1288,4 @@ "view_image_popover.download": "Descargar", "view_image_popover.file": "Archivo {count} de {total}", "view_image_popover.publicLink": "Obtener Enlace Público" -} \ No newline at end of file +} diff --git a/web/static/i18n/pt.json b/web/static/i18n/pt.json index eaec8ba78..f80a6814c 100644 --- a/web/static/i18n/pt.json +++ b/web/static/i18n/pt.json @@ -558,7 +558,6 @@ "channel_loader.wrote": " escreveu: ", "channel_members_modal.addNew": " Adicionar Novos Membros", "channel_members_modal.close": "Fechar", - "channel_members_modal.removeMember": "Remover Membro", "channel_memebers_modal.members": " Membros", "channel_modal.cancel": "Cancelar", "channel_modal.channel": "Canal", @@ -1284,4 +1283,4 @@ "view_image_popover.download": "Download", "view_image_popover.file": "Arquivo {count} de {total}", "view_image_popover.publicLink": "Obter O Link Público" -} \ No newline at end of file +} -- cgit v1.2.3-1-g7c22 From 6217b06ca23ea3a5ef553fdaa0103b69600d9947 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Mon, 7 Mar 2016 09:51:10 -0500 Subject: Added @ before username in UserList when a Full Name or Nickname is present --- web/react/components/user_list_row.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'web') diff --git a/web/react/components/user_list_row.jsx b/web/react/components/user_list_row.jsx index 2aeca7d47..d75078619 100644 --- a/web/react/components/user_list_row.jsx +++ b/web/react/components/user_list_row.jsx @@ -10,9 +10,9 @@ export default function UserListRow({user, actions}) { let name = user.username; if (user.nickname && nameFormat === Constants.Preferences.DISPLAY_PREFER_NICKNAME) { - name = `${user.nickname} (${user.username})`; + name = `${user.nickname} (@${user.username})`; } else if ((user.first_name || user.last_name) && (nameFormat === Constants.Preferences.DISPLAY_PREFER_NICKNAME || nameFormat === Constants.Preferences.DISPLAY_PREFER_FULL_NAME)) { - name = `${Utils.getFullName(user)} (${user.username})`; + name = `${Utils.getFullName(user)} (@${user.username})`; } const buttons = actions.map((Action, index) => { -- cgit v1.2.3-1-g7c22 From 8f917a2925d9e99c5dc7710c3df7b0d5d755a0df Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Mon, 7 Mar 2016 09:55:57 -0500 Subject: Changed Channel Members modal to list full user objects with all fields populated --- web/react/components/channel_members_modal.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'web') diff --git a/web/react/components/channel_members_modal.jsx b/web/react/components/channel_members_modal.jsx index d67ebf7d4..3ec93a616 100644 --- a/web/react/components/channel_members_modal.jsx +++ b/web/react/components/channel_members_modal.jsx @@ -44,6 +44,7 @@ export default class ChannelMembersModal extends React.Component { } getStateFromStores() { const extraInfo = ChannelStore.getCurrentExtraInfo(); + const profiles = UserStore.getActiveOnlyProfiles(); if (extraInfo.member_count !== extraInfo.members.length) { AsyncClient.getChannelExtraInfo(this.props.channel.id, -1); @@ -53,9 +54,8 @@ export default class ChannelMembersModal extends React.Component { }; } - // clone the member list since we mutate it later on const memberList = extraInfo.members.map((member) => { - return Object.assign({}, member); + return profiles[member.id]; }); function compareByUsername(a, b) { -- cgit v1.2.3-1-g7c22