continue to backport old code
This commit is contained in:
@@ -23,5 +23,6 @@ module Northwhale2
|
||||
config.autoload_paths << "#{Rails.root}/app/workers"
|
||||
config.i18n.default_locale = 'en-gb'
|
||||
config.i18n.available_locales = ['de-de', 'en-gb', 'en-us', 'es-mx', 'pt-br', 'es-es', 'fr-fr', 'it', 'ru-ru', 'ko', 'zh-tw', 'zh-cn']
|
||||
config.i18n.fallbacks.map = { 'fr-fr': :'fr-ch' }
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Additional translations at https://github.com/heartcombo/devise/wiki/I18n
|
||||
|
||||
en:
|
||||
en-gb:
|
||||
devise:
|
||||
confirmations:
|
||||
confirmed: "Your email address has been successfully confirmed."
|
||||
@@ -29,5 +29,20 @@
|
||||
# To learn more, please read the Rails Internationalization guide
|
||||
# available at https://guides.rubyonrails.org/i18n.html.
|
||||
|
||||
en:
|
||||
hello: "Hello world"
|
||||
en-gb:
|
||||
character_list:
|
||||
name: "Name"
|
||||
gender: "Gender"
|
||||
realm: "Realm"
|
||||
race: "Race"
|
||||
class: "Class"
|
||||
faction: "Faction"
|
||||
level: "Level"
|
||||
mount_list:
|
||||
name: "Name"
|
||||
description: "Description"
|
||||
owned: "Owned"
|
||||
pet_list:
|
||||
name: "Name"
|
||||
description: "Description"
|
||||
owned: "Owned"
|
||||
@@ -4,10 +4,12 @@ Rails.application.routes.draw do
|
||||
get 'home/index'
|
||||
devise_for :users, controllers: { omniauth_callbacks: 'users/omniauth_callbacks' }
|
||||
devise_scope :user do
|
||||
get 'sign_in', :to => 'devise/sessions#new', :as => :new_user_session
|
||||
get 'sign_in', :to => 'home#index', :as => :new_user_session
|
||||
delete 'sign_out', :to => 'devise/sessions#destroy', :as => :destroy_user_session
|
||||
end
|
||||
root to: "home#index"
|
||||
mount Sidekiq::Web => '/sidekiq'
|
||||
resources :wow_characters, path: '/wow-characters', only: [:index, :show]
|
||||
resources :wow_characters, only: [:index, :show]
|
||||
resources :wow_mounts, only: [:index, :show]
|
||||
resources :wow_pets, only: [:index, :show]
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user