Make the diary RSS feed translatable

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 48cdda8a03df2823b55684ccd63d3265b41496ce..52e287b9a1d9fe65ad55038e6f6542a5c6276b39 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -103,8 +103,8 @@ class DiaryEntryController < ApplicationController
 
       if user
         @entries = DiaryEntry.find(:all, :conditions => ['user_id = ?', user.id], :order => 'created_at DESC', :limit => 20)
-        @title = "OpenStreetMap diary entries for #{user.display_name}"
-        @description = "Recent OpenStreetmap diary entries from #{user.display_name}"
+        @title = I18n.t('diary_entry.feed.user.title', :user => user.display_name, :locale => I18n.locale)
+        @description = I18n.t('diary_entry.feed.user.description', :user => user.display_name)
         @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
       else
         render :nothing => true, :status => :not_found
@@ -113,15 +113,15 @@ class DiaryEntryController < ApplicationController
       @entries = DiaryEntry.find(:all, :include => :user,
         :conditions => ["users.visible = ? AND diary_entries.language_code = ?", true, params[:language]],
         :order => 'created_at DESC', :limit => 20)
-      @title = "OpenStreetMap diary entries in #{Language.find(params[:language]).english_name}"
-      @description = "Recent diary entries from users of OpenStreetMap in #{Language.find(params[:language]).english_name}"
+      @title = I18n.t('diary_entry.feed.language.title', Language.find(params[:language]).english_name)
+      @description = I18n.t('diary_entry.feed.language.description', Language.find(params[:language]).english_name)
       @link = "http://#{SERVER_URL}/diary/#{params[:language]}"
     else
       @entries = DiaryEntry.find(:all, :include => :user,
                                  :conditions => ["users.visible = ?", true],
                                  :order => 'created_at DESC', :limit => 20)
-      @title = "OpenStreetMap diary entries"
-      @description = "Recent diary entries from users of OpenStreetMap"
+      @title = I18n.t('diary_entry.feed.all.title')
+      @description = I18n.t('diary_entry.feed.all.description')
       @link = "http://#{SERVER_URL}/diary"
     end
   end

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4e61c16bfee79ee99b4bdc467688a49053b03505..c89ac8025bbe86430248e00e0fff539de724a90d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -320,6 +320,16 @@ en:
       edit_link: Edit this entry
     diary_comment:
       comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
+    feed:
+      user:
+        title: "OpenStreetMap diary entries for {{user}}"
+        description: "Recent OpenStreetmap diary entries from {{user}}"
+      language:
+        title: "OpenStreetMap diary entries in {{language_name}}"
+        description: "Recent diary entries from users of OpenStreetMap in {{language_name}}"
+      all:
+        title: "OpenStreetMap diary entries"
+        description: "Recent diary entries from users of OpenStreetMap"
   export:
     start:
       area_to_export: "Area to Export"

diff --git a/config/locales/is.yml b/config/locales/is.yml
index e59180333b40d3f0687da0935ba9e24285bd0d37..c38ae9ae17eb875f12f07b64987b0ff1ac49392c 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -318,6 +318,16 @@ is:
       edit_link: "Breyta þessari færslu"
     diary_comment:
       comment_from: "Athugasemd eftir {{link_user}} þann {{comment_created_at}}"
+    feed:
+      user:
+        title: "OpenStreetMap dagbókarfærslur eftir {{user}}"
+        description: "Nýjustu dagbókarfærslur eftir {{user}}"
+      language:
+        title: "OpenStreetMap dagbókarfærslur á {{language_name}}"
+        description: "Nýjustu dagbókarfærslur frá OpenStreetMap á {{language_name}}"
+      all:
+        title: "OpenStreetMap dagbókarfærslur"
+        description: "Nýjustu dagbókarfærslur frá OpenStreetMap"
   export:
     start:
       area_to_export: "Svæði til að niðurhala"