From f5c67eff6c0a4b81fe63e24126fef37f79844195 Mon Sep 17 00:00:00 2001
From: ryu818 <masukawa@nii.ac.jp>
Date: Wed, 24 Feb 2021 13:29:49 +0900
Subject: [PATCH 1/2] =?UTF-8?q?change:=20=E8=8B=B1=E8=AA=9E=E3=81=AEUserna?=
 =?UTF-8?q?me=E3=81=AE=E3=83=A9=E3=83=99=E3=83=AB=E3=82=92Login=20ID?=
 =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=E3=80=82=20https://github.com/resea?=
 =?UTF-8?q?rchmap/RmNetCommons3/issues/2408?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Locale/eng/LC_MESSAGES/auth.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Locale/eng/LC_MESSAGES/auth.po b/Locale/eng/LC_MESSAGES/auth.po
index f805632..414458c 100644
--- a/Locale/eng/LC_MESSAGES/auth.po
+++ b/Locale/eng/LC_MESSAGES/auth.po
@@ -124,12 +124,12 @@ msgstr ""
 #: Auth/View/Auth/login.ctp:50
 #: Auth/View/ForgotPass/update.ctp:26
 msgid "Username"
-msgstr ""
+msgstr "Login ID"
 
 #: Auth/View/Auth/login.ctp:51
 #: Auth/View/ForgotPass/update.ctp:27
 msgid "Please enter your username."
-msgstr ""
+msgstr "Please enter your Login ID"
 
 #: Auth/View/Auth/login.ctp:57
 msgid "Password"

From 95b564a9f8668a6b7b15ee25e0c806326e9faa17 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Mon, 24 May 2021 13:47:24 +0900
Subject: [PATCH 2/2] =?UTF-8?q?change:=20IE=E3=81=A7=E3=83=AD=E3=82=B0?=
 =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=81=97=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AB?=
 =?UTF-8?q?=E3=82=A2=E3=83=A9=E3=83=BC=E3=83=88=E3=82=92=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=20https://github.com/NetCommons3/NetCommons3?=
 =?UTF-8?q?/issues/1644=20https://github.com/researchmap/RmNetCommons3/iss?=
 =?UTF-8?q?ues/2390?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Controller/AuthController.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Controller/AuthController.php b/Controller/AuthController.php
index 261054f..c68d9b6 100644
--- a/Controller/AuthController.php
+++ b/Controller/AuthController.php
@@ -21,6 +21,7 @@
  * @property ForgotPass $ForgotPass
  * @property NetCommonsComponent $NetCommons
  * @property User $User
+ * @property DeprecatedBrowserComponent $DeprecatedBrowser
  *
  * @author Shohei Nakajima <nakajimashouhei@gmail.com>
  * @package NetCommons\Auth\Controller
@@ -34,6 +35,7 @@ class AuthController extends AuthAppController {
  */
 	public $components = array(
 		'Security',
+		'NetCommons.DeprecatedBrowser',
 	);
 
 /**
@@ -113,6 +115,11 @@ public function login() {
 			//$this->_setNc2Authenticate();
 
 			if ($this->Auth->login()) {
+				//非推奨ブラウザチェック
+				if ($this->DeprecatedBrowser->isDeprecatedBrowser()) {
+					$this->DeprecatedBrowser->setFlashNotification();
+				}
+
 				ClassRegistry::removeObject('User');
 				$this->User = ClassRegistry::init('Users.User');