From b722f3c60c2c34d9d96c6ca5ec01a7e05da9f7b8 Mon Sep 17 00:00:00 2001
From: Noxx <noxx@penya.de>
Date: Wed, 10 Jul 2013 19:26:52 +0200
Subject: [PATCH] Made en-gb to our default language and use it for fallback;
 Added it as seperate translation

---
 client/assets/src/app.js                   |  28 +-
 client/assets/src/index.html.tmpl          |   1 -
 client/assets/src/translations/en-gb.po    | 358 +++++++++++++++++++++
 client/assets/src/translations/template.po | 212 ++++++------
 server/httphandler.js                      |  18 +-
 5 files changed, 480 insertions(+), 137 deletions(-)
 create mode 100755 client/assets/src/translations/en-gb.po

diff --git a/client/assets/src/app.js b/client/assets/src/app.js
index 1dc1a7f..9b6fa45 100644
--- a/client/assets/src/app.js
+++ b/client/assets/src/app.js
@@ -115,31 +115,27 @@ _kiwi.global = {
         _kiwi.global.settings.load();
 
         continueStart = function (locale, s, xhr) {
-        	if (locale) {
-        		_kiwi.global.i18n = new Jed({locale_data: locale, domain: xhr.getResponseHeader('Content-Language')});
-        	} else {
-        		_kiwi.global.i18n = new Jed();
-        	}
+          if (locale) {
+            _kiwi.global.i18n = new Jed({locale_data: locale, domain: xhr.getResponseHeader('Content-Language')});
+          } else {
+            _kiwi.global.i18n = new Jed();
+          }
 
-			_kiwi.app = new _kiwi.model.Application(opts);
+          _kiwi.app = new _kiwi.model.Application(opts);
 
-			if (opts.kiwi_server) {
-				_kiwi.app.kiwi_server = opts.kiwi_server;
-			}
+          if (opts.kiwi_server) {
+            _kiwi.app.kiwi_server = opts.kiwi_server;
+          }
 
-			// Start the client up
-			_kiwi.app.start();
+          // Start the client up
+          _kiwi.app.start();
         };
 
         locale = _kiwi.global.settings.get('locale')
         if (!locale) {
         	$.getJSON(opts.base_path + '/assets/locales/magic.json', continueStart);
         } else {
-        	if (locale === 'en-gb') {
-        		continueStart();
-        	} else {
-        		$.getJSON(opts.base_path + '/assets/locales/' + locale + '.json', continueStart);
-        	}
+        	$.getJSON(opts.base_path + '/assets/locales/' + locale + '.json', continueStart);
         }
 	}
 };
diff --git a/client/assets/src/index.html.tmpl b/client/assets/src/index.html.tmpl
index 7324b0f..728edbe 100644
--- a/client/assets/src/index.html.tmpl
+++ b/client/assets/src/index.html.tmpl
@@ -249,7 +249,6 @@
                 <h6>Language</h6>
                 <div class="control-group">
                     <select data-setting="locale">
-                        <option value="en-gb">English (British)</option>
                         <% _.forEach(languages, function(lang) { %>
                             <option value="<%= lang.tag %>"><%= lang.language %></li>
                         <% }); %>
diff --git a/client/assets/src/translations/en-gb.po b/client/assets/src/translations/en-gb.po
new file mode 100755
index 0000000..23f3b17
--- /dev/null
+++ b/client/assets/src/translations/en-gb.po
@@ -0,0 +1,358 @@
+
+#: client/assets/src/applets/chanlist.js
+msgid "client_applets_chanlist_channelname"
+msgstr "Channel Name"
+
+msgid "client_applets_chanlist_users"
+msgstr "Users"
+
+msgid "client_applets_chanlist_topic"
+msgstr "Topic"
+
+msgid "client_applets_chanlist_channellist"
+msgstr "Channel List"
+
+
+
+#: client/assets/src/applets/scripteditor.js
+msgid "client_applets_scripteditor_save"
+msgstr "Save"
+
+msgid "client_applets_scripteditor_error"
+msgstr "Script error. %s"
+
+msgid "client_applets_scripteditor_saved"
+msgstr "Your script has been saved and is now active"
+
+msgid "client_applets_scripteditor_title"
+msgstr "Script Editor"
+
+
+
+#: client/assets/src/applets/settings.js
+msgid "client_applets_settings_channelview_tabs"
+msgstr "Tabs"
+
+msgid "client_applets_settings_channelview_list"
+msgstr "List"
+
+msgid "client_applets_settings_channelview_list_notice"
+msgstr "for large amouts of channels"
+
+msgid "client_applets_settings_notification_joinpart"
+msgstr "Join/part channel notifications"
+
+msgid "client_applets_settings_timestamp"
+msgstr "Timestamps"
+
+msgid "client_applets_settings_notification_sound"
+msgstr "Mute sound notifications"
+
+msgid "client_applets_settings_history_length"
+msgstr "messages in scroll history"
+
+msgid "client_applets_settings_default_client"
+msgstr "Default IRC client"
+
+msgid "client_applets_settings_default_client_enable"
+msgstr "Make Kiwi my default IRC client"
+
+msgid "client_applets_settings_default_client_notice"
+msgstr "Note: Chrome or Chromium browser users may need to check their settings via %s if nothing happens"
+
+msgid "client_applets_settings_title"
+msgstr "Settings"
+
+
+
+#: client/assets/src/models/applet.js
+msgid "client_models_applet_unknown"
+msgstr "Unknown Applet"
+
+msgid "client_models_applet_loading"
+msgstr "Loading.."
+
+msgid "client_models_applet_notfound"
+msgstr "Not found"
+
+
+
+#: client/assets/src/models/application.js
+msgid "client_models_application_reconnecting"
+msgstr "You have been disconnected. Attempting to reconnect for you"
+
+msgid "client_models_application_reconnect_in_x_seconds"
+msgstr "You have been disconnected. Attempting to reconnect again in %d seconds"
+
+msgid "client_models_application_reconnect_successfully"
+msgstr "It's OK, you're connected again"
+
+msgid "client_models_application_settings_saved"
+msgstr "Settings have been saved"
+
+msgid "client_models_application_ignore_title"
+msgstr "Ignored nicks"
+
+msgid "client_models_application_ignore_none"
+msgstr "Not ignoring anybody"
+
+msgid "client_models_application_ignore_nick"
+msgstr "Ignoring %s"
+
+msgid "client_models_application_ignore_stop_notice"
+msgstr "Specifiy which nick you wish to stop ignoring"
+
+msgid "client_models_application_ignore_stopped"
+msgstr "Stopped ignoring %s"
+
+msgid "client_models_application_applet_notfound"
+msgstr "Applet \"%s\" does not exist"
+
+msgid "client_models_application_encoding_changed"
+msgstr "Encoding modified to %s"
+
+msgid "client_models_application_encoding_invalid"
+msgstr "%s is not a valid encoding"
+
+msgid "client_models_application_encoding_notspecified"
+msgstr "Encoding not specified"
+
+msgid "client_models_application_encoding_usage"
+msgstr "Usage: /encoding [NEW-ENCODING]"
+
+msgid "client_models_application_connection_create"
+msgstr "New Connection"
+
+msgid "client_models_application_connection_connecting"
+msgstr "Connecting to %s:%s..."
+
+msgid "client_models_application_connection_error"
+msgstr "Error connecting to %s:%s (%s)"
+
+
+
+#: client/assets/src/models/channel.js
+msgid "client_models_channel_join"
+msgstr "%s has joined"
+
+msgid "client_models_channel_quit"
+msgstr "%s has quit %s"
+
+msgid "client_models_channel_kicked"
+msgstr "%s was kicked by %s %s"
+
+msgid "client_models_channel_selfkick"
+msgstr "You have been kicked by %s %s"
+
+msgid "client_models_channel_part"
+msgstr "%s has left %s"
+
+
+
+#: client/assets/src/models/network.js
+msgid "client_models_network_channel_invalid_name"
+msgstr "%s is not a valid channel name"
+
+msgid "client_models_network_disconnected"
+msgstr "Disconnected from the IRC network"
+
+msgid "client_models_network_nickname_changed"
+msgstr "%s is now known as %s"
+
+msgid "client_models_network_topic"
+msgstr "Topic set by %s at %s"
+
+msgid "client_models_network_selfmode"
+msgstr "%s sets mode %s"
+
+msgid "client_models_network_mode"
+msgstr "%s set mode %s"
+
+msgid "client_models_network_channels"
+msgstr "Channels: %s"
+
+msgid "client_models_network_server"
+msgstr "Connected to server: %s %s"
+
+msgid "client_models_network_idle_and_signon"
+msgstr "Idle for %s, signed on %s"
+
+msgid "client_models_network_away"
+msgstr "Away: %s"
+
+msgid "client_models_network_idle"
+msgstr "Idle for %s"
+
+msgid "client_models_network_nickname_notfound"
+msgstr "No such nick"
+
+msgid "client_models_network_banned"
+msgstr "You are banned from %s. %s"
+
+msgid "client_models_network_channel_badkey"
+msgstr "Bad channel key for %s"
+
+msgid "client_models_network_channel_inviteonly"
+msgstr "%s is invite only."
+
+msgid "client_models_network_channel_limitreached"
+msgstr "%s is full."
+
+msgid "client_models_network_nickname_alreadyinuse"
+msgstr "The nickname \"%s\" is already in use. Please select a new nickname"
+
+msgid "client_models_network_badpassword"
+msgstr "Incorrect password given"
+
+
+
+#: client/assets/src/views/application.js
+msgid "client_views_application_close_notice"
+msgstr "This will close all KiwiIRC conversations. Are you sure you want to close this window?"
+
+
+
+#: client/assets/src/views/channel.js
+msgid "client_views_channel_joining"
+msgstr "Joining channel.."
+
+msgid "client_views_channel_topic"
+msgstr "Topic for %s is: %s"
+
+
+
+#: client/assets/src/views/mediamessage.js
+msgid "client_views_mediamessage_close"
+msgstr "Close media"
+
+msgid "client_views_mediamessage_notfound"
+msgstr "Not found"
+
+msgid "client_views_mediamessage_load_tweet"
+msgstr "Loading tweet"
+
+msgid "client_views_mediamessage_load_image"
+msgstr "Loading image"
+
+msgid "client_views_mediamessage_load_reddit"
+msgstr "Loading Reddit thread"
+
+msgid "client_views_mediamessage_load_gist"
+msgstr "Loading gist"
+
+
+
+#: client/assets/src/views/nickchangegbox.js
+msgid "client_views_nickchangebox_new"
+msgstr "New nick"
+
+msgid "client_views_nickchangebox_change"
+msgstr "Change"
+
+msgid "client_views_nickchangebox_cancel"
+msgstr "Cancel"
+
+
+
+#: client/assets/src/views/panel.js
+msgid "client_views_panel_activity"
+msgstr "People are talking!"
+
+
+
+#: client/assets/src/views/serverselect.js
+msgid "client_views_serverselect_form_title"
+msgstr "Think of a nickname..."
+
+msgid "client_views_serverselect_nickname"
+msgstr "Nickname"
+
+msgid "client_views_serverselect_enable_password"
+msgstr "I have a password"
+
+msgid "client_views_serverselect_password"
+msgstr "Password"
+
+msgid "client_views_serverselect_channel"
+msgstr "Channel"
+
+msgid "client_views_serverselect_channelkey"
+msgstr "Channel Key"
+
+msgid "client_views_serverselect_channelkey_required"
+msgstr "Channel requires a key"
+
+msgid "client_views_serverselect_key"
+msgstr "Key"
+
+msgid "client_views_serverselect_connection_start"
+msgstr "Start..."
+
+msgid "client_views_serverselect_server_and_network"
+msgstr "Server and network"
+
+msgid "client_views_serverselect_server"
+msgstr "Server"
+
+msgid "client_views_serverselect_port"
+msgstr "Port"
+
+msgid "client_views_serverselect_poweredby"
+msgstr "Powered by Kiwi IRC"
+
+msgid "client_views_serverselect_nickname_error_empty"
+msgstr "Select a nickname first!"
+
+msgid "client_views_serverselect_connection_successfully"
+msgstr "Connected"
+
+msgid "client_views_serverselect_connection_trying"
+msgstr "Connecting.."
+
+msgid "client_views_serverselect_nickname_error_alreadyinuse"
+msgstr "Nickname already taken"
+
+msgid "client_views_serverselect_nickname_invalid"
+msgstr "Erroneus nickname"
+
+msgid "client_views_serverselect_password_incorrect"
+msgstr "Incorrect Password"
+
+msgid "client_views_serverselect_connection_error"
+msgstr "Error Connecting"
+
+msgid "client_views_serverselect_server_notfound"
+msgstr "Server not found"
+
+msgid "client_views_serverselect_connection_refused"
+msgstr "Connection refused"
+
+
+
+#: client/assets/src/views/userbox.js
+msgid "client_views_userbox_op"
+msgstr "Op"
+
+msgid "client_views_userbox_deop"
+msgstr "De-op"
+
+msgid "client_views_userbox_voice"
+msgstr "Voice"
+
+msgid "client_views_userbox_devoice"
+msgstr "De-voice"
+
+msgid "client_views_userbox_kick"
+msgstr "Kick"
+
+msgid "client_views_userbox_ban"
+msgstr "Ban"
+
+msgid "client_views_userbox_query"
+msgstr "Message"
+
+msgid "client_views_userbox_whois"
+msgstr "Info"
+
+msgid "client_views_userbox_slap"
+msgstr "Slap!"
diff --git a/client/assets/src/translations/template.po b/client/assets/src/translations/template.po
index 23f3b17..ccf06c4 100755
--- a/client/assets/src/translations/template.po
+++ b/client/assets/src/translations/template.po
@@ -1,358 +1,358 @@
 
 #: client/assets/src/applets/chanlist.js
 msgid "client_applets_chanlist_channelname"
-msgstr "Channel Name"
+msgstr ""
 
 msgid "client_applets_chanlist_users"
-msgstr "Users"
+msgstr ""
 
 msgid "client_applets_chanlist_topic"
-msgstr "Topic"
+msgstr ""
 
 msgid "client_applets_chanlist_channellist"
-msgstr "Channel List"
+msgstr ""
 
 
 
 #: client/assets/src/applets/scripteditor.js
 msgid "client_applets_scripteditor_save"
-msgstr "Save"
+msgstr ""
 
 msgid "client_applets_scripteditor_error"
-msgstr "Script error. %s"
+msgstr ""
 
 msgid "client_applets_scripteditor_saved"
-msgstr "Your script has been saved and is now active"
+msgstr ""
 
 msgid "client_applets_scripteditor_title"
-msgstr "Script Editor"
+msgstr ""
 
 
 
 #: client/assets/src/applets/settings.js
 msgid "client_applets_settings_channelview_tabs"
-msgstr "Tabs"
+msgstr ""
 
 msgid "client_applets_settings_channelview_list"
-msgstr "List"
+msgstr ""
 
 msgid "client_applets_settings_channelview_list_notice"
-msgstr "for large amouts of channels"
+msgstr ""
 
 msgid "client_applets_settings_notification_joinpart"
-msgstr "Join/part channel notifications"
+msgstr ""
 
 msgid "client_applets_settings_timestamp"
-msgstr "Timestamps"
+msgstr ""
 
 msgid "client_applets_settings_notification_sound"
-msgstr "Mute sound notifications"
+msgstr ""
 
 msgid "client_applets_settings_history_length"
-msgstr "messages in scroll history"
+msgstr ""
 
 msgid "client_applets_settings_default_client"
-msgstr "Default IRC client"
+msgstr ""
 
 msgid "client_applets_settings_default_client_enable"
-msgstr "Make Kiwi my default IRC client"
+msgstr ""
 
 msgid "client_applets_settings_default_client_notice"
-msgstr "Note: Chrome or Chromium browser users may need to check their settings via %s if nothing happens"
+msgstr ""
 
 msgid "client_applets_settings_title"
-msgstr "Settings"
+msgstr ""
 
 
 
 #: client/assets/src/models/applet.js
 msgid "client_models_applet_unknown"
-msgstr "Unknown Applet"
+msgstr ""
 
 msgid "client_models_applet_loading"
-msgstr "Loading.."
+msgstr ""
 
 msgid "client_models_applet_notfound"
-msgstr "Not found"
+msgstr ""
 
 
 
 #: client/assets/src/models/application.js
 msgid "client_models_application_reconnecting"
-msgstr "You have been disconnected. Attempting to reconnect for you"
+msgstr ""
 
 msgid "client_models_application_reconnect_in_x_seconds"
-msgstr "You have been disconnected. Attempting to reconnect again in %d seconds"
+msgstr ""
 
 msgid "client_models_application_reconnect_successfully"
-msgstr "It's OK, you're connected again"
+msgstr ""
 
 msgid "client_models_application_settings_saved"
-msgstr "Settings have been saved"
+msgstr ""
 
 msgid "client_models_application_ignore_title"
-msgstr "Ignored nicks"
+msgstr ""
 
 msgid "client_models_application_ignore_none"
-msgstr "Not ignoring anybody"
+msgstr ""
 
 msgid "client_models_application_ignore_nick"
-msgstr "Ignoring %s"
+msgstr ""
 
 msgid "client_models_application_ignore_stop_notice"
-msgstr "Specifiy which nick you wish to stop ignoring"
+msgstr ""
 
 msgid "client_models_application_ignore_stopped"
-msgstr "Stopped ignoring %s"
+msgstr ""
 
 msgid "client_models_application_applet_notfound"
-msgstr "Applet \"%s\" does not exist"
+msgstr ""
 
 msgid "client_models_application_encoding_changed"
-msgstr "Encoding modified to %s"
+msgstr ""
 
 msgid "client_models_application_encoding_invalid"
-msgstr "%s is not a valid encoding"
+msgstr ""
 
 msgid "client_models_application_encoding_notspecified"
-msgstr "Encoding not specified"
+msgstr ""
 
 msgid "client_models_application_encoding_usage"
-msgstr "Usage: /encoding [NEW-ENCODING]"
+msgstr ""
 
 msgid "client_models_application_connection_create"
-msgstr "New Connection"
+msgstr ""
 
 msgid "client_models_application_connection_connecting"
-msgstr "Connecting to %s:%s..."
+msgstr ""
 
 msgid "client_models_application_connection_error"
-msgstr "Error connecting to %s:%s (%s)"
+msgstr ""
 
 
 
 #: client/assets/src/models/channel.js
 msgid "client_models_channel_join"
-msgstr "%s has joined"
+msgstr ""
 
 msgid "client_models_channel_quit"
-msgstr "%s has quit %s"
+msgstr ""
 
 msgid "client_models_channel_kicked"
-msgstr "%s was kicked by %s %s"
+msgstr ""
 
 msgid "client_models_channel_selfkick"
-msgstr "You have been kicked by %s %s"
+msgstr ""
 
 msgid "client_models_channel_part"
-msgstr "%s has left %s"
+msgstr ""
 
 
 
 #: client/assets/src/models/network.js
 msgid "client_models_network_channel_invalid_name"
-msgstr "%s is not a valid channel name"
+msgstr ""
 
 msgid "client_models_network_disconnected"
-msgstr "Disconnected from the IRC network"
+msgstr ""
 
 msgid "client_models_network_nickname_changed"
-msgstr "%s is now known as %s"
+msgstr ""
 
 msgid "client_models_network_topic"
-msgstr "Topic set by %s at %s"
+msgstr ""
 
 msgid "client_models_network_selfmode"
-msgstr "%s sets mode %s"
+msgstr ""
 
 msgid "client_models_network_mode"
-msgstr "%s set mode %s"
+msgstr ""
 
 msgid "client_models_network_channels"
-msgstr "Channels: %s"
+msgstr ""
 
 msgid "client_models_network_server"
-msgstr "Connected to server: %s %s"
+msgstr ""
 
 msgid "client_models_network_idle_and_signon"
-msgstr "Idle for %s, signed on %s"
+msgstr ""
 
 msgid "client_models_network_away"
-msgstr "Away: %s"
+msgstr ""
 
 msgid "client_models_network_idle"
-msgstr "Idle for %s"
+msgstr ""
 
 msgid "client_models_network_nickname_notfound"
-msgstr "No such nick"
+msgstr ""
 
 msgid "client_models_network_banned"
-msgstr "You are banned from %s. %s"
+msgstr ""
 
 msgid "client_models_network_channel_badkey"
-msgstr "Bad channel key for %s"
+msgstr ""
 
 msgid "client_models_network_channel_inviteonly"
-msgstr "%s is invite only."
+msgstr ""
 
 msgid "client_models_network_channel_limitreached"
-msgstr "%s is full."
+msgstr ""
 
 msgid "client_models_network_nickname_alreadyinuse"
-msgstr "The nickname \"%s\" is already in use. Please select a new nickname"
+msgstr ""
 
 msgid "client_models_network_badpassword"
-msgstr "Incorrect password given"
+msgstr ""
 
 
 
 #: client/assets/src/views/application.js
 msgid "client_views_application_close_notice"
-msgstr "This will close all KiwiIRC conversations. Are you sure you want to close this window?"
+msgstr ""
 
 
 
 #: client/assets/src/views/channel.js
 msgid "client_views_channel_joining"
-msgstr "Joining channel.."
+msgstr ""
 
 msgid "client_views_channel_topic"
-msgstr "Topic for %s is: %s"
+msgstr ""
 
 
 
 #: client/assets/src/views/mediamessage.js
 msgid "client_views_mediamessage_close"
-msgstr "Close media"
+msgstr ""
 
 msgid "client_views_mediamessage_notfound"
-msgstr "Not found"
+msgstr ""
 
 msgid "client_views_mediamessage_load_tweet"
-msgstr "Loading tweet"
+msgstr ""
 
 msgid "client_views_mediamessage_load_image"
-msgstr "Loading image"
+msgstr ""
 
 msgid "client_views_mediamessage_load_reddit"
-msgstr "Loading Reddit thread"
+msgstr ""
 
 msgid "client_views_mediamessage_load_gist"
-msgstr "Loading gist"
+msgstr ""
 
 
 
 #: client/assets/src/views/nickchangegbox.js
 msgid "client_views_nickchangebox_new"
-msgstr "New nick"
+msgstr ""
 
 msgid "client_views_nickchangebox_change"
-msgstr "Change"
+msgstr ""
 
 msgid "client_views_nickchangebox_cancel"
-msgstr "Cancel"
+msgstr ""
 
 
 
 #: client/assets/src/views/panel.js
 msgid "client_views_panel_activity"
-msgstr "People are talking!"
+msgstr ""
 
 
 
 #: client/assets/src/views/serverselect.js
 msgid "client_views_serverselect_form_title"
-msgstr "Think of a nickname..."
+msgstr ""
 
 msgid "client_views_serverselect_nickname"
-msgstr "Nickname"
+msgstr ""
 
 msgid "client_views_serverselect_enable_password"
-msgstr "I have a password"
+msgstr ""
 
 msgid "client_views_serverselect_password"
-msgstr "Password"
+msgstr ""
 
 msgid "client_views_serverselect_channel"
-msgstr "Channel"
+msgstr ""
 
 msgid "client_views_serverselect_channelkey"
-msgstr "Channel Key"
+msgstr ""
 
 msgid "client_views_serverselect_channelkey_required"
-msgstr "Channel requires a key"
+msgstr ""
 
 msgid "client_views_serverselect_key"
-msgstr "Key"
+msgstr ""
 
 msgid "client_views_serverselect_connection_start"
-msgstr "Start..."
+msgstr ""
 
 msgid "client_views_serverselect_server_and_network"
-msgstr "Server and network"
+msgstr ""
 
 msgid "client_views_serverselect_server"
-msgstr "Server"
+msgstr ""
 
 msgid "client_views_serverselect_port"
-msgstr "Port"
+msgstr ""
 
 msgid "client_views_serverselect_poweredby"
-msgstr "Powered by Kiwi IRC"
+msgstr ""
 
 msgid "client_views_serverselect_nickname_error_empty"
-msgstr "Select a nickname first!"
+msgstr ""
 
 msgid "client_views_serverselect_connection_successfully"
-msgstr "Connected"
+msgstr ""
 
 msgid "client_views_serverselect_connection_trying"
-msgstr "Connecting.."
+msgstr ""
 
 msgid "client_views_serverselect_nickname_error_alreadyinuse"
-msgstr "Nickname already taken"
+msgstr ""
 
 msgid "client_views_serverselect_nickname_invalid"
-msgstr "Erroneus nickname"
+msgstr ""
 
 msgid "client_views_serverselect_password_incorrect"
-msgstr "Incorrect Password"
+msgstr ""
 
 msgid "client_views_serverselect_connection_error"
-msgstr "Error Connecting"
+msgstr ""
 
 msgid "client_views_serverselect_server_notfound"
-msgstr "Server not found"
+msgstr ""
 
 msgid "client_views_serverselect_connection_refused"
-msgstr "Connection refused"
+msgstr ""
 
 
 
 #: client/assets/src/views/userbox.js
 msgid "client_views_userbox_op"
-msgstr "Op"
+msgstr ""
 
 msgid "client_views_userbox_deop"
-msgstr "De-op"
+msgstr ""
 
 msgid "client_views_userbox_voice"
-msgstr "Voice"
+msgstr ""
 
 msgid "client_views_userbox_devoice"
-msgstr "De-voice"
+msgstr ""
 
 msgid "client_views_userbox_kick"
-msgstr "Kick"
+msgstr ""
 
 msgid "client_views_userbox_ban"
-msgstr "Ban"
+msgstr ""
 
 msgid "client_views_userbox_query"
-msgstr "Message"
+msgstr ""
 
 msgid "client_views_userbox_whois"
-msgstr "Info"
+msgstr ""
 
 msgid "client_views_userbox_slap"
-msgstr "Slap!"
+msgstr ""
diff --git a/server/httphandler.js b/server/httphandler.js
index 16320f2..7a6ca85 100644
--- a/server/httphandler.js
+++ b/server/httphandler.js
@@ -36,8 +36,7 @@ HttpHandler.prototype.serve = function (request, response) {
     }
 
     // If the 'magic' translation is requested, figure out the best language to use from
-    // the Accept-Language HTTP header. If nothing is suitible, serve an empty response,
-    // Kiwi will just use the default en-gb strings baked in to it.
+    // the Accept-Language HTTP header. If nothing is suitible, fallback to our en-gb default translation
     if (request.url.substr(0, 16) === '/assets/locales/') {
         if (request.url === '/assets/locales/magic.json') {
             return serveMagicLocale.call(this, request, response);
@@ -83,18 +82,9 @@ var serveMagicLocale = function (request, response) {
                     return this.file_server.serveFile('/assets/locales/' + langs[i][0] + '.json', 200, {Vary: 'Accept-Language', 'Content-Language': langs[i][0]}, request, response);
                 }
             }
-            serveFallbackLocale(response);
         });
-    } else {
-        serveFallbackLocale(response);
     }
-};
-
-var serveFallbackLocale = function (response) {
-    response.writeHead(200, {
-        'Vary': 'Accept-Language',
-        'Content-Type': 'application/json',
-        'Content-Language': 'en-gb'
-    });
-    response.end('{"en-gb": {"":{}}}');
+    
+    //en-gb is our default language, so we serve this as the last possible answer for everything
+    return this.file_server.serveFile('/assets/locales/en-gb.json', 200, {Vary: 'Accept-Language', 'Content-Language': 'en-gb'}, request, response);
 };
-- 
2.25.1