diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-02-29 17:39:21 +0100 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-02-29 17:39:21 +0100 |
| commit | 0091df2bc8eed432df9d726d5bea09ac527128d2 (patch) | |
| tree | 65dd8ede996c1776d6eea666342cc8106db0c6b7 /core/js/l10n.js | |
| parent | 78570a5f728bb0b16ddea31f8ca8cfc212144246 (diff) | |
| download | nextcloud-server-0091df2bc8eed432df9d726d5bea09ac527128d2.tar.gz nextcloud-server-0091df2bc8eed432df9d726d5bea09ac527128d2.zip | |
Improved JS L10N bundle merging + tests
Diffstat (limited to 'core/js/l10n.js')
| -rw-r--r-- | core/js/l10n.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/js/l10n.js b/core/js/l10n.js index c19f523b30e..43cfc7e820f 100644 --- a/core/js/l10n.js +++ b/core/js/l10n.js @@ -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); } }, |