From f5c44ef0e6c7bfe68730e5e33e22c0842f7a12f8 Mon Sep 17 00:00:00 2001 From: Kristina Lim Date: Fri, 31 Aug 2018 15:15:50 +0800 Subject: [PATCH] Rename "entreprise" in i18n keys to "enterprise" --- .../side_menu_controller.js.coffee | 4 +- .../enterprise_groups/_form_address.html.haml | 16 +++--- .../enterprise_groups/_form_images.html.haml | 8 +-- .../_form_primary_details.html.haml | 4 +- .../enterprise_groups/_form_users.html.haml | 4 +- .../enterprise_groups/_form_web.html.haml | 4 +- .../admin/enterprise_groups/index.html.haml | 10 ++-- .../_enterprise_relationship.html.haml | 2 +- .../enterprise_relationships/_form.html.haml | 6 +-- .../_search_input.html.haml | 2 +- .../enterprise_relationships/index.html.haml | 2 +- .../reports/users_and_enterprises.html.haml | 2 +- config/locales/en.yml | 52 +++++++++---------- 13 files changed, 58 insertions(+), 58 deletions(-) diff --git a/app/assets/javascripts/admin/enterprise_groups/controllers/side_menu_controller.js.coffee b/app/assets/javascripts/admin/enterprise_groups/controllers/side_menu_controller.js.coffee index f69c5365d5..1006ac7aa4 100644 --- a/app/assets/javascripts/admin/enterprise_groups/controllers/side_menu_controller.js.coffee +++ b/app/assets/javascripts/admin/enterprise_groups/controllers/side_menu_controller.js.coffee @@ -8,8 +8,8 @@ angular.module("admin.enterprise_groups") { name: 'users', label: t('users'), icon_class: "icon-user" } { name: 'about', label: t('about'), icon_class: "icon-pencil" } { name: 'images', label: t('images'), icon_class: "icon-picture" } - { name: 'contact', label: t('admin_entreprise_groups_contact'), icon_class: "icon-phone" } - { name: 'web', label: t('admin_entreprise_groups_web'), icon_class: "icon-globe" } + { name: 'contact', label: t('admin_enterprise_groups_contact'), icon_class: "icon-phone" } + { name: 'web', label: t('admin_enterprise_groups_web'), icon_class: "icon-globe" } ] $scope.select(0) diff --git a/app/views/admin/enterprise_groups/_form_address.html.haml b/app/views/admin/enterprise_groups/_form_address.html.haml index 2b8add5392..1e93c5f7f9 100644 --- a/app/views/admin/enterprise_groups/_form_address.html.haml +++ b/app/views/admin/enterprise_groups/_form_address.html.haml @@ -5,7 +5,7 @@ .alpha.three.columns = af.label :phone .omega.eight.columns - = af.text_field :phone, { placeholder: t(:admin_entreprise_groups_contact_phone_placeholder)} + = af.text_field :phone, { placeholder: t(:admin_enterprise_groups_contact_phone_placeholder)} .row .alpha.three.columns = f.label :email @@ -15,7 +15,7 @@ .three.columns.alpha = af.label :address1 .eight.columns.omega - = af.text_field :address1, { placeholder: t(:admin_entreprise_groups_contact_address1_placeholder)} + = af.text_field :address1, { placeholder: t(:admin_enterprise_groups_contact_address1_placeholder)} .row .alpha.three.columns = af.label :address2 @@ -23,17 +23,17 @@ = af.text_field :address2 .row .three.columns.alpha - = af.label :city, t(:admin_entreprise_groups_contact_city) + = af.label :city, t(:admin_enterprise_groups_contact_city) \/ - = af.label :zipcode, t(:admin_entreprise_groups_contact_zipcode) + = af.label :zipcode, t(:admin_enterprise_groups_contact_zipcode) .four.columns - = af.text_field :city, { placeholder: t(:admin_entreprise_groups_contact_city_placeholder)} + = af.text_field :city, { placeholder: t(:admin_enterprise_groups_contact_city_placeholder)} .four.columns.omega - = af.text_field :zipcode, { placeholder: t(:admin_entreprise_groups_contact_zipcode_placeholder)} + = af.text_field :zipcode, { placeholder: t(:admin_enterprise_groups_contact_zipcode_placeholder)} .row .three.columns.alpha - = af.label :state_id, t(:admin_entreprise_groups_contact_state_id) - = af.label :country_id, t(:admin_entreprise_groups_contact_country_id) + = af.label :state_id, t(:admin_enterprise_groups_contact_state_id) + = af.label :country_id, t(:admin_enterprise_groups_contact_country_id) .four.columns = af.collection_select :state_id, af.object.country.states, :id, :name, {}, :class => "select2 fullwidth" .four.columns.omega diff --git a/app/views/admin/enterprise_groups/_form_images.html.haml b/app/views/admin/enterprise_groups/_form_images.html.haml index 7add7c914a..aa31913a20 100644 --- a/app/views/admin/enterprise_groups/_form_images.html.haml +++ b/app/views/admin/enterprise_groups/_form_images.html.haml @@ -2,16 +2,16 @@ %legend {{menu.selected.label}} .row .alpha.three.columns - = f.label :logo, 'ofn-with-tip' => t('admin_entreprise_groups_data_powertip_logo') - %div{'ofn-with-tip' => t('admin_entreprise_groups_data_powertip_logo')} + = f.label :logo, 'ofn-with-tip' => t('admin_enterprise_groups_data_powertip_logo') + %div{'ofn-with-tip' => t('admin_enterprise_groups_data_powertip_logo')} %a= t 'admin.whats_this' .omega.eight.columns = image_tag @object.logo.url if @object.logo.present? = f.file_field :logo .row .alpha.three.columns - = f.label :promo_image, 'ofn-with-tip' => t(:admin_entreprise_groups_data_powertip_promo_image) - %div{'ofn-with-tip' => t('admin_entreprise_groups_data_powertip_promo_image')} + = f.label :promo_image, 'ofn-with-tip' => t(:admin_enterprise_groups_data_powertip_promo_image) + %div{'ofn-with-tip' => t('admin_enterprise_groups_data_powertip_promo_image')} %a= t 'admin.whats_this' .omega.eight.columns = image_tag @object.promo_image.url if @object.promo_image.present? diff --git a/app/views/admin/enterprise_groups/_form_primary_details.html.haml b/app/views/admin/enterprise_groups/_form_primary_details.html.haml index f003963b4e..ad40764fac 100644 --- a/app/views/admin/enterprise_groups/_form_primary_details.html.haml +++ b/app/views/admin/enterprise_groups/_form_primary_details.html.haml @@ -11,12 +11,12 @@ = f.text_field :description = f.field_container :on_front_page do - = f.label :on_front_page, t(:admin_entreprise_groups_on_front_page) + = f.label :on_front_page, t(:admin_enterprise_groups_on_front_page) %br/ = f.check_box :on_front_page = f.field_container :enterprise_ids do - = f.label :enterprise_ids, t(:admin_entreprise_groups_entreprise) + = f.label :enterprise_ids, t(:admin_enterprise_groups_enterprise) %br/ = f.collection_select :enterprise_ids, @enterprises, :id, :name, {}, {class: "select2 fullwidth", multiple: true} diff --git a/app/views/admin/enterprise_groups/_form_users.html.haml b/app/views/admin/enterprise_groups/_form_users.html.haml index 22ac7921ca..f96212064e 100644 --- a/app/views/admin/enterprise_groups/_form_users.html.haml +++ b/app/views/admin/enterprise_groups/_form_users.html.haml @@ -2,8 +2,8 @@ %legend {{menu.selected.label}} .row .three.columns.alpha - =f.label :owner_id, t(:admin_entreprise_groups_owner) - .with-tip{'data-powertip' => t(:admin_entreprise_groups_data_powertip)} + =f.label :owner_id, t(:admin_enterprise_groups_owner) + .with-tip{'data-powertip' => t(:admin_enterprise_groups_data_powertip)} %a = t 'admin.whats_this' .eight.columns.omega diff --git a/app/views/admin/enterprise_groups/_form_web.html.haml b/app/views/admin/enterprise_groups/_form_web.html.haml index e0de2f7159..ad155ac95c 100644 --- a/app/views/admin/enterprise_groups/_form_web.html.haml +++ b/app/views/admin/enterprise_groups/_form_web.html.haml @@ -4,7 +4,7 @@ .alpha.three.columns = f.label :website .omega.eight.columns - = f.text_field :website, { placeholder: t(:admin_entreprise_groups_web_website_placeholder)} + = f.text_field :website, { placeholder: t(:admin_enterprise_groups_web_website_placeholder)} .row .alpha.three.columns = f.label :facebook, 'Facebook' @@ -24,4 +24,4 @@ .alpha.three.columns = f.label :twitter .omega.eight.columns - = f.text_field :twitter, { placeholder: t(:admin_entreprise_groups_web_twitter) } + = f.text_field :twitter, { placeholder: t(:admin_enterprise_groups_web_twitter) } diff --git a/app/views/admin/enterprise_groups/index.html.haml b/app/views/admin/enterprise_groups/index.html.haml index 2540c64980..93d7ee81ba 100644 --- a/app/views/admin/enterprise_groups/index.html.haml +++ b/app/views/admin/enterprise_groups/index.html.haml @@ -1,5 +1,5 @@ = content_for :page_title do - = t 'admin_entreprise_groups' + = t 'admin_enterprise_groups' - if admin_user? = content_for :page_actions do @@ -9,14 +9,14 @@ %thead %tr %th - = t 'admin_entreprise_groups_name' + = t 'admin_enterprise_groups_name' - if spree_current_user.admin? %th - = t 'admin_entreprise_groups_owner' + = t 'admin_enterprise_groups_owner' %th - = t 'admin_entreprise_groups_on_front_page' + = t 'admin_enterprise_groups_on_front_page' %th - = t 'admin_entreprise_groups_entreprise' + = t 'admin_enterprise_groups_enterprise' %th.actions %tbody diff --git a/app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml b/app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml index 05e6505868..c1c6ccbc4b 100644 --- a/app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml +++ b/app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml @@ -1,7 +1,7 @@ %tr{"ng-repeat" => "enterprise_relationship in EnterpriseRelationships.enterprise_relationships | keywords:query"} %td {{ enterprise_relationship.parent_name }} %td - = t 'admin_entreprise_relationships_permits' + = t 'admin_enterprise_relationships_permits' %td {{ enterprise_relationship.child_name }} %td %ul diff --git a/app/views/admin/enterprise_relationships/_form.html.haml b/app/views/admin/enterprise_relationships/_form.html.haml index 4d68d61e1b..958ce53074 100644 --- a/app/views/admin/enterprise_relationships/_form.html.haml +++ b/app/views/admin/enterprise_relationships/_form.html.haml @@ -3,17 +3,17 @@ %select.select2.fullwidth{id: "enterprise_relationship_parent_id", "ng-model" => "parent_id", "ng-options" => "e.id as e.name for e in Enterprises.my_enterprises"} %td - = t 'admin_entreprise_relationships_permits' + = t 'admin_enterprise_relationships_permits' %td %select.select2.fullwidth{id: "enterprise_relationship_child_id", "ng-model" => "child_id", "ng-options" => "e.id as e.name for e in Enterprises.all_enterprises"} %td %label %input{type: "checkbox", ng: {checked: "allPermissionsChecked()", click: "checkAllPermissions()"}} - = t 'admin_entreprise_relationships_everything' + = t 'admin_enterprise_relationships_everything' %div{"ng-repeat" => "permission in EnterpriseRelationships.all_permissions"} %label %input{type: "checkbox", "ng-model" => "permissions[permission]"} to {{ EnterpriseRelationships.permission_presentation(permission) }} %td.actions - %input{type: "button", value: t(:admin_entreprise_relationships_button_create), "ng-click" => "create()"} + %input{type: "button", value: t(:admin_enterprise_relationships_button_create), "ng-click" => "create()"} .errors {{ EnterpriseRelationships.create_errors }} diff --git a/app/views/admin/enterprise_relationships/_search_input.html.haml b/app/views/admin/enterprise_relationships/_search_input.html.haml index 350089dc4f..a85f201b91 100644 --- a/app/views/admin/enterprise_relationships/_search_input.html.haml +++ b/app/views/admin/enterprise_relationships/_search_input.html.haml @@ -1,4 +1,4 @@ -%input.search{"ng-model" => "query", "placeholder" => t(:admin_entreprise_relationships_seach_placeholder)} +%input.search{"ng-model" => "query", "placeholder" => t(:admin_enterprise_relationships_seach_placeholder)} %label{ng: {repeat: "permission in EnterpriseRelationships.all_permissions"}} %input{type: "checkbox", ng: {click: "$parent.query = toggleKeyword($parent.query, permission)"}} diff --git a/app/views/admin/enterprise_relationships/index.html.haml b/app/views/admin/enterprise_relationships/index.html.haml index bdff595f09..c9a12531f0 100644 --- a/app/views/admin/enterprise_relationships/index.html.haml +++ b/app/views/admin/enterprise_relationships/index.html.haml @@ -1,5 +1,5 @@ - content_for :page_title do - = t 'admin_entreprise_relationships' + = t 'admin_enterprise_relationships' = render 'admin/shared/enterprises_sub_menu' diff --git a/app/views/spree/admin/reports/users_and_enterprises.html.haml b/app/views/spree/admin/reports/users_and_enterprises.html.haml index d7a521911f..4c74a79e0d 100644 --- a/app/views/spree/admin/reports/users_and_enterprises.html.haml +++ b/app/views/spree/admin/reports/users_and_enterprises.html.haml @@ -1,6 +1,6 @@ = form_tag spree.users_and_enterprises_admin_reports_url do |f| .row - .alpha.two.columns= label_tag nil, t(:report_entreprises) + .alpha.two.columns= label_tag nil, t(:report_enterprises) .omega.fourteen.columns= select_tag(:enterprise_id_in, options_from_collection_for_select(Enterprise.all, :id, :name, params[:enterprise_id_in].andand.split(",")), {class: "select2 fullwidth", multiple: true}) .row diff --git a/config/locales/en.yml b/config/locales/en.yml index 14eb3ebaf7..161e240f13 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1995,31 +1995,31 @@ See the %{link} to find out more about %{sitename}'s features and to start using you_have_no_orders_yet: "You have no orders yet" running_balance: "Running balance" outstanding_balance: "Outstanding balance" - admin_entreprise_relationships: "Enterprise Permissions" - admin_entreprise_relationships_everything: "Everything" - admin_entreprise_relationships_permits: "permits" - admin_entreprise_relationships_seach_placeholder: "Search" - admin_entreprise_relationships_button_create: "Create" - admin_entreprise_groups: "Enterprise Groups" - admin_entreprise_groups_name: "Name" - admin_entreprise_groups_owner: "Owner" - admin_entreprise_groups_on_front_page: "On front page ?" - admin_entreprise_groups_entreprise: "Enterprises" - admin_entreprise_groups_data_powertip: "The primary user responsible for this group." - admin_entreprise_groups_data_powertip_logo: "This is the logo for the group" - admin_entreprise_groups_data_powertip_promo_image: "This image is displayed at the top of the Group profile" - admin_entreprise_groups_contact: "Contact" - admin_entreprise_groups_contact_phone_placeholder: "eg. 98 7654 3210" - admin_entreprise_groups_contact_address1_placeholder: "eg. 123 High Street" - admin_entreprise_groups_contact_city: "Suburb" - admin_entreprise_groups_contact_city_placeholder: "eg. Northcote" - admin_entreprise_groups_contact_zipcode: "Postcode" - admin_entreprise_groups_contact_zipcode_placeholder: "eg. 3070" - admin_entreprise_groups_contact_state_id: "State" - admin_entreprise_groups_contact_country_id: "Country" - admin_entreprise_groups_web: "Web Resources" - admin_entreprise_groups_web_twitter: "eg. @the_prof" - admin_entreprise_groups_web_website_placeholder: "eg. www.truffles.com" + admin_enterprise_relationships: "Enterprise Permissions" + admin_enterprise_relationships_everything: "Everything" + admin_enterprise_relationships_permits: "permits" + admin_enterprise_relationships_seach_placeholder: "Search" + admin_enterprise_relationships_button_create: "Create" + admin_enterprise_groups: "Enterprise Groups" + admin_enterprise_groups_name: "Name" + admin_enterprise_groups_owner: "Owner" + admin_enterprise_groups_on_front_page: "On front page ?" + admin_enterprise_groups_enterprise: "Enterprises" + admin_enterprise_groups_data_powertip: "The primary user responsible for this group." + admin_enterprise_groups_data_powertip_logo: "This is the logo for the group" + admin_enterprise_groups_data_powertip_promo_image: "This image is displayed at the top of the Group profile" + admin_enterprise_groups_contact: "Contact" + admin_enterprise_groups_contact_phone_placeholder: "eg. 98 7654 3210" + admin_enterprise_groups_contact_address1_placeholder: "eg. 123 High Street" + admin_enterprise_groups_contact_city: "Suburb" + admin_enterprise_groups_contact_city_placeholder: "eg. Northcote" + admin_enterprise_groups_contact_zipcode: "Postcode" + admin_enterprise_groups_contact_zipcode_placeholder: "eg. 3070" + admin_enterprise_groups_contact_state_id: "State" + admin_enterprise_groups_contact_country_id: "Country" + admin_enterprise_groups_web: "Web Resources" + admin_enterprise_groups_web_twitter: "eg. @the_prof" + admin_enterprise_groups_web_website_placeholder: "eg. www.truffles.com" admin_order_cycles: "Admin Order Cycles" open: "Open" close: "Close" @@ -2157,7 +2157,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using report_payment_totals: 'Payment Totals' report_all: 'all' report_order_cycle: "Order Cycle: " - report_entreprises: "Enterprises: " + report_enterprises: "Enterprises: " report_users: "Users: " report_tax_rates: Tax rates report_tax_types: Tax types