diff --git a/.eslintrc b/.eslintrc index 7ee543533e74..c9d00b203b12 100644 --- a/.eslintrc +++ b/.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, diff --git a/.meteor/packages b/.meteor/packages index 6131d799c7db..b77a8aa4096c 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -200,3 +200,4 @@ rocketchat:bigbluebutton rocketchat:mailmessages juliancwirko:postcss littledata:synced-cron +rocketchat:utils \ No newline at end of file diff --git a/.meteor/versions b/.meteor/versions index 203746025451..447e1583da9c 100644 --- a/.meteor/versions +++ b/.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 diff --git a/client/methods/updateMessage.js b/client/methods/updateMessage.js index ddcdae14c49d..c329ad762afa 100644 --- a/client/methods/updateMessage.js +++ b/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'; diff --git a/client/startup/i18n.js b/client/startup/i18n.js index 242e06f6b0c1..d2f01ec88207 100644 --- a/client/startup/i18n.js +++ b/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(); diff --git a/imports/message-read-receipt/client/room.js b/imports/message-read-receipt/client/room.js index 89f61ccab43a..4a28ed022b02 100644 --- a/imports/message-read-receipt/client/room.js +++ b/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', diff --git a/imports/personal-access-tokens/client/personalAccessTokens.js b/imports/personal-access-tokens/client/personalAccessTokens.js index 98260fe5ef81..1a5841d555bd 100644 --- a/imports/personal-access-tokens/client/personalAccessTokens.js +++ b/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'; diff --git a/packages/chatpal-search/client/route.js b/packages/chatpal-search/client/route.js index 42361a139674..3fb6072366b6 100644 --- a/packages/chatpal-search/client/route.js +++ b/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', diff --git a/packages/chatpal-search/package.js b/packages/chatpal-search/package.js index 987a519f53c3..06f5fe53821a 100644 --- a/packages/chatpal-search/package.js +++ b/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', diff --git a/packages/rocketchat-2fa/client/TOTPPassword.js b/packages/rocketchat-2fa/client/TOTPPassword.js index 12018bca2d7d..7bb15b1fa738 100644 --- a/packages/rocketchat-2fa/client/TOTPPassword.js +++ b/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) { diff --git a/packages/rocketchat-2fa/client/accountSecurity.js b/packages/rocketchat-2fa/client/accountSecurity.js index 76d1da0ca290..b99fb2fc3e49 100644 --- a/packages/rocketchat-2fa/client/accountSecurity.js +++ b/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'; diff --git a/packages/rocketchat-2fa/package.js b/packages/rocketchat-2fa/package.js index 5f5d3e2dc013..71f3cf76599f 100644 --- a/packages/rocketchat-2fa/package.js +++ b/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'); diff --git a/packages/rocketchat-apps/client/admin/apps.js b/packages/rocketchat-apps/client/admin/apps.js index d89aad367b92..a12d2a77db9d 100644 --- a/packages/rocketchat-apps/client/admin/apps.js +++ b/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); diff --git a/packages/rocketchat-apps/package.js b/packages/rocketchat-apps/package.js index ce67fc50d3a7..82f2f351214c 100644 --- a/packages/rocketchat-apps/package.js +++ b/packages/rocketchat-apps/package.js @@ -8,6 +8,7 @@ Package.onUse(function(api) { 'ecmascript', 'rocketchat:lib', 'rocketchat:api', + 'rocketchat:utils', 'templating', ]); diff --git a/packages/rocketchat-authorization/client/route.js b/packages/rocketchat-authorization/client/route.js index b13310db167f..8e9805ac1583 100644 --- a/packages/rocketchat-authorization/client/route.js +++ b/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', diff --git a/packages/rocketchat-authorization/client/views/permissionsRole.js b/packages/rocketchat-authorization/client/views/permissionsRole.js index 779b29b74d8b..6b92f463bdba 100644 --- a/packages/rocketchat-authorization/client/views/permissionsRole.js +++ b/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'; diff --git a/packages/rocketchat-authorization/package.js b/packages/rocketchat-authorization/package.js index 87fad95e2311..2aab4bc7e2e0 100644 --- a/packages/rocketchat-authorization/package.js +++ b/packages/rocketchat-authorization/package.js @@ -11,6 +11,7 @@ Package.onUse(function(api) { 'ecmascript', 'rocketchat:lib', 'mongo', + 'rocketchat:utils', ]); api.use([ 'templating', diff --git a/packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.js b/packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.js index f30e2253c263..4ffcc9cae97c 100644 --- a/packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.js +++ b/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'; diff --git a/packages/rocketchat-autotranslate/package.js b/packages/rocketchat-autotranslate/package.js index 49c42dcc3a55..45a9beeeb0a7 100644 --- a/packages/rocketchat-autotranslate/package.js +++ b/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'); diff --git a/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js b/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js index 1e8dd5ff2ff2..83ae7802056d 100644 --- a/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js +++ b/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'; diff --git a/packages/rocketchat-channel-settings-mail-messages/package.js b/packages/rocketchat-channel-settings-mail-messages/package.js index 946ffd68a559..efd2f3c6e2b8 100644 --- a/packages/rocketchat-channel-settings-mail-messages/package.js +++ b/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'); diff --git a/packages/rocketchat-channel-settings/client/startup/messageTypes.js b/packages/rocketchat-channel-settings/client/startup/messageTypes.js index 5f38103ab24d..1fe5f21590ed 100644 --- a/packages/rocketchat-channel-settings/client/startup/messageTypes.js +++ b/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() { diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.js b/packages/rocketchat-channel-settings/client/views/channelSettings.js index 09c868db0ccd..7afff0bf10ad 100644 --- a/packages/rocketchat-channel-settings/client/views/channelSettings.js +++ b/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() { diff --git a/packages/rocketchat-channel-settings/package.js b/packages/rocketchat-channel-settings/package.js index 3ce10ab02904..80bc0b90d365 100644 --- a/packages/rocketchat-channel-settings/package.js +++ b/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'); diff --git a/packages/rocketchat-custom-sounds/client/admin/soundEdit.js b/packages/rocketchat-custom-sounds/client/admin/soundEdit.js index 65594d0d0a2b..4caa4cb55235 100644 --- a/packages/rocketchat-custom-sounds/client/admin/soundEdit.js +++ b/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'; diff --git a/packages/rocketchat-custom-sounds/client/admin/soundInfo.js b/packages/rocketchat-custom-sounds/client/admin/soundInfo.js index db3853e0b74e..9a22be4b34b2 100644 --- a/packages/rocketchat-custom-sounds/client/admin/soundInfo.js +++ b/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({ diff --git a/packages/rocketchat-custom-sounds/package.js b/packages/rocketchat-custom-sounds/package.js index dc9e37d5d4d1..79d876e0e230 100644 --- a/packages/rocketchat-custom-sounds/package.js +++ b/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', diff --git a/packages/rocketchat-e2e/client/accountEncryption.js b/packages/rocketchat-e2e/client/accountEncryption.js index 4b25397a90af..77a927bba701 100644 --- a/packages/rocketchat-e2e/client/accountEncryption.js +++ b/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({ diff --git a/packages/rocketchat-e2e/package.js b/packages/rocketchat-e2e/package.js index 2626854b6ddd..bb189c659e59 100644 --- a/packages/rocketchat-e2e/package.js +++ b/packages/rocketchat-e2e/package.js @@ -11,6 +11,7 @@ Package.onUse(function(api) { 'less', 'mizzao:timesync', 'rocketchat:lib', + 'rocketchat:utils', 'templating', 'sha', ]); diff --git a/packages/rocketchat-emoji-custom/client/admin/emojiEdit.js b/packages/rocketchat-emoji-custom/client/admin/emojiEdit.js index 0509ab70713e..b318029e4dd6 100644 --- a/packages/rocketchat-emoji-custom/client/admin/emojiEdit.js +++ b/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'; diff --git a/packages/rocketchat-emoji-custom/client/admin/emojiInfo.js b/packages/rocketchat-emoji-custom/client/admin/emojiInfo.js index 17c35f3ad577..3fb81a237eeb 100644 --- a/packages/rocketchat-emoji-custom/client/admin/emojiInfo.js +++ b/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() { diff --git a/packages/rocketchat-emoji-custom/package.js b/packages/rocketchat-emoji-custom/package.js index 775afc1bcec2..87f122eb2bc3 100644 --- a/packages/rocketchat-emoji-custom/package.js +++ b/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', diff --git a/packages/rocketchat-grant/package.js b/packages/rocketchat-grant/package.js index ad577eeb7dbd..6438b3cf5072 100644 --- a/packages/rocketchat-grant/package.js +++ b/packages/rocketchat-grant/package.js @@ -11,6 +11,7 @@ Package.onUse(function(api) { 'mongo', 'check', 'ecmascript', + 'rocketchat:utils', 'rocketchat:lib', 'rocketchat:accounts', 'rocketchat:ui', diff --git a/packages/rocketchat-grant/server/authenticate.js b/packages/rocketchat-grant/server/authenticate.js index 838e70408e32..077065114836 100644 --- a/packages/rocketchat-grant/server/authenticate.js +++ b/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, () => { diff --git a/packages/rocketchat-importer/client/admin/adminImport.js b/packages/rocketchat-importer/client/admin/adminImport.js index 095a08f9fc88..826fc35c4e24 100644 --- a/packages/rocketchat-importer/client/admin/adminImport.js +++ b/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() { diff --git a/packages/rocketchat-importer/client/admin/adminImportPrepare.js b/packages/rocketchat-importer/client/admin/adminImportPrepare.js index 2b093e01e524..dabd3234703f 100644 --- a/packages/rocketchat-importer/client/admin/adminImportPrepare.js +++ b/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({ diff --git a/packages/rocketchat-importer/client/admin/adminImportProgress.js b/packages/rocketchat-importer/client/admin/adminImportProgress.js index 49ad9c6071c4..4c18ca511268 100644 --- a/packages/rocketchat-importer/client/admin/adminImportProgress.js +++ b/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'; diff --git a/packages/rocketchat-importer/package.js b/packages/rocketchat-importer/package.js index f0126dc24e77..421165b9c12e 100644 --- a/packages/rocketchat-importer/package.js +++ b/packages/rocketchat-importer/package.js @@ -10,6 +10,7 @@ Package.onUse(function(api) { 'ecmascript', 'templating', 'check', + 'rocketchat:utils', 'rocketchat:lib', 'rocketchat:logger', ]); diff --git a/packages/rocketchat-integrations/client/route.js b/packages/rocketchat-integrations/client/route.js index 52677171fc35..831f6b384384 100644 --- a/packages/rocketchat-integrations/client/route.js +++ b/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', diff --git a/packages/rocketchat-integrations/client/views/integrationsIncoming.js b/packages/rocketchat-integrations/client/views/integrationsIncoming.js index 811e32f5c4a9..4311aa8ba70c 100644 --- a/packages/rocketchat-integrations/client/views/integrationsIncoming.js +++ b/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'; diff --git a/packages/rocketchat-integrations/client/views/integrationsOutgoing.js b/packages/rocketchat-integrations/client/views/integrationsOutgoing.js index f3c4a2004860..3d83d762bc68 100644 --- a/packages/rocketchat-integrations/client/views/integrationsOutgoing.js +++ b/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'; diff --git a/packages/rocketchat-integrations/package.js b/packages/rocketchat-integrations/package.js index ff6f91617268..43f897cb8e47 100644 --- a/packages/rocketchat-integrations/package.js +++ b/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', diff --git a/packages/rocketchat-irc/package.js b/packages/rocketchat-irc/package.js index e0ee2af46bd9..13dc5a9f73b7 100644 --- a/packages/rocketchat-irc/package.js +++ b/packages/rocketchat-irc/package.js @@ -9,6 +9,7 @@ Package.onUse(function(api) { api.use([ 'ecmascript', 'underscore', + 'rocketchat:utils', 'rocketchat:lib', 'rocketchat:ui', ]); diff --git a/packages/rocketchat-irc/server/methods/resetIrcConnection.js b/packages/rocketchat-irc/server/methods/resetIrcConnection.js index 0c8891679263..39e85122d949 100644 --- a/packages/rocketchat-irc/server/methods/resetIrcConnection.js +++ b/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({ diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js index 92257e842cce..e898821a4951 100644 --- a/packages/rocketchat-lib/client/MessageAction.js +++ b/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'; diff --git a/packages/rocketchat-lib/client/lib/ChannelActions.js b/packages/rocketchat-lib/client/lib/ChannelActions.js index 4f2bbfd11383..bbd791a2a8cf 100644 --- a/packages/rocketchat-lib/client/lib/ChannelActions.js +++ b/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); diff --git a/packages/rocketchat-lib/client/lib/settings.js b/packages/rocketchat-lib/client/lib/settings.js index 07697e94bb10..cbf735772ad8 100644 --- a/packages/rocketchat-lib/client/lib/settings.js +++ b/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 diff --git a/packages/rocketchat-lib/package.js b/packages/rocketchat-lib/package.js index ec59039597b8..d055661ffbbc 100644 --- a/packages/rocketchat-lib/package.js +++ b/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'); diff --git a/packages/rocketchat-livechat/.app/.eslintrc b/packages/rocketchat-livechat/.app/.eslintrc index e82af1014185..8a444e628832 100644 --- a/packages/rocketchat-livechat/.app/.eslintrc +++ b/packages/rocketchat-livechat/.app/.eslintrc @@ -13,6 +13,7 @@ "LivechatPageVisited" : false, "LivechatTrigger" : false, "parentCall" : false, + "t" : false, "Trigger" : false, "Triggers" : false, "visitor" : false diff --git a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js b/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js index 5233e6eb9ae0..02f8bb49185f 100644 --- a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js +++ b/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({ diff --git a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.js b/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.js index cff44d09ff2f..6ea1d11215d0 100644 --- a/packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationWebhook.js +++ b/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'; diff --git a/packages/rocketchat-livechat/client/views/app/livechatAppearance.js b/packages/rocketchat-livechat/client/views/app/livechatAppearance.js index 1a6356db4e37..d7fab05cbca1 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatAppearance.js +++ b/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'; diff --git a/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js b/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js index b646e7e6faba..8babe75a5e56 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatCurrentChats.js +++ b/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'; diff --git a/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js b/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js index 67cfff7ab6e7..3fa98254e364 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js +++ b/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'; diff --git a/packages/rocketchat-livechat/client/views/app/livechatCustomFields.js b/packages/rocketchat-livechat/client/views/app/livechatCustomFields.js index 051372182afa..24648b63d880 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatCustomFields.js +++ b/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'; diff --git a/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js b/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js index c7b7e80d6457..1ecfeddd6966 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js +++ b/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'; diff --git a/packages/rocketchat-livechat/client/views/app/livechatDepartments.js b/packages/rocketchat-livechat/client/views/app/livechatDepartments.js index 0dfc26f7e966..c5a4c3ec883d 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatDepartments.js +++ b/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'; diff --git a/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js b/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js index cbec7d80d221..842143026123 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js +++ b/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'; diff --git a/packages/rocketchat-livechat/client/views/app/livechatTriggers.js b/packages/rocketchat-livechat/client/views/app/livechatTriggers.js index b6e27ee4ac7d..20886228a6bc 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatTriggers.js +++ b/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'; diff --git a/packages/rocketchat-livechat/client/views/app/livechatTriggersForm.js b/packages/rocketchat-livechat/client/views/app/livechatTriggersForm.js index 8ed4cc8e0ceb..5955bd3d8a9a 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatTriggersForm.js +++ b/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'; diff --git a/packages/rocketchat-livechat/client/views/app/livechatUsers.js b/packages/rocketchat-livechat/client/views/app/livechatUsers.js index 96e81d17693c..8e58dd89d114 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatUsers.js +++ b/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'; diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js index a02f661a34b7..139c1b549c91 100644 --- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js +++ b/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'; diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js index 75d27be5195c..3f89ecb1d2d7 100644 --- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js +++ b/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'; diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js index d6b3b78fefd3..c5ce132cd467 100644 --- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js +++ b/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'; diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.js index 64ee781f2ca5..c5007719fec5 100644 --- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.js +++ b/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'); diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechat.js b/packages/rocketchat-livechat/client/views/sideNav/livechat.js index 5c8aa5f6af24..074bc84bbc56 100644 --- a/packages/rocketchat-livechat/client/views/sideNav/livechat.js +++ b/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({ diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js b/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js index aee3a515ea3b..ea3c15a62d04 100644 --- a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.js +++ b/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) { diff --git a/packages/rocketchat-livechat/package.js b/packages/rocketchat-livechat/package.js index 1a080a72b46a..631b29132e3c 100644 --- a/packages/rocketchat-livechat/package.js +++ b/packages/rocketchat-livechat/package.js @@ -25,6 +25,7 @@ Package.onUse(function(api) { 'ecmascript', 'webapp', 'autoupdate', + 'rocketchat:utils', 'rocketchat:lib', 'rocketchat:authorization', 'rocketchat:logger', diff --git a/packages/rocketchat-livestream/client/views/liveStreamTab.js b/packages/rocketchat-livestream/client/views/liveStreamTab.js index ebd843664b08..647d80c877b8 100644 --- a/packages/rocketchat-livestream/client/views/liveStreamTab.js +++ b/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) { diff --git a/packages/rocketchat-livestream/package.js b/packages/rocketchat-livestream/package.js index e8fcf830f75e..2b22c85b851b 100644 --- a/packages/rocketchat-livestream/package.js +++ b/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', diff --git a/packages/rocketchat-logger/client/viewLogs.js b/packages/rocketchat-logger/client/viewLogs.js index 26a73bd5986c..c98da9e3c921 100644 --- a/packages/rocketchat-logger/client/viewLogs.js +++ b/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'); diff --git a/packages/rocketchat-logger/package.js b/packages/rocketchat-logger/package.js index 35307ded6940..e279d1428e83 100644 --- a/packages/rocketchat-logger/package.js +++ b/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', ]); diff --git a/packages/rocketchat-message-snippet/client/actionButton.js b/packages/rocketchat-message-snippet/client/actionButton.js index e99541bc6dcf..14a59daf8f71 100644 --- a/packages/rocketchat-message-snippet/client/actionButton.js +++ b/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({ diff --git a/packages/rocketchat-message-snippet/package.js b/packages/rocketchat-message-snippet/package.js index 563daf7638de..2762df5c1a5b 100644 --- a/packages/rocketchat-message-snippet/package.js +++ b/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', diff --git a/packages/rocketchat-oauth2-server-config/client/admin/route.js b/packages/rocketchat-oauth2-server-config/client/admin/route.js index 991dde709f2c..03ba7691627d 100644 --- a/packages/rocketchat-oauth2-server-config/client/admin/route.js +++ b/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', diff --git a/packages/rocketchat-oauth2-server-config/client/admin/views/oauthApp.js b/packages/rocketchat-oauth2-server-config/client/admin/views/oauthApp.js index ea3932455313..706f6d73a50e 100644 --- a/packages/rocketchat-oauth2-server-config/client/admin/views/oauthApp.js +++ b/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'; diff --git a/packages/rocketchat-oauth2-server-config/package.js b/packages/rocketchat-oauth2-server-config/package.js index ebea4568a12b..6533759629a4 100644 --- a/packages/rocketchat-oauth2-server-config/package.js +++ b/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', diff --git a/packages/rocketchat-otr/client/rocketchat.otr.js b/packages/rocketchat-otr/client/rocketchat.otr.js index 67ca64e9a8e0..977bf8072b7f 100644 --- a/packages/rocketchat-otr/client/rocketchat.otr.js +++ b/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() { diff --git a/packages/rocketchat-otr/package.js b/packages/rocketchat-otr/package.js index b291530c86dd..124bb4e2f249 100644 --- a/packages/rocketchat-otr/package.js +++ b/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', diff --git a/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js b/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js index 48b7877de8a9..3c7a3dca6205 100644 --- a/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js +++ b/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', diff --git a/packages/rocketchat-push-notifications/package.js b/packages/rocketchat-push-notifications/package.js index 7a0d71beb406..d130ea8d9376 100644 --- a/packages/rocketchat-push-notifications/package.js +++ b/packages/rocketchat-push-notifications/package.js @@ -8,6 +8,7 @@ Package.describe({ Package.onUse(function(api) { api.use([ 'ecmascript', + 'rocketchat:utils', 'rocketchat:lib', 'templating', ]); diff --git a/packages/rocketchat-setup-wizard/client/setupWizard.js b/packages/rocketchat-setup-wizard/client/setupWizard.js index 50b4a693e621..817868adda84 100644 --- a/packages/rocketchat-setup-wizard/client/setupWizard.js +++ b/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 = () => { diff --git a/packages/rocketchat-setup-wizard/package.js b/packages/rocketchat-setup-wizard/package.js index ee5e86f0d706..69472c57b0ee 100644 --- a/packages/rocketchat-setup-wizard/package.js +++ b/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'); diff --git a/packages/rocketchat-tokenpass/client/tokenpassChannelSettings.js b/packages/rocketchat-tokenpass/client/tokenpassChannelSettings.js index 9fcd715b3df0..d8f66006f6f2 100644 --- a/packages/rocketchat-tokenpass/client/tokenpassChannelSettings.js +++ b/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({ diff --git a/packages/rocketchat-tokenpass/package.js b/packages/rocketchat-tokenpass/package.js index fe12256ab828..971d02779c83 100644 --- a/packages/rocketchat-tokenpass/package.js +++ b/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', diff --git a/packages/rocketchat-ui-account/client/accountFlex.js b/packages/rocketchat-ui-account/client/accountFlex.js index 0de86a8e74a3..71fcd1d8355e 100644 --- a/packages/rocketchat-ui-account/client/accountFlex.js +++ b/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"]'() { diff --git a/packages/rocketchat-ui-account/client/accountIntegrations.js b/packages/rocketchat-ui-account/client/accountIntegrations.js index 1ec7399c092a..803c84b20d48 100644 --- a/packages/rocketchat-ui-account/client/accountIntegrations.js +++ b/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({ diff --git a/packages/rocketchat-ui-account/client/accountPreferences.js b/packages/rocketchat-ui-account/client/accountPreferences.js index 679e68429aec..f4488972b5be 100644 --- a/packages/rocketchat-ui-account/client/accountPreferences.js +++ b/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'; diff --git a/packages/rocketchat-ui-account/client/accountProfile.js b/packages/rocketchat-ui-account/client/accountProfile.js index 1cd682bfad9b..ddb1ea964b3c 100644 --- a/packages/rocketchat-ui-account/client/accountProfile.js +++ b/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'; diff --git a/packages/rocketchat-ui-account/client/avatar/prompt.js b/packages/rocketchat-ui-account/client/avatar/prompt.js index aee93c8d737e..db53a5a25a11 100644 --- a/packages/rocketchat-ui-account/client/avatar/prompt.js +++ b/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'; diff --git a/packages/rocketchat-ui-account/package.js b/packages/rocketchat-ui-account/package.js index ccc52f7bf7a7..6fdd1c9011c2 100644 --- a/packages/rocketchat-ui-account/package.js +++ b/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'); diff --git a/packages/rocketchat-ui-admin/client/admin.js b/packages/rocketchat-ui-admin/client/admin.js index c9528a9ee840..c5f17ab6d066 100644 --- a/packages/rocketchat-ui-admin/client/admin.js +++ b/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'; diff --git a/packages/rocketchat-ui-admin/client/adminFlex.js b/packages/rocketchat-ui-admin/client/adminFlex.js index 77b63702cc57..06830633eee3 100644 --- a/packages/rocketchat-ui-admin/client/adminFlex.js +++ b/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'; diff --git a/packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.js b/packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.js index 00b2c8775941..4847e6955b61 100644 --- a/packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.js +++ b/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'; diff --git a/packages/rocketchat-ui-admin/client/rooms/adminRooms.js b/packages/rocketchat-ui-admin/client/rooms/adminRooms.js index 1abb43d06704..bba612df0bed 100644 --- a/packages/rocketchat-ui-admin/client/rooms/adminRooms.js +++ b/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'; diff --git a/packages/rocketchat-ui-admin/client/rooms/channelSettingsDefault.js b/packages/rocketchat-ui-admin/client/rooms/channelSettingsDefault.js index 6589ddf0ad60..6d2546912186 100644 --- a/packages/rocketchat-ui-admin/client/rooms/channelSettingsDefault.js +++ b/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'; diff --git a/packages/rocketchat-ui-admin/client/users/adminInviteUser.js b/packages/rocketchat-ui-admin/client/users/adminInviteUser.js index 89542c3dc4cc..d0462f0f1c4b 100644 --- a/packages/rocketchat-ui-admin/client/users/adminInviteUser.js +++ b/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'; diff --git a/packages/rocketchat-ui-admin/package.js b/packages/rocketchat-ui-admin/package.js index b9cf9d35b1b3..425121cefb67 100644 --- a/packages/rocketchat-ui-admin/package.js +++ b/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'); diff --git a/packages/rocketchat-ui-clean-history/client/views/cleanHistory.js b/packages/rocketchat-ui-clean-history/client/views/cleanHistory.js index 68098615818d..cb30481ae9cf 100644 --- a/packages/rocketchat-ui-clean-history/client/views/cleanHistory.js +++ b/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'; diff --git a/packages/rocketchat-ui-clean-history/package.js b/packages/rocketchat-ui-clean-history/package.js index dd29496d1eb0..4b8fce5043e1 100644 --- a/packages/rocketchat-ui-clean-history/package.js +++ b/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'); diff --git a/packages/rocketchat-ui-flextab/client/flexTabBar.js b/packages/rocketchat-ui-flextab/client/flexTabBar.js index 5badd59a81d9..0f773e70aeed 100644 --- a/packages/rocketchat-ui-flextab/client/flexTabBar.js +++ b/packages/rocketchat-ui-flextab/client/flexTabBar.js @@ -4,7 +4,8 @@ import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; import { RocketChat } from 'meteor/rocketchat:lib'; -import { t, popover } from 'meteor/rocketchat:ui'; +import { popover } from 'meteor/rocketchat:ui'; +import { t } from 'meteor/rocketchat:utils'; import _ from 'underscore'; const commonHelpers = { diff --git a/packages/rocketchat-ui-flextab/client/tabs/inviteUsers.js b/packages/rocketchat-ui-flextab/client/tabs/inviteUsers.js index 0391f5d3181e..06f2ff61209c 100644 --- a/packages/rocketchat-ui-flextab/client/tabs/inviteUsers.js +++ b/packages/rocketchat-ui-flextab/client/tabs/inviteUsers.js @@ -5,7 +5,7 @@ import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; import { AutoComplete } from 'meteor/mizzao:autocomplete'; import { RocketChat } from 'meteor/rocketchat:lib'; -import { t } from 'meteor/rocketchat:ui'; +import { t } from 'meteor/rocketchat:utils'; import { Deps } from 'meteor/deps'; import toastr from 'toastr'; diff --git a/packages/rocketchat-ui-flextab/client/tabs/membersList.js b/packages/rocketchat-ui-flextab/client/tabs/membersList.js index 7948c582742d..9988532feca7 100644 --- a/packages/rocketchat-ui-flextab/client/tabs/membersList.js +++ b/packages/rocketchat-ui-flextab/client/tabs/membersList.js @@ -4,7 +4,8 @@ import { Tracker } from 'meteor/tracker'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; import { RocketChat, handleError } from 'meteor/rocketchat:lib'; -import { t, ChatRoom, RoomManager, popover, isRtl } from 'meteor/rocketchat:ui'; +import { ChatRoom, RoomManager, popover } from 'meteor/rocketchat:ui'; +import { t, isRtl } from 'meteor/rocketchat:utils'; import { WebRTC } from 'meteor/rocketchat:webrtc'; import _ from 'underscore'; import { getActions } from './userActions'; diff --git a/packages/rocketchat-ui-flextab/client/tabs/userActions.js b/packages/rocketchat-ui-flextab/client/tabs/userActions.js index 7f8bc884b338..81ea34da70d4 100644 --- a/packages/rocketchat-ui-flextab/client/tabs/userActions.js +++ b/packages/rocketchat-ui-flextab/client/tabs/userActions.js @@ -4,7 +4,8 @@ import { Session } from 'meteor/session'; import { TAPi18n } from 'meteor/tap:i18n'; import { RocketChat, handleError } from 'meteor/rocketchat:lib'; import { WebRTC } from 'meteor/rocketchat:webrtc'; -import { t, modal, ChatRoom, ChatSubscription, RoomRoles } from 'meteor/rocketchat:ui'; +import { modal, ChatRoom, ChatSubscription, RoomRoles } from 'meteor/rocketchat:ui'; +import { t } from 'meteor/rocketchat:utils'; import _ from 'underscore'; import toastr from 'toastr'; diff --git a/packages/rocketchat-ui-flextab/client/tabs/userEdit.js b/packages/rocketchat-ui-flextab/client/tabs/userEdit.js index 6da320f07a6f..f2b6280e59b8 100644 --- a/packages/rocketchat-ui-flextab/client/tabs/userEdit.js +++ b/packages/rocketchat-ui-flextab/client/tabs/userEdit.js @@ -4,7 +4,7 @@ import { Random } from 'meteor/random'; 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'; import s from 'underscore.string'; diff --git a/packages/rocketchat-ui-flextab/package.js b/packages/rocketchat-ui-flextab/package.js index 4789bea39691..1543254317da 100644 --- a/packages/rocketchat-ui-flextab/package.js +++ b/packages/rocketchat-ui-flextab/package.js @@ -15,6 +15,7 @@ Package.onUse(function(api) { 'mongo', 'ecmascript', 'templating', + 'rocketchat:utils', 'rocketchat:lib', 'mizzao:autocomplete', 'rocketchat:webrtc', diff --git a/packages/rocketchat-ui-login/client/login/form.js b/packages/rocketchat-ui-login/client/login/form.js index 86e1c30ebed7..255429f5cdbf 100644 --- a/packages/rocketchat-ui-login/client/login/form.js +++ b/packages/rocketchat-ui-login/client/login/form.js @@ -5,7 +5,7 @@ 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 } from 'meteor/rocketchat:ui'; +import { t } from 'meteor/rocketchat:utils'; import _ from 'underscore'; import s from 'underscore.string'; import toastr from 'toastr'; diff --git a/packages/rocketchat-ui-login/client/reset-password/resetPassword.js b/packages/rocketchat-ui-login/client/reset-password/resetPassword.js index e6feab392eb1..90484e88b408 100644 --- a/packages/rocketchat-ui-login/client/reset-password/resetPassword.js +++ b/packages/rocketchat-ui-login/client/reset-password/resetPassword.js @@ -2,7 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; 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 } from 'meteor/rocketchat:lib'; import toastr from 'toastr'; diff --git a/packages/rocketchat-ui-login/package.js b/packages/rocketchat-ui-login/package.js index 80afe54def6b..4a3e59d2849e 100644 --- a/packages/rocketchat-ui-login/package.js +++ b/packages/rocketchat-ui-login/package.js @@ -14,6 +14,7 @@ Package.onUse(function(api) { api.use([ 'ecmascript', 'templating', + 'rocketchat:utils', 'rocketchat:lib', 'rocketchat:ui', 'rocketchat:assets', diff --git a/packages/rocketchat-ui-master/client/main.js b/packages/rocketchat-ui-master/client/main.js index 459e5508b538..034c1948322c 100644 --- a/packages/rocketchat-ui-master/client/main.js +++ b/packages/rocketchat-ui-master/client/main.js @@ -3,6 +3,7 @@ import { Match } from 'meteor/check'; import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; import { FlowRouter } from 'meteor/kadira:flow-router'; +import { t } from 'meteor/rocketchat:utils'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; import Clipboard from 'clipboard'; diff --git a/packages/rocketchat-ui-master/package.js b/packages/rocketchat-ui-master/package.js index fa87a6a34d85..1b89acbef491 100644 --- a/packages/rocketchat-ui-master/package.js +++ b/packages/rocketchat-ui-master/package.js @@ -17,6 +17,7 @@ Package.onUse(function(api) { 'templating', 'reactive-var', 'rocketchat:lib', + 'rocketchat:utils', 'meteorhacks:inject-initial', ]); diff --git a/packages/rocketchat-ui-message/client/message.js b/packages/rocketchat-ui-message/client/message.js index fb1b63a914d3..4a4690e00e82 100644 --- a/packages/rocketchat-ui-message/client/message.js +++ b/packages/rocketchat-ui-message/client/message.js @@ -10,7 +10,7 @@ import { renderEmoji } from 'meteor/rocketchat:emoji'; import { renderMessageBody } from './renderMessageBody'; import { RocketChat } from 'meteor/rocketchat:lib'; import { RoomRoles, UserRoles } from 'meteor/rocketchat:ui'; -import { t } from 'meteor/rocketchat:ui'; +import { t } from 'meteor/rocketchat:utils'; async function renderPdfToCanvas(canvasId, pdfLink) { const isSafari = /constructor/i.test(window.HTMLElement) || diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js index 75ea52fed62f..5f2ce4ebbba8 100644 --- a/packages/rocketchat-ui-message/client/messageBox.js +++ b/packages/rocketchat-ui-message/client/messageBox.js @@ -6,7 +6,8 @@ import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; import { RocketChat } from 'meteor/rocketchat:lib'; import { fileUploadHandler } from 'meteor/rocketchat:file-upload'; -import { t, ChatSubscription, RoomHistoryManager, RoomManager, KonchatNotification, popover, ChatMessages, fileUpload, AudioRecorder, chatMessages } from 'meteor/rocketchat:ui'; +import { ChatSubscription, RoomHistoryManager, RoomManager, KonchatNotification, popover, ChatMessages, fileUpload, AudioRecorder, chatMessages } from 'meteor/rocketchat:ui'; +import { t } from 'meteor/rocketchat:utils'; import toastr from 'toastr'; import moment from 'moment'; import _ from 'underscore'; diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js b/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js index 3da3c5851527..525622a6d057 100644 --- a/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js +++ b/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js @@ -6,7 +6,7 @@ import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; import { RocketChat } from 'meteor/rocketchat:lib'; -import { t } from 'meteor/rocketchat:ui'; +import { t } from 'meteor/rocketchat:utils'; import _ from 'underscore'; const usersFromRoomMessages = new Mongo.Collection(null); diff --git a/packages/rocketchat-ui-message/client/startup/messageBoxActions.js b/packages/rocketchat-ui-message/client/startup/messageBoxActions.js index 651f199f6ccc..0f28a35c3a2a 100644 --- a/packages/rocketchat-ui-message/client/startup/messageBoxActions.js +++ b/packages/rocketchat-ui-message/client/startup/messageBoxActions.js @@ -3,7 +3,8 @@ import { Random } from 'meteor/random'; import mime from 'mime-type/with-db'; import { VRecDialog } from 'meteor/rocketchat:ui-vrecord'; import { RocketChat } from 'meteor/rocketchat:lib'; -import { t, modal, fileUpload } from 'meteor/rocketchat:ui'; +import { modal, fileUpload } from 'meteor/rocketchat:ui'; +import { t } from 'meteor/rocketchat:utils'; RocketChat.messageBox.actions.add('Create_new', 'Video_message', { id: 'video-message', diff --git a/packages/rocketchat-ui-message/package.js b/packages/rocketchat-ui-message/package.js index fdc1f05f155d..591099cda9f3 100644 --- a/packages/rocketchat-ui-message/package.js +++ b/packages/rocketchat-ui-message/package.js @@ -16,6 +16,7 @@ Package.onUse(function(api) { 'ecmascript', 'templating', 'tracker', + 'rocketchat:utils', 'rocketchat:emoji', 'rocketchat:lib', 'rocketchat:ui-account', diff --git a/packages/rocketchat-ui-sidenav/client/chatRoomItem.js b/packages/rocketchat-ui-sidenav/client/chatRoomItem.js index 82c9275ddee2..ea0bbc0b813b 100644 --- a/packages/rocketchat-ui-sidenav/client/chatRoomItem.js +++ b/packages/rocketchat-ui-sidenav/client/chatRoomItem.js @@ -1,6 +1,7 @@ import { Tracker } from 'meteor/tracker'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; +import { t } from 'meteor/rocketchat:utils'; Template.chatRoomItem.helpers({ roomData() { diff --git a/packages/rocketchat-ui-sidenav/client/sidebarHeader.js b/packages/rocketchat-ui-sidenav/client/sidebarHeader.js index 2ca64d93d6c4..bc5c6eec5535 100644 --- a/packages/rocketchat-ui-sidenav/client/sidebarHeader.js +++ b/packages/rocketchat-ui-sidenav/client/sidebarHeader.js @@ -3,6 +3,7 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; import { popover } from 'meteor/rocketchat:ui'; +import { t } from 'meteor/rocketchat:utils'; const setStatus = (status) => { AccountBox.setStatus(status); diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.js b/packages/rocketchat-ui-sidenav/client/sidebarItem.js index 8aa05be9ca74..20cfc6f16002 100644 --- a/packages/rocketchat-ui-sidenav/client/sidebarItem.js +++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.js @@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; +import { t } from 'meteor/rocketchat:utils'; import moment from 'moment'; import { renderMessageBody } from 'meteor/rocketchat:ui-message'; import { popover } from 'meteor/rocketchat:ui'; diff --git a/packages/rocketchat-ui-sidenav/package.js b/packages/rocketchat-ui-sidenav/package.js index 47d1b466de27..d92210779e0a 100644 --- a/packages/rocketchat-ui-sidenav/package.js +++ b/packages/rocketchat-ui-sidenav/package.js @@ -15,6 +15,7 @@ Package.onUse(function(api) { 'ecmascript', 'templating', 'rocketchat:lib', + 'rocketchat:utils', 'rocketchat:ui', 'rocketchat:lazy-load', ]); diff --git a/packages/rocketchat-ui/client/components/header/header.js b/packages/rocketchat-ui/client/components/header/header.js index b21fbed5410a..03d82cffa020 100644 --- a/packages/rocketchat-ui/client/components/header/header.js +++ b/packages/rocketchat-ui/client/components/header/header.js @@ -1,6 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; +import { t } from 'meteor/rocketchat:utils'; const isSubscribed = (_id) => ChatSubscription.find({ rid: _id }).count() > 0; diff --git a/packages/rocketchat-ui/client/lib/accounts.js b/packages/rocketchat-ui/client/lib/accounts.js index fa86205b546e..078aa266db46 100644 --- a/packages/rocketchat-ui/client/lib/accounts.js +++ b/packages/rocketchat-ui/client/lib/accounts.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Accounts } from 'meteor/accounts-base'; +import { t } from 'meteor/rocketchat:utils'; import toastr from 'toastr'; Accounts.onEmailVerificationLink(function(token, done) { diff --git a/packages/rocketchat-ui/client/lib/chatMessages.js b/packages/rocketchat-ui/client/lib/chatMessages.js index e04755f36342..99bfbf78ed24 100644 --- a/packages/rocketchat-ui/client/lib/chatMessages.js +++ b/packages/rocketchat-ui/client/lib/chatMessages.js @@ -5,6 +5,7 @@ import { Tracker } from 'meteor/tracker'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; import { TAPi18n } from 'meteor/tap:i18n'; +import { t } from 'meteor/rocketchat:utils'; import _ from 'underscore'; import s from 'underscore.string'; import moment from 'moment'; diff --git a/packages/rocketchat-ui/client/lib/fileUpload.js b/packages/rocketchat-ui/client/lib/fileUpload.js index b0d48defee7d..d3a30e794a1f 100644 --- a/packages/rocketchat-ui/client/lib/fileUpload.js +++ b/packages/rocketchat-ui/client/lib/fileUpload.js @@ -4,6 +4,7 @@ import { Session } from 'meteor/session'; import s from 'underscore.string'; import { fileUploadHandler } from 'meteor/rocketchat:file-upload'; import { Handlebars } from 'meteor/ui'; +import { t } from 'meteor/rocketchat:utils'; const readAsDataURL = (file, callback) => { const reader = new FileReader(); diff --git a/packages/rocketchat-ui/client/lib/menu.js b/packages/rocketchat-ui/client/lib/menu.js index 80a5c38791a0..467376571fb0 100644 --- a/packages/rocketchat-ui/client/lib/menu.js +++ b/packages/rocketchat-ui/client/lib/menu.js @@ -2,6 +2,7 @@ import { Session } from 'meteor/session'; import _ from 'underscore'; import EventEmitter from 'wolfy87-eventemitter'; import { lazyloadtick } from 'meteor/rocketchat:lazy-load'; +import { isRtl } from 'meteor/rocketchat:utils'; const sideNavW = 280; const map = (x, in_min, in_max, out_min, out_max) => (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min; diff --git a/packages/rocketchat-ui/client/views/app/createChannel.js b/packages/rocketchat-ui/client/views/app/createChannel.js index 6a67df806389..6a89273aabbe 100644 --- a/packages/rocketchat-ui/client/views/app/createChannel.js +++ b/packages/rocketchat-ui/client/views/app/createChannel.js @@ -5,6 +5,7 @@ import { Blaze } from 'meteor/blaze'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; import { AutoComplete } from 'meteor/mizzao:autocomplete'; +import { t } from 'meteor/rocketchat:utils'; import _ from 'underscore'; const acEvents = { diff --git a/packages/rocketchat-ui/client/views/app/directory.js b/packages/rocketchat-ui/client/views/app/directory.js index 3ac767a92cdd..7391748a3178 100644 --- a/packages/rocketchat-ui/client/views/app/directory.js +++ b/packages/rocketchat-ui/client/views/app/directory.js @@ -4,6 +4,7 @@ import { Tracker } from 'meteor/tracker'; import { Template } from 'meteor/templating'; import _ from 'underscore'; import { timeAgo } from './helpers'; +import { t } from 'meteor/rocketchat:utils'; function directorySearch(config, cb) { return Meteor.call('browseChannels', config, (err, result) => { diff --git a/packages/rocketchat-ui/client/views/app/modal.js b/packages/rocketchat-ui/client/views/app/modal.js index 481e8383ffc9..5bfb5d99d28b 100644 --- a/packages/rocketchat-ui/client/views/app/modal.js +++ b/packages/rocketchat-ui/client/views/app/modal.js @@ -1,6 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Blaze } from 'meteor/blaze'; import { Template } from 'meteor/templating'; +import { t } from 'meteor/rocketchat:utils'; modal = { renderedModal: null, diff --git a/packages/rocketchat-ui/client/views/app/popover.js b/packages/rocketchat-ui/client/views/app/popover.js index f43104cce605..238e0d69eced 100644 --- a/packages/rocketchat-ui/client/views/app/popover.js +++ b/packages/rocketchat-ui/client/views/app/popover.js @@ -3,6 +3,7 @@ import { Blaze } from 'meteor/blaze'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; +import { isRtl } from 'meteor/rocketchat:utils'; import _ from 'underscore'; import { hide, leave } from 'meteor/rocketchat:lib'; diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js index b250fe94fcba..f22cfc55544e 100644 --- a/packages/rocketchat-ui/client/views/app/room.js +++ b/packages/rocketchat-ui/client/views/app/room.js @@ -7,6 +7,7 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; import { RocketChatTabBar } from 'meteor/rocketchat:lib'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; +import { t } from 'meteor/rocketchat:utils'; import { WebRTC } from 'meteor/rocketchat:webrtc'; import _ from 'underscore'; import moment from 'moment'; diff --git a/packages/rocketchat-ui/client/views/app/videoCall/videoCall.js b/packages/rocketchat-ui/client/views/app/videoCall/videoCall.js index 00c4cb2163c2..3cb8c8b8f65e 100644 --- a/packages/rocketchat-ui/client/views/app/videoCall/videoCall.js +++ b/packages/rocketchat-ui/client/views/app/videoCall/videoCall.js @@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; +import { t } from 'meteor/rocketchat:utils'; import { WebRTC } from 'meteor/rocketchat:webrtc'; Template.videoCall.onCreated(function() { diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js index 5d224c996dc1..c6ace6c12b65 100644 --- a/packages/rocketchat-ui/package.js +++ b/packages/rocketchat-ui/package.js @@ -23,6 +23,7 @@ Package.onUse(function(api) { 'rocketchat:lib', 'rocketchat:ui-master', 'rocketchat:push', + 'rocketchat:utils', 'raix:ui-dropped-event', 'rocketchat:lazy-load', 'rocketchat:e2e', @@ -58,7 +59,6 @@ Package.onUse(function(api) { api.addFiles('client/lib/RoomHistoryManager.js', 'client'); api.addFiles('client/lib/RoomManager.js', 'client'); api.addFiles('client/lib/sideNav.js', 'client'); - api.addFiles('client/lib/tapi18n.js'); api.addFiles('client/lib/textarea-autogrow.js', 'client'); api.addFiles('client/lib/codeMirror/codeMirror.js', 'client'); @@ -149,7 +149,6 @@ Package.onUse(function(api) { api.addFiles('client/components/contextualBar.js', 'client'); api.export('fileUpload'); - api.export('t'); api.export('modal', 'client'); api.export('popover', 'client'); api.export('fireGlobalEvent', 'client'); @@ -167,7 +166,6 @@ Package.onUse(function(api) { api.export('AudioRecorder', 'client'); api.export('VideoRecorder', 'client'); api.export('UserRoles', 'client'); - api.export('isRtl', 'client'); api.export('alerts', 'client'); api.export('AccountBox', 'client'); api.export('chatMessages', 'client'); diff --git a/packages/rocketchat-utils/client/index.js b/packages/rocketchat-utils/client/index.js new file mode 100644 index 000000000000..49c8d6407fbc --- /dev/null +++ b/packages/rocketchat-utils/client/index.js @@ -0,0 +1,6 @@ +import { t, isRtl } from '../lib/tapi18n'; + +export { + t, + isRtl, +}; diff --git a/packages/rocketchat-ui/client/lib/tapi18n.js b/packages/rocketchat-utils/lib/tapi18n.js similarity index 60% rename from packages/rocketchat-ui/client/lib/tapi18n.js rename to packages/rocketchat-utils/lib/tapi18n.js index 14ef48497ab3..77a11c881a82 100644 --- a/packages/rocketchat-ui/client/lib/tapi18n.js +++ b/packages/rocketchat-utils/lib/tapi18n.js @@ -1,7 +1,7 @@ import _ from 'underscore'; import { TAPi18n } from 'meteor/tap:i18n'; -t = function(key, ...replaces) { +export const t = function(key, ...replaces) { if (_.isObject(replaces[0])) { return TAPi18n.__(key, ...replaces); } else { @@ -12,18 +12,7 @@ t = function(key, ...replaces) { } }; -this.tr = function(key, options, ...replaces) { - if (_.isObject(replaces[0])) { - return TAPi18n.__(key, options, ...replaces); - } else { - return TAPi18n.__(key, options, { - postProcess: 'sprintf', - sprintf: replaces, - }); - } -}; - -isRtl = (lang) => { +export const isRtl = (lang) => { const language = lang || localStorage.getItem('userLanguage') || 'en-US'; return ['ar', 'dv', 'fa', 'he', 'ku', 'ps', 'sd', 'ug', 'ur', 'yi'].includes(language.split('-').shift().toLowerCase()); }; diff --git a/packages/rocketchat-utils/package.js b/packages/rocketchat-utils/package.js new file mode 100644 index 000000000000..6655c606eda4 --- /dev/null +++ b/packages/rocketchat-utils/package.js @@ -0,0 +1,14 @@ +Package.describe({ + name: 'rocketchat:utils', + version: '0.0.1', + summary: 'RocketChat utils', +}); + +Package.onUse(function(api) { + api.use([ + 'ecmascript', + 'tap:i18n', + ]); + api.mainModule('client/index.js', 'client'); + api.mainModule('server/index.js', 'server'); +}); diff --git a/packages/rocketchat-utils/server/index.js b/packages/rocketchat-utils/server/index.js new file mode 100644 index 000000000000..49c8d6407fbc --- /dev/null +++ b/packages/rocketchat-utils/server/index.js @@ -0,0 +1,6 @@ +import { t, isRtl } from '../lib/tapi18n'; + +export { + t, + isRtl, +}; diff --git a/packages/rocketchat-videobridge/client/views/videoFlexTab.js b/packages/rocketchat-videobridge/client/views/videoFlexTab.js index 52ed27b4050e..aec68d7cd8e5 100644 --- a/packages/rocketchat-videobridge/client/views/videoFlexTab.js +++ b/packages/rocketchat-videobridge/client/views/videoFlexTab.js @@ -2,7 +2,8 @@ import { Meteor } from 'meteor/meteor'; import { Session } from 'meteor/session'; 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'; Template.videoFlexTab.helpers({ openInNewWindow() { diff --git a/packages/rocketchat-videobridge/package.js b/packages/rocketchat-videobridge/package.js index add3418a53cc..a455f5f047ab 100644 --- a/packages/rocketchat-videobridge/package.js +++ b/packages/rocketchat-videobridge/package.js @@ -9,6 +9,7 @@ Package.onUse(function(api) { api.use([ 'ecmascript', 'less', + 'rocketchat:utils', 'rocketchat:lib', 'rocketchat:bigbluebutton', 'templating', diff --git a/packages/rocketchat-webdav/client/actionButton.js b/packages/rocketchat-webdav/client/actionButton.js index 8e62af92cce5..c2c06c02a93c 100644 --- a/packages/rocketchat-webdav/client/actionButton.js +++ b/packages/rocketchat-webdav/client/actionButton.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; -import { t, modal } from 'meteor/rocketchat:ui'; +import { modal } from 'meteor/rocketchat:ui'; +import { t } from 'meteor/rocketchat:utils'; import { RocketChat } from 'meteor/rocketchat:lib'; Meteor.startup(function() { diff --git a/packages/rocketchat-webdav/client/addWebdavAccount.js b/packages/rocketchat-webdav/client/addWebdavAccount.js index 1a15a5efcb25..8683b63314db 100644 --- a/packages/rocketchat-webdav/client/addWebdavAccount.js +++ b/packages/rocketchat-webdav/client/addWebdavAccount.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 _ from 'underscore'; import toastr from 'toastr'; diff --git a/packages/rocketchat-webdav/client/selectWebdavAccount.js b/packages/rocketchat-webdav/client/selectWebdavAccount.js index 71e002cf3939..9916342180b0 100644 --- a/packages/rocketchat-webdav/client/selectWebdavAccount.js +++ b/packages/rocketchat-webdav/client/selectWebdavAccount.js @@ -1,7 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; import toastr from 'toastr'; -import { t, modal } from 'meteor/rocketchat:ui'; +import { modal } from 'meteor/rocketchat:ui'; +import { t } from 'meteor/rocketchat:utils'; import { RocketChat } from 'meteor/rocketchat:lib'; Template.selectWebdavAccount.helpers({ diff --git a/packages/rocketchat-webdav/client/startup/messageBoxActions.js b/packages/rocketchat-webdav/client/startup/messageBoxActions.js index 8217fb71676e..4ade4c324840 100644 --- a/packages/rocketchat-webdav/client/startup/messageBoxActions.js +++ b/packages/rocketchat-webdav/client/startup/messageBoxActions.js @@ -1,6 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; -import { t, modal } from 'meteor/rocketchat:ui'; +import { modal } from 'meteor/rocketchat:ui'; +import { t } from 'meteor/rocketchat:utils'; import { RocketChat } from 'meteor/rocketchat:lib'; RocketChat.messageBox.actions.add('WebDAV', 'Add Server', { diff --git a/packages/rocketchat-webdav/client/webdavFilePicker.js b/packages/rocketchat-webdav/client/webdavFilePicker.js index 3ff7d6abe67b..9b9713ec3f80 100644 --- a/packages/rocketchat-webdav/client/webdavFilePicker.js +++ b/packages/rocketchat-webdav/client/webdavFilePicker.js @@ -4,7 +4,8 @@ import _ from 'underscore'; import toastr from 'toastr'; import { Session } from 'meteor/session'; import { call } from 'meteor/rocketchat:lib'; -import { t, modal } from 'meteor/rocketchat:ui'; +import { modal } from 'meteor/rocketchat:ui'; +import { t } from 'meteor/rocketchat:utils'; import { fileUploadHandler } from 'meteor/rocketchat:file-upload'; import { Handlebars } from 'meteor/ui'; diff --git a/packages/rocketchat-webdav/package.js b/packages/rocketchat-webdav/package.js index 17898bb785cb..61d2a21652fb 100644 --- a/packages/rocketchat-webdav/package.js +++ b/packages/rocketchat-webdav/package.js @@ -15,6 +15,7 @@ Package.onUse(function(api) { 'mongo', 'templating', 'less', + 'rocketchat:utils', 'rocketchat:lib', 'rocketchat:api', 'rocketchat:grant', diff --git a/packages/rocketchat-webrtc/client/WebRTCClass.js b/packages/rocketchat-webrtc/client/WebRTCClass.js index 3bb61d24f4ff..9c07e70ba943 100644 --- a/packages/rocketchat-webrtc/client/WebRTCClass.js +++ b/packages/rocketchat-webrtc/client/WebRTCClass.js @@ -3,6 +3,7 @@ import { Tracker } from 'meteor/tracker'; import { ReactiveVar } from 'meteor/reactive-var'; import { FlowRouter } from 'meteor/kadira:flow-router' ; import { TAPi18n } from 'meteor/tap:i18n'; +import { t } from 'meteor/rocketchat:utils'; import { ChromeScreenShare } from './screenShare'; class WebRTCTransportClass { diff --git a/packages/rocketchat-webrtc/package.js b/packages/rocketchat-webrtc/package.js index 932db8720c7f..c82843b19bb8 100644 --- a/packages/rocketchat-webrtc/package.js +++ b/packages/rocketchat-webrtc/package.js @@ -7,6 +7,7 @@ Package.describe({ Package.onUse(function(api) { api.use('rocketchat:lib'); + api.use('rocketchat:utils'); api.use('ecmascript'); api.use('templating', 'client');