From b2a1c9881ed91b8c5a005d59d69e0eff6ef42e90 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Tue, 25 Oct 2016 15:18:56 -0500
Subject: [PATCH] Fixes comments from review.

Adds a safe check, i18n is expecting undefined not null. Fix a method name and translation to be at placeholder.
---
 modules/UI/feedback/FeedbackWindow.js | 4 ++--
 modules/UI/invite/InviteDialogView.js | 3 ++-
 modules/translation/translation.js    | 7 +++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/UI/feedback/FeedbackWindow.js b/modules/UI/feedback/FeedbackWindow.js
index 1bf248a44..f6254557e 100644
--- a/modules/UI/feedback/FeedbackWindow.js
+++ b/modules/UI/feedback/FeedbackWindow.js
@@ -146,10 +146,10 @@ export default class Dialog {
         this.submitted = false;
         this.onCloseCallback = function() {};
 
-        this.setDefaulOptions();
+        this.setDefaultOptions();
     }
 
-    setDefaulOptions() {
+    setDefaultOptions() {
         var self = this;
 
         this.options = {
diff --git a/modules/UI/invite/InviteDialogView.js b/modules/UI/invite/InviteDialogView.js
index 74e62e6ce..95ee622b6 100644
--- a/modules/UI/invite/InviteDialogView.js
+++ b/modules/UI/invite/InviteDialogView.js
@@ -156,7 +156,8 @@ export default class InviteDialogView {
                </label>
                 <div class="input-control__container">
                     <input class="input-control__input" id="newPasswordInput"
-                           type="text" data-i18n="dialog.createPassword">
+                           type="text" 
+                           data-i18n="[placeholder]dialog.createPassword">
                     <button id="addPasswordBtn" id="inviteDialogAddPassword"
                             disabled data-i18n="dialog.add"
                             class="button-control button-control_light">
diff --git a/modules/translation/translation.js b/modules/translation/translation.js
index b0db06a33..5a39f83b6 100644
--- a/modules/translation/translation.js
+++ b/modules/translation/translation.js
@@ -98,7 +98,9 @@ module.exports = {
         return i18n.lng();
     },
     translateElement: function (selector, options) {
-        selector.i18n(options);
+        // i18next expects undefined if options are missing, check if its null
+        selector.i18n(
+            options === null ? undefined : options);
     },
     generateTranslationHTML: function (key, options) {
         var str = "<span data-i18n=\"" + key + "\"";
@@ -106,7 +108,8 @@ module.exports = {
             str += " data-i18n-options='" + JSON.stringify(options) + "'";
         }
         str += ">";
-        str += i18n.t(key, options);
+        // i18next expects undefined if options ARE missing, check if its null
+        str += i18n.t(key, options === null ? undefined : options);
         str += "</span>";
         return str;