[MERGE] forward port of branch 9.0 up to afba8ce

3 files changed, 8 insertions, 10 deletions

diff --git a/addons/mail/static/src/js/chat_manager.js b/addons/mail/static/src/js/chat_manager.js
index 5b4508f6ead..8a80968c5b7 100644
--- a/addons/mail/static/src/js/chat_manager.js
+++ b/addons/mail/static/src/js/chat_manager.js
@@ -11,6 +11,7 @@ var time = require('web.time');
 var web_client = require('web.web_client');
 
 var _t = core._t;
+var _lt = core._lt;
 var LIMIT = 100;
 var preview_msg_max_size = 350;  // optimal for native english speakers
 
@@ -300,7 +301,9 @@ function add_channel (data, options) {
     } else {
         channel = chat_manager.make_channel(data, options);
         channels.push(channel);
-        channels = _.sortBy(channels, function (channel) { return channel.name.toLowerCase(); });
+        // In case of a static channel (Inbox, Starred), the name is translated thanks to _lt
+        // (lazy translate). In this case, channel.name is an object, not a string.
+        channels = _.sortBy(channels, function (channel) { return _.isString(channel.name) ? channel.name.toLowerCase() : '' });
         if (!options.silent) {
             chat_manager.bus.trigger("new_channel", channel);
         }
@@ -1029,13 +1032,13 @@ chat_manager.bus.on('client_action_open', null, function (open) {
 function init () {
     add_channel({
         id: "channel_inbox",
-        name: _t("Inbox"),
+        name: _lt("Inbox"),
         type: "static",
     }, { display_needactions: true });
 
     add_channel({
         id: "channel_starred",
-        name: _t("Starred"),
+        name: _lt("Starred"),
         type: "static"
     });
 
diff --git a/addons/mail/static/src/js/chatter.js b/addons/mail/static/src/js/chatter.js
index d76db503fba..ccf7a04b0ad 100644
--- a/addons/mail/static/src/js/chatter.js
+++ b/addons/mail/static/src/js/chatter.js
@@ -440,7 +440,7 @@ var ChatterComposer = composer.BasicComposer.extend({
             internal_subtypes: [],
         });
         if (this.options.is_log) {
-            this.options.send_text = _('Log');
+            this.options.send_text = _t('Log');
         }
         this.events = _.extend(this.events, {
             'click .o_composer_button_full_composer': 'on_open_full_composer',
diff --git a/addons/mail/static/src/js/composer.js b/addons/mail/static/src/js/composer.js
index ae17f4a9854..896368c5961 100644
--- a/addons/mail/static/src/js/composer.js
+++ b/addons/mail/static/src/js/composer.js
@@ -243,12 +243,7 @@ var MentionManager = Widget.extend({
     },
 
     get_selection_id: function (match, selection) {
-        var m = match[0].slice(1);
-        _.each(selection, function (s) {
-            if(s.name == m){
-                return s.id;
-            }
-        });
+        return _.findWhere(selection, {'name': match[0].slice(1)}).id;
     },
 
     reset_selections: function () {