Control input placeholder text

diff --git a/client/src/models/application.js b/client/src/models/application.js
index 12787b1ae56922b47dc89eff1956e690274b17ca..7b4f97147b710672cea1c1e9b89c1d04190b27e1 100644 (file)
--- a/client/src/models/application.js
+++ b/client/src/models/application.js
@@ -87,7 +87,7 @@
             /**\r
              * Set the UI components up\r
              */\r
-            this.controlbox = new _kiwi.view.ControlBox({el: $('#kiwi .controlbox')[0]});\r
+            this.controlbox = (new _kiwi.view.ControlBox({el: $('#kiwi .controlbox')[0]})).render();\r
             this.client_ui_commands = new _kiwi.misc.ClientUiCommands(this, this.controlbox);\r
 \r
             this.rightbar = new _kiwi.view.RightBar({el: this.view.$('.right_bar')[0]});\r

diff --git a/client/src/translations/en-gb.po b/client/src/translations/en-gb.po
index ec9681e3f6b17de5e9bca5463ec6b4b5b6e3d297..6f66587ac1b7e49808790035196aefda37f706b8 100755 (executable)
--- a/client/src/translations/en-gb.po
+++ b/client/src/translations/en-gb.po
@@ -16,6 +16,10 @@ msgstr ""
 "Project-Id-Version: Kiwi\n"
 "Language: en\n"
 
+#:
+msgid "client_views_controlbox_message"
+msgstr "Send message..."
+
 #: client/assets/src/applets/chanlist.js
 msgid "client_applets_chanlist_channelname"
 msgstr "Channel Name"

diff --git a/client/src/views/controlbox.js b/client/src/views/controlbox.js
index 6a71bde4f125d9f6ca4a10738d8a465cf2dd74fb..7808c103255e0333d99f89e9c3d9f0cc11f53ec5 100644 (file)
--- a/client/src/views/controlbox.js
+++ b/client/src/views/controlbox.js
@@ -38,6 +38,13 @@ _kiwi.view.ControlBox = Backbone.View.extend({
         });
     },
 
+    render: function() {
+        var send_message_text = translateText('client_views_controlbox_message');
+        this.$('.inp').attr('placeholder', send_message_text);
+
+        return this;
+    },
+
     showNickChange: function (ev) {
         // Nick box already open? Don't do it again
         if (this.nick_change)