fix formatjs setup, #62

This commit is contained in:
or-else
2021-01-26 13:58:59 -08:00
parent a319e2b0bc
commit 1172adefb4
8 changed files with 22 additions and 13 deletions
+9
View File
@@ -1,4 +1,13 @@
{ {
"presets": ["@babel/preset-react", "@babel/preset-env"], "presets": ["@babel/preset-react", "@babel/preset-env"],
"comments": false, "comments": false,
"plugins": [
[
"formatjs",
{
"idInterpolationPattern": "[sha512:contenthash:base64:6]",
"ast": true
}
]
]
} }
+1 -1
View File
@@ -67,8 +67,8 @@
"@babel/core": "^7.12.10", "@babel/core": "^7.12.10",
"@babel/preset-env": "^7.12.11", "@babel/preset-env": "^7.12.11",
"@babel/preset-react": "^7.12.10", "@babel/preset-react": "^7.12.10",
"@formatjs/cli": "^3.0.1",
"babel-loader": "^8.2.2", "babel-loader": "^8.2.2",
"babel-plugin-formatjs": "^9.0.2",
"browserslist": "^4.16.1", "browserslist": "^4.16.1",
"copy-webpack-plugin": "^6.4.1", "copy-webpack-plugin": "^6.4.1",
"cssnano": "^4.1.10", "cssnano": "^4.1.10",
+4 -4
View File
@@ -240,7 +240,7 @@ class TinodeWeb extends React.Component {
console.log("Failed to register service worker:", err); console.log("Failed to register service worker:", err);
}); });
} catch (err) { } catch (err) {
this.handleError(formatMessage({id: 'push_init_failed'}), 'err'); this.handleError(formatMessage(messages.push_init_failed), 'err');
console.log("Failed to initialize push notifications", err); console.log("Failed to initialize push notifications", err);
this.setState({desktopAlertsEnabled: false}); this.setState({desktopAlertsEnabled: false});
} }
@@ -361,7 +361,7 @@ class TinodeWeb extends React.Component {
if (online) { if (online) {
this.handleError(); this.handleError();
} else { } else {
this.handleError(this.props.intl.formatMessage({id: 'no_connection'}), 'warn'); this.handleError(this.props.intl.formatMessage(messages.no_connection), 'warn');
} }
this.setState({liveConnection: online}); this.setState({liveConnection: online});
} }
@@ -484,7 +484,7 @@ class TinodeWeb extends React.Component {
if (ctrl.code >= 300 && ctrl.text === 'validate credentials') { if (ctrl.code >= 300 && ctrl.text === 'validate credentials') {
this.setState({loadSpinnerVisible: false}); this.setState({loadSpinnerVisible: false});
if (cred) { if (cred) {
this.handleError(this.props.intl.formatMessage({id: 'code_doesnot_match'}), 'warn'); this.handleError(this.props.intl.formatMessage(messages.code_doesnot_match), 'warn');
} }
this.handleCredentialsRequest(ctrl.params); this.handleCredentialsRequest(ctrl.params);
} else { } else {
@@ -1375,7 +1375,7 @@ class TinodeWeb extends React.Component {
handleResetPassword(scheme, newPassword, token) { handleResetPassword(scheme, newPassword, token) {
token = base64ReEncode(token); token = base64ReEncode(token);
if (!token) { if (!token) {
this.handleError(this.props.intl.formatMessage({id: 'invalid_security_token'}), 'err'); this.handleError(this.props.intl.formatMessage(messages.invalid_security_token), 'err');
} else { } else {
this.tinode.connect() this.tinode.connect()
.then(() => { .then(() => {
+4 -4
View File
@@ -107,7 +107,7 @@ class ContextMenu extends React.Component {
title: formatMessage(messages.clear_messages), title: formatMessage(messages.clear_messages),
handler: (params, errorHandler) => { handler: (params, errorHandler) => {
return props.onShowAlert( return props.onShowAlert(
formatMessage({id: 'menu_item_clear_messages'}), // title formatMessage(messages.menu_item_clear_messages), // title
formatMessage({id: 'clear_messages_warning'}), // content formatMessage({id: 'clear_messages_warning'}), // content
(() => { this.deleteMessages(true, false, params, errorHandler); }), // onConfirm (() => { this.deleteMessages(true, false, params, errorHandler); }), // onConfirm
null, // "OK" null, // "OK"
@@ -121,7 +121,7 @@ class ContextMenu extends React.Component {
title: formatMessage(messages.clear_for_all), title: formatMessage(messages.clear_for_all),
handler: (params, errorHandler) => { handler: (params, errorHandler) => {
return props.onShowAlert( return props.onShowAlert(
formatMessage({id: 'menu_item_clear_messages_for_all'}), // title formatMessage(messages.menu_item_clear_messages_for_all), // title
formatMessage({id: 'delete_messages_warning'}), // content formatMessage({id: 'delete_messages_warning'}), // content
(() => { return this.deleteMessages(true, true, params, errorHandler); }), (() => { return this.deleteMessages(true, true, params, errorHandler); }),
null, // "OK" null, // "OK"
@@ -171,7 +171,7 @@ class ContextMenu extends React.Component {
title: formatMessage(messages.block), title: formatMessage(messages.block),
handler: (params, errorHandler) => { handler: (params, errorHandler) => {
return props.onShowAlert( return props.onShowAlert(
formatMessage({id: 'menu_item_block'}), // title formatMessage(messages.menu_item_block), // title
formatMessage(messages.topic_block_warning), // content formatMessage(messages.topic_block_warning), // content
(() => { (() => {
return this.topicPermissionSetter('-JP', params, errorHandler).then((ctrl) => { return this.topicPermissionSetter('-JP', params, errorHandler).then((ctrl) => {
@@ -190,7 +190,7 @@ class ContextMenu extends React.Component {
title: formatMessage(messages.topic_delete), title: formatMessage(messages.topic_delete),
handler: (params, errorHandler) => { handler: (params, errorHandler) => {
return props.onShowAlert( return props.onShowAlert(
formatMessage({id: 'menu_item_delete_topic'}), // title formatMessage(messages.menu_item_delete_topic), // title
formatMessage(messages.topic_delete_warning), // content formatMessage(messages.topic_delete_warning), // content
(() => { (() => {
const topic = this.props.tinode.getTopic(params.topicName); const topic = this.props.tinode.getTopic(params.topicName);
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long