diff --git a/app/assets/javascripts/app/controllers/signup.coffee b/app/assets/javascripts/app/controllers/signup.coffee index 3f4325ece..bcbc67fba 100644 --- a/app/assets/javascripts/app/controllers/signup.coffee +++ b/app/assets/javascripts/app/controllers/signup.coffee @@ -94,7 +94,7 @@ class Signup extends App.ControllerFullPage # add notify @notify( type: 'success' - msg: App.i18n.translateContent('Email sent to "%s". Please verify your email address.', @params.email) + msg: App.i18n.translateContent('Email sent to "%s". Please verify your email account.', @params.email) removeAll: true ) diff --git a/app/assets/javascripts/app/controllers/user_profile.coffee b/app/assets/javascripts/app/controllers/user_profile.coffee index fef15587f..fdef8571d 100644 --- a/app/assets/javascripts/app/controllers/user_profile.coffee +++ b/app/assets/javascripts/app/controllers/user_profile.coffee @@ -117,7 +117,7 @@ class ActionRow extends App.ControllerObserverActionRow success: (data, status, xhr) => @notify type: 'success' - msg: App.i18n.translateContent('Email sent to "%s". Please let the user verify his email address.', user.email) + msg: App.i18n.translateContent('Email sent to "%s". Please let the user verify their email account.', user.email) removeAll: true error: (data, status, xhr) => @notify diff --git a/app/assets/javascripts/app/views/object_manager/attribute/multiselect.jst.eco b/app/assets/javascripts/app/views/object_manager/attribute/multiselect.jst.eco index 8db494781..5ea39738a 100644 --- a/app/assets/javascripts/app/views/object_manager/attribute/multiselect.jst.eco +++ b/app/assets/javascripts/app/views/object_manager/attribute/multiselect.jst.eco @@ -64,7 +64,7 @@ <%- @Icon('checkbox', 'icon-unchecked') %> <%- @Icon('checkbox-checked', 'icon-checked') %> <%- @T('Use custom option sort') %> - <%- @T('Check this box if you want to customise how options are been sorted. If checkbox is disabled, values are sorted in alphabetical order.') %> + <%- @T('Check this box if you want to customise how options are sorted. If the box is not checked, values are sorted in alphabetical order.') %>
diff --git a/app/assets/javascripts/app/views/object_manager/attribute/select.jst.eco b/app/assets/javascripts/app/views/object_manager/attribute/select.jst.eco index 9799ce436..0c2e02030 100644 --- a/app/assets/javascripts/app/views/object_manager/attribute/select.jst.eco +++ b/app/assets/javascripts/app/views/object_manager/attribute/select.jst.eco @@ -60,7 +60,7 @@ <%- @Icon('checkbox', 'icon-unchecked') %> <%- @Icon('checkbox-checked', 'icon-checked') %> <%- @T('Use custom option sort') %> - <%- @T('Check this box if you want to customise how options are been sorted. If checkbox is disabled, values are sorted in alphabetical order.') %> + <%- @T('Check this box if you want to customise how options are sorted. If the box is not checked, values are sorted in alphabetical order.') %> diff --git a/i18n/zammad.pot b/i18n/zammad.pot index 6710eb91b..0d59a88ab 100644 --- a/i18n/zammad.pot +++ b/i18n/zammad.pot @@ -514,8 +514,6 @@ msgstr "" #: app/assets/javascripts/app/views/knowledge_base/sidebar/attachments.jst.eco #: app/assets/javascripts/app/views/knowledge_base/sidebar/generic_list.jst.eco #: app/assets/javascripts/app/views/knowledge_base/sidebar/linked_tickets.jst.eco -#: app/assets/javascripts/app/views/layout_ref/scheduler_modal.jst.eco -#: app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco #: app/assets/javascripts/app/views/microsoft365/list.jst.eco #: app/assets/javascripts/app/views/object_manager/attribute/multiselect.jst.eco #: app/assets/javascripts/app/views/object_manager/attribute/select.jst.eco @@ -939,8 +937,6 @@ msgid "At least one user needs to have admin permissions." msgstr "" #: app/assets/javascripts/app/views/generic/attachments.jst.eco -#: app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco -#: app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco #: app/views/knowledge_base/public/answers/show.html.erb msgid "Attached Files" msgstr "" @@ -1098,8 +1094,6 @@ msgid "BCC address for all outgoing emails" msgstr "" #: app/assets/javascripts/app/views/generic/object_search/item_organization_members.jst.eco -#: app/assets/javascripts/app/views/layout_ref/content.jst.eco -#: app/assets/javascripts/app/views/layout_ref/ui.jst.eco msgid "Back" msgstr "" @@ -1112,7 +1106,6 @@ msgid "Back to search results" msgstr "" #: app/assets/javascripts/app/views/channel/chat.jst.eco -#: app/assets/javascripts/app/views/layout_ref/inputs.jst.eco msgid "Background color" msgstr "" @@ -1403,7 +1396,6 @@ msgid "Cancel & Go Back" msgstr "" #: app/assets/javascripts/app/views/generic/attachment.jst.eco -#: app/assets/javascripts/app/views/layout_ref/communication_reply.jst.eco #: app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco msgid "Cancel Upload" msgstr "" @@ -1428,7 +1420,6 @@ msgstr "" msgid "Categories" msgstr "" -#: app/assets/javascripts/app/controllers/layout_ref.coffee #: app/assets/javascripts/app/models/knowledge_base_answer.coffee #: app/assets/javascripts/app/views/popover/kb_generic.jst.eco msgid "Category" @@ -1606,7 +1597,7 @@ msgstr "" #: app/assets/javascripts/app/views/object_manager/attribute/multiselect.jst.eco #: app/assets/javascripts/app/views/object_manager/attribute/select.jst.eco -msgid "Check this box if you want to customise how options are been sorted. If checkbox is disabled, values are sorted in alphabetical order." +msgid "Check this box if you want to customise how options are sorted. If the box is not checked, values are sorted in alphabetical order." msgstr "" #: app/assets/javascripts/app/controllers/_integration/check_mk.coffee @@ -1962,7 +1953,6 @@ msgstr "" msgid "Connection test successful" msgstr "" -#: app/assets/javascripts/app/controllers/layout_ref.coffee #: app/assets/javascripts/app/models/knowledge_base_answer.coffee #: app/assets/javascripts/app/models/text_module.coffee #: app/assets/javascripts/app/views/integration/placetel.jst.eco @@ -2104,7 +2094,6 @@ msgstr "" #: app/assets/javascripts/app/controllers/_dashboard/first_steps_clues.coffee #: app/assets/javascripts/app/controllers/_profile/token_access.coffee #: app/assets/javascripts/app/controllers/knowledge_base/add_form.coffee -#: app/assets/javascripts/app/controllers/layout_ref.coffee #: app/assets/javascripts/app/views/agent_ticket_create.jst.eco #: app/assets/javascripts/app/views/agent_user_create.jst.eco #: app/assets/javascripts/app/views/customer_ticket_create.jst.eco @@ -2135,10 +2124,6 @@ msgstr "" msgid "Create Macros" msgstr "" -#: app/assets/javascripts/app/controllers/layout_ref.coffee -msgid "Create SLA" -msgstr "" - #: app/controllers/first_steps_controller.rb msgid "Create Text Modules" msgstr "" @@ -2164,7 +2149,6 @@ msgid "Create my account" msgstr "" #: app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.coffee -#: app/assets/javascripts/app/views/layout_ref/content.jst.eco msgid "Create new Customer" msgstr "" @@ -2304,7 +2288,6 @@ msgstr "" #: app/assets/javascripts/app/controllers/_ui_element/postmaster_set.coffee #: app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.coffee #: app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_customer.coffee -#: app/assets/javascripts/app/controllers/layout_ref.coffee #: app/assets/javascripts/app/controllers/ticket_customer.coffee #: app/assets/javascripts/app/controllers/ticket_zoom/sidebar_customer.coffee #: app/assets/javascripts/app/controllers/widget/user.coffee @@ -3070,7 +3053,6 @@ msgid "Delete Customer" msgstr "" #: app/assets/javascripts/app/views/generic/attachment_item.jst.eco -#: app/assets/javascripts/app/views/layout_ref/communication_reply.jst.eco msgid "Delete File" msgstr "" @@ -3340,7 +3322,6 @@ msgstr "" #: app/assets/javascripts/app/views/generic/attachment.jst.eco #: app/assets/javascripts/app/views/knowledge_base/sidebar/attachments.jst.eco -#: app/assets/javascripts/app/views/layout_ref/communication_reply.jst.eco #: app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco msgid "Drop files here" msgstr "" @@ -3379,10 +3360,6 @@ msgstr "" msgid "Edit" msgstr "" -#: app/assets/javascripts/app/views/layout_ref/kb_link_answer_to_answer_ref.jst.eco -msgid "Edit Answer" -msgstr "" - #: app/assets/javascripts/app/controllers/agent_ticket_create/sidebar_customer.coffee #: app/assets/javascripts/app/controllers/ticket_zoom/sidebar_customer.coffee msgid "Edit Customer" @@ -3520,11 +3497,11 @@ msgid "Email sending and receiving could not be verified. Please check your sett msgstr "" #: 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 their email account." msgstr "" #: app/assets/javascripts/app/controllers/signup.coffee -msgid "Email sent to \"%s\". Please verify your email address." +msgid "Email sent to \"%s\". Please verify your email account." msgstr "" #: app/assets/javascripts/app/views/knowledge_base/public_menu_manager.jst.eco @@ -3737,18 +3714,10 @@ msgstr "" msgid "Enter Private Key Secret" msgstr "" -#: app/assets/javascripts/app/controllers/layout_ref.coffee -msgid "Enter Project Name" -msgstr "" - #: app/assets/javascripts/app/views/ticket_zoom/title.jst.eco msgid "Enter Titleā¦" msgstr "" -#: app/assets/javascripts/app/controllers/layout_ref.coffee -msgid "Enter User" -msgstr "" - #: app/assets/javascripts/app/views/import/freshdesk.jst.eco #: app/assets/javascripts/app/views/import/kayako.jst.eco #: app/assets/javascripts/app/views/import/zendesk.jst.eco @@ -4036,7 +4005,6 @@ msgstr "" #: app/assets/javascripts/app/views/dashboard/first_steps_clues_content.jst.eco #: app/assets/javascripts/app/views/getting_started/email_pre_configured.jst.eco -#: app/assets/javascripts/app/views/layout_ref/clue_content.jst.eco msgid "Finish" msgstr "" @@ -4187,8 +4155,6 @@ msgstr "" msgid "Format as ||italic||" msgstr "" -#: app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco -#: app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco #: app/assets/javascripts/app/views/widget/ticket_stats_frequency.jst.eco msgid "Frequency" msgstr "" @@ -5330,10 +5296,6 @@ msgstr "" msgid "Knowledge Base Answer" msgstr "" -#: app/assets/javascripts/app/views/layout_ref/kb_link_ticket_to_answer_ref.jst.eco -msgid "Knowledge Base Browser" -msgstr "" - #: db/seeds/permissions.rb msgid "Knowledge Base Editor" msgstr "" @@ -5772,7 +5734,6 @@ msgstr "" msgid "May" msgstr "" -#: app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco #: app/assets/javascripts/app/views/organization_profile/object.jst.eco #: app/assets/javascripts/app/views/popover/organization.jst.eco #: app/assets/javascripts/app/views/widget/organization.jst.eco @@ -5788,7 +5749,6 @@ msgid "Mentions Group" msgstr "" #: app/assets/javascripts/app/controllers/agent_ticket_merge.coffee -#: app/assets/javascripts/app/controllers/layout_ref.coffee #: app/assets/javascripts/app/controllers/ticket_zoom/sidebar_ticket.coffee msgid "Merge" msgstr "" @@ -6291,7 +6251,6 @@ msgstr "" #: app/assets/javascripts/app/views/dashboard/first_steps_clues_content.jst.eco #: app/assets/javascripts/app/views/getting_started/base.jst.eco #: app/assets/javascripts/app/views/import/otrs.jst.eco -#: app/assets/javascripts/app/views/layout_ref/clue_content.jst.eco msgid "Next" msgstr "" @@ -6823,7 +6782,6 @@ msgid "Options" msgstr "" #: app/assets/javascripts/app/views/getting_started/intro.jst.eco -#: app/assets/javascripts/app/views/layout_ref/setup.jst.eco msgid "Or migrate from another system." msgstr "" @@ -7275,7 +7233,6 @@ msgid "Preview owner tickets" msgstr "" #: app/assets/javascripts/app/views/dashboard/first_steps_clues_content.jst.eco -#: app/assets/javascripts/app/views/layout_ref/clue_content.jst.eco msgid "Previous" msgstr "" @@ -7452,10 +7409,6 @@ msgstr "" msgid "Recently Viewed Tickets" msgstr "" -#: app/assets/javascripts/app/views/layout_ref/kb_link_ticket_to_answer_ref.jst.eco -msgid "Recently Visited Answers" -msgstr "" - #: app/assets/javascripts/app/controllers/_plugin/navigation.coffee msgid "Recently viewed" msgstr "" @@ -7505,8 +7458,6 @@ msgstr "" #: app/assets/javascripts/app/views/generic/postmaster_match.jst.eco #: app/assets/javascripts/app/views/generic/postmaster_set_row.jst.eco #: app/assets/javascripts/app/views/generic/ticket_perform_action/row.jst.eco -#: app/assets/javascripts/app/views/layout_ref/scheduler_modal.jst.eco -#: app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco msgid "Remote" msgstr "" @@ -7911,11 +7862,6 @@ msgstr "" msgid "Search" msgstr "" -#: app/assets/javascripts/app/views/layout_ref/kb_agent_reader_ref.jst.eco -#: app/assets/javascripts/app/views/layout_ref/kb_link_ticket_to_answer_ref.jst.eco -msgid "Search Knowledge Base" -msgstr "" - #: app/assets/javascripts/app/views/twitter/account_edit.jst.eco msgid "Search Term" msgstr "" @@ -7955,8 +7901,6 @@ msgstr "" #: app/assets/javascripts/app/controllers/data_privacy.coffee #: app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee #: app/assets/javascripts/app/views/data_privacy/tasks.jst.eco -#: app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco -#: app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco #: app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco msgid "See more" msgstr "" @@ -8011,7 +7955,6 @@ msgstr "" #: app/assets/javascripts/app/views/channel/chat.jst.eco #: app/assets/javascripts/app/views/customer_chat/chat_window.jst.eco -#: app/assets/javascripts/app/views/layout_ref/customer_chat_window.jst.eco #: public/assets/chat/views/chat.eco msgid "Send" msgstr "" @@ -8186,7 +8129,6 @@ msgid "Set timeframe in seconds. If it's set to 0 you can delete notes without t msgstr "" #: app/assets/javascripts/app/views/getting_started/intro.jst.eco -#: app/assets/javascripts/app/views/layout_ref/setup.jst.eco msgid "Set up a new system" msgstr "" @@ -8215,7 +8157,6 @@ msgstr "" #: app/assets/javascripts/app/views/integration/ldap.jst.eco #: app/assets/javascripts/app/views/integration/placetel.jst.eco #: app/assets/javascripts/app/views/integration/sipgate.jst.eco -#: app/assets/javascripts/app/views/layout_ref/customer_chat.jst.eco #: app/assets/javascripts/app/views/telegram/bot_add.jst.eco #: app/assets/javascripts/app/views/telegram/bot_edit.jst.eco msgid "Settings" @@ -8499,7 +8440,6 @@ msgstr "" #: app/assets/javascripts/app/views/generic/error/generic.jst.eco #: app/assets/javascripts/app/views/generic/error/placeholder.jst.eco -#: app/assets/javascripts/app/views/layout_ref/error.jst.eco msgid "Status Code" msgstr "" @@ -9400,7 +9340,6 @@ msgstr "" msgid "Timing" msgstr "" -#: app/assets/javascripts/app/controllers/layout_ref.coffee #: app/assets/javascripts/app/models/knowledge_base.coffee #: app/assets/javascripts/app/models/knowledge_base_answer.coffee #: app/assets/javascripts/app/models/knowledge_base_category.coffee @@ -9808,7 +9747,6 @@ msgstr "" #: app/assets/javascripts/app/views/generic/attachment.jst.eco #: app/assets/javascripts/app/views/knowledge_base/sidebar/attachments.jst.eco -#: app/assets/javascripts/app/views/layout_ref/communication_reply.jst.eco #: app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco msgid "Uploading" msgstr "" @@ -10604,7 +10542,6 @@ msgstr "" #: app/assets/javascripts/app/views/generic/login_preview.jst.eco #: app/assets/javascripts/app/views/getting_started/base.jst.eco -#: app/assets/javascripts/app/views/layout_ref/setup.jst.eco msgid "Your Logo" msgstr "" @@ -10753,10 +10690,6 @@ msgstr "" msgid "again" msgstr "" -#: app/assets/javascripts/app/views/layout_ref/kb_link_ticket_to_answer_ref.jst.eco -msgid "already linked" -msgstr "" - #: app/assets/javascripts/app/controllers/_ui_element/timer.coffee msgid "and" msgstr "" @@ -11110,10 +11043,6 @@ msgstr "" msgid "last week" msgstr "" -#: app/assets/javascripts/app/views/layout_ref/kb_link_ticket_to_answer_ref.jst.eco -msgid "link" -msgstr "" - #: app/assets/javascripts/app/lib/app_post/pretty_date.coffee msgid "m" msgstr "" diff --git a/lib/generators/translation_catalog/extractor/frontend.rb b/lib/generators/translation_catalog/extractor/frontend.rb index 8075156cb..7134430be 100644 --- a/lib/generators/translation_catalog/extractor/frontend.rb +++ b/lib/generators/translation_catalog/extractor/frontend.rb @@ -39,6 +39,6 @@ class Generators::TranslationCatalog::Extractor::Frontend < Generators::Translat files += Dir.glob("#{base_path}/#{dir}/*.eco") files += Dir.glob("#{base_path}/#{dir}/*.coffee") end - files + files.reject { |d| d.include?('layout_ref') } end end