github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-25 01:36:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Concatenate items in {second}, not {first}

Browse Source
This commit is contained in:
Toby Zerner 2015-10-11 10:09:22 +10:30
parent 0b888ea342
commit 7387dfb7da
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/lib/helpers/punctuateSeries.js
View File

@ -16,17 +16,17 @@ export default function punctuateSeries(items) {
second: items[1]
});
} else if (items.length >= 3) {
// If there are three or more items, we will join all of the items up until
// the second-to-last one with the equivalent of a comma, and then we will
// feed that into the translator along with the last two items.
const first = items
.slice(0, items.length - 2)
// If there are three or more items, we will join all but the first and
// last items with the equivalent of a comma, and then we will feed that
// into the translator along with the first and last item.
const second = items
.slice(1, items.length - 1)
.reduce((list, item) => list.concat([item, app.trans('core.lib.series_glue_text')]), [])
.slice(0, -1);
return app.trans('core.lib.series_three_text', {
first,
second: items[items.length - 2],
first: items[0],
second,
third: items[items.length - 1]
});
}