updated translations

mandym-webdev · May 21, 2015 · 7ae14d5 · 7ae14d5
1 parent 25fad62
commit 7ae14d5
Show file tree

Hide file tree

Showing 12 changed files with 77 additions and 37 deletions.
diff --git a/app/views/solution_stories/card.html.erb b/app/views/solution_stories/card.html.erb
@@ -11,7 +11,7 @@
 
       <div class='solution_story-effort'>
         <div class='solution-effort' style='margin-bottom: 0px'>
-          <span class="badge"><span class='hidden-xs hidden-sm hidden-md text-bold'><%= t('solution_stories.card.header') %>
+          <span class="badge"><span class='hidden-xs hidden-sm hidden-md text-bold'><%= t('solution_stories.card.header') %></span>
           <% ["#{t('solution_stories.card.time1')}", "#{t('solution_stories.card.time2')}", "#{t('solution_stories.card.time3')}", "#{t('solution_stories.card.time4')}"].each do |effort| %>
             <span class="badge <%= effort == solution_story.solution.effort ? 'active' : '' %>"><%= effort.titleize %></span>
           <% end %>

diff --git a/app/views/solutions/show.html.erb b/app/views/solutions/show.html.erb
@@ -111,7 +111,7 @@
         <p class='text-solution text-large text-bold text-uppercase'><%= t('solutions.show.header4') %></p>
 
         <div class='solution-effort'>
-          <span class="badge"><span class='hidden-xs hidden-sm hidden-md text-bold'><%= t('solutions.show.header5') %></span>
+          <span class="badge"><span class='hidden-xs hidden-sm hidden-md text-bold'><%= t('solutions.show.header5') %></span></span>
           <% ["#{t('solutions.show.time1')}", "#{t('solutions.show.time2')}", "#{t('solutions.show.time3')}", "#{t('solutions.show.time4')}"].each do |effort| %>
             <span class="badge <%= effort == @solution.effort ? 'active' : '' %>"><%= effort.titleize %></span>
           <% end %>

diff --git a/app/views/suggestions/_form.html.erb b/app/views/suggestions/_form.html.erb
@@ -1,11 +1,11 @@
 <%= form_for(@suggestion, url: url) do |f| %>
   <%= render partial: 'layouts/error_messages', locals: { model: @suggestion } %>
   <div class='form-group'>
-    <%= f.text_field :title, placeholder: "Give it a title. Name a challenge we should take on.", class: 'form-control input-lg' %>
+    <%= f.text_field :title, placeholder: "#{t('suggestions._form.title_placeholder')}", class: 'form-control input-lg' %>
   </div>
 
   <div class='form-group'>
-    <%= f.text_area :description, placeholder: "Explain the challenge. Why is it important? How does it affect you and other educators? How can #{I18n.t(:project_name)} help?", class: 'form-control', rows: 4 %>
+    <%= f.text_area :description, placeholder: "#{t('suggestions._form.description_placeholder')}", class: 'form-control', rows: 4 %>
   </div>
 
   <div class='row'>
@@ -19,19 +19,19 @@
             </span>
           </div>
           <div class='media-body'>
-            <span class='help-text'>Add a link to a video, article, image or other support</span>
+            <span class='help-text'><%= t('suggestions._form.link_description') %></span>
           </div>
         </div>
 
         <div ng-show='suggestion_link' class='form-group'>
-          <%= f.text_field :link, placeholder: "Add URL", class: 'form-control' %>
-          <span class='help-block'>Share a link, image, video, or Tweet– we'll display it alongside your suggestion.</span>
+          <%= f.text_field :link, placeholder: "#{t('suggestions._form.url')}", class: 'form-control' %>
+          <span class='help-block'><%= t('suggestions._form.link_placeholder') %></span>
         </div>
       </div>
     </div>
 
     <div class='col-sm-2 col-xs-6'>
-      <%= link_to 'Cancel', cancel_path, class: 'btn btn-rounded btn-sm btn-block btn-default' %>
+      <%= link_to "#{t('suggestions._form.cancel')}", cancel_path, class: 'btn btn-rounded btn-sm btn-block btn-default' %>
     </div>
 
     <div class='col-sm-2 col-xs-6'>

diff --git a/app/views/suggestions/card/_form.html.erb b/app/views/suggestions/card/_form.html.erb
@@ -1,10 +1,10 @@
 <%= form_for(suggestion, url: url) do |f| %>
   <div class='form-group'>
-    <%= f.text_field :title, placeholder: "Give it a title. Name a challenge we should take on.", class: 'form-control input-lg' %>
+    <%= f.text_field :title, placeholder: "#{t('suggestions.card._form.title_placeholder')}", class: 'form-control input-lg' %>
   </div>
 
   <div class='form-group'>
-    <%= f.text_area :description, placeholder: "Explain the challenge. Why is it important? How does it affect you and other educators? How can #{I18n.t(:project_name)} help?", class: 'form-control', rows: 4 %>
+    <%= f.text_area :description, placeholder: "#{t('suggestions.card._form.description_placeholder')}", class: 'form-control', rows: 4 %>
   </div>
 
   <div class='row'>
@@ -18,19 +18,19 @@
             </span>
           </div>
           <div class='media-body'>
-            <span class='help-text'>Add a link to a video, article, image or other support</span>
+            <span class='help-text'><%= t('suggestions.card._form.link_description') %></span>
           </div>
         </div>
 
         <div ng-show='suggestion_link' class='form-group'>
-          <%= f.text_field :link, placeholder: "Add URL", class: 'form-control' %>
-          <span class='help-block'>Share a link, image, video, or Tweet– we'll display it alongside your suggestion.</span>
+          <%= f.text_field :link, placeholder: "#{t('suggestions.card._form.url')}", class: 'form-control' %>
+          <span class='help-block'><%= t('suggestions.card._form.link_placeholder') %></span>
         </div>
       </div>
     </div>
 
     <div class='col-sm-2 col-xs-6'>
-      <%= link_to 'Cancel', '#', class: 'btn btn-rounded btn-sm btn-block btn-default', "ng-click" => cancel_path, onclick: 'return false;' %>
+      <%= link_to "#{t('suggestions.card._form.cancel')}", '#', class: 'btn btn-rounded btn-sm btn-block btn-default', "ng-click" => cancel_path, onclick: 'return false;' %>
     </div>
 
     <div class='col-sm-2 col-xs-6'>

diff --git a/app/views/suggestions/card/_new.html.erb b/app/views/suggestions/card/_new.html.erb
@@ -1,10 +1,10 @@
 <div class='suggestion-form' id='new-suggestion' ng-switch='suggestion_draft' ng-init='suggestion_draft=false'>
   <div class='well well-lg well-share' ng-hide='suggestion_draft' ng-click='suggestion_draft=true'>
-    <p><i class='fa fa-pencil'></i>&nbsp; Share a suggestion that you think we should tackle with the <%= "#{I18n.t(:project_name)}" %>!</p>
+    <p><i class='fa fa-pencil'></i>&nbsp; <%= t('suggestions.card._new.placeholder') %> <%= "#{I18n.t(:project_name)}" %>!</p>
   </div>
 
   <div ng-show='suggestion_draft' class='well well-suggestion'>
-    <%= render partial: 'suggestions/card/form', locals: { suggestion: new_suggestion, url: suggestions_path, cancel_path: "suggestion_draft=false", submit_text: "Share" } %>
+    <%= render partial: 'suggestions/card/form', locals: { suggestion: new_suggestion, url: suggestions_path, cancel_path: "suggestion_draft=false", submit_text: "#{t('suggestions.card._new.submit')}" } %>
     <div class='clearfix'></div>
   </div>
 </div>
diff --git a/app/views/suggestions/card/_show.html.erb b/app/views/suggestions/card/_show.html.erb
@@ -6,7 +6,7 @@
         <small style='margin-left:10px'>
           <%= link_to "<i class='fa fa-edit'></i>".html_safe, '#', 'ng-click' => "suggestion_#{suggestion.id}_edit=true", onclick: 'return false;', class: 'list-link' %> 
           &nbsp; &bull; &nbsp;
-          <%= link_to "<i class='fa fa-trash'></i>".html_safe, suggestion_path(suggestion.id), method: :delete, data: { confirm: "Are you sure you want to delete your suggestion?"}, class: 'list-link' %>
+          <%= link_to "<i class='fa fa-trash'></i>".html_safe, suggestion_path(suggestion.id), method: :delete, data: { confirm: "#{t('suggestions.card._show.confirm')}"}, class: 'list-link' %>
         </small>
       <% end %>
     </h3>
@@ -37,7 +37,7 @@
 
 <div class="row">
   <div class="col-sm-4">
-    <p class='suggestion-user text-left'>How much does this impact you?</p>
+    <p class='suggestion-user text-left'><%= t('suggestions.card._show.question') %></p>
   </div>
 
   <div class="col-sm-5">

diff --git a/app/views/suggestions/card/_vote.html.erb b/app/views/suggestions/card/_vote.html.erb
@@ -1,4 +1,4 @@
-<li style='top:3px;position:relative'>Not at all</li>
+<li style='top:3px;position:relative'><%= t('suggestions.card._vote.low') %></li>
 
 <% Suggestion::RATING_WEIGHTS.each do |weight| %>
   <% if user_signed_in? && suggestion.get_likes.where(voter_id: current_user.id, vote_scope: 'rating', vote_weight: weight).present? %>
@@ -23,4 +23,4 @@
   <% end %>
 <% end %>
 
-<li style='top:3px;position:relative'>A lot</li>
+<li style='top:3px;position:relative'><%= t('suggestions.card._vote.high') %></li>
diff --git a/app/views/suggestions/edit.html.erb b/app/views/suggestions/edit.html.erb
@@ -8,12 +8,12 @@
       <div class='col-sm-10 col-sm-offset-1'>
 
         <div class='suggestion-block'>
-          <h6 class='suggestion-header'>Suggestion</h6>
-          <h2 class='suggestion-title'>Edit Suggestion</h2>
+          <h6 class='suggestion-header'><%= t('suggestions.edit.header') %></h6>
+          <h2 class='suggestion-title'><%= t('suggestions.edit.title') %></h2>
         </div>
 
         <div class="well well-lg well-suggestion"> 
-          <%= render partial: 'suggestions/form', locals: { url: suggestion_path, cancel_path: root_path, submit_text: "Update" } %>
+          <%= render partial: 'suggestions/form', locals: { url: suggestion_path, cancel_path: root_path, submit_text: "#{t('suggestions.edit.submit')}" } %>
         </div>
 
       </div>

diff --git a/app/views/suggestions/new.html.erb b/app/views/suggestions/new.html.erb
@@ -8,12 +8,12 @@
       <div class='col-sm-10 col-sm-offset-1'>
 
         <div class='suggestion-block'>
-          <h6 class='suggestion-header'>Suggestion</h6>
-          <h2 class='suggestion-title'>New Suggestion</h2>
+          <h6 class='suggestion-header'><%= t('suggestions.new.header') %></h6>
+          <h2 class='suggestion-title'><%= t('suggestions.new.title') %></h2>
         </div>
 
         <div class="well well-lg well-suggestion"> 
-          <%= render partial: 'suggestions/form', locals: { url: suggestions_path, cancel_path: root_path, submit_text: "Share" } %>
+          <%= render partial: 'suggestions/form', locals: { url: suggestions_path, cancel_path: root_path, submit_text: "#{t('suggestions.new.submit')}" } %>
         </div>
 
       </div>

diff --git a/app/views/users/_header.html.erb b/app/views/users/_header.html.erb
@@ -20,9 +20,9 @@
 
         <% if user_signed_in? && current_user == @user %>
           <ul class="nav nav-tabs nav-justified">
-            <li role="presentation"><%= link_to 'Edit Profile', edit_user_registration_path(setting: 'profile') %></li>
-            <li role="presentation"><%= link_to 'Account Settings', edit_user_registration_path(setting: 'account') %></li>
-            <li role="presentation" class='active'><%= link_to 'Activity', user_path(current_user) %></li>
+            <li role="presentation"><%= link_to "#{t('users._header.edit')}", edit_user_registration_path(setting: 'profile') %></li>
+            <li role="presentation"><%= link_to "#{t('users._header.settings')}", edit_user_registration_path(setting: 'account') %></li>
+            <li role="presentation" class='active'><%= link_to "#{t('users._header.activity')}", user_path(current_user) %></li>
           </ul>
         <% end %>
 

diff --git a/app/views/users/cards/_submission.html.erb b/app/views/users/cards/_submission.html.erb
@@ -20,7 +20,7 @@
     <td class='text-small'>
       <i class="fa fa-comments-o"></i>
       <b><%= display_commenters(submission) %></b>
-      <i><%= "commented on your #{submission.class.to_s.downcase}" %></i>
+      <i><%= "#{t('users.cards._submission.commenters')}" "#{submission.class.to_s.downcase}" %></i>
     </td>
   </tr>
 <% end %>
@@ -33,7 +33,7 @@
     <td class='text-small'>
       <i class="fa fa-thumbs-up"></i>
       <b><%= display_likers(submission) %></b>
-      <i><%= "liked your #{submission.class.to_s.downcase}" %></i>
+      <i><%= "#{t('users.cards._submission.likers')}" "#{submission.class.to_s.downcase}" %></i>
     </td>
   </tr>
 <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -172,6 +172,7 @@ en:
     show:
       inspired: "Get inspired." #line 11
       browse: "Browse the stories other educators shared." #line 13
+
       add: "Add the first experience" #line 39
       header: "Theme" #line 60
       experience: "experience" #line 73
@@ -380,7 +381,7 @@ en:
 
   solution_stories:
     card:
-      header: "Required</span> Effort" #line 14
+      header: "Required Effort" #line 14
       time1: "hours" #line 15
       time2: "days" #line 15
       time3: "weeks" #line 15
@@ -398,7 +399,7 @@ en:
       discuss: "<i class='fa fa-reply'></i> Discuss" #line 82
       download: "<i class='fa fa-download'></i> Download" #line 92
       header4: "What You'll Need" #line 111
-      header5: "Required</span> Effort" #line 114
+      header5: "Required Effort" #line 114
       time1: "hours" #line 115
       time2: "days" #line 115
       time3: "weeks" #line 115
@@ -411,19 +412,58 @@ en:
       _edit: 
         submit: "Update" #line 2
       _form:
-        description_placeholder: "Explain the challenge. Why is it important? How does it affect you and other educators? How can %{name} help?"
+        title_placeholder: "Give it a title. Name a challenge we should take on."
+        description_placeholder: "Explain the challenge. Why is it important? How does it affect you and other educators?" #line 7
+        link_description: "Add a link to a video, article, image or other support" #line 21
+        url: "Add URL" #line 26
+        link_placeholder: "Share a link, image, video, or Tweet– we'll display it alongside your suggestion." #line 27
+        cancel: "Cancel" #line 33
+      _new: 
+        placeholder: "Share a suggestion that you think we should tackle with the" #line 3
+        submit: "Share" #line 7
+      _show: 
+        confirm: "Are you sure you want to delete your suggestion?" #line 9
+        question: "How much does this impact you?" #line 40
+      _vote:
+        low: "Not at all" #line 1
+        high: "A lot" #line 26
+    _form: 
+      title_placeholder: "Give it a title. Name a challenge we should take on." #line 4
+      description_placeholder: "Explain the challenge. Why is it important? How does it affect you and other educators?" #line 8
+      link_description: "Add a link to a video, article, image or other support" #line 22
+      url: "Add URL" #line 27
+      link_placeholder: "Share a link, image, video, or Tweet– we'll display it alongside your suggestion." #line 28
+      cancel: "Cancel" #line 34
+    edit:
+      header: "Suggestion" #line 11
+      title: "Edit Suggestion" #line 12
+      submit: "Update" #line 16
+    new:
+      header: "Suggestion" #line 11
+      title: "Edit Suggestion" #line 12
+      submit: "Share" #line 16
+
+  users:
+    cards:
+      _submission:
+        commenters: "commented on your" #line 23
+        likers: "liked your" #line 36
+    _header:
+      edit: "Edit Profile" #line 23
+      settings: "Account Settings" #line 24
+      activity: "Activity" #line 25
 
 
 
 
-  # <%= t('solutions.show.header7') %>
+  # <%= t('suggestions.new.header') %>
 
-  # "#{t('suggestions.card._edit.submit')}"
+  # "#{t('users._header.activity')}"
 
 
 # <%= t('comments._header.comment', :class => @comment.commentable.class.to_s) %>
 
-  # "#{t('suggestions.card._form.description_placeholder', :name => #{I18n.t(:project_name)})}"
+  # "#{t('users.cards._submission.commenters', :commenters => #{submission.class.to_s.downcase}"