tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-29 20:59:23 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Properly merging different dictionaries for javascript i18n implementation (see #2916)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63857 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2008-10-08 12:17:00 +00:00
parent 8c75af3927
commit 9d31e43de3
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
javascript/i18n.js
View File

@ -72,11 +72,8 @@ ss.i18n = {
},
addDictionary: function(locale, dict) {
if(typeof(this.lang[locale])) {
this.lang[locale] = dict;
} else {
this.lang[locale] += dict;
}
if(!this.lang[locale]) this.lang[locale] = $H();
this.lang[locale] = $H(this.lang[locale]).merge(dict);
},
/**