diff --git a/app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml b/app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml index 996bc487d8..b4e865f083 100644 --- a/app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml +++ b/app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml @@ -1,6 +1,7 @@ %tr{"ng-repeat" => "enterprise_relationship in EnterpriseRelationships.enterprise_relationships | keywords:query"} %td {{ enterprise_relationship.parent_name }} - %td permits + %td + = t 'admin_entreprise_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 433f9f4ca0..300b096424 100644 --- a/app/views/admin/enterprise_relationships/_form.html.haml +++ b/app/views/admin/enterprise_relationships/_form.html.haml @@ -3,17 +3,17 @@ %select{name: "enterprise_relationship_parent_id", "ng-model" => "parent_id", "ng-options" => "e.id as e.name for e in Enterprises.my_enterprises"} %td - permits + = t 'admin_entreprise_relationships_permits' %td %select{name: "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()"}} - Everything + = t 'admin_entreprise_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: "Create", "ng-click" => "create()"} + %input{type: "button", value: t(:admin_entreprise_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 b8bcbc62c6..350089dc4f 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" => "Search"} +%input.search{"ng-model" => "query", "placeholder" => t(:admin_entreprise_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/config/locales/en.yml b/config/locales/en.yml index 1d9f7a6120..7e1274739c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -659,6 +659,10 @@ Please follow the instructions there to make your enterprise visible on the Open included_tax: "Included tax" remove_tax: "Remove tax" admin_entreprise_relationships: "Enterprise Relationships" + 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" @@ -669,7 +673,6 @@ Please follow the instructions there to make your enterprise visible on the Open admin_entreprise_groups_data_powertip_logo: "This is the logo" admin_entreprise_groups_data_powertip_promo_image: "This image is displayed at the top of the Group profile" admin_entreprise_groups_data_powertip_promo_image_tip: "This image is displayed at the top of the Group profile" - admin_entreprise_groups_what_s_this: "What's this ?" admin_entreprise_groups_about: "About" admin_entreprise_groups_images: "Images" admin_entreprise_groups_contact: "Contact" @@ -684,6 +687,7 @@ Please follow the instructions there to make your enterprise visible on the Open admin_entreprise_groups_web: "Web Resources" admin_entreprise_groups_web_twitter: "eg. @the_prof" admin_entreprise_groups_web_website_placeholder: "eg. www.truffles.com" +<<<<<<< HEAD admin_order_cycles: "Admin Order Cycles" open: "Open" close: "Close" @@ -731,3 +735,4 @@ Please follow the instructions there to make your enterprise visible on the Open on_hand: "On hand" save_changes: "Save changes" update_action: "update()" + admin_entreprise_groups_what_s_this: "What's this ?"