Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Maintenance: Improved translatable source strings.

Browse source
This commit is contained in:
Martin Gruner 2022-01-19 14:59:52 +01:00
parent 104e2b415e
commit db0eb45fe1
45 changed files with 212 additions and 227 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/app/controllers/_channel/email.coffee
View file

@ -528,7 +528,7 @@ class ChannelEmailAccountWizard extends App.ControllerWizardModal
@showAlert('js-intro', __('Account already exists!')) @showAlert('js-intro', __('Account already exists!'))
else else
@showSlide('js-inbound') @showSlide('js-inbound')
@showAlert('js-inbound', __('Unable to detect your server settings. Manual configuration needed.')) @showAlert('js-inbound', __('The server settings could not be automatically detected. Please configure them manually.'))
@$('.js-inbound [name="options::user"]').val(@account['meta']['email']) @$('.js-inbound [name="options::user"]').val(@account['meta']['email'])
@$('.js-inbound [name="options::password"]').val(@account['meta']['password']) @$('.js-inbound [name="options::password"]').val(@account['meta']['password'])
@$('.js-inbound [name="options::email"]').val(@account['meta']['email']) @$('.js-inbound [name="options::email"]').val(@account['meta']['email'])
@ -749,7 +749,7 @@ class ChannelEmailAccountWizard extends App.ControllerWizardModal
@delay( @delay(
=> =>
@showSlide('js-intro') @showSlide('js-intro')
@showAlert('js-intro', __('Unable to verify sending and receiving. Please check your settings.')) @showAlert('js-intro', __('Email sending and receiving could not be verified. Please check your settings.'))
2300 2300
) )
@ -759,7 +759,7 @@ class ChannelEmailAccountWizard extends App.ControllerWizardModal
@verify(@account, count + 1) @verify(@account, count + 1)
error: => error: =>
@showSlide('js-intro') @showSlide('js-intro')
@showAlert('js-intro', __('Unable to verify sending and receiving. Please check your settings.')) @showAlert('js-intro', __('Email sending and receiving could not be verified. Please check your settings.'))
) )
hide: (e) => hide: (e) =>

2
app/assets/javascripts/app/controllers/_channel/facebook.coffee
View file

@ -182,7 +182,7 @@ class AppConfig extends App.ControllerModal
) )
return return
@formEnable(e) @formEnable(e)
@el.find('.alert').removeClass('hidden').text(data.error || __('Unable to verify App.')) @el.find('.alert').removeClass('hidden').text(data.error || __('App could not be verified.'))
) )
class AccountEdit extends App.ControllerModal class AccountEdit extends App.ControllerModal

2
app/assets/javascripts/app/controllers/_channel/google.coffee
View file

@ -425,7 +425,7 @@ class AppConfig extends App.ControllerModal
) )
return return
@formEnable(e) @formEnable(e)
@el.find('.alert').removeClass('hidden').text(data.error || __('Unable to verify App.')) @el.find('.alert').removeClass('hidden').text(data.error || __('App could not be verified.'))
) )
App.Config.set('google', { prio: 5000, name: __('Google'), parent: '#channels', target: '#channels/google', controller: App.ChannelGoogle, permission: ['admin.channel_google'] }, 'NavBarAdmin') App.Config.set('google', { prio: 5000, name: __('Google'), parent: '#channels', target: '#channels/google', controller: App.ChannelGoogle, permission: ['admin.channel_google'] }, 'NavBarAdmin')

2
app/assets/javascripts/app/controllers/_channel/microsoft365.coffee
View file

@ -416,7 +416,7 @@ class AppConfig extends App.ControllerModal
) )
return return
@formEnable(e) @formEnable(e)
@el.find('.alert').removeClass('hidden').text(data.error || __('Unable to verify App.')) @el.find('.alert').removeClass('hidden').text(data.error || __('App could not be verified.'))
) )
App.Config.set('microsoft365', { prio: 5000, name: __('Microsoft 365'), parent: '#channels', target: '#channels/microsoft365', controller: App.ChannelMicrosoft365, permission: ['admin.channel_microsoft365'] }, 'NavBarAdmin') App.Config.set('microsoft365', { prio: 5000, name: __('Microsoft 365'), parent: '#channels', target: '#channels/microsoft365', controller: App.ChannelMicrosoft365, permission: ['admin.channel_microsoft365'] }, 'NavBarAdmin')

2
app/assets/javascripts/app/controllers/_channel/sms.coffee
View file

@ -435,7 +435,7 @@ class TestModal extends App.ControllerModal
data = JSON.parse(xhr.responseText) data = JSON.parse(xhr.responseText)
@formEnable(@el) @formEnable(@el)
@el.find('.js-danger') @el.find('.js-danger')
.text(@T(data.error || __('Unable to perform test'))) .text(@T(data.error || __('SMS test failed.')))
.removeClass('hide') .removeClass('hide')
) )

2
app/assets/javascripts/app/controllers/_channel/telegram.coffee
View file

@ -149,7 +149,7 @@ class BotAdd extends App.ControllerModal
error: (xhr) => error: (xhr) =>
data = JSON.parse(xhr.responseText) data = JSON.parse(xhr.responseText)
@formEnable(e) @formEnable(e)
error_message = App.i18n.translateContent(data.error || __('Unable to save Bot.')) error_message = App.i18n.translateContent(data.error || __('The Telegram bot could not be saved.'))
@el.find('.alert').removeClass('hidden').text(error_message) @el.find('.alert').removeClass('hidden').text(error_message)
) )

2
app/assets/javascripts/app/controllers/_channel/twitter.coffee
View file

@ -189,7 +189,7 @@ class AppConfig extends App.ControllerModal
) )
return return
@formEnable(e) @formEnable(e)
@el.find('.alert').removeClass('hidden').text(data.error || __('Unable to verify App.')) @el.find('.alert').removeClass('hidden').text(data.error || __('App could not be verified.'))
) )
class AccountEdit extends App.ControllerModal class AccountEdit extends App.ControllerModal

6
app/assets/javascripts/app/controllers/_integration/exchange.coffee
View file

@ -282,7 +282,7 @@ class ConnectionWizard extends App.ControllerWizardModal
if !_.isEmpty(detailsRaw) if !_.isEmpty(detailsRaw)
details = JSON.parse(detailsRaw) details = JSON.parse(detailsRaw)
@showSlide('js-discover') @showSlide('js-discover')
@showAlert('js-discover', details.error || __('Unable to perform backend.')) @showAlert('js-discover', details.error || __('Server operation failed.'))
) )
folders: (e) => folders: (e) =>
@ -323,7 +323,7 @@ class ConnectionWizard extends App.ControllerWizardModal
if !_.isEmpty(detailsRaw) if !_.isEmpty(detailsRaw)
details = JSON.parse(detailsRaw) details = JSON.parse(detailsRaw)
@showSlide('js-bind') @showSlide('js-bind')
@showAlert('js-bind', details.error || __('Unable to perform backend.')) @showAlert('js-bind', details.error || __('Server operation failed.'))
) )
foldersShow: (alreadyShown) => foldersShow: (alreadyShown) =>
@ -429,7 +429,7 @@ class ConnectionWizard extends App.ControllerWizardModal
if !_.isEmpty(detailsRaw) if !_.isEmpty(detailsRaw)
details = JSON.parse(detailsRaw) details = JSON.parse(detailsRaw)
@showSlide('js-folders') @showSlide('js-folders')
@showAlert('js-folders', details.error || __('Unable to perform backend.')) @showAlert('js-folders', details.error || __('Server operation failed.'))
) )
mappingShow: (alreadyShown) => mappingShow: (alreadyShown) =>

2
app/assets/javascripts/app/controllers/_integration/github.coffee
View file

@ -60,7 +60,7 @@ class Form extends App.Controller
details = data.responseJSON || {} details = data.responseJSON || {}
App.Event.trigger 'notify', { App.Event.trigger 'notify', {
type: 'error' type: 'error'
msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to save!')) msg: App.i18n.translateContent(details.error_human || details.error || __('Saving failed.'))
} }
) )

2
app/assets/javascripts/app/controllers/_integration/gitlab.coffee
View file

@ -60,7 +60,7 @@ class Form extends App.Controller
details = data.responseJSON || {} details = data.responseJSON || {}
App.Event.trigger 'notify', { App.Event.trigger 'notify', {
type: 'error' type: 'error'
msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to save!')) msg: App.i18n.translateContent(details.error_human || details.error || __('Saving failed.'))
} }
) )

2
app/assets/javascripts/app/controllers/_integration/idoit.coffee
View file

@ -73,7 +73,7 @@ class Form extends App.Controller
details = data.responseJSON || {} details = data.responseJSON || {}
@notify( @notify(
type: 'error' type: 'error'
msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to save!')) msg: App.i18n.translateContent(details.error_human || details.error || __('Saving failed.'))
) )
) )

4
app/assets/javascripts/app/controllers/_integration/ldap.coffee
View file

@ -315,7 +315,7 @@ class ConnectionWizard extends App.ControllerWizardModal
if !_.isEmpty(detailsRaw) if !_.isEmpty(detailsRaw)
details = JSON.parse(detailsRaw) details = JSON.parse(detailsRaw)
@showSlide('js-discover') @showSlide('js-discover')
@showAlert('js-discover', details.error || __('Unable to perform backend.')) @showAlert('js-discover', details.error || __('Server operation failed.'))
) )
@ -384,7 +384,7 @@ class ConnectionWizard extends App.ControllerWizardModal
if !_.isEmpty(detailsRaw) if !_.isEmpty(detailsRaw)
details = JSON.parse(detailsRaw) details = JSON.parse(detailsRaw)
@showSlide('js-bind') @showSlide('js-bind')
@showAlert('js-bind', details.error || __('Unable to perform backend.')) @showAlert('js-bind', details.error || __('Server operation failed.'))
) )
mappingShow: (alreadyShown) => mappingShow: (alreadyShown) =>

8
app/assets/javascripts/app/controllers/_integration/smime.coffee
View file

@ -106,7 +106,7 @@ class Certificate extends App.ControllerModal
details = data.responseJSON || {} details = data.responseJSON || {}
@notify @notify
type: 'error' type: 'error'
msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to import!')) msg: App.i18n.translateContent(details.error_human || details.error || __('The import failed.'))
timeout: 6000 timeout: 6000
) )
@ -149,7 +149,7 @@ class PrivateKey extends App.ControllerModal
details = data.responseJSON || {} details = data.responseJSON || {}
@notify @notify
type: 'error' type: 'error'
msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to import!')) msg: App.i18n.translateContent(details.error_human || details.error || __('The import failed.'))
timeout: 6000 timeout: 6000
) )
@ -178,7 +178,7 @@ class List extends App.Controller
details = data.responseJSON || {} details = data.responseJSON || {}
@notify( @notify(
type: 'error' type: 'error'
msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to load list of certificates!')) msg: App.i18n.translateContent(details.error_human || details.error || __('Loading failed.'))
) )
# do something # do something
@ -210,7 +210,7 @@ class List extends App.Controller
details = data.responseJSON || {} details = data.responseJSON || {}
@notify( @notify(
type: 'error' type: 'error'
msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to save!')) msg: App.i18n.translateContent(details.error_human || details.error || __('Server operation failed.'))
) )
) )

2
app/assets/javascripts/app/controllers/_profile/password.coffee
View file

@ -74,7 +74,7 @@ class ProfilePassword extends App.ControllerSubContent
else else
@notify @notify
type: 'error' type: 'error'
msg: __('Unable to set password. Please contact your administrator.') msg: __('The password could not be set. Please contact your administrator.')
removeAll: true removeAll: true
@formEnable( @$('form') ) @formEnable( @$('form') )

2
app/assets/javascripts/app/controllers/agent_ticket_merge.coffee
View file

@ -113,7 +113,7 @@ class App.TicketMerge extends App.ControllerModal
details = data.responseJSON || {} details = data.responseJSON || {}
@notify @notify
type: 'error' type: 'error'
msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to merge!')) msg: App.i18n.translateContent(details.error_human || details.error || __('The tickets could not be merged.'))
timeout: 6000 timeout: 6000
@formEnable(e) @formEnable(e)
) )

2
app/assets/javascripts/app/controllers/email_verify.coffee
View file

@ -50,7 +50,7 @@ class Fail extends App.ControllerAppContent
render: => render: =>
@renderScreenError( @renderScreenError(
detail: __('Unable to verify email. Please contact your administrator.') detail: __('Email could not be verified. Please contact your administrator.')
) )
App.Config.set('email_verify/:token', EmailVerify, 'Routes') App.Config.set('email_verify/:token', EmailVerify, 'Routes')

2
app/assets/javascripts/app/controllers/getting_started/admin.coffee
View file

@ -101,7 +101,7 @@ class GettingStartedAdmin extends App.ControllerWizardFullScreen
fail: (settings, details) => fail: (settings, details) =>
@formEnable(e) @formEnable(e)
@form.showAlert(details.error_human || details.error || __('Unable to create user!')) @form.showAlert(details.error_human || details.error || __('User could not be created.'))
) )
relogin: (data, status, xhr) => relogin: (data, status, xhr) =>

6
app/assets/javascripts/app/controllers/getting_started/channel_email.coffee
View file

@ -178,7 +178,7 @@ class GettingStartedChannelEmail extends App.ControllerWizardFullScreen
@showAlert('js-intro', __('Account already exists!') ) @showAlert('js-intro', __('Account already exists!') )
else else
@showSlide('js-inbound') @showSlide('js-inbound')
@showAlert('js-inbound', __('Unable to detect your server settings. Manual configuration needed.') ) @showAlert('js-inbound', __('The server settings could not be automatically detected. Please configure them manually.') )
@$('.js-inbound [name="options::user"]').val( @account['meta']['email'] ) @$('.js-inbound [name="options::user"]').val( @account['meta']['email'] )
@$('.js-inbound [name="options::password"]').val( @account['meta']['password'] ) @$('.js-inbound [name="options::password"]').val( @account['meta']['password'] )
@ -354,7 +354,7 @@ class GettingStartedChannelEmail extends App.ControllerWizardFullScreen
@delay( @delay(
=> =>
@showSlide('js-intro') @showSlide('js-intro')
@showAlert('js-intro', __('Unable to verify sending and receiving. Please check your settings.') ) @showAlert('js-intro', __('Email sending and receiving could not be verified. Please check your settings.') )
2300 2300
) )
@ -364,7 +364,7 @@ class GettingStartedChannelEmail extends App.ControllerWizardFullScreen
@verify( @account, count + 1 ) @verify( @account, count + 1 )
fail: => fail: =>
@showSlide('js-intro') @showSlide('js-intro')
@showAlert('js-intro', __('Unable to verify sending and receiving. Please check your settings.')) @showAlert('js-intro', __('Email sending and receiving could not be verified. Please check your settings.'))
) )
App.Config.set('getting_started/channel/email', GettingStartedChannelEmail, 'Routes') App.Config.set('getting_started/channel/email', GettingStartedChannelEmail, 'Routes')

4
app/assets/javascripts/app/controllers/idoit_object_selector.coffee
View file

@ -39,7 +39,7 @@ class App.IdoitObjectSelector extends App.ControllerModal
return if status is 'abort' return if status is 'abort'
# show error message # show error message
@contentInline = __('Unable to load content') @contentInline = __('Content could not be loaded.')
@render() @render()
) )
'' ''
@ -71,7 +71,7 @@ class App.IdoitObjectSelector extends App.ControllerModal
return if status is 'abort' return if status is 'abort'
# show error message # show error message
@contentInline = __('Unable to load content') @contentInline = __('Content could not be loaded.')
@render() @render()
) )

2
app/assets/javascripts/app/controllers/knowledge_base/delete_action.coffee
View file

@ -64,7 +64,7 @@ class App.KnowledgeBaseDeleteAction
deleteFailure: (modal, xhr) -> deleteFailure: (modal, xhr) ->
modal.formEnable(modal.el) modal.formEnable(modal.el)
modal.showAlert xhr.responseJSON?.error || __('Unable to delete.') modal.showAlert xhr.responseJSON?.error || __('Deletion failed.')
# simulate modal's close function # simulate modal's close function
close: -> close: ->

2
app/assets/javascripts/app/controllers/knowledge_base/search_field_widget.coffee
View file

@ -100,7 +100,7 @@ class App.KnowledgeBaseSearchFieldWidget extends App.Controller
@searchField.removeClass('loading') @searchField.removeClass('loading')
text = xhr.responseJSON?.error_human || xhr.responseJSON?.errorr || __('Unable to load') text = xhr.responseJSON?.error_human || xhr.responseJSON?.errorr || __('Loading failed.')
@renderError(text) @renderError(text)
onSuccess: (data, originalQuery) => onSuccess: (data, originalQuery) =>

2
app/assets/javascripts/app/controllers/password_reset_verify.coffee
View file

@ -133,7 +133,7 @@ class PasswordResetVerify extends App.ControllerFullPage
else else
@notify( @notify(
type: 'error' type: 'error'
msg: __('Unable to set password. Please contact your administrator.') msg: __('The password could not be set. Please contact your administrator.')
removeAll: true removeAll: true
) )
@formEnable(@$('form')) @formEnable(@$('form'))

2
app/assets/javascripts/app/controllers/signup.coffee
View file

@ -74,7 +74,7 @@ class Signup extends App.ControllerFullPage
)) ))
fail: (settings, details) => fail: (settings, details) =>
@formEnable(e) @formEnable(e)
@form.showAlert(details.error_human || details.error || __('Unable to create user!')) @form.showAlert(details.error_human || details.error || __('User could not be created.'))
) )
resend: (e) => resend: (e) =>

2
app/assets/javascripts/app/controllers/ticket_zoom.coffee
View file

@ -1022,7 +1022,7 @@ class App.TicketZoom extends App.Controller
error = settings.responseJSON.error error = settings.responseJSON.error
App.Event.trigger 'notify', { App.Event.trigger 'notify', {
type: 'error' type: 'error'
msg: App.i18n.translateContent(details.error_human || details.error || error || __('Unable to update!')) msg: App.i18n.translateContent(details.error_human || details.error || error || __('Saving failed.'))
timeout: 2000 timeout: 2000
} }
@autosaveStart() @autosaveStart()

2
app/assets/javascripts/app/controllers/ticket_zoom/article_action/delete.coffee
View file

@ -57,7 +57,7 @@ class Delete
ui.log 'errors', details ui.log 'errors', details
ui.notify( ui.notify(
type: 'error' type: 'error'
msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to delete article!')) msg: App.i18n.translateContent(details.error_human || details.error || __('Article could not be deleted.'))
timeout: 6000 timeout: 6000
) )
) )

10
app/assets/javascripts/app/controllers/ticket_zoom/sidebar_git_issue.coffee
View file

@ -70,7 +70,7 @@ class App.SidebarGitIssue extends App.Controller
success: => success: =>
ui.close() ui.close()
@renderIssues() @renderIssues()
error: (message = __('Unable to save issue')) => error: (message = __('The issue could not be saved.')) =>
ui.showAlert(App.i18n.translatePlain(message)) ui.showAlert(App.i18n.translatePlain(message))
form = ui.el.find('.js-result') form = ui.el.find('.js-result')
@formEnable(form) @formEnable(form)
@ -78,7 +78,7 @@ class App.SidebarGitIssue extends App.Controller
else else
ui.close() ui.close()
@renderIssues() @renderIssues()
error: (message = __('Unable to load issues')) => error: (message = __('Loading failed.')) =>
ui.showAlert(App.i18n.translatePlain(message)) ui.showAlert(App.i18n.translatePlain(message))
form = ui.el.find('.js-result') form = ui.el.find('.js-result')
@formEnable(form) @formEnable(form)
@ -126,7 +126,7 @@ class App.SidebarGitIssue extends App.Controller
@issueLinkData = result @issueLinkData = result
@renderIssues() @renderIssues()
error: => error: =>
@showError(App.i18n.translateInline('Unable to load issues')) @showError(App.i18n.translateInline('Loading failed.'))
) )
getIssues: (params) -> getIssues: (params) ->
@ -141,7 +141,7 @@ class App.SidebarGitIssue extends App.Controller
# some issues redirect to pull requests like # some issues redirect to pull requests like
# https://github.com/zammad/zammad/issues/1574 # https://github.com/zammad/zammad/issues/1574
# in this case throw error # in this case throw error
return params.error(__('Unable to load issues')) if _.isEmpty(data.response) return params.error(__('Loading failed.')) if _.isEmpty(data.response)
params.success(data.response) params.success(data.response)
else else
@ -176,7 +176,7 @@ class App.SidebarGitIssue extends App.Controller
links: @issueLinks links: @issueLinks
success: => success: =>
@renderIssues() @renderIssues()
error: (message = __('Unable to save issue')) => error: (message = __('The issue could not be saved.')) =>
@showError(App.i18n.translateInline(message)) @showError(App.i18n.translateInline(message))
) )
else else

4
app/assets/javascripts/app/controllers/ticket_zoom/sidebar_idoit.coffee
View file

@ -67,7 +67,7 @@ class SidebarIdoit extends App.Controller
if data.response if data.response
@showList(data.response.result) @showList(data.response.result)
return return
@showError(__('Unable to load data…')) @showError(__('Loading failed.'))
error: (xhr, status, error) => error: (xhr, status, error) =>
@ -75,7 +75,7 @@ class SidebarIdoit extends App.Controller
return if status is 'abort' return if status is 'abort'
# show error message # show error message
@showError(__('Unable to load data…')) @showError(__('Loading failed.'))
) )
showList: (objects) => showList: (objects) =>

2
app/assets/javascripts/app/controllers/widget/import.coffee
View file

@ -61,7 +61,7 @@ class App.Import extends App.ControllerModal
details = data.responseJSON || {} details = data.responseJSON || {}
@notify @notify
type: 'error' type: 'error'
msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to import!')) msg: App.i18n.translateContent(details.error_human || details.error || __('The import failed.'))
timeout: 6000 timeout: 6000
@formEnable(e) @formEnable(e)
) )

2
app/assets/javascripts/app/controllers/widget/import_try_result.coffee
View file

@ -59,7 +59,7 @@ class App.ImportTryResult extends App.ControllerModal
details = data.responseJSON || {} details = data.responseJSON || {}
@notify @notify
type: 'error' type: 'error'
msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to import!')) msg: App.i18n.translateContent(details.error_human || details.error || __('The import failed.'))
timeout: 6000 timeout: 6000
@formEnable(e) @formEnable(e)
) )

2
app/assets/javascripts/app/controllers/widget/payload_example.coffee
View file

@ -31,6 +31,6 @@ class App.WidgetPayloadExample extends App.ControllerModal
details = data.responseJSON || {} details = data.responseJSON || {}
@notify @notify
type: 'error' type: 'error'
msg: App.i18n.translateContent(details.error_human || details.error || __('Unable to load example payload!')) msg: App.i18n.translateContent(details.error_human || details.error || __('Loading failed.'))
timeout: 6000 timeout: 6000
) )

2
app/assets/javascripts/app/models/knowledge_base_answer_translation.coffee
View file

@ -48,7 +48,7 @@ class App.KnowledgeBaseAnswerTranslation extends App.Model
App.Event.trigger 'notify', { App.Event.trigger 'notify', {
type: 'error' type: 'error'
msg: xhr.responseJSON?.error || __('Unable to load') msg: xhr.responseJSON?.error || __('Loading failed.')
} }
) )

2
app/assets/javascripts/app/views/knowledge_base/base_form.coffee
View file

@ -85,7 +85,7 @@ class App.KnowledgeBaseForm extends App.Controller
@scrollTop() @scrollTop()
error: (xhr) => error: (xhr) =>
@formEnable(@el) @formEnable(@el)
formController.showAlert(xhr.responseJSON?.error || __('Unable to save changes')) formController.showAlert(xhr.responseJSON?.error || __('Changes could not be saved.'))
@scrollTop() @scrollTop()
) )

2
app/controllers/getting_started_controller.rb
View file

@ -128,7 +128,7 @@ curl http://localhost/api/v1/getting_started -v -u #{login}:#{password}
if params[:logo] && params[:logo] =~ %r{^data:image}i if params[:logo] && params[:logo] =~ %r{^data:image}i
file = StaticAssets.data_url_attributes(params[:logo]) file = StaticAssets.data_url_attributes(params[:logo])
if !file[:content] || !file[:mime_type] if !file[:content] || !file[:mime_type]
messages[:logo] = __('Unable to process image upload.') messages[:logo] = __('The uploaded image could not be processed.')
end end
end end

2
app/controllers/import_otrs_controller.rb
View file

@ -60,7 +60,7 @@ class ImportOtrsController < ApplicationController
if !key_parts[1] if !key_parts[1]
render json: { render json: {
result: 'invalid', result: 'invalid',
message_human: __('Unable to get key from URL!') message_human: __('Import API key could not be extracted from URL.')
} }
return return
end end

2
app/controllers/settings_controller.rb
View file

@ -56,7 +56,7 @@ class SettingsController < ApplicationController
if !file[:content] || !file[:mime_type] if !file[:content] || !file[:mime_type]
render json: { render json: {
result: 'invalid', result: 'invalid',
message: __('Unable to process image upload.'), message: __('The uploaded image could not be processed.'),
} }
return return
end end

2
app/jobs/communicate_sms_job.rb
View file

@ -107,6 +107,6 @@ class CommunicateSmsJob < ApplicationJob
end end
def log_error_prefix def log_error_prefix
'Unable to send sms message' # rubocop:disable Zammad/DetectTranslatableString 'Unable to send SMS message' # rubocop:disable Zammad/DetectTranslatableString
end end
end end

4
app/models/store.rb
View file

@ -160,7 +160,7 @@ returns
if !file if !file
raise "No such file #{store_file_id}!" raise "No such file #{store_file_id}!"
end end
raise __('Unable to generate preview') if options[:silence] != true && preferences[:content_preview] != true raise __('Content preview could not be generated.') if options[:silence] != true && preferences[:content_preview] != true
image_resize(file.content, 200) image_resize(file.content, 200)
end end
@ -183,7 +183,7 @@ returns
if !file if !file
raise "No such file #{store_file_id}!" raise "No such file #{store_file_id}!"
end end
raise __('Unable to generate inline') if options[:silence] != true && preferences[:content_inline] != true raise __('Inline content could not be generated.') if options[:silence] != true && preferences[:content_inline] != true
image_resize(file.content, 1800) image_resize(file.content, 1800)
end end

4
app/models/ticket.rb
View file

@ -999,7 +999,7 @@ perform changes on ticket
if value['pre_condition'].start_with?('not_set') if value['pre_condition'].start_with?('not_set')
value['value'] = 1 value['value'] = 1
elsif value['pre_condition'].start_with?('current_user.') elsif value['pre_condition'].start_with?('current_user.')
raise __('Unable to use current_user, got no current_user_id for ticket.perform_changes') if !current_user_id raise __("The required parameter 'current_user_id' is missing.") if !current_user_id
value['value'] = current_user_id value['value'] = current_user_id
end end
@ -1021,7 +1021,7 @@ perform changes on ticket
objects = build_notification_template_objects(article) objects = build_notification_template_objects(article)
perform_article.each do |key, value| perform_article.each do |key, value|
raise __('Unable to create article, we only support article.note') if key != 'article.note' raise __("Article could not be created. An unsupported key other than 'article.note' was provided.") if key != 'article.note'
add_trigger_note(id, value, objects, perform_origin) add_trigger_note(id, value, objects, perform_origin)
end end

279
i18n/zammad.pot
View file

@ -780,6 +780,13 @@ msgstr ""
msgid "App Version" msgid "App Version"
msgstr "" msgstr ""
#: app/assets/javascripts/app/controllers/_channel/facebook.coffee
#: app/assets/javascripts/app/controllers/_channel/google.coffee
#: app/assets/javascripts/app/controllers/_channel/microsoft365.coffee
#: app/assets/javascripts/app/controllers/_channel/twitter.coffee
msgid "App could not be verified."
msgstr ""
#: db/seeds/settings.rb #: db/seeds/settings.rb
msgid "App credentials for Facebook." msgid "App credentials for Facebook."
msgstr "" msgstr ""
@ -851,6 +858,14 @@ msgstr ""
msgid "Article Count" msgid "Article Count"
msgstr "" msgstr ""
#: app/models/ticket.rb
msgid "Article could not be created. An unsupported key other than 'article.note' was provided."
msgstr ""
#: app/assets/javascripts/app/controllers/ticket_zoom/article_action/delete.coffee
msgid "Article could not be deleted."
msgstr ""
#: app/assets/javascripts/app/models/ticket.coffee #: app/assets/javascripts/app/models/ticket.coffee
msgid "Article#" msgid "Article#"
msgstr "" msgstr ""
@ -1413,6 +1428,10 @@ msgstr ""
msgid "Cc" msgid "Cc"
msgstr "" msgstr ""
#: lib/secure_mailing/smime/incoming.rb
msgid "Certificate for verification could not be found."
msgstr ""
#: app/assets/javascripts/app/views/integration/smime.jst.eco #: app/assets/javascripts/app/views/integration/smime.jst.eco
msgid "Certificates & Private Keys" msgid "Certificates & Private Keys"
msgstr "" msgstr ""
@ -1463,6 +1482,10 @@ msgstr ""
msgid "Changes" msgid "Changes"
msgstr "" msgstr ""
#: app/assets/javascripts/app/views/knowledge_base/base_form.coffee
msgid "Changes could not be saved."
msgstr ""
#: app/assets/javascripts/app/views/object_manager/index.jst.eco #: app/assets/javascripts/app/views/object_manager/index.jst.eco
msgid "Changes were made that require a database update." msgid "Changes were made that require a database update."
msgstr "" msgstr ""
@ -1930,6 +1953,14 @@ msgstr ""
msgid "Content" msgid "Content"
msgstr "" msgstr ""
#: app/assets/javascripts/app/controllers/idoit_object_selector.coffee
msgid "Content could not be loaded."
msgstr ""
#: app/models/store.rb
msgid "Content preview could not be generated."
msgstr ""
#: app/assets/javascripts/app/controllers/knowledge_base/content_controller.coffee #: app/assets/javascripts/app/controllers/knowledge_base/content_controller.coffee
msgid "Content was changed since loading" msgid "Content was changed since loading"
msgstr "" msgstr ""
@ -3069,6 +3100,10 @@ msgstr ""
msgid "Deletion Task" msgid "Deletion Task"
msgstr "" msgstr ""
#: app/assets/javascripts/app/controllers/knowledge_base/delete_action.coffee
msgid "Deletion failed."
msgstr ""
#: app/assets/javascripts/app/views/ticket_zoom/article_view_delivery_failed.jst.eco #: app/assets/javascripts/app/views/ticket_zoom/article_view_delivery_failed.jst.eco
msgid "Delivery failed" msgid "Delivery failed"
msgstr "" msgstr ""
@ -3431,6 +3466,15 @@ msgstr ""
msgid "Email Outbound" msgid "Email Outbound"
msgstr "" msgstr ""
#: app/assets/javascripts/app/controllers/email_verify.coffee
msgid "Email could not be verified. Please contact your administrator."
msgstr ""
#: app/assets/javascripts/app/controllers/_channel/email.coffee
#: app/assets/javascripts/app/controllers/getting_started/channel_email.coffee
msgid "Email sending and receiving could not be verified. Please check your settings."
msgstr ""
#: app/assets/javascripts/app/controllers/user_profile.coffee #: app/assets/javascripts/app/controllers/user_profile.coffee
msgid "Email sent to \"%s\". Please let the user verify his email address." msgid "Email sent to \"%s\". Please let the user verify his email address."
msgstr "" msgstr ""
@ -4755,6 +4799,10 @@ msgstr ""
msgid "Import %s" msgid "Import %s"
msgstr "" msgstr ""
#: app/controllers/import_otrs_controller.rb
msgid "Import API key could not be extracted from URL."
msgstr ""
#: db/seeds/settings.rb #: db/seeds/settings.rb
msgid "Import Backend" msgid "Import Backend"
msgstr "" msgstr ""
@ -4933,6 +4981,10 @@ msgstr ""
msgid "Information" msgid "Information"
msgstr "" msgstr ""
#: app/models/store.rb
msgid "Inline content could not be generated."
msgstr ""
#: app/assets/javascripts/app/views/translation/index.jst.eco #: app/assets/javascripts/app/views/translation/index.jst.eco
msgid "Inline translation" msgid "Inline translation"
msgstr "" msgstr ""
@ -5474,6 +5526,15 @@ msgstr ""
msgid "Load" msgid "Load"
msgstr "" msgstr ""
#: app/assets/javascripts/app/controllers/_integration/smime.coffee
#: app/assets/javascripts/app/controllers/knowledge_base/search_field_widget.coffee
#: app/assets/javascripts/app/controllers/ticket_zoom/sidebar_git_issue.coffee
#: app/assets/javascripts/app/controllers/ticket_zoom/sidebar_idoit.coffee
#: app/assets/javascripts/app/controllers/widget/payload_example.coffee
#: app/assets/javascripts/app/models/knowledge_base_answer_translation.coffee
msgid "Loading failed."
msgstr ""
#: app/assets/javascripts/app/lib/app_post/task_manager.coffee #: app/assets/javascripts/app/lib/app_post/task_manager.coffee
#: app/assets/javascripts/app/lib/base/jquery.textmodule.js #: app/assets/javascripts/app/lib/base/jquery.textmodule.js
#: app/assets/javascripts/app/views/generic/page_loading.jst.eco #: app/assets/javascripts/app/views/generic/page_loading.jst.eco
@ -7229,6 +7290,10 @@ msgstr ""
msgid "Priority Icons in Overviews" msgid "Priority Icons in Overviews"
msgstr "" msgstr ""
#: lib/secure_mailing/smime/incoming.rb
msgid "Private key for decryption could not be found."
msgstr ""
#: db/seeds/object_manager_attributes.rb #: db/seeds/object_manager_attributes.rb
msgid "Problem" msgid "Problem"
msgstr "" msgstr ""
@ -7699,6 +7764,10 @@ msgstr ""
msgid "SMS successfully sent" msgid "SMS successfully sent"
msgstr "" msgstr ""
#: app/assets/javascripts/app/controllers/_channel/sms.coffee
msgid "SMS test failed."
msgstr ""
#: lib/email_helper.rb #: lib/email_helper.rb
msgid "SMTP - configure your own outgoing SMTP settings" msgid "SMTP - configure your own outgoing SMTP settings"
msgstr "" msgstr ""
@ -7767,6 +7836,13 @@ msgstr ""
msgid "Saved conditions" msgid "Saved conditions"
msgstr "" msgstr ""
#: app/assets/javascripts/app/controllers/_integration/github.coffee
#: app/assets/javascripts/app/controllers/_integration/gitlab.coffee
#: app/assets/javascripts/app/controllers/_integration/idoit.coffee
#: app/assets/javascripts/app/controllers/ticket_zoom.coffee
msgid "Saving failed."
msgstr ""
#: app/assets/javascripts/app/controllers/knowledge_base/content_can_be_published_form.coffee #: app/assets/javascripts/app/controllers/knowledge_base/content_can_be_published_form.coffee
msgid "Schedule for" msgid "Schedule for"
msgstr "" msgstr ""
@ -8002,6 +8078,12 @@ msgstr ""
msgid "Sequencer log level" msgid "Sequencer log level"
msgstr "" msgstr ""
#: app/assets/javascripts/app/controllers/_integration/exchange.coffee
#: app/assets/javascripts/app/controllers/_integration/ldap.coffee
#: app/assets/javascripts/app/controllers/_integration/smime.coffee
msgid "Server operation failed."
msgstr ""
#: app/assets/javascripts/app/views/integration/index.jst.eco #: app/assets/javascripts/app/views/integration/index.jst.eco
msgid "Service" msgid "Service"
msgstr "" msgstr ""
@ -8730,6 +8812,10 @@ msgstr ""
msgid "The MIME type of the resized image is invalid." msgid "The MIME type of the resized image is invalid."
msgstr "" msgstr ""
#: app/assets/javascripts/app/controllers/_channel/telegram.coffee
msgid "The Telegram bot could not be saved."
msgstr ""
#: lib/telegram.rb #: lib/telegram.rb
msgid "The Telegram file is larger than the allowed 20 MB." msgid "The Telegram file is larger than the allowed 20 MB."
msgstr "" msgstr ""
@ -8837,6 +8923,12 @@ msgstr ""
msgid "The identifier for a ticket, e.g. Ticket#, Call#, MyTicket#. The default is Ticket#." msgid "The identifier for a ticket, e.g. Ticket#, Call#, MyTicket#. The default is Ticket#."
msgstr "" msgstr ""
#: app/assets/javascripts/app/controllers/_integration/smime.coffee
#: app/assets/javascripts/app/controllers/widget/import.coffee
#: app/assets/javascripts/app/controllers/widget/import_try_result.coffee
msgid "The import failed."
msgstr ""
#: app/assets/javascripts/app/views/generic/object_import/imported.jst.eco #: app/assets/javascripts/app/views/generic/object_import/imported.jst.eco
msgid "The import was successful." msgid "The import was successful."
msgstr "" msgstr ""
@ -8849,6 +8941,10 @@ msgstr ""
msgid "The installed attachment plugin could not handle the request payload. Ensure that the correct attachment plugin is installed (ingest-attachment)." msgid "The installed attachment plugin could not handle the request payload. Ensure that the correct attachment plugin is installed (ingest-attachment)."
msgstr "" msgstr ""
#: app/assets/javascripts/app/controllers/ticket_zoom/sidebar_git_issue.coffee
msgid "The issue could not be saved."
msgstr ""
#: app/assets/javascripts/app/controllers/_application_controller/generic_new.coffee #: app/assets/javascripts/app/controllers/_application_controller/generic_new.coffee
#: app/assets/javascripts/app/controllers/_channel/_email_signature.coffee #: app/assets/javascripts/app/controllers/_channel/_email_signature.coffee
#: app/assets/javascripts/app/controllers/agent_ticket_create.coffee #: app/assets/javascripts/app/controllers/agent_ticket_create.coffee
@ -8882,6 +8978,11 @@ msgstr ""
msgid "The page you were looking for does not exist." msgid "The page you were looking for does not exist."
msgstr "" msgstr ""
#: app/assets/javascripts/app/controllers/_profile/password.coffee
#: app/assets/javascripts/app/controllers/password_reset_verify.coffee
msgid "The password could not be set. Please contact your administrator."
msgstr ""
#: app/assets/javascripts/app/views/knowledge_base/delete.coffee #: app/assets/javascripts/app/views/knowledge_base/delete.coffee
msgid "The request could not be processed." msgid "The request could not be processed."
msgstr "" msgstr ""
@ -8898,6 +8999,10 @@ msgstr ""
msgid "The required parameter 'crc_token' is missing from the Twitter verify payload!" msgid "The required parameter 'crc_token' is missing from the Twitter verify payload!"
msgstr "" msgstr ""
#: app/models/ticket.rb
msgid "The required parameter 'current_user_id' is missing."
msgstr ""
#: app/controllers/users_controller.rb #: app/controllers/users_controller.rb
msgid "The required parameter 'id' is missing." msgid "The required parameter 'id' is missing."
msgstr "" msgstr ""
@ -8914,6 +9019,11 @@ msgstr ""
msgid "The retried security process failed!" msgid "The retried security process failed!"
msgstr "" msgstr ""
#: app/assets/javascripts/app/controllers/_channel/email.coffee
#: app/assets/javascripts/app/controllers/getting_started/channel_email.coffee
msgid "The server settings could not be automatically detected. Please configure them manually."
msgstr ""
#: app/assets/javascripts/app/controllers/getting_started/admin.coffee #: app/assets/javascripts/app/controllers/getting_started/admin.coffee
msgid "The sign-in failed. Please contact the Support team." msgid "The sign-in failed. Please contact the Support team."
msgstr "" msgstr ""
@ -8934,6 +9044,19 @@ msgstr ""
msgid "The text at the beginning of the subject in an email reply, e.g. RE, AW, or AS." msgid "The text at the beginning of the subject in an email reply, e.g. RE, AW, or AS."
msgstr "" msgstr ""
#: app/assets/javascripts/app/controllers/agent_ticket_merge.coffee
msgid "The tickets could not be merged."
msgstr ""
#: app/controllers/getting_started_controller.rb
#: app/controllers/settings_controller.rb
msgid "The uploaded image could not be processed."
msgstr ""
#: lib/external_credential/microsoft365.rb
msgid "The user's 'preferred_username' could not be extracted from 'id_token'."
msgstr ""
#: app/assets/javascripts/app/controllers/customer_ticket_create.coffee #: app/assets/javascripts/app/controllers/customer_ticket_create.coffee
#: app/assets/javascripts/app/views/customer_not_ticket_exists.jst.eco #: app/assets/javascripts/app/views/customer_not_ticket_exists.jst.eco
msgid "The way to communicate with us is this thing called \"ticket\"." msgid "The way to communicate with us is this thing called \"ticket\"."
@ -9538,153 +9661,6 @@ msgstr ""
msgid "URL (AJAX endpoint)" msgid "URL (AJAX endpoint)"
msgstr "" msgstr ""
#: app/assets/javascripts/app/views/knowledge_base/base_form.coffee
msgid "Unable to save changes"
msgstr ""
#: app/models/ticket.rb
msgid "Unable to create article, we only support article.note"
msgstr ""
#: app/assets/javascripts/app/controllers/getting_started/admin.coffee
#: app/assets/javascripts/app/controllers/signup.coffee
msgid "Unable to create user!"
msgstr ""
#: app/assets/javascripts/app/controllers/ticket_zoom/article_action/delete.coffee
msgid "Unable to delete article!"
msgstr ""
#: app/assets/javascripts/app/controllers/knowledge_base/delete_action.coffee
msgid "Unable to delete."
msgstr ""
#: app/assets/javascripts/app/controllers/_channel/email.coffee
#: app/assets/javascripts/app/controllers/getting_started/channel_email.coffee
msgid "Unable to detect your server settings. Manual configuration needed."
msgstr ""
#: lib/external_credential/google.rb
msgid "Unable to extract user email from id_token!"
msgstr ""
#: lib/external_credential/microsoft365.rb
msgid "Unable to extract user preferred_username from id_token!"
msgstr ""
#: lib/secure_mailing/smime/incoming.rb
msgid "Unable to find certificate for verification"
msgstr ""
#: lib/secure_mailing/smime/incoming.rb
msgid "Unable to find private key to decrypt"
msgstr ""
#: app/models/store.rb
msgid "Unable to generate inline"
msgstr ""
#: app/models/store.rb
msgid "Unable to generate preview"
msgstr ""
#: app/controllers/import_otrs_controller.rb
msgid "Unable to get key from URL!"
msgstr ""
#: app/assets/javascripts/app/controllers/_integration/smime.coffee
#: app/assets/javascripts/app/controllers/widget/import.coffee
#: app/assets/javascripts/app/controllers/widget/import_try_result.coffee
msgid "Unable to import!"
msgstr ""
#: app/assets/javascripts/app/controllers/knowledge_base/search_field_widget.coffee
#: app/assets/javascripts/app/models/knowledge_base_answer_translation.coffee
msgid "Unable to load"
msgstr ""
#: app/assets/javascripts/app/controllers/idoit_object_selector.coffee
msgid "Unable to load content"
msgstr ""
#: app/assets/javascripts/app/controllers/ticket_zoom/sidebar_idoit.coffee
msgid "Unable to load data…"
msgstr ""
#: app/assets/javascripts/app/controllers/widget/payload_example.coffee
msgid "Unable to load example payload!"
msgstr ""
#: app/assets/javascripts/app/controllers/ticket_zoom/sidebar_git_issue.coffee
msgid "Unable to load issues"
msgstr ""
#: app/assets/javascripts/app/controllers/_integration/smime.coffee
msgid "Unable to load list of certificates!"
msgstr ""
#: app/assets/javascripts/app/controllers/agent_ticket_merge.coffee
msgid "Unable to merge!"
msgstr ""
#: app/assets/javascripts/app/controllers/_integration/exchange.coffee
#: app/assets/javascripts/app/controllers/_integration/ldap.coffee
msgid "Unable to perform backend."
msgstr ""
#: app/assets/javascripts/app/controllers/_channel/sms.coffee
msgid "Unable to perform test"
msgstr ""
#: app/controllers/getting_started_controller.rb
#: app/controllers/settings_controller.rb
msgid "Unable to process image upload."
msgstr ""
#: app/assets/javascripts/app/controllers/_channel/telegram.coffee
msgid "Unable to save Bot."
msgstr ""
#: app/assets/javascripts/app/controllers/ticket_zoom/sidebar_git_issue.coffee
msgid "Unable to save issue"
msgstr ""
#: app/assets/javascripts/app/controllers/_integration/github.coffee
#: app/assets/javascripts/app/controllers/_integration/gitlab.coffee
#: app/assets/javascripts/app/controllers/_integration/idoit.coffee
#: app/assets/javascripts/app/controllers/_integration/smime.coffee
msgid "Unable to save!"
msgstr ""
#: app/assets/javascripts/app/controllers/_profile/password.coffee
#: app/assets/javascripts/app/controllers/password_reset_verify.coffee
msgid "Unable to set password. Please contact your administrator."
msgstr ""
#: app/assets/javascripts/app/controllers/ticket_zoom.coffee
msgid "Unable to update!"
msgstr ""
#: app/models/ticket.rb
msgid "Unable to use current_user, got no current_user_id for ticket.perform_changes"
msgstr ""
#: app/assets/javascripts/app/controllers/_channel/facebook.coffee
#: app/assets/javascripts/app/controllers/_channel/google.coffee
#: app/assets/javascripts/app/controllers/_channel/microsoft365.coffee
#: app/assets/javascripts/app/controllers/_channel/twitter.coffee
msgid "Unable to verify App."
msgstr ""
#: app/assets/javascripts/app/controllers/email_verify.coffee
msgid "Unable to verify email. Please contact your administrator."
msgstr ""
#: app/assets/javascripts/app/controllers/_channel/email.coffee
#: app/assets/javascripts/app/controllers/getting_started/channel_email.coffee
msgid "Unable to verify sending and receiving. Please check your settings."
msgstr ""
#: app/controllers/first_steps_controller.rb #: app/controllers/first_steps_controller.rb
#: db/seeds/overviews.rb #: db/seeds/overviews.rb
msgid "Unassigned & Open" msgid "Unassigned & Open"
@ -9955,6 +9931,15 @@ msgstr ""
msgid "User assignment to telephones to be able to open new ticket screen upon answering a call." msgid "User assignment to telephones to be able to open new ticket screen upon answering a call."
msgstr "" msgstr ""
#: app/assets/javascripts/app/controllers/getting_started/admin.coffee
#: app/assets/javascripts/app/controllers/signup.coffee
msgid "User could not be created."
msgstr ""
#: lib/external_credential/google.rb
msgid "User email could not be extracted from 'id_token'."
msgstr ""
#: db/seeds/settings.rb #: db/seeds/settings.rb
msgid "User email for muliple users" msgid "User email for muliple users"
msgstr "" msgstr ""

2
lib/external_credential/google.rb
View file

@ -41,7 +41,7 @@ class ExternalCredential::Google
end end
user_data = user_info(response[:id_token]) user_data = user_info(response[:id_token])
raise Exceptions::UnprocessableEntity, __('Unable to extract user email from id_token!') if user_data[:email].blank? raise Exceptions::UnprocessableEntity, __("User email could not be extracted from 'id_token'.") if user_data[:email].blank?
channel_options = { channel_options = {
inbound: { inbound: {

2
lib/external_credential/microsoft365.rb
View file

@ -45,7 +45,7 @@ class ExternalCredential::Microsoft365
end end
user_data = user_info(response[:id_token]) user_data = user_info(response[:id_token])
raise Exceptions::UnprocessableEntity, __('Unable to extract user preferred_username from id_token!') if user_data[:preferred_username].blank? raise Exceptions::UnprocessableEntity, __("The user's 'preferred_username' could not be extracted from 'id_token'.") if user_data[:preferred_username].blank?
channel_options = { channel_options = {
inbound: { inbound: {

4
lib/secure_mailing/smime/incoming.rb
View file

@ -73,7 +73,7 @@ class SecureMailing::SMIME::Incoming < SecureMailing::Backend::Handler
return if !smime? return if !smime?
success = false success = false
comment = __('Unable to find private key to decrypt') comment = __('Private key for decryption could not be found.')
::SMIMECertificate.where.not(private_key: [nil, '']).find_each do |cert| ::SMIMECertificate.where.not(private_key: [nil, '']).find_each do |cert|
key = OpenSSL::PKey::RSA.new(cert.private_key, cert.private_key_secret) key = OpenSSL::PKey::RSA.new(cert.private_key, cert.private_key_secret)
@ -106,7 +106,7 @@ class SecureMailing::SMIME::Incoming < SecureMailing::Backend::Handler
return if !signed? return if !signed?
success = false success = false
comment = __('Unable to find certificate for verification') comment = __('Certificate for verification could not be found.')
result = verify_certificate_chain(verify_sign_p7enc.certificates) result = verify_certificate_chain(verify_sign_p7enc.certificates)
if result.present? if result.present?

16
spec/lib/secure_mailing/smime_spec.rb
View file

@ -327,7 +327,7 @@ RSpec.describe SecureMailing::SMIME do
it 'fails' do it 'fails' do
expect(mail[:body]).to include(raw_body) expect(mail[:body]).to include(raw_body)
expect(mail['x-zammad-article-preferences'][:security][:sign][:success]).to be false expect(mail['x-zammad-article-preferences'][:security][:sign][:success]).to be false
expect(mail['x-zammad-article-preferences'][:security][:sign][:comment]).to eq('Unable to find certificate for verification') expect(mail['x-zammad-article-preferences'][:security][:sign][:comment]).to eq('Certificate for verification could not be found.')
expect(mail['x-zammad-article-preferences'][:security][:encryption][:success]).to be false expect(mail['x-zammad-article-preferences'][:security][:encryption][:success]).to be false
expect(mail['x-zammad-article-preferences'][:security][:encryption][:comment]).to be nil expect(mail['x-zammad-article-preferences'][:security][:encryption][:comment]).to be nil
end end
@ -342,7 +342,7 @@ RSpec.describe SecureMailing::SMIME do
it 'fails' do it 'fails' do
expect(mail[:body]).to include(raw_body) expect(mail[:body]).to include(raw_body)
expect(mail['x-zammad-article-preferences'][:security][:sign][:success]).to be false expect(mail['x-zammad-article-preferences'][:security][:sign][:success]).to be false
expect(mail['x-zammad-article-preferences'][:security][:sign][:comment]).to eq('Unable to find certificate for verification') expect(mail['x-zammad-article-preferences'][:security][:sign][:comment]).to eq('Certificate for verification could not be found.')
expect(mail['x-zammad-article-preferences'][:security][:encryption][:success]).to be false expect(mail['x-zammad-article-preferences'][:security][:encryption][:success]).to be false
expect(mail['x-zammad-article-preferences'][:security][:encryption][:comment]).to be nil expect(mail['x-zammad-article-preferences'][:security][:encryption][:comment]).to be nil
end end
@ -356,7 +356,7 @@ RSpec.describe SecureMailing::SMIME do
it 'fails' do it 'fails' do
expect(mail[:body]).to include(raw_body) expect(mail[:body]).to include(raw_body)
expect(mail['x-zammad-article-preferences'][:security][:sign][:success]).to be false expect(mail['x-zammad-article-preferences'][:security][:sign][:success]).to be false
expect(mail['x-zammad-article-preferences'][:security][:sign][:comment]).to eq('Unable to find certificate for verification') expect(mail['x-zammad-article-preferences'][:security][:sign][:comment]).to eq('Certificate for verification could not be found.')
expect(mail['x-zammad-article-preferences'][:security][:encryption][:success]).to be false expect(mail['x-zammad-article-preferences'][:security][:encryption][:success]).to be false
expect(mail['x-zammad-article-preferences'][:security][:encryption][:comment]).to be nil expect(mail['x-zammad-article-preferences'][:security][:encryption][:comment]).to be nil
end end
@ -375,7 +375,7 @@ RSpec.describe SecureMailing::SMIME do
it "won't perform verification" do it "won't perform verification" do
expect(mail[:body]).to include(raw_body) expect(mail[:body]).to include(raw_body)
expect(mail['x-zammad-article-preferences'][:security][:sign][:success]).to be false expect(mail['x-zammad-article-preferences'][:security][:sign][:success]).to be false
expect(mail['x-zammad-article-preferences'][:security][:sign][:comment]).to eq('Unable to find certificate for verification') expect(mail['x-zammad-article-preferences'][:security][:sign][:comment]).to eq('Certificate for verification could not be found.')
expect(mail['x-zammad-article-preferences'][:security][:encryption][:success]).to be false expect(mail['x-zammad-article-preferences'][:security][:encryption][:success]).to be false
expect(mail['x-zammad-article-preferences'][:security][:encryption][:comment]).to be nil expect(mail['x-zammad-article-preferences'][:security][:encryption][:comment]).to be nil
end end
@ -406,7 +406,7 @@ RSpec.describe SecureMailing::SMIME do
it 'fails' do it 'fails' do
expect(mail[:body]).to include(raw_body) expect(mail[:body]).to include(raw_body)
expect(mail['x-zammad-article-preferences'][:security][:sign][:success]).to be false expect(mail['x-zammad-article-preferences'][:security][:sign][:success]).to be false
expect(mail['x-zammad-article-preferences'][:security][:sign][:comment]).to eq('Unable to find certificate for verification') expect(mail['x-zammad-article-preferences'][:security][:sign][:comment]).to eq('Certificate for verification could not be found.')
expect(mail['x-zammad-article-preferences'][:security][:encryption][:success]).to be false expect(mail['x-zammad-article-preferences'][:security][:encryption][:success]).to be false
expect(mail['x-zammad-article-preferences'][:security][:encryption][:comment]).to be nil expect(mail['x-zammad-article-preferences'][:security][:encryption][:comment]).to be nil
end end
@ -421,7 +421,7 @@ RSpec.describe SecureMailing::SMIME do
it 'fails' do it 'fails' do
expect(mail[:body]).to include(raw_body) expect(mail[:body]).to include(raw_body)
expect(mail['x-zammad-article-preferences'][:security][:sign][:success]).to be false expect(mail['x-zammad-article-preferences'][:security][:sign][:success]).to be false
expect(mail['x-zammad-article-preferences'][:security][:sign][:comment]).to eq('Unable to find certificate for verification') expect(mail['x-zammad-article-preferences'][:security][:sign][:comment]).to eq('Certificate for verification could not be found.')
expect(mail['x-zammad-article-preferences'][:security][:encryption][:success]).to be false expect(mail['x-zammad-article-preferences'][:security][:encryption][:success]).to be false
expect(mail['x-zammad-article-preferences'][:security][:encryption][:comment]).to be nil expect(mail['x-zammad-article-preferences'][:security][:encryption][:comment]).to be nil
end end
@ -446,7 +446,7 @@ RSpec.describe SecureMailing::SMIME do
it 'fails' do it 'fails' do
expect(mail[:body]).to include(raw_body) expect(mail[:body]).to include(raw_body)
expect(mail['x-zammad-article-preferences'][:security][:sign][:success]).to be false expect(mail['x-zammad-article-preferences'][:security][:sign][:success]).to be false
expect(mail['x-zammad-article-preferences'][:security][:sign][:comment]).to eq('Unable to find certificate for verification') expect(mail['x-zammad-article-preferences'][:security][:sign][:comment]).to eq('Certificate for verification could not be found.')
expect(mail['x-zammad-article-preferences'][:security][:encryption][:success]).to be false expect(mail['x-zammad-article-preferences'][:security][:encryption][:success]).to be false
expect(mail['x-zammad-article-preferences'][:security][:encryption][:comment]).to be nil expect(mail['x-zammad-article-preferences'][:security][:encryption][:comment]).to be nil
end end
@ -573,7 +573,7 @@ RSpec.describe SecureMailing::SMIME do
expect(mail['x-zammad-article-preferences'][:security][:sign][:success]).to be false expect(mail['x-zammad-article-preferences'][:security][:sign][:success]).to be false
expect(mail['x-zammad-article-preferences'][:security][:sign][:comment]).to be nil expect(mail['x-zammad-article-preferences'][:security][:sign][:comment]).to be nil
expect(mail['x-zammad-article-preferences'][:security][:encryption][:success]).to be false expect(mail['x-zammad-article-preferences'][:security][:encryption][:success]).to be false
expect(mail['x-zammad-article-preferences'][:security][:encryption][:comment]).to eq('Unable to find private key to decrypt') expect(mail['x-zammad-article-preferences'][:security][:encryption][:comment]).to eq('Private key for decryption could not be found.')
end end
it_behaves_like 'HttpLog writer', 'failed' it_behaves_like 'HttpLog writer', 'failed'

22
spec/models/store_spec.rb
View file

@ -234,10 +234,10 @@ RSpec.describe Store, type: :model do
it 'cannot be resized (neither inlined nor previewed)' do it 'cannot be resized (neither inlined nor previewed)' do
expect { store.content_inline } expect { store.content_inline }
.to raise_error('Unable to generate inline') .to raise_error('Inline content could not be generated.')
expect { store.content_preview } expect { store.content_preview }
.to raise_error('Unable to generate preview') .to raise_error('Content preview could not be generated.')
expect(store.preferences) expect(store.preferences)
.to not_include(resizable: true) .to not_include(resizable: true)
@ -254,10 +254,10 @@ RSpec.describe Store, type: :model do
it 'cannot be resized (neither inlined nor previewed)' do it 'cannot be resized (neither inlined nor previewed)' do
expect { store.content_inline } expect { store.content_inline }
.to raise_error('Unable to generate inline') .to raise_error('Inline content could not be generated.')
expect { store.content_preview } expect { store.content_preview }
.to raise_error('Unable to generate preview') .to raise_error('Content preview could not be generated.')
expect(store.preferences) expect(store.preferences)
.to not_include(resizable: true) .to not_include(resizable: true)
@ -273,10 +273,10 @@ RSpec.describe Store, type: :model do
it 'cannot be resized (neither inlined nor previewed)' do it 'cannot be resized (neither inlined nor previewed)' do
expect { store.content_inline } expect { store.content_inline }
.to raise_error('Unable to generate inline') .to raise_error('Inline content could not be generated.')
expect { store.content_preview } expect { store.content_preview }
.to raise_error('Unable to generate preview') .to raise_error('Content preview could not be generated.')
expect(store.preferences) expect(store.preferences)
.to not_include(resizable: true) .to not_include(resizable: true)
@ -291,7 +291,7 @@ RSpec.describe Store, type: :model do
it 'can be resized (previewed but not inlined)' do it 'can be resized (previewed but not inlined)' do
expect { store.content_inline } expect { store.content_inline }
.to raise_error('Unable to generate inline') .to raise_error('Inline content could not be generated.')
expect(resized_preview_image.width).to eq(200) expect(resized_preview_image.width).to eq(200)
@ -335,10 +335,10 @@ RSpec.describe Store, type: :model do
it 'cannot be resized (neither inlined nor previewed)' do it 'cannot be resized (neither inlined nor previewed)' do
expect { store.content_inline } expect { store.content_inline }
.to raise_error('Unable to generate inline') .to raise_error('Inline content could not be generated.')
expect { store.content_preview } expect { store.content_preview }
.to raise_error('Unable to generate preview') .to raise_error('Content preview could not be generated.')
expect(store.preferences) expect(store.preferences)
.to not_include(resizable: true) .to not_include(resizable: true)
@ -352,10 +352,10 @@ RSpec.describe Store, type: :model do
it 'cannot be resized (neither inlined nor previewed)' do it 'cannot be resized (neither inlined nor previewed)' do
expect { store.content_inline } expect { store.content_inline }
.to raise_error('Unable to generate inline') .to raise_error('Inline content could not be generated.')
expect { store.content_preview } expect { store.content_preview }
.to raise_error('Unable to generate preview') .to raise_error('Content preview could not be generated.')
expect(store.preferences) expect(store.preferences)
.to not_include(resizable: true) .to not_include(resizable: true)

2
spec/system/channels/email_spec.rb
View file

@ -50,7 +50,7 @@ RSpec.describe 'Manage > Channels > Email', type: :system do
fill_in 'password', with: mailbox_password fill_in 'password', with: mailbox_password
select 'Users', from: 'group_id' select 'Users', from: 'group_id'
click '.js-submit' click '.js-submit'
expect(page).to have_text('Unable to detect your server settings. Manual configuration needed.') expect(page).to have_text('The server settings could not be automatically detected. Please configure them manually.')
end end
end end