Skip to content

Enable more than 1 level of nested directories #32

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
Oct 17, 2016
Merged

Enable more than 1 level of nested directories #32

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
ad3811f
Merge pull request #31 from rmariuzzo/develop
rmariuzzo Aug 26, 2016
b592aa1
Merge branch 'develop'
rmariuzzo Aug 27, 2016
8ae7d19
Enable more than 1 level of nested directories
lphilps Oct 13, 2016
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
4 changes: 2 additions & 2 deletions src/lang.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,8 @@
var segments = key.split('.');

return {
source: locale + '.' + segments[0].replace('/', '.'),
sourceFallback: this.getFallback() + '.' + segments[0].replace('/', '.'),
source: locale + '.' + segments[0].replace(/\//g, '.'),
sourceFallback: this.getFallback() + '.' + segments[0].replace(/\//g, '.'),
entries: segments.slice(1)
};
};
Expand Down
3 changes: 3 additions & 0 deletions test/fixture/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,9 @@
"en.forum.thread": {
"viewAllThreads": "View all threads"
},
"en.dir1.dir2.child": {
"deeplynestedmessage": "Message from file 2 directories down"
},
"ht.messages": {
"home": "Ak\u00e8y",
"login": "Aksede",
Expand Down
4 changes: 4 additions & 0 deletions test/spec/lang_trans_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ describe('The lang.trans() method', function () {
expect(lang.trans('forum/thread.viewAllThreads')).toBe('View all threads');
});

it('should return the expected message inside a deeply nested directory', function () {
expect(lang.trans('dir1/dir2/child.deeplynestedmessage')).toBe('Message from file 2 directories down');
});

it('should return the passed key when nested message does not point to a message', function () {
expect(lang.trans('messages.family.children')).toBe('messages.family.children');
expect(lang.trans('a.b.c.d.f.g.h.i.j.k')).toBe('a.b.c.d.f.g.h.i.j.k');
Expand Down