From 6281f4195b1f1830f60e869d98a20f0cc37a4c00 Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Wed, 2 Mar 2016 01:04:24 +0100
Subject: [PATCH] cleans up

---
 app/models/spending_proposal.rb              | 8 ++------
 app/views/admin/valuators/_valuator.html.erb | 2 +-
 config/locales/admin.en.yml                  | 4 +---
 config/locales/admin.es.yml                  | 4 +---
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/models/spending_proposal.rb b/app/models/spending_proposal.rb
index 9497dcae3..ba8ef7e78 100644
--- a/app/models/spending_proposal.rb
+++ b/app/models/spending_proposal.rb
@@ -34,15 +34,11 @@ class SpendingProposal < ActiveRecord::Base
     results = results.by_geozone(params[:geozone_id])             if params[:geozone_id].present?
     results = results.by_administrator(params[:administrator_id]) if params[:administrator_id].present?
     results = results.send(current_filter)                        if current_filter.present?
-    results = results.for_render
-    results
+    results.for_render
   end
 
   def self.by_geozone(geozone)
-    case geozone
-    when nil
-      self
-    when 'all'
+    if geozone == 'all'
       where(geozone_id: nil)
     else
       where(geozone_id: geozone.presence)
diff --git a/app/views/admin/valuators/_valuator.html.erb b/app/views/admin/valuators/_valuator.html.erb
index 72eec5304..68c2ae46d 100644
--- a/app/views/admin/valuators/_valuator.html.erb
+++ b/app/views/admin/valuators/_valuator.html.erb
@@ -3,5 +3,5 @@
 <span><%= valuator.email %></span>
 <% unless valuator.persisted? %>
   <%= link_to t('admin.valuators.valuator.add'),{ controller: "admin/valuators", action: :create, user_id: valuator.user_id },
-    method: :post, class: "button tiny radius success right" %>
+    method: :post, class: "button small success float-right" %>
 <% end %>
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index c44f216e4..0a78be2f1 100755
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -73,10 +73,8 @@ en:
     valuators:
       index:
         title: Valuators
-      moderator:
+      valuator:
         add: Add
-        delete: Delete
-        show: Show
       search:
         email_placeholder: Search user by email
         search: Search
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index 986e8671a..2a57c92f7 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -73,10 +73,8 @@ es:
     valuators:
       index:
         title: Evaluadores
-      moderator:
+      valuator:
         add: Añadir
-        delete: Borrar
-        show: Mostrar
       search:
         email_placeholder: Buscar usuario por email
         search: Buscar