From ba905b24ca1bfbe18a02b7f863599389e6ac6e77 Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Mon, 9 Apr 2018 09:12:01 +0200 Subject: [PATCH] FIX: differentiate one/other select-kit maximumLabel/minimumLabel --- config/locales/client.en.yml | 8 ++++++-- test/javascripts/components/multi-select-test.js.es6 | 2 +- test/javascripts/components/single-select-test.js.es6 | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 95a4b4d2ed9..2c7a7b6d373 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1251,8 +1251,12 @@ en: no_content: No matches found filter_placeholder: Search... create: "Create: '{{content}}'" - max_content_reached: "You can only select {{count}} item(s)." - min_content_not_reached: "Select at least {{count}} item(s)." + max_content_reached: + one: "You can only select {{count}} item." + other: "You can only select {{count}} item(s)." + min_content_not_reached: + one: "Select at least {{count}} item." + other: "Select at least {{count}} item(s)." emoji_picker: filter_placeholder: Search for emoji diff --git a/test/javascripts/components/multi-select-test.js.es6 b/test/javascripts/components/multi-select-test.js.es6 index d77583271c8..c829b3ea534 100644 --- a/test/javascripts/components/multi-select-test.js.es6 +++ b/test/javascripts/components/multi-select-test.js.es6 @@ -171,7 +171,7 @@ componentTest('with minimum', { test(assert) { this.get('subject').expand(); - andThen(() => assert.equal(this.get('subject').validationMessage(), 'Select at least 1 item(s).')); + andThen(() => assert.equal(this.get('subject').validationMessage(), 'Select at least 1 item.')); this.get('subject').selectRowByValue('sam'); diff --git a/test/javascripts/components/single-select-test.js.es6 b/test/javascripts/components/single-select-test.js.es6 index 619e56ee68d..e7a1080290e 100644 --- a/test/javascripts/components/single-select-test.js.es6 +++ b/test/javascripts/components/single-select-test.js.es6 @@ -512,7 +512,7 @@ componentTest('with minimum', { test(assert) { this.get('subject').expand(); - andThen(() => assert.equal(this.get('subject').validationMessage(), 'Select at least 1 item(s).')); + andThen(() => assert.equal(this.get('subject').validationMessage(), 'Select at least 1 item.')); this.get('subject').selectRowByValue('sam');