diff --git a/app/components/table-filters/pablo-number-range.js b/app/components/table-filters/pablo-number-range.js index a232090..1dc7ad5 100644 --- a/app/components/table-filters/pablo-number-range.js +++ b/app/components/table-filters/pablo-number-range.js @@ -53,7 +53,7 @@ export default Component.extend({ let hbc = this.get('upper_bound_candidate'); if (hbc < lbc) { - this.set('error', `lower limit (${lbc}) cannot be greater than the upper limit (${hbc}).`); + this.set('error', t('number.range.lower_larger_than_upper_error', {lower: lbc, upper: hbc})); console.log(this.error); } else { this.set('lower_bound', lbc || ''); diff --git a/app/templates/components/table-filters/pablo-number-range.emblem b/app/templates/components/table-filters/pablo-number-range.emblem index 2524228..6fe34b6 100644 --- a/app/templates/components/table-filters/pablo-number-range.emblem +++ b/app/templates/components/table-filters/pablo-number-range.emblem @@ -2,15 +2,18 @@ ui-dropdown class='left basic labeled top left pointing icon select-number' acti = filter_text .menu .item class='number-range-container' - 'Between + = t 'number.range.between' + ' .ui.input.select-number= input type='number' value=lower_bound_candidate enter=(action 'set_filter') - ' and + ' + = t 'general.and' + ' .ui.input.select-number= input type='number' value=upper_bound_candidate enter=(action 'set_filter') if error br .ui.pointing.red.basic.label {{error}} .item - ui-checkbox class='item' checked=inclusive label='inclusive' onChange=(action 'toggle_inclusive' option) + ui-checkbox class='item' checked=inclusive label=(t 'number.range.inclusive') onChange=(action 'toggle_inclusive' option) .divider .options-container diff --git a/tests/dummy/app/i18n/translations.coffee b/tests/dummy/app/i18n/translations.coffee index 3ffb547..3289681 100644 --- a/tests/dummy/app/i18n/translations.coffee +++ b/tests/dummy/app/i18n/translations.coffee @@ -17,6 +17,7 @@ window.$translations = close: 'Close' clear: 'Clear' apply: 'Apply' + and: 'and' confirm: cancel: 'Cancel' confirm: 'Yes' @@ -62,3 +63,8 @@ window.$translations = friday: 'Vrijdag' saturday: 'Zaterdag' sunday: 'Zondag' + number: + range: + between: 'Between' + inclusive: 'inclusive' + lower_larger_than_upper_error: 'lower limit (%{lower}) cannot be greater than the upper limit (%{upper}).'