Skip to content

Commit df03c90

Browse files
committed
Merge pull request riseuplabs#87 from azul/bugfix/destroy_membership_confirmation
fix translation interpolation - fixes #7814
2 parents afcd53c + df28d1f commit df03c90

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

config/locales/de.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ de:
498498
member_groups_of_network: "Gruppen im Netzwerk"
499499
members: BenutzerInnen
500500
membership: Mitgliedschaft
501-
membership_destroy_confirm_message: "Bist du sicher das du '%{user}' von %{group_type} entfernen willst?"
501+
membership_destroy_confirm_message: "Bist du sicher das du '%{entity}' aus %{group} entfernen willst?"
502502
membership_exists_error: "Mitgliedschaft besteht bereits für %{member}"
503503
membership_leave_message: "Du wurdest von %{group} entfernt"
504504
menu_admin: Admin

config/locales/es.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ es:
499499
member_groups_of_network: "Grupos Miembros"
500500
members: Personas
501501
membership: Afiliaciones
502-
membership_destroy_confirm_message: "¿Tienes la certeza de que quieres retirar a '%{user}' de %{group_type}?"
502+
membership_destroy_confirm_message: "¿Tienes la certeza de que quieres retirar a '%{entity}' de %{group}?"
503503
membership_exists_error: "Ya %{member} tiene una afiliación"
504504
membership_leave_message: "Te han retirado de %{group}"
505505
menu_admin: Admin

test/functional/groups/memberships_controller_test.rb

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
require File.dirname(__FILE__) + '/../../test_helper'
1+
require 'test_helper'
22

33
class Groups::MembershipsControllerTest < ActionController::TestCase
4+
fixtures :all
45

56
def setup
67
@user = FactoryGirl.create(:user)
@@ -30,4 +31,10 @@ def test_destroy
3031
assert_response :success
3132
end
3233

34+
def test_index_with_links_to_destroy
35+
login_as users(:blue)
36+
get :index, { group_id: groups(:warm) },
37+
{ language_code: 'de' }
38+
assert_response :success
39+
end
3340
end

0 commit comments

Comments
 (0)