Browse Source

Maintenance: Improved source strings for new features.

Martin Gruner 3 years ago
parent
commit
9bccb2d2d2

+ 1 - 1
app/assets/javascripts/app/controllers/knowledge_base/content_controller.coffee

@@ -104,7 +104,7 @@ class App.KnowledgeBaseContentController extends App.Controller
 
     new App.ControllerConfirm(
       head:    __('Content was changed since loading')
-      message: __('Your changes may override someone else\'s changes. Are you sure to save?')
+      message: __('Your changes may override someone else\'s changes. Do you really want to save?')
       callback: =>
         @parentController.coordinator.saveChanges(@object, paramsForSaving, @)
     )

+ 2 - 2
app/assets/javascripts/app/controllers/knowledge_base/permissions_dialog.coffee

@@ -64,7 +64,7 @@ class App.KnowledgeBasePermissionsDialog extends App.ControllerModal
         @data = data
         @update()
       error:       (xhr) =>
-        @showAlert(xhr.responseJSON?.error || __('Unable to load changes'))
+        @showAlert(xhr.responseJSON?.error || __('Changes could not be loaded.'))
     )
 
   toggleDisabled: (state) =>
@@ -88,5 +88,5 @@ class App.KnowledgeBasePermissionsDialog extends App.ControllerModal
         @close()
       error:       (xhr) =>
         @toggleDisabled(false)
-        @showAlert(xhr.responseJSON?.error || __('Unable to save changes'))
+        @showAlert(xhr.responseJSON?.error || __('Changes could not be saved.'))
     )

+ 1 - 1
app/assets/javascripts/app/controllers/ticket_zoom/attribute_bar.coffee

@@ -121,7 +121,7 @@ class App.TicketZoomAttributeBar extends App.Controller
         user      = App.User.find draft?.updated_by_id
         name      = user?.displayName()
 
-        content =  App.i18n.translatePlain('Last change %s<br>by %s', timestamp, name)
+        content =  App.i18n.translatePlain('Last change %s %s by %s', timestamp, '<br>', name)
 
         # needs linebreak to align vertically without title
         '<br>' + content

+ 1 - 1
app/assets/javascripts/app/lib/app_post/utils.coffee

@@ -1419,7 +1419,7 @@ class App.Utils
     imageCache.onload = ->
       App.Utils._htmlImage2DataUrl(imageCache, params)
     imageCache.onerror = ->
-      App.Log.notice('Utils', "Unable to load image from #{originalImage.src}")
+      App.Log.notice('Utils', "Image could not be loaded from #{originalImage.src}")
       params.fail(originalImage) if params.fail
     imageCache.alt = originalImage.alt
     imageCache.src = originalImage.src

+ 1 - 1
app/assets/javascripts/app/views/ticket_shared_draft_modal.coffee

@@ -124,7 +124,7 @@ class App.TicketSharedDraftModal extends App.ControllerModal
       small: true
 
       content: ->
-        App.i18n.translateContent('Are you sure to delete this draft?')
+        App.i18n.translateContent('Do you really want to delete this draft?')
 
       onSubmit: ->
         @startLoading()

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

@@ -16,7 +16,7 @@
 
   <span class="attributeBar-draft--saving hide">
     <%- @Icon('reload') %>
-    <%- @T('Sharing draft...') %>
+    <%- @T('Sharing draft') %>
   </span>
 </div>
 

+ 2 - 2
app/controllers/tickets_controller.rb

@@ -85,7 +85,7 @@ class TicketsController < ApplicationController
         shared_draft = Ticket::SharedDraftStart.find_by id: shared_draft_id
 
         if shared_draft && (shared_draft.group_id.to_s != params[:group_id]&.to_s || !shared_draft.group.shared_drafts?)
-          raise Exceptions::UnprocessableEntity, __('Shared draft not eligible for this ticket')
+          raise Exceptions::UnprocessableEntity, __('Shared draft cannot be selected for this ticket.')
         end
 
         shared_draft&.destroy
@@ -259,7 +259,7 @@ class TicketsController < ApplicationController
           shared_draft = Ticket::SharedDraftZoom.find_by id: shared_draft_id
 
           if shared_draft && shared_draft.ticket != ticket
-            raise Exceptions::UnprocessableEntity, __('Shared draft not eligible for this ticket')
+            raise Exceptions::UnprocessableEntity, __('Shared draft cannot be selected for this ticket.')
           end
 
           shared_draft&.destroy

+ 14 - 17
i18n/zammad.pot

@@ -837,10 +837,6 @@ msgstr ""
 msgid "Archived at"
 msgstr ""
 
-#: app/assets/javascripts/app/views/ticket_shared_draft_modal.coffee
-msgid "Are you sure to delete this draft?"
-msgstr ""
-
 #: app/assets/javascripts/app/controllers/knowledge_base/content_controller.coffee
 msgid "Are you sure you want to reload? You have unsaved changes that will get lost"
 msgstr ""
@@ -1510,6 +1506,11 @@ msgstr ""
 msgid "Changes"
 msgstr ""
 
+#: app/assets/javascripts/app/controllers/knowledge_base/permissions_dialog.coffee
+msgid "Changes could not be loaded."
+msgstr ""
+
+#: app/assets/javascripts/app/controllers/knowledge_base/permissions_dialog.coffee
 #: app/assets/javascripts/app/views/knowledge_base/base_form.coffee
 msgid "Changes could not be saved."
 msgstr ""
@@ -3295,6 +3296,10 @@ msgstr ""
 msgid "Do you really want to delete \"%s\"?"
 msgstr ""
 
+#: app/assets/javascripts/app/views/ticket_shared_draft_modal.coffee
+msgid "Do you really want to delete this draft?"
+msgstr ""
+
 #: app/assets/javascripts/app/controllers/_application_controller/_modal_generic_destroy_confirm.coffee
 #: app/assets/javascripts/app/controllers/tag.coffee
 msgid "Do you really want to delete this object?"
@@ -5186,7 +5191,7 @@ msgid "Invalid payload, need data:image in logo param"
 msgstr ""
 
 #: lib/knowledge_base/permissions_update.rb
-msgid "Invalid permissions, do not lock out yourself"
+msgid "Invalid permissions, do not lock yourself out."
 msgstr ""
 
 #: app/models/concerns/checks_condition_validation.rb
@@ -5412,7 +5417,7 @@ msgid "Last Contact Customer At"
 msgstr ""
 
 #: app/assets/javascripts/app/controllers/ticket_zoom/attribute_bar.coffee
-msgid "Last change %s<br>by %s"
+msgid "Last change %s %s by %s"
 msgstr ""
 
 #: app/assets/javascripts/app/models/ticket.coffee
@@ -8200,7 +8205,7 @@ msgid "Shared Drafts"
 msgstr ""
 
 #: app/controllers/tickets_controller.rb
-msgid "Shared draft not eligible for this ticket"
+msgid "Shared draft cannot be selected for this ticket."
 msgstr ""
 
 #: app/assets/javascripts/app/models/organization.coffee
@@ -8209,7 +8214,7 @@ msgid "Shared organization"
 msgstr ""
 
 #: app/assets/javascripts/app/views/ticket_zoom/attribute_bar.jst.eco
-msgid "Sharing draft..."
+msgid "Sharing draft"
 msgstr ""
 
 #: app/assets/javascripts/app/controllers/_profile/avatar.coffee
@@ -9639,14 +9644,6 @@ msgstr ""
 msgid "URL (AJAX endpoint)"
 msgstr ""
 
-#: app/assets/javascripts/app/controllers/knowledge_base/permissions_dialog.coffee
-msgid "Unable to load changes"
-msgstr ""
-
-#: app/assets/javascripts/app/controllers/knowledge_base/permissions_dialog.coffee
-msgid "Unable to save changes"
-msgstr ""
-
 #: app/controllers/first_steps_controller.rb
 #: db/seeds/overviews.rb
 msgid "Unassigned & Open Tickets"
@@ -10614,7 +10611,7 @@ msgid "Your callback URL"
 msgstr ""
 
 #: app/assets/javascripts/app/controllers/knowledge_base/content_controller.coffee
-msgid "Your changes may override someone else's changes. Are you sure to save?"
+msgid "Your changes may override someone else's changes. Do you really want to save?"
 msgstr ""
 
 #: app/assets/javascripts/app/views/integration/exchange_certificate_issue.jst.eco

+ 1 - 1
lib/knowledge_base/permissions_update.rb

@@ -82,7 +82,7 @@ class KnowledgeBase
       return if !@user
       return if KnowledgeBase::EffectivePermission.new(@user, @object).access_effective == 'editor'
 
-      raise Exceptions::UnprocessableEntity, __('Invalid permissions, do not lock out yourself')
+      raise Exceptions::UnprocessableEntity, __('Invalid permissions, do not lock yourself out.')
     end
 
     def mark_permission_for_cleanup_if_needed(permission, parents)