Revert Potlatch 0.10 from the trunk - we will keep it on the potlatch_010
branch for now until it has been reviewed.
This commit is contained in:
parent
62a1ec4748
commit
50c0333ea6
11 changed files with 740 additions and 1128 deletions
|
@ -83,7 +83,7 @@ module Potlatch
|
|||
when 'Hash'
|
||||
a=3.chr
|
||||
n.each do |k,v|
|
||||
a+=encodestring(k.to_s)+encodevalue(v)
|
||||
a+=encodestring(k)+encodevalue(v)
|
||||
end
|
||||
a+0.chr+0.chr+9.chr
|
||||
when 'String'
|
||||
|
@ -195,10 +195,7 @@ module Potlatch
|
|||
}
|
||||
end
|
||||
|
||||
# Read internationalisation
|
||||
localised = YAML::load(File.open("#{RAILS_ROOT}/config/potlatch/localised.yaml"))
|
||||
|
||||
[presets,presetmenus,presetnames,colours,casing,areas,autotags,relcolours,relalphas,relwidths,localised]
|
||||
[presets,presetmenus,presetnames,colours,casing,areas,autotags,relcolours,relalphas,relwidths]
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue