From 22f1537abd384c1554d0f3edebd947e0a08e1935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=81=BE=E3=81=BF=E3=82=84=20=E3=82=86=E3=81=86?= =?UTF-8?q?=E3=81=93?= <1@1234.sh> Date: Tue, 6 Oct 2015 22:02:44 +0800 Subject: [PATCH 1/2] Update Resources.resx --- src/Microsoft.AspNet.Identity/Resources.resx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.AspNet.Identity/Resources.resx b/src/Microsoft.AspNet.Identity/Resources.resx index feda1883d2..ca81c76d0b 100644 --- a/src/Microsoft.AspNet.Identity/Resources.resx +++ b/src/Microsoft.AspNet.Identity/Resources.resx @@ -122,7 +122,7 @@ Error when optimistic concurrency fails - An unknown failure has occured. + An unknown failure has occurred. Default identity result error message @@ -281,4 +281,4 @@ User is not in role '{0}'. Error when a user is not in the role - \ No newline at end of file + From aadae4163e62d4d21de08618d4c9c94ecf93ed73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=81=BE=E3=81=BF=E3=82=84=20=E3=82=86=E3=81=86?= =?UTF-8?q?=E3=81=93?= <1@1234.sh> Date: Tue, 6 Oct 2015 22:03:26 +0800 Subject: [PATCH 2/2] Update jquery.validate-vsdoc.js --- samples/IdentitySample.Mvc/Scripts/jquery.validate-vsdoc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/IdentitySample.Mvc/Scripts/jquery.validate-vsdoc.js b/samples/IdentitySample.Mvc/Scripts/jquery.validate-vsdoc.js index fd9125705c..96f2589708 100644 --- a/samples/IdentitySample.Mvc/Scripts/jquery.validate-vsdoc.js +++ b/samples/IdentitySample.Mvc/Scripts/jquery.validate-vsdoc.js @@ -622,7 +622,7 @@ $.extend($.validator, { return false; } } catch(e) { - this.settings.debug && window.console && console.log("exception occured when checking element " + element.id + this.settings.debug && window.console && console.log("exception occurred when checking element " + element.id + ", check the '" + rule.method + "' method", e); throw e; }