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
RocketChat · Dec 20, 2018 · 94df0a7 · 94df0a7
1 parent be06e4c
commit 94df0a7
Show file tree

Hide file tree

Showing 146 changed files with 221 additions and 98 deletions.
diff --git 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
@@ -200,3 +200,4 @@ rocketchat:bigbluebutton
 rocketchat:mailmessages
 juliancwirko:postcss
 littledata:synced-cron
+rocketchat:utils
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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({