fix options override on show

src/core/index.js

@@ -523,11 +523,15 @@ export function overrideOptions(m, opts) {
     }
   }
 
-  if (opts.language) {
-    opts.dict = opts.dict || {};
+  if (opts.language || opts.languageDictionary) {
 
-    m = tset(m, ["ui", "language"], opts.language);
-    m = tset(m, ["ui", "dict"], opts.dict);
+    if (opts.language) {
+      m = tset(m, ["ui", "language"], opts.language);
+    }
+
+    if (opts.languageDictionary) {
+      m = tset(m, ["ui", "dict"], opts.languageDictionary);
+    }
 
     m = i18n.initI18n(m);
   }

src/i18n.js

@@ -58,7 +58,7 @@ export function initI18n(m) {
   return set(m, "strings", base);
 }
 
-function assertLanguage(m, language, base, path = "") { 
+function assertLanguage(m, language, base, path = "") {
   Object.keys(base).forEach( key => {
     if (!language.hasOwnProperty(key)) {
       l.warn(m, `language does not have property ${path}${key}`);

support/index.html

@@ -28,7 +28,11 @@
       });
     });
 
-    lock.show();
+    lock.show({
+      languageDictionary: {
+        title: "sarlanga"
+      }
+    });
 
   </script>
 </body>

test/override_options.test.js

@@ -0,0 +1,70 @@
+"use strict";
+import { stub } from 'sinon';
+
+import expect from 'expect.js';
+import Immutable from 'immutable';
+
+import { overrideOptions } from '../src/core/index';
+import * as i18n from '../src/i18n';
+
+describe("Override state with options on show", () => {
+
+  before(function() {
+    stub(i18n, "initI18n", (m) => {
+      return m;
+    });
+  });
+
+  after(function() {
+    i18n.initI18n.restore();
+  });
+
+  it('should merge and warn missing keys', () => {
+
+    var m = Immutable.fromJS({});
+
+    var new_options = {
+      allowedConnections: 'facebook',
+      languageDictionary: {
+        title: 'new_title'
+      },
+      flashMessage: {
+        type: 'success',
+        text: 'test'
+      },
+      auth: {
+        params: {
+          state: '1234'
+        }
+      },
+      language: 'es',
+      theme: {
+        primaryColor: 'red',
+        logo: 'http://test.com/logo.png'
+      }
+    };
+
+    m = overrideOptions(m, new_options);
+
+    expect(m.toJS()).to.eql({
+      core: {
+        transient: {
+          globalSuccess: 'test',
+          allowedConnections: "facebook",
+          ui: {
+            primaryColor: 'red',
+            logo: 'http://test.com/logo.png',
+            language: 'es',
+            dict: {
+              title: "new_title"
+            }
+          },
+          authParams: {
+            state: '1234'
+          }
+        }
+      }
+    });
+
+  });
+});