Merge pull request #152 from frisoft/master

Bugfix: import and italian localization update.
This commit is contained in:
Didier Lafforgue 2011-08-11 14:00:48 -07:00
commit 7a4253a7e4
4 changed files with 12 additions and 4 deletions

View File

@ -16,6 +16,7 @@ it:
welcome: Benvenuto, %{name}
see: Vedi il sito web
switch: Passa ad un altro sito
help: Aiuto
logout: Esci
menu:
contents: Contenuti

View File

@ -105,11 +105,13 @@ module Locomotive
next if element.nil?
if element.respond_to?(:source)
unless attributes['content'].blank?
asset_path = File.join(theme_path, 'public', attributes['content'])
if File.exists?(asset_path)
element.source = File.open(asset_path)
end
end
else
element.content = attributes['content']
end

Binary file not shown.

View File

@ -74,6 +74,11 @@ describe Locomotive::Import::Job do
page.find_editable_element('content', 'office').source_filename.should == 'office.jpg'
end
it 'sets the empty editable file for a page from the site config file' do
page = @site.pages.where(:title => 'Contact').first
page.find_editable_element('content', 'office2').source_filename.should be_nil
end
it 'inserts templatized page' do
page = @site.pages.where(:templatized => true).first
page.should_not be_nil