cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing interpolation error with per language rss feeds that was introduced in [16903]

Browse source
This commit is contained in:
Štefan Baebler 2009-08-18 19:36:58 +00:00
parent 1f007b289c
commit 803acea032
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/diary_entry_controller.rb
View 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)
@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,

10
config/locales/sl.yml
View file

@ -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"