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

Closes: #3918 - Improved translatable source strings.

Browse source
This commit is contained in:
Martin Gruner 2022-01-18 07:17:00 +01:00
parent 539f4bc0e4
commit 84b071a039
9 changed files with 24 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -107,12 +107,12 @@ class App.TicketCreate extends App.Controller
'phone-in': 'phone-in':
sender: 'Customer' sender: 'Customer'
article: 'phone' article: 'phone'
title: __('Call Inbound') title: __('Inbound Call')
screen: 'create_phone_in' screen: 'create_phone_in'
'phone-out': 'phone-out':
sender: 'Agent' sender: 'Agent'
article: 'phone' article: 'phone'
title: __('Call Outbound') title: __('Outbound Call')
screen: 'create_phone_out' screen: 'create_phone_out'
'email-out': 'email-out':
sender: 'Agent' sender: 'Agent'

6
app/assets/javascripts/app/views/time_accounting/by_ticket.jst.eco
View file

@ -13,8 +13,8 @@
<th><%- @T('Agent') %> <th><%- @T('Agent') %>
<th><%- @T('Time Units') %> <th><%- @T('Time Units') %>
<th><%- @T('Time Units Total') %> <th><%- @T('Time Units Total') %>
<th><%- @T('Created at') %> <th><%- @T('Created At') %>
<th><%- @T('Closed at') %> <th><%- @T('Closed At') %>
</thead> </thead>
<tbody> <tbody>
<% for row in @rows: %> <% for row in @rows: %>
@ -32,4 +32,4 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<% end %> <% end %>

2
app/helpers/knowledge_base_breadcrumb_helper.rb
View file

@ -21,7 +21,7 @@ module KnowledgeBaseBreadcrumbHelper
objects = calculate_breadcrumb_to_category(object&.parent) objects = calculate_breadcrumb_to_category(object&.parent)
last = if alternative.present? && alternative.translations.any? last = if alternative.present? && alternative.translations.any?
Translation.translate(system_locale_via_uri&.locale, 'Alternative translations') Translation.translate(system_locale_via_uri&.locale, 'Alternative Translations')
else else
object object
end end

2
app/models/object_manager/object.rb
View file

@ -17,7 +17,7 @@ get user based list of used object attributes
returns: returns:
[ [
{ name: 'api_key', display: __('API KEY'), tag: 'input', null: true, edit: true, maxlength: 32 }, { name: 'api_key', display: __('API Key'), tag: 'input', null: true, edit: true, maxlength: 32 },
{ name: 'api_ip_regexp', display: __('API IP RegExp'), tag: 'input', null: true, edit: true }, { name: 'api_ip_regexp', display: __('API IP RegExp'), tag: 'input', null: true, edit: true },
{ name: 'api_ip_max', display: __('API IP Max'), tag: 'input', null: true, edit: true }, { name: 'api_ip_max', display: __('API IP Max'), tag: 'input', null: true, edit: true },
] ]

4
app/views/mailer/test_ticket/it.html.erb
View file

@ -1,8 +1,8 @@
Ticket di prova! Ticket di prova!
<div>Cear #{agent.firstname},</div>,</div>. <div>Caro #{agent.firstname},</div>,</div>.
<br> <br>
<div>Questo è un <b>test ticket</b>. Sono un cliente e ho bisogno di aiuto! :)</div> <div>Questo è un <b>ticket di prova</b>. Sono un cliente e ho bisogno di aiuto! :)</div>
<br> <br>
<div>#{customer.fullname}</div></div> <div>#{customer.fullname}</div></div>
<br> <br>

26
i18n/zammad.pot
View file

@ -350,11 +350,8 @@ msgstr ""
msgid "API IP RegExp" msgid "API IP RegExp"
msgstr "" msgstr ""
#: app/models/object_manager/object.rb
msgid "API KEY"
msgstr ""
#: app/assets/javascripts/app/controllers/_integration/clearbit.coffee #: app/assets/javascripts/app/controllers/_integration/clearbit.coffee
#: app/models/object_manager/object.rb
msgid "API Key" msgid "API Key"
msgstr "" msgstr ""
@ -721,6 +718,7 @@ msgstr ""
msgid "Alternative FQDN for callbacks if you operate Zammad in internal network." msgid "Alternative FQDN for callbacks if you operate Zammad in internal network."
msgstr "" msgstr ""
#: app/helpers/knowledge_base_breadcrumb_helper.rb
#: app/helpers/knowledge_base_public_page_title_helper.rb #: app/helpers/knowledge_base_public_page_title_helper.rb
msgid "Alternative Translations" msgid "Alternative Translations"
msgstr "" msgstr ""
@ -729,10 +727,6 @@ msgstr ""
msgid "Alternative name" msgid "Alternative name"
msgstr "" msgstr ""
#: app/helpers/knowledge_base_breadcrumb_helper.rb
msgid "Alternative translations"
msgstr ""
#: app/assets/javascripts/app/views/generic/object_import/index.jst.eco #: app/assets/javascripts/app/views/generic/object_import/index.jst.eco
msgid "Alternatively, you can use the Zammad API to import data." msgid "Alternatively, you can use the Zammad API to import data."
msgstr "" msgstr ""
@ -1304,14 +1298,6 @@ msgstr ""
msgid "Calendars" msgid "Calendars"
msgstr "" msgstr ""
#: app/assets/javascripts/app/controllers/agent_ticket_create.coffee
msgid "Call Inbound"
msgstr ""
#: app/assets/javascripts/app/controllers/agent_ticket_create.coffee
msgid "Call Outbound"
msgstr ""
#: app/assets/javascripts/app/controllers/cti.coffee #: app/assets/javascripts/app/controllers/cti.coffee
msgid "Call from %s for %s" msgid "Call from %s for %s"
msgstr "" msgstr ""
@ -1759,6 +1745,7 @@ msgstr ""
msgid "Closed" msgid "Closed"
msgstr "" msgstr ""
#: app/assets/javascripts/app/views/time_accounting/by_ticket.jst.eco
#: lib/excel_sheet/ticket.rb #: lib/excel_sheet/ticket.rb
msgid "Closed At" msgid "Closed At"
msgstr "" msgstr ""
@ -1768,10 +1755,6 @@ msgstr ""
msgid "Closed Tickets" msgid "Closed Tickets"
msgstr "" msgstr ""
#: app/assets/javascripts/app/views/time_accounting/by_ticket.jst.eco
msgid "Closed at"
msgstr ""
#: db/seeds/schedulers.rb #: db/seeds/schedulers.rb
msgid "Closed chat sessions where participients are offline." msgid "Closed chat sessions where participients are offline."
msgstr "" msgstr ""
@ -2186,6 +2169,7 @@ msgstr ""
msgid "Created" msgid "Created"
msgstr "" msgstr ""
#: app/assets/javascripts/app/views/time_accounting/by_ticket.jst.eco
#: lib/excel_sheet/ticket.rb #: lib/excel_sheet/ticket.rb
msgid "Created At" msgid "Created At"
msgstr "" msgstr ""
@ -2195,7 +2179,6 @@ msgstr ""
#: app/assets/javascripts/app/models/ticket.coffee #: app/assets/javascripts/app/models/ticket.coffee
#: app/assets/javascripts/app/models/user.coffee #: app/assets/javascripts/app/models/user.coffee
#: app/assets/javascripts/app/views/customer_chat/chat_window.jst.eco #: app/assets/javascripts/app/views/customer_chat/chat_window.jst.eco
#: app/assets/javascripts/app/views/time_accounting/by_ticket.jst.eco
#: app/assets/javascripts/app/views/widget/http_log.jst.eco #: app/assets/javascripts/app/views/widget/http_log.jst.eco
#: app/assets/javascripts/app/views/widget/http_log_show.jst.eco #: app/assets/javascripts/app/views/widget/http_log_show.jst.eco
msgid "Created at" msgid "Created at"
@ -4864,6 +4847,7 @@ msgstr ""
msgid "Inbound" msgid "Inbound"
msgstr "" msgstr ""
#: app/assets/javascripts/app/controllers/agent_ticket_create.coffee
#: app/assets/javascripts/app/views/navigation/menu_cti_ringing.jst.eco #: app/assets/javascripts/app/views/navigation/menu_cti_ringing.jst.eco
msgid "Inbound Call" msgid "Inbound Call"
msgstr "" msgstr ""

4
spec/system/keyboard_shortcuts_spec.rb
View file

@ -147,7 +147,7 @@ RSpec.describe 'Keyboard Shortcuts', type: :system do
it 'show the next tab' do it 'show the next tab' do
within :active_content, 'form.ticket-create' do within :active_content, 'form.ticket-create' do
expect(page).to have_title 'Call Inbound' expect(page).to have_title 'Inbound Call'
end end
end end
end end
@ -157,7 +157,7 @@ RSpec.describe 'Keyboard Shortcuts', type: :system do
it 'shows the previous tab' do it 'shows the previous tab' do
within :active_content, 'form.ticket-create' do within :active_content, 'form.ticket-create' do
expect(page).to have_title 'Call Outbound' expect(page).to have_title 'Outbound Call'
end end
end end
end end

4
spec/system/profile/preferences_language_spec.rb
View file

@ -115,7 +115,7 @@ RSpec.describe 'Profile > Language', type: :system do
let(:path) { 'ticket/create' } let(:path) { 'ticket/create' }
let(:title) { 'preferences lang check #1' } let(:title) { 'preferences lang check #1' }
let(:customer) { 'nicole' } let(:customer) { 'nicole' }
let(:translated_content) { "Call Inbound: #{title}" } let(:translated_content) { "Inbound Call: #{title}" }
translated_element = '.newTicket .ticket-create' translated_element = '.newTicket .ticket-create'
@ -206,7 +206,7 @@ RSpec.describe 'Profile > Language', type: :system do
let(:path) { 'ticket/create' } let(:path) { 'ticket/create' }
let(:title) { 'preferences lang check #1' } let(:title) { 'preferences lang check #1' }
let(:customer) { 'nicole' } let(:customer) { 'nicole' }
let(:translated_content) { "Anruf eingehend: #{title}" } let(:translated_content) { "Eingehender Anruf: #{title}" }
translated_element = '.newTicket .ticket-create' translated_element = '.newTicket .ticket-create'

12
test/browser/agent_navigation_and_title_test.rb
View file

@ -49,30 +49,30 @@ class AgentNavigationAndTitleTest < TestCase
do_not_submit: true, do_not_submit: true,
) )
sleep 4 sleep 4
verify_title(value: 'Call Inbound') verify_title(value: 'Inbound Call')
verify_task( verify_task(
data: { data: {
title: 'Call Inbound: ticket create #1', title: 'Inbound Call: ticket create #1',
} }
) )
exists_not(css: '#navigation .js-menu .is-active') exists_not(css: '#navigation .js-menu .is-active')
execute(js: 'App.Event.trigger("ui:rerender")') execute(js: 'App.Event.trigger("ui:rerender")')
sleep 1 sleep 1
verify_title(value: 'Call Inbound') verify_title(value: 'Inbound Call')
verify_task( verify_task(
data: { data: {
title: 'Call Inbound: ticket create #1', title: 'Inbound Call: ticket create #1',
} }
) )
exists_not(css: '#navigation .js-menu .is-active') exists_not(css: '#navigation .js-menu .is-active')
reload reload
sleep 2 sleep 2
verify_title(value: 'Call Inbound') verify_title(value: 'Inbound Call')
verify_task( verify_task(
data: { data: {
title: 'Call Inbound: ticket create #1', title: 'Inbound Call: ticket create #1',
} }
) )
exists_not(css: '#navigation .js-menu .is-active') exists_not(css: '#navigation .js-menu .is-active')