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

Fixes Norwegian localization for shields and rewards. #2717

Merged
merged 1 commit into from
Jun 18, 2019

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Jun 16, 2019

Fixes brave/brave-browser#3425
Uplift request from #2709

Submitter Checklist:

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

After-merge Checklist:

  • The associated issue milestone is set to the smallest version that the
    changes has landed on.
  • All relevant documentation has been updated.

@mkarolin mkarolin added this to the 0.66.x - Beta milestone Jun 16, 2019
@mkarolin mkarolin requested a review from a team June 16, 2019 16:31
@mkarolin mkarolin self-assigned this Jun 16, 2019
kjozwiak
kjozwiak previously approved these changes Jun 18, 2019
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 0.66.x approved after going through #2709 (comment). Please ensure that the correct labels are being used and that the appropriate issue is moved into the correct milestone.

@kjozwiak kjozwiak self-requested a review June 18, 2019 05:25
@kjozwiak
Copy link
Member

@mkarolin can you take a look at the following conflicts before merging into 0.66.x?:

* components/brave_extension/extension/brave_extension/_locales/nb/messages.json
* components/brave_rewards/resources/extension/brave_rewards/_locales/nb/messages.json

Fixes Norwegian localization for shields and rewards.
@mkarolin mkarolin force-pushed the maxk-fix-norwegian-l10n-0.66.x branch from 4576422 to f178033 Compare June 18, 2019 14:03
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 0.66.x approved. Went through #2709 (comment) and ensured that the PR was working on 0.68.57 Chromium: 75.0.3770.90. Please make sure that all the labels are correctly being used and that the appropriate issue is moved into the correct milestone.

Checked the Jenkins failures, looks like it's lint issues and failure to upload xUnit report. Should be safe to uplift 👍

@mkarolin mkarolin merged commit 32e074c into 0.66.x Jun 18, 2019
@mkarolin mkarolin deleted the maxk-fix-norwegian-l10n-0.66.x branch June 18, 2019 21:09
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.

2 participants