typus 0.9.27 → 0.9.28

data/README.rdoc

@@ -141,7 +141,7 @@ This feature is a work in progress. Only previews images.
 - Komzák Nándor (Code, bugfixes & feedback) http://github.com/rubymood
 - Michael Grunewalder (German translation) http://michael.grunewalder.com
 - Tim Harvey (Code) http://www.timharvey.net/ 
-- Ned Baldessin (Code) http://github.com/nedbaldessin
+- Ned Baldessin (French translation and code) http://github.com/nedbaldessin
 - Robert Rouse (Code) - Ruby 1.9 compatibility fixes.
 
 == Acknowledgments

data/Rakefile

@@ -57,5 +57,5 @@ begin
     gemspec.authors = ["Francesc Esplugas"]
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler not available. Install it with: sudo gem install jeweler -s http://gemcutter.org"
 end

data/VERSION

@@ -1 +1 @@
-0.9.27
+0.9.28

data/app/controllers/admin/master_controller.rb

@@ -67,6 +67,8 @@ class Admin::MasterController < ApplicationController
 
   def new
 
+    check_ownership_of_referal_item
+
     item_params = params.dup
     %w( controller action resource resource_id back_to selected ).each do |param|
       item_params.delete(param)
@@ -87,7 +89,7 @@ class Admin::MasterController < ApplicationController
 
     @item = @resource[:class].new(params[:item])
 
-    if @item.attributes.include?(Typus.user_fk)
+    if @resource[:class].typus_user_id?
       @item.attributes = { Typus.user_fk => @current_user.id }
     end
 
@@ -130,7 +132,13 @@ class Admin::MasterController < ApplicationController
   end
 
   def update
+
     if @item.update_attributes(params[:item])
+
+      if @resource[:class].typus_user_id? && !@current_user.is_root?
+        @item.update_attributes Typus.user_fk => @current_user.id
+      end
+
       flash[:success] = _("{{model}} successfully updated.", :model => @resource[:class].typus_human_name)
       path = if @resource[:class].typus_options_for(:index_after_save)
                params[:back_to] ? "#{params[:back_to]}##{@resource[:self]}" : { :action => 'index' }
@@ -138,10 +146,14 @@ class Admin::MasterController < ApplicationController
                { :action => @resource[:class].typus_options_for(:default_action_on_item), :id => @item.id, :back_to => params[:back_to] }
              end
       redirect_to path
+
     else
+
       @previous, @next = @item.previous_and_next
       select_template :edit
+
     end
+
   end
 
   def destroy
@@ -247,16 +259,19 @@ private
   # If item is owned by another user, we only can perform a 
   # show action on the item. Updated item is also blocked.
   #
-  #   before_filter :check_ownership_of_item, :only => [ :edit, :update, :destroy ]
+  #   before_filter :check_ownership_of_item, :only => [ :edit, :update, :destroy, 
+  #                                                      :toggle, :position, 
+  #                                                      :relate, :unrelate ]
   #
   def check_ownership_of_item
 
-    # If current_user is a root user, by-pass.
+    # By-pass if current_user is root.
     return if @current_user.is_root?
 
-    # OPTIMIZE: `typus_users` is currently hard-coded. We should find a good name for this option.
-    if @item.respond_to?('typus_users') && !@item.send('typus_users').include?(@current_user) ||
-       @item.respond_to?(Typus.user_fk) && !@item.owned_by?(@current_user)
+    condition_typus_users = @item.respond_to?(Typus.relationship) && !@item.send(Typus.relationship).include?(@current_user)
+    condition_typus_user_id = @item.respond_to?(Typus.user_fk) && !@item.owned_by?(@current_user)
+
+    if condition_typus_users || condition_typus_user_id
        flash[:notice] = _("You don't have permission to access this item.")
        redirect_to request.referer || admin_dashboard_path
     end
@@ -268,9 +283,8 @@ private
     # By-pass if current_user is root.
     return if @current_user.is_root?
 
-    # If current user is not root and @resource has a foreign_key which 
-    # is related to the logged user (Typus.user_fk) we only show the user 
-    # related items.
+    # Show only related items it @resource has a foreign_key (Typus.user_fk) 
+    # related to the logged user.
     if @resource[:class].typus_user_id?
       condition = { Typus.user_fk => @current_user }
       @conditions = @resource[:class].merge_conditions(@conditions, condition)
@@ -278,6 +292,14 @@ private
 
   end
 
+  def check_ownership_of_referal_item
+    return unless params[:resource] && params[:resource_id]
+    klass = params[:resource].classify.constantize
+    return if !klass.typus_user_id?
+    item = klass.find(params[:resource_id])
+    raise "You're not owner of this record." unless item.owned_by?(@current_user)
+  end
+
   def set_fields
     @fields = case params[:action]
               when 'index'

data/app/controllers/typus_controller.rb

@@ -102,8 +102,12 @@ class TypusController < ApplicationController
 
     if request.post?
 
-      email, password = params[:user][:email], 'columbia'
-      user = Typus.user_class.generate(email, password)
+      password = 'columbia'
+
+      user = Typus.user_class.generate(:email => params[:user][:email], 
+                                       :password => 'columbia', 
+                                       :role => Typus::Configuration.options[:root])
+      user.status = true
 
       if user.save
         session[:typus_user_id] = user.id

data/app/helpers/admin/form_helper.rb

@@ -203,7 +203,6 @@ module Admin::FormHelper
 
   def typus_relationships
 
-    # OPTIMIZE
     @back_to = '/' + [ params[:controller], params[:action], params[:id] ].compact.join('/')
 
     returning(String.new) do |html|
@@ -297,16 +296,24 @@ module Admin::FormHelper
       reflection = @resource[:class].reflect_on_association(field.to_sym)
       association = reflection.macro
 
+      condition = !(@resource[:class].typus_user_id? && @current_user.id == @item.send(Typus.user_fk))
+
+      unless condition
+        add_new = <<-HTML
+  <small>#{link_to _("Add new"), :controller => field, :action => 'new', :back_to => @back_to, :resource => @resource[:self], :resource_id => @item.id if @current_user.can_perform?(model_to_relate, 'create')}</small>
+        HTML
+      end
+
       html << <<-HTML
 <a name="#{field}"></a>
 <div class="box_relationships">
   <h2>
   #{link_to model_to_relate.typus_human_name.pluralize, :controller => "admin/#{model_to_relate_as_resource}"}
-  <small>#{link_to _("Add new"), :controller => field, :action => 'new', :back_to => @back_to, :resource => @resource[:self], :resource_id => @item.id if @current_user.can_perform?(model_to_relate, 'create')}</small>
+  #{add_new}
   </h2>
       HTML
       items_to_relate = (model_to_relate.find(:all) - @item.send(field))
-      unless items_to_relate.empty?
+      unless condition || items_to_relate.empty?
         html << <<-HTML
   #{form_tag :action => 'relate', :id => @item.id}
   #{hidden_field :related, :model, :value => model_to_relate}

data/app/helpers/admin/sidebar_helper.rb

@@ -28,18 +28,14 @@ module Admin::SidebarHelper
       end
     end
 
-    # OPTIMIZE
     case params[:action]
     when 'show'
-      if @current_user.can_perform?(@resource[:class], 'update')
-        if @item.typus_user_id?
-          if @item.owned_by?(@current_user)
-            items << (link_to _("Edit entry"), :action => 'edit', :id => @item.id)
-          end
-        else
-          items << (link_to _("Edit entry"), :action => 'edit', :id => @item.id)
-        end
-      end
+      condition = if @resource[:class].typus_user_id? && !@current_user.is_root?
+                    @item.owned_by?(@current_user)
+                  else
+                    @current_user.can_perform?(@resource[:class], 'destroy')
+                  end
+      items << (link_to _("Edit entry"), :action => 'edit', :id => @item.id) if condition
     end
 
     @resource[:class].typus_actions_for(params[:action]).each do |action|
@@ -89,12 +85,32 @@ module Admin::SidebarHelper
 
   end
 
-  def previous_and_next
+  def previous_and_next(klass = @resource[:class])
+
     return [] unless %w( edit show update ).include?(params[:action])
+
+    # Verify ownership of record to define the kind of action which can be 
+    # performed on the record.
+
     returning(Array.new) do |items|
-      items << (link_to _("Next"), params.merge(:id => @next.id)) if @next
-      items << (link_to _("Previous"), params.merge(:id => @previous.id)) if @previous
+      if @next
+        action = if klass.typus_user_id? && !@current_user.is_root?
+                   @next.owned_by?(@current_user) ? 'edit' : 'show'
+                 else
+                   !@current_user.can_perform?(klass, 'edit') ? 'show' : params[:action]
+                 end
+        items << (link_to _("Next"), params.merge(:action => action, :id => @next.id))
+      end
+      if @previous
+        action = if klass.typus_user_id? && !@current_user.is_root?
+                   @previous.owned_by?(@current_user) ? 'edit' : 'show'
+                 else
+                   !@current_user.can_perform?(klass, 'edit') ? 'show' : params[:action]
+                 end
+        items << (link_to _("Previous"), params.merge(:action => action, :id => @previous.id))
+      end
     end
+
   end
 
   def search
@@ -178,7 +194,7 @@ function surfto_#{model_pluralized}(form) {
 <!-- /Embedded JS -->
 <form class="form" action="#"><p>
   <select name="#{model_pluralized}" onChange="surfto_#{model_pluralized}(this.form)">
-    <option value="#{url_for params_without_filter}">#{_("filter by")} #{_(model.typus_human_name)}</option>
+    <option value="#{url_for params_without_filter}">#{_("Filter by")} #{_(model.typus_human_name)}</option>
     #{items.join("\n")}
   </select>
 </p></form>

data/app/helpers/admin/table_helper.rb

@@ -33,7 +33,7 @@ module Admin::TableHelper
           end
         end
 
-        action = if item.typus_user_id? && !@current_user.is_root?
+        action = if model.typus_user_id? && !@current_user.is_root?
                    # If there's a typus_user_id column on the table and logged user is not root ...
                    item.owned_by?(@current_user) ? 'edit' : 'show'
                  elsif !@current_user.can_perform?(model, 'edit')
@@ -47,46 +47,57 @@ module Admin::TableHelper
 <td width="10px">#{content}</td>
         HTML
 
-      ##
-      # This controls the action to perform. If we are on a model list we 
-      # will remove the entry, but if we inside a model we will remove the 
-      # relationship between the models.
-      #
-      # Only shown is the user can destroy items.
-      #
-      if @current_user.can_perform?(model, 'delete')
+        ##
+        # This controls the action to perform. If we are on a model list we 
+        # will remove the entry, but if we inside a model we will remove the 
+        # relationship between the models.
+        #
+        # Only shown is the user can destroy/unrelate items.
+        #
 
         trash = "<div class=\"sprite trash\">Trash</div>"
+        unrelate = "<div class=\"sprite unrelate\">Unrelate</div>"
 
         case params[:action]
         when 'index'
-          perform = link_to trash, { :action => 'destroy', 
-                                     :id => item.id }, 
+          condition = if model.typus_user_id? && !@current_user.is_root?
+                        item.owned_by?(@current_user)
+                      else
+                        @current_user.can_perform?(model, 'destroy')
+                      end
+          perform = link_to trash, { :action => 'destroy', :id => item.id }, 
+                                     :title => _("Remove"), 
                                      :confirm => _("Remove entry?"), 
-                                     :method => :delete
-        else
-          perform = link_to trash, { :action => 'unrelate', 
-                                     :id => params[:id], 
-                                     :association => association, 
-                                     :resource => model, 
-                                     :resource_id => item.id }, 
-                                     :confirm => _("Unrelate {{unrelate_model}} from {{unrelate_model_from}}?", 
-                                     :unrelate_model => model.typus_human_name, 
-                                     :unrelate_model_from => @resource[:class].typus_human_name)
+                                     :method => :delete if condition
+        when 'edit'
+          # If we are editing content, we can relate and unrelate always!
+          perform = link_to unrelate, { :action => 'unrelate', :id => params[:id], :association => association, :resource => model, :resource_id => item.id }, 
+                                        :title => _("Unrelate"), 
+                                        :confirm => _("Unrelate {{unrelate_model}} from {{unrelate_model_from}}?", 
+                                        :unrelate_model => model.typus_human_name, 
+                                        :unrelate_model_from => @resource[:class].typus_human_name)
+        when 'show'
+          # If we are showing content, we only can relate and unrelate if we are 
+          # the owners of the owner record.
+          # If the owner record doesn't have a foreign key (Typus.user_fk) we look
+          # each item to verify the ownership.
+          condition = if @resource[:class].typus_user_id? && !@current_user.is_root?
+                        @item.owned_by?(@current_user)
+                      end
+          perform = link_to unrelate, { :action => 'unrelate', :id => params[:id], :association => association, :resource => model, :resource_id => item.id }, 
+                                        :title => _("Unrelate"), 
+                                        :confirm => _("Unrelate {{unrelate_model}} from {{unrelate_model_from}}?", 
+                                        :unrelate_model => model.typus_human_name, 
+                                        :unrelate_model_from => @resource[:class].typus_human_name) if condition
         end
 
         html << <<-HTML
 <td width="10px">#{perform}</td>
+</tr>
         HTML
 
       end
 
-      html << <<-HTML
-</tr>
-      HTML
-
-    end
-
       html << "</table>"
 
     end

data/app/views/admin/dashboard/_sidebar.html.erb

@@ -2,6 +2,6 @@
 
 <p>Documentation is available <%= link_to 'here', 'http://intraducibles.com/projects/typus', :rel => 'external' %>.</p>
 
-<p>If you need help don't hesitate in joining the <%= link_to 'Typus', 'http://groups.google.com/group/typus', :rel => 'external' %> mailing list.</p>
+<p>If you need help don't hesitate in joining the <%= link_to 'mailing list', 'http://groups.google.com/group/typus', :rel => 'external' %>.</p>
 
 <p>Replace this sidebar dropping a file named <code>_sidebar.html.erb</code> on the <code>app/views/admin/dashboard</code> folder.</p>

data/app/views/admin/resources/show.html.erb

@@ -9,9 +9,24 @@
 <%= typus_block :location => @resource[:self], :partial => 'show' %>
 
 <dl>
-<%- @fields.map { |u| u.first }.each do |column| -%>
-  <dt><%=h @resource[:class].human_attribute_name(column) %></dt>
-  <dd><%=h (!@item.send(column).blank?) ? @item.send(column) : 'nil' %></dd>
+<%- @fields.each do |field| -%>
+  <dt><%=h @resource[:class].human_attribute_name(field.first) %></dt>
+  <%-
+    data_type = field.last
+    raw_data = @item.send(field.first)
+    data = case data_type
+           when :boolean
+             boolean_hash = @resource[:class].typus_boolean(field.first)
+             !raw_data.nil? ? boolean_hash["#{raw_data}".to_sym] : @resource[:class].typus_options_for(:nil)
+           when :belongs_to
+             raw_data.typus_name
+           when :text
+             defined?(RDiscount) ? markdown(raw_data) : raw_data
+           else
+             raw_data
+           end
+  -%>
+  <dd><%= !data.blank? ? (data_type.eql?(:text) ? markdown(data) : h(data)) : '&#151;' %></dd>
 <%- end -%>
 </dl>
 

data/app/views/admin/shared/_pagination.html.erb

@@ -1,9 +1,9 @@
 <div class="pagination">
 
   <% if @items.prev? %>
-    <%= link_to _("&larr; Previous"), params.merge(:page => @items.prev.number, :anchor => @options[:anchor]) %>
+    <%= link_to "&larr; " + _("Previous"), params.merge(:page => @items.prev.number, :anchor => @options[:anchor]) %>
   <% else %>
-    <span class="disabled"><%= _("&larr; Previous") %></span>
+    <span class="disabled"><%= "&larr; " + _("Previous") %></span>
   <% end %>
 
   <% last_page = 0 -%>
@@ -20,9 +20,9 @@
   <% end -%>
 
   <% if @items.next? %>
-    <%= link_to _("Next &rarr;"), params.merge(:page => @items.next.number, :anchor => @options[:anchor]) %>
+    <%= link_to _("Next") + " &rarr;", params.merge(:page => @items.next.number, :anchor => @options[:anchor]) %>
   <% else %>
-    <span class="disabled"><%= _("Next &rarr;") %></span>
+    <span class="disabled"><%= _("Next") + " &rarr;" %></span>
   <% end %>
 
 </div>

data/config/locales/de.yml

@@ -38,8 +38,6 @@ de:
   "Back to list": "Zur7uuml;ck zur Liste"
   "Actions": "Aktionen"
   "Add": "Zufügen"
-  "← Previous": "← Vorheriger"
-  "Next →": "Nächster &rarr"
   "Previous": "Vorheriger"
   "Next": "Nächster"
   "Search": "Suchen"
@@ -70,7 +68,7 @@ de:
   "Resources": "Resourcen"
   "Up": "Hoch"
   "Down": "Runter"
-  "filter by": "filter nach"
+  "Filter by": "filter nach"
   "Checked if active": "Angekreuzt wenn activiert"
   "As you're not the admin or the owner of this record you cannot edit it": "Nur der Administrator oder der Eigent7uuml;er des Datensates kann ihn bearbeiten"
   "You can't change your role": "Sie können Ihre Rolle nicht ändern"
@@ -82,7 +80,6 @@ de:
   "{{current_user_role}} can't perform action. ({{action}})": "{{current_user_role}} kann die Aktion nicht ausführen. ({{action}})"
   "{{current_user_role}} can't go to {{action}} on {{controller}}": "{{current_user_role}} kann {{action}} von {{controller}} nicht asuführen"
   "{{current_user_role}} can't delete this item": "{{current_user_role}} kann diesen Eintrag nicht löschen"
-  "{{current_user_role}} can't perform action ({{action}})": "{{current_user_role}} kann diese Aktion nicht ausführen"
   "{{current_user_role}} can't display items": "{{current_user_role}} kann Einträge nicht anzeigen"
   "You can update your password at": "Sie k7ouml;nnen Ihr Passwort ändern unter"
   "If you didn't request a password update, you can ignore this message": "Falls Sie keine Passwort Äderung beantragt haben, können Sie diese nachricht ignorieren"

data/config/locales/es.yml

@@ -38,8 +38,6 @@ es:
   "Back to list": "Volver al listado"
   "Actions": "Acciones"
   "Add": "Añadir"
-  "← Previous": "← Anterior"
-  "Next →": "Siguente →"
   "Previous": "Anterior"
   "Next": "Siguiente"
   "Search": "Búsqueda"
@@ -70,7 +68,7 @@ es:
   "Resources": "Recursos"
   "Up": "Subir"
   "Down": "Bajar"
-  "filter by": "filtrar por"
+  "Filter by": "filtrar por"
   "Checked if active": "Marca para activar"
   "As you're not the admin or the owner of this record you cannot edit it": "Como no eres el admin o el propietario de este registro no puedes editarlo."
   "You can't change your role": "No puedes cambiar tu propio rol."
@@ -82,7 +80,6 @@ es:
   "{{current_user_role}} can't perform action. ({{action}})": "{{current_user_role}} no puede realizar la acción. ({{action}})"
   "{{current_user_role}} can't go to {{action}} on {{controller}}":  "{{current_user_role}} no pude ir a {{action}} en {{controller}}."
   "{{current_user_role}} can't delete this item": "{{current_user_role}} no puede borrar este elemento."
-  "{{current_user_role}} can't perform action ({{action}})": "{{current_user_role}} no puede relizar la accion ({{action}})"
   "{{current_user_role}} can't display items": "{{current_user_role}} no puede mostrar los elementos."
   "You can update your password at": "Puedes actualizar tu contraseña en"
   "If you didn't request a password update, you can ignore this message": "Si no pediste una actualización de tu contraseña, puedes ignorar este mensaje."

data/config/locales/fr.yml

@@ -0,0 +1,99 @@
+# French translations for Typus
+# by Ned Baldessin <http://github.com/nedbaldessin>
+
+fr:
+  "Email": "Email"
+  "Password": "Mot de passe"
+  "Password confirmation": "Confirmation du mot de passe"
+  "Sign in": "Entrer"
+  "Recover password": "Récupérer le mot de passe"
+  "Sign up": "Ouvrir un compte"
+  "Enter your email below to create the first user": "Entrez votre adresse email pour créer le premier utilisateur"
+  "That doesn't seem like a valid email address": "L'adresse email ne semble pas valide"
+  "I remember my password": "Je me souviens du mot de passe"
+  "Password recovery link sent to your email": "Un email vous a été envoyé pour la récupération de votre mot de passe"
+  "A valid token is required": "Un token valide est nécessaire"
+  "The email and/or password you entered is invalid": "L'adresse email et/ou le mot de passe sont incorrects"
+  "There are not defined applications in config/typus/*.yml": "Aucune application définie dans config/typus/*.yml"
+  "Overview": "Vision générale"
+  "Options": "Options"
+  "Password confirm": "Confirmation du mot de passe"
+  "Change password": "Modifier le mot de passe"
+  "There are no {{records}}": "Il n'y aucun(e) {{records}}."
+  "There are no {{records}} under this filter": "Il n'y a aucun(e) {{records}} avec ce filtre."
+  "Dashboard": "Tableau de bord"
+  "Create entry": "Créer"
+  "Update entry": "Mettre-à-jour"
+  "New": "Nouveau"
+  "Show": "Voir"
+  "Edit": "Éditer"
+  "Login": "Identification"
+  "Setup": "Configurer"
+  "Create": "Créer"
+  "Sign out": "Déconnexion"
+  "Update": "Mettre-à-jour"
+  "View site": "Voir le site"
+  "Logged as": "Identifié comme"
+  "Remove filter": "Supprimer le filtre"
+  "Back to list": "Retour liste"
+  "Actions": "Actions"
+  "Add": "Ajouter"
+  "Previous": "Précédent"
+  "Next": "Suivant"
+  "Search": "Recherche"
+  "Search by": "Rechercher par"
+  "{{model}} successfully updated": "{{model}} correctement mis(e)-à-jour."
+  "{{model}} successfully created": "{{model}} correctement créé(e)."
+  "{{model}} successfully removed": "{{model}} correctement supprimé(e)."
+  "{{model}} {{attribute}} changed": "{{model}} {{attribute}} modifié."
+  "You're adding a new {{resource_from}} to {{resource_to}}": "Vous ajoutez un(e) {{resource_from}} à un(e) {{resource_to}}."
+  "You're adding a new {{resource_from}}": "Vous ajoutez un nouveau {{resource_from}}."
+  "You're updating a {{resource_from}} for {{resource_to}}": "Vous mettez-à-jour un(e) {{resource_from}} pour un(e) {{resource_to}}."
+  "You're updating a {{resource_from}}": "Vous mettez-à-jour un(e) {{resource_from}}."
+  "Toggle is disabled": "Le basculement est désactivé"
+  "Record moved {{to}}": "Entrées réordonnées"
+  "{{model_a}} related to {{model_b}}": "{{model_a}} associé à {{model_b}}."
+  "{{model_a}} successfully assigned to {{model_b}}": "{{model_a}} associé à {{model_b}}."
+  "{{model_a}} unrelated from {{model_b}}": "{{model_a}} dissocié de {{model_b}}."
+  "{{model_a}} removed from {{model_b}}": "{{model_a}} retiré de {{model_b}}."
+  "Your new password is {{password}}": "Votre nouveau mot-de-passe est {{password}}."
+  "Add entry": "Ajouter une entrée"
+  "Go to": "Aller"
+  "First name": "Prénom"
+  "Last name": "Nom de famille"
+  "Roles": "Rôles"
+  "Status": "État"
+  "Typus User": "Utilisateur admin"
+  "System Users Administration": "Modifier les utilisateurs de l'admin"
+  "Resources": "Ressources"
+  "Up": "Monter"
+  "Down": "Descendre"
+  "Filter by": "Filtrer par"
+  "Checked if active": "Coché si actif"
+  "As you're not the admin or the owner of this record you cannot edit it": "Vous n'êtes pas le propriétaire de cette entrée, ou un administrateur, par conséquent vous ne pouvez pas le modifier"
+  "You can't change your role": "Vous ne pouvez pas changer votre propre rôle."
+  "Error! Typus User or role doesn't exist": "Une erreur est survenue. L'utilisateur ou le rôle sont inconnus."
+  "You can't toggle your status": "Vous ne pouvez pas basculer votre statut"
+  "You're not allowed to toggle status": "Vous n'êtes pas autorisé à basculer votre statut"
+  "You can't remove yourself": "Vous ne pouvez pas supprimer votre propre compte"
+  "You're not allowed to remove Typus Users": "Vous n'avez pas le droit de supprimer des utilisateurs de l'administration"
+  "{{current_user_role}} can't perform action. ({{action}})": "{{current_user_role}} ne peut effectuer l'action ({{action}})"
+  "{{current_user_role}} can't go to {{action}} on {{controller}}":  "{{current_user_role}} ne peut effectuer {{action}} sur {{controller}}"
+  "{{current_user_role}} can't delete this item": "{{current_user_role}} ne peut supprimer cette entrée"
+  "{{current_user_role}} can't perform action ({{action}})": "{{current_user_role}} ne peut effectuer l'action ({{action}})"
+  "Record owned by another user": "Cette entrée est la propriété d'un autre utilisateur"
+  "{{current_user_role}} can't display items": "Un utilisateur de rôle {{current_user_role}} ne peut pas afficher ces éléments."
+  "You can update your password at": "Vous pouvez modifier votre mot de passe ici"
+  "If you didn't request a password update, you can ignore this message": "Si vous n'avez pas demandé à mettre à jour votre mot de passe, vous pouvez ignorer ce message"
+  "Reset password": "Renouveler le mot de passe"
+  "Add new": "Ajouter nouveau"
+  "Do you want to cancel it?": "Voulez-vous annuler?"
+  "Click here": "Cliquer ici"
+  "Are you sure you want to leave this page?": "Êtes-vous certain de vouloir quitter cette page?"
+  "If you have made any changes to the fields without clicking the Save/Update entry button, your changes will be lost": "Si vous avez effectué des modifications sans cliquer sur le bouton Enregistrer ou Mettre à jour, ces modifications seront perdues."
+  "Click OK to continue, or click Cancel to stay on this page": "Cliquez sur Ok pour continuer, ou Annuler pour rester sur cette page."
+  "Remove entry?": "Supprimer l'entrée?"
+  "Unrelate {{unrelate_model}} from {{unrelate_model_from}}?": "Dissocier {{unrelate_model}} de {{unrelate_model_from}}?"
+  "Change {{attribute}}?": "Changer {{attribute}}?"
+  "True": 
+  "False":