From: Darren <darren@darrenwhitlen.com>
Date: Wed, 7 May 2014 22:33:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/development' into CoryChaplin-text_themes
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1f49427e510c67118a0f0442f2231c686a705472;p=KiwiIRC.git

Merge remote-tracking branch 'origin/development' into CoryChaplin-text_themes

* origin/development: (23 commits)
  Using Negotiator for accept-language parsing
  Client transports within config.js
  Don't automatically give focus when within an iframe
  MenuBox now a public component
  Startup applet correctly showing the info box
  Build script fix #531
  Missed HTML template update from previous commit
  Moving nick list toggle into the right bar
  More format adjustment :)
  Adjusted code format
  Added inspircd 396 numeric RPL_HOSTCLOACKING
  Extracting the right_bar into its own view with toggling logic
  using the .disabled CSS class when toggling right_bar
  Kiwi API: addMediaMessageType()
  Separating formatDate + only init'ing its vars once
  Date format language files
  Adding date.format to make date strings customisable to fit your locale
  Add visible check for updating banlist
  fix indentation (I should really have checked the diff better >_>)
  remove useless show
  ...

Conflicts:
	client/build.js
	server/settingsgenerator.js
---

1f49427e510c67118a0f0442f2231c686a705472
diff --cc client/build.js
index 746cd6c,f33f641..01ea6c4
--- a/client/build.js
+++ b/client/build.js
@@@ -81,6 -79,8 +79,7 @@@ var source_files = 
      __dirname + '/src/views/userbox.js',
      __dirname + '/src/views/channeltools.js',
      __dirname + '/src/views/channelinfo.js',
+     __dirname + '/src/views/rightbar.js',
 -
      __dirname + '/src/applets/settings.js',
      __dirname + '/src/applets/chanlist.js',
      __dirname + '/src/applets/scripteditor.js',
diff --cc client/src/models/network.js
index 5c754d3,1d5a073..ae050a1
--- a/client/src/models/network.js
+++ b/client/src/models/network.js
@@@ -810,20 -808,23 +810,23 @@@
              _kiwi.app.message.text(_kiwi.global.i18n.translate('client_models_network_channel_badkey').fetch(event.channel));
              break;
          case 'invite_only_channel':
 -            panel.addMsg(' ', '== ' + _kiwi.global.i18n.translate('client_models_network_channel_inviteonly').fetch(event.channel), 'status');
 -            _kiwi.app.message.text(_kiwi.global.i18n.translate('client_models_network_channel_inviteonly').fetch(event.channel));
 +            panel.addMsg(' ', styleText('channel_inviteonly', {nick: event.nick, text: translateText('client_models_network_channel_inviteonly', [event.nick, event.channel]), channel: event.channel}), 'status');
 +            _kiwi.app.message.text(event.channel + ' ' + _kiwi.global.i18n.translate('client_models_network_channel_inviteonly').fetch());
              break;
          case 'user_on_channel':
 -            panel.addMsg(' ', '== ' + event.nick + ' is already on this channel');
 +            panel.addMsg(' ', styleText('channel_alreadyin', {nick: event.nick, text: translateText('client_models_network_channel_alreadyin'), channel: event.channel}));
              break;
          case 'channel_is_full':
 -            panel.addMsg(' ', '== ' + _kiwi.global.i18n.translate('client_models_network_channel_limitreached').fetch(event.channel), 'status');
 -            _kiwi.app.message.text(_kiwi.global.i18n.translate('client_models_network_channel_limitreached').fetch(event.channel));
 +            panel.addMsg(' ', styleText('channel_limitreached', {nick: event.nick, text: translateText('client_models_network_channel_limitreached', [event.channel]), channel: event.channel}), 'status');
 +            _kiwi.app.message.text(event.channel + ' ' + _kiwi.global.i18n.translate('client_models_network_channel_limitreached').fetch(event.channel));
              break;
          case 'chanop_privs_needed':
 -            panel.addMsg(' ', '== ' + event.reason, 'status');
 +            panel.addMsg(' ', styleText('chanop_privs_needed', {text: event.reason, channel: event.channel}), 'status');
              _kiwi.app.message.text(event.reason + ' (' + event.channel + ')');
              break;
+ 	case 'cannot_send_to_channel':
+             panel.addMsg(' ', '== ' + _kiwi.global.i18n.translate('Cannot send message to channel, you are not voiced').fetch(event.channel, event.reason), 'status');
+ 	    break;
          case 'no_such_nick':
              tmp = this.panels.getByName(event.nick);
              if (tmp) {