upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 14:50:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 53

Improved JS L10N bundle merging + tests

Browse source
This commit is contained in:
Vincent Petry 2016-02-29 17:39:21 +01:00
parent 78570a5f72
commit 0091df2bc8
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/js/l10n.js
View file

@ -78,9 +78,7 @@ OC.L10N = {
}
} else {
// Theme overwriting the default language
_.each(bundle, function(translation, key) {
self._bundles[appName][key] = translation
});
_.extend(self._bundles[appName], bundle);
}
},

8
core/js/tests/specs/l10nSpec.js
View file

@ -52,6 +52,14 @@ describe('OC.L10N tests', function() {
t(TEST_APP, 'Hello {name}', {name: '<strong>Steve</strong>'}, null, {escape: false})
).toEqual('Hello <strong>Steve</strong>');
});
it('keeps old texts when registering existing bundle', function() {
OC.L10N.register(TEST_APP, {
'sunny': 'sonnig',
'new': 'neu'
});
expect(t(TEST_APP, 'sunny')).toEqual('sonnig');
expect(t(TEST_APP, 'new')).toEqual('neu');
});
});
describe('plurals', function() {
function checkPlurals() {