Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: differentiate one/other select-kit maximumLabel/minimumLabel

This commit is contained in:
Claas Augner 2018-04-09 09:12:01 +02:00 committed by Joffrey JAFFEUX
parent 185d6ac747
commit ba905b24ca
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/locales/client.en.yml
View File

@ -1251,8 +1251,12 @@ en:
no_content: No matches found no_content: No matches found
filter_placeholder: Search... filter_placeholder: Search...
create: "Create: '{{content}}'" create: "Create: '{{content}}'"
max_content_reached: "You can only select {{count}} item(s)." max_content_reached:
min_content_not_reached: "Select at least {{count}} item(s)." 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: emoji_picker:
filter_placeholder: Search for emoji filter_placeholder: Search for emoji

2
test/javascripts/components/multi-select-test.js.es6
View File

@ -171,7 +171,7 @@ componentTest('with minimum', {
test(assert) { test(assert) {
this.get('subject').expand(); 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'); this.get('subject').selectRowByValue('sam');

2
test/javascripts/components/single-select-test.js.es6
View File

@ -512,7 +512,7 @@ componentTest('with minimum', {
test(assert) { test(assert) {
this.get('subject').expand(); 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'); this.get('subject').selectRowByValue('sam');