diff --git a/app/models/sheet_year.rb b/app/models/sheet_year.rb index 2189835..967debd 100644 --- a/app/models/sheet_year.rb +++ b/app/models/sheet_year.rb @@ -13,7 +13,7 @@ class SheetYear < ActiveRecord::Base - JOIN_TYPE = {1 => "Individuel", 2 => "Familial", 3 =>"Association"} + JOIN_TYPE = {1 => "Individuelle", 2 => "Familiale", 3 =>"Association"} PAYMENT_TYPE = {1 => "Chèque", 2 => "Liquide", 3 => "Paypal (ou carte bancaire)"} before_validation do diff --git a/app/views/public/joins/paid.html.haml b/app/views/public/joins/paid.html.haml index 2013891..a622b84 100644 --- a/app/views/public/joins/paid.html.haml +++ b/app/views/public/joins/paid.html.haml @@ -26,7 +26,7 @@ %p Montant de l'adhésion : =number_to_currency f.object.amount - =# f.input :join_type, :collection => {"Individuel (10€)" => 1, "Familial (15€)" => 2}, :as => :select, :label => "Type d'adhésion :", :include_blank => false + =# f.input :join_type, :collection => {"Individuelle (10€)" => 1, "Familiale (15€)" => 2}, :as => :select, :label => "Type d'adhésion :", :include_blank => false diff --git a/app/views/public/joins/select_sheet.html.haml b/app/views/public/joins/select_sheet.html.haml index 95da7b4..907e5c4 100644 --- a/app/views/public/joins/select_sheet.html.haml +++ b/app/views/public/joins/select_sheet.html.haml @@ -44,7 +44,7 @@ %br =form.input :error_join, :label => false, :input_html => {:style => "display:none;"} - = f.input :join_type, :collection => {"Individuel (10€)" => 1, "Familial (15€)" => 2}, :as => :select, :label => "Type d'adhésion :", :include_blank => false + = f.input :join_type, :collection => {"Individuelle (10€)" => 1, "Familiale (15€)" => 2}, :as => :select, :label => "Type d'adhésion :", :include_blank => false =f.input :benefactor, :label => "Adhésion bienfaiteur ? (somme libre au dessus de 20€)", :input_html => {:onchange => "if($(this).is(':checked')){$('.bienfaiteur').show();}else{$('.bienfaiteur').hide();}"} diff --git a/app/views/public/renews/select_sheet.html.haml b/app/views/public/renews/select_sheet.html.haml index 46363b7..0d4b2b4 100644 --- a/app/views/public/renews/select_sheet.html.haml +++ b/app/views/public/renews/select_sheet.html.haml @@ -1,4 +1,4 @@ -%h1 Renouveller mon adhésion +%h1 Renouveler mon adhésion %p Pour renouveller votre adhésion vous pouvez indiquer votre numéro d'adhérent ci-dessous : @@ -28,5 +28,5 @@ - =f.submit "Renouveller mon adhésion par CB" + =f.submit "Renouveler mon adhésion par CB" diff --git a/app/views/public/shared/_top.html.haml b/app/views/public/shared/_top.html.haml index 4a3d988..0bfe1f6 100644 --- a/app/views/public/shared/_top.html.haml +++ b/app/views/public/shared/_top.html.haml @@ -3,7 +3,7 @@ =link_to image_tag("/logo_pic_vert_w.png", :id => "logo"), "/" #personnal_menu - =link_to "Renouveller mon adhésion »", select_sheet_public_renews_index_path + =link_to "Renouveler mon adhésion »", select_sheet_public_renews_index_path =link_to "Adhérer »", select_sheet_public_joins_path =link_to "Accès au forum »", "/forum" #menu