Skip to content

Merge gutenberg strings in the main strings.xml file #11585

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

Jump to bottom
Merged
maxme merged 3 commits into from
Apr 3, 2020
Merged

Merge gutenberg strings in the main strings.xml file #11585

maxme merged 3 commits into from
Apr 3, 2020

Conversation

@maxme
Copy link
Contributor

@maxme maxme commented Apr 3, 2020

Merge gutenberg strings in the main strings.xml file.

@maxme maxme requested review from Tug, hypest and loremattei April 3, 2020 11:23
@maxme maxme added this to the 14.5 milestone Apr 3, 2020
@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Apr 3, 2020 •
edited
Loading

You can test the changes on this Pull Request by downloading the APK here.

@maxme
Copy link
Contributor Author

maxme commented Apr 3, 2020 •
edited
Loading

There is a lint error coming from one imported string:

/home/circleci/project/WordPress/src/main/res/values/strings.xml:2682: Error: Replace "-" with an "en dash" character (–, –) ? [TypographyDashes]
    <string name="gutenberg_native_555_555_1234" tools:ignore="UnusedResources">(555)555-1234</string>

I'll update the file manually here and open another PR to fix the script.

@maxme
Copy link
Contributor Author

maxme commented Apr 3, 2020

Please hold on reviewing that one, it seems there are some extra strings in the generated file, that might come from a missing gutenberg.pot file which should be excluded. I'll investigate and fix or comment here.

@maxme maxme force-pushed the issue/update-translations-for-14.5 branch from 0478620 to 878eada Compare April 3, 2020 14:03
@maxme maxme mentioned this pull request Apr 3, 2020
Merged
@maxme
Copy link
Contributor Author

maxme commented Apr 3, 2020 •
edited
Loading

The patch looks better after 878eada

Note after a couple of problems here, I opened:

@maxme
Copy link
Contributor Author

maxme commented Apr 3, 2020

BTW, I guess the next step is to merge release/14.5 to master so the new strings get picked up by the GlotPress script. cc @loremattei

loremattei
loremattei approved these changes Apr 3, 2020
View reviewed changes
Copy link
Contributor

@loremattei loremattei left a comment

Choose a reason for hiding this comment

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

LGTM!
I'll upload it and merge the branch into master as soon as this is merged 👍

Tug
Tug reviewed Apr 3, 2020
View reviewed changes
WordPress/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
Copy link
Contributor

@Tug Tug Apr 3, 2020

Choose a reason for hiding this comment

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

So far I've tried to manually revert this change each time. It's annoying but I haven't found a way to fix it yet

Copy link
Contributor Author

@maxme maxme Apr 3, 2020

Choose a reason for hiding this comment

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

Is this important? Or just annoying because it's different from the default android format for xml files?

Copy link
Contributor

@Tug Tug Apr 3, 2020

Choose a reason for hiding this comment

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

Not important afaik

Tug
Tug approved these changes Apr 3, 2020
View reviewed changes
Copy link
Contributor

@Tug Tug left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@maxme maxme merged commit d207c3d into release/14.5 Apr 3, 2020
@maxme maxme deleted the issue/update-translations-for-14.5 branch April 3, 2020 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hypest hypest Awaiting requested review from hypest

2 more reviewers

@Tug Tug Tug approved these changes

@loremattei loremattei loremattei approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

14.5

Development

Successfully merging this pull request may close these issues.

4 participants

@maxme @Tug @loremattei