typus 1.0.0.pre8 → 1.0.0.pre9

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

@@ -7,12 +7,11 @@
 
 <h2>
   <%= page_title %>
-  <small></small>
 </h2>
 
 <%= display_link_to_previous %>
 <%= display_flash_message %>
-<%= typus_block %>
+<%= typus_render :partial => 'edit' %>
 
 <%
   options = { :action => "update",
@@ -23,6 +22,6 @@
   button = _t("Save %{resource}", :resource => @resource.model_name.human)
 %>
 
-<%= render form_partial, :options => options, :button => button %>
+<%= typus_render :partial => 'form', :options => options, :button => button %>
 
 <%= raw typus_relationships %>

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

@@ -11,7 +11,7 @@
 </h2>
 
 <%= display_flash_message %>
-<%= typus_block %>
+<%= typus_render :partial => 'index' %>
 
 <% if (build_filters || search) && !@resource.count.zero? %>
   <div class="filters">
@@ -20,18 +20,20 @@
   </div>
 <% end %>
 
-<% unless @items.count.zero? -%>
+<% if @resource.count.zero? %>
+  <p>
+    <%= _t("There are no %{records}.", :records => @resource.model_name.human.pluralize.downcase) %>
+    <%= link_to _t("Create one now."), { :action => "new" } if current_user.can?('create', @resource) %>
+  </p>
+<% end %>
+
+<% if @items.any? -%>
   <%= raw build_list(@resource, @fields, @items) %>
   <%= pagination %>
-<% else %>
-  <% if @resource.count.zero? %>
-    <p>
-      <%= _t("There are no %{records}.", :records => @resource.model_name.human.pluralize.downcase) %>
-      <%= link_to _t("Create one now."), { :action => "new" } if @current_user.can?('create', @resource) %>
-    </p>
-  <% else %>
-    <div class="flash notice">
-      <%= _t("There are no %{records} under this filter.", :records => @resource.model_name.human.pluralize.downcase) %>
-    </div>
-  <% end %>
+<% end %>
+
+<% if @items.empty? && !@resource.count.zero? %>
+  <div class="flash notice">
+    <%= _t("There are no %{records} under this filter.", :records => @resource.model_name.human.pluralize.downcase) %>
+  </div>
 <% end %>

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

@@ -10,7 +10,7 @@
 </h2>
 
 <%= display_link_to_previous %>
-<%= typus_block %>
+<%= typus_render :partial => 'new' %>
 
 <%
   options = { :action => 'create',
@@ -21,4 +21,4 @@
   button = _t("Create %{resource}", :resource => @resource.model_name.human)
 %>
 
-<%= render form_partial, :options => options, :button => button %>
+<%= typus_render :partial => 'form', :options => options, :button => button %>

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

@@ -7,11 +7,10 @@
 
 <h2>
   <%= page_title %>
-  <small></small>
 </h2>
 
 <%= display_flash_message %>
-<%= typus_block %>
+<%= typus_render :partial => 'show' %>
 
 <dl>
 <%- @fields.each do |field| -%>

data/app/views/admin/templates/_boolean.html.erb

@@ -1,4 +1,4 @@
 <li>
-  <%= form.label attribute, label_text, :class => "inline_label" %>
   <%= form.check_box attribute, options %>
+  <%= form.label attribute, label_text, :class => "inline_label" %>
 </li>

data/app/views/admin/templates/_has_many.html.erb

@@ -12,13 +12,11 @@
 
   <%= form %>
 
-  <% unless @items.count.zero? -%>
+  <% if @items.any? -%>
     <%= table %>
     <%= pagination(:anchor => model_to_relate.to_resource) %>
   <% else %>
-    <div id="flash" class="notice">
-      <p><%= _t("There are no %{records}.", :records => model_to_relate.model_name.human.pluralize.downcase) %></p>
-    </div>
+    <p><%= _t("There are no %{records}.", :records => model_to_relate.model_name.human.pluralize.downcase) %></p>
   <% end %>
 
 </div>

data/app/views/admin/templates/_has_n.html.erb

@@ -7,7 +7,7 @@
 
   <%= form %>
 
-  <% unless @items.count.zero? -%>
+  <% if @items.any? -%>
     <%= table %>
     <%= pagination(:anchor => model_to_relate.to_resource) %>
   <% else %>

data/app/views/admin/templates/_selector.html.erb

@@ -1,6 +1,5 @@
 <%
   values = @resource::const_get(attribute.upcase)
-  values = values.invert if values.kind_of?(Hash)
 %>
 
 <li>

data/app/views/admin/templates/_string.html.erb

@@ -17,6 +17,6 @@
 %>
 
 <li>
-  <%= form.label attribute, label_text %>
+  <%= form.label attribute, raw(label_text) %>
   <%= form.text_field attribute, options %>
 </li>

data/app/views/layouts/admin/session.html.erb

@@ -9,7 +9,7 @@
   Ruby on Rails easy-to-use interface to allow trusted users
   edit structured content. (Admin scaffold generator)
 
-  Get the code at http://github.com/fesplugas/typus
+  Documentation available at http://core.typuscms.com/
 
 -->
 

data/config/available_locales/ca.yml

@@ -14,8 +14,6 @@ ca:
   "Are you sure you want to sign out and end your session?": "Estàs segur que vols sortir i tancar la sessió?"
   "As you're not the admin or the owner of this record you cannot edit it": "Com que no ets l'administrador o el propietari d'aquest registre no el pots editar."
 
-  "Back to list": "Tornar al llistat"
-
   "Cancel and go back":
   "Change password": "Canviar contrasenya"
   "Change %{attribute}?": "Canviar %{attribute}?"
@@ -26,7 +24,6 @@ ca:
 
   "Dashboard": "Panell de control"
   "Do you want to cancel it?": "Vols cancel·lar-lo?"
-  "Documentation": "Documentació"
   "Down": "Baixar"
 
   "Edit": "Editar"
@@ -48,7 +45,7 @@ ca:
   "Last few days": "Últims dies"
   "Last 30 days": "Últims 30 dies"
   "Last 7 days": "Últims 7 dies"
-  "License": "Llicència"
+  "List": "Llista"
   "Logged as": "Identificat com"
   "Login": "Login"
 
@@ -98,13 +95,14 @@ ca:
   "You're adding a new %{resource_from} to %{resource_to}": "Estàs afegint un nou %{resource_from} a %{resource_to}."
   "You're not allowed to remove Typus Users": "No pots esborrar usuaris de typus."
   "You're not allowed to toggle status": "No pots canviar el teu estat."
-  "You can update your password at": "Pots actualitzar la teva contrasenya a "
+  "You can update your password at": "Pots actualitzar la teva contrasenya a"
   "You can't change your role": "No pots canviar-te tu mateix el rol."
   "You can't remove yourself": "No et pots eliminar a tu mateix."
   "You can't toggle your status": "No pots canviar-te l'estat."
   "You're updating a %{resource_from}": "Estàs actualitzant un %{resource_from}."
   "You're updating a %{resource_from} for %{resource_to}": "Estàs actualitzant un %{resource_from} de %{resource_to}."
 
+  "View all %{attribute}":
   "View site": "Veure la web"
 
   "%{attachment} can't be removed": "%{attachment} no es pot esborrar."

data/config/available_locales/de.yml

@@ -14,8 +14,6 @@ de:
   "Are you sure you want to sign out and end your session?": "Wollen Sie sich abmelden und die Sitzung beenden?"
   "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"
 
-  "Back to list": "Zurück zur Liste"
-
   "Cancel and go back":
   "Change password": "Passwort ändern"
   "Change %{attribute}?": "%{attribute}ändern?"
@@ -26,7 +24,6 @@ de:
 
   "Dashboard": "Dashboard"
   "Do you want to cancel it?": "Wollen Sie abbrechen?"
-  "Documentation": "Dokumentation"
   "Down": "Runter"
 
   "Edit": "Bearbeiten"
@@ -48,7 +45,7 @@ de:
   "Last few days": "Letzten Tage"
   "Last 30 days": "Letzten 30 Tage"
   "Last 7 days": "Letzten 7 Tage"
-  "License": "Lizenz"
+  "List":
   "Logged as": "Aufgezeichnet als"
   "Login": "Anmeldem"
 
@@ -94,6 +91,7 @@ de:
   "Unrelate %{unrelate_model} from %{unrelate_model_from}?": "Verknüpfung zwischen %{unrelate_model} und %{unrelate_model_from}entfernen?"
   "Up": "Hoch"
 
+  "View all %{attribute}":
   "View site": "Site anzeigen"
 
   "You're adding a new %{resource_from}": "Sie erstellen eine neue %{resource_from}"

data/config/available_locales/es.yml

@@ -14,8 +14,6 @@ es:
   "Are you sure you want to sign out and end your session?": "¿Estás seguro que quieres salir y cerrar la sessión?"
   "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."
 
-  "Back to list": "Volver al listado"
-
   "Cancel and go back":
   "Change password": "Cambiar contraseña"
   "Change %{attribute}?": "Cambiar %{attribute}?"
@@ -26,7 +24,6 @@ es:
 
   "Dashboard": "Panel de control"
   "Do you want to cancel it?": "¿Quieres cancelarlo?"
-  "Documentation": "Documentación"
   "Down": "Bajar"
 
   "Edit": "Editar"
@@ -48,7 +45,7 @@ es:
   "Last few days": "Últimos dias"
   "Last 30 days": "Últimos 30 dias"
   "Last 7 days": "Últimos 7 dias"
-  "License": "Licencia"
+  "List": "Lista"
   "Logged as": "Autenticado como"
   "Login": "Login"
 
@@ -105,6 +102,7 @@ es:
   "You're updating a %{resource_from}": "Estás actualizando un %{resource_from}."
   "You're updating a %{resource_from} for %{resource_to}": "Estás actualizando un %{resource_from} de %{resource_to}."
 
+  "View all %{attribute}":
   "View site": "Ver web"
 
   "%{attachment} can't be removed": "%{attachment} no puede ser borrado."

data/config/available_locales/fr.yml

@@ -1,32 +1,30 @@
 # French translations for Typus
 # by Ned Baldessin <http://github.com/nedbaldessin>
+# and Jonathan Meiss <http://github.com/jmeiss>
 
 fr:
 
   "A valid token is required": "Un token valide est nécessaire"
-  "Actions":
-  "Active":
+  "Actions": "Actions"
+  "Active": "Actif"
   "Add": "Ajouter"
   "Add %{resource}": "Ajouter %{resource}"
   "Add new": "Ajouter nouveau"
-  "Are you sure?":
-  "Are you sure you want to leave this page?": "Êtes-vous certain de vouloir quitter cette page?"
-  "Are you sure you want to sign out and end your session?":
-  "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"
+  "Are you sure?": "Êtes-vous sûre ?"
+  "Are you sure you want to leave this page?": "Êtes-vous sûre de vouloir quitter cette page ?"
+  "Are you sure you want to sign out and end your session?": "Etes-vous sûre de vouloir vous déconnecter et mettre fin à votre session ?"
+  "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 la modifier"
 
-  "Back to list": "Retour liste"
-
-  "Cancel and go back":
+  "Cancel and go back": "Annuler et retourner en arrière"
   "Change password": "Modifier le mot de passe"
-  "Change %{attribute}?": "Changer %{attribute}?"
+  "Change %{attribute}?": "Changer %{attribute} ?"
   "Checked if active": "Coché si actif"
   "Click OK to continue, or click Cancel to stay on this page": "Cliquez sur Ok pour continuer, ou Annuler pour rester sur cette page."
   "Create %{resource}": "Créer %{resource}"
-  "Create one now":
+  "Create one now": "Ajouter une entrée"
 
   "Dashboard": "Tableau de bord"
-  "Do you want to cancel it?": "Voulez-vous annuler?"
-  "Documentation":
+  "Do you want to cancel it?": "Voulez-vous annuler ?"
   "Down": "Descendre"
 
   "Edit": "Éditer"
@@ -34,7 +32,7 @@ fr:
   "Enter your email below to create the first user": "Entrez votre adresse email pour créer le premier utilisateur"
   "Error! Typus User or role doesn't exist": "Une erreur est survenue. L'utilisateur ou le rôle sont inconnus."
 
-  "False":
+  "False": "Faux"
   "Filter": "Filtrer"
   "Filter by %{attribute}": "Filtrer par %{attribute}"
 
@@ -43,12 +41,12 @@ fr:
   "I remember my password": "Je me souviens du mot de passe"
   "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"
   "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."
-  "Inactive":
+  "Inactive": "Inactif"
 
-  "Last few days":
-  "Last 30 days":
-  "Last 7 days":
-  "License":
+  "Last few days": "Ces derniers jours"
+  "Last 30 days": "30 derniers jours"
+  "Last 7 days": "7 derniers jours"
+  "List": "Liste"
   "Logged as": "Identifié comme"
   "Login": "Identification"
 
@@ -57,43 +55,44 @@ fr:
 
   "Options": "Options"
 
-  "Password recovery link sent to your email":
+  "Password recovery link sent to your email": "Le lien pour retrouver votre mot de passe vous a été envoyé par email"
   "Previous": "Précédent"
 
   "Record moved %{to}": "Entrées réordonnées"
-  "Recover password":
+  "Recover password": "Retrouver mon mot de passe"
   "Remove": "Supprimer"
   "Remove %{attribute}": "Supprimer %{attribute}"
-  "Remove %{resource}?": "Supprimer %{resource}?"
+  "Remove %{resource}?": "Supprimer %{resource} ?"
   "Remove filter": "Supprimer le filtre"
-  "Remove search":
+  "Remove search": "Supprimer la recherche"
   "Reset password": "Renouveler le mot de passe"
   "Resources": "Ressources"
 
-  "Save %{resource}":
+  "Save %{resource}": "Sauvegarder %{resource}"
   "Search": "Recherche"
   "Search by": "Rechercher par"
-  "Send us feedback":
+  "Send us feedback": "Nous envoyer votre avis"
   "Setup": "Configurer"
   "Show": "Voir"
-  "Show %{resource}":
+  "Show %{resource}": "Voir %{resource}"
   "Sign in": "Entrer"
   "Sign out": "Déconnexion"
   "Sign up": "Ouvrir un compte"
-  "Submit a bug report":
+  "Submit a bug report": "Soumettre un bug"
   "System Users Administration": "Modifier les utilisateurs de l'admin"
 
   "That doesn't seem like a valid email address": "L'adresse email ne semble pas valide"
-  "The email and/or password you entered is invalid":
+  "The email and/or password you entered is invalid": "L'email ou le mot de passe que vous avez saisi n'est pas valide"
   "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."
-  "Today":
+  "Today": "Ajourd'hui"
   "Toggle is disabled": "Le basculement est désactivé"
-  "True":
+  "True": "Vrai"
 
-  "Unrelate %{unrelate_model} from %{unrelate_model_from}?": "Dissocier %{unrelate_model} de %{unrelate_model_from}?"
+  "Unrelate %{unrelate_model} from %{unrelate_model_from}?": "Dissocier %{unrelate_model} de %{unrelate_model_from} ?"
   "Up": "Monter"
 
+  "View all %{attribute}": "Voir tou(s/tes) %{attribute}"
   "View site": "Voir le site"
 
   "You can update your password at": "Vous pouvez modifier votre mot de passe ici"
@@ -107,18 +106,20 @@ fr:
   "You're updating a %{resource_from}": "Vous mettez-à-jour un(e) %{resource_from}."
   "You're updating a %{resource_from} for %{resource_to}": "Vous mettez-à-jour un(e) %{resource_from} pour un(e) %{resource_to}."
 
-  "%{attachment} removed":
-  "%{attachment} can't be removed":
+  "%{attachment} can't be removed": "%{attachment} ne peut pas être supprimé"
+  "%{attachment} removed": "%{attachment} supprimé"
+  "%{current_user_role} can't delete this item": "%{current_user_role} ne peut supprimer cette entrée"
+  "%{current_user_role} can't display items": "Un utilisateur de rôle %{current_user_role} ne peut pas afficher ces éléments."
+  "%{current_user_role} can't perform action (%{action})": "%{current_user_role} ne peut effectuer l'action (%{action})"
+  "%{current_user_role} can't perform action. (%{action})": "%{current_user_role} ne peut effectuer l'action. (%{action})"
   "%{model} successfully created": "%{model} correctement créé(e)."
   "%{model} successfully removed": "%{model} correctement supprimé(e)."
   "%{model} successfully updated": "%{model} correctement mis(e)-à-jour."
   "%{model} %{attribute} changed": "%{model} %{attribute} modifié."
+  "%{model_a} cannot be related to %{model_b}": "%{model_a} ne peut pas être lié à %{model_b}"
+  "%{model_a} cannot be unrelated from %{model_b}": "%{model_a} ne peut pas être disjoint de %{model_b}"  
   "%{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}."
-  "%{current_user_role} can't display items": "Un utilisateur de rôle %{current_user_role} ne peut pas afficher ces éléments."
-  "%{model_a} cannot be related to %{model_b}":
-  "%{model_a} cannot be unrelated from %{model_b}":
-  "%{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})"
-  "%{current_user_role} can't perform action (%{action})": "%{current_user_role} ne peut effectuer l'action (%{action})"
+
+

data/config/available_locales/fr_models.yml

@@ -4,10 +4,10 @@ fr:
       typus_user: "Utilisateur admin"
     attributes:
       typus_user:
-        email:
+        email: "Email"
         first_name: "Prénom"
         last_name: "Nom de famille"
         password: "Mot de passe"
         password_confirmation: "Confirmation du mot de passe"
         status: "État"
-        role:
+        role: "Rôle"

data/config/available_locales/hu.yml

@@ -14,8 +14,6 @@ hu:
   "Are you sure you want to sign out and end your session?": "Biztosan ki akarsz lépni?"
   "As you're not the admin or the owner of this record you cannot edit it": "Ezt a bejegyzést csak a tuljadonosa és az adminok szerkeszthetik."
 
-  "Back to list": "Vissza a listához"
-
   "Cancel and go back":
   "Change %{attribute}?": "Megváltoztatod ezt: %{attribute}?"
   "Change password": "Jelszó megváltoztatása"
@@ -26,7 +24,6 @@ hu:
 
   "Dashboard": "Admin nyitólap"
   "Do you want to cancel it?": "Szeretnéd visszavonni?"
-  "Documentation": "Dokumentáció"
   "Down": "Le"
 
   "Edit": "Szerkesztés"
@@ -48,8 +45,8 @@ hu:
   "Last few days": "Utóbbi néhány nap"
   "Last 30 days": "Az elmúlt 30 nap"
   "Last 7 days": "Az elmúlt 7 nap"
-  "License": "Licensz"
-  "Logged as": "Bejelentkezve "
+  "List":
+  "Logged as": "Bejelentkezve"
   "Login": "Belépés"
 
   "New": "Új"
@@ -94,6 +91,7 @@ hu:
   "Unrelate %{unrelate_model} from %{unrelate_model_from}?": "Unrelate %{unrelate_model} from %{unrelate_model_from}?"
   "Up": "Fel"
 
+  "View all %{attribute}":
   "View site": "A weboldal megtekintése"
 
   "You're adding a new %{resource_from}": "%{resource_from} hozzáadása"