Merge in @incanus's changes from openstreetmap#22 and pass group titl…

…e through.
osmlab · Sep 24, 2013 · 1c6b388 · 1c6b388
1 parent 32fb9bf
commit 1c6b388
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/app/views/groups/_join_or_leave_links.html.erb b/app/views/groups/_join_or_leave_links.html.erb
@@ -1,5 +1,5 @@
 <% if @user.groups.include?(group) %>
-  <li><%= link_to t('group.leave.action'), leave_group_path(group), :method => :post, :data => { :confirm => t('group.leave.confirm') } %></li>
+  <li><%= link_to t('group.leave.action'), leave_group_path(group), :method => :post, :data => { :confirm => t('group.leave.confirm', :title => group.title) } %></li>
 <% else %>
-  <li><%= link_to t('group.join.action'), join_group_path(group), :method => :post, :data => { :confirm => t('group.join.confirm') } %></li>
+  <li><%= link_to t('group.join.action'), join_group_path(group), :method => :post, :data => { :confirm => t('group.join.confirm', :title => group.title) } %></li>
 <% end %>
diff --git a/app/views/groups/show.html.erb b/app/views/groups/show.html.erb
@@ -9,9 +9,9 @@
       <% if @group.leadership_includes?(@user) %>
         <li><%= link_to t('group.message.action'), new_message_to_group_path(@group) %></li>
         <li><%= link_to t('group.edit.action'), edit_group_path(@group) %></li>
-        <li><%= link_to t('group.resign.action'), resign_leader_group_path(@group), :method => :post, :data => { :confirm => t('group.resign.confirm') } %></li>
+        <li><%= link_to t('group.resign.action'), resign_leader_group_path(@group), :method => :post, :data => { :confirm => t('group.resign.confirm', :title => @group.title) } %></li>
       <% elsif @group.users.include?(@user) && @group.leaders.count == 0 %>
-        <li><%= link_to t('group.lead.action'), become_leader_group_path(@group), :method => :post, :data => { :confirm => t('group.lead.confirm') } %></li>
+        <li><%= link_to t('group.lead.action'), become_leader_group_path(@group), :method => :post, :data => { :confirm => t('group.lead.confirm', :title => @group.title) } %></li>
       <% end %>
       <%= render :partial => 'join_or_leave_links', :locals => { :group => @group } %>
     </ul>

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -2234,19 +2234,19 @@ en:
     leave:
       action: "leave group"
       confirm: "Leave %{title}?"
-      not_in_group: "You can't leave %{title}, since you aren't a member."
+      not_in_group: "You can't leave %{title} as you are not a member."
       success: "You are no longer a member of %{title}."
       error: "Error leaving %{title}."
     show:
       members: "Members"
       diary_entries: "Recent diary entries"
     lead:
       action: "become a group leader"
-      confirm: "Become leader for %{title}?"
-      success: "You are now one of the leaders for %{title}."
+      confirm: "Become a leader of %{title}?"
+      success: "You are now one of the leaders of %{title}."
     resign:
       action: "resign from group leader"
-      confirm: "Resign as group leader of %{title}?"
+      confirm: "Stop leading %{title}?"
       success: "You are no longer a leader of %{title}."
     message:
       action: "message all members"