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.

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

BZ#1525883 CFME SSUI My Orders - Oder page has untranslated entries #1500

Merged
merged 1 commit into from
Nov 28, 2018
Merged

BZ#1525883 CFME SSUI My Orders - Oder page has untranslated entries #1500

merged 1 commit into from
Nov 28, 2018

Conversation

AllenBW
Copy link
Member

@AllenBW AllenBW commented Nov 27, 2018 •
edited
Loading

fixes https://bugzilla.redhat.com/show_bug.cgi?id=1525883

I know we don't usually include the .pot... but master is woefully outta date, plus this relates to this bz

this looks righter

screen shot 2018-11-27 at 11 33 54 am

@AllenBW AllenBW requested a review from himdel November 27, 2018 17:49
@AllenBW
Copy link
Member Author

AllenBW commented Nov 27, 2018 •
edited
Loading

@simaishi 28ea294 is the only commit that should be backported from this work

@AllenBW AllenBW added this to the Sprint 100 Ending Dec 3, 2018 milestone Nov 27, 2018
@AllenBW AllenBW force-pushed the BZ/#1525883-untranslated-order-strings branch from c13ea6a to 54fbb3c Compare November 27, 2018 17:59
@simaishi
Copy link
Contributor

@simaishi 28ea294 is the only commit that should be backported from this work

Since I cherry-pick PR's merge commit, I can't selectively backport a commit from a multi-commit PR. Are you able to split them up to 2 PRs?

@AllenBW
Copy link
Member Author

AllenBW commented Nov 27, 2018

Oh snap, ok yeah i can do that, I thought it was by commit

@AllenBW AllenBW force-pushed the BZ/#1525883-untranslated-order-strings branch from 54fbb3c to 9a2e6d7 Compare November 27, 2018 18:42
@miq-bot
Copy link
Member

miq-bot commented Nov 27, 2018

Checked commit AllenBW@9a2e6d7 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
0 files checked, 0 offenses detected
Everything looks fine. 🍪

@AllenBW AllenBW mentioned this pull request Nov 27, 2018
Merged
himdel
himdel approved these changes Nov 28, 2018
View reviewed changes
Copy link
Contributor

@himdel himdel left a comment

Choose a reason for hiding this comment

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

LGTM, the order names coming from the server don't really contain any useful info.

@himdel himdel merged commit f5fa74d into ManageIQ:master Nov 28, 2018
@AllenBW AllenBW deleted the BZ/#1525883-untranslated-order-strings branch November 28, 2018 15:36
simaishi pushed a commit that referenced this pull request Dec 3, 2018
@himdel @simaishi
Merge pull request #1500 from AllenBW/BZ/#1525883-untranslated-order-…
e7e33b5 
…strings

 BZ#1525883 CFME SSUI My Orders - Oder page has untranslated entries

(cherry picked from commit f5fa74d)

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1525883
@simaishi
Copy link
Contributor

simaishi commented Dec 3, 2018

Hammer backport details:

$ git log -1
commit e7e33b5c18b8d7067dc0867b969d525820c96efd
Author: Martin Hradil <himdel@seznam.cz>
Date:   Wed Nov 28 16:24:37 2018 +0100

    Merge pull request #1500 from AllenBW/BZ/#1525883-untranslated-order-strings
    
     BZ#1525883 CFME SSUI My Orders - Oder page has untranslated entries
    
    (cherry picked from commit f5fa74db18edad1ba5b806ec99d49f66c2768358)
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1525883

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@himdel himdel himdel approved these changes

Assignees

@himdel himdel

Labels
bug hammer/backported internationalization
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@AllenBW @simaishi @miq-bot @himdel