Made en-gb to our default language and use it for fallback; Added it as seperate...

diff --git a/client/assets/src/app.js b/client/assets/src/app.js
index 1dc1a7f9d569d7abccfa540151552f2ffde34b0e..9b6fa45e3730ced271da8eef5fd9e15e59e4b1dd 100644 (file)
--- a/client/assets/src/app.js
+++ b/client/assets/src/app.js
@@ -115,31 +115,27 @@ _kiwi.global = {
         _kiwi.global.settings.load();\r
 \r
         continueStart = function (locale, s, xhr) {\r
-               if (locale) {\r
-                       _kiwi.global.i18n = new Jed({locale_data: locale, domain: xhr.getResponseHeader('Content-Language')});\r
-               } else {\r
-                       _kiwi.global.i18n = new Jed();\r
-               }\r
+          if (locale) {\r
+            _kiwi.global.i18n = new Jed({locale_data: locale, domain: xhr.getResponseHeader('Content-Language')});\r
+          } else {\r
+            _kiwi.global.i18n = new Jed();\r
+          }\r
 \r
-                       _kiwi.app = new _kiwi.model.Application(opts);\r
+          _kiwi.app = new _kiwi.model.Application(opts);\r
 \r
-                       if (opts.kiwi_server) {\r
-                               _kiwi.app.kiwi_server = opts.kiwi_server;\r
-                       }\r
+          if (opts.kiwi_server) {\r
+            _kiwi.app.kiwi_server = opts.kiwi_server;\r
+          }\r
 \r
-                       // Start the client up\r
-                       _kiwi.app.start();\r
+          // Start the client up\r
+          _kiwi.app.start();\r
         };\r
 \r
         locale = _kiwi.global.settings.get('locale')\r
         if (!locale) {\r
                $.getJSON(opts.base_path + '/assets/locales/magic.json', continueStart);\r
         } else {\r
-               if (locale === 'en-gb') {\r
-                       continueStart();\r
-               } else {\r
-                       $.getJSON(opts.base_path + '/assets/locales/' + locale + '.json', continueStart);\r
-               }\r
+               $.getJSON(opts.base_path + '/assets/locales/' + locale + '.json', continueStart);\r
         }\r
        }\r
 };\r

diff --git a/client/assets/src/index.html.tmpl b/client/assets/src/index.html.tmpl
index 7324b0fc84f669cbb4bb43afe72aa661b93e67c6..728edbe91244c33992c86f56db8c632324df40d1 100644 (file)
--- a/client/assets/src/index.html.tmpl
+++ b/client/assets/src/index.html.tmpl
@@ -249,7 +249,6 @@
                 <h6>Language</h6>\r
                 <div class="control-group">\r
                     <select data-setting="locale">\r
-                        <option value="en-gb">English (British)</option>\r
                         <% _.forEach(languages, function(lang) { %>\r
                             <option value="<%= lang.tag %>"><%= lang.language %></li>\r
                         <% }); %>\r

diff --git a/client/assets/src/translations/en-gb.po b/client/assets/src/translations/en-gb.po
new file mode 100755 (executable)
index 0000000..23f3b17
--- /dev/null
+++ b/client/assets/src/translations/en-gb.po
@@ -0,0 +1,358 @@
+\r
+#: client/assets/src/applets/chanlist.js\r
+msgid "client_applets_chanlist_channelname"\r
+msgstr "Channel Name"\r
+\r
+msgid "client_applets_chanlist_users"\r
+msgstr "Users"\r
+\r
+msgid "client_applets_chanlist_topic"\r
+msgstr "Topic"\r
+\r
+msgid "client_applets_chanlist_channellist"\r
+msgstr "Channel List"\r
+\r
+\r
+\r
+#: client/assets/src/applets/scripteditor.js\r
+msgid "client_applets_scripteditor_save"\r
+msgstr "Save"\r
+\r
+msgid "client_applets_scripteditor_error"\r
+msgstr "Script error. %s"\r
+\r
+msgid "client_applets_scripteditor_saved"\r
+msgstr "Your script has been saved and is now active"\r
+\r
+msgid "client_applets_scripteditor_title"\r
+msgstr "Script Editor"\r
+\r
+\r
+\r
+#: client/assets/src/applets/settings.js\r
+msgid "client_applets_settings_channelview_tabs"\r
+msgstr "Tabs"\r
+\r
+msgid "client_applets_settings_channelview_list"\r
+msgstr "List"\r
+\r
+msgid "client_applets_settings_channelview_list_notice"\r
+msgstr "for large amouts of channels"\r
+\r
+msgid "client_applets_settings_notification_joinpart"\r
+msgstr "Join/part channel notifications"\r
+\r
+msgid "client_applets_settings_timestamp"\r
+msgstr "Timestamps"\r
+\r
+msgid "client_applets_settings_notification_sound"\r
+msgstr "Mute sound notifications"\r
+\r
+msgid "client_applets_settings_history_length"\r
+msgstr "messages in scroll history"\r
+\r
+msgid "client_applets_settings_default_client"\r
+msgstr "Default IRC client"\r
+\r
+msgid "client_applets_settings_default_client_enable"\r
+msgstr "Make Kiwi my default IRC client"\r
+\r
+msgid "client_applets_settings_default_client_notice"\r
+msgstr "Note: Chrome or Chromium browser users may need to check their settings via %s if nothing happens"\r
+\r
+msgid "client_applets_settings_title"\r
+msgstr "Settings"\r
+\r
+\r
+\r
+#: client/assets/src/models/applet.js\r
+msgid "client_models_applet_unknown"\r
+msgstr "Unknown Applet"\r
+\r
+msgid "client_models_applet_loading"\r
+msgstr "Loading.."\r
+\r
+msgid "client_models_applet_notfound"\r
+msgstr "Not found"\r
+\r
+\r
+\r
+#: client/assets/src/models/application.js\r
+msgid "client_models_application_reconnecting"\r
+msgstr "You have been disconnected. Attempting to reconnect for you"\r
+\r
+msgid "client_models_application_reconnect_in_x_seconds"\r
+msgstr "You have been disconnected. Attempting to reconnect again in %d seconds"\r
+\r
+msgid "client_models_application_reconnect_successfully"\r
+msgstr "It's OK, you're connected again"\r
+\r
+msgid "client_models_application_settings_saved"\r
+msgstr "Settings have been saved"\r
+\r
+msgid "client_models_application_ignore_title"\r
+msgstr "Ignored nicks"\r
+\r
+msgid "client_models_application_ignore_none"\r
+msgstr "Not ignoring anybody"\r
+\r
+msgid "client_models_application_ignore_nick"\r
+msgstr "Ignoring %s"\r
+\r
+msgid "client_models_application_ignore_stop_notice"\r
+msgstr "Specifiy which nick you wish to stop ignoring"\r
+\r
+msgid "client_models_application_ignore_stopped"\r
+msgstr "Stopped ignoring %s"\r
+\r
+msgid "client_models_application_applet_notfound"\r
+msgstr "Applet \"%s\" does not exist"\r
+\r
+msgid "client_models_application_encoding_changed"\r
+msgstr "Encoding modified to %s"\r
+\r
+msgid "client_models_application_encoding_invalid"\r
+msgstr "%s is not a valid encoding"\r
+\r
+msgid "client_models_application_encoding_notspecified"\r
+msgstr "Encoding not specified"\r
+\r
+msgid "client_models_application_encoding_usage"\r
+msgstr "Usage: /encoding [NEW-ENCODING]"\r
+\r
+msgid "client_models_application_connection_create"\r
+msgstr "New Connection"\r
+\r
+msgid "client_models_application_connection_connecting"\r
+msgstr "Connecting to %s:%s..."\r
+\r
+msgid "client_models_application_connection_error"\r
+msgstr "Error connecting to %s:%s (%s)"\r
+\r
+\r
+\r
+#: client/assets/src/models/channel.js\r
+msgid "client_models_channel_join"\r
+msgstr "%s has joined"\r
+\r
+msgid "client_models_channel_quit"\r
+msgstr "%s has quit %s"\r
+\r
+msgid "client_models_channel_kicked"\r
+msgstr "%s was kicked by %s %s"\r
+\r
+msgid "client_models_channel_selfkick"\r
+msgstr "You have been kicked by %s %s"\r
+\r
+msgid "client_models_channel_part"\r
+msgstr "%s has left %s"\r
+\r
+\r
+\r
+#: client/assets/src/models/network.js\r
+msgid "client_models_network_channel_invalid_name"\r
+msgstr "%s is not a valid channel name"\r
+\r
+msgid "client_models_network_disconnected"\r
+msgstr "Disconnected from the IRC network"\r
+\r
+msgid "client_models_network_nickname_changed"\r
+msgstr "%s is now known as %s"\r
+\r
+msgid "client_models_network_topic"\r
+msgstr "Topic set by %s at %s"\r
+\r
+msgid "client_models_network_selfmode"\r
+msgstr "%s sets mode %s"\r
+\r
+msgid "client_models_network_mode"\r
+msgstr "%s set mode %s"\r
+\r
+msgid "client_models_network_channels"\r
+msgstr "Channels: %s"\r
+\r
+msgid "client_models_network_server"\r
+msgstr "Connected to server: %s %s"\r
+\r
+msgid "client_models_network_idle_and_signon"\r
+msgstr "Idle for %s, signed on %s"\r
+\r
+msgid "client_models_network_away"\r
+msgstr "Away: %s"\r
+\r
+msgid "client_models_network_idle"\r
+msgstr "Idle for %s"\r
+\r
+msgid "client_models_network_nickname_notfound"\r
+msgstr "No such nick"\r
+\r
+msgid "client_models_network_banned"\r
+msgstr "You are banned from %s. %s"\r
+\r
+msgid "client_models_network_channel_badkey"\r
+msgstr "Bad channel key for %s"\r
+\r
+msgid "client_models_network_channel_inviteonly"\r
+msgstr "%s is invite only."\r
+\r
+msgid "client_models_network_channel_limitreached"\r
+msgstr "%s is full."\r
+\r
+msgid "client_models_network_nickname_alreadyinuse"\r
+msgstr "The nickname \"%s\" is already in use. Please select a new nickname"\r
+\r
+msgid "client_models_network_badpassword"\r
+msgstr "Incorrect password given"\r
+\r
+\r
+\r
+#: client/assets/src/views/application.js\r
+msgid "client_views_application_close_notice"\r
+msgstr "This will close all KiwiIRC conversations. Are you sure you want to close this window?"\r
+\r
+\r
+\r
+#: client/assets/src/views/channel.js\r
+msgid "client_views_channel_joining"\r
+msgstr "Joining channel.."\r
+\r
+msgid "client_views_channel_topic"\r
+msgstr "Topic for %s is: %s"\r
+\r
+\r
+\r
+#: client/assets/src/views/mediamessage.js\r
+msgid "client_views_mediamessage_close"\r
+msgstr "Close media"\r
+\r
+msgid "client_views_mediamessage_notfound"\r
+msgstr "Not found"\r
+\r
+msgid "client_views_mediamessage_load_tweet"\r
+msgstr "Loading tweet"\r
+\r
+msgid "client_views_mediamessage_load_image"\r
+msgstr "Loading image"\r
+\r
+msgid "client_views_mediamessage_load_reddit"\r
+msgstr "Loading Reddit thread"\r
+\r
+msgid "client_views_mediamessage_load_gist"\r
+msgstr "Loading gist"\r
+\r
+\r
+\r
+#: client/assets/src/views/nickchangegbox.js\r
+msgid "client_views_nickchangebox_new"\r
+msgstr "New nick"\r
+\r
+msgid "client_views_nickchangebox_change"\r
+msgstr "Change"\r
+\r
+msgid "client_views_nickchangebox_cancel"\r
+msgstr "Cancel"\r
+\r
+\r
+\r
+#: client/assets/src/views/panel.js\r
+msgid "client_views_panel_activity"\r
+msgstr "People are talking!"\r
+\r
+\r
+\r
+#: client/assets/src/views/serverselect.js\r
+msgid "client_views_serverselect_form_title"\r
+msgstr "Think of a nickname..."\r
+\r
+msgid "client_views_serverselect_nickname"\r
+msgstr "Nickname"\r
+\r
+msgid "client_views_serverselect_enable_password"\r
+msgstr "I have a password"\r
+\r
+msgid "client_views_serverselect_password"\r
+msgstr "Password"\r
+\r
+msgid "client_views_serverselect_channel"\r
+msgstr "Channel"\r
+\r
+msgid "client_views_serverselect_channelkey"\r
+msgstr "Channel Key"\r
+\r
+msgid "client_views_serverselect_channelkey_required"\r
+msgstr "Channel requires a key"\r
+\r
+msgid "client_views_serverselect_key"\r
+msgstr "Key"\r
+\r
+msgid "client_views_serverselect_connection_start"\r
+msgstr "Start..."\r
+\r
+msgid "client_views_serverselect_server_and_network"\r
+msgstr "Server and network"\r
+\r
+msgid "client_views_serverselect_server"\r
+msgstr "Server"\r
+\r
+msgid "client_views_serverselect_port"\r
+msgstr "Port"\r
+\r
+msgid "client_views_serverselect_poweredby"\r
+msgstr "Powered by Kiwi IRC"\r
+\r
+msgid "client_views_serverselect_nickname_error_empty"\r
+msgstr "Select a nickname first!"\r
+\r
+msgid "client_views_serverselect_connection_successfully"\r
+msgstr "Connected"\r
+\r
+msgid "client_views_serverselect_connection_trying"\r
+msgstr "Connecting.."\r
+\r
+msgid "client_views_serverselect_nickname_error_alreadyinuse"\r
+msgstr "Nickname already taken"\r
+\r
+msgid "client_views_serverselect_nickname_invalid"\r
+msgstr "Erroneus nickname"\r
+\r
+msgid "client_views_serverselect_password_incorrect"\r
+msgstr "Incorrect Password"\r
+\r
+msgid "client_views_serverselect_connection_error"\r
+msgstr "Error Connecting"\r
+\r
+msgid "client_views_serverselect_server_notfound"\r
+msgstr "Server not found"\r
+\r
+msgid "client_views_serverselect_connection_refused"\r
+msgstr "Connection refused"\r
+\r
+\r
+\r
+#: client/assets/src/views/userbox.js\r
+msgid "client_views_userbox_op"\r
+msgstr "Op"\r
+\r
+msgid "client_views_userbox_deop"\r
+msgstr "De-op"\r
+\r
+msgid "client_views_userbox_voice"\r
+msgstr "Voice"\r
+\r
+msgid "client_views_userbox_devoice"\r
+msgstr "De-voice"\r
+\r
+msgid "client_views_userbox_kick"\r
+msgstr "Kick"\r
+\r
+msgid "client_views_userbox_ban"\r
+msgstr "Ban"\r
+\r
+msgid "client_views_userbox_query"\r
+msgstr "Message"\r
+\r
+msgid "client_views_userbox_whois"\r
+msgstr "Info"\r
+\r
+msgid "client_views_userbox_slap"\r
+msgstr "Slap!"\r

diff --git a/client/assets/src/translations/template.po b/client/assets/src/translations/template.po
index 23f3b17bc27f6cc69f166e3c022b817160f223cd..ccf06c4ac37dde1db2157a385195eb2bd1a782b3 100755 (executable)
--- a/client/assets/src/translations/template.po
+++ b/client/assets/src/translations/template.po
@@ -1,358 +1,358 @@
 \r
 #: client/assets/src/applets/chanlist.js\r
 msgid "client_applets_chanlist_channelname"\r
-msgstr "Channel Name"\r
+msgstr ""\r
 \r
 msgid "client_applets_chanlist_users"\r
-msgstr "Users"\r
+msgstr ""\r
 \r
 msgid "client_applets_chanlist_topic"\r
-msgstr "Topic"\r
+msgstr ""\r
 \r
 msgid "client_applets_chanlist_channellist"\r
-msgstr "Channel List"\r
+msgstr ""\r
 \r
 \r
 \r
 #: client/assets/src/applets/scripteditor.js\r
 msgid "client_applets_scripteditor_save"\r
-msgstr "Save"\r
+msgstr ""\r
 \r
 msgid "client_applets_scripteditor_error"\r
-msgstr "Script error. %s"\r
+msgstr ""\r
 \r
 msgid "client_applets_scripteditor_saved"\r
-msgstr "Your script has been saved and is now active"\r
+msgstr ""\r
 \r
 msgid "client_applets_scripteditor_title"\r
-msgstr "Script Editor"\r
+msgstr ""\r
 \r
 \r
 \r
 #: client/assets/src/applets/settings.js\r
 msgid "client_applets_settings_channelview_tabs"\r
-msgstr "Tabs"\r
+msgstr ""\r
 \r
 msgid "client_applets_settings_channelview_list"\r
-msgstr "List"\r
+msgstr ""\r
 \r
 msgid "client_applets_settings_channelview_list_notice"\r
-msgstr "for large amouts of channels"\r
+msgstr ""\r
 \r
 msgid "client_applets_settings_notification_joinpart"\r
-msgstr "Join/part channel notifications"\r
+msgstr ""\r
 \r
 msgid "client_applets_settings_timestamp"\r
-msgstr "Timestamps"\r
+msgstr ""\r
 \r
 msgid "client_applets_settings_notification_sound"\r
-msgstr "Mute sound notifications"\r
+msgstr ""\r
 \r
 msgid "client_applets_settings_history_length"\r
-msgstr "messages in scroll history"\r
+msgstr ""\r
 \r
 msgid "client_applets_settings_default_client"\r
-msgstr "Default IRC client"\r
+msgstr ""\r
 \r
 msgid "client_applets_settings_default_client_enable"\r
-msgstr "Make Kiwi my default IRC client"\r
+msgstr ""\r
 \r
 msgid "client_applets_settings_default_client_notice"\r
-msgstr "Note: Chrome or Chromium browser users may need to check their settings via %s if nothing happens"\r
+msgstr ""\r
 \r
 msgid "client_applets_settings_title"\r
-msgstr "Settings"\r
+msgstr ""\r
 \r
 \r
 \r
 #: client/assets/src/models/applet.js\r
 msgid "client_models_applet_unknown"\r
-msgstr "Unknown Applet"\r
+msgstr ""\r
 \r
 msgid "client_models_applet_loading"\r
-msgstr "Loading.."\r
+msgstr ""\r
 \r
 msgid "client_models_applet_notfound"\r
-msgstr "Not found"\r
+msgstr ""\r
 \r
 \r
 \r
 #: client/assets/src/models/application.js\r
 msgid "client_models_application_reconnecting"\r
-msgstr "You have been disconnected. Attempting to reconnect for you"\r
+msgstr ""\r
 \r
 msgid "client_models_application_reconnect_in_x_seconds"\r
-msgstr "You have been disconnected. Attempting to reconnect again in %d seconds"\r
+msgstr ""\r
 \r
 msgid "client_models_application_reconnect_successfully"\r
-msgstr "It's OK, you're connected again"\r
+msgstr ""\r
 \r
 msgid "client_models_application_settings_saved"\r
-msgstr "Settings have been saved"\r
+msgstr ""\r
 \r
 msgid "client_models_application_ignore_title"\r
-msgstr "Ignored nicks"\r
+msgstr ""\r
 \r
 msgid "client_models_application_ignore_none"\r
-msgstr "Not ignoring anybody"\r
+msgstr ""\r
 \r
 msgid "client_models_application_ignore_nick"\r
-msgstr "Ignoring %s"\r
+msgstr ""\r
 \r
 msgid "client_models_application_ignore_stop_notice"\r
-msgstr "Specifiy which nick you wish to stop ignoring"\r
+msgstr ""\r
 \r
 msgid "client_models_application_ignore_stopped"\r
-msgstr "Stopped ignoring %s"\r
+msgstr ""\r
 \r
 msgid "client_models_application_applet_notfound"\r
-msgstr "Applet \"%s\" does not exist"\r
+msgstr ""\r
 \r
 msgid "client_models_application_encoding_changed"\r
-msgstr "Encoding modified to %s"\r
+msgstr ""\r
 \r
 msgid "client_models_application_encoding_invalid"\r
-msgstr "%s is not a valid encoding"\r
+msgstr ""\r
 \r
 msgid "client_models_application_encoding_notspecified"\r
-msgstr "Encoding not specified"\r
+msgstr ""\r
 \r
 msgid "client_models_application_encoding_usage"\r
-msgstr "Usage: /encoding [NEW-ENCODING]"\r
+msgstr ""\r
 \r
 msgid "client_models_application_connection_create"\r
-msgstr "New Connection"\r
+msgstr ""\r
 \r
 msgid "client_models_application_connection_connecting"\r
-msgstr "Connecting to %s:%s..."\r
+msgstr ""\r
 \r
 msgid "client_models_application_connection_error"\r
-msgstr "Error connecting to %s:%s (%s)"\r
+msgstr ""\r
 \r
 \r
 \r
 #: client/assets/src/models/channel.js\r
 msgid "client_models_channel_join"\r
-msgstr "%s has joined"\r
+msgstr ""\r
 \r
 msgid "client_models_channel_quit"\r
-msgstr "%s has quit %s"\r
+msgstr ""\r
 \r
 msgid "client_models_channel_kicked"\r
-msgstr "%s was kicked by %s %s"\r
+msgstr ""\r
 \r
 msgid "client_models_channel_selfkick"\r
-msgstr "You have been kicked by %s %s"\r
+msgstr ""\r
 \r
 msgid "client_models_channel_part"\r
-msgstr "%s has left %s"\r
+msgstr ""\r
 \r
 \r
 \r
 #: client/assets/src/models/network.js\r
 msgid "client_models_network_channel_invalid_name"\r
-msgstr "%s is not a valid channel name"\r
+msgstr ""\r
 \r
 msgid "client_models_network_disconnected"\r
-msgstr "Disconnected from the IRC network"\r
+msgstr ""\r
 \r
 msgid "client_models_network_nickname_changed"\r
-msgstr "%s is now known as %s"\r
+msgstr ""\r
 \r
 msgid "client_models_network_topic"\r
-msgstr "Topic set by %s at %s"\r
+msgstr ""\r
 \r
 msgid "client_models_network_selfmode"\r
-msgstr "%s sets mode %s"\r
+msgstr ""\r
 \r
 msgid "client_models_network_mode"\r
-msgstr "%s set mode %s"\r
+msgstr ""\r
 \r
 msgid "client_models_network_channels"\r
-msgstr "Channels: %s"\r
+msgstr ""\r
 \r
 msgid "client_models_network_server"\r
-msgstr "Connected to server: %s %s"\r
+msgstr ""\r
 \r
 msgid "client_models_network_idle_and_signon"\r
-msgstr "Idle for %s, signed on %s"\r
+msgstr ""\r
 \r
 msgid "client_models_network_away"\r
-msgstr "Away: %s"\r
+msgstr ""\r
 \r
 msgid "client_models_network_idle"\r
-msgstr "Idle for %s"\r
+msgstr ""\r
 \r
 msgid "client_models_network_nickname_notfound"\r
-msgstr "No such nick"\r
+msgstr ""\r
 \r
 msgid "client_models_network_banned"\r
-msgstr "You are banned from %s. %s"\r
+msgstr ""\r
 \r
 msgid "client_models_network_channel_badkey"\r
-msgstr "Bad channel key for %s"\r
+msgstr ""\r
 \r
 msgid "client_models_network_channel_inviteonly"\r
-msgstr "%s is invite only."\r
+msgstr ""\r
 \r
 msgid "client_models_network_channel_limitreached"\r
-msgstr "%s is full."\r
+msgstr ""\r
 \r
 msgid "client_models_network_nickname_alreadyinuse"\r
-msgstr "The nickname \"%s\" is already in use. Please select a new nickname"\r
+msgstr ""\r
 \r
 msgid "client_models_network_badpassword"\r
-msgstr "Incorrect password given"\r
+msgstr ""\r
 \r
 \r
 \r
 #: client/assets/src/views/application.js\r
 msgid "client_views_application_close_notice"\r
-msgstr "This will close all KiwiIRC conversations. Are you sure you want to close this window?"\r
+msgstr ""\r
 \r
 \r
 \r
 #: client/assets/src/views/channel.js\r
 msgid "client_views_channel_joining"\r
-msgstr "Joining channel.."\r
+msgstr ""\r
 \r
 msgid "client_views_channel_topic"\r
-msgstr "Topic for %s is: %s"\r
+msgstr ""\r
 \r
 \r
 \r
 #: client/assets/src/views/mediamessage.js\r
 msgid "client_views_mediamessage_close"\r
-msgstr "Close media"\r
+msgstr ""\r
 \r
 msgid "client_views_mediamessage_notfound"\r
-msgstr "Not found"\r
+msgstr ""\r
 \r
 msgid "client_views_mediamessage_load_tweet"\r
-msgstr "Loading tweet"\r
+msgstr ""\r
 \r
 msgid "client_views_mediamessage_load_image"\r
-msgstr "Loading image"\r
+msgstr ""\r
 \r
 msgid "client_views_mediamessage_load_reddit"\r
-msgstr "Loading Reddit thread"\r
+msgstr ""\r
 \r
 msgid "client_views_mediamessage_load_gist"\r
-msgstr "Loading gist"\r
+msgstr ""\r
 \r
 \r
 \r
 #: client/assets/src/views/nickchangegbox.js\r
 msgid "client_views_nickchangebox_new"\r
-msgstr "New nick"\r
+msgstr ""\r
 \r
 msgid "client_views_nickchangebox_change"\r
-msgstr "Change"\r
+msgstr ""\r
 \r
 msgid "client_views_nickchangebox_cancel"\r
-msgstr "Cancel"\r
+msgstr ""\r
 \r
 \r
 \r
 #: client/assets/src/views/panel.js\r
 msgid "client_views_panel_activity"\r
-msgstr "People are talking!"\r
+msgstr ""\r
 \r
 \r
 \r
 #: client/assets/src/views/serverselect.js\r
 msgid "client_views_serverselect_form_title"\r
-msgstr "Think of a nickname..."\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_nickname"\r
-msgstr "Nickname"\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_enable_password"\r
-msgstr "I have a password"\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_password"\r
-msgstr "Password"\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_channel"\r
-msgstr "Channel"\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_channelkey"\r
-msgstr "Channel Key"\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_channelkey_required"\r
-msgstr "Channel requires a key"\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_key"\r
-msgstr "Key"\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_connection_start"\r
-msgstr "Start..."\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_server_and_network"\r
-msgstr "Server and network"\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_server"\r
-msgstr "Server"\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_port"\r
-msgstr "Port"\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_poweredby"\r
-msgstr "Powered by Kiwi IRC"\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_nickname_error_empty"\r
-msgstr "Select a nickname first!"\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_connection_successfully"\r
-msgstr "Connected"\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_connection_trying"\r
-msgstr "Connecting.."\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_nickname_error_alreadyinuse"\r
-msgstr "Nickname already taken"\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_nickname_invalid"\r
-msgstr "Erroneus nickname"\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_password_incorrect"\r
-msgstr "Incorrect Password"\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_connection_error"\r
-msgstr "Error Connecting"\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_server_notfound"\r
-msgstr "Server not found"\r
+msgstr ""\r
 \r
 msgid "client_views_serverselect_connection_refused"\r
-msgstr "Connection refused"\r
+msgstr ""\r
 \r
 \r
 \r
 #: client/assets/src/views/userbox.js\r
 msgid "client_views_userbox_op"\r
-msgstr "Op"\r
+msgstr ""\r
 \r
 msgid "client_views_userbox_deop"\r
-msgstr "De-op"\r
+msgstr ""\r
 \r
 msgid "client_views_userbox_voice"\r
-msgstr "Voice"\r
+msgstr ""\r
 \r
 msgid "client_views_userbox_devoice"\r
-msgstr "De-voice"\r
+msgstr ""\r
 \r
 msgid "client_views_userbox_kick"\r
-msgstr "Kick"\r
+msgstr ""\r
 \r
 msgid "client_views_userbox_ban"\r
-msgstr "Ban"\r
+msgstr ""\r
 \r
 msgid "client_views_userbox_query"\r
-msgstr "Message"\r
+msgstr ""\r
 \r
 msgid "client_views_userbox_whois"\r
-msgstr "Info"\r
+msgstr ""\r
 \r
 msgid "client_views_userbox_slap"\r
-msgstr "Slap!"\r
+msgstr ""\r

diff --git a/server/httphandler.js b/server/httphandler.js
index 16320f25ad0c8f7e5a2b7a0bac0679752fd228f4..7a6ca85b3dd05b2437b4feed3e936ee9336b91ed 100644 (file)
--- 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);
 };