Skip to content
This repository has been archived by the owner on Jul 9, 2018. It is now read-only.

i18n: Support accumulatively registering additional locale data for domain #105

Merged
merged 13 commits into from
Apr 12, 2018
Merged

i18n: Support accumulatively registering additional locale data for domain #105

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
601b638
allow for setting additional locale data for a domain accumulatively
nerrad Apr 10, 2018
b3775ae
woops wrong object reference
nerrad Apr 10, 2018
1e430cf
add test for accumulation of localeData
nerrad Apr 10, 2018
0757767
repackage additional tests
nerrad Apr 10, 2018
3bb5b9c
use more performant “in” check instead of lodash `_.has`
nerrad Apr 10, 2018
9a6d78e
use hasOwnProperty instead of in
nerrad Apr 11, 2018
3f56469
fix formatting for code style
nerrad Apr 12, 2018
25c686f
fix formatting
nerrad Apr 12, 2018
8dfe686
use Object.assign instead of lodash.merge
nerrad Apr 12, 2018
a39924a
add new plural strings to tests
nerrad Apr 12, 2018
533c64e
simplify merging
nerrad Apr 12, 2018
1b31bc8
indent, indent
nerrad Apr 12, 2018
aed293b
i18n: Fix indentation
aduth Apr 12, 2018
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
6 changes: 5 additions & 1 deletion packages/i18n/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ export function setLocaleData( localeData = { '': {} }, domain = 'default' ) {
} );
}

i18n.options.locale_data[ domain ] = localeData;
i18n.options.locale_data[ domain ] = Object.assign(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These lines need to be tabbed once more.

{},
i18n.options.locale_data[ domain ],
localeData
);
}

/**
Expand Down
52 changes: 44 additions & 8 deletions packages/i18n/src/test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,27 @@ jest.mock( 'memize', () => ( fn ) => fn );
const localeData = {
"" : {
// Domain name
"domain" : "test_domain",
"lang" : "fr",
domain: 'test_domain',
lang: 'fr',
// Plural form function for language
"plural_forms" : "nplurals=2; plural=(n != 1);"
plural_forms: 'nplurals=2; plural=(n != 1);'
},

"hello" : [ "bonjour" ],
hello: [ 'bonjour' ],

"verb\u0004feed": [ "nourrir" ],
'verb\u0004feed': [ 'nourrir' ],

"hello %s": [ "bonjour %s"],
'hello %s': [ 'bonjour %s' ],

"%d banana" : [ "une banane", "%d bananes" ],
'%d banana': [ 'une banane', '%d bananes' ],

"fruit\u0004%d apple" : [ "une pomme", "%d pommes" ],
'fruit\u0004%d apple': [ 'une pomme', '%d pommes' ],
}
const additionalLocaleData = {
cheeseburger: [ 'hamburger au fromage' ],
'%d cat': [ 'un chat', '%d chats' ]
};

setLocaleData( localeData, 'test_domain' );

describe( 'i18n', () => {
Expand Down Expand Up @@ -84,4 +89,35 @@ describe( 'i18n', () => {
expect( result ).toBe( 'bonjour Riad' );
} );
} );

describe( 'setAdditionalLocale', () => {
beforeAll( () => {
setLocaleData( additionalLocaleData, 'test_domain' );
} );
describe( '__', () => {
it( 'existing translation still available', () => {
expect( __( 'hello', 'test_domain' ) ).toBe( 'bonjour' );
} );
} );

describe( '__', () => {
it( 'new translation available.', () => {
expect( __( 'cheeseburger', 'test_domain' ) ).toBe( 'hamburger au fromage' );
} );
} );

describe( '_n', () => {
it( 'existing plural form still works', () => {
expect( _n( '%d banana', '%d bananas', 3, 'test_domain' ) ).toBe( '%d bananes' );
} );

it( 'new singular form was added', () => {
expect( _n( '%d cat', '%d cats', 1, 'test_domain' ) ).toBe( 'un chat' );
} );

it( 'new plural form was added', () => {
expect( _n( '%d cat', '%d cats', 3, 'test_domain' ) ).toBe( '%d chats' );
} );
} );
} );
} );