summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2016-02-04 09:29:00 -0500
committerJoramWilander <jwawilander@gmail.com>2016-02-04 13:33:18 -0500
commita3df1eaa5520b5aab871464d767f1f56b84b6158 (patch)
treee3a477521569f3207973438e4566dae259cf3d23
parentda7832ed8a26ec180787614d84f227bf45e305af (diff)
downloadchat-a3df1eaa5520b5aab871464d767f1f56b84b6158.tar.gz
chat-a3df1eaa5520b5aab871464d767f1f56b84b6158.tar.bz2
chat-a3df1eaa5520b5aab871464d767f1f56b84b6158.zip
Rename audits tab
-rw-r--r--web/react/components/admin_console/admin_sidebar.jsx2
-rw-r--r--web/react/components/admin_console/audits.jsx2
-rw-r--r--web/static/i18n/en.json9
3 files changed, 10 insertions, 3 deletions
diff --git a/web/react/components/admin_console/admin_sidebar.jsx b/web/react/components/admin_console/admin_sidebar.jsx
index 642bfe9d7..7d74013f2 100644
--- a/web/react/components/admin_console/admin_sidebar.jsx
+++ b/web/react/components/admin_console/admin_sidebar.jsx
@@ -225,7 +225,7 @@ export default class AdminSidebar extends React.Component {
>
<FormattedMessage
id='admin.sidebar.audits'
- defaultMessage='Audits'
+ defaultMessage='Compliance and Auditing'
/>
</a>
</li>
diff --git a/web/react/components/admin_console/audits.jsx b/web/react/components/admin_console/audits.jsx
index 866539b3d..01db939ef 100644
--- a/web/react/components/admin_console/audits.jsx
+++ b/web/react/components/admin_console/audits.jsx
@@ -72,7 +72,7 @@ export default class Audits extends React.Component {
<h3>
<FormattedMessage
id='admin.audits.title'
- defaultMessage='Server Audits'
+ defaultMessage='User Activity'
/>
</h3>
<button
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index dffda84f3..bd3a44392 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -50,6 +50,8 @@
"admin.sidebar.teams": "TEAMS ({count})",
"admin.sidebar.other": "OTHER",
"admin.sidebar.logs": "Logs",
+ "admin.sidebar.audits": "Compliance and Auditing",
+ "admin.analytics.loading": "Loading...",
"admin.analytics.totalUsers": "Total Users",
"admin.analytics.publicChannels": "Public Channels",
"admin.analytics.privateGroups": "Private Groups",
@@ -293,6 +295,11 @@
"admin.log.save": "Save",
"admin.logs.title": "Server Logs",
"admin.logs.reload": "Reload",
+<<<<<<< HEAD
+=======
+ "admin.audits.title": "User Activity",
+ "admin.audits.reload": "Reload",
+>>>>>>> Rename audits tab
"admin.privacy.saving": "Saving Config...",
"admin.privacy.title": "Privacy Settings",
"admin.privacy.showEmailTitle": "Show Email Address: ",
@@ -1257,4 +1264,4 @@
"intro_messages.beginning": "Beginning of {name}",
"intro_messages.invite": "Invite others to this {type}",
"intro_messages.setHeader": "Set a Header"
-} \ No newline at end of file
+}