Skip to content

Commit

Permalink
Merge pull request #2671 from kristinalim/translations-any_enterprise…
Browse files Browse the repository at this point in the history
…_in_oc_filters

Translate "Any Enterprise" and "Any Schedule" in OC filters
  • Loading branch information
sauloperez authored Sep 18, 2018
2 parents 19df4ff + 798a6ed commit 9f7d249
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/views/admin/order_cycles/_filters.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
.filter_select.four.columns
%label{ :for => 'involving_filter' }=t('.involving')
%br
%input.ofn-select2.fullwidth{ :id => 'involving_filter', type: 'number', blank: "{id: 0, name: 'Any Enterprise'}", data: 'enterprises', ng: { model: 'involvingFilter' } }
%input.ofn-select2.fullwidth{ id: 'involving_filter', type: 'number', blank: "{id: 0, name: '#{j t(".any_enterprise")}'}", data: 'enterprises', ng: { model: 'involvingFilter' } }
- if subscriptions_enabled?
.filter_select.four.columns
%label{ :for => 'schedule_filter' }=t('admin.order_cycles.index.schedule')
%br
%input.ofn-select2.fullwidth{ :id => 'schedule_filter', type: 'number', blank: "{id: 0, name: 'Any Schedule'}", data: 'schedules', ng: { model: 'scheduleFilter' } }
%input.ofn-select2.fullwidth{ id: 'schedule_filter', type: 'number', blank: "{id: 0, name: '#{j t(".any_schedule")}'}", data: 'schedules', ng: { model: 'scheduleFilter' } }
.two.columns  
- else
.six.columns  
Expand Down
2 changes: 2 additions & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -902,6 +902,8 @@ en:
filters:
search_by_order_cycle_name: "Search by Order Cycle name..."
involving: "Involving"
any_enterprise: "Any Enterprise"
any_schedule: "Any Schedule"
form:
incoming: Incoming
supplier: Supplier
Expand Down

0 comments on commit 9f7d249

Please sign in to comment.