From d3a402e29a0918cdb7e7648f25e2fa437d5850cc Mon Sep 17 00:00:00 2001 From: David Benque Date: Fri, 22 Mar 2024 17:19:52 +0000 Subject: [PATCH] Microcopy and icon change --- www/admin/inner.js | 8 +++---- www/common/application_config_internal.js | 2 +- www/common/common-ui-elements.js | 5 ++--- www/moderation/inner.js | 27 +++++++++++------------ 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/www/admin/inner.js b/www/admin/inner.js index 223e79ea2..1484f6bc6 100644 --- a/www/admin/inner.js +++ b/www/admin/inner.js @@ -2767,16 +2767,16 @@ define([ }; // XXX DUPLICATE FROM ADMIN/INNER.JS - Messages.admin_supportSetupHint = "Create or update the current support keys."; + Messages.admin_supportSetupHint = "Create or update the support keys."; Messages.admin_supportSetupTitle = "Initialize support"; Messages.admin_supportEnabled = "Modern support system is enabled."; Messages.admin_supportDisabled = "Modern support system is disabled."; Messages.admin_supportInit = "Initialize support page on this instance"; Messages.admin_supportDelete = "Disable support"; - Messages.admin_supportConfirm = "Are you sure? This will remove access to all current moderators and delete all existing tickets."; - Messages.admin_supportMembers = "Current support team"; + Messages.admin_supportConfirm = "Are you sure? This will delete all existing tickets and block access for all moderators."; + Messages.admin_supportMembers = "Support team"; Messages.admin_supportAdd = "Add a contact to the support team"; - Messages.admin_supportRotateNotify = "Warning: new keys have been generated but an unenexpected error prevented the system to send them to the moderators. You may have to remove and re-add all the other moderators"; + Messages.admin_supportRotateNotify = "Warning: new keys have been generated but an unenexpected error prevented the system to send them to the moderators. Please remove and re-add all members of the support team"; sidebar.addItem('support-setup', function (cb) { let supportKey = ApiConfig.supportMailboxKey; let edPublic = common.getMetadataMgr().getPrivateData().edPublic; // My edPublic diff --git a/www/common/application_config_internal.js b/www/common/application_config_internal.js index d6642ecad..662db522c 100644 --- a/www/common/application_config_internal.js +++ b/www/common/application_config_internal.js @@ -215,7 +215,7 @@ define(function() { teams: 'fa-users', admin: 'fa-gears', settings: 'fa-gear', - moderation: 'fa-comments-o', + moderation: 'fa-ambulance', profile: 'fa-user-circle', support: 'fa-life-ring', accounts: 'fa-ticket' diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index e467f2e3e..e01a0835a 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -2054,11 +2054,10 @@ define([ } // Add moderation panel link if the user is a moderator and support is enabled if (priv.edPublic && Config.supportMailboxKey && Array.isArray(Config.moderatorKeys) && Config.moderatorKeys.includes(priv.edPublic)) { - Messages.moderationPage = "Support panel"; // XXX already in moderation/inner.js options.push({ tag: 'a', - attributes: {'class': 'cp-toolbar-menu-admin fa fa-comments-o'}, - content: h('span', Messages.moderationPage || 'Support panel'), + attributes: {'class': 'cp-toolbar-menu-admin fa fa-ambulance'}, + content: h('span', Messages.moderationPage || 'Support mailbox'), action: function () { Common.openURL(origin+'/moderation/'); return true; diff --git a/www/moderation/inner.js b/www/moderation/inner.js index b4f2cdafa..73e0d6a8e 100644 --- a/www/moderation/inner.js +++ b/www/moderation/inner.js @@ -54,7 +54,7 @@ define([ }; // XXX - Messages.moderationPage = "Support panel"; // XXX + Messages.moderationPage = "Support mailbox"; // XXX Messages.support_cat_open = "Inbox"; Messages.support_cat_closed = "Closed"; @@ -62,9 +62,9 @@ define([ Messages.support_cat_settings = "Settings"; Messages.support_cat_legacy = "Legacy"; - Messages.support_pending = "Pending tickets:"; - Messages.support_pending_tag = "Pending"; - Messages.support_active_tag = "Active"; + Messages.support_pending = "Archived tickets:"; + Messages.support_pending_tag = "Archived"; + Messages.support_active_tag = "Inbox"; Messages.support_closed_tag = "Closed"; /* Messages.support_activeListTitle = "Active tickets"; @@ -77,24 +77,23 @@ define([ Messages.support_privacyHint = "Check this option to reply as 'The Support Team' instead of your own username"; Messages.support_notificationsTitle = "Disable notifications"; - Messages.support_notificationsHint = "Check this option to disable notifications on new or updated ticket"; - - Messages.support_openTicketTitle = "Open a ticket for a user"; - Messages.support_openTicketHint = "Create a ticket for a user. They will receive a CryptPad notification to warn them. You can copy their user data from an existing support ticket, using the Copy button in the user data."; + Messages.support_notificationsHint = "Check this option to disable notifications for new tickets and replies"; + Messages.support_openTicketTitle = "Open a ticket with a user"; + Messages.support_openTicketHint = "Copy the recipient user's data from their profile page or an existing support ticket. They will receive a CryptPad notification about this message."; Messages.support_userChannel = "User's notifications channel ID"; - Messages.support_userKey = "User's curvePublic key"; + Messages.support_userKey = "User's public key"; Messages.support_invalChan = "Invalid notifications channel"; Messages.support_pasteUserData = "Paste user data here"; - Messages.support_recordedTitle = "Prerecorded messages"; - Messages.support_recordedHint = "You can store prerecorded message in order to insert them with one click in a support ticket."; - Messages.support_recordedEmpty = "No recorded messages"; - Messages.support_recordedId = "Unique Identifier"; + Messages.support_recordedTitle = "Snippets"; + Messages.support_recordedHint = "Store common text as one-click shortcuts to insert in support messages."; + Messages.support_recordedEmpty = "No snippets"; + Messages.support_recordedId = "Snippet ID (unique)"; Messages.support_recordedContent = "Content"; Messages.support_legacyTitle = "View old support data"; - Messages.support_legacyHint = "View tickets from the legacy system. You'll be able to recreate thse tickets on the new support system."; + Messages.support_legacyHint = "View tickets from the legacy support system and recreate them in the new one."; Messages.support_legacyButton = "Get active"; Messages.support_legacyDump = "Export all"; Messages.support_legacyClear = "Delete from my account";