Merge branch '0.6.x'

Conflicts:
	index.html

CHANGES.rst

@@ -4,7 +4,8 @@ Changelog
 0.6.6 (2013-10-08)
 ------------------
 
-* Bugfix: Presence stanza sent out before roster has been initialized [jcbrand]
+* Bugfix: Presence stanza must be sent out after roster has been initialized [jcbrand]
+* Dutch translation [maartenkling]
 
 0.6.5 (2013-10-08)
 ------------------

converse.js

@@ -153,6 +153,7 @@
         // Module-level variables
         // ----------------------
         this.callback = callback || function () {};
+        this.initial_presence_sent = 0;
         this.msg_counter = 0;
 
         // Module-level functions
@@ -253,11 +254,6 @@
                 converse.giveFeedback(__('Authentication Failed'), 'error');
             } else if (status === Strophe.Status.DISCONNECTING) {
                 converse.giveFeedback(__('Disconnecting'), 'error');
-                converse.connection.connect(
-                    converse.connection.jid,
-                    converse.connection.pass,
-                    converse.onConnect
-                );
             } else if (status === Strophe.Status.ATTACHED) {
                 converse.log('Attached');
                 converse.onConnected();
@@ -2569,17 +2565,6 @@
             },
 
             rosterHandler: function (items) {
-                if ((items.length === 0) || (items.length === _.where(items, {subscription:'none'}).length)) {
-                    // The presence stanza is sent out once all
-                    // roster contacts have been added and rendered.
-                    // See RosterView's render method.
-                    //
-                    // If there aren't any roster contacts, we still
-                    // want to send a presence stanza, so we do it here.
-                    converse.xmppstatus.sendPresence();
-                    return true;
-                }
-
                 this.cleanCache(items);
                 _.each(items, function (item, index, items) {
                     if (this.isSelf(item.jid)) { return; }
@@ -2606,6 +2591,17 @@
                         }
                     }
                 }, this);
+
+                if (!converse.initial_presence_sent) {
+                    /* Once we've sent out our initial presence stanza, we'll
+                     * start receiving presence stanzas from our contacts.
+                     * We therefore only want to do this after our roster has
+                     * been set up (otherwise we can't meaningfully process
+                     * incoming presence stanzas).
+                     */
+                    converse.initial_presence_sent = 1;
+                    converse.xmppstatus.sendPresence();
+                }
             },
 
             handleIncomingSubscription: function (jid) {
@@ -2833,7 +2829,6 @@
                             // can show the roster.
                             this.$el.show();
                         }
-                        converse.xmppstatus.sendPresence();
                     }
                 }
                 // Hide the headings if there are no contacts under them

index.html

@@ -54,7 +54,7 @@
         <li>Custom status messages</li>
         <li>Typing notifications</li>
         <li>Third person messages (/me )</li>
-        <li>Translated into multiple languages  (af, de, es, fr, it, hu, pt-BR, ru)</li>
+        <li>Translated into multiple languages  (af, de, es, fr, hu, it, nl, pt-BR, ru)</li>
         <li>Off-the-record encryption (via <a href="http://arlolra.github.io/otr/" target="_blank">OTR.js</a>)</li>
     </ul>
 

locale/locales.js

@@ -16,6 +16,7 @@
             "fr": "locale/fr/LC_MESSAGES/fr",
             "hu": "locale/hu/LC_MESSAGES/hu",
             "it": "locale/it/LC_MESSAGES/it",
+            "nl": "locale/nl/LC_MESSAGES/nl",
             "pt_BR": "locale/pt_BR/LC_MESSAGES/pt_BR",
             "ru": "locale/ru/LC_MESSAGES/ru"
         }
@@ -30,9 +31,10 @@
         'fr',
         'hu',
         'it',
+        'nl',
         'pt_BR',
         'ru'
-        ], function (jed, af, de, en, es, fr, hu, it, pt_BR, ru) {
+        ], function (jed, af, de, en, es, fr, hu, it, nl, pt_BR, ru) {
             root.locales = {
                 'af': af,
                 'de': de,
@@ -41,6 +43,7 @@
                 'fr': fr,
                 'hu': hu,
                 'it': it,
+                'nl': nl,
                 'pt-br': pt_BR,
                 'ru': ru
             };