Remove the languages hash since we are now storing the languages in a table. Translat...

diff --git a/app/views/diary_entry/_diary_entry.rhtml b/app/views/diary_entry/_diary_entry.rhtml
index 87d2a0112b2abdb2d461af0c2ccf472a3f39e65d..a83f7ba25395c20d63ab4ef03b6734e4068a9ada 100644 (file)
--- a/app/views/diary_entry/_diary_entry.rhtml
+++ b/app/views/diary_entry/_diary_entry.rhtml
@@ -3,7 +3,7 @@
 <% if diary_entry.latitude and diary_entry.longitude %>
 <%= t 'map.coordinates' %> <div class="geo" style="display: inline"><span class="latitude"><%= diary_entry.latitude %></span>; <span class="longitude"><%= diary_entry.longitude %></span></div> (<%=link_to (t 'map.view'), :controller => 'site', :action => 'index', :lat => diary_entry.latitude, :lon => diary_entry.longitude, :zoom => 14 %> / <%=link_to (t 'map.edit'), :controller => 'site', :action => 'edit', :lat => diary_entry.latitude, :lon => diary_entry.longitude, :zoom => 14 %>)<br/>
 <% end %>
-Posted by <b><%= link_to h(diary_entry.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_entry.user.display_name %></b> at <%= diary_entry.created_at %> in <%= LANGUAGES[diary_entry.language] %>
+<%= t 'diary_entry.posted_by', :link_user => (link_to h(diary_entry.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_entry.user.display_name), :created => l(diary_entry.created_at), :language => diary_entry.language.name %>
 <% if params[:action] == 'list' %>
 <br />
 <%= link_to t('diary_entry.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %>

diff --git a/config/initializers/available_locales.rb b/config/initializers/available_locales.rb
index 518b6d376d8585ce6475b2022f5da9213d2eac85..026be263a5c64f6f6bbc774345a92562e45ba6cd 100644 (file)
--- a/config/initializers/available_locales.rb
+++ b/config/initializers/available_locales.rb
@@ -16,7 +16,3 @@ module I18n
   end
 end
 
-LANGUAGES = 
-{ "en" => "English",
-  "de" => "Deutsch"
-  }

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a414e659a0dd4bbf0d96c2337d9ebca68f92f60f..d174ba087f30c024d5f2793a204948ed885fdea3 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -11,6 +11,7 @@ en:
       recent_entries: "Recent diary entries: "
       older_entries: Older Entries
       newer_entries: Newer Entries
+    posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
     comment_link: Comment on this entry
     reply_link: Reply to this entry
     comment_count: