From 966232326149865795288bb53e84ae20653ecfee Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Mon, 15 Apr 2019 17:08:09 +0100 Subject: [PATCH] Move a group of translations related to schedules to the js translations namespace --- .../directives/schedule_dialog.js.coffee | 2 +- .../resources/services/schedules.js.coffee | 6 ++--- .../admin/order_cycles_selector.html.haml | 4 +-- .../templates/admin/schedule_dialog.html.haml | 18 +++++++------ config/locales/en.yml | 26 +++++++++++-------- 5 files changed, 31 insertions(+), 25 deletions(-) diff --git a/app/assets/javascripts/admin/order_cycles/directives/schedule_dialog.js.coffee b/app/assets/javascripts/admin/order_cycles/directives/schedule_dialog.js.coffee index 2ff59bd1de..8acaa0cd43 100644 --- a/app/assets/javascripts/admin/order_cycles/directives/schedule_dialog.js.coffee +++ b/app/assets/javascripts/admin/order_cycles/directives/schedule_dialog.js.coffee @@ -47,7 +47,7 @@ angular.module("admin.orderCycles").directive 'scheduleDialog', ($window, $compi scope.schedule_form.$setPristine() scope.submitted = true scope.errors = [] - return scope.errors.push(t('admin.order_cycles.index.no_order_cycles_error')) unless scope.selectedOrderCycles.length > 0 + return scope.errors.push(t('js.admin.order_cycles.schedules.no_order_cycles_error')) unless scope.selectedOrderCycles.length > 0 scope.schedule.order_cycle_ids = scope.selectedOrderCycles.map (oc) -> oc.id if scope.schedule_form.$valid method = if scope.schedule.id? then Schedules.update else Schedules.add diff --git a/app/assets/javascripts/admin/resources/services/schedules.js.coffee b/app/assets/javascripts/admin/resources/services/schedules.js.coffee index a4c34a0ce0..e5baac2777 100644 --- a/app/assets/javascripts/admin/resources/services/schedules.js.coffee +++ b/app/assets/javascripts/admin/resources/services/schedules.js.coffee @@ -17,7 +17,7 @@ angular.module("admin.resources").factory "Schedules", ($q, $injector, RequestMo @byID[schedule.id] = schedule if schedule.id? Dereferencer.dereference(schedule.order_cycles, OrderCycles.byID) orderCycle.schedules.push(schedule) for orderCycle in schedule.order_cycles - StatusMessage.display 'success', "#{t('admin.order_cycles.index.created_schedule')}: '#{schedule.name}'" + StatusMessage.display 'success', "#{t('js.admin.order_cycles.schedules.created_schedule')}: '#{schedule.name}'" update: (params) => ScheduleResource.update params, (schedule) => @@ -29,7 +29,7 @@ angular.module("admin.resources").factory "Schedules", ($q, $injector, RequestMo for orderCycle in schedule.order_cycles when orderCycle.id not in @byID[schedule.id].order_cycle_ids orderCycle.schedules.push(@byID[schedule.id]) angular.extend(@byID[schedule.id], schedule) - StatusMessage.display 'success', "#{t('admin.order_cycles.index.updated_schedule')}: '#{schedule.name}'" + StatusMessage.display 'success', "#{t('js.admin.order_cycles.schedules.updated_schedule')}: '#{schedule.name}'" remove: (schedule) -> params = id: schedule.id @@ -38,7 +38,7 @@ angular.module("admin.resources").factory "Schedules", ($q, $injector, RequestMo if orderCycle.schedules # Only if we need to update the schedules orderCycle.schedules.splice(i, 1) for s, i in orderCycle.schedules by -1 when s.id == schedule.id delete @byID[schedule.id] - StatusMessage.display 'success', "#{t('admin.order_cycles.index.deleted_schedule')}: '#{schedule.name}'" + StatusMessage.display 'success', "#{t('js.admin.order_cycles.schedules.deleted_schedule')}: '#{schedule.name}'" index: -> request = ScheduleResource.index (data) => @load(data) diff --git a/app/assets/javascripts/templates/admin/order_cycles_selector.html.haml b/app/assets/javascripts/templates/admin/order_cycles_selector.html.haml index 406a12f056..a0b9e7776c 100644 --- a/app/assets/javascripts/templates/admin/order_cycles_selector.html.haml +++ b/app/assets/javascripts/templates/admin/order_cycles_selector.html.haml @@ -1,7 +1,7 @@ %table %tr %td#available-order-cycles - Available + {{ 'js.admin.order_cycles.schedules.available' | t }} .order-cycles .order-cycle{ ng: { repeat: 'orderCycle in orderCycles | available:selectedOrderCycles as availableOrderCycles', click: 'selections.available = orderCycle', dblclick: 'add(orderCycle)', class: '{selected: selections.available == orderCycle}' } } {{ orderCycle.name }} @@ -11,7 +11,7 @@ %a.remove.button{ href: 'javascript:void(0)', ng: { click: 'remove()' } } %i.icon-chevron-left %td#selected-order-cycles - Selected + {{ 'js.admin.order_cycles.schedules.selected' | t }} .order-cycles .order-cycle{ ng: { repeat: 'orderCycle in selectedOrderCycles', click: 'selections.selected = orderCycle', dblclick: 'remove(orderCycle)', class: '{selected: selections.selected == orderCycle}' } } {{ orderCycle.name }} diff --git a/app/assets/javascripts/templates/admin/schedule_dialog.html.haml b/app/assets/javascripts/templates/admin/schedule_dialog.html.haml index b8eb29febc..1792c38a4f 100644 --- a/app/assets/javascripts/templates/admin/schedule_dialog.html.haml +++ b/app/assets/javascripts/templates/admin/schedule_dialog.html.haml @@ -1,23 +1,25 @@ #schedule-dialog .text-normal.margin-bottom-30.text-center - %span{ ng: { hide: 'schedule.id' } }= t('admin.order_cycles.index.adding_a_new_schedule') - %span{ ng: { show: 'schedule.id' } }= t('admin.order_cycles.index.updating_a_schedule') + %span{ ng: { hide: 'schedule.id' } } + {{ 'js.admin.order_cycles.schedules.adding_a_new_schedule' | t }} + %span{ ng: { show: 'schedule.id' } } + {{ 'js.admin.order_cycles.schedules.updating_a_schedule' | t }} %form{ name: 'schedule_form', novalidate: true, ng: { submit: "submit()" }} .text-center.margin-bottom-20 - %input.fullwidth{ type: 'text', name: 'name', required: true, placeholder: t('admin.order_cycles.index.schedule_name_placeholder'), ng: { model: "schedule.name" } } + %input.fullwidth{ type: 'text', name: 'name', required: true, placeholder: "{{ 'js.admin.order_cycles.schedules.schedule_name_placeholder' | t }}", ng: { model: "schedule.name" } } %div{ ng: { show: "submitted && schedule_form.$pristine" } } .error{ ng: { show: "(schedule_form.name.$error.required)" } } - = t('admin.order_cycles.index.name_required_error') + {{ 'js.admin.order_cycles.schedules.name_required_error' | t }} .order-cycles-selector.text-center.margin-bottom-30 .text-center - %input.button{ type: 'submit', value: t('admin.order_cycles.index.create_schedule'), ng: { hide: 'schedule.id' } } - %input.button{ type: 'submit', value: t('admin.order_cycles.index.update_schedule'), ng: { show: 'schedule.id' } } + %input.button{ type: 'submit', value: "{{ 'js.admin.order_cycles.schedules.create_schedule' | t }}", ng: { hide: 'schedule.id' } } + %input.button{ type: 'submit', value: "{{ 'js.admin.order_cycles.schedules.update_schedule' | t }}", ng: { show: 'schedule.id' } } %span{ ng: { show: 'schedule.id' } } or - %input.button.red{ type: 'button', value: t('admin.order_cycles.index.delete_schedule'), ng: { show: 'schedule.id', click: 'delete()'} } + %input.button.red{ type: 'button', value: "{{ 'js.admin.order_cycles.schedules.delete_schedule' | t }}", ng: { show: 'schedule.id', click: 'delete()'} } or - %input.button{ type: 'button', value: t('actions.cancel'), ng: { click: 'close()' } } + %input.button{ type: 'button', value: "{{ 'actions.cancel' | t }}", ng: { click: 'close()' } } diff --git a/config/locales/en.yml b/config/locales/en.yml index bd744716ae..af36502df6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -906,18 +906,7 @@ en: index: schedule: Schedule schedules: Schedules - adding_a_new_schedule: Adding A New Schedule - updating_a_schedule: Updating A Schedule new_schedule: New Schedule - create_schedule: Create Schedule - update_schedule: Update Schedule - delete_schedule: Delete Schedule - created_schedule: Created schedule - updated_schedule: Updated schedule - deleted_schedule: Deleted schedule - schedule_name_placeholder: Schedule Name - name_required_error: Please enter a name for this schedule - no_order_cycles_error: Please select at least one order cycle (drag and drop) name_and_timing_form: name: Name orders_open: Orders open at @@ -2550,6 +2539,21 @@ See the %{link} to find out more about %{sitename}'s features and to start using sending: "Resend..." done: "Resend done ✓" failed: "Resend failed ✗" + order_cycles: + schedules: + adding_a_new_schedule: "Adding A New Schedule" + updating_a_schedule: "Updating A Schedule" + create_schedule: "Create Schedule" + update_schedule: "Update Schedule" + delete_schedule: "Delete Schedule" + schedule_name_placeholder: "Schedule Name" + created_schedule: "Created schedule" + updated_schedule: "Updated schedule" + deleted_schedule: "Deleted schedule" + name_required_error: "Please enter a name for this schedule" + no_order_cycles_error: "Please select at least one order cycle (drag and drop)" + available: "Available" + selected: "Selected" insufficient_stock: "Insufficient stock available, only %{on_hand} remaining" out_of_stock: reduced_stock_available: Reduced stock available