Skip to content

Commit

Permalink
Merge branch 'master' into netcore2.0-2
Browse files Browse the repository at this point in the history
  • Loading branch information
hikalkan committed Sep 7, 2017
2 parents dddbe60 + 7b29507 commit 6e3d15f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public override async Task Delete(EntityDto<int> input)
var role = await _roleManager.FindByIdAsync(input.Id.ToString());
if (role.IsStatic)
{
throw new UserFriendlyException("CannotDeleteAStaticRole");
throw new UserFriendlyException(L("CanNotDeleteStaticRole"));
}

var users = await _userManager.GetUsersInRoleAsync(role.NormalizedName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,17 @@
<text name="Edit">Edit</text>
<text name="Delete">Delete</text>

<text name="CreateNewRole">Create New Role</text>
<text name="CreateNewRole">Create new role</text>
<text name="RoleName">Role Name</text>
<text name="Actions">Actions</text>

<text name="CouldNotCompleteLoginOperation">Could not complete login operation. Please try again later.</text>

<text name="CouldNotValidateExternalUser">Could not validate external user</text>
<text name="EditRole">Edit role</text>
<text name="EditTenant">Edit tenant</text>
<text name="EditUser">Edit user</text>
<text name="TenantIdIsNotActive{0}">TenantId {0} is not active</text>
<text name="UnknownTenantId{0}">Unknown tenantId {0}</text>
</texts>
</localizationDictionary>

0 comments on commit 6e3d15f

Please sign in to comment.