Permalink
Browse files

a number of minor changes

  • Loading branch information...
1 parent 6c64cd9 commit 1e63554983293df65ec1ac4120658f4d35a2e067 erik committed May 25, 2011
View
2 app/controllers/links_controller.rb
@@ -107,7 +107,7 @@ def translate
link = Link.find_by_id(params[:link_id])
l = link.children.find_by_language_id(language_id)
l.update_attributes({:translated=>true}) if l
- l = link.create_language_child(l, true) unless l
+ l = link.create_language_child(language_id, true) unless l
redirect_to edit_link_path(l)
return
View
2 app/controllers/pages_controller.rb
@@ -82,7 +82,7 @@ def translate
page = Page.find_by_id(params[:page_id])
p = page.children.find_by_language_id(language_id)
p.update_attributes({:translated=>true}) if p
- p = page.create_language_child(l, true) unless p
+ p = page.create_language_child(language_id, true) unless p
redirect_to edit_page_path(p)
return
View
2 app/controllers/posts_controller.rb
@@ -121,7 +121,7 @@ def translate
post = Post.find_by_id(params[:post_id])
p = post.children.find_by_language_id(language_id)
p.update_attributes({:translated=>true}) if p
- p = post.create_language_child(l, true) unless p
+ p = post.create_language_child(language_id, true) unless p
redirect_to edit_post_path(p)
return
View
2 app/models/post.rb
@@ -95,7 +95,7 @@ def self.is_home_page?(is_admin=false)
end
def self.get_search(search_term, page, is_admin=false)
- having_cache ["search_posts_", page, search_term, @@per_page, self.active_language?, SPHINX_SEARCH], {:expires_in => CACHE_TIMEOUT, :force => is_admin } do
+ having_cache ["search_posts_", page, search_term, @@per_page, Language.active_language_id?, SPHINX_SEARCH], {:expires_in => CACHE_TIMEOUT, :force => is_admin } do
return search search_term, :order => :created_at, :sort_mode => :desc, :conditions=>['language_id=?', Language.active_language_id?], :page => page, :per_page => @@per_page if SPHINX_SEARCH
search_term = "%#{search_term}%"
return paginate({:page=>page, :conditions=>["title like ? OR body like ? OR excerpt like ? and language_id=?", search_term, search_term, search_term, Language.active_language_id?]})
View
10 config/locales/ka.yml
@@ -17,17 +17,17 @@ ka:
human:
format:
delimiter: ","
- storage_units: [Bytes, KB, MB, GB, TB]
+ storage_units: ["Bytes", "KB", "MB", "GB", "TB"]
precision:
format:
delimiter: ","
date:
order: [:day, :month, :year]
- abbr_day_names: [To, Lu, Ma, Mi, Ju, Wi, Sa]
- abbr_month_names: [~, Ju'ik', Ka'ik', Oxik', Kajik', Wo'ik', Waqik', Wuqik', Waqxaqik', Belejik', Lajik', Julajik', Kablajik']
- day_names: [Toq'ij, Luq'ij, Maq'ij, Miq'ij, Juq'ij, Wiq'ij, Saq'ij]
- month_names: [~, Ju'ik', Ka'ik', Oxik', Kajik', Wo'ik', Waqik', Wuqik', Waqxaqik', Belejik', Lajik', Julajik', Kablajik']
+ abbr_day_names: ["To", "Lu", "Ma", "Mi", "Ju", "Wi", "Sa"]
+ abbr_month_names: ["~", "Ju'ik'", "Ka'ik'", "Oxik'", "Kajik'", "Wo'ik'", "Waqik'", "Wuqik'", "Waqxaqik'", "Belejik'", "Lajik'", "Julajik'", "Kablajik'"]
+ day_names: ["Toq'ij", "Luq'ij", "Maq'ij", "Miq'ij", "Juq'ij", "Wiq'ij", "Saq'ij"]
+ month_names: ["~", "Ju'ik'", "Ka'ik'", "Oxik'", "Kajik'", "Wo'ik'", "Waqik'", "Wuqik'", "Waqxaqik'", "Belejik'", "Lajik'", "Julajik'", "Kablajik'"]
formats:
short: "%d richin %b"
default: "%d/%m/%Y"
View
1 public/stylesheets/main.css
@@ -432,6 +432,7 @@
font-size:18px;
line-height:20px;
margin: 5px auto;
+ margin-top:10px;
padding:10px;
width:920px;
}

0 comments on commit 1e63554

Please sign in to comment.