Move tapi18n t and isRtl functions from ui to utils (#13005)

* Move t, isRtl from rocektchat-ui to rocketchat-utils

* Change imports t and isRtl from ui to utils

.eslintrc

@@ -30,7 +30,6 @@
 		"globals"                     : true,
 		"isChrome"                    : false,
 		"isFirefox"                   : false,
-		"isRtl"                       : false,
 		"JitsiMeetExternalAPI"        : false,
 		"jscolor"                     : false,
 		"KonchatNotification"         : false,
@@ -56,7 +55,6 @@
 		"Settings"                    : false,
 		"SideNav"                     : false,
 		"TAPi18next"                  : false,
-		"t"                           : false,
 		"toolbarSearch"               : false,
 		"TwitterConnect"              : false,
 		"updateAvatarOfUsername"      : false,

.meteor/packages

@@ -200,3 +200,4 @@ rocketchat:bigbluebutton
 rocketchat:mailmessages
 juliancwirko:postcss
 littledata:synced-cron
+rocketchat:utils

.meteor/versions

@@ -250,6 +250,7 @@ rocketchat:ui-message@0.1.0
 rocketchat:ui-sidenav@0.1.0
 rocketchat:ui-vrecord@0.0.1
 rocketchat:user-data-download@1.0.0
+rocketchat:utils@0.0.1
 rocketchat:version@1.0.0
 rocketchat:version-check@0.0.1
 rocketchat:videobridge@0.2.0

client/methods/updateMessage.js

@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { TimeSync } from 'meteor/mizzao:timesync';
+import { t } from 'meteor/rocketchat:utils';
 import _ from 'underscore';
 import moment from 'moment';
 import toastr from 'toastr';

client/startup/i18n.js

@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 import { TAPi18n } from 'meteor/tap:i18n';
-import { isRtl } from 'meteor/rocketchat:ui';
+import { isRtl } from 'meteor/rocketchat:utils';
 import moment from 'moment';
 
 const currentLanguage = new ReactiveVar();

imports/message-read-receipt/client/room.js

@@ -1,3 +1,5 @@
+import { t } from 'meteor/rocketchat:utils';
+
 RocketChat.MessageAction.addButton({
 	id: 'receipt-detail',
 	icon: 'info-circled',

imports/personal-access-tokens/client/personalAccessTokens.js

@@ -3,6 +3,7 @@ import { Mongo } from 'meteor/mongo';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 import { Template } from 'meteor/templating';
+import { t } from 'meteor/rocketchat:utils';
 import toastr from 'toastr';
 import moment from 'moment';
 

packages/chatpal-search/client/route.js

@@ -1,6 +1,6 @@
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 
 FlowRouter.route('/admin/chatpal', {
 	name: 'chatpal-admin',

packages/chatpal-search/package.js

@@ -9,6 +9,7 @@ Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
 		'templating',
+		'rocketchat:utils',
 	]);
 	api.addAssets([
 		'server/asset/chatpal-enter.svg',

packages/rocketchat-2fa/client/TOTPPassword.js

@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
-import { t, modal } from 'meteor/rocketchat:ui';
+import { modal } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import toastr from 'toastr';
 
 function reportError(error, callback) {

packages/rocketchat-2fa/client/accountSecurity.js

@@ -1,8 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { t, modal } from 'meteor/rocketchat:ui';
+import { modal } from 'meteor/rocketchat:ui';
 import { RocketChat } from 'meteor/rocketchat:lib';
+import { t } from 'meteor/rocketchat:utils';
 import toastr from 'toastr';
 import qrcode from 'yaqrcode';
 

packages/rocketchat-2fa/package.js

@@ -15,6 +15,7 @@ Package.onUse(function(api) {
 		'sha',
 		'random',
 		'rocketchat:ui',
+		'rocketchat:utils',
 	]);
 
 	api.mainModule('client/index.js', 'client');

packages/rocketchat-apps/client/admin/apps.js

@@ -2,8 +2,9 @@ import toastr from 'toastr';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-
+import { t } from 'meteor/rocketchat:utils';
 import { AppEvents } from '../communication';
+
 const ENABLED_STATUS = ['auto_enabled', 'manually_enabled'];
 const HOST = 'https://marketplace.rocket.chat';
 const enabled = ({ status }) => ENABLED_STATUS.includes(status);

packages/rocketchat-apps/package.js

@@ -8,6 +8,7 @@ Package.onUse(function(api) {
 		'ecmascript',
 		'rocketchat:lib',
 		'rocketchat:api',
+		'rocketchat:utils',
 		'templating',
 	]);
 

packages/rocketchat-authorization/client/route.js

@@ -1,6 +1,6 @@
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 
 FlowRouter.route('/admin/permissions', {
 	name: 'admin-permissions',

packages/rocketchat-authorization/client/views/permissionsRole.js

@@ -2,7 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { t, modal } from 'meteor/rocketchat:ui';
+import { modal } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { RocketChat, handleError } from 'meteor/rocketchat:lib';
 
 import toastr from 'toastr';

packages/rocketchat-authorization/package.js

@@ -11,6 +11,7 @@ Package.onUse(function(api) {
 		'ecmascript',
 		'rocketchat:lib',
 		'mongo',
+		'rocketchat:utils',
 	]);
 	api.use([
 		'templating',

packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.js

@@ -3,7 +3,8 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Random } from 'meteor/random';
 import { Template } from 'meteor/templating';
 import { RocketChat } from 'meteor/rocketchat:lib';
-import { ChatSubscription, t } from 'meteor/rocketchat:ui';
+import { ChatSubscription } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import _ from 'underscore';
 import toastr from 'toastr';
 

packages/rocketchat-autotranslate/package.js

@@ -11,6 +11,7 @@ Package.onUse(function(api) {
 		'ddp-rate-limiter',
 		'rocketchat:lib',
 		'templating',
+		'rocketchat:utils',
 	]);
 	api.addFiles('client/stylesheets/autotranslate.css', 'client');
 	api.mainModule('client/index.js', 'client');

packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js

@@ -5,7 +5,8 @@ import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { AutoComplete } from 'meteor/mizzao:autocomplete';
 import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { t, ChatRoom } from 'meteor/rocketchat:ui';
+import { ChatRoom } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { Deps } from 'meteor/deps';
 import toastr from 'toastr';
 import resetSelection from '../resetSelection';

packages/rocketchat-channel-settings-mail-messages/package.js

@@ -15,6 +15,7 @@ Package.onUse(function(api) {
 		'rocketchat:channel-settings',
 		'mizzao:autocomplete',
 		'mongo',
+		'rocketchat:utils',
 	]);
 	api.mainModule('client/index.js', 'client');
 	api.mainModule('server/index.js', 'server');

packages/rocketchat-channel-settings/client/startup/messageTypes.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { RocketChat } from 'meteor/rocketchat:lib';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import s from 'underscore.string';
 
 Meteor.startup(function() {

packages/rocketchat-channel-settings/client/views/channelSettings.js

@@ -2,12 +2,12 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
-import { popover } from 'meteor/rocketchat:ui';
 import toastr from 'toastr';
 import moment from 'moment';
 import s from 'underscore.string';
 import { call, erase, hide, leave, RocketChat, RoomSettingsEnum } from 'meteor/rocketchat:lib';
-import { modal, t, ChatRoom } from 'meteor/rocketchat:ui';
+import { modal, ChatRoom, popover } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 
 const common = {
 	canLeaveRoom() {

packages/rocketchat-channel-settings/package.js

@@ -13,6 +13,7 @@ Package.onUse(function(api) {
 		'templating',
 		'rocketchat:lib',
 		'rocketchat:ui',
+		'rocketchat:utils',
 	]);
 	api.addFiles('client/stylesheets/channel-settings.css', 'client');
 	api.mainModule('client/index.js', 'client');

packages/rocketchat-custom-sounds/client/admin/soundEdit.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { handleError } from 'meteor/rocketchat:lib';
 import toastr from 'toastr';
 import s from 'underscore.string';

packages/rocketchat-custom-sounds/client/admin/soundInfo.js

@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { t, modal } from 'meteor/rocketchat:ui';
+import { modal } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { handleError } from 'meteor/rocketchat:lib';
 
 Template.soundInfo.helpers({

packages/rocketchat-custom-sounds/package.js

@@ -10,6 +10,7 @@ Package.onUse(function(api) {
 		'ecmascript',
 		'rocketchat:file',
 		'rocketchat:lib',
+		'rocketchat:utils',
 		'templating',
 		'reactive-var',
 		'webapp',

packages/rocketchat-e2e/client/accountEncryption.js

@@ -1,9 +1,9 @@
-
 import { Template } from 'meteor/templating';
 import { ReactiveVar } from 'meteor/reactive-var';
 import toastr from 'toastr';
 import s from 'underscore.string';
 import { RocketChat } from 'meteor/rocketchat:lib';
+import { t } from 'meteor/rocketchat:utils';
 import { e2e } from 'meteor/rocketchat:e2e';
 
 Template.accountEncryption.helpers({

packages/rocketchat-e2e/package.js

@@ -11,6 +11,7 @@ Package.onUse(function(api) {
 		'less',
 		'mizzao:timesync',
 		'rocketchat:lib',
+		'rocketchat:utils',
 		'templating',
 		'sha',
 	]);

packages/rocketchat-emoji-custom/client/admin/emojiEdit.js

@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { handleError } from 'meteor/rocketchat:lib';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import toastr from 'toastr';
 import s from 'underscore.string';
 

packages/rocketchat-emoji-custom/client/admin/emojiInfo.js

@@ -2,7 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
 import { handleError } from 'meteor/rocketchat:lib';
-import { t, modal } from 'meteor/rocketchat:ui';
+import { modal } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 
 Template.emojiInfo.helpers({
 	name() {

packages/rocketchat-emoji-custom/package.js

@@ -11,6 +11,7 @@ Package.onUse(function(api) {
 		'rocketchat:emoji',
 		'rocketchat:file',
 		'rocketchat:lib',
+		'rocketchat:utils',
 		'templating',
 		'webapp',
 		'kadira:flow-router',

packages/rocketchat-grant/package.js

@@ -11,6 +11,7 @@ Package.onUse(function(api) {
 		'mongo',
 		'check',
 		'ecmascript',
+		'rocketchat:utils',
 		'rocketchat:lib',
 		'rocketchat:accounts',
 		'rocketchat:ui',

packages/rocketchat-grant/server/authenticate.js

@@ -4,7 +4,7 @@ import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
 import { GrantError } from './error';
 import Providers from './providers';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 
 const setAvatarFromUrl = (userId, url) => new Promise((resolve, reject) => {
 	Meteor.runAsUser(userId, () => {

packages/rocketchat-importer/client/admin/adminImport.js

@@ -4,7 +4,7 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 
 Template.adminImport.helpers({
 	isAdmin() {

packages/rocketchat-importer/client/admin/adminImportPrepare.js

@@ -4,7 +4,7 @@ import { Importers } from 'meteor/rocketchat:importer';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import toastr from 'toastr';
 
 Template.adminImportPrepare.helpers({

packages/rocketchat-importer/client/admin/adminImportProgress.js

@@ -3,7 +3,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Importers, ImporterWebsocketReceiver, ProgressStep } from 'meteor/rocketchat:importer';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { handleError } from 'meteor/rocketchat:lib';
 import toastr from 'toastr';
 

packages/rocketchat-importer/package.js

@@ -10,6 +10,7 @@ Package.onUse(function(api) {
 		'ecmascript',
 		'templating',
 		'check',
+		'rocketchat:utils',
 		'rocketchat:lib',
 		'rocketchat:logger',
 	]);

packages/rocketchat-integrations/client/route.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 
 FlowRouter.route('/admin/integrations', {
 	name: 'admin-integrations',

packages/rocketchat-integrations/client/views/integrationsIncoming.js

@@ -5,7 +5,8 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { t, modal } from 'meteor/rocketchat:ui';
+import { modal } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { ChatIntegrations } from '../collections';
 import hljs from 'highlight.js';
 import toastr from 'toastr';

packages/rocketchat-integrations/client/views/integrationsOutgoing.js

@@ -5,7 +5,8 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { t, modal } from 'meteor/rocketchat:ui';
+import { modal } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { ChatIntegrations } from '../collections';
 import hljs from 'highlight.js';
 import toastr from 'toastr';

packages/rocketchat-integrations/package.js

@@ -15,6 +15,7 @@ Package.onUse(function(api) {
 		'rocketchat:authorization',
 		'rocketchat:theme',
 		'rocketchat:logger',
+		'rocketchat:utils',
 		'kadira:flow-router',
 		'kadira:blaze-layout',
 		'nimble:restivus',

packages/rocketchat-irc/package.js

@@ -9,6 +9,7 @@ Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
 		'underscore',
+		'rocketchat:utils',
 		'rocketchat:lib',
 		'rocketchat:ui',
 	]);

packages/rocketchat-irc/server/methods/resetIrcConnection.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { RocketChat } from 'meteor/rocketchat:lib';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import Bridge from '../irc-bridge';
 
 Meteor.methods({

packages/rocketchat-lib/client/MessageAction.js

@@ -3,6 +3,7 @@ import { TAPi18n } from 'meteor/tap:i18n';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 import { Session } from 'meteor/session';
+import { t } from 'meteor/rocketchat:utils';
 import _ from 'underscore';
 import moment from 'moment';
 import toastr from 'toastr';

packages/rocketchat-lib/client/lib/ChannelActions.js

@@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { call, UiTextContext } from 'meteor/rocketchat:lib';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
+import { t } from 'meteor/rocketchat:utils';
 
 export function hide(type, rid, name) {
 	const warnText = RocketChat.roomTypes.roomTypes[type].getUiText(UiTextContext.HIDE_WARNING);

packages/rocketchat-lib/client/lib/settings.js

@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { ReactiveDict } from 'meteor/reactive-dict';
+import { t } from 'meteor/rocketchat:utils';
 
 /*
 * RocketChat.settings holds all packages settings

packages/rocketchat-lib/package.js

@@ -24,6 +24,7 @@ Package.onUse(function(api) {
 	api.use('matb33:collection-hooks');
 	api.use('service-configuration');
 	api.use('check');
+	api.use('rocketchat:utils');
 	api.use('rocketchat:accounts');
 	api.use('modules');
 	api.use('rocketchat:i18n');

packages/rocketchat-livechat/.app/.eslintrc

@@ -13,6 +13,7 @@
 		"LivechatPageVisited"         : false,
 		"LivechatTrigger"             : false,
 		"parentCall"                  : false,
+		"t"                           : false,
 		"Trigger"                     : false,
 		"Triggers"                    : false,
 		"visitor"                     : false

packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js

@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { t, modal } from 'meteor/rocketchat:ui';
+import { modal } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { handleError } from 'meteor/rocketchat:lib';
 
 Template.livechatIntegrationFacebook.helpers({

packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.js

@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { t, modal } from 'meteor/rocketchat:ui';
+import { modal } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { handleError } from 'meteor/rocketchat:lib';
 import { LivechatIntegration } from '../../../collections/LivechatIntegration';
 import _ from 'underscore';

packages/rocketchat-livechat/client/views/app/livechatAppearance.js

@@ -4,7 +4,7 @@ import { Mongo } from 'meteor/mongo';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Random } from 'meteor/random';
 import { Template } from 'meteor/templating';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { handleError } from 'meteor/rocketchat:lib';
 import s from 'underscore.string';
 import moment from 'moment';

packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js

@@ -3,7 +3,8 @@ import { Mongo } from 'meteor/mongo';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { t, modal } from 'meteor/rocketchat:ui';
+import { modal } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { handleError } from 'meteor/rocketchat:lib';
 import { AgentUsers } from '../../collections/AgentUsers';
 import _ from 'underscore';

packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js

@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { handleError } from 'meteor/rocketchat:lib';
 import { LivechatCustomField } from '../../collections/LivechatCustomField';
 import toastr from 'toastr';

packages/rocketchat-livechat/client/views/app/livechatCustomFields.js

@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { t, modal } from 'meteor/rocketchat:ui';
+import { modal } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { handleError } from 'meteor/rocketchat:lib';
 import { LivechatCustomField } from '../../collections/LivechatCustomField';
 

packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js

@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { handleError } from 'meteor/rocketchat:lib';
 import { AgentUsers } from '../../collections/AgentUsers';
 import { LivechatDepartment } from '../../collections/LivechatDepartment';

packages/rocketchat-livechat/client/views/app/livechatDepartments.js

@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { t, modal } from 'meteor/rocketchat:ui';
+import { modal } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { handleError } from 'meteor/rocketchat:lib';
 import { LivechatDepartment } from '../../collections/LivechatDepartment';
 

packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js

@@ -3,7 +3,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { LivechatOfficeHour } from '../../collections/livechatOfficeHour';
 import toastr from 'toastr';
 import moment from 'moment';

packages/rocketchat-livechat/client/views/app/livechatTriggers.js

@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { t, modal } from 'meteor/rocketchat:ui';
+import { modal } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { handleError } from 'meteor/rocketchat:lib';
 import { LivechatTrigger } from '../../collections/LivechatTrigger';
 

packages/rocketchat-livechat/client/views/app/livechatTriggersForm.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { handleError } from 'meteor/rocketchat:lib';
 import { LivechatTrigger } from '../../collections/LivechatTrigger';
 import toastr from 'toastr';

packages/rocketchat-livechat/client/views/app/livechatUsers.js

@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { Mongo } from 'meteor/mongo';
 import { Template } from 'meteor/templating';
-import { t, modal } from 'meteor/rocketchat:ui';
+import { modal } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { handleError } from 'meteor/rocketchat:lib';
 import { AgentUsers } from '../../collections/AgentUsers';
 import _ from 'underscore';

packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js

@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { t, ChatRoom } from 'meteor/rocketchat:ui';
+import { ChatRoom } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { LivechatVisitor } from '../../../collections/LivechatVisitor';
 import toastr from 'toastr';
 

packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js

@@ -2,7 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { t, ChatRoom } from 'meteor/rocketchat:ui';
+import { ChatRoom } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { LivechatDepartment } from '../../../collections/LivechatDepartment';
 import { AgentUsers } from '../../../collections/AgentUsers';
 import toastr from 'toastr';

packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js

@@ -4,7 +4,8 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { t, modal, ChatRoom } from 'meteor/rocketchat:ui';
+import { modal, ChatRoom } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { LivechatVisitor } from '../../../collections/LivechatVisitor';
 import _ from 'underscore';
 import s from 'underscore.string';

packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.js

@@ -1,6 +1,7 @@
 import { Mongo } from 'meteor/mongo';
 import { Template } from 'meteor/templating';
-import { t, ChatRoom } from 'meteor/rocketchat:ui';
+import { ChatRoom } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import moment from 'moment';
 
 const visitorNavigationHistory = new Mongo.Collection('visitor_navigation_history');

packages/rocketchat-livechat/client/views/sideNav/livechat.js

@@ -4,7 +4,8 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { t, modal, ChatSubscription, KonchatNotification } from 'meteor/rocketchat:ui';
+import { modal, ChatSubscription, KonchatNotification } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { LivechatInquiry } from '../../../lib/LivechatInquiry';
 
 Template.livechat.helpers({

packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js

@@ -1,6 +1,7 @@
 import { Template } from 'meteor/templating';
 import { RocketChat } from 'meteor/rocketchat:lib';
-import { t, SideNav } from 'meteor/rocketchat:ui';
+import { SideNav } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 
 Template.livechatFlex.helpers({
 	menuItem(name, icon, section) {

packages/rocketchat-livechat/package.js

@@ -25,6 +25,7 @@ Package.onUse(function(api) {
 		'ecmascript',
 		'webapp',
 		'autoupdate',
+		'rocketchat:utils',
 		'rocketchat:lib',
 		'rocketchat:authorization',
 		'rocketchat:logger',

packages/rocketchat-livestream/client/views/liveStreamTab.js

@@ -7,7 +7,8 @@ import { TAPi18n } from 'meteor/tap:i18n';
 import toastr from 'toastr';
 import { auth } from '../oauth.js';
 import { RocketChatAnnouncement, RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { popout, t } from 'meteor/rocketchat:ui';
+import { popout } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 
 export const call = (...args) => new Promise(function(resolve, reject) {
 	Meteor.call(...args, function(err, result) {

packages/rocketchat-livestream/package.js

@@ -8,6 +8,7 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
+		'rocketchat:utils',
 		'rocketchat:lib',
 		'rocketchat:ui',
 		'templating',

packages/rocketchat-logger/client/viewLogs.js

@@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { Mongo } from 'meteor/mongo';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
+import { t } from 'meteor/rocketchat:utils';
 
 export const stdout = new Mongo.Collection('stdout');
 

packages/rocketchat-logger/package.js

@@ -13,6 +13,7 @@ Package.onUse(function(api) {
 		'nooitaf:colors',
 		'raix:eventemitter',
 		'templating',
+		'rocketchat:utils',
 		'kadira:flow-router',
 		'kadira:blaze-layout',
 	]);

packages/rocketchat-message-snippet/client/actionButton.js

@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { modal, t } from 'meteor/rocketchat:ui';
+import { modal } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 
 Meteor.startup(function() {
 	RocketChat.MessageAction.addButton({

packages/rocketchat-message-snippet/package.js

@@ -9,6 +9,7 @@ Package.onUse(function(api) {
 	api.use([
 		'mongo',
 		'ecmascript',
+		'rocketchat:utils',
 		'rocketchat:lib',
 		'rocketchat:file',
 		'rocketchat:markdown',

packages/rocketchat-oauth2-server-config/client/admin/route.js

@@ -1,6 +1,6 @@
 import { FlowRouter } from 'meteor/kadira:flow-router' ;
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 
 FlowRouter.route('/admin/oauth-apps', {
 	name: 'admin-oauth-apps',

packages/rocketchat-oauth2-server-config/client/admin/views/oauthApp.js

@@ -4,7 +4,8 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { t, modal } from 'meteor/rocketchat:ui';
+import { modal } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { ChatOAuthApps } from '../collection';
 import toastr from 'toastr';
 

packages/rocketchat-oauth2-server-config/package.js

@@ -9,6 +9,7 @@ Package.onUse(function(api) {
 		'ecmascript',
 		'webapp',
 		'mongo',
+		'rocketchat:utils',
 		'rocketchat:lib',
 		'rocketchat:api',
 		'rocketchat:theme',

packages/rocketchat-otr/client/rocketchat.otr.js

@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 import { RocketChat } from 'meteor/rocketchat:lib';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 
 class OTR {
 	constructor() {

packages/rocketchat-otr/package.js

@@ -8,6 +8,7 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
+		'rocketchat:utils',
 		'rocketchat:lib',
 		'tracker',
 		'reactive-var',

packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js

@@ -3,7 +3,8 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { t, ChatSubscription, popover } from 'meteor/rocketchat:ui';
+import { ChatSubscription, popover } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 
 const notificationLabels = {
 	all: 'All_messages',

packages/rocketchat-push-notifications/package.js

@@ -8,6 +8,7 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
+		'rocketchat:utils',
 		'rocketchat:lib',
 		'templating',
 	]);

packages/rocketchat-setup-wizard/client/setupWizard.js

@@ -6,7 +6,7 @@ import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import toastr from 'toastr';
 
 const cannotSetup = () => {

packages/rocketchat-setup-wizard/package.js

@@ -9,6 +9,7 @@ Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
 		'templating',
+		'rocketchat:utils',
 		'rocketchat:theme',
 	]);
 	api.mainModule('client/index.js', 'client');

packages/rocketchat-tokenpass/client/tokenpassChannelSettings.js

@@ -3,7 +3,8 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { handleError } from 'meteor/rocketchat:lib';
-import { t, ChatRoom } from 'meteor/rocketchat:ui';
+import { ChatRoom } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import toastr from 'toastr';
 
 Template.channelSettings__tokenpass.helpers({

packages/rocketchat-tokenpass/package.js

@@ -12,6 +12,7 @@ Package.onUse(function(api) {
 		'service-configuration',
 		'templating',
 		'littledata:synced-cron',
+		'rocketchat:utils',
 		'rocketchat:lib',
 		'rocketchat:authorization',
 		'rocketchat:custom-oauth',

packages/rocketchat-ui-account/client/accountFlex.js

@@ -1,6 +1,7 @@
 import { Template } from 'meteor/templating';
 import { RocketChat } from 'meteor/rocketchat:lib';
-import { t, SideNav } from 'meteor/rocketchat:ui';
+import { SideNav } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 
 Template.accountFlex.events({
 	'click [data-action="close"]'() {

packages/rocketchat-ui-account/client/accountIntegrations.js

@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
 import { RocketChat } from 'meteor/rocketchat:lib';
-import { t, modal } from 'meteor/rocketchat:ui';
+import { modal } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import toastr from 'toastr';
 
 Template.accountIntegrations.helpers({

packages/rocketchat-ui-account/client/accountPreferences.js

@@ -5,7 +5,8 @@ import { Reload } from 'meteor/reload';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { t, modal, SideNav, KonchatNotification } from 'meteor/rocketchat:ui';
+import { modal, SideNav, KonchatNotification } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';

packages/rocketchat-ui-account/client/accountProfile.js

@@ -5,7 +5,8 @@ import { Tracker } from 'meteor/tracker';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { t, modal, SideNav } from 'meteor/rocketchat:ui';
+import { modal, SideNav } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';

packages/rocketchat-ui-account/client/avatar/prompt.js

@@ -4,7 +4,8 @@ import { Tracker } from 'meteor/tracker';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { RocketChat } from 'meteor/rocketchat:lib';
-import { t, SideNav } from 'meteor/rocketchat:ui';
+import { SideNav } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { fileUploadHandler } from 'meteor/rocketchat:file-upload';
 import s from 'underscore.string';
 import toastr from 'toastr';

packages/rocketchat-ui-account/package.js

@@ -16,6 +16,7 @@ Package.onUse(function(api) {
 		'templating',
 		'rocketchat:lib',
 		'sha',
+		'rocketchat:utils',
 		'rocketchat:lazy-load',
 	]);
 	api.mainModule('client/index.js', 'client');

packages/rocketchat-ui-admin/client/admin.js

@@ -7,7 +7,8 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { SideNav, t, modal } from 'meteor/rocketchat:ui';
+import { SideNav, modal } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';

packages/rocketchat-ui-admin/client/adminFlex.js

@@ -2,7 +2,8 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { RocketChat } from 'meteor/rocketchat:lib';
-import { SideNav, t } from 'meteor/rocketchat:ui';
+import { SideNav } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import _ from 'underscore';
 import s from 'underscore.string';
 

packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.js

@@ -4,7 +4,8 @@ import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { t, modal } from 'meteor/rocketchat:ui';
+import { modal } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { AdminChatRoom } from './adminRooms';
 import toastr from 'toastr';
 

packages/rocketchat-ui-admin/client/rooms/adminRooms.js

@@ -5,7 +5,8 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
-import { SideNav, t } from 'meteor/rocketchat:ui';
+import { SideNav } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { RocketChat, RocketChatTabBar } from 'meteor/rocketchat:lib';
 import _ from 'underscore';
 import s from 'underscore.string';

packages/rocketchat-ui-admin/client/rooms/channelSettingsDefault.js

@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { handleError } from 'meteor/rocketchat:lib';
 import { AdminChatRoom } from './adminRooms';
 import toastr from 'toastr';

packages/rocketchat-ui-admin/client/users/adminInviteUser.js

@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
 import { RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { t } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import _ from 'underscore';
 import toastr from 'toastr';
 

packages/rocketchat-ui-admin/package.js

@@ -15,6 +15,7 @@ Package.onUse(function(api) {
 		'mongo',
 		'ecmascript',
 		'templating',
+		'rocketchat:utils',
 		'rocketchat:lib',
 	]);
 	api.mainModule('client/index.js', 'client');

packages/rocketchat-ui-clean-history/client/views/cleanHistory.js

@@ -4,7 +4,8 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { AutoComplete } from 'meteor/mizzao:autocomplete';
-import { t, ChatRoom, modal } from 'meteor/rocketchat:ui';
+import { ChatRoom, modal } from 'meteor/rocketchat:ui';
+import { t } from 'meteor/rocketchat:utils';
 import { RocketChat, call } from 'meteor/rocketchat:lib';
 import moment from 'moment';
 

packages/rocketchat-ui-clean-history/package.js

@@ -15,6 +15,7 @@ Package.onUse(function(api) {
 		'mongo',
 		'ecmascript',
 		'templating',
+		'rocketchat:utils',
 		'rocketchat:lib',
 	]);
 	api.addFiles('client/views/stylesheets/cleanHistory.css', 'client');