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

Replace some use of "entreprise" (fr) in the code with "enterprise" for consistency #2443

Closed
kristinalim opened this issue Jul 9, 2018 · 3 comments

Comments

@kristinalim
Copy link
Member

Replace some use of "entreprise" (fr) in the code with "enterprise" for consistency.

Description

The code uses "enterprise" in most places, but there are a few translation keys (not translation values) that use "entreprise".

I recommend that we rename these to use "enterprise" for consistency.

Why is this important?

It is normal for devs to search the code for keywords to see which places need to be updated. Inconsistent use between the two could cause confusion and possibly bugs.

(For example, I was momentarily confused when searching the code for admin_enterprise_relationships did not give the results I was expecting. The correct key is the "entreprise" counterpart.)

From below:

  • 7,559 lines use "enterprise"
  • 32 lines use "entreprise"
$ git grep -i enterprise | grep -v config/locales/ | wc -l
7559
$ git grep -i entreprise | grep -v config/locales/ | wc -l
32
$ git grep -i entreprise | grep -v config/locales/
app/assets/javascripts/admin/enterprise_groups/controllers/side_menu_controller.js.coffee:11:      { name: 'contact', label: t('admin_entreprise_groups_contact'), icon_class: "icon-phone" }
app/assets/javascripts/admin/enterprise_groups/controllers/side_menu_controller.js.coffee:12:      { name: 'web', label: t('admin_entreprise_groups_web'), icon_class: "icon-globe" }
app/views/admin/enterprise_groups/_form_address.html.haml:8:        = af.text_field :phone, { placeholder: t(:admin_entreprise_groups_contact_phone_placeholder)}
app/views/admin/enterprise_groups/_form_address.html.haml:18:        = af.text_field :address1, { placeholder: t(:admin_entreprise_groups_contact_address1_placeholder)}
app/views/admin/enterprise_groups/_form_address.html.haml:26:        = af.label :city, t(:admin_entreprise_groups_contact_city)
app/views/admin/enterprise_groups/_form_address.html.haml:28:        = af.label :zipcode, t(:admin_entreprise_groups_contact_zipcode)
app/views/admin/enterprise_groups/_form_address.html.haml:30:        = af.text_field :city, { placeholder: t(:admin_entreprise_groups_contact_city_placeholder)}
app/views/admin/enterprise_groups/_form_address.html.haml:32:        = af.text_field :zipcode, { placeholder: t(:admin_entreprise_groups_contact_zipcode_placeholder)}
app/views/admin/enterprise_groups/_form_address.html.haml:35:        = af.label :state_id, t(:admin_entreprise_groups_contact_state_id)
app/views/admin/enterprise_groups/_form_address.html.haml:36:        = af.label :country_id, t(:admin_entreprise_groups_contact_country_id)
app/views/admin/enterprise_groups/_form_images.html.haml:5:      = f.label :logo, 'ofn-with-tip' => t('admin_entreprise_groups_data_powertip_logo')
app/views/admin/enterprise_groups/_form_images.html.haml:6:      %div{'ofn-with-tip' => t('admin_entreprise_groups_data_powertip_logo')}
app/views/admin/enterprise_groups/_form_images.html.haml:13:      = f.label :promo_image, 'ofn-with-tip' => t(:admin_entreprise_groups_data_powertip_promo_image)
app/views/admin/enterprise_groups/_form_images.html.haml:14:      %div{'ofn-with-tip' => t('admin_entreprise_groups_data_powertip_promo_image')}
app/views/admin/enterprise_groups/_form_primary_details.html.haml:14:    = f.label :on_front_page, t(:admin_entreprise_groups_on_front_page)
app/views/admin/enterprise_groups/_form_primary_details.html.haml:19:    = f.label :enterprise_ids, t(:admin_entreprise_groups_entreprise)
app/views/admin/enterprise_groups/_form_users.html.haml:5:      =f.label :owner_id, t(:admin_entreprise_groups_owner)
app/views/admin/enterprise_groups/_form_users.html.haml:6:      .with-tip{'data-powertip' => t(:admin_entreprise_groups_data_powertip)}
app/views/admin/enterprise_groups/_form_web.html.haml:7:      = f.text_field :website, { placeholder: t(:admin_entreprise_groups_web_website_placeholder)}
app/views/admin/enterprise_groups/_form_web.html.haml:27:      = f.text_field :twitter, { placeholder: t(:admin_entreprise_groups_web_twitter) }
app/views/admin/enterprise_groups/index.html.haml:2:  = t 'admin_entreprise_groups'
app/views/admin/enterprise_groups/index.html.haml:12:        = t 'admin_entreprise_groups_name'
app/views/admin/enterprise_groups/index.html.haml:15:          = t 'admin_entreprise_groups_owner'
app/views/admin/enterprise_groups/index.html.haml:17:        = t 'admin_entreprise_groups_on_front_page'
app/views/admin/enterprise_groups/index.html.haml:19:        = t 'admin_entreprise_groups_entreprise'
app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml:4:    = t 'admin_entreprise_relationships_permits'
app/views/admin/enterprise_relationships/_form.html.haml:6:    = t 'admin_entreprise_relationships_permits'
app/views/admin/enterprise_relationships/_form.html.haml:12:        = t 'admin_entreprise_relationships_everything'
app/views/admin/enterprise_relationships/_form.html.haml:18:    %input{type: "button", value: t(:admin_entreprise_relationships_button_create), "ng-click" => "create()"}
app/views/admin/enterprise_relationships/_search_input.html.haml:1:%input.search{"ng-model" => "query", "placeholder" => t(:admin_entreprise_relationships_seach_placeholder)}
app/views/admin/enterprise_relationships/index.html.haml:2:  = t 'admin_entreprise_relationships'
app/views/spree/admin/reports/users_and_enterprises.html.haml:3:    .alpha.two.columns= label_tag nil, t(:report_entreprises)
@sauloperez
Copy link
Contributor

Feel free to fix it @kristinalim

@daniellemoorhead
Copy link
Contributor

Hey @kristinalim you ok to get take this one?

@kristinalim
Copy link
Member Author

@sauloperez Sorry, I missed your earlier comment!

@daniellemoorhead Sure! I'll take care of it after updating two other pull requests.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

4 participants