From 38dfc7b65b0451bd419a098f71c1b9080ee7b7fb Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Fri, 2 Mar 2018 16:30:00 +0100
Subject: [PATCH] Hook in turkish as locale, update changelog.

---
 CHANGES.md                | 7 +++++--
 src/converse-bookmarks.js | 4 ++--
 src/i18n.js               | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8493b115d..239beeaf1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,11 +2,9 @@
 
 ## 3.3.4 (Unreleased)
 
-- Avoid `eval` (via `_.template` from lodash).
 - Don't show bookmark toggles when PEP bookmarking not supported by the XMPP server.
 - Emojis are now sent in unicode instead of short names (also in MUCs)
 
-
 ### Bugfixes
 
 - Avatars weren't being shown.
@@ -14,6 +12,11 @@
 - #1024 null reference on MUC Invite
 - #1025 OTR lock icon disappears
 - #1027 `new Event` not supported in IE11
+- #1028 Avoid `eval` (crept in via `_.template` from lodash).
+
+### Translation changes
+
+- Updated German, Bulgarian, Russian, Chinese (traditional), Norwegian Bokmål and French translations.
 
 ## 3.3.3 (2018-02-14)
 
diff --git a/src/converse-bookmarks.js b/src/converse-bookmarks.js
index 57c09348d..c381134c1 100644
--- a/src/converse-bookmarks.js
+++ b/src/converse-bookmarks.js
@@ -536,8 +536,8 @@
                         _converse.api.disco.supports(Strophe.NS.PUBSUB+'#publish-options', _converse.bare_jid)
                     ]).then((args) => {
                         resolve(args[0] && (args[1].supported || _converse.allow_public_bookmarks));
-                    });
-                });
+                    }).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
+                }).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
             }
 
             const initBookmarks = function () {
diff --git a/src/i18n.js b/src/i18n.js
index ea556ec58..981d8b99d 100644
--- a/src/i18n.js
+++ b/src/i18n.js
@@ -29,6 +29,7 @@
         'moment/locale/pl',
         'moment/locale/pt-br',
         'moment/locale/ru',
+        'moment/locale/tr',
         'moment/locale/uk',
         'moment/locale/zh-cn',
         'moment/locale/zh-tw'