instedd-rails 0.0.22 → 0.0.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTVkMzE2MjVmODRmYmRlOGNkZjVmYWRhMWFmMDEyN2FlNWE5ZjJkMA==
+    MGE2MmUxZTdmNWQ3YmNlZTlhZThjY2MwNjIwN2I2MmI2Yjg4OWU0Ng==
   data.tar.gz: !binary |-
-    MzcwM2RlZmNmZDdkYmIzMmFlMjAzNGE3NWI2OTcxYTM5ZmU0NjI1OQ==
+    ZDM5NGUyMTBkMGRlNDAwODBkMjg1NzAyYTU1Njg4YmNmN2Y4MTNhZA==
 SHA512:
   metadata.gz: !binary |-
-    ODhiZDdkODViNTM0Mjg2MDE2NGZlOTBjMzQyNmE0MTUwMGUxOTI4MzQ4NDdk
-    MTc1ZTU4OGNmMjVmZTc0MDk3YmRmODVmMWIxM2E5ZjVlOTYxZWZhYzhmMGJk
-    NDJhODI4YTQ2ODg4ZGY4YjEzNDFhOWNkNTljMTM2ODMyNTg5Yjc=
+    MjRkZmU0YmMzOTYxMzdhYzAyNWIyOGZlZGQ4YTNkZDVhZTM0Y2JjMmRhYTNi
+    MjY1MDVkNzY4MjhkMjkyYjlhODc4Y2U1OTFmYzcwZDZiZTllYTAyNmFhZWE0
+    NGIwNWYzNGE1NmRmNDM0OTM3OGM1MWFhNzgyZjNkMDYzNzRjZDE=
   data.tar.gz: !binary |-
-    ZDVkMmU0ZWJlMjA1MTcyYzFkNmVhN2NmYWRlMjA2ZGM2MWZiOWFmOTBjOWU0
-    NmE4MzU1YjcxOTM2YzFhYmQ4YjFlNjY1ODUzNGYyNjYyZjE5NGVkNDhmNGEx
-    NzA3NzYwNGZlM2NhNzMxNjM1YmVmOWNiNTEzOWQyZmJiYzFjMTc=
+    ODkzNzQwZWUzYmYxMjVlZTk4ZTZiMGM4ZjVlZjMxOGQzNTk3NzY5MTcwMzNl
+    M2FlMGM0MjAyYTRmNGFiMTk3NTM0OWMzZTQyMmFmODBjODVjNzMzODM1ZTFi
+    MzRkOGY5NDNmYzI0ZGU0ZDZmNTM5OTE2OTAzNDBiN2I4ZTIxNWM=

data/Gemfile.lock

@@ -1,90 +1,97 @@
 PATH
   remote: .
   specs:
-    instedd-rails (0.0.16)
+    instedd-rails (0.0.23)
       breadcrumbs_on_rails (>= 2.2.0)
+      haml-rails
       rails (>= 3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.3)
-      actionpack (= 3.2.3)
-      mail (~> 2.4.4)
-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    actionmailer (3.2.14)
+      actionpack (= 3.2.14)
+      mail (~> 2.5.4)
+    actionpack (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    activerecord (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-    activesupport (3.2.3)
-      i18n (~> 0.6)
+    activeresource (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    arel (3.0.2)
+    arel (3.0.3)
     breadcrumbs_on_rails (2.2.0)
-    builder (3.0.0)
+    builder (3.0.4)
     erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.3)
-    json (1.7.0)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    haml (3.1.8)
+    haml-rails (0.3.5)
+      actionpack (>= 3.1, < 4.1)
+      activesupport (>= 3.1, < 4.1)
+      haml (~> 3.1)
+      railties (>= 3.1, < 4.1)
+    hike (1.2.3)
+    i18n (0.6.9)
+    journey (1.0.4)
+    json (1.8.1)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.18)
-    multi_json (1.3.4)
-    polyglot (0.3.3)
-    rack (1.4.1)
+    mime-types (1.25.1)
+    multi_json (1.9.3)
+    polyglot (0.3.4)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.4)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.3)
-      actionmailer (= 3.2.3)
-      actionpack (= 3.2.3)
-      activerecord (= 3.2.3)
-      activeresource (= 3.2.3)
-      activesupport (= 3.2.3)
+    rails (3.2.14)
+      actionmailer (= 3.2.14)
+      actionpack (= 3.2.14)
+      activerecord (= 3.2.14)
+      activeresource (= 3.2.14)
+      activesupport (= 3.2.14)
       bundler (~> 1.0)
-      railties (= 3.2.3)
-    railties (3.2.3)
-      actionpack (= 3.2.3)
-      activesupport (= 3.2.3)
+      railties (= 3.2.14)
+    railties (3.2.14)
+      actionpack (= 3.2.14)
+      activesupport (= 3.2.14)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.3.1)
+    rdoc (3.12.2)
       json (~> 1.4)
-    sprockets (2.1.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
+    thor (0.19.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.39)
 
 PLATFORMS
   ruby

data/app/helpers/devise_helper.rb

@@ -3,7 +3,7 @@ module DeviseHelper
     return if resource.errors.full_messages.empty?
     
     (content_tag :div, :class => "box error_description #{html_options[:class] || 'w60'}"  do
-      (content_tag :h2, 'The following errors occurred') \
+      (content_tag :h2, t("following_errors_ocurred", default: 'The following errors occurred')) \
       + \
       (content_tag :ul do
         raw resource.errors.full_messages.map { |msg| content_tag(:li, msg) }.join

data/app/helpers/instedd_rails/instedd_app_helper.rb

@@ -28,7 +28,7 @@ module InsteddRails
 
           content_tag :div, :class => "box error_description #{options[:class] || 'w60'}" do
             (content_tag :h2 do
-              "#{pluralize(object.errors.count, 'error')} prohibited this #{object_name.humanize} from being saved:"
+              t("errors_prohibited_being_saved", default: "%{errors_count} prohibited this %{object_name} from being saved:") % {errors_count: pluralize(object.errors.count, 'error'), object_name: object_name.humanize}
             end) \
             + \
             (content_tag :ul do

data/app/views/devise/confirmations/new.html.erb

@@ -3,15 +3,15 @@
 <div class="box centered w30">
 
 <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
-  <h2>Resend confirmation instructions</h2>
+  <h2><%= t("resend_confirmation_instructions", :default => "Resend confirmation instructions") %></h2>
 
   <div class="field w30">
-    <%= f.label :email %>
+    <%= f.label :email, t("email", default: "Email") %>
     <%= f.email_field :email %>
   </div>
 
   <div class="actions">
-    <button type="submit" class="white">Resend confirmation instructions</button>
+    <button type="submit" class="white"><%= t("resend_confirmation_instructions", :default => "Resend confirmation instructions") %></button>
   </div>
 
 <% end %>
@@ -19,4 +19,3 @@
 <%= render :partial => "devise/shared/links" %>
 
 </div>
-

data/app/views/devise/passwords/edit.html.erb

@@ -2,24 +2,24 @@
 
 <div class="box centered w30">
   <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
-    <h2>Change your password</h2>
+    <h2><%= t("change_your_password", :default => "Change your password") %></h2>
 
     <hr class="shadow"/>
 
     <%= f.hidden_field :reset_password_token %>
 
     <div class="field w30">
-      <%= f.label :password, "New password" %>
+      <%= f.label :password, t("new_password", :default => "New password") %>
       <%= f.password_field :password %>
     </div>
 
     <div class="field w30">
-      <%= f.label :password_confirmation, "Confirm new password" %>
+      <%= f.label :password_confirmation, t("confirm_new_password", :default => "Confirm new password") %>
       <%= f.password_field :password_confirmation %>
     </div>
 
     <div class="actions">
-      <button type="submit" class="white">Change my password</button>
+      <button type="submit" class="white"><%= t("change_my_password", :default => "Change my password") %></button>
     </div>
   <% end %>
-</div>
+</div>

data/app/views/devise/passwords/new.html.erb

@@ -3,19 +3,19 @@
 <div class="box centered w30">
     
 <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
-  <h2>Forgot your password?</h2>
+  <h2><%= t("forgot_your_password", :default => "Forgot your password?") %></h2>
   
   <hr class="shadow"/>
   
   <div class="field w30">
-    <%= f.label :email %>
+    <%= f.label :email, t("email", default: "Email") %>
     <%= f.email_field :email %>
   </div>
 
   <div class="actions">
-    <button type="submit" class="white">Send me reset password instructions</button>
+    <button type="submit" class="white"><%= t("send_me_reset_password_instructions", :default => "Send me reset password instructions") %></button>
   </div>
   
 <% end %>
 
-</div>
+</div>

data/app/views/devise/registrations/edit.html.haml

@@ -1,27 +1,32 @@
 = devise_error_messages!
 = form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f|
-  %h2 Edit settings
+  %h2
+    = t("edit_settings", default: "Edit settings")
   .field.w30
-    = f.label :email, "Email"
+    = f.label :email, t("email", default: "Email")
     = f.email_field :email, :readonly => true
   .field.w30
-    = f.label :current_password, "Current password"
-    %p (we need your current password to confirm your changes)
+    = f.label :current_password, t("current_password", default: "Current password")
+    %p
+      = t("need_current_password_to_confirm", default: "(we need your current password to confirm your changes)")
     = f.password_field :current_password
   .ux-collapsible.collapsed.w30{"data-on-expanded" => "box grey"}
     %span
-      %a.fsettings{:href => "#"} Change my password
+      %a.fsettings{:href => "#"}
+        = t("change_my_password", default: "Change my password")
     .ux-content
       .field.w30
-        = f.label :password, "New password"
-        %p (leave blank if you don't want to change it)
+        = f.label :password, t("new_password", default: "New password")
+        %p
+          = t("leave_blank_if_dont_want_to_change", default: "(leave blank if you don't want to change it)")
         = f.password_field :password
       .field.w30
-        = f.label :password_confirmation, "Confirm new password"
+        = f.label :password_confirmation, t("confirm_new_password", default: "Confirm new password")
         = f.password_field :password_confirmation
   .actions
-    %button.white{:type => "submit"} Update
-    = link_to "Back", :back
+    %button.white{:type => "submit"}
+      = t("update", default: "Update")
+    = link_to t("back", default: "Back"), :back
   %hr.w30/
   %p
-    = link_to "Delete my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete, :class => 'fdelete'
+    = link_to t("delete_my_account", default: "Delete my account"), registration_path(resource_name), :confirm => t("are_you_sure", default: "Are you sure?"), :method => :delete, :class => 'fdelete'

data/app/views/devise/sessions/new.html.erb

@@ -3,31 +3,31 @@
 <div class="box centered w30">
   
 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-  <h2>Log In</h2>
+  <h2><%= t("log_in", :default => "Log In") %></h2>
   
   <hr class="shadow" />
   
   <div class="field w30">
-    <%= f.label :email %>
+    <%= f.label :email, t("email", :default => "Email") %>
     <%= f.email_field :email %>
   </div>
 
   <div class="field w30">
-    <%= f.label :password %>
+    <%= f.label :password, t("password", :default => "Password") %>
     <%= f.password_field :password %>
   </div>
 
   <% if devise_mapping.rememberable? -%>
     <div class="field">
-      <%= f.check_box :remember_me %> <%= f.label :remember_me, :class=>'checkbox' %>
+      <%= f.check_box :remember_me %> <%= f.label :remember_me, t("remember_me", default: "Remember me"), :class=>'checkbox' %>
     </div>
   <% end -%>
 
   <div class="actions">
-    <button type="submit" class="white">Log In</button>
+    <button type="submit" class="white"><%= t("log_in", :default => "Log In") %></button>
   </div>
   
   <%= render :partial => "devise/shared/links" %>
 <% end %>
 
-</div>
+</div>

data/app/views/devise/shared/_links.erb

@@ -2,32 +2,32 @@
 
 <!-- <%- if controller_name != 'sessions' %>
   <p>
-    Already have an account? <%= link_to "Log In", new_session_path(resource_name) %>
+    <%= t('already_have_an_account', default: "Already have an account?") %> <%= link_to t("log_in", :default => "Log In"), new_session_path(resource_name) %>
   </p>
 <% end -%> -->
 
 <!-- <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
   <p>
-    Don't have an account? <%= link_to "Create it", new_registration_path(resource_name) %>
+    <%= t('dont_have_an_account', default: "Don't have an account?") %> <%= link_to t("create_it", :default => "Create it"), new_registration_path(resource_name) %>
   </p>
 <% end -%> -->
 
 <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
   <p>
-  Forgot your password? <%= link_to "Reset it", new_password_path(resource_name) %>
+  <%= t('forgot_your_password', default: 'Forgot your password?') %> <%= link_to t("reset_it", :default => "Reset it"), new_password_path(resource_name) %>
   </p>
 <% end -%>
 
 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+  <%= link_to t("didnt_receive_confirmation_instructions", :default => "Didn't receive confirmation instructions?"), new_confirmation_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
+  <%= link_to t("didnt_receive_unlock_instructions", :default => "Didn't receive unlock instructions?"), new_unlock_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.omniauthable? %>
   <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
+    <%= link_to t("sign_in_with_provider", :default => "Sign in with %{provider}") % {provider: provider.to_s.titleize}, omniauth_authorize_path(resource_name, provider) %><br />
   <% end -%>
-<% end -%>
+<% end -%>

data/app/views/devise/unlocks/new.html.erb

@@ -3,21 +3,21 @@
 <div class="box centered w30">
 <%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
 
-  <h2>Resend unlock instructions</h2>
+  <h2><%= t("resend_unlock_instructions", :default => "Resend unlock instructions") %></h2>
   
   <hr class="shadow" />
 
   <div class="field w30">
-    <%= f.label :email %>
+    <%= f.label :email, t("email", :default => "Email") %>
     <%= f.email_field :email %>
   </div>
 
   <div class="actions">
-    <button type="submit" class="white">Resend unlock instructions</button>
+    <button type="submit" class="white"><%= t("resend_unlock_instructions", :default => "Resend unlock instructions") %></button>
   </div>
 
 <% end %>
 
 <%= render :partial => "devise/shared/links" %>
 
-</div>
+</div>

data/app/views/errors/internal_server_error.html.erb

@@ -1,9 +1,9 @@
 <div class ="box centered w50">
   <h1>
     <div class="i48grad-error"></div>
-    We're sorry, but something went wrong
+    <%= t("were_sorry_but_something_went_wrong", :default => "We're sorry, but something went wrong") %>
   </h1>
-  <p>We've been notified about this issue and we'll take a look at it shortly.</p>
+  <p><%= t("weve_been_notified_about_this_issue_and_well_take_a_look_at_it_shortly", :default => "We've been notified about this issue and we'll take a look at it shortly.") %></p>
   <hr/>
-  <%= link_to 'Back', :back, :class =>"button white" %>
-</div>
+  <%= link_to t("back", :default => 'Back'), :back, :class =>"button white" %>
+</div>

data/app/views/errors/not_found.html.erb

@@ -1,9 +1,9 @@
 <div class ="box centered w50">
   <h1>
     <div class="i48grad-error"></div>
-    The page you were looking for doesn't exist
+    <%= t("the_page_you_were_looking_for_doesnt_exist", :default => "The page you were looking for doesn't exist") %>
   </h1>
-  <p>You may have mistyped the address or the page may have moved.</p>
+  <p><%= t("you_may_have_mistyped_the_address_or_the_page_may_have_moved", :default => "You may have mistyped the address or the page may have moved.") %></p>
   <hr/>
-  <%= link_to 'Back', :back, :class =>"button white" %>
-</div>
+  <%= link_to t("back", :default => 'Back'), :back, :class =>"button white" %>
+</div>

data/app/views/errors/unprocessable_entity.html.erb

@@ -1,9 +1,9 @@
 <div class ="box centered w50">
   <h1>
     <div class="i48grad-error"></div>
-    The change you wanted was rejected
+    <%= t("the_change_you_wanted_was_rejected", :default => "The change you wanted was rejected") %>
   </h1>
-  <p>Maybe you tried to change something you didn't have access to.</p>
+  <p><%= t("maybe_you_tried_to_change_something_you_didnt_have_access_to", :default => "Maybe you tried to change something you didn't have access to.") %></p>
   <hr/>
-  <%= link_to 'Back', :back, :class =>"button white" %>
-</div>
+  <%= link_to t("back", :default => 'Back'), :back, :class =>"button white" %>
+</div>

data/app/views/layouts/_navigation.html.erb

@@ -1 +1 @@
-<%= section 'Home', root_path, :home %>
+<%= section t("home", default: 'Home'), root_path, :home %>

data/app/views/layouts/instedd_application.html.erb

@@ -70,10 +70,11 @@
         <div id="footer-container">
           <div>
             <div class="left platform">
-              InSTEDD has created an evolving platform of free and open source technologies to support humanitarian causes. These tools can be used individually or as building blocks for larger solutions. <a href="http://instedd.org/technologies/">Click here</a> to learn more
+              <%= t("instedd_has_created_an_evolving_platform", default: "InSTEDD has created an evolving platform of free and open source technologies to support humanitarian causes. These tools can be used individually or as building blocks for larger solutions.") %>
+              <%= raw(t("click_here_to_learn_more", default: "%{click_here_link} to learn more") % {click_here_link: "<a href='http://instedd.org/technologies/'>%{click_here}</a>" % {click_here: t("click_here", :default => "Click here")}}) %>
             </div>
             <div class="right">
-              <a href="http://instedd.org/technologies/" class="more">Learn more</a>
+              <a href="http://instedd.org/technologies/" class="more"><%= t("learn_more", :default => "Learn more") %></a>
               <div id="instedd-footer" data-app-name="<%= application_name.underscore %>"></div>
             </div>
             <div class="clear"></div>
@@ -81,8 +82,8 @@
           <div>
             <div class="left">
               <a href="http://instedd.org">&copy; 2011 InSTEDD</a>
-              <a href="<%= terms_and_conditions_path %>">Terms and conditions</a>
-              <a href="mailto:support@instedd.org?subject=[<%= application_name.titleize %>]">Contact us</a>
+              <a href="<%= terms_and_conditions_path %>"><%= t("terms_and_conditions", :default => "Terms and conditions") %></a>
+              <a href="mailto:support@instedd.org?subject=[<%= application_name.titleize %>]"><%= t("contact_us", :default => "Contact us") %></a>
             </div>
             <div class="right">
               <%= yield(:footer_links) %>

data/app/views/layouts/mail.html.erb

@@ -9,7 +9,7 @@
   <%= footer do %>
     <hr/>
     <p>
-      Do you have questions or need help? Contact us at
+      <%= t("do_you_have_questions_or_need_help_contact_us_at", :default => "Do you have questions or need help? Contact us at") %>
       <%= link "mailto:support@instedd.org?subject=#{application_name.titleize}" do %>
         support@instedd.org
       <% end %>

data/app/views/layouts/mail.text.erb

@@ -6,4 +6,4 @@
 
 
 ---------
-Do you have questions or need help? Contact us at support@instedd.org
+<%= t("do_you_have_questions_or_need_help_contact_us_at_support_insteddorg", :default => "Do you have questions or need help? Contact us at support@instedd.org") %>

data/app/views/user_mailer/confirmation_instructions.html.erb

@@ -1,8 +1,8 @@
 <%= h1 do %>
-	You are almost done!
+	<%= t("you_are_almost_done", :default => "You are almost done!") %>
 <% end %>
 <%= h2 do %>
-	To verify your account and complete the registration process please click in the link below or copy paste the URL into your browser
+	<%= t("to_verify_your_account_and_complete_the_registration_process_please_click_in_the_link_below_or_copy_paste_the_url_into_your_browser", :default => "To verify your account and complete the registration process please click in the link below or copy paste the URL into your browser") %>
 <% end  %>
 <br/>
-<%= advertised_link 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>
+<%= advertised_link t("confirm_my_account", default:'Confirm my account'), confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>

data/app/views/user_mailer/confirmation_instructions.text.erb

@@ -1,5 +1,5 @@
-You are almost done!
+<%= t("you_are_almost_done", :default => "You are almost done!") %>
 
-To verify your account and complete the registration process please click in the link below or copy paste the URL into your browser
+<%= t("to_verify_your_account_and_complete_the_registration_process_please_click_in_the_link_below_or_copy_paste_the_url_into_your_browser", :default => "To verify your account and complete the registration process please click in the link below or copy paste the URL into your browser") %>
 
-<%= confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>
+<%= confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>

data/app/views/user_mailer/reset_password_instructions.html.erb

@@ -1,12 +1,12 @@
 <%= h1 do %>
-	Hello <%= @resource.email %>!
+	<%= t("hello_email", :default => "Hello %{email}!") % {email: @resource.email} %>
 <% end %>
 <%= h2 do %>
-	Someone has requested a link to change your password, and you can do this through the link below.
+	<%= t("someone_has_requested_a_link_to_change_your_password_and_you_can_do_this_through_the_link_below", :default => "Someone has requested a link to change your password, and you can do this through the link below.") %>
 <% end  %>
 <br/>
-<%= advertised_link 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>
+<%= advertised_link t("change_my_password", default: 'Change my password'), edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>
 <br/>
 <%= h2 do %>
-	If you didn't request this, please ignore this email. Your password won't change until you access the link above and create a new one.
-<% end  %>
+	<%= t("if_you_didnt_request_this_please_ignore_this_email_your_password_wont_change_until_you_access_the_link_above_and_create_a_new_one", :default => "If you didn't request this, please ignore this email. Your password won't change until you access the link above and create a new one.") %>
+<% end  %>

data/app/views/user_mailer/reset_password_instructions.text.erb

@@ -1,7 +1,7 @@
-Hello <%= @resource.email %>!
+<%= t("hello_email", :default => "Hello %{email}!") % {email: @resource.email} %>
 
-Someone has requested a link to change your password, and you can do this through the link below.
+<%= t("someone_has_requested_a_link_to_change_your_password_and_you_can_do_this_through_the_link_below", :default => "Someone has requested a link to change your password, and you can do this through the link below.") %>
 
 <%= edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>
 
-If you didn't request this, please ignore this email. Your password won't change until you access the link above and create a new one.
+<%= t("if_you_didnt_request_this_please_ignore_this_email_your_password_wont_change_until_you_access_the_link_above_and_create_a_new_one", :default => "If you didn't request this, please ignore this email. Your password won't change until you access the link above and create a new one.") %>

data/config/locales/fr.yml

@@ -0,0 +1,55 @@
+fr:
+  resend_confirmation_instructions:
+  email:
+  change_your_password:
+  new_password:
+  confirm_new_password:
+  change_my_password:
+  forgot_your_password:
+  send_me_reset_password_instructions:
+  log_in:
+  password:
+  remember_me:
+  already_have_an_account:
+  dont_have_an_account:
+  create_it:
+  reset_it:
+  didnt_receive_confirmation_instructions:
+  didnt_receive_unlock_instructions:
+  sign_in_with_provider:
+  resend_unlock_instructions:
+  were_sorry_but_something_went_wrong:
+  weve_been_notified_about_this_issue_and_well_take_a_look_at_it_shortly:
+  back:
+  the_page_you_were_looking_for_doesnt_exist:
+  you_may_have_mistyped_the_address_or_the_page_may_have_moved:
+  the_change_you_wanted_was_rejected:
+  maybe_you_tried_to_change_something_you_didnt_have_access_to:
+  home:
+  instedd_has_created_an_evolving_platform:
+  click_here_to_learn_more:
+  click_here:
+  learn_more:
+  terms_and_conditions:
+  contact_us:
+  do_you_have_questions_or_need_help_contact_us_at:
+  do_you_have_questions_or_need_help_contact_us_at_support_insteddorg:
+  you_are_almost_done:
+  to_verify_your_account_and_complete_the_registration_process_please_click_in_the_link_below_or_copy_paste_the_url_into_your_browser:
+  confirm_my_account:
+  hello_email:
+  someone_has_requested_a_link_to_change_your_password_and_you_can_do_this_through_the_link_below:
+  if_you_didnt_request_this_please_ignore_this_email_your_password_wont_change_until_you_access_the_link_above_and_create_a_new_one:
+  edit_settings:
+  current_password:
+  need_current_password_to_confirm:
+  leave_blank_if_dont_want_to_change:
+  update:
+  delete_my_account:
+  are_you_sure:
+  following_errors_ocurred:
+  errors_prohibited_being_saved:
+  views:
+    pagination:
+      first:
+      last:

data/lib/generators/instedd_rails/templates/application.html.erb

@@ -1,8 +1,8 @@
 <% content_for :navigation do %> 
-  <%= section 'Home', root_path, :home %>
-  <%= section 'Tour', tour_path(:start), :tour %>
-  <%= section 'Community', community_path, :community %>
-  <%= section 'Help', help_path , :help %>
+  <%= section t('home', default: 'Home'), root_path, :home %>
+  <%= section t('tour', default: 'Tour'), tour_path(:start), :tour %>
+  <%= section t('community', default: 'Community'), community_path, :community %>
+  <%= section t('help', default: 'Help'), help_path , :help %>
 <% end %>
 <% content_for :right_menu do %> 
   <ul class="RightMenu">
@@ -12,13 +12,13 @@
           <%=current_user.email%><br><br>
           <div class="container">
             <ul>
-              <li><%= link_to 'Reminders', schedules_path %></li>
-              <li><%= link_to 'Settings', edit_user_registration_path %></li>
+              <li><%= link_to t('reminders', default: 'Reminders'), schedules_path %></li>
+              <li><%= link_to t('settings', default: 'Settings'), edit_user_registration_path %></li>
             </ul>
             <hr/>
             <ul>
-              <li><a href="mailto:support@instedd.org?subject=[<%= application_name.underscore %>-bug]">Report a bug</a></li>
-              <li><%= link_to "Sign Out", destroy_user_session_path %></li>
+              <li><a href="mailto:support@instedd.org?subject=[<%= application_name.underscore %>-bug]"><%= t('report_a_bug', default: "Report a bug") %></a></li>
+              <li><%= link_to t('sign_out', default: "Sign Out"), destroy_user_session_path %></li>
             </ul>
           </div>
         </div>
@@ -28,18 +28,18 @@
         </li>
         <% else %>
         <li>
-          <%= link_to "Create account", new_user_registration_path, :class => 'fedit' %>
+          <%= link_to t('create_account', default: "Create account"), new_user_registration_path, :class => 'fedit' %>
         </li>
         <li>
-          <%= link_to "Log in", new_user_session_path, :class => 'fuser' %>
+          <%= link_to t('log_in', default: "Log in"), new_user_session_path, :class => 'fuser' %>
         </li>
         <% end %>
       </ul>
 <% end %>
 <% content_for :footer_links do %> 
-  <a href="<%= root_path %>">Home</a>
-  <a href="<%= tour_path(:start) %>">Tour</a>
-  <a href="<%= community_path %>">Community</a>
-  <a href="<%= help_path %>">Help</a>
+  <a href="<%= root_path %>"><%= t('home', default: 'Home') %></a>
+  <a href="<%= tour_path(:start) %>"><%= t('tour', default: 'Tour') %></a>
+  <a href="<%= community_path %>"><%= t('community', default: 'Community') %></a>
+  <a href="<%= help_path %>"><%= t('help', default: 'Help') %></a>
 <% end %>
 <%= render :file => 'layouts/instedd_application' %>

data/lib/instedd_rails/version.rb

@@ -1,3 +1,3 @@
 module InsteddRails
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instedd-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Instedd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -102,6 +102,7 @@ files:
 - app/views/user_mailer/confirmation_instructions.text.erb
 - app/views/user_mailer/reset_password_instructions.html.erb
 - app/views/user_mailer/reset_password_instructions.text.erb
+- config/locales/fr.yml
 - config/routes.rb
 - instedd-rails.gemspec
 - lib/generators/instedd_rails/config_generator.rb
@@ -133,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: instedd-rails
-rubygems_version: 2.2.2
+rubygems_version: 2.1.4
 signing_key: 
 specification_version: 4
 summary: Instedd Platform Common helpers for Rails