Permalink
Browse files

Updated to Rails 3.2.1

  • Loading branch information...
1 parent e6bc668 commit de91be136cba992a683b6c9a3d412d39b7040315 @miloops committed Feb 14, 2012
View
@@ -1,6 +1,6 @@
source "http://rubygems.org"
-gem "rails", "3.1.1"
+gem "rails", "3.2.1"
gem 'will_paginate'
gem "ya2yaml"
@@ -1,6 +1,6 @@
module Tolk
class Locale < ActiveRecord::Base
- set_table_name "tolk_locales"
+ self.table_name = "tolk_locales"
MAPPING = {
'ar' => 'Arabic',
@@ -1,6 +1,6 @@
module Tolk
class Phrase < ActiveRecord::Base
- set_table_name "tolk_phrases"
+ self.table_name = "tolk_phrases"
validates_uniqueness_of :key
@@ -1,6 +1,6 @@
module Tolk
class Translation < ActiveRecord::Base
- set_table_name "tolk_translations"
+ self.table_name = "tolk_translations"
scope :containing_text, lambda {|query| where("tolk_translations.text LIKE ?", "%#{query}%") }
@@ -27,6 +27,6 @@ def teardown
protected
def encode_credentials(username, password)
- "Basic #{ActiveSupport::Base64.encode64("#{username}:#{password}")}"
+ "Basic #{Base64.encode64("#{username}:#{password}")}"
end
end

1 comment on commit de91be1

Thanks! Love tolk and great it works in new rails version now!

Please sign in to comment.