Merge branch 'devel'

3 files changed, 19 insertions, 9 deletions

diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js
index df22fc14..f12718a7 100644
--- a/client/components/main/layouts.js
+++ b/client/components/main/layouts.js
@@ -17,10 +17,14 @@ Template.userFormsLayout.onRendered(() => {
 Template.userFormsLayout.helpers({
   languages() {
     return _.map(TAPi18n.getLanguages(), (lang, code) => {
-      return {
-        tag: code,
-        name: lang.name === 'br' ? 'Brezhoneg' : lang.name === 'ig' ? 'Igbo' : lang.name,
-      };
+      const tag = code;
+      let name = lang.name;
+      if (lang.name === 'br') {
+        name = 'Brezhoneg';
+      } else if (lang.name === 'ig') {
+        name = 'Igbo';
+      }
+      return { tag, name };
     }).sort(function(a, b) {
       if (a.name === b.name) {
         return 0;
diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js
index e4a7c409..bff96dcb 100644
--- a/client/components/sidebar/sidebar.js
+++ b/client/components/sidebar/sidebar.js
@@ -156,7 +156,7 @@ Template.memberPopup.events({
   }),
   'click .js-leave-member': Popup.afterConfirm('leaveBoard', () => {
     const boardId = Session.get('currentBoard');
-    Meteor.call('quitBoard', boardId, (err, ret) => {
+    Meteor.call('quitBoard', boardId, () => {
       Popup.close();
       FlowRouter.go('home');
     });
diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js
index 96c8c95e..be7d4dcb 100644
--- a/client/components/users/userHeader.js
+++ b/client/components/users/userHeader.js
@@ -114,10 +114,16 @@ Template.changePasswordPopup.onRendered(function () {
 Template.changeLanguagePopup.helpers({
   languages() {
     return _.map(TAPi18n.getLanguages(), (lang, code) => {
-      return {
-        tag: code,
-        name: lang.name === 'br' ? 'Brezhoneg' : lang.name === 'ig' ? 'Igbo' : lang.name,
-      };
+      // Same code in /client/components/main/layouts.js
+      // TODO : Make code reusable
+      const tag = code;
+      let name = lang.name;
+      if (lang.name === 'br') {
+        name = 'Brezhoneg';
+      } else if (lang.name === 'ig') {
+        name = 'Igbo';
+      }
+      return { tag, name };
     }).sort(function (a, b) {
       if (a.name === b.name) {
         return 0;