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

[DARGA] toolbars i18n fixes #9744

Merged
merged 18 commits into from Jul 13, 2016

Conversation

mzazrivec
Copy link
Contributor

i18n toolbar fixes for the darga branch. The PR contains cherry-picks from the following
master pull requests:

#9501
#9508
#9510
#9512
#9572
#9621

@martinpovolny

Martin Povolny and others added 12 commits July 12, 2016 13:25
Reasons:
1. using ui_lookup here means using string interpolations inside
a gettext call.
2. easier translation work & better translations in general
(declensions, conjugations, etc)

(cherry picked from commit d5daf4f)
(cherry picked from commit 6946eb0)
@martinpovolny
Copy link

and #8149

@chessbyte chessbyte changed the title Darga toolbars i18n fixes [DARGA] toolbars i18n fixes Jul 12, 2016
@chessbyte chessbyte self-assigned this Jul 12, 2016
@Fryguy
Copy link
Member

Fryguy commented Jul 12, 2016

@martinpovolny Are those last few commits cherry-picks, or did you create them just for darga? If the former, can you update the commit message with the (cherry picked from commit SHA) text (or just re-cherry-pick with git cherry-pick -x)

@martinpovolny
Copy link

@Fryguy : done

@Fryguy Fryguy removed the darga/yes label Jul 12, 2016
@miq-bot
Copy link
Member

miq-bot commented Jul 12, 2016

Checked commits mzazrivec/manageiq@9c9d2ef~...e510627 with ruby 2.2.5, rubocop 0.37.2, and haml-lint 0.16.1
76 files checked, 61 offenses detected

app/helpers/application_helper/toolbar/auth_key_pair_cloud_center.rb

app/helpers/application_helper/toolbar/auth_key_pair_clouds_center.rb

app/helpers/application_helper/toolbar/condition_center.rb

app/helpers/application_helper/toolbar/conditions_center.rb

app/helpers/application_helper/toolbar/container_center.rb

app/helpers/application_helper/toolbar/container_group_center.rb

app/helpers/application_helper/toolbar/container_groups_center.rb

app/helpers/application_helper/toolbar/container_image_registries_center.rb

app/helpers/application_helper/toolbar/container_image_registry_center.rb

app/helpers/application_helper/toolbar/container_node_center.rb

app/helpers/application_helper/toolbar/container_nodes_center.rb

app/helpers/application_helper/toolbar/container_project_center.rb

app/helpers/application_helper/toolbar/container_projects_center.rb

app/helpers/application_helper/toolbar/container_replicator_center.rb

app/helpers/application_helper/toolbar/container_replicators_center.rb

app/helpers/application_helper/toolbar/container_route_center.rb

app/helpers/application_helper/toolbar/container_routes_center.rb

app/helpers/application_helper/toolbar/container_service_center.rb

app/helpers/application_helper/toolbar/container_services_center.rb

app/helpers/application_helper/toolbar/containers_center.rb

app/helpers/application_helper/toolbar/ems_cloud_center.rb

app/helpers/application_helper/toolbar/ems_clouds_center.rb

app/helpers/application_helper/toolbar/ems_container_center.rb

app/helpers/application_helper/toolbar/ems_containers_center.rb

app/helpers/application_helper/toolbar/ems_infra_center.rb

app/helpers/application_helper/toolbar/ems_infras_center.rb

app/helpers/application_helper/toolbar/ems_middleware_center.rb

app/helpers/application_helper/toolbar/ems_middlewares_center.rb

app/helpers/application_helper/toolbar/ems_network_center.rb

app/helpers/application_helper/toolbar/ems_networks_center.rb

app/helpers/application_helper/toolbar/miq_alert_profiles_center.rb

app/helpers/application_helper/toolbar/miq_group_center.rb

app/helpers/application_helper/toolbar/miq_groups_center.rb

app/helpers/application_helper/toolbar/miq_policies_center.rb

app/helpers/application_helper/toolbar/miq_policy_center.rb

app/helpers/application_helper/toolbar/orchestration_stack_center.rb

app/helpers/application_helper/toolbar/orchestration_stacks_center.rb

app/helpers/application_helper/toolbar/persistent_volume_center.rb

app/helpers/application_helper/toolbar/persistent_volumes_center.rb

app/helpers/application_helper/toolbar/storage_center.rb

app/helpers/application_helper/toolbar/storages_center.rb

app/helpers/application_helper/toolbar/tenant_center.rb

app/helpers/application_helper/toolbar/tenants_center.rb

app/helpers/application_helper/toolbar/user_center.rb

app/helpers/application_helper/toolbar/users_center.rb

app/helpers/application_helper/toolbar_builder.rb

app/helpers/toolbar_helper.rb

spec/helpers/application_helper/toolbar_builder_spec.rb

  • ❗ - Line 103, Col 11 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
  • ❗ - Line 104, Col 11 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
  • ❗ - Line 108, Col 11 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
  • ❗ - Line 65, Col 11 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
  • ❗ - Line 76, Col 11 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
  • ❗ - Line 77, Col 11 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.
  • ❗ - Line 81, Col 11 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.

@mzazrivec
Copy link
Contributor Author

@chessbyte This PR is ready to be tested / merged for Darga (I tested this from developer's POV
and things work correctly).

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

5 participants