Skip to content

Commit

Permalink
changed Language.default to Language.default.to_s, since it returns n…
Browse files Browse the repository at this point in the history
…ow a symbol (same as Language.list, now returning a list of symbols)

seems cleaner somehow to me...maybe this will get changed again some time, we'll see. also updated edit-view for account in that matter.
  • Loading branch information
bakkdoor committed Sep 7, 2008
1 parent 31e3831 commit e5ba29f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/app/views/account/edit.rhtml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<p>
<%= f.label :language, (l :language) %><br />

<%= collection_select(:user, :language, Language.list, :to_s, :lang_word, {:prompt => true}) %>
<%= collection_select(:user, :language, Language.list.map(&:to_s), :to_s, :lang_word, {:prompt => true}) %>
</p>
<p>
<%= f.submit (l :update) %>
Expand Down
2 changes: 1 addition & 1 deletion src/db/migrate/20080903223558_create_users.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def self.up
t.column :last_login, :datetime
t.column :failed_logins, :integer, :default => 0
t.column :user_level, :integer, :default => User.level_code(:new_member) #new_member
t.column :language, :string, :default => Language.default
t.column :language, :string, :default => Language.default.to_s
end
add_index :users, :login, :unique => true
end
Expand Down
4 changes: 2 additions & 2 deletions src/lib/language.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ class Language

# gibt standard-sprache zurück.
def self.default
"en"
:en
end

def self.list
["en", "de"]
[:en, :de]
end

end

0 comments on commit e5ba29f

Please sign in to comment.