Skip to content

Message extraction fails when using both Globalize.formatMessage and <FormatMessage> #5

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.

Sign up for GitHub

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

Closed
alunny wants to merge 2 commits into from
Closed

Message extraction fails when using both Globalize.formatMessage and <FormatMessage> #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f37fa16
extract default messages from Globalize functions
alunny Oct 1, 2015
ce52f74
move globalize2 transform to extract-transforms
alunny Oct 2, 2015
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
7 changes: 0 additions & 7 deletions lib/extract-default-messages-transforms/index.js
View file
Open in desktop

This file was deleted.

7 changes: 6 additions & 1 deletion lib/extract-default-messages-visitors/global-globalize-format-message.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,18 @@ var sanitizePath = require("../util/sanitize-message-path");
var Syntax = esprima.Syntax;

module.exports = {
displayName: "Globalize.formatMessage visitor",
Copy link
Collaborator Author

@alunny alunny Oct 1, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found this useful during debugging - not strictly necessary.

Copy link
Owner

@rxaviers rxaviers Oct 1, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting 👍


test: function(node) {
return node.type === Syntax.CallExpression &&
node.callee.type === Syntax.MemberExpression &&
node.callee.object.type === Syntax.Identifier &&
node.callee.object.name === "Globalize" &&
node.callee.property.type === Syntax.Identifier &&
node.callee.property.name === "formatMessage";
(
node.callee.property.name === "formatMessage" ||
node.callee.property.name === "messageFormatter"
);
},

getDefaultMessage: function(node) {
Expand Down
2 changes: 2 additions & 0 deletions lib/extract-default-messages-visitors/react-globalize-format-message.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ var sanitizePath = require("../util/sanitize-message-path");
var Syntax = esprima.Syntax;

module.exports = {
displayName: "<FormatMessage> visitor",

test: function(node) {
return node.type === Syntax.CallExpression &&
node.callee.type === Syntax.MemberExpression &&
Expand Down
2 changes: 1 addition & 1 deletion lib/extract-default-messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var esprima = require("esprima");
var extend = require("util")._extend;
var fs = require("fs");
var transforms = require("./extract-default-messages-transforms/index");
var transforms = require("./extract-transforms/index");
var visitors = require("./extract-default-messages-visitors/index");

function traverse(ast, iterate) {
Expand Down
0 ...abel-globalize2-default-into-globalize.js → ...abel-globalize2-default-into-globalize.js
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions lib/extract-transforms/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
module.exports = [
require("./babel-globalize2-default-into-globalize"),
require("./babel-react2-default-into-react"),
require("./babel-react-globalize"),

Expand Down
21 changes: 21 additions & 0 deletions test/fixtures/es6-both.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
* es6 code with both FormatMessage and Globalize.formatMessage
*/
import Globalize from 'globalize';
import { FormatMessage } from 'react-globalize';
import React from 'react';

const label = Globalize.formatMessage('Header');
const photoTitle = Globalize.messageFormatter(
`{user}'s {count, plural,
one {photo}
other {photos}}`
);

export default class Header extends React.Component {
render() {
return <div aria-label={label}>
<FormatMessage>My Header</FormatMessage>
</div>;
}
}
11 changes: 11 additions & 0 deletions test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ function getFixtureAst(filename) {
var fixtures = {
es6: getFixtureAst("es6.jsx"),
es6addons: getFixtureAst("es6-addOn.jsx"),
es6both: getFixtureAst("es6-both.jsx"),
jsx1: getFixtureAst("jsx1.jsx"),
jsx2: getFixtureAst("jsx2.jsx"),
};
Expand Down Expand Up @@ -44,6 +45,16 @@ describe("Extract ReactGlobalize default messages", function() {
"View More People"
);
});

it("should extract from both components and Globalize functions", function() {
var defaultMessages = reactGlobalizeCompiler.extractDefaultMessages(fixtures.es6both);
expect(defaultMessages).to.be.an("object");
expect(defaultMessages).to.include.keys(
"(user)'s (count, plural, one (photo) other (photos))",
"Header",
"My Header"
);
});
});

describe("Extract ReactGlobalize formatters", function() {
Expand Down