Просмотр исходного кода

Maintenance: Rephrase warning message for sanitized messages.

Dusan Vuckovic 8 месяцев назад
Родитель
Сommit
22071b7a51

+ 1 - 1
app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco

@@ -117,7 +117,7 @@
   <% if @article.preferences?.remote_content_removed: %>
     <div class="alert alert--warning">
       <div class="alert-row">
-        <%- @Icon('danger') %> <%- @T('For privacy reasons, Zammad has blocked remote content in this message. You can retrieve it from the original formatting.') %>
+        <%- @Icon('danger') %> <%- @T('This message contains content hosted by an external source. The content has been blocked by Zammad, but you can retrieve it by downloading the original formatting.') %>
       </div>
       <div class="btn btn--action btn--small js-fetchOriginalFormatting"><%- @T('Original Formatting') %></div>
     </div>

+ 1 - 1
app/frontend/apps/mobile/pages/ticket/components/TicketDetailView/ArticleRemoteContentBadge.vue

@@ -53,7 +53,7 @@ const popupItems = computed(() =>
         <div>
           {{
             $t(
-              'For privacy reasons, Zammad has blocked remote content in this message. You can retrieve it from the original formatting.',
+              'This message contains content hosted by an external source. The content has been blocked by Zammad, but you can retrieve it by downloading the original formatting.',
             )
           }}
         </div>

+ 1 - 1
app/frontend/apps/mobile/pages/ticket/components/TicketDetailView/__tests__/ArticleRemoteContentBadge.spec.ts

@@ -40,7 +40,7 @@ describe('rendering remote content badge', () => {
     expect(within(popup).getByText('Blocked Content')).toBeInTheDocument()
     expect(
       within(popup).getByText(
-        'For privacy reasons, Zammad has blocked remote content in this message. You can retrieve it from the original formatting.',
+        'This message contains content hosted by an external source. The content has been blocked by Zammad, but you can retrieve it by downloading the original formatting.',
       ),
     ).toBeInTheDocument()
 

+ 5 - 5
i18n/zammad.pot

@@ -6025,11 +6025,6 @@ msgstr ""
 msgid "For more details, please check out our online documentation %l."
 msgstr ""
 
-#: app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco:120
-#: app/frontend/apps/mobile/pages/ticket/components/TicketDetailView/ArticleRemoteContentBadge.vue:56
-msgid "For privacy reasons, Zammad has blocked remote content in this message. You can retrieve it from the original formatting."
-msgstr ""
-
 #: app/assets/javascripts/app/views/profile/token_access_created.jst.eco:1
 #: app/frontend/apps/desktop/pages/personal-setting/components/PersonalSettingNewAccessTokenFlyout.vue:142
 msgid "For security reasons, the API token is shown only once. You'll need to save it somewhere secure before continuing."
@@ -14488,6 +14483,11 @@ msgstr ""
 msgid "This message cannot be displayed due to HTML processing issues. Download the raw message below and open it via an Email client if you still wish to view it."
 msgstr ""
 
+#: app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco:120
+#: app/frontend/apps/mobile/pages/ticket/components/TicketDetailView/ArticleRemoteContentBadge.vue:56
+msgid "This message contains content hosted by an external source. The content has been blocked by Zammad, but you can retrieve it by downloading the original formatting."
+msgstr ""
+
 #: lib/secure_mailing/smime/incoming.rb:86
 msgid "This message was not signed by its sender."
 msgstr ""

+ 1 - 1
spec/system/ticket/zoom/remote_content_removed_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe 'Ticket Zoom > Remote Content Removed', authenticated_as: :user,
   context 'when a mail with an inline image is received' do
     it 'shows a message that the image was removed' do
       within(:active_content) do
-        expect(page).to have_text('For privacy reasons, Zammad has blocked remote content in this message.')
+        expect(page).to have_text('This message contains content hosted by an external source. The content has been blocked by Zammad, but you can retrieve it by downloading the original formatting.')
       end
     end