Skip to content

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

Merged
maxme merged 3 commits into
release/14.5from
issue/update-translations-for-14.5
Apr 3, 2020
Merged

Merge gutenberg strings in the main strings.xml file#11585
maxme merged 3 commits into
release/14.5from
issue/update-translations-for-14.5

Conversation

@maxme

@maxme maxme commented Apr 3, 2020

Copy link
Copy Markdown
Contributor

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

peril-wordpress-mobile Bot commented Apr 3, 2020

Copy link
Copy Markdown

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

@maxme

maxme commented Apr 3, 2020

Copy link
Copy Markdown
Contributor Author

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

maxme commented Apr 3, 2020

Copy link
Copy Markdown
Contributor Author

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 commented Apr 3, 2020

Copy link
Copy Markdown
Contributor Author

@maxme

maxme commented Apr 3, 2020

Copy link
Copy Markdown
Contributor Author

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 left a comment

Copy link
Copy Markdown
Contributor

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 👍

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>

Copy link
Copy Markdown
Contributor

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
Copy Markdown
Contributor Author

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
Copy Markdown
Contributor

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 left a comment

Copy link
Copy Markdown
Contributor

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants