diff --git a/Gemfile b/Gemfile index 0f00da1ba..929a88187 100644 --- a/Gemfile +++ b/Gemfile @@ -59,7 +59,6 @@ gem 'sitemap_generator', '~> 5.3.1' gem 'ahoy_matey', '~> 1.6.0' gem 'groupdate', '~> 3.2.0' # group temporary data -gem 'tolk', '~> 2.0.0' # Web interface for translations gem 'browser' gem 'turnout', '~> 2.4.0' diff --git a/Gemfile.lock b/Gemfile.lock index de9002e3a..ad5c0383e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -387,7 +387,6 @@ GEM rvm1-capistrano3 (1.4.0) capistrano (~> 3.0) sshkit (>= 1.2) - safe_yaml (1.0.4) safely_block (0.2.0) errbase sass (3.4.23) @@ -445,9 +444,6 @@ GEM tilt (2.0.7) timecop (0.8.1) tins (1.13.2) - tolk (2.0.0) - rails (>= 4.0) - safe_yaml (>= 0.8.6) turbolinks (2.5.3) coffee-rails turnout (2.4.0) @@ -559,7 +555,6 @@ DEPENDENCIES spring spring-commands-rspec sprockets (~> 3.7.1) - tolk (~> 2.0.0) turbolinks turnout (~> 2.4.0) uglifier (~> 3.2.0) diff --git a/config/initializers/tolk.rb b/config/initializers/tolk.rb deleted file mode 100644 index 2284aa921..000000000 --- a/config/initializers/tolk.rb +++ /dev/null @@ -1,25 +0,0 @@ -# encoding: utf-8 - -# Tolk config file. Generated on January 14, 2016 12:09 -# See github.com/tolk/tolk for more informations - -Tolk.config do |config| - - # If you need to add a mapping do it like this : - # May we suggest you use http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes - # config.mapping['en-AU'] = 'English (Australia)' - # config.mapping['es-MX'] = 'Spanish (Mexico)' - # config.mapping['fr-ES'] = 'FraƱol !' - # config.mapping['is'] = 'Icelandic' - # config.mapping['vi'] = 'Vietnamese' - - # Master source of strings to be translated - config.primary_locale_name = 'en' -end - -Tolk::ApplicationController.authenticator = proc { - authenticate_or_request_with_http_basic do |username, password| - username == Rails.application.secrets.translate_username && - password == Rails.application.secrets.translate_password - end -} diff --git a/config/routes.rb b/config/routes.rb index bdf1e22f3..ea12cf1ab 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -416,7 +416,6 @@ Rails.application.routes.draw do end mount GraphiQL::Rails::Engine, at: '/graphiql', graphql_path: '/graphql' - mount Tolk::Engine => '/translate', :as => 'tolk' # more info pages get 'more-information', to: 'pages#show', id: 'more_info/index', as: 'more_info' diff --git a/config/secrets.yml.example b/config/secrets.yml.example index 6e67e57c8..f67ea65c0 100644 --- a/config/secrets.yml.example +++ b/config/secrets.yml.example @@ -33,9 +33,6 @@ production: &production google_oauth2_key: "" google_oauth2_secret: "" - translate_username: "" - translate_password: "" - rollbar_server_token: "" server_name: "" diff --git a/db/migrate/20170708225159_remove_tolk.rb b/db/migrate/20170708225159_remove_tolk.rb new file mode 100644 index 000000000..d07c88ebb --- /dev/null +++ b/db/migrate/20170708225159_remove_tolk.rb @@ -0,0 +1,10 @@ +class RemoveTolk < ActiveRecord::Migration + def change + remove_index :tolk_translations, column: [:phrase_id, :locale_id] + remove_index :tolk_locales, column: :name + + drop_table :tolk_translations + drop_table :tolk_phrases + drop_table :tolk_locales + end +end diff --git a/db/schema.rb b/db/schema.rb index 0787b5ed1..440fb2a9a 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: 20170704105112) do +ActiveRecord::Schema.define(version: 20170708225159) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -860,32 +860,6 @@ ActiveRecord::Schema.define(version: 20170704105112) do add_index "tags", ["proposals_count"], name: "index_tags_on_proposals_count", using: :btree add_index "tags", ["spending_proposals_count"], name: "index_tags_on_spending_proposals_count", using: :btree - create_table "tolk_locales", force: :cascade do |t| - t.string "name" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "tolk_locales", ["name"], name: "index_tolk_locales_on_name", unique: true, using: :btree - - create_table "tolk_phrases", force: :cascade do |t| - t.text "key" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "tolk_translations", force: :cascade do |t| - t.integer "phrase_id" - t.integer "locale_id" - t.text "text" - t.text "previous_text" - t.boolean "primary_updated", default: false - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "tolk_translations", ["phrase_id", "locale_id"], name: "index_tolk_translations_on_phrase_id_and_locale_id", unique: true, using: :btree - create_table "users", force: :cascade do |t| t.string "email", default: "" t.string "encrypted_password", default: "", null: false