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

I18n various pieces #3118

Merged
merged 5 commits into from
Jun 11, 2015
Merged

I18n various pieces #3118

merged 5 commits into from
Jun 11, 2015

Conversation

martinpovolny
Copy link
Member

I will update the .po files in a different PR because that is a hell to rebase and will have to be redone for the production anyway...

Replaces #3046 and #3043

@himdel
Copy link
Contributor

himdel commented Jun 10, 2015

ACK :)

@martinpovolny
Copy link
Member Author

@himdel : fixed + removed the line of javascript that seems to be dead code as there's no #navcontainer around

@miq-bot
Copy link
Member

miq-bot commented Jun 10, 2015

Checked commits martinpovolny@dff5413 .. martinpovolny@79e3d78 with rubocop 0.27.1
4 files checked, 20 offenses detected

vmdb/app/controllers/configuration_controller.rb

vmdb/app/views/dashboard/_login_more.html.haml

  • 🔴 Warn - Line 20, Col - - Hash attribute should end with one space before the closing brace
  • 🔴 Warn - Line 20, Col - - Hash attribute should start with one space after the opening brace

vmdb/app/views/layouts/_user_options.html.haml

  • 🔴 Warn - Line 19, Col - - Hash attribute should end with one space before the closing brace
  • 🔴 Warn - Line 19, Col - - Hash attribute should start with one space after the opening brace
  • 🔴 Warn - Line 19, Col - - Line is too long. [84/80]
  • 🔴 Warn - Line 21, Col - - Line is too long. [88/80]
  • 🔴 Warn - Line 28, Col - - Line is too long. [115/80]
  • 🔴 Warn - Line 28, Col - - Hash attribute should end with one space before the closing brace
  • 🔴 Warn - Line 28, Col - - Hash attribute should start with one space after the opening brace

@martinpovolny
Copy link
Member Author

@himdel : so with the last change we are good to merge, right?

dclarizio pushed a commit that referenced this pull request Jun 11, 2015
@dclarizio dclarizio merged commit d688a9e into ManageIQ:master Jun 11, 2015
@dclarizio dclarizio added this to the Sprint 25 Ending June 22, 2015 milestone Jun 11, 2015
@dclarizio dclarizio added the ui label Jun 11, 2015
@himdel
Copy link
Contributor

himdel commented Jun 11, 2015

@martinpovolny right :)

@martinpovolny martinpovolny deleted the i18n_logout2 branch November 28, 2017 18:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants