Skip to content
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.

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

views/badges etc i18n #15021

Merged
merged 5 commits into from Oct 20, 2021
Merged

views/badges etc i18n #15021

merged 5 commits into from Oct 20, 2021

Conversation

yheuhtozr
Copy link
Contributor

@yheuhtozr yheuhtozr commented Oct 12, 2021 •
edited by juliannatetreault

What type of PR is this? (check all applicable)

  • Refactor
  • Feature
  • Bug Fix
  • Optimization
  • Documentation Update

Description

Extracts strings for i18n from app/views/badges and related. Attached fr locales for testing purposes. Existing translations up to #15002 reflected (hopefully).

Related Tickets & Documents

Relates to #14888

QA Instructions, Screenshots, Recordings

UI accessibility concerns?

Added/updated tests?

  • Yes
  • No, and this is why: please replace this line with details on why tests
    have not been included
  • I need help with writing tests

[Forem core team only] How will this change be communicated?

Will this PR introduce a change that impacts Forem members or creators, the
development process, or any of our internal teams? If so, please note how you
will share this change with the people who need to know about it.

  • I've updated the Developer Docs or
    Storybook (for Crayons components)
  • This PR changes the Forem platform and our documentation needs to be
    updated. I have filled out the
    Changes Requested
    issue template so Community Success can help update the Admin Docs
    appropriately.
  • I've updated the README or added inline documentation
  • I've added an entry to
    CHANGELOG.md
  • I will share this change in a Changelog
    or in a forem.dev post
  • I will share this change internally with the appropriate teams
  • I'm not sure how best to communicate this change and need help
  • This change does not need to be communicated, and this is why not: this is ongoing work related to a large, ongoing initiative.

[optional] Are there any post deployment tasks we need to perform?

N/A

[optional] What gif best describes this PR or how it makes you feel?

alt_text

@pr-triage pr-triage bot added the PR: unreviewed bot applied label for PR's with no review label Oct 12, 2021
@github-actions
Copy link
Contributor

Thank you for opening this PR! We appreciate you!

For all pull requests coming from third-party forks we will need to
review the PR before we can process it through our CI pipelines.

A Forem Team member will review this contribution and get back to
you as soon as possible!

@juliannatetreault
Copy link
Contributor

juliannatetreault commented Oct 14, 2021 •
edited

Hey @yheuhtozr! 👋 Can you please update your branch with the latest code from the repository’s main branch? i18n files weren’t being loaded properly and we have merged a fix for this. Thanks so much in advance and please do not hesitate to reach out if you need help!

citizen428
citizen428 reviewed Oct 15, 2021
View reviewed changes
app/views/badges/show.html.erb Outdated
@@ -1,8 +1,8 @@
<% title "#{@badge.title} Badge" %>
<% title t("views.badges.meta.name"), title: @badge.title %>
Copy link
Contributor

Choose a reason for hiding this comment

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

I think .meta. is not necessary here, views.badges.name should be enough. I understand that the second one has emojis on both sides but I'd consider leaving them off from the actual translation and interpolating between them since they are symmetrical that would also work for RTL languages.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is tempting to unify them, but beware that emoji is not totally synonymous across the world. I prefer letting translators change those symbols in case they make no sense in their locale.

Copy link
Contributor

Choose a reason for hiding this comment

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

Fair enough. If it were up to me we wouldn't be using any emoji at all in our copy.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removing emoji would be a base text change, which is a design decision. If you are sure it should be done, please let me know.

juliannatetreault
juliannatetreault approved these changes Oct 15, 2021
View reviewed changes
Copy link
Contributor

@juliannatetreault juliannatetreault left a comment •
edited

Choose a reason for hiding this comment

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

I left a few suggestions on keeping interpolations consistent across the files, otherwise, nice work!

config/locales/views/misc/en.yml Show resolved Hide resolved
config/locales/views/misc/fr.yml Show resolved Hide resolved
@pr-triage pr-triage bot added PR: partially-approved bot applied label for PR's where a single reviewer approves changes PR: unreviewed bot applied label for PR's with no review and removed PR: unreviewed bot applied label for PR's with no review PR: partially-approved bot applied label for PR's where a single reviewer approves changes labels Oct 15, 2021
@pr-triage pr-triage bot added PR: partially-approved bot applied label for PR's where a single reviewer approves changes and removed PR: unreviewed bot applied label for PR's with no review labels Oct 15, 2021
citizen428
citizen428 approved these changes Oct 18, 2021
View reviewed changes
Copy link
Contributor

@citizen428 citizen428 left a comment

Choose a reason for hiding this comment

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

I'm pre-emptively approving this but the merge conflicts need to be fixed first.

@pr-triage pr-triage bot added PR: reviewed-approved bot applied label for PR's where reviewer approves changes PR: unreviewed bot applied label for PR's with no review and removed PR: partially-approved bot applied label for PR's where a single reviewer approves changes PR: reviewed-approved bot applied label for PR's where reviewer approves changes labels Oct 18, 2021
@pr-triage pr-triage bot added PR: reviewed-approved bot applied label for PR's where reviewer approves changes and removed PR: unreviewed bot applied label for PR's with no review labels Oct 18, 2021
citizen428
citizen428 approved these changes Oct 19, 2021
View reviewed changes
app/views/badges/show.html.erb Outdated
@@ -1,8 +1,8 @@
<% title "#{@badge.title} Badge" %>
<% title t("views.badges.meta.name"), title: @badge.title %>
Copy link
Contributor

Choose a reason for hiding this comment

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

Fair enough. If it were up to me we wouldn't be using any emoji at all in our copy.

@juliannatetreault
Copy link
Contributor

Hi, @yheuhtozr 👋 It looks like there is a failing spec, which can be found here, and some merge conflicts to resolve, but once those two things are taken care of and all of the checks pass, I will happily merge your work! 🚀

@pr-triage pr-triage bot added PR: unreviewed bot applied label for PR's with no review and removed PR: reviewed-approved bot applied label for PR's where reviewer approves changes labels Oct 20, 2021
@yheuhtozr
Copy link
Contributor Author

yheuhtozr commented Oct 20, 2021 •
edited

@juliannatetreault I debugged one error hoping it will get rid of the spec failure. Conflicts resolved but it overwrites the same files with #15083, so that one should have conflicts again if this one's got merged.

@juliannatetreault
Copy link
Contributor

@juliannatetreault I debugged one error hoping it will get rid of the spec failure. Conflicts resolved but it overwrites the same files with #15083, so that one should have conflicts again if this one's got merged.

Ah, okay and thank you, @yheuhtozr! I'm going to go ahead and merge this one. 🚀

@juliannatetreault juliannatetreault merged commit 8b87086 into forem:main Oct 20, 2021
@pr-triage pr-triage bot added PR: merged bot applied label for PR's that are merged and removed PR: unreviewed bot applied label for PR's with no review labels Oct 20, 2021
citizen428 pushed a commit that referenced this pull request Oct 29, 2021
@yheuhtozr @citizen428
views/badges etc i18n (#15021)
384fc56 
* views/badges etc i18n

* reformat for PR

* remove ja.yml

* PR argument error fix?
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@citizen428 citizen428 citizen428 approved these changes

@juliannatetreault juliannatetreault juliannatetreault approved these changes

Assignees
No one assigned
Labels
PR: merged bot applied label for PR's that are merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@yheuhtozr @juliannatetreault @citizen428