diff --git a/app/controllers/offers_controller.rb b/app/controllers/offers_controller.rb index 41ebec5..f91f229 100644 --- a/app/controllers/offers_controller.rb +++ b/app/controllers/offers_controller.rb @@ -28,7 +28,7 @@ class OffersController < ApplicationController end def create - @offer = current_user.offers.create(params[:offer]) + @offer = current_user.offers.create(offer_params) unless admin? current_user.join(@offer) end diff --git a/app/views/application/_nav.html.haml b/app/views/application/_nav.html.haml index 5b129bb..29e8b39 100644 --- a/app/views/application/_nav.html.haml +++ b/app/views/application/_nav.html.haml @@ -15,12 +15,12 @@ %li{class: ('active' if current_page? controller: "offers")} %a{href: offers_path} %i.icon-hand-up.icon-fixed-width - = Offer.model_name.human.pluralize + = Offer.model_name.human(count: :many) %li{class: ('active' if current_page? controller: "inquiries")} %a{href: inquiries_path} %i.icon-bell.icon-fixed-width - = Inquiry.model_name.human.pluralize + = Inquiry.model_name.human(count: :many) %li.nav-header= t ".reports" %li @@ -31,3 +31,9 @@ %a{href: "/report/user_list", data: {popup: true}} %i.icon-list-alt.icon-fixed-width = t "reports.user_list.title" + +%li.nav-header= t ".stats" +%li + %a{href: "#"} + %i.icon-tasks.icon-fixed-width + = t "stats.min_balance.title" diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 5148347..3ef0143 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -1,72 +1,101 @@ ca: - "catchPhrase": "Benvingut al sistema de gestió de Bancs de Temps" - "nuevouser": "Nou usuari" - "modificaruser": "Modificar" - "ver": "Veure" - "borrar": "Esborra" - "nuevaorg": "Nova organització" - "nombre": "Nom" - "guardar": "Desa" - "cancelar": "Cancel·la" - "nuevacat": "Nou servei" - "sincatsup": "(sense categoria superior)" - "nuevaorg": "Nova organització" - "nuevaorg": "Nova organització" - "nuevaorg": "Nova organització" - "nuevaorg": "Nova organització" - "nuevaorg": "Nova organització" - "userForm.nombre": "Nom" - "userForm.organizacion": "Organització" - "userForm.email": "Email" - "userForm.admin": "És administrador" - "userForm.superadmin": "És superadministrador" - "userForm.fechaalta": "Data d'alta" - "userForm.password": "Contrasenya" - "userForm.rpassword": "Repetir contrasenya" - "userForm.fechanacimiento": "Data de neixement" - "userForm.ndocumento": "Número de document (DNI/Pasaport/...)" - "userForm.telofono": "Telèfon principal" - "userForm.telefonoalt": "Telèfon alternatiu" - "userForm.servicios": "Serveis ofertats" - "userForm.siguientepaso": "Pas següent" - "userForm.guardar": "Desar" - "userForm.cancelar": "Cancel·la" - "userForm.codigo": "Codi d'usuari" - "userForm.telefonos": "Telèfons" - "userForm.porusuario": "Per usuari" - "userForm.porcategoria": "Per serveis" - "userForm.veremails": "Veure emails" - "userForm.usuarios": "Usuaris" - "userForm.usuarios": "Usuaris" + # NOMBRES DE LAS COSAS + activerecord: - "New service": "Nou servei" - "Cancel": "Cancel·la" - "no parent": "Sense pare" - "Welcome to the new-generation time banking system": "Benvingut al nou sistema de Banc de Temps" - "Learn more": "Saber-ne més" - "New organization": "Nou Banc" - "Name": "Nom" - "Organization": "Banc de Temps" - "E-mail": "Correu electrònic" - "Administrator": "Administrador" - "Super Administrator": "Administrador de sistema" - "Member Code": "Códi de membre" - "Register date": "Data d'alta" - "Document ID": "Número de document" - "Phones": "Telèfons" - "Offers categories": "Serveis ofertats" - "New user": "Nou usuari" - "Edit": "Modificar" - "Password": "Contrasenya" - "Repeat password": "Repetir contranseya" - "Birth date": "Data de neixement" - "Phone": "Telèfon" - "Alternate Phone": "Telèfon alternatiu" - "Categories": "Serveis" - "Users": "Usuaris" - "By user": "Per usuaris" - "By category": "Per serveis" - "Category": "Categoria" - "Members": "Membres" - "View": "Veure" + models: + # Para usar: + # User.model_name.human + user: Usuari + organization: + one: Banc de Temps + other: Bancs de Temps + category: Servicio + offer: + one: Oferta + other: Ofertes + inquiry: + one: Demanda + other: Demandes + + + attributes: + user: + username: Nom + organization: + one: Banc de Temps + other: Bancs de Temps + email: Correo + registration_date: Data de alta + registration_number: Codi d'usuari + birth_date: Data de naixement + identity_document: DNI + phone: Telèfon + alt_phone: Telèfon alternatiu + password: Contrasenya + password_confirmation: Repeteix Contrasenya + admin: Administrador del Banc de Temps + superadmin: SuperAdministrador del Sistema + organization: + name: Nom + category: + name: Nom + parent: Categoría padre + + # ETIQUETAS VARIADAS EN PLANTILLAS + + application: + nav: + administration: Administració + reports: Informes + stats: Estadístiques + users: Usuaris + categories: Serveis + organizations: Bancs de Temps + + # views/users/index... + + users: + + index: + create: Crear nou Usuari + show: + phone: + one: Telèfon + other: Telèfons + data: Dades del Usuari + categories: Serveis Oferts + account: Darrers moviments + form: + superadmin_warning: Compte!!! Estás donant poders de SuperAdministrador a aquest usuari + admin_warning: Compte!!! Estás donant poders d'Administrador del Banc de Temps a aquest usuari + + offers: + index: + offered_by: "Ofertat per %{size} persones" + show: + offered_by: "Ofertants" + + categories: + index: + all: Totes + tree: Principals + global: Globals + local: Locals + add: Afegir servei + + reports: + cat_with_users: + title: Servicios ofrecidos + user_list: + title: Listado usuarios + + stats: + min_balance: + title: Usuaris Saldo Mínim + + global: + show: Mostrar + edit: Modificar + delete: Borrar + save: Guardar \ No newline at end of file diff --git a/config/locales/es.yml b/config/locales/es.yml index 4af3f92..f55887c 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -11,6 +11,12 @@ es: one: Banco de Tiempo other: Bancos de Tiempo category: Servicio + offer: + one: Oferta + other: Ofertas + inquiry: + one: Demanda + other: Demandas attributes: user: @@ -40,10 +46,14 @@ es: application: nav: administration: Administración + reports: Informes + stats: Estadísticas users: Usuarios categories: Servicios organizations: Organizaciones + # views/users/index... + users: index: @@ -79,43 +89,12 @@ es: user_list: title: Listado usuarios + stats: + min_balance: + title: Usuarios Saldo Mínimo + global: show: Mostrar edit: Modificar delete: Borrar save: Guardar - - "catchPhrase": "Benvenido al sistema de gestión del Banco de Tiempo" - "Save changes": "Guardar" - "New service": "Nuevo servicio" - "Cancel": "Cancelar" - "no parent": "Sin padre" - "Welcome to the new-generation time banking system": "Bienvenido al nuevo sistema de Bancos de Tiempo" - "Learn more": "Saber más" - "New organization": "Nuevo Banco" - "Name": "Nombre" - "Organization": "Banco de Tiempo" - "E-mail": "Correo electrónico" - "Administrator": "Administrador" - "Super Administrator": "Administrador de sistema" - "Member Code": "Código de miembro" - "Register date": "Fecha de alta" - "Document ID": "Número de documento" - "Phones": "Teléfonos" - "Offers categories": "Servicios ofrecidos" - "New user": "Nuevo usuario" - "Edit": "Modificar" - "Password": "Contraseña" - "Repeat password": "Repetir contraña" - "Birth date": "Fecha de nacimiento" - "Phone": "Teléfono" - "Alternate Phone": "Teléfono alternativo" - "Categories": "Servicios" - "Users": "Usuarios" - "By user": "Por usuarios" - "By category": "Por servicios" - "Category": "Categoría" - "Members": "Miembros" - "View": "Ver" - "give time": "Ingresar horas" - "change password": "Cambiar password"