Skip to content

Fix broken pluralizations #3043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 27, 2020
Merged

Fix broken pluralizations #3043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24cf819
Fix broken pluralizations
Turbo87 Nov 24, 2020
0a72e74
mirage/serializers: Allow factories to override the `crates_cnt` prop…
Turbo87 Nov 24, 2020
2e5c7b3
tests/categories: Add checks for large `crates_cnt` values
Turbo87 Nov 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/templates/categories.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
{{category.category}}
</LinkTo>
<span local-class="crate-count" data-test-crate-count>
{{ pluralize (format-num category.crates_cnt) "crate" }}
{{format-num category.crates_cnt}} {{if (eq category.crates_cnt 1) "crate" "crates"}}
</span>
</div>
<div local-class="description">
Expand Down
2 changes: 1 addition & 1 deletion app/templates/category/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div>
<LinkTo @route="category" @model={{subcategory.slug}}>{{subcategory.category}}</LinkTo>
<span local-class="crate-count">
{{ pluralize (format-num subcategory.crates_cnt) "crate" }}
{{format-num subcategory.crates_cnt}} {{if (eq subcategory.crates_cnt 1) "crate" "crates"}}
</span>
</div>
<div local-class="category-description">
Expand Down
2 changes: 1 addition & 1 deletion app/templates/keywords.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<div local-class="row">
<LinkTo @route="keyword" @model={{keyword}}>{{keyword.id}}</LinkTo>
<span local-class="crate-count">
{{ pluralize (format-num keyword.crates_cnt) "crate" }}
{{format-num keyword.crates_cnt}} {{if (eq keyword.crates_cnt 1) "crate" "crates"}}
</span>
</div>
{{/each}}
Expand Down
2 changes: 1 addition & 1 deletion mirage/serializers/category.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ export default BaseSerializer.extend({
let allCrates = this.schema.crates.all();
let associatedCrates = allCrates.filter(it => it.categoryIds.includes(hash.id));

hash.crates_cnt = associatedCrates.length;
hash.crates_cnt ??= associatedCrates.length;
},
});
2 changes: 1 addition & 1 deletion mirage/serializers/keyword.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ export default BaseSerializer.extend({
let allCrates = this.schema.crates.all();
let associatedCrates = allCrates.filter(it => it.keywordIds.includes(hash.id));

hash.crates_cnt = associatedCrates.length;
hash.crates_cnt ??= associatedCrates.length;
},
});
16 changes: 16 additions & 0 deletions tests/acceptance/categories-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,47 @@ import { module, test } from 'qunit';

import percySnapshot from '@percy/ember';
import a11yAudit from 'ember-a11y-testing/test-support/audit';
import window from 'ember-window-mock';
import { setupWindowMock } from 'ember-window-mock/test-support';

import axeConfig from '../axe-config';
import setupMirage from '../helpers/setup-mirage';

module('Acceptance | categories', function (hooks) {
setupApplicationTest(hooks);
setupWindowMock(hooks);
setupMirage(hooks);

test('listing categories', async function (assert) {
window.navigator = { languages: ['en'] };

this.server.create('category', { category: 'API bindings' });
this.server.create('category', { category: 'Algorithms' });
this.server.createList('crate', 1, { categoryIds: ['algorithms'] });
this.server.create('category', { category: 'Asynchronous' });
this.server.createList('crate', 15, { categoryIds: ['asynchronous'] });
this.server.create('category', { category: 'Everything', crates_cnt: 1234 });

await visit('/categories');

assert.dom('[data-test-category="api-bindings"] [data-test-crate-count]').hasText('0 crates');
assert.dom('[data-test-category="algorithms"] [data-test-crate-count]').hasText('1 crate');
assert.dom('[data-test-category="asynchronous"] [data-test-crate-count]').hasText('15 crates');
assert.dom('[data-test-category="everything"] [data-test-crate-count]').hasText('1,234 crates');

await percySnapshot(assert);
await a11yAudit(axeConfig);
});

test('listing categories (locale: de)', async function (assert) {
window.navigator = { languages: ['de'] };

this.server.create('category', { category: 'Everything', crates_cnt: 1234 });

await visit('/categories');
assert.dom('[data-test-category="everything"] [data-test-crate-count]').hasText('1.234 crates');
});

test('category/:category_id index default sort is recent-downloads', async function (assert) {
this.server.create('category', { category: 'Algorithms' });

Expand Down