github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-05-24 07:39:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add third tier to key namespacing

Browse Source 
- Changes all `app.trans` calls to `app.translator.trans` calls.
- Changes existing keys to [three-tier namespace structure](https://github.com/flarum/english/pull/12).
- Extracts additional strings for `lib:` namespace.
- Extracts two previously missed strings for EditGroupModal.js.
This commit is contained in:
dcsjapan
2015-10-20 13:04:43 +09:00
parent a9eb62880e
commit 49d59089e4
54 changed files with 216 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@
*/
export default function punctuateSeries(items) {
if (items.length === 2) {
return app.trans('core.lib.series_two_text', {
return app.translator.trans('core.lib.series.two_text', {
first: items[0],
second: items[1]
});
@ -21,10 +21,10 @@ export default function punctuateSeries(items) {
// 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')]), [])
.reduce((list, item) => list.concat([item, app.translator.trans('core.lib.series.glue_text')]), [])
.slice(0, -1);
return app.trans('core.lib.series_three_text', {
return app.translator.trans('core.lib.series.three_text', {
first: items[0],
second,
third: items[items.length - 1]