Added full i18n support and extracted texts to en.yml file.

jnettome · jnettome · commit 68fb3d3a63e6 · 2013-05-07T01:16:55.000-03:00
diff --git a/app.rb b/app.rb
@@ -43,7 +43,7 @@ def t(*args)
       redirect '/login'
     end
 
-    I18n.locale = session[:lang].to_sym unless session[:lang].blank? || :en
+    I18n.locale = ENV["locale"].to_sym unless ENV["locale"].blank? || :en
   end
 
   get "/" do
@@ -59,4 +59,3 @@ def t(*args)
 require_relative "app/controllers/first_run_controller"
 require_relative "app/controllers/sessions_controller"
 require_relative "app/controllers/feeds_controller"
-require_relative "app/controllers/languages_controller"
diff --git a/app/controllers/languages_controller.rb b/app/controllers/languages_controller.rb
diff --git a/app/views/first_run/password.erb b/app/views/first_run/password.erb
@@ -1,21 +1,21 @@
 <div class="setup" id="password-setup">
-  <h1>Stringer is <span class="orange">anti-social</span>.</h1>
-  <h2>There is only one user: you.</h2>
+  <h1><%= t('first_run.password.title') %></h1>
+  <h2><%= t('first_run.password.subtitle') %></h2>
   <hr />
-  <p>Let's pick a password so only you can read your stories.</p>
+  <p><%= t('first_run.password.description') %></p>
   <hr />
   <form id="password_setup" method="POST" action="/setup/password">
     <div class="control-group">
       <input name="password" id="password" type="password" autofocus="autofocus"/ >
       <i class="icon-lock field-icon"></i>
-      <label id="password-label" class="field-label" for="password">Password</label>
+      <label id="password-label" class="field-label" for="password"><%= t('first_run.password.fields.password') %></label>
     </div>
     <div class="control-group">
       <input name="password_confirmation" id="password-confirmation" type="password" />
       <i class="icon-lock field-icon"></i>
-      <label id="confirm-label" class="field-label" for="password_confirmation">Confirm</label>
+      <label id="confirm-label" class="field-label" for="password_confirmation"><%= t('first_run.password.fields.password_confirmation') %></label>
     </div>
 
-    <input type="submit" id="submit" class="btn btn-primary pull-right" value="Next"/>
+    <input type="submit" id="submit" class="btn btn-primary pull-right" value="<%= t('first_run.password.fields.next') %>"/>
   </form>
-</div>
+</div>
diff --git a/app/views/import.erb b/app/views/import.erb
@@ -3,19 +3,19 @@
 <% end %>
 
 <div class="setup" id="feed-setup">
-  <h1>Welcome aboard.</h1>
-  <h2>Let's setup your feeds.</h2>
-  
+  <h1><%= t('import.title') %></h1>
+  <h2><%= t('import.subtitle') %></h2>
+
   <hr />
   <p>
-    <a href="https://www.google.com/reader/subscriptions/export?hl=en">Export</a> your feeds from Google Reader and import them.
+    <%= t('import.description', :link => '<a href="https://www.google.com/reader/subscriptions/export?hl=en">'+t('import.export')+'</a>') %>
   </p>
   <hr />
 
   <form id="import" method="POST" action="/import" enctype="multipart/form-data">
-    <input id="opml_file" name="opml_file" type="file" title="Import" class="btn-primary" />
-    <a href="/setup/tutorial" id="skip" class="btn pull-right">Not now</a>
-  </form> 
+    <input id="opml_file" name="opml_file" type="file" title="<%= t('import.fields.import') %>" class="btn-primary" />
+    <a href="/setup/tutorial" id="skip" class="btn pull-right"><%= t('import.fields.not_now') %></a>
+  </form>
 </div>
 
 <script type="text/javascript">
@@ -24,4 +24,4 @@ $(document).ready(function() {
     $('form#import').submit();
   });
 });
-</script>
+</script>
diff --git a/app/views/layout.erb b/app/views/layout.erb
@@ -3,7 +3,7 @@
   <head>
     <title>
       <%= yield_content :title %>
-      stringer | your rss buddy
+      <%= t('layout.title') %>
     </title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <link rel="shortcut icon" href="/img/favicon.png">
@@ -30,7 +30,7 @@
             <div class="span12">
               <%= yield %>
             </div>
-          </div>       
+          </div>
         </div>
       </div>
 
@@ -43,22 +43,22 @@
           <div class="span6">
             <ul class="footer-links">
               <% if current_user %>
-                <li><a href="/logout">Logout</a></li>
+                <li><a href="/logout"><%= t('layout.logout') %></a></li>
                 <li class="muted">·</li>
-                <li><a href="/export">Export</a></li>
+                <li><a href="/export"><%= t('layout.export') %></a></li>
                 <li class="muted">·</li>
               <% end %>
-              
-              <li><a href="https://github.com/swanson/stringer">Support</a></li>
+
+              <li><a href="https://github.com/swanson/stringer"><%= t('layout.support') %></a></li>
             </ul>
           </div>
           <div class="span6">
             <p class="pull-right">
-              <b>Hey!</b> Get back to work, slacker!
+              <%= t('layout.back_to_work') %>
             </p>
           </div>
         </div>
       </div>
     </div>
   </body>
-</html>
+</html>
diff --git a/app/views/partials/_action_bar.erb b/app/views/partials/_action_bar.erb
@@ -1,21 +1,21 @@
 <div class="row-fluid">
   <div class="pull-left">
-    <a class="btn" id="mark-all" title="Mark all as read">
+    <a class="btn" id="mark-all" title="<%= t('partials.action_bar.mark_all') %>">
       <i class="icon-ok"></i>
-      <%= render_partial :mark_all_as_read_form, 
+      <%= render_partial :mark_all_as_read_form,
                         {stories: stories} %>
     </a>
-    <a class="btn" href="/" id="refresh" title="Refresh">
+    <a class="btn" href="/" id="refresh" title="<%= t('partials.action_bar.refresh') %>">
       <i class="icon-repeat"></i>
     </a>
   </div>
 
   <div class="pull-right">
-    <a class="btn btn-primary" id="feeds" href="/feeds" title="View feeds">
+    <a class="btn btn-primary" id="feeds" href="/feeds" title="<%= t('partials.action_bar.view_feeds') %>">
       <i class="icon-list"></i>
     </a>
-    <a class="btn btn-primary" id="add-feed" href="/add_feed" title="Add a feed">
+    <a class="btn btn-primary" id="add-feed" href="/add_feed" title="<%= t('partials.action_bar.add_feed') %>">
       <i class="icon-plus"></i>
     </a>
   </div>
-</div>
+</div>
diff --git a/app/views/partials/_feed.erb b/app/views/partials/_feed.erb
@@ -7,7 +7,7 @@
       </p>
     </div>
     <div class="span4 feed-last-updated">
-      <span class="last-updated">Last updated</span>
+      <span class="last-updated"><%= t('partials.feed.last_updated') %></span>
       <span class="last-updated-time">
         <% if feed.last_fetched %>
           <%= feed.last_fetched.strftime("%b %d, %H:%M") %>
@@ -20,4 +20,4 @@
       <a class="icon-remove"></a>
     </div>
   </div>
-</li>
+</li>
diff --git a/app/views/partials/_feed_action_bar.erb b/app/views/partials/_feed_action_bar.erb
@@ -1,16 +1,16 @@
 <div class="row-fluid">
   <div class="pull-left">
-    <a class="btn" id="home" href="/news" title="Return to Stories">
+    <a class="btn" id="home" href="/news" title="<%= t('partials.feed_action_bar.home') %>">
       <i class="icon-reply"></i>
     </a>
   </div>
 
   <div class="pull-right">
-    <a class="btn btn-primary" id="feeds" href="/feeds" title="View feeds">
+    <a class="btn btn-primary" id="feeds" href="/feeds" title="<%= t('partials.feed_action_bar.feeds') %>">
       <i class="icon-list"></i>
     </a>
-    <a class="btn btn-primary" id="add-feed" href="/add_feed" title="Add a feed">
+    <a class="btn btn-primary" id="add-feed" href="/add_feed" title="<%= t('partials.feed_action_bar.add_feed') %>">
       <i class="icon-plus"></i>
     </a>
   </div>
-</div>
+</div>
diff --git a/app/views/partials/_shortcuts.erb b/app/views/partials/_shortcuts.erb
@@ -1,16 +1,16 @@
 <div id="shortcuts" class="modal hide fade" tabindex="-1" role="dialog">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="myModalLabel">Keyboard shortcuts</h3>
+    <h3 id="myModalLabel"><%= t('partials.shortcuts.title') %></h3>
   </div>
   <div class="modal-body">
     <ul class="shortcut-legend">
-      <li><kbd>j</kbd>/<kbd>k</kbd>: Next/previous story</li>
-      <li><kbd>o</kbd> or <kbd>enter</kbd>: Toggle story open/closed</li>
-      <li><kbd>v</kbd>: Go to story URL</li>
+      <li><kbd>j</kbd>/<kbd>k</kbd>: <%= t('partials.shortcuts.keys.jk') %></li>
+      <li><kbd>o</kbd> or <kbd>enter</kbd>: <%= t('partials.shortcuts.keys.oenter') %></li>
+      <li><kbd>v</kbd>: <%= t('partials.shortcuts.keys.v') %></li>
       <li class="blank"></li>
-      <li><kbd>shift</kbd>+<kbd>a</kbd>: Mark all as read</li>
-      <li><kbd>r</kbd>: Refresh</li>
+      <li><kbd>shift</kbd>+<kbd>a</kbd>: <%= t('partials.shortcuts.keys.shifta') %></li>
+      <li><kbd>r</kbd>: <%= t('partials.shortcuts.keys.r') %></li>
     </ul>
   </div>
-</div>
+</div>
diff --git a/app/views/partials/_zen.erb b/app/views/partials/_zen.erb
@@ -1,10 +1,9 @@
 <div id="zen">
   <span id="zero">&ndash; 0 &ndash;</span>
-  <p>You&#8217;ve reached RSS Zero&trade;</p>
+  <p><%= t('partials.zen.zero') %></p>
   <p>
     <small>
-      Now stop reading blogs and 
-      <span id="gtfo">go make something</span>.
+      <%= t('partials.zen.gtfo') %>
     </small>
   </p>
-</div>
+</div>
diff --git a/app/views/sessions/new.erb b/app/views/sessions/new.erb
@@ -1,15 +1,15 @@
 <div class="setup" id="feed-setup">
-  <h1>Stringer speaks <span class="orange">RSS</span>.</h1>
-  <h2>Welcome back, friend.</h2>
-  
+  <h1><%= t('sessions.new.title') %></h1>
+  <h2><%= t('sessions.new.subtitle') %></h2>
+
   <hr />
 
   <form method="POST" id="login" action="/login">
     <div class="control-group">
       <input name="password" id="password" type="password" autofocus="autofocus"/ >
       <i class="icon-lock field-icon"></i>
-      <label id="password-label" class="field-label" for="password">Password</label>
+      <label id="password-label" class="field-label" for="password"><%= t('sessions.new.fields.password') %></label>
     </div>
-    <input type="submit" value="Login" class="btn btn-primary pull-right" />
-  </form> 
-</div>
+    <input type="submit" value="<%= t('sessions.new.fields.submit') %>" class="btn btn-primary pull-right" />
+  </form>
+</div>
diff --git a/app/views/tutorial.erb b/app/views/tutorial.erb
@@ -3,19 +3,19 @@
 <% end %>
 
 <div class="tutorial-overlay">
-  <p class="instruction" id="mark-all-instruction">mark all <br/>as read</p>
+  <p class="instruction" id="mark-all-instruction"><%= t('tutorial.mark_all') %></p>
 </div>
 <div class="tutorial-overlay">
-  <p class="instruction" id="refresh-instruction">refresh</p>
+  <p class="instruction" id="refresh-instruction"><%= t('tutorial.refresh') %></p>
 </div>
 <div class="tutorial-overlay">
-  <p class="instruction" id="feeds-instruction">your feeds</p>
+  <p class="instruction" id="feeds-instruction"><%= t('tutorial.your_feeds') %></p>
 </div>
 <div class="tutorial-overlay">
-  <p class="instruction" id="add-feed-instruction">add feed</p>
+  <p class="instruction" id="add-feed-instruction"><%= t('tutorial.add_feed') %></p>
 </div>
 <div class="tutorial-overlay">
-  <p class="instruction" id="story-instruction">your stories <br/>(click to read)</p>
+  <p class="instruction" id="story-instruction"><%= t('tutorial.your_stories') %></p>
 </div>
 
 <div id="action-bar">
@@ -31,23 +31,23 @@
 </div>
 
 <div class="setup">
-  <h1>Stringer is <span class="orange">simple</span>.</h1>
-  <h2>Here's the instruction manual.</h2>
+  <h1><%= t('tutorial.title') %></h1>
+  <h2><%= t('tutorial.subtitle') %></h2>
   <hr />
-  <p id="cta">We're getting you some stories to read, give us a second.</p>
+  <p id="cta"><%= t('tutorial.description') %></p>
   <hr />
   <div class="center">
-    <a href="/news" id="start" style="display: none" class="btn btn-primary">Start Reading</a>
+    <a href="/news" id="start" style="display: none" class="btn btn-primary"><%= t('tutorial.start') %></a>
   </div>
 </div>
 
 <script type="text/javascript">
 $(document).ready(function() {
   setTimeout(function() {
     $("#cta").fadeOut(function() {
-      $(this).html("Okay, it's ready!").fadeIn();
+      $(this).html("<%= t('tutorial.ready') %>").fadeIn();
       $("#start").fadeIn();
     });
   }, 10 * 1000);
 });
-</script>
+</script>
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -9,3 +9,67 @@ en:
     index:
       add_some_feeds: "Hey, you should %{add} some feeds."
       add: "add"
+  first_run:
+    password:
+      title: 'Stringer is <span class="orange">anti-social</span>.'
+      subtitle: "There is only one user: you."
+      description: "Let's pick a password so only you can read your stories."
+      fields:
+        password: "Password"
+        password_confirmation: "Confirm"
+        next: "Next"
+  partials:
+    action_bar:
+      mark_all: "Mark all as read"
+      refresh: "Refresh"
+      view_feeds: "View feeds"
+      add_feed: "Add a feed"
+    feed:
+      last_updated: "Last updated at"
+    feed_action_bar:
+      home: "Return to Stories"
+      feeds: "View feeds"
+      add_feed: "Add a feed"
+    shortcuts:
+      title: "Keyboard shortcuts"
+      keys:
+        jk: "Next/previous story"
+        oenter: "Toggle story open/closed"
+        v: "Go to story URL"
+        shifta: "Mark all as read"
+        r: "Refresh"
+    zen:
+      zero: "You&#8217;ve reached RSS Zero&trade;"
+      gtfo: 'Now stop reading blogs and <span id="gtfo">go make something</span>.'
+  sessions:
+    new:
+      title: 'Stringer speaks <span class="orange">RSS</span>.'
+      subtitle: "Welcome back, friend."
+      fields:
+        password: "Password"
+        submit: "Login"
+  import:
+    title: "Welcome aboard."
+    subtitle: "Let's setup your feeds."
+    description: "%{link} your feeds from Google Reader and import them."
+    export: "Export"
+    fields:
+      import: "Import"
+      not_now: "Not now"
+  layout:
+    title: "stringer | your rss buddy"
+    logout: "Logout"
+    export: "Export"
+    support: "Support"
+    back_to_work: "<b>Hey!</b> Get back to work, slacker!"
+  tutorial:
+    mark_all: "mark all <br/>as read"
+    refresh: "refresh"
+    your_feeds: "your feeds"
+    add_feed: "add feed"
+    your_stories: "your stories <br/>(click to read)"
+    title: 'Stringer is <span class="orange">simple</span>.'
+    subtitle: "Here's the instruction manual."
+    description: "We're getting you some stories to read, give us a second."
+    start: "Start Reading"
+    ready: "Okay, it's ready!"
diff --git a/spec/controllers/languages_controller_spec.rb b/spec/controllers/languages_controller_spec.rb
diff --git a/spec/utils/i18n_support_spec.rb b/spec/utils/i18n_support_spec.rb
