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

Maintenance: Improve translatable strings to avoid 'we' when referring to the Zammad software itself.

Martin Gruner 8 месяцев назад
Родитель
Сommit
27f5de887b

+ 1 - 1
app/assets/javascripts/app/controllers/_channel/email.coffee

@@ -680,7 +680,7 @@ class ChannelEmailAccountWizard extends App.ControllerWizardModal
       return
 
     @$('.js-archiveMessage').removeClass('hide')
-    message = App.i18n.translateContent('In addition, we have found emails in your mailbox that are older than %s weeks. You can import such emails as an "archive", which means that no notifications are sent and the tickets have the status "closed". However, you can find them in Zammad anytime using the search function.', data.archive_week_range)
+    message = App.i18n.translateContent('In addition, emails were found in your mailbox that are older than %s weeks. You can import such emails as an "archive", which means that no notifications are sent and the tickets have the status "closed". However, you can find them in Zammad anytime using the search function.', data.archive_week_range)
     @$('.js-inbound-acknowledge .js-archiveMessageCount').html(message)
 
     configureAttributesAcknowledge = [

+ 1 - 1
app/assets/javascripts/app/controllers/getting_started/channel_email.coffee

@@ -279,7 +279,7 @@ class GettingStartedChannelEmail extends App.ControllerWizardFullScreen
       return
 
     @$('.js-archiveMessage').removeClass('hide')
-    message = App.i18n.translateContent('In addition, we have found emails in your mailbox that are older than %s weeks. You can import such emails as an "archive", which means that no notifications are sent and the tickets have the status "closed". However, you can find them in Zammad anytime using the search function.', data.archive_week_range)
+    message = App.i18n.translateContent('In addition, emails were found in your mailbox that are older than %s weeks. You can import such emails as an "archive", which means that no notifications are sent and the tickets have the status "closed". However, you can find them in Zammad anytime using the search function.', data.archive_week_range)
     @$('.js-inbound-acknowledge .js-archiveMessageCount').html(message)
 
     configureAttributesAcknowledge = [

+ 1 - 1
app/assets/javascripts/app/views/channel/email_account_wizard.jst.eco

@@ -114,7 +114,7 @@
         <p class="js-messageFound"><%- @T('%s email(s) were found in your mailbox. They will all be moved from your mailbox into Zammad.', 'x') %></p>
 
         <div class="js-archiveMessage">
-          <p class="js-archiveMessageCount"><%- @T('In addition, we have found emails in your mailbox that are older than %s weeks. You can import such emails as an "archive", which means that no notifications are sent and the tickets have the status "closed". However, you can find them in Zammad anytime using the search function.', 'x') %></p>
+          <p class="js-archiveMessageCount"><%- @T('In addition, emails were found in your mailbox that are older than %s weeks. You can import such emails as an "archive", which means that no notifications are sent and the tickets have the status "closed". However, you can find them in Zammad anytime using the search function.', 'x') %></p>
 
           <p><%- @T('Should the emails from this mailbox be imported as an archive or as regular emails?') %></p>
 

+ 1 - 1
app/assets/javascripts/app/views/getting_started/email.jst.eco

@@ -90,7 +90,7 @@
         <p class="js-messageFound"><%- @T('%s email(s) were found in your mailbox. They will all be moved from your mailbox into Zammad.', 'x') %></p>
 
         <div class="js-archiveMessage">
-          <p class="js-archiveMessageCount"><%- @T('In addition, we have found emails in your mailbox that are older than %s weeks. You can import such emails as an "archive", which means that no notifications are sent and the tickets have the status "closed". However, you can find them in Zammad anytime using the search function.', 'x') %></p>
+          <p class="js-archiveMessageCount"><%- @T('In addition, emails were found in your mailbox that are older than %s weeks. You can import such emails as an "archive", which means that no notifications are sent and the tickets have the status "closed". However, you can find them in Zammad anytime using the search function.', 'x') %></p>
 
           <p><%- @T('Should the emails from this mailbox be imported as an archive or as regular emails?') %></p>
 

+ 1 - 1
app/assets/javascripts/app/views/import/zendesk.jst.eco

@@ -61,7 +61,7 @@
     <div class="wizard-slide vertical hide" data-slide="zendesk-import">
       <h2><%- @T('%s Migration', 'Zendesk') %></h2>
       <div class="alert alert--danger hide js-error" role="alert"></div>
-      <div class="alert alert--info hide js-ticket-count-info" role="alert"><%- @T("There are more than 1000 tickets in the Zendesk system. Due to API rate limit restrictions we can't get the exact number of tickets yet and have to fetch them in batches of 1000. This might take some time, better grab a cup of coffee. The total number of tickets gets updated as soon as the currently known number is surpassed.") %></div>
+      <div class="alert alert--info hide js-ticket-count-info" role="alert"><%- @T("There are more than 1000 tickets in the Zendesk system. Due to API rate limit restrictions, Zammad can't get the exact number of tickets yet and has to fetch them in batches of 1000. This might take some time, better grab a cup of coffee. The total number of tickets gets updated as soon as the currently known number is surpassed.") %></div>
       <div class="wizard-body flex vertical justified">
         <table class="progressTable">
           <tr class="js-groups">

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

@@ -137,7 +137,7 @@
         <% end %>
         <% if @article.preferences?.remote_content_removed: %>
           <div class="remote-content-message js-fetchOriginalFormatting" role="button">
-            <%- @Icon('danger') %> <%- @T('This message contains images or other content hosted by an external source. We blocked it, but you can download the original formatting here.') %>
+            <%- @Icon('danger') %> <%- @T('This message contains images or other content hosted by an external source. It was blocked, but you can download the original formatting here.') %>
           </div>
         <% end %>
         <%- @attachments %>

+ 1 - 1
app/frontend/apps/desktop/entities/channel-email/composables/useEmailInboundMessagesForm.ts

@@ -40,7 +40,7 @@ export const useEmailInboundMessagesForm = (
               isLayout: true,
               component: 'CommonLabel',
               children:
-                '$t(\'In addition, we have found emails in your mailbox that are older than %s weeks. You can import such emails as an "archive", which means that no notifications are sent and the tickets have the status "closed". However, you can find them in Zammad anytime using the search function.\', $metaInformationInbound.archiveWeekRange)',
+                '$t(\'In addition, emails were found in your mailbox that are older than %s weeks. You can import such emails as an "archive", which means that no notifications are sent and the tickets have the status "closed". However, you can find them in Zammad anytime using the search function.\', $metaInformationInbound.archiveWeekRange)',
             },
             {
               isLayout: true,

+ 1 - 1
app/frontend/apps/desktop/pages/guided-setup/__tests__/guided-setup-manual-channel-email.spec.ts

@@ -425,7 +425,7 @@ describe('guided setup manual channel email', () => {
       )
 
       expect(inboundMessagesForm).toHaveTextContent(
-        'In addition, we have found emails in your mailbox that are older than 2 weeks. You can import such emails as an "archive", which means that no notifications are sent and the tickets have the status "closed". However, you can find them in Zammad anytime using the search function.',
+        'In addition, emails were found in your mailbox that are older than 2 weeks. You can import such emails as an "archive", which means that no notifications are sent and the tickets have the status "closed". However, you can find them in Zammad anytime using the search function.',
       )
 
       expect(

+ 2 - 2
app/frontend/apps/desktop/pages/guided-setup/components/GuidedSetupImport/GuidedSetupImportSource/plugins/otrs.ts

@@ -19,10 +19,10 @@ export default <GuidedSetupImportSourcePlugin>{
   },
   preStartHints: [
     __(
-      "OTRS BPM processes can't get imported into Zammad since we currently don't support this kind of workflows.",
+      "OTRS BPM processes can't get imported into Zammad since it currently doesn't support this kind of workflows.",
     ),
     __(
-      'Dynamic fields are not that common in Zammad, as we take a different approach to ticket attributes. Zammad also uses tags in addition to custom fields to classify tickets. This difference can create a new philosophy of your ticket attributes/tags compared to your current use of dynamic fields in OTRS.',
+      'Dynamic fields are not that common in Zammad, as it takes a different approach to ticket attributes. Zammad also uses tags in addition to custom fields to classify tickets. This difference can create a new philosophy of your ticket attributes/tags compared to your current use of dynamic fields in OTRS.',
     ),
   ],
   documentationURL: 'https://docs.zammad.org/en/latest/migration/otrs.html',

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

@@ -53,7 +53,7 @@ const popupItems = computed(() =>
         <div>
           {{
             $t(
-              'This message contains images or other content hosted by an external source. We blocked it, but you can download the original formatting here.',
+              'This message contains images or other content hosted by an external source. It was blocked, but you can download the original formatting here.',
             )
           }}
         </div>

Некоторые файлы не были показаны из-за большого количества измененных файлов