From 2587eaf3cca817712373d04b200d049b9422919a Mon Sep 17 00:00:00 2001
From: Sylvain <bond.never.die@gmail.com>
Date: Thu, 31 Mar 2016 12:59:29 +0200
Subject: [PATCH] [feature] link to CGV in about page

---
 app/assets/javascripts/controllers/about.coffee | 4 ++++
 app/assets/templates/shared/about.html.erb      | 5 ++++-
 config/locales/app.public.en.yml                | 1 +
 config/locales/app.public.fr.yml                | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/controllers/about.coffee b/app/assets/javascripts/controllers/about.coffee
index f91ab061f..62ab6969b 100644
--- a/app/assets/javascripts/controllers/about.coffee
+++ b/app/assets/javascripts/controllers/about.coffee
@@ -16,4 +16,8 @@ Application.Controllers.controller "AboutController", ['$scope', 'Setting', 'Cus
   # retrieve the CGU
   CustomAsset.get {name: 'cgu-file'}, (cgu) ->
     $scope.cgu = cgu.custom_asset
+
+  # retrieve the CGV
+  CustomAsset.get {name: 'cgv-file'}, (cgv) ->
+    $scope.cgv = cgv.custom_asset
 ]
diff --git a/app/assets/templates/shared/about.html.erb b/app/assets/templates/shared/about.html.erb
index a4c2337e5..c3059e3cf 100644
--- a/app/assets/templates/shared/about.html.erb
+++ b/app/assets/templates/shared/about.html.erb
@@ -11,7 +11,10 @@
     <div class="col-sm-offset-1 col-md-offset-3 col-sm-7 col-md-5 col-lg-4 m-b-lg">
       <span ng-bind-html="aboutBody.value"></span>
       <p ng-show="cgu">
-        <a href="{{cgu.custom_asset_file_attributes.attachment_url}}" target="_blank" translate translate>{{ 'read_the_fablab_policy' }}</a>
+        <a href="{{cgu.custom_asset_file_attributes.attachment_url}}" target="_blank" translate>{{ 'read_the_fablab_policy' }}</a>
+      </p>
+      <p ng-show="cgv">
+        <a href="{{cgv.custom_asset_file_attributes.attachment_url}}" target="_blank" translate>{{ 'read_the_fablab_s_general_terms_and_conditions' }}</a>
       </p>
     </div>
 
diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml
index 843fff01a..1cd8a6118 100644
--- a/config/locales/app.public.en.yml
+++ b/config/locales/app.public.en.yml
@@ -92,6 +92,7 @@ en:
       about:
         # about page
         read_the_fablab_policy: "Read the FabLab policy"
+        read_the_fablab_s_general_terms_and_conditions: "Read the FabLab's general terms and conditions"
         your_fablab_s_contacts: "Your FabLab's contacts"
 
       home:
diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml
index 67a3422d3..ca6ee56ce 100644
--- a/config/locales/app.public.fr.yml
+++ b/config/locales/app.public.fr.yml
@@ -92,6 +92,7 @@ fr:
       about:
         # page à propos
         read_the_fablab_policy: "Consulter les règles d'utilisation du Fab Lab"
+        read_the_fablab_s_general_terms_and_conditions: "Consulter les conditions générales de vente du Fab Lab"
         your_fablab_s_contacts: "Vos contacts au Fab Lab"
 
       home: