Registration fix and nav translations
7 changed files with 13 additions and 5 deletions
+ 1
- 1
app/controllers/application_controller.rb
@@ -40,7 +40,7 @@ class ApplicationController < ActionController::Base |
||
| 40 | 40 |
I18n.locale = l |
| 41 | 41 |
if @config.open_for_public == false && user_signed_in? == false |
| 42 | 42 |
page = params[:controller] |
| 43 |
- if page != 'start' && page != 'devise/sessions' && page != 'devise/registrations' && page != 'devise/invitations' && page != 'devise/passwords' && page != 'devise/unlocks' && page != 'devise/confirmations' && page != 'contact_messages' && page != 'subscription' |
|
| 43 |
+ if page != 'start' && page != 'user/sessions' && page != 'user/registrations' && page != 'user/invitations' && page != 'devise/passwords' && page != 'devise/unlocks' && page != 'devise/confirmations' && page != 'contact_messages' && page != 'subscription' |
|
| 44 | 44 |
#@analytics.track('Access Denied')
|
| 45 | 45 |
redirect_to root_path, notice: (t 'admin_panel.closed_for_public') |
| 46 | 46 |
return |
+ 2
- 2
app/views/layouts/_navigation_links.html.erb
@@ -4,8 +4,8 @@ |
||
| 4 | 4 |
<% if user_signed_in? %> |
| 5 | 5 |
<li><%= link_to (t 'agent.dashboard'), dashboard_path %></li> |
| 6 | 6 |
<% end %> |
| 7 |
- <li><%= link_to (t 'missions.missions'), missions_path %></li> |
|
| 8 |
- <li><%= link_to (t 'agents.agents'), agent_list_path %></li> |
|
| 7 |
+ <li><%= link_to (t 'mission.missions'), missions_path %></li> |
|
| 8 |
+ <li><%= link_to (t 'mission.agents'), agent_list_path %></li> |
|
| 9 | 9 |
<% else %> |
| 10 | 10 |
<li><%= link_to (t "landing_page.about").html_safe, root_path(anchor: 'about'), class: 'btn-about nav-responsive-link' %></li> |
| 11 | 11 |
<li><%= link_to (t "landing_page.features").html_safe, root_path(anchor: 'features'), class: 'btn-features nav-responsive-link' %></li> |
+ 2
- 2
app/views/layouts/footer/_footer_links.html.erb
@@ -6,8 +6,8 @@ |
||
| 6 | 6 |
<% end %> |
| 7 | 7 |
<%= content_tag(:div, class: 'pull-right') do %> |
| 8 | 8 |
<% if @config.open_for_public || user_signed_in? %> |
| 9 |
- <%= link_to (t 'missions.missions'), missions_path %><br> |
|
| 10 |
- <%= link_to (t 'missions.agents'), agent_list_path %><br> |
|
| 9 |
+ <%= link_to (t 'mission.missions'), missions_path %><br> |
|
| 10 |
+ <%= link_to (t 'mission.agents'), agent_list_path %><br> |
|
| 11 | 11 |
<% if user_signed_in? %> |
| 12 | 12 |
<%= link_to (t 'agent.dashboard'), dashboard_path %><br> |
| 13 | 13 |
<%= link_to (t "registration.account"), edit_user_registration_path, class: "btn-account" %><br> |
+ 2
- 0
config/locales/en.yml
@@ -286,7 +286,9 @@ en: |
||
| 286 | 286 |
email_contact: contact |
| 287 | 287 |
location: Location |
| 288 | 288 |
current_location: 'São Paulo, Brazil' |
| 289 |
+ support: 'Support' |
|
| 289 | 290 |
registration: |
| 291 |
+ account: 'Account' |
|
| 290 | 292 |
sign_in: Sign In |
| 291 | 293 |
sign_up: Sign Up |
| 292 | 294 |
first_name: First Name |
+ 2
- 0
config/locales/mission.en.yml
@@ -2,6 +2,8 @@ en: |
||
| 2 | 2 |
mission: |
| 3 | 3 |
mission: 'Mission' |
| 4 | 4 |
missions: 'Missions' |
| 5 |
+ agents: 'Agents' |
|
| 6 |
+ agent: 'Agent' |
|
| 5 | 7 |
notification: 'Notification' |
| 6 | 8 |
step: 'Step' |
| 7 | 9 |
mission_control: 'Mission Control' |
+ 2
- 0
config/locales/mission.pt-BR.yml
@@ -2,6 +2,8 @@ pt-BR: |
||
| 2 | 2 |
mission: |
| 3 | 3 |
mission: 'Missão' |
| 4 | 4 |
missions: 'Missões' |
| 5 |
+ agents: 'Agentes' |
|
| 6 |
+ agent: 'Agente' |
|
| 5 | 7 |
notification: 'Notificação' |
| 6 | 8 |
step: 'Passo' |
| 7 | 9 |
mission_control: 'Base de Comando' |
+ 2
- 0
config/locales/pt-BR.yml
@@ -288,7 +288,9 @@ pt-BR: |
||
| 288 | 288 |
email_contact: contato |
| 289 | 289 |
location: Local |
| 290 | 290 |
current_location: 'São Paulo, Brasil' |
| 291 |
+ support: "Suporte" |
|
| 291 | 292 |
registration: |
| 293 |
+ account: 'Conta' |
|
| 292 | 294 |
sign_in: Entrar |
| 293 | 295 |
sign_up: Cadastro |
| 294 | 296 |
first_name: Nome |