react-i18n -> vulcan:i18n

packages/example-customization/lib/components/CustomNewsletter.jsx

@@ -9,7 +9,7 @@ functions, event handlers, etc.).
 
 import { Components, getRawComponent, replaceComponent }from 'meteor/vulcan:core';
 import React from 'react';
-import { FormattedMessage /*, intlShape */ } from 'react-intl';
+import { FormattedMessage /*, intlShape */ } from 'meteor/vulcan:i18n';
 
 class CustomNewsletter extends getRawComponent('Newsletter') {
 

packages/example-customization/lib/components/CustomPostsItem.jsx

@@ -1,6 +1,6 @@
 import { Components, getRawComponent, replaceComponent } from 'meteor/vulcan:core';
 import React from 'react';
-import { FormattedMessage, FormattedRelative } from 'react-intl';
+import { FormattedMessage, FormattedRelative } from 'meteor/vulcan:i18n';
 import { Link } from 'react-router';
 import Posts from "meteor/vulcan:posts";
 

packages/vulcan-accounts/imports/ui/components/LoginForm.jsx

@@ -4,7 +4,7 @@ import Tracker from 'tracker-component';
 import { Accounts } from 'meteor/accounts-base';
 import { KEY_PREFIX } from '../../login_session.js';
 import { Components, registerComponent, withCurrentUser } from 'meteor/vulcan:core';
-import { intlShape } from 'react-intl';
+import { intlShape } from 'meteor/vulcan:i18n';
 import { withApollo } from 'react-apollo';
 
 import {

packages/vulcan-accounts/imports/ui/components/PasswordOrService.jsx

@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { hasPasswordService } from '../../helpers.js';
 import { registerComponent } from 'meteor/vulcan:core';
-import { intlShape } from 'react-intl';
+import { intlShape } from 'meteor/vulcan:i18n';
 
 export class AccountsPasswordOrService extends PureComponent {
   render () {

packages/vulcan-base-components/lib/categories/CategoriesEditForm.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { intlShape } from 'react-intl';
+import { intlShape } from 'meteor/vulcan:i18n';
 import { Components, registerComponent, getFragment, withMessages } from 'meteor/vulcan:core';
 import Categories from "meteor/vulcan:categories";
 

packages/vulcan-base-components/lib/categories/CategoriesList.jsx

@@ -1,7 +1,7 @@
 import { ModalTrigger, Components, registerComponent, withList, Utils } from "meteor/vulcan:core";
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'meteor/vulcan:i18n';
 import { Button, DropdownButton, MenuItem } from 'react-bootstrap';
 import { withRouter } from 'react-router'
 import { LinkContainer } from 'react-router-bootstrap';

packages/vulcan-base-components/lib/categories/CategoriesNewForm.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { intlShape } from 'react-intl';
+import { intlShape } from 'meteor/vulcan:i18n';
 import { Components, registerComponent, getFragment, withMessages } from 'meteor/vulcan:core';
 import Categories from "meteor/vulcan:categories";
 

packages/vulcan-base-components/lib/comments/CommentsItem.jsx

@@ -1,7 +1,7 @@
 import { Components, registerComponent, withCurrentUser, withMessages } from 'meteor/vulcan:core';
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import { intlShape, FormattedMessage, FormattedRelative } from 'react-intl';
+import { intlShape, FormattedMessage, FormattedRelative } from 'meteor/vulcan:i18n';
 import Comments from 'meteor/vulcan:comments';
 
 class CommentsItem extends PureComponent {

packages/vulcan-base-components/lib/comments/CommentsList.jsx

@@ -1,6 +1,6 @@
 import { Components, registerComponent } from 'meteor/vulcan:core';
 import React from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'meteor/vulcan:i18n';
 
 const CommentsList = ({comments, commentCount}) => {
 

packages/vulcan-base-components/lib/comments/CommentsNewForm.jsx

@@ -2,7 +2,7 @@ import { Components, registerComponent, getFragment, withMessages } from 'meteor
 import React from 'react';
 import PropTypes from 'prop-types';
 import Comments from "meteor/vulcan:comments";
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'meteor/vulcan:i18n';
 
 const CommentsNewForm = (props, context) => {
 

packages/vulcan-base-components/lib/common/Footer.jsx

@@ -1,6 +1,6 @@
 import { registerComponent } from 'meteor/vulcan:core';
 import React from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'meteor/vulcan:i18n';
 
 const Footer = props => {
   return (

packages/vulcan-base-components/lib/common/Newsletter.jsx

@@ -1,7 +1,7 @@
 import { Components, registerComponent, withCurrentUser, withMutation, withMessages, Utils } from 'meteor/vulcan:core';
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage, intlShape } from 'react-intl';
+import { FormattedMessage, intlShape } from 'meteor/vulcan:i18n';
 import Formsy from 'formsy-react';
 import { Input } from 'formsy-react-components';
 import { Button } from 'react-bootstrap';

packages/vulcan-base-components/lib/common/NewsletterButton.jsx

@@ -1,6 +1,6 @@
 import { Components, registerComponent, withMutation, withCurrentUser, withMessages, Utils } from 'meteor/vulcan:core';
 import React, { PropTypes, Component } from 'react';
-import { FormattedMessage, intlShape } from 'react-intl';
+import { FormattedMessage, intlShape } from 'meteor/vulcan:i18n';
 import { Button } from 'react-bootstrap';
 
 class NewsletterButton extends Component {

packages/vulcan-base-components/lib/common/SearchForm.jsx

@@ -1,6 +1,6 @@
 import { registerComponent, Components } from 'meteor/vulcan:core';
 import React, { PropTypes, Component } from 'react';
-import { intlShape } from 'react-intl';
+import { intlShape } from 'meteor/vulcan:i18n';
 import Formsy from 'formsy-react';
 import FRC from 'formsy-react-components';
 import { withRouter, Link } from 'react-router'

packages/vulcan-base-components/lib/common/Vote.jsx

@@ -3,7 +3,7 @@ import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { withVote, hasUpvoted, hasDownvoted } from 'meteor/vulcan:voting';
-import { /*FormattedMessage,*/ intlShape } from 'react-intl';
+import { /*FormattedMessage,*/ intlShape } from 'meteor/vulcan:i18n';
 
 class Vote extends PureComponent {
 

packages/vulcan-base-components/lib/posts/PostsCommentsThread.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'meteor/vulcan:i18n';
 import { withList, withCurrentUser, Components, registerComponent, Utils } from 'meteor/vulcan:core';
 import Comments from 'meteor/vulcan:comments';
 

packages/vulcan-base-components/lib/posts/PostsDailyList.jsx

@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import moment from 'moment';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'meteor/vulcan:i18n';
 import Posts from 'meteor/vulcan:posts';
 import { withCurrentUser, withList, getSetting, Components, getRawComponent, registerComponent } from 'meteor/vulcan:core';
 

packages/vulcan-base-components/lib/posts/PostsEditForm.jsx

@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { Components, registerComponent, getFragment, withMessages } from 'meteor/vulcan:core';
-import { intlShape } from 'react-intl';
+import { intlShape } from 'meteor/vulcan:i18n';
 import Posts from "meteor/vulcan:posts";
 import { withRouter } from 'react-router'
 

packages/vulcan-base-components/lib/posts/PostsItem.jsx

@@ -1,7 +1,7 @@
 import { Components, registerComponent, ModalTrigger } from 'meteor/vulcan:core';
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage, FormattedRelative } from 'react-intl';
+import { FormattedMessage, FormattedRelative } from 'meteor/vulcan:i18n';
 import { Link } from 'react-router';
 import Posts from "meteor/vulcan:posts";
 

packages/vulcan-base-components/lib/posts/PostsList.jsx

@@ -3,7 +3,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import Posts from 'meteor/vulcan:posts';
 import { Alert } from 'react-bootstrap';
-import { FormattedMessage, intlShape } from 'react-intl';
+import { FormattedMessage, intlShape } from 'meteor/vulcan:i18n';
 import classNames from 'classnames';
 
 const Error = ({error}) => <Alert className="flash-message" bsStyle="danger"><FormattedMessage id={error.id} values={{value: error.value}}/>{error.message}</Alert>

packages/vulcan-base-components/lib/posts/PostsLoadMore.jsx

@@ -1,6 +1,6 @@
 import { registerComponent } from 'meteor/vulcan:core';
 import React from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'meteor/vulcan:i18n';
 
 const PostsLoadMore = ({loadMore, count, totalCount}) => {
   return (

packages/vulcan-base-components/lib/posts/PostsNewButton.jsx

@@ -1,7 +1,7 @@
 import { Components, registerComponent, withCurrentUser } from 'meteor/vulcan:core';
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage, intlShape } from 'react-intl';
+import { FormattedMessage, intlShape } from 'meteor/vulcan:i18n';
 import { Button } from 'react-bootstrap';
 
 const PostsNewButton = (props, context) => {

packages/vulcan-base-components/lib/posts/PostsNewForm.jsx

@@ -2,7 +2,7 @@ import { Components, registerComponent, getRawComponent, getFragment, withMessag
 import Posts from "meteor/vulcan:posts";
 import React from 'react';
 import PropTypes from 'prop-types';
-import { intlShape, FormattedMessage } from 'react-intl';
+import { intlShape, FormattedMessage } from 'meteor/vulcan:i18n';
 import { withRouter } from 'react-router'
 
 const PostsNewForm = (props, context) => 

packages/vulcan-base-components/lib/posts/PostsNoMore.jsx

@@ -1,6 +1,6 @@
 import { registerComponent } from 'meteor/vulcan:core';
 import React from "react";
-import { FormattedMessage } from "react-intl";
+import { FormattedMessage } from 'meteor/vulcan:i18n';
 
 const PostsNoMore = props => <p className="posts-no-more"><FormattedMessage id="posts.no_more"/></p>;
 

packages/vulcan-base-components/lib/posts/PostsNoResults.jsx

@@ -1,6 +1,6 @@
 import { registerComponent } from 'meteor/vulcan:core';
 import React from 'react';
-import { FormattedMessage } from "react-intl";
+import { FormattedMessage } from 'meteor/vulcan:i18n';
 
 const PostsNoResults = props => <p className="posts-no-results"><FormattedMessage id="posts.no_results"/></p>;
 

packages/vulcan-base-components/lib/posts/PostsPage.jsx

@@ -3,7 +3,7 @@ import Posts from 'meteor/vulcan:posts';
 import React, { Component, PropTypes } from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'meteor/vulcan:i18n';
 
 class PostsPage extends Component {
   

packages/vulcan-base-components/lib/posts/PostsViews.jsx

@@ -1,7 +1,7 @@
 import { registerComponent, withCurrentUser } from 'meteor/vulcan:core';
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage, intlShape } from 'react-intl';
+import { FormattedMessage, intlShape } from 'meteor/vulcan:i18n';
 import { DropdownButton, MenuItem } from 'react-bootstrap';
 import { LinkContainer } from 'react-router-bootstrap';
 import { withRouter } from 'react-router'

packages/vulcan-base-components/lib/users/UsersAccountMenu.jsx

@@ -1,6 +1,6 @@
 import { Components, registerComponent } from 'meteor/vulcan:core';
 import React, { PropTypes, Component } from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'meteor/vulcan:i18n';
 import { Dropdown } from 'react-bootstrap';
 import { STATES } from 'meteor/vulcan:accounts';
 

packages/vulcan-base-components/lib/users/UsersEditForm.jsx

@@ -1,7 +1,7 @@
 import { Components, registerComponent, withCurrentUser, withMessages } from 'meteor/vulcan:core';
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage, intlShape } from 'react-intl';
+import { FormattedMessage, intlShape } from 'meteor/vulcan:i18n';
 import Users from 'meteor/vulcan:users';
 import { STATES } from 'meteor/vulcan:accounts';
 

packages/vulcan-base-components/lib/users/UsersMenu.jsx

@@ -1,7 +1,7 @@
 import { Components, registerComponent, withCurrentUser } from 'meteor/vulcan:core';
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'meteor/vulcan:i18n';
 import { Meteor } from 'meteor/meteor';
 import { Dropdown, MenuItem } from 'react-bootstrap';
 import { LinkContainer } from 'react-router-bootstrap';

packages/vulcan-base-components/lib/users/UsersProfile.jsx

@@ -1,6 +1,6 @@
 import { Components, registerComponent, withDocument, withCurrentUser } from 'meteor/vulcan:core';
 import React from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'meteor/vulcan:i18n';
 import Users from 'meteor/vulcan:users';
 import { Link } from 'react-router';
 

packages/vulcan-base-components/lib/users/UsersProfileCheck.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Modal } from 'react-bootstrap';
 import Users from 'meteor/vulcan:users';
 import { withDocument, Components, registerComponent, withMessages } from 'meteor/vulcan:core';
-import { FormattedMessage, intlShape } from 'react-intl';
+import { FormattedMessage, intlShape } from 'meteor/vulcan:i18n';
 import { gql } from 'react-apollo';
 
 const UsersProfileCheck = ({currentUser, document, loading, flash}, context) => {

packages/vulcan-base-components/lib/users/UsersResetPassword.jsx

@@ -2,7 +2,7 @@ import { Components, registerComponent, withCurrentUser } from 'meteor/vulcan:co
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { Link } from 'react-router';
-import { intlShape } from 'react-intl';
+import { intlShape } from 'meteor/vulcan:i18n';
 
 class UsersResetPassword extends PureComponent {
   componentDidMount() {

packages/vulcan-core/lib/modules/components/App.jsx

@@ -1,9 +1,10 @@
 import { Components, registerComponent, getSetting, Strings } from 'meteor/vulcan:lib';
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import { IntlProvider, intlShape} from 'react-intl';
+import { IntlProvider, intlShape} from 'meteor/vulcan:i18n';
 import withCurrentUser from '../containers/withCurrentUser.js';
 
+import { FormattedMessage } from 'meteor/vulcan:i18n';
 
 class App extends PureComponent {
 

packages/vulcan-core/lib/modules/components/Error404.jsx

@@ -1,6 +1,6 @@
 import { registerComponent } from 'meteor/vulcan:lib';
 import React from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'meteor/vulcan:i18n';
 
 const Error404 = () => {
   return (

packages/vulcan-core/package.js

@@ -11,6 +11,7 @@ Package.onUse(function(api) {
 
   api.use([
     'vulcan:lib@1.4.0',
+    'vulcan:i18n@1.4.0',
     'vulcan:users@1.4.0',
     'vulcan:routing@1.4.0'
   ]);

packages/vulcan-debug/lib/components/Settings.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'meteor/vulcan:i18n';
 import { getSetting, registerComponent, Components } from 'meteor/vulcan:core';
 
 const renderSetting = key => (

packages/vulcan-embedly/lib/components/EmbedlyURL.jsx

@@ -1,7 +1,7 @@
 import { Components, registerComponent, Utils, getSetting } from 'meteor/vulcan:core';
 import { withMutation } from 'meteor/vulcan:core';
 import React, { PropTypes, Component } from 'react';
-import { FormattedMessage, intlShape } from 'react-intl';
+import { FormattedMessage, intlShape } from 'meteor/vulcan:i18n';
 import FRC from 'formsy-react-components';
 
 const Input = FRC.Input;

packages/vulcan-forms/lib/Form.jsx

@@ -25,7 +25,7 @@ This component expects:
 import { Components, Utils, runCallbacks } from 'meteor/vulcan:core';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage, intlShape } from 'react-intl';
+import { FormattedMessage, intlShape } from 'meteor/vulcan:i18n';
 import Formsy from 'formsy-react';
 import { Button } from 'react-bootstrap';
 import Flash from "./Flash.jsx";

packages/vulcan-forms/lib/FormComponent.jsx

@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import Formsy from 'formsy-react';
 import FRC from 'formsy-react-components';
-import { intlShape } from 'react-intl';
+import { intlShape } from 'meteor/vulcan:i18n';
 import DateTime from './DateTime.jsx';
 
 // import Utils from './utils.js';

packages/vulcan-forms/lib/FormWrapper.jsx

@@ -26,7 +26,7 @@ component is also added to wait for withDocument's loading prop to be false)
 
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import { intlShape } from 'react-intl';
+import { intlShape } from 'meteor/vulcan:i18n';
 import { withApollo, compose } from 'react-apollo';
 import { Components, registerComponent, withCurrentUser, Utils, withNew, withEdit, withRemove } from 'meteor/vulcan:core';
 import Form from './Form.jsx';

packages/vulcan-lib/lib/modules/index.js

@@ -4,7 +4,7 @@ import './settings.js';
 import './collections.js';
 import './deep.js';
 import './deep_extend.js';
-import './intl_polyfill.js';
+// import './intl_polyfill.js';
 import './graphql.js';
 import './icons.js';
 import './mongo_redux.js';

packages/vulcan-lib/lib/server/main.js

@@ -1,5 +1,6 @@
 import './oauth_config.js';
 import './apollo_server.js';
+import './intl_polyfill.js';
 
 export * from './meteor_patch.js';
 export * from '../modules/index.js';

packages/vulcan-newsletter/lib/components/NewsletterSubscribe.jsx

@@ -1,7 +1,7 @@
 import { Components, withMessages } from 'meteor/vulcan:core';
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import { intlShape } from 'react-intl';
+import { intlShape } from 'meteor/vulcan:i18n';
 
 // this component is used as a custom controller in user's account edit (cf. ./custom_fields.js)
 class NewsletterSubscribe extends PureComponent {

packages/vulcan-payments/lib/components/Checkout.jsx

@@ -2,7 +2,7 @@ import React from 'react'
 import StripeCheckout from 'react-stripe-checkout';
 import { Components, registerComponent, getSetting, withCurrentUser, withMessages } from 'meteor/vulcan:core';
 import Users from 'meteor/vulcan:users';
-import { intlShape } from 'react-intl';
+import { intlShape } from 'meteor/vulcan:i18n';
 import classNames from 'classnames';
 import withCreateCharge from '../containers/withCreateCharge.js';
 import { Products } from '../modules/products.js';

packages/vulcan-subscribe/lib/components/SubscribeTo.jsx

@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import { intlShape, FormattedMessage } from 'react-intl';
+import { intlShape, FormattedMessage } from 'meteor/vulcan:i18n';
 import { compose, graphql } from 'react-apollo';
 import gql from 'graphql-tag';
 import Users from 'meteor/vulcan:users';