]> _ Git - fluidbook-html5.git/commitdiff
wip #1743 @0:10
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 11 Oct 2017 13:10:58 +0000 (15:10 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 11 Oct 2017 13:10:58 +0000 (15:10 +0200)
js/libs/fluidbook/fluidbook.l10n.js

index 12ce4336222980cd12ce6153c41ee2c92d7e889a..2f6114531787f9dc659ddecd94dce7553d97dc72 100644 (file)
@@ -25,7 +25,13 @@ FluidbookL10N.prototype = {
             $("html").removeClass('rtl').addClass('ltr');
         }
 
-        this.translations = this.fluidbook.datas.l10n[lang];
+        if (lang == 'default') {
+            this.translations = this.fluidbook.datas.l10n[this.fluidbook.datas.defaultLang];
+            $.extend(this.translations, this.fluidbook.datas.l10n[lang]);
+        } else {
+            this.translations = this.fluidbook.datas.l10n[lang];
+        }
+
         this.updateTranslations();
     },
     getActiveLang: function () {