Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

more wip

  • Loading branch information...
commit afe4dc66193cd778ce2e2b2be11eba8ce92554d5 1 parent 8f34d50
Robert Sosinski authored
View
2  app/views/root/pages/welcome.html.erb
@@ -8,7 +8,7 @@
<p>
<%= link_to t('root.layouts.namespace.signup'), new_users_path, :class => "btn btn-primary btn-large" %>
- <span class="welcome-or"><%= t 'app.or' %></span>
+ <span class="welcome-or"><%= t 'root.words.or' %></span>
<%= link_to t('root.layouts.namespace.login'), new_sessions_path, :class => "btn btn-large" %>
</p>
</div>
View
2  config/initializers/locale.rb
@@ -1 +1 @@
-I18n.load_path += Dir[Rails.root.join('config', 'locales', '{app,admin,api,root}', '*.{rb,yml}')]
+I18n.load_path += Dir[Rails.root.join('config', 'locales', '{admin,api,root}', '*.{rb,yml}')]
View
3  config/locales/app/en.yml
@@ -1,3 +0,0 @@
-en:
- app:
- or: or
View
3  config/locales/app/fr.yml
@@ -1,3 +0,0 @@
-fr:
- app:
- or: ou
View
3  config/locales/app/jp.yml
@@ -1,3 +0,0 @@
-jp:
- app:
- or: または
View
3  config/locales/root/en.yml
@@ -1,5 +1,8 @@
en:
root:
+ words:
+ or: or
+
layouts:
namespace:
language: Language
View
3  config/locales/root/fr.yml
@@ -1,5 +1,8 @@
fr:
root:
+ words:
+ or: ou
+
layouts:
namespace:
language: Langue
View
3  config/locales/root/jp.yml
@@ -1,5 +1,8 @@
jp:
root:
+ words:
+ or: または
+
layouts:
namespace:
language: 言語
View
4 config/routes/root.rb
@@ -1,6 +1,8 @@
Kiv7::Application.routes.draw do
scope :module => :root do
- scope '(:locale)', :locale => /en|fr|jp/ do
+ root :to => redirect('/en')
+
+ scope ':locale', :locale => /en|fr|jp/ do
root :to => 'pages#welcome'
# routes all pages to an appropriate template

0 comments on commit afe4dc6

Please sign in to comment.
Something went wrong with that request. Please try again.