aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlatka Pavisic2017-03-22 08:57:30 +0100
committerVlatka Pavisic2017-03-22 08:57:30 +0100
commit65eb3767c716ee8bf94306de2122e817bbe65edb (patch)
tree721ccb8ebeeecb47861fc88f314864a76461c9d3
parent7fd8b759b21fe157a2767f5d5342f4e438e98aac (diff)
downloadchouette-core-65eb3767c716ee8bf94306de2122e817bbe65edb.tar.bz2
Refs #2912 : Rm i18n-active_record
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock3
-rw-r--r--config/initializers/locale.rb13
-rw-r--r--db/migrate/20170322075010_delete_translations.rb5
-rw-r--r--db/schema.rb30
5 files changed, 6 insertions, 46 deletions
diff --git a/Gemfile b/Gemfile
index b9dd01f90..2c3d56385 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,6 @@ source 'http://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 4.1.10'
-gem 'i18n-active_record', :require => 'i18n/active_record'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 4.0.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index 35dc39edd..67aa8c87c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -257,8 +257,6 @@ GEM
httparty (0.14.0)
multi_xml (>= 0.5.2)
i18n (0.7.0)
- i18n-active_record (0.1.2)
- i18n (>= 0.5.0)
i18n-tasks (0.8.6)
activesupport
easy_translate (>= 0.5.0)
@@ -621,7 +619,6 @@ DEPENDENCIES
guard
guard-rspec
has_array_of!
- i18n-active_record
i18n-tasks
inherited_resources
jbuilder (~> 2.0)
diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb
deleted file mode 100644
index c7262b8a0..000000000
--- a/config/initializers/locale.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'i18n/backend/active_record'
-Translation = I18n::Backend::ActiveRecord::Translation
-
-if Translation.table_exists?
- I18n.backend = I18n::Backend::ActiveRecord.new
-
- I18n::Backend::ActiveRecord.send(:include, I18n::Backend::Memoize)
- I18n::Backend::ActiveRecord.send(:include, I18n::Backend::Flatten)
- I18n::Backend::Simple.send(:include, I18n::Backend::Memoize)
- I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization)
-
- I18n.backend = I18n::Backend::Chain.new(I18n::Backend::Simple.new, I18n.backend)
-end
diff --git a/db/migrate/20170322075010_delete_translations.rb b/db/migrate/20170322075010_delete_translations.rb
new file mode 100644
index 000000000..76976f6b8
--- /dev/null
+++ b/db/migrate/20170322075010_delete_translations.rb
@@ -0,0 +1,5 @@
+class DeleteTranslations < ActiveRecord::Migration
+ def change
+ drop_table :translations
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 61a8042d2..027079611 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20170321141620) do
+ActiveRecord::Schema.define(version: 20170322075010) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -165,22 +165,6 @@ ActiveRecord::Schema.define(version: 20170321141620) do
add_index "connection_links", ["objectid"], :name => "connection_links_objectid_key", :unique => true
- create_table "delayed_jobs", force: true do |t|
- t.integer "priority", default: 0
- t.integer "attempts", default: 0
- t.text "handler"
- t.text "last_error"
- t.datetime "run_at"
- t.datetime "locked_at"
- t.datetime "failed_at"
- t.string "locked_by"
- t.string "queue"
- t.datetime "created_at"
- t.datetime "updated_at"
- end
-
- add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
-
create_table "exports", force: true do |t|
t.integer "referential_id", limit: 8
t.string "status"
@@ -748,16 +732,6 @@ ActiveRecord::Schema.define(version: 20170321141620) do
t.datetime "updated_at"
end
- create_table "translations", force: true do |t|
- t.string "locale"
- t.string "key"
- t.text "value"
- t.text "interpolations"
- t.boolean "is_proc", default: false
- t.datetime "created_at"
- t.datetime "updated_at"
- end
-
create_table "users", force: true do |t|
t.string "email", default: "", null: false
t.string "encrypted_password", default: ""
@@ -851,8 +825,6 @@ ActiveRecord::Schema.define(version: 20170321141620) do
add_index "workbenches", ["stop_area_referential_id"], :name => "index_workbenches_on_stop_area_referential_id"
Foreigner.load
- add_foreign_key "access_links", "access_points", name: "aclk_acpt_fkey", dependent: :delete
-
add_foreign_key "group_of_lines_lines", "group_of_lines", name: "groupofline_group_fkey", dependent: :delete
add_foreign_key "journey_frequencies", "timebands", name: "journey_frequencies_timeband_id_fk", dependent: :nullify