it translation, strings

app/views/admin/members/_form.html.erb

@@ -19,9 +19,9 @@
   :f => f,
   :continue_editing => false,
   :hide_cancel => (@app_dialog or action_name == "insert" or from_dialog?),
-  :delete_title => t('delete', :scope => 'admin.roles'),
+  :delete_title => t('delete', :scope => 'admin.members'),
   :delete_confirmation => (t('message', :scope => 'shared.admin.delete',
-  :title => @member.title) if @member.persisted?)
+  :title => @member.full_name) if @member.persisted?)
 } %>
 <% end -%>
 

app/views/admin/members/_form_account.html.erb

@@ -1,5 +1,5 @@
 <fieldset id="member_account_form">
-  <legend><%=t('members.shared.account')%></legend>
+  <legend><%=t('account', :scope => 'admin.members')%></legend>
   <p class="field">
       <%= f.label :email %>
       <%= f.text_field :email, :class => 'widest'%>

app/views/admin/members/_form_activation.html.erb

@@ -1,19 +1,21 @@
 <fieldset id="member_activation_form" class="clearfix">
-  <legend><%=t('members.shared.activation')%></legend>  
+  <legend><%=t('activation', :scope => 'admin.members')%></legend>  
   
   <p class="field">
     <%= f.check_box :enabled %>
-    <%= f.label :enabled %>
+    <%= f.label :enabled, t('user_can_login', :scope => 'admin.members') %>
   </p>
   <% if RefinerySetting::find_or_set('memberships_timed_accounts', true) %>
   <p class="field">
   <span>
     <% if f.object.member_until %>
-      <%= t('.member_until')%> <b><%= f.object.member_until.strftime('%d/%m/%Y') %></b>
-      <%= t('.extend_membership_by')%> <%= f.select :add_to_member_until, [[]]+(1..10).collect{|n| [t('years', :count => n), n]} %>
+      <%= t('member_until', :scope => 'admin.members') if @member.member_until.future? %> 
+      <%= t('membership_expired', :scope => 'admin.members') if @member.member_until.past? %> 
+      <b><%= f.object.member_until.strftime('%d/%m/%Y') %></b><br />
+      <%= t('extend_membership_for', :scope => 'admin.members')%> <%= f.select :add_to_member_until, [[]]+(1..10).collect{|n| [t('years', :count => n), n]} %>
     <% else %>
-      <%= t('.not_yet_member')%> 
-      <%= t('.make_member_for')%> <%= f.select :add_to_member_until, [[]]+(1..10).collect{|n| [t('years', :count => n), n]} %>
+    <b><%= t('not_yet_member', :scope => 'admin.members')%></b><br />
+      <%= t('activate_member_for', :scope => 'admin.members')%> <%= f.select :add_to_member_until, [[]]+(1..10).collect{|n| [t('years', :count => n), n]} %>
     <% end %>
   </span>
   </p>

app/views/admin/members/_form_organization.html.erb

@@ -1,5 +1,5 @@
 <fieldset id="member_organization_form">
-  <legend><%=t('members.shared.organization')%></legend>
+  <legend><%=t('organization', :scope => 'admin.members')%></legend>
   
   <p class="field">
       <%= f.label :organization %>

app/views/admin/members/_form_profile.html.erb

@@ -1,5 +1,5 @@
 <fieldset id="member_profile_form">
-  <legend><%=t('members.shared.profile')%></legend>
+  <legend><%=t('profile', :scope => 'admin.members')%></legend>
   <p class="field">
       <%= f.label :first_name %>
       <%= f.text_field :first_name, :class => 'widest' %>

app/views/admin/members/_form_roles.html.erb

@@ -1,6 +1,6 @@
 <% if Role.where(['title NOT IN (?)',['Superuser','Refinery','Member']]).count > 0 %>
   <fieldset id="member_roles_form" class="clearfix">
-    <legend><%=t('members.shared.user_roles')%></legend>  
+    <legend><%=t('user_roles', :scope => 'admin.members')%></legend>  
     
     <% Role.where(['title NOT IN (?)',['Superuser','Refinery','Member']]).all.each_with_index do | role, idx | %>
     <p class="role">

app/views/admin/members/_member.html.erb

@@ -7,13 +7,13 @@
   <td><%= member.member_until.nil? ? '--' : member.member_until.strftime('%d/%m/%Y') %></td>
   <td>
     <% if member.active? %>
-      <%= image_tag 'refinery/icons/tick.png', :tooltip => t('.account_active') %>
+      <%= image_tag 'refinery/icons/tick.png', :tooltip => t('account_active', :scope => 'admin.members') %>
     <% elsif member.is_new %>
-      <%= image_tag 'refinery/icons/new_account.png', :tooltip => t('.new_account') %>
+      <%= image_tag 'refinery/icons/new_account.png', :tooltip => t('new_account', :scope => 'admin.members') %>
     <% elsif !member.enabled %>
-      <%= image_tag 'refinery/icons/cross.png', :tooltip => t('.account_disabled') %>
+      <%= image_tag 'refinery/icons/cross.png', :tooltip => t('account_disabled', :scope => 'admin.members') %>
     <% elsif member.lapsed? %>
-      <%= image_tag 'refinery/icons/clock_red.png', :tooltip => t('.account_expired') %>
+      <%= image_tag 'refinery/icons/clock_red.png', :tooltip => t('account_expired', :scope => 'admin.members') %>
     <% end %>
   </td>
   <% end %>
@@ -40,7 +40,7 @@
     <%= link_to refinery_icon_tag('delete.png'), admin_member_path(member),
       :class => "cancel confirm-delete",
       :title => t('delete', :scope => 'admin.members'),
-      :confirm => t('message', :scope => 'shared.admin.delete', :title => member.title),
+      :confirm => t('message', :scope => 'shared.admin.delete', :title => member.full_name),
       :method => :delete %>
     </span>
   </td>

app/views/admin/members/_members.html.erb

@@ -20,6 +20,6 @@
 </table>
 <% else %>
 <p>
-<%= t('.no_members')%>
+  <strong><%= t('no_members_yet', :scope => 'admin.members')%></strong>
 </p>
 <% end %>

app/views/admin/members/index.html.erb

@@ -1,4 +1,4 @@
-<h2><%= t('members_administration', :scope => 'admin.memberships')%></h2>
+<h2><%= t('members_administration', :scope => 'admin.members')%></h2>
 <div id='records' class="pagination_container">
   <%= render :partial => 'members' %>
 </div>

app/views/admin/membership_emails/_email.html.erb

@@ -1,6 +1,6 @@
 <li class='clearfix record <%= cycle("on", "on-hover") %>'>
   <span class='title'>
-    <%= email.title.titleize %>
+    <%= t(email.title, :scope => 'admin.membership_emails') %>
     <% if defined?(::Refinery::I18n) and ::Refinery::I18n.frontend_locales.many? and
     (locales = email.translations.collect{|t| t.locale}).present? %>
     <span class='preview'>

app/views/admin/membership_emails/_form.html.erb

@@ -1,4 +1,4 @@
-<h2><%= t('@membership_email', :scope => 'refinery.membership_emails.titles') %></h2>
+<h2><%= MembershipEmail.human_name%>: <%= t(@membership_email.title, :scope => 'membership_emails') %></h2>
 <%= form_for [:admin, @membership_email], :url => @url_override || @url do |f| -%>
 
   <%= render :partial => "/shared/admin/error_messages",

app/views/admin/membership_emails/_records.html.erb

@@ -8,7 +8,7 @@
 <% else %>
   <p>
     <% unless searching? %>
-      <strong><%= t('.no_files_yet') %></strong>
+      <strong><%= t('no_emails_yet', :scope => 'admin.membership_emails') %></strong>
     <% else %>
       <%= t('no_results', :scope => 'shared.admin.search') %>
     <% end %>

app/views/admin/membership_emails/index.html.erb

@@ -1,4 +1,4 @@
-<h2><%= t('emails_administration', :scope => 'admin.memberships')%></h2>
+<h2><%= t('emails_administration', :scope => 'admin.membership_emails')%></h2>
 <div id='records'>
   <%= render :partial => 'records' %>
 </div>

app/views/admin/memberships/_member.html.erb

@@ -18,7 +18,7 @@
     <%= link_to refinery_icon_tag('delete.png'), admin_member_path(member),
       :class => "cancel confirm-delete",
       :title => t('delete', :scope => 'admin.members'),
-      :confirm => t('message', :scope => 'shared.admin.delete', :title => member.title),
+      :confirm => t('message', :scope => 'shared.admin.delete', :title => member.full_name),
       :method => :delete %>
     </span>
   </td>

app/views/admin/memberships/_members.html.erb

@@ -18,6 +18,6 @@
 </table>
 <% else %>
 <p>
-<%= t('.no_new_members')%>
+  <strong><%= t('no_new_members', :scope => 'admin.memberships')%></strong>
 </p>
 <% end %>

app/views/admin/roles/_form.html.erb

@@ -15,9 +15,18 @@
              :locals => {
                :f => f,
                :continue_editing => false,
-               :hide_cancel => (@app_dialog or action_name == "insert" or from_dialog?),
+               :hide_cancel => false,
+               :hide_delete => (@role.new_record?),
                :delete_title => t('delete', :scope => 'admin.roles'),
                :delete_confirmation => (t('message', :scope => 'shared.admin.delete',
                                         :title => @role.title) if @role.persisted?)
                                       } %>
-<% end -%>
+<% end -%>
+
+<% content_for :javascripts do %>
+<script>
+$(function(){
+  $('.form-actions-dialog #cancel_button').not('.wym_iframe_body .form-actions-dialog #cancel_button').click(close_dialog);
+});
+</script
+<% end %>

app/views/admin/roles/_records.html.erb

@@ -8,7 +8,7 @@
 <% else %>
   <p>
     <% unless searching? %>
-      <strong><%= t('.no_files_yet') %></strong>
+      <strong><%= t('no_roles_yet', :scope => 'admin.roles') %></strong>
     <% else %>
       <%= t('no_results', :scope => 'shared.admin.search') %>
     <% end %>

app/views/admin/roles/index.html.erb

@@ -1,3 +1,4 @@
+<h2><%= t('roles_administration', :scope => 'admin.roles')%></h2>
 <div id='records'>
   <%= render :partial => 'records' %>
 </div>

app/views/admin/shared/_memberships_actions.html.erb

@@ -2,29 +2,37 @@
   <li>
     <%= render :partial => "/shared/admin/search", :locals => {:url => send("admin_#{params[:controller].gsub(/^admin\//, '')}_url")} %>
   </li>
+  
   <% if params[:controller] == 'admin/roles' %>
   <li>
-    <%= link_to t('.new_role'), new_admin_role_url(:dialog => true, :width => 500, :height => 300), :class => "add_icon" %>
+    <%= link_to t('new_role', :scope => 'admin.roles'), new_admin_role_url(:dialog => true, :width => 500, :height => 300), :class => "add_icon" %>
   </li> 
   <% end %>
+  
+  <% if params[:controller] == 'admin/membership_emails' %>
+  <li>
+    <%= link_to t('email_settings', :scope => 'admin.membership_emails'), settings_admin_membership_emails_path(:dialog => true, :width => 650, :height => 400), :class => "options_icon" %>
+  </li> 
+  <% end %>
+  
   <% unless params[:controller] == 'admin/memberships' %>
   <li>
     <%= link_to t('new_members', :scope => 'admin.memberships'), admin_memberships_path, :class => "new_members_icon" %>
   </li>  
   <% end %>
   <% unless params[:controller] == 'admin/members' %>
   <li>
-    <%= link_to t('members_administration', :scope => 'admin.memberships'), admin_members_path, :class => "members_icon" %>
+    <%= link_to t('members_administration', :scope => 'admin.members'), admin_members_path, :class => "members_icon" %>
   </li>
   <% end %>
   <% unless params[:controller] == 'admin/membership_emails' %>
   <li>
-    <%= link_to t('emails_administration', :scope => 'admin.memberships'), admin_membership_emails_path, :class => "email_icon" %>
+    <%= link_to t('emails_administration', :scope => 'admin.membership_emails'), admin_membership_emails_path, :class => "email_icon" %>
   </li>
   <% end %>
   <% unless params[:controller] == 'admin/roles' %>
   <li>
-    <%= link_to t('roles_administration', :scope => 'admin.memberships'), admin_roles_path, :class => "roles_icon" %>
+    <%= link_to t('roles_administration', :scope => 'admin.roles'), admin_roles_path, :class => "roles_icon" %>
   </li>
   <% end %>
 </ul>

config/locales/it.yml

@@ -1,4 +1,93 @@
 it:
+  activerecord:
+    models:
+      member: Utente registrato
+      role: Gruppo utente
+      membership_email: Email notifica utente
+    attributes:
+      role:
+        title: Nome gruppo
+      member:
+        name: Nome
+        organization: Organizzazione
+        email: Email
+        created_at: Data iscrizione
+        member_until: Scadenza iscrizione
+        active: Stato
+        password: Password
+        password_confirmation: Ripeti password
+        first_name: Nome
+        last_name: Cognome
+        title: Titolo
+        phone: Telefono
+        fax: Fax
+        street_address: Indirizzo
+        city: Città
+        province: Provincia
+        postal_code: C.A.P.
+        website: Sito web
+      membership_email:
+        subject: Oggetto
+        body: Corpo del messaggio
   years:
-    :one: 1 anno
-    :other: %{count} anni
+    one: '1 anno'
+    other: '%{count} anni'
+  admin:
+    memberships:
+      new_members: Nuovi utenti iscritti
+      no_new_members: Non ci sono nuovi utenti iscritti
+    pages:
+      tabs:
+        roles:
+          allow_everyone: "Permetti l'accesso a tutti"
+          allow_all_members: "Permetti l'accesso a tutti gli utenti registrati"
+          allow_members_of: "Permetti l'accesso agli utenti dei gruppi"
+    roles:
+      delete: Elimina gruppo
+      no_roles_yet: Non sono stati ancora creati dei gruppi
+      edit: Modifica gruppo
+      delete: Elimina gruppo
+      new_role: Nuovo gruppo
+      roles_administration: Amministrazione gruppi di utenti
+    members:
+      accept: "Accetta l'iscrizione"
+      reject: "Rifiuta l'iscrizione"
+      edit: Modifica utente
+      delete: Elimina utente
+      member_until: Scadenza iscrizione
+      membership_expired: Iscrizione scaduta il
+      not_yet_member: "L'utente non è ancora attivo"
+      activate_member_for: "Attiva iscrizione per"
+      account_active: Utente attivo
+      new_account: Nuovo utente
+      account_disabled: Utente disabilitato
+      account_expired: Utente scaduto
+      cancel: Disabilita utente
+      enable: Abilita utente
+      delete: Elimina questo utente
+      no_members_yet: Non ci sono ancora utenti registrati
+      members_administration: Amministrazione utenti
+      account: Dati iscrizione
+      organization: Organizzazione
+      profile: Dati personali
+      activation: Attivazione iscrizione
+      user_roles: Gruppi utente
+      user_can_login: "L'utente può accedere alle pagine riservate"
+      extend: Rinnova iscrizione
+      extend_membership_for: Rinnova iscrizione per
+    membership_emails:
+      member_accepted: Iscrizione accettata
+      member_created: Nuova iscrizione
+      member_deleted: Iscrizione cancellata
+      member_rejected: Iscrizione rifiutata
+      membership_extended: Iscrizione rinnovata
+      edit: Modifica email
+      no_emails_yet: Non ci sono ancora email
+      emails_administration: Amministrazione email
+      membership_email:
+      email_settings: Preferenze email
+      settings:
+        deliver_notifications_on: Spedire le seguenti notifiche agli utenti
+        deliver_admin_notifications_to: Spedire le notifiche amministrative a
+        email_delivery: Notifiche utente
+        admin_notifications: Notifiche amministrative

public/stylesheets/memberships.css

@@ -9,4 +9,7 @@
 }
 .roles_icon {  
   background-image: url('/images/refinery/icons/group.png');
+}
+.options_icon {  
+  background-image: url('/images/refinery/icons/cog_edit.png');
 }