From 803acea03227f560776bf49621d9525ff40cba2f Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=A0tefan=20Baebler?= Date: Tue, 18 Aug 2009 19:36:58 +0000 Subject: [PATCH] fixing interpolation error with per language rss feeds that was introduced in [16903] --- app/controllers/diary_entry_controller.rb | 4 ++-- config/locales/sl.yml | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb index 52e287b9a..112b80182 100644 --- a/app/controllers/diary_entry_controller.rb +++ b/app/controllers/diary_entry_controller.rb @@ -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) - @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, diff --git a/config/locales/sl.yml b/config/locales/sl.yml index db249f264..f79a9c1cf 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -322,6 +322,16 @@ sl: 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" -- 2.39.5