From cbdc437c6c25d57332027d15d8d14442a8668fdc Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Tue, 12 Nov 2013 20:22:56 +0100
Subject: [PATCH] i18n fetprofile

---
 app/views/fetprofiles/_form.html.erb | 2 +-
 app/views/fetprofiles/_tabs.html.erb | 8 ++++----
 app/views/fetprofiles/new.html.erb   | 4 ++--
 app/views/fetprofiles/show.html.erb  | 4 ++--
 app/views/studien/_studium.html.erb  | 2 +-
 config/locales/de.yml                | 4 +++-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/views/fetprofiles/_form.html.erb b/app/views/fetprofiles/_form.html.erb
index d6d6efb..28905e7 100644
--- a/app/views/fetprofiles/_form.html.erb
+++ b/app/views/fetprofiles/_form.html.erb
@@ -22,7 +22,7 @@
 	<%= f.hidden_field :picture_cache %>
 	<label>
 	  <%= f.check_box :remove_picture %>
-	  Bild Entfernen
+	  <%= I18n.t('profile.remove_picture') %>
 	</label>
       </div>
       <div class="span4">  <%= f.input :fetmailalias %></div> 
diff --git a/app/views/fetprofiles/_tabs.html.erb b/app/views/fetprofiles/_tabs.html.erb
index 71f204d..a17254b 100644
--- a/app/views/fetprofiles/_tabs.html.erb
+++ b/app/views/fetprofiles/_tabs.html.erb
@@ -1,9 +1,9 @@
 <ul class="nav nav-tabs">
   <li <%= (request.fullpath == fetprofiles_path(filter: "active")|| request.fullpath == fetprofiles_path) ? 'class="active"'.html_safe : ''%> >
-    <%= link_to "Aktive Mitglieder" , fetprofiles_path( filter: "active") %> 
+    <%= link_to I18n.t('profile.active_members') , fetprofiles_path( filter: "active") %> 
   </li>
   <li>
-    <%= link_to "Alle Gremien und Gruppen", gremien_path %>
+    <%= link_to I18n.t('profile.all_groups'), gremien_path %>
   </li> 
   <% for g in @gremientabs %>
   <li <%= (!@gremium.nil? && g == @gremium) ? 'class="active"'.html_safe : '' %> title="<%= g.name %>">
@@ -11,7 +11,7 @@
   </li>
   <% end %>
   <li <%= (request.fullpath == fetprofiles_path(filter: "all")) ? 'class="active"'.html_safe : ''%> >
-    <%= link_to "Alle Mitglieder" , fetprofiles_path( filter: "all") %> 
+    <%= link_to I18n.t('profile.all_members') , fetprofiles_path( filter: "all") %> 
   </li>
   <% if can?(:verwalten,Gremium) %>
   <% if request.fullpath == verwalten_gremien_path %>
@@ -19,7 +19,7 @@
   <% else %>
   <li class="pull-right">
   <% end %>
-    <%= link_to "Verwaltung", verwalten_gremien_path %>
+    <%= link_to I18n.t('common.verwalten'), verwalten_gremien_path %>
   </li>
   <% end %>
 </ul>
diff --git a/app/views/fetprofiles/new.html.erb b/app/views/fetprofiles/new.html.erb
index 94b4554..0499665 100644
--- a/app/views/fetprofiles/new.html.erb
+++ b/app/views/fetprofiles/new.html.erb
@@ -1,5 +1,5 @@
-<h1>New fetprofile</h1>
+<h1><%= I18n.t('profile.new_profile')%></h1>
 
 <%= render 'form' %>
 
-<%= link_to 'Back', fetprofiles_path %>
+<%= link_to I18n.t('common.back'), fetprofiles_path %>
diff --git a/app/views/fetprofiles/show.html.erb b/app/views/fetprofiles/show.html.erb
index 760381c..8f6ba1e 100644
--- a/app/views/fetprofiles/show.html.erb
+++ b/app/views/fetprofiles/show.html.erb
@@ -18,8 +18,8 @@
 	<% @fetprofile.memberships.each do |m| %>
 	<li>
 	  <%= render m %>
-	  <%= link_to 'edit', edit_fetprofile_membership_path(@fetprofile,m) if params["verwalten"] && can?(:delete, m)%>
-	  <%= link_to 'delete', [@fetprofile, m], method: :delete, data: {confirm: 'Sure to delete?'} if params["verwalten"] && can?(:delete, m ) %>
+	  <%= link_to I18n.t('common.edit'), edit_fetprofile_membership_path(@fetprofile,m) if params["verwalten"] && can?(:edit, m)%>
+	  <%= link_to I18n.t('common.delete'), [@fetprofile, m], method: :delete, data: {confirm: I18n.t('common.sure_del')} if params["verwalten"] && can?(:delete, m ) %>
 	</li>
 	<% end %>
       </ul>
diff --git a/app/views/studien/_studium.html.erb b/app/views/studien/_studium.html.erb
index cc45c82..f7b116d 100644
--- a/app/views/studien/_studium.html.erb
+++ b/app/views/studien/_studium.html.erb
@@ -12,7 +12,7 @@
       <b><%= studium.typ%> </b>
     </p>
     <p><b><%=I18n.t("studien.desc")%>:</b><br>
-      <%= !(studium.desc.to_s == "") ? studium.desc.html_safe :  I18n.t("keine.beschreibung")%>
+      <%= !(studium.desc.to_s == "") ? studium.desc_first_words.html_safe :  I18n.t("keine.beschreibung")%>
     </p>
     
   </div>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 6f8b853..8b26a65 100755
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -5,10 +5,12 @@ de:
   hello: "Hallo Welt"
   common:
     edit: "Bearbeiten"
+    back: "Zurück"
     actions: "Aktionen"
     delete: "Löschen"    
     verwalten: "Verwalten"
     back: "Zurück"
+    sure_del: "Sicher endgültig löschen?"
   home:
     mtitle: "Menu"
     willkommen: "Willkommen bei der Fachschaft Elektrotechnik"
@@ -82,4 +84,4 @@ de:
               blank: "Wählen Sie zumindest eine Modulgruppe aus"
   support:
     array:
-      two_words_connector: ', '
\ No newline at end of file
+      two_words_connector: ', '	
\ No newline at end of file