diff --git a/app/views/solution_stories/card.html.erb b/app/views/solution_stories/card.html.erb index 7f0c304..7d7a319 100644 --- a/app/views/solution_stories/card.html.erb +++ b/app/views/solution_stories/card.html.erb @@ -11,7 +11,7 @@
-
- <%= 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' %>
diff --git a/app/views/suggestions/card/_form.html.erb b/app/views/suggestions/card/_form.html.erb index c9cc1d0..03c0a15 100644 --- 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| %>
- <%= 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' %>
- <%= 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 %>
@@ -18,19 +18,19 @@
- Add a link to a video, article, image or other support + <%= t('suggestions.card._form.link_description') %>
- <%= f.text_field :link, placeholder: "Add URL", class: 'form-control' %> - Share a link, image, video, or Tweet– we'll display it alongside your suggestion. + <%= f.text_field :link, placeholder: "#{t('suggestions.card._form.url')}", class: 'form-control' %> + <%= t('suggestions.card._form.link_placeholder') %>
- <%= 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;' %>
diff --git a/app/views/suggestions/card/_new.html.erb b/app/views/suggestions/card/_new.html.erb index 709a02f..c04aeb3 100644 --- a/app/views/suggestions/card/_new.html.erb +++ b/app/views/suggestions/card/_new.html.erb @@ -1,10 +1,10 @@
- <%= 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')}" } %>
\ No newline at end of file diff --git a/app/views/suggestions/card/_show.html.erb b/app/views/suggestions/card/_show.html.erb index 722bfc9..bad9bf7 100644 --- a/app/views/suggestions/card/_show.html.erb +++ b/app/views/suggestions/card/_show.html.erb @@ -6,7 +6,7 @@ <%= link_to "".html_safe, '#', 'ng-click' => "suggestion_#{suggestion.id}_edit=true", onclick: 'return false;', class: 'list-link' %>   •   - <%= link_to "".html_safe, suggestion_path(suggestion.id), method: :delete, data: { confirm: "Are you sure you want to delete your suggestion?"}, class: 'list-link' %> + <%= link_to "".html_safe, suggestion_path(suggestion.id), method: :delete, data: { confirm: "#{t('suggestions.card._show.confirm')}"}, class: 'list-link' %> <% end %> @@ -37,7 +37,7 @@
-

How much does this impact you?

+

<%= t('suggestions.card._show.question') %>

diff --git a/app/views/suggestions/card/_vote.html.erb b/app/views/suggestions/card/_vote.html.erb index ae9721a..76ae8f8 100644 --- a/app/views/suggestions/card/_vote.html.erb +++ b/app/views/suggestions/card/_vote.html.erb @@ -1,4 +1,4 @@ -
  • Not at all
    • +
  • <%= t('suggestions.card._vote.low') %>
    • <% 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 %> -
  • A lot
    • \ No newline at end of file +
  • <%= t('suggestions.card._vote.high') %>
    • \ No newline at end of file diff --git a/app/views/suggestions/edit.html.erb b/app/views/suggestions/edit.html.erb index 588ce67..49fefd8 100644 --- a/app/views/suggestions/edit.html.erb +++ b/app/views/suggestions/edit.html.erb @@ -8,12 +8,12 @@
    -
    Suggestion
    -

    Edit Suggestion

    +
    <%= t('suggestions.edit.header') %>
    +

    <%= t('suggestions.edit.title') %>

    - <%= 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')}" } %>
    diff --git a/app/views/suggestions/new.html.erb b/app/views/suggestions/new.html.erb index 100bd7f..a7f3592 100644 --- a/app/views/suggestions/new.html.erb +++ b/app/views/suggestions/new.html.erb @@ -8,12 +8,12 @@
    -
    Suggestion
    -

    New Suggestion

    +
    <%= t('suggestions.new.header') %>
    +

    <%= t('suggestions.new.title') %>

    - <%= 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')}" } %>
    diff --git a/app/views/users/_header.html.erb b/app/views/users/_header.html.erb index 1b44e1b..f682118 100644 --- 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 %>
      -
    • <%= link_to 'Edit Profile', edit_user_registration_path(setting: 'profile') %>
      • -
    • <%= link_to 'Account Settings', edit_user_registration_path(setting: 'account') %>
      • - +
    • <%= link_to "#{t('users._header.edit')}", edit_user_registration_path(setting: 'profile') %>
      • +
    • <%= link_to "#{t('users._header.settings')}", edit_user_registration_path(setting: 'account') %>
      • +
    <% end %> diff --git a/app/views/users/cards/_submission.html.erb b/app/views/users/cards/_submission.html.erb index 392cd97..f11c642 100644 --- a/app/views/users/cards/_submission.html.erb +++ b/app/views/users/cards/_submission.html.erb @@ -20,7 +20,7 @@ <%= display_commenters(submission) %> - <%= "commented on your #{submission.class.to_s.downcase}" %> + <%= "#{t('users.cards._submission.commenters')}" "#{submission.class.to_s.downcase}" %> <% end %> @@ -33,7 +33,7 @@ <%= display_likers(submission) %> - <%= "liked your #{submission.class.to_s.downcase}" %> + <%= "#{t('users.cards._submission.likers')}" "#{submission.class.to_s.downcase}" %> <% end %> \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index a3f47d8..0beb1f1 100644 --- 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 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: " Discuss" #line 82 download: " Download" #line 92 header4: "What You'll Need" #line 111 - header5: "Required 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}"