Merge branch 'i18n' into development

[KiwiIRC.git] / client / assets / src / models / application.js

diff --git a/client/assets/src/models/application.js b/client/assets/src/models/application.js
index c2bf0fea4201650d6abdd2ee1da202c6adc9b69f..2f4c2d9c735c01d73a670cfea6ea678d3a721713 100644 (file)
--- a/client/assets/src/models/application.js
+++ b/client/assets/src/models/application.js
@@ -25,6 +25,7 @@ _kiwi.model.Application = function () {
 \r
             // Any options sent down from the server\r
             this.server_settings = options[0].server_settings || {};\r
+            this.translations = options[0].translations || {};\r
 \r
             // Best guess at where the kiwi server is\r
             this.detectKiwiServer();\r
@@ -352,7 +353,7 @@ _kiwi.model.Application = function () {
                 var gw_stat = 0;\r
 \r
                 gw.on('disconnect', function (event) {\r
-                    var msg = 'You have been disconnected. Attempting to reconnect for you..';\r
+                    var msg = _kiwi.global.i18n.translate('You have been disconnected. Attempting to reconnect for you').fetch() + '...';\r
                     that.message.text(msg, {timeout: 10000});\r
 \r
                     that.view.$el.removeClass('connected');\r
@@ -374,7 +375,7 @@ _kiwi.model.Application = function () {
 \r
 \r
                 gw.on('reconnecting', function (event) {\r
-                    var msg = 'You have been disconnected. Attempting to reconnect again in ' + (event.delay/1000) + ' seconds..';\r
+                    var msg = _kiwi.global.i18n.translate('You have been disconnected. Attempting to reconnect again in %d seconds').fetch(event.delay/1000) + '...';\r
 \r
                     // Only need to mention the repeating re-connection messages on server panels\r
                     _kiwi.app.connections.forEach(function(connection) {\r
@@ -387,7 +388,7 @@ _kiwi.model.Application = function () {
                     that.view.$el.addClass('connected');\r
                     if (gw_stat !== 1) return;\r
 \r
-                    var msg = 'It\'s OK, you\'re connected again :)';\r
+                    var msg = _kiwi.global.i18n.translate('It\'s OK, you\'re connected again').fetch() + ':)';\r
                     that.message.text(msg, {timeout: 5000});\r
 \r
                     // Mention the disconnection on every channel\r
@@ -521,7 +522,7 @@ _kiwi.model.Application = function () {
 \r
             controlbox.on('command:save', function (ev) {\r
                 _kiwi.global.settings.save();\r
-                _kiwi.app.panels().active.addMsg('', 'Settings have been saved');\r
+                _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('Settings have been saved').fetch());\r
             });\r
 \r
 \r
@@ -563,12 +564,12 @@ _kiwi.model.Application = function () {
                 // No parameters passed so list them\r
                 if (!ev.params[0]) {\r
                     if (list.length > 0) {\r
-                        _kiwi.app.panels().active.addMsg(' ', 'Ignored nicks:');\r
+                        _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('Ignored nicks').fetch() + ':');\r
                         $.each(list, function (idx, ignored_pattern) {\r
                             _kiwi.app.panels().active.addMsg(' ', ignored_pattern);\r
                         });\r
                     } else {\r
-                        _kiwi.app.panels().active.addMsg(' ', 'Not ignoring anybody');\r
+                        _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('Not ignoring anybody').fetch());\r
                     }\r
                     return;\r
                 }\r
@@ -576,7 +577,7 @@ _kiwi.model.Application = function () {
                 // We have a parameter, so add it\r
                 list.push(ev.params[0]);\r
                 _kiwi.gateway.set('ignore_list', list);\r
-                _kiwi.app.panels().active.addMsg(' ', 'Ignoring ' + ev.params[0]);\r
+                _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('Ignoring %s').fetch(ev.params[0]));\r
             });\r
 \r
 \r
@@ -584,7 +585,7 @@ _kiwi.model.Application = function () {
                 var list = _kiwi.gateway.get('ignore_list');\r
 \r
                 if (!ev.params[0]) {\r
-                    _kiwi.app.panels().active.addMsg(' ', 'Specifiy which nick you wish to stop ignoring');\r
+                    _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('Specifiy which nick you wish to stop ignoring').fetch());\r
                     return;\r
                 }\r
 \r
@@ -594,7 +595,7 @@ _kiwi.model.Application = function () {
 \r
                 _kiwi.gateway.set('ignore_list', list);\r
 \r
-                _kiwi.app.panels().active.addMsg(' ', 'Stopped ignoring ' + ev.params[0]);\r
+                _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('Stopped ignoring %s').fetch(ev.params[0]));\r
             });\r
 \r
 \r
@@ -764,7 +765,7 @@ _kiwi.model.Application = function () {
                 if (_kiwi.applets[ev.params[0]]) {\r
                     panel.load(new _kiwi.applets[ev.params[0]]());\r
                 } else {\r
-                    _kiwi.app.panels().server.addMsg('', 'Applet "' + ev.params[0] + '" does not exist');\r
+                    _kiwi.app.panels().server.addMsg('', _kiwi.global.i18n.translate('Applet "%s" does not exist').fetch(ev.params[0]));\r
                     return;\r
                 }\r
             }\r
@@ -805,14 +806,14 @@ _kiwi.model.Application = function () {
             if (ev.params[0]) {\r
                 _kiwi.gateway.setEncoding(null, ev.params[0], function (success) {\r
                     if (success) {\r
-                        _kiwi.app.panels().active.addMsg('', "Encoding modified to "+ev.params[0]);\r
+                        _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('Encoding modified to %s').fetch(ev.params[0]));\r
                     } else {\r
-                        _kiwi.app.panels().active.addMsg('', ev.params[0]+' is not a valid encoding');\r
+                        _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('%s is not a valid encoding').fetch(ev.params[0]));\r
                     }\r
                 });\r
             } else {\r
-                _kiwi.app.panels().active.addMsg('', 'Encoding not specified');\r
-                _kiwi.app.panels().active.addMsg('', 'Usage: /encoding [NEW-ENCODING]');\r
+                _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('Encoding not specified').fetch());\r
+                _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('Usage: /encoding [NEW-ENCODING]').fetch());\r
             }\r
         }\r
 \r
@@ -822,7 +823,7 @@ _kiwi.model.Application = function () {
 \r
             // If no server address given, show the new connection dialog\r
             if (!ev.params[0]) {\r
-                tmp = new _kiwi.view.MenuBox('New Connection');\r
+                tmp = new _kiwi.view.MenuBox(_kiwi.global.i18n.translate('New Connection').fetch());\r
                 tmp.addItem('new_connection', new _kiwi.model.NewConnection().view.$el);\r
                 tmp.show();\r
 \r
@@ -865,7 +866,7 @@ _kiwi.model.Application = function () {
             // Use the same nick as we currently have\r
             nick = _kiwi.app.connections.active_connection.get('nick');\r
 \r
-            _kiwi.app.panels().active.addMsg('', 'Connecting to ' + server + ':' + port.toString() + '..');\r
+            _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('Connecting to %s:%s...').fetch(server, port.toString()));\r
 \r
             _kiwi.gateway.newConnection({\r
                 nick: nick,\r
@@ -875,7 +876,7 @@ _kiwi.model.Application = function () {
                 password: password\r
             }, function(err, new_connection) {\r
                 if (err)\r
-                    _kiwi.app.panels().active.addMsg('', 'Error connecting to ' + server + ':' + port.toString() + ' (' + err.toString() + ')');\r
+                    _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('Error connecting to %s:%s (%s)').fetch(server, port.toString(), err.toString()));\r
             });\r
         }\r
 \r