fixing interpolation error with per language rss feeds that was introduced in [16903]
authorŠtefan Baebler <stefan.baebler@gmail.com>
Tue, 18 Aug 2009 19:36:58 +0000 (19:36 +0000)
committerŠtefan Baebler <stefan.baebler@gmail.com>
Tue, 18 Aug 2009 19:36:58 +0000 (19:36 +0000)
app/controllers/diary_entry_controller.rb
config/locales/sl.yml

index 52e287b9a1d9fe65ad55038e6f6542a5c6276b39..112b80182fdbb93afcb4c12064a8cd66df93a31a 100644 (file)
@@ -113,8 +113,8 @@ 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)
       @entries = DiaryEntry.find(:all, :include => :user,
         :conditions => ["users.visible = ? AND diary_entries.language_code = ?", true, params[:language]],
         :order => 'created_at DESC', :limit => 20)
-      @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)
+      @title = I18n.t('diary_entry.feed.language.title', :language_name => Language.find(params[:language]).english_name, :locale => I18n.locale)
+      @description = I18n.t('diary_entry.feed.language.description', :language_name => Language.find(params[:language]).english_name, :locale => I18n.locale)
       @link = "http://#{SERVER_URL}/diary/#{params[:language]}"
     else
       @entries = DiaryEntry.find(:all, :include => :user,
       @link = "http://#{SERVER_URL}/diary/#{params[:language]}"
     else
       @entries = DiaryEntry.find(:all, :include => :user,
index db249f264f306c1de6c1a2defaf8b1a26925c058..f79a9c1cf5b6840bb01cbf2891f2eb4e6e58b747 100644 (file)
@@ -322,6 +322,16 @@ sl:
       edit_link: Uredi ta vnos
     diary_comment:
       comment_from: "Komentar uporabnika {{link_user}} v {{comment_created_at}}"
       edit_link: Uredi ta vnos
     diary_comment:
       comment_from: "Komentar uporabnika {{link_user}} v {{comment_created_at}}"
+    feed:
+      user:
+        title: "Dnevnik OpenStreetMap uporabnika {{user}}"
+        description: "Nedavni zapisi v dnevnik OpenStreetmap uporabnika {{user}}"
+      language:
+        title: "Dnevnik OpenStreetMap v jeziku {{language_name}}"
+        description: "Nedavni zapisi v dnevnik uporabnikov OpenStreetmap v jeziku {{language_name}}"
+      all:
+        title: "Dnevnik OpenStreetMap"
+        description: "Nedavni zapisi v dnevnik uporabnikov OpenStreetmap"
   export:
     start:
       area_to_export: "Področje za izvoz"
   export:
     start:
       area_to_export: "Področje za izvoz"