From 6022491a2675b3e65080486c7324415886cd6b6d Mon Sep 17 00:00:00 2001
From: Andreas Deutschmann <philo@fet.at>
Date: Wed, 12 Mar 2014 17:58:49 +0100
Subject: [PATCH 1/3] FIX: Translations Gremien Issure #121

---
 app/controllers/gremien_controller.rb | 2 +-
 app/views/fetprofiles/index.html.erb  | 2 +-
 app/views/gremien/verwalten.html.erb  | 2 +-
 config/locales/fetprofile.de.yml      | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/gremien_controller.rb b/app/controllers/gremien_controller.rb
index 966cc4c..497163f 100644
--- a/app/controllers/gremien_controller.rb
+++ b/app/controllers/gremien_controller.rb
@@ -6,7 +6,7 @@ class GremienController < ApplicationController
   def verwalten
     @gremien = Gremium.all
     @gremientabs=Gremium.tabs
-    @toolbar_elements << {:text=>I18n.t('common.new'),:path=>new_gremium_path() ,:icon=>:plus} if can? :new, Gremium
+    @toolbar_elements << {:text=>I18n.t('gremium.new'),:path=>new_gremium_path() ,:icon=>:plus} if can? :new, Gremium
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @gremien }
diff --git a/app/views/fetprofiles/index.html.erb b/app/views/fetprofiles/index.html.erb
index a36b5b2..d80a255 100644
--- a/app/views/fetprofiles/index.html.erb
+++ b/app/views/fetprofiles/index.html.erb
@@ -41,7 +41,7 @@
 
 <div class="row-fluid">
   <div class="span12">
-    <%= link_to I18n.t('fetprofiles.new'), new_fetprofile_path %>
+    <%= link_to I18n.t('profile.new_profile'), new_fetprofile_path %>
   </div>
 </div></div>
 </div>
diff --git a/app/views/gremien/verwalten.html.erb b/app/views/gremien/verwalten.html.erb
index 3348678..38a339e 100644
--- a/app/views/gremien/verwalten.html.erb
+++ b/app/views/gremien/verwalten.html.erb
@@ -39,7 +39,7 @@
 
 <br />
 <%= render 'layouts/pretty_toolbar' %>
-<%= link_to 'New Gremium', new_gremium_path %>
+
 
 
 
diff --git a/config/locales/fetprofile.de.yml b/config/locales/fetprofile.de.yml
index 335d99e..8d938b5 100644
--- a/config/locales/fetprofile.de.yml
+++ b/config/locales/fetprofile.de.yml
@@ -7,6 +7,7 @@ de:
     notactive_members: "Pension"
     new_profile: "Neues Profil anlegen"
   gremium:
+    new: "Neues Gremium"
     filter:
       berufung:
         title: "Berufungskommission"

From 1dd6f027a0cb5b7a79b492260d38f99eec3f4846 Mon Sep 17 00:00:00 2001
From: Andreas Deutschmann <philo@fet.at>
Date: Wed, 12 Mar 2014 22:07:03 +0100
Subject: [PATCH 2/3] FIX: Issue #117

---
 app/controllers/fetprofiles_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/fetprofiles_controller.rb b/app/controllers/fetprofiles_controller.rb
index 2f8a654..ad61588 100644
--- a/app/controllers/fetprofiles_controller.rb
+++ b/app/controllers/fetprofiles_controller.rb
@@ -28,7 +28,7 @@ class FetprofilesController < ApplicationController
    
      @toolbar_elements << {:hicon=>'icon-pencil', :text=> I18n.t('common.edit'),:path => edit_fetprofile_path(@fetprofile) } if can? :edit, @fetprofile
 
-      @toolbar_elements << {:hicon=>'icon-minus', :text => I18n.t('common.delete'), :method=>:delete, :confirm=>"Sure"}
+      @toolbar_elements << {:hicon=>'icon-minus', :text => I18n.t('common.delete'), :method=>:delete, :confirm=>"Sure"} if can? :destroy,@fetprofile
           
    
     respond_to do |format|

From 9fae6dae7f3030e7e428904dd221c1d445bf967e Mon Sep 17 00:00:00 2001
From: Andreas Deutschmann <philo@fet.at>
Date: Wed, 12 Mar 2014 22:20:04 +0100
Subject: [PATCH 3/3] FIX: Translation Missing Themengruppe verwalten

---
 app/controllers/themengruppen_controller.rb | 2 +-
 config/locales/themen.de.yml                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/themengruppen_controller.rb b/app/controllers/themengruppen_controller.rb
index aba10ca..07c0a06 100644
--- a/app/controllers/themengruppen_controller.rb
+++ b/app/controllers/themengruppen_controller.rb
@@ -22,7 +22,7 @@ class ThemengruppenController < ApplicationController
     @toolbar_elements = []
     @toolbar_elements << {:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('thema.add'), :path=>new_themengruppe_thema_path(@themengruppe)} if can? :new, Themengruppe
     @toolbar_elements << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('themengruppe.edit'), :path=>edit_themengruppe_path(@themengruppe)} if can? :edit, @themengruppe
-  @toolbar_elements << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t("themengruppe.verwalten"), :path=>themengruppe_verwalten_path(@themengruppe)} if can? :edit, @themengruppe
+  @toolbar_elements << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t("themengruppe.manage"), :path=>themengruppe_verwalten_path(@themengruppe)} if can? :edit, @themengruppe
   @toolbar_elements << {:hicon=>'icon-remove-circle',:text=>I18n.t('themengruppe.remove'), :path=>themengruppe_path(@themengruppe), :method=>:delete,:confirm=>I18n.t('themengruppe.sure')} if can? :delete, @themengruppe
 
 
diff --git a/config/locales/themen.de.yml b/config/locales/themen.de.yml
index 7430b27..3b0229b 100644
--- a/config/locales/themen.de.yml
+++ b/config/locales/themen.de.yml
@@ -5,6 +5,7 @@ de:
     edit: "Themengruppe bearbeiten"
     remove: "Themengruppe löschen"
     sure: "Sicher, dass Sie diese Themengruppe löschen möchten?"
+    manage: "Themengruppe verwalten"
   thema:
     add: "Thema hinzufügen"
     edit: "Thema bearbeiten"