projects
/
rails.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cc9a9ee
)
Attempt to unbreak Potlatch.
author
Tom Hughes
<tom@compton.nu>
Thu, 15 Oct 2009 07:40:47 +0000
(07:40 +0000)
committer
Tom Hughes
<tom@compton.nu>
Thu, 15 Oct 2009 07:40:47 +0000
(07:40 +0000)
app/controllers/amf_controller.rb
patch
|
blob
|
history
diff --git
a/app/controllers/amf_controller.rb
b/app/controllers/amf_controller.rb
index 64abdb25785116632dab53bcdf2f8ba326a7551d..7df237de87e245fa4a15ef24a8c46967fdbb7527 100644
(file)
--- a/
app/controllers/amf_controller.rb
+++ b/
app/controllers/amf_controller.rb
@@
-249,7
+249,7
@@
class AmfController < ApplicationController
en = YAML::load(File.open("#{RAILS_ROOT}/config/potlatch/locales/en.yml"))["en"]
if lang == 'en'
- return [
real
_lang, en]
+ return [
loaded
_lang, en]
else
# Use English as a fallback
begin