Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BREAK] Replace tap:i18n to add support to 3-digit locales #15109

Merged
merged 5 commits into from
Aug 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ konecty:user-presence

deepwell:bootstrap-datepicker2
dispatch:run-as-user
francocatena:status
jalik:ufs
jalik:ufs-gridfs
jparker:gravatar
Expand All @@ -72,7 +71,7 @@ rocketchat:push
raix:ui-dropped-event
todda00:friendly-slugs

tap:i18n
rocketchat:tap-i18n
underscore@1.0.10
juliancwirko:postcss
littledata:synced-cron
Expand Down
3 changes: 1 addition & 2 deletions .meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ es5-shim@4.8.0
facebook-oauth@1.5.0
fastclick@1.0.13
fetch@0.1.0
francocatena:status@1.5.3
geojson-utils@1.0.10
github-oauth@1.2.2
google-oauth@1.2.6
Expand Down Expand Up @@ -132,6 +131,7 @@ rocketchat:monitoring@2.30.2_3
rocketchat:oauth2-server@2.1.0
rocketchat:push@3.3.1
rocketchat:streamer@1.0.2
rocketchat:tap-i18n@1.9.1
rocketchat:version@1.0.0
routepolicy@1.1.0
service-configuration@1.0.11
Expand All @@ -145,7 +145,6 @@ spacebars-compiler@1.1.3
srp@1.0.12
standard-minifier-js@2.4.0
swydo:graphql@0.4.0
tap:i18n@1.8.2
templating@1.3.2
templating-compiler@1.3.3
templating-runtime@1.3.2
Expand Down
2 changes: 1 addition & 1 deletion app/api/server/v1/misc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import s from 'underscore.string';

import { hasRole } from '../../../authorization';
Expand Down
2 changes: 1 addition & 1 deletion app/api/server/v1/users.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import _ from 'underscore';
import Busboy from 'busboy';

Expand Down
2 changes: 1 addition & 1 deletion app/apps/client/admin/appLogs.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ReactiveVar } from 'meteor/reactive-var';
import { FlowRouter } from 'meteor/kadira:flow-router';
import { Template } from 'meteor/templating';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import { Tracker } from 'meteor/tracker';
import moment from 'moment';
import hljs from 'highlight.js';
Expand Down
2 changes: 1 addition & 1 deletion app/apps/client/admin/appManage.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
import { ReactiveDict } from 'meteor/reactive-dict';
import { FlowRouter } from 'meteor/kadira:flow-router';
import { Template } from 'meteor/templating';
import { TAPi18n, TAPi18next } from 'meteor/tap:i18n';
import { TAPi18n, TAPi18next } from 'meteor/rocketchat:tap-i18n';
import { Tracker } from 'meteor/tracker';
import _ from 'underscore';

Expand Down
2 changes: 1 addition & 1 deletion app/apps/client/i18n.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TAPi18next } from 'meteor/tap:i18n';
import { TAPi18next } from 'meteor/rocketchat:tap-i18n';

import { Apps } from './orchestrator';
import { Utilities } from '../lib/misc/Utilities';
Expand Down
2 changes: 1 addition & 1 deletion app/apps/server/cron.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { HTTP } from 'meteor/http';
import { SyncedCron } from 'meteor/littledata:synced-cron';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus';

import { Apps } from './orchestrator';
Expand Down
2 changes: 1 addition & 1 deletion app/channel-settings/client/views/channelSettings.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { ReactiveVar } from 'meteor/reactive-var';
import { Template } from 'meteor/templating';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import toastr from 'toastr';
import moment from 'moment';
import s from 'underscore.string';
Expand Down
2 changes: 1 addition & 1 deletion app/channel-settings/server/functions/saveRoomType.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { Match } from 'meteor/check';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';

import { Rooms, Subscriptions, Messages } from '../../../models';
import { settings } from '../../../settings';
Expand Down
2 changes: 1 addition & 1 deletion app/chatpal-search/client/template/admin.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { ReactiveVar } from 'meteor/reactive-var';
import { Template } from 'meteor/templating';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import toastr from 'toastr';

import { settings } from '../../../settings';
Expand Down
2 changes: 1 addition & 1 deletion app/chatpal-search/client/template/result.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ReactiveVar } from 'meteor/reactive-var';
import { Session } from 'meteor/session';
import { Template } from 'meteor/templating';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';

import { DateFormat } from '../../../lib';
import { roomTypes, getURL } from '../../../utils';
Expand Down
2 changes: 1 addition & 1 deletion app/custom-sounds/client/admin/soundEdit.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import toastr from 'toastr';
import s from 'underscore.string';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Template } from 'meteor/templating';
import { ReactiveVar } from 'meteor/reactive-var';
import { AutoComplete } from 'meteor/mizzao:autocomplete';
import { Blaze } from 'meteor/blaze';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import toastr from 'toastr';

import { roomTypes } from '../../../../utils/client';
Expand Down
2 changes: 1 addition & 1 deletion app/e2e/client/rocketchat.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
import { Tracker } from 'meteor/tracker';
import { EJSON } from 'meteor/ejson';
import { FlowRouter } from 'meteor/kadira:flow-router';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';

import { E2ERoom } from './rocketchat.e2e.room';
import {
Expand Down
2 changes: 1 addition & 1 deletion app/emoji-custom/client/admin/emojiEdit.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import toastr from 'toastr';
import s from 'underscore.string';

Expand Down
2 changes: 1 addition & 1 deletion app/file-upload/server/lib/FileUpload.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import sharp from 'sharp';
import { Cookies } from 'meteor/ostrio:cookies';
import { UploadFS } from 'meteor/jalik:ufs';
import { Match } from 'meteor/check';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import filesize from 'filesize';

import { settings } from '../../../settings/server';
Expand Down
2 changes: 1 addition & 1 deletion app/google-vision/server/googlevision.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { Random } from 'meteor/random';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';

import { settings } from '../../settings';
import { callbacks } from '../../callbacks';
Expand Down
2 changes: 1 addition & 1 deletion app/importer/client/admin/adminImport.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Importers } from '..';

import { FlowRouter } from 'meteor/kadira:flow-router';
import { Template } from 'meteor/templating';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';

import { hasRole } from '../../../authorization';
import { t, handleError } from '../../../utils';
Expand Down
2 changes: 1 addition & 1 deletion app/importer/client/admin/adminImportPrepare.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Importers } from '..';

import { FlowRouter } from 'meteor/kadira:flow-router';
import { Template } from 'meteor/templating';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import toastr from 'toastr';

import { hasRole } from '../../../authorization';
Expand Down
2 changes: 1 addition & 1 deletion app/integrations/client/views/integrations.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Template } from 'meteor/templating';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import { Tracker } from 'meteor/tracker';
import moment from 'moment';

Expand Down
2 changes: 1 addition & 1 deletion app/integrations/client/views/integrationsIncoming.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import { Tracker } from 'meteor/tracker';
import hljs from 'highlight.js';
import toastr from 'toastr';
Expand Down
2 changes: 1 addition & 1 deletion app/integrations/client/views/integrationsOutgoing.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
import { Random } from 'meteor/random';
import { FlowRouter } from 'meteor/kadira:flow-router';
import { Template } from 'meteor/templating';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import { Tracker } from 'meteor/tracker';
import hljs from 'highlight.js';
import toastr from 'toastr';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import { Tracker } from 'meteor/tracker';
import _ from 'underscore';
import hljs from 'highlight.js';
Expand Down
2 changes: 1 addition & 1 deletion app/lib/client/CustomTranslations.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { Session } from 'meteor/session';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import { Tracker } from 'meteor/tracker';

import { applyCustomTranslations } from '../../utils';
Expand Down
2 changes: 1 addition & 1 deletion app/lib/server/functions/cleanRoomHistory.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';

import { deleteRoom } from './deleteRoom';
import { FileUpload } from '../../../file-upload';
Expand Down
2 changes: 1 addition & 1 deletion app/lib/server/functions/deleteUser.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';

import { FileUpload } from '../../../file-upload';
import { Users, Subscriptions, Messages, Rooms, Integrations, FederationPeers } from '../../../models';
Expand Down
2 changes: 1 addition & 1 deletion app/lib/server/functions/notifications/email.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import s from 'underscore.string';

import * as Mailer from '../../../../mailer';
Expand Down
2 changes: 1 addition & 1 deletion app/lib/server/functions/notifications/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import s from 'underscore.string';

import { settings } from '../../../../settings';
Expand Down
2 changes: 1 addition & 1 deletion app/lib/server/methods/addUsersToRoom.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Match } from 'meteor/check';
import { Random } from 'meteor/random';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';

import { Rooms, Subscriptions, Users } from '../../../models';
import { hasPermission } from '../../../authorization';
Expand Down
2 changes: 1 addition & 1 deletion app/lib/server/methods/filterATAllTag.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { Random } from 'meteor/random';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import _ from 'underscore';
import moment from 'moment';

Expand Down
2 changes: 1 addition & 1 deletion app/lib/server/methods/filterATHereTag.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { Random } from 'meteor/random';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import _ from 'underscore';
import moment from 'moment';

Expand Down
2 changes: 1 addition & 1 deletion app/lib/server/methods/sendMessage.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';
import { Random } from 'meteor/random';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import moment from 'moment';

import { hasPermission } from '../../../authorization';
Expand Down
2 changes: 1 addition & 1 deletion app/livechat/client/lib/chartHandler.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Chart from 'chart.js';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';

const lineChartConfiguration = ({ legends = false, anim = false, smallTicks = false }) => {
const config = {
Expand Down
2 changes: 1 addition & 1 deletion app/livechat/client/views/app/livechatOfficeHours.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { ReactiveVar } from 'meteor/reactive-var';
import { Template } from 'meteor/templating';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import toastr from 'toastr';
import moment from 'moment';

Expand Down
2 changes: 1 addition & 1 deletion app/livechat/client/views/app/tabbar/visitorInfo.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
import { FlowRouter } from 'meteor/kadira:flow-router';
import { Session } from 'meteor/session';
import { Template } from 'meteor/templating';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import _ from 'underscore';
import s from 'underscore.string';
import moment from 'moment';
Expand Down
2 changes: 1 addition & 1 deletion app/livechat/lib/messageTypes.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import { Livechat } from 'meteor/rocketchat:livechat';

import { MessageTypes } from '../../ui-utils';
Expand Down
2 changes: 1 addition & 1 deletion app/livechat/server/api/v1/offlineMessage.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Match, check } from 'meteor/check';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';

import { API } from '../../../../api';
import { Livechat } from '../../lib/Livechat';
Expand Down
2 changes: 1 addition & 1 deletion app/livechat/server/api/v1/room.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';
import { Random } from 'meteor/random';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';

import { settings as rcSettings } from '../../../../settings';
import { Messages, Rooms } from '../../../../models';
Expand Down
2 changes: 1 addition & 1 deletion app/livechat/server/api/v1/transcript.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { check } from 'meteor/check';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';

import { API } from '../../../../api';
import { Livechat } from '../../lib/Livechat';
Expand Down
2 changes: 1 addition & 1 deletion app/livechat/server/lib/Livechat.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import dns from 'dns';
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';
import { Random } from 'meteor/random';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import { HTTP } from 'meteor/http';
import _ from 'underscore';
import s from 'underscore.string';
Expand Down
2 changes: 1 addition & 1 deletion app/livechat/server/lib/QueueMethods.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import _ from 'underscore';

import { Livechat } from './Livechat';
Expand Down
2 changes: 1 addition & 1 deletion app/livechat/server/methods/closeByVisitor.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';

import { settings } from '../../../settings';
import { Rooms, LivechatVisitors } from '../../../models';
Expand Down
2 changes: 1 addition & 1 deletion app/livechat/server/startup.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';

import { roomTypes } from '../../utils';
import { Rooms } from '../../models';
Expand Down
2 changes: 1 addition & 1 deletion app/livestream/client/views/liveStreamTab.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
import { Blaze } from 'meteor/blaze';
import { Session } from 'meteor/session';
import { Template } from 'meteor/templating';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import toastr from 'toastr';

import { auth } from '../oauth.js';
Expand Down
2 changes: 1 addition & 1 deletion app/mail-messages/client/views/mailer.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating';
import { Tracker } from 'meteor/tracker';
import { TAPi18n } from 'meteor/tap:i18n';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import toastr from 'toastr';

import { settings } from '../../../settings';
Expand Down
Loading