From fb704fdf878362638f201f6ba9a0cb0db2e22e24 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Sat, 2 Apr 2022 15:55:56 +0200
Subject: [PATCH] Don't import from i18n in headless

---
 src/headless/plugins/bookmarks/collection.js | 3 ++-
 src/headless/plugins/roster/contacts.js      | 3 ++-
 src/headless/plugins/roster/index.js         | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/headless/plugins/bookmarks/collection.js b/src/headless/plugins/bookmarks/collection.js
index 99112b8f5..6883da921 100644
--- a/src/headless/plugins/bookmarks/collection.js
+++ b/src/headless/plugins/bookmarks/collection.js
@@ -1,7 +1,6 @@
 import "@converse/headless/plugins/muc/index.js";
 import Bookmark from './model.js';
 import log from "@converse/headless/log.js";
-import { __ } from 'i18n';
 import { _converse, api, converse } from "@converse/headless/core";
 import { getOpenPromise } from '@converse/openpromise';
 import { initStorage } from '@converse/headless/utils/storage.js';
@@ -86,6 +85,7 @@ const Bookmarks = {
     },
 
     onBookmarkError (iq, options) {
+        const { __ } = _converse;
         log.error("Error while trying to add bookmark");
         log.error(iq);
         api.alert(
@@ -145,6 +145,7 @@ const Bookmarks = {
     },
 
     onBookmarksReceivedError (deferred, iq) {
+        const { __ } = _converse;
         if (iq === null) {
             log.error('Error: timeout while fetching bookmarks');
             api.alert('error', __('Timeout Error'),
diff --git a/src/headless/plugins/roster/contacts.js b/src/headless/plugins/roster/contacts.js
index 3ba9532b9..c6d4e08f5 100644
--- a/src/headless/plugins/roster/contacts.js
+++ b/src/headless/plugins/roster/contacts.js
@@ -3,7 +3,6 @@ import log from "@converse/headless/log";
 import sum from 'lodash-es/sum';
 import { Collection } from "@converse/skeletor/src/collection";
 import { Model } from "@converse/skeletor/src/model";
-import { __ } from 'i18n';
 import { _converse, api, converse } from "@converse/headless/core";
 import { initStorage } from '@converse/headless/utils/storage.js';
 import { rejectPresenceSubscription } from './utils.js';
@@ -163,6 +162,7 @@ const RosterContacts = Collection.extend({
         try {
             await this.sendContactAddIQ(jid, name, groups);
         } catch (e) {
+            const { __ } = _converse;
             log.error(e);
             alert(__('Sorry, there was an error while trying to add %1$s as a contact.', name || jid));
             return e;
@@ -355,6 +355,7 @@ const RosterContacts = Collection.extend({
             contact = this.get(bare_jid);
 
         if (!api.settings.get('allow_contact_requests')) {
+            const { __ } = _converse;
             rejectPresenceSubscription(
                 jid,
                 __("This client does not allow presence subscriptions")
diff --git a/src/headless/plugins/roster/index.js b/src/headless/plugins/roster/index.js
index e7f52343f..d32844dd2 100644
--- a/src/headless/plugins/roster/index.js
+++ b/src/headless/plugins/roster/index.js
@@ -7,7 +7,6 @@ import RosterContact from './contact.js';
 import RosterContacts from './contacts.js';
 import roster_api from './api.js';
 import { Presence, Presences } from './presence.js';
-import { __ } from 'i18n';
 import { _converse, api, converse } from '@converse/headless/core';
 import {
     onChatBoxesInitialized,
@@ -34,6 +33,7 @@ converse.plugins.add('converse-roster', {
         // API methods only available to plugins
         Object.assign(_converse.api, roster_api);
 
+        const { __ } = _converse;
         _converse.HEADER_CURRENT_CONTACTS = __('My contacts');
         _converse.HEADER_PENDING_CONTACTS = __('Pending contacts');
         _converse.HEADER_REQUESTING_CONTACTS = __('Contact requests');