Skip to content

Updating Key Extractor to allow for more flexible markup #21

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

Merged
jpomykala merged 1 commit into from
Oct 13, 2020
Merged

Updating Key Extractor to allow for more flexible markup #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/main/java/io/simplelocalize/cli/processor/keys/ReactIntlKeyExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,26 @@ public Set<String> extractKeysFromFile(Path filePath) {

private Set<String> matchDefineMessageIds(String fileContent) {
fileContent = fileContent.replaceAll("\\s+", "");
return Pattern.compile("(?<=defineMessages\\(\\{id:[\"|\'])(.*?)(?=[\"|\'])")
return Pattern.compile("defineMessages\\(\\{\\s*?\\n?\\s*?(?>[\\s?\\w]+:\\s?\\{\\s?)*?id:\\s?[\"|'](.*?)(?=[\"|'])")
.matcher(fileContent)
.results()
.map(MatchResult::group)
.map(mapper -> mapper.group(1))
.collect(Collectors.toSet());
}

private Set<String> matchFormattedHTMLMessageIds(String fileContent) {
return Pattern.compile("(?<=<FormattedHTMLMessage id=\")(.*?)(?=\")")
return Pattern.compile("<FormattedHTMLMessage\\s*?(?:\\S*)\\s*?id=\"(.*?)(?=\")")
.matcher(fileContent)
.results()
.map(MatchResult::group)
.collect(Collectors.toSet());
}

private Set<String> matchFormattedMessageIds(String fileContent) {
return Pattern.compile("(?<=<FormattedMessage id=\")(.*?)(?=\")")
return Pattern.compile("<FormattedMessage\\s*?(?:\\S*)\\s*?id=\"(.*?)(?=[\"|'])")
.matcher(fileContent)
.results()
.map(MatchResult::group)
.map(mapper -> mapper.group(1))
.collect(Collectors.toSet());
}

Expand Down
9 changes: 6 additions & 3 deletions src/test/resources/react-intl/UserPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,11 @@ class UserPage extends Component {
icon="plane"/>&nbsp;{user.visitsCount}</h2>
<h5 className="text-muted">
<FormattedMessage


defaultMessage="Visits"
id="VISITS"
defaultMessage="Visits"

/>
</h5>
</Col>
Expand Down Expand Up @@ -211,9 +214,9 @@ class UserPage extends Component {
null}

<h2 className="text-center">
<FormattedMessage
<FormattedMessage defaultMessage="Achievements"
id="ACHIEVEMENTS"
defaultMessage="Achievements"

/>
</h2>
<h4 className="text-muted text-center">
Expand Down