From f308adbc07942e1e286fed261a7552f6776d7154 Mon Sep 17 00:00:00 2001 From: nishizoe Date: Mon, 16 Jan 2017 19:03:06 +0900 Subject: [PATCH 1/3] =?UTF-8?q?(fixed=20#4128)=20=E3=83=8B=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=83=8D=E3=83=BC=E3=83=A0=E3=82=92SNS=E5=86=85?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=A8=AD=E5=AE=9A=E3=81=AB=E5=AF=BE=E5=BF=9C?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/pc_backend/i18n/messages.ja.xml | 4 ++-- apps/pc_backend/modules/member/actions/actions.class.php | 2 +- apps/pc_backend/modules/member/templates/deleteSuccess.php | 2 +- apps/pc_backend/modules/member/templates/listSuccess.php | 2 +- apps/pc_backend/modules/member/templates/rejectSuccess.php | 2 +- templates/_deleteAccountMail.php | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml index d6717b4a5..be28386c7 100644 --- a/apps/pc_backend/i18n/messages.ja.xml +++ b/apps/pc_backend/i18n/messages.ja.xml @@ -3,8 +3,8 @@ - Nickname - ニックネーム + %nickname% + %nickname% Password diff --git a/apps/pc_backend/modules/member/actions/actions.class.php b/apps/pc_backend/modules/member/actions/actions.class.php index cb5d47af4..d1fb40711 100644 --- a/apps/pc_backend/modules/member/actions/actions.class.php +++ b/apps/pc_backend/modules/member/actions/actions.class.php @@ -37,7 +37,7 @@ public function executeList(sfWebRequest $request) $params = $request->getParameter('member', array()); $this->form = new opMemberProfileSearchForm(array(), array('is_use_id' => true, 'is_check_public_flag' => false)); - $this->form->getWidgetSchema()->setLabel('name', 'Nickname'); + $this->form->getWidgetSchema()->setLabel('name', '%nickname%'); $this->form->bind($params); $this->pager = new sfDoctrinePager('Member', 20); diff --git a/apps/pc_backend/modules/member/templates/deleteSuccess.php b/apps/pc_backend/modules/member/templates/deleteSuccess.php index bec3623fd..48679dcac 100644 --- a/apps/pc_backend/modules/member/templates/deleteSuccess.php +++ b/apps/pc_backend/modules/member/templates/deleteSuccess.php @@ -13,7 +13,7 @@ getId() ?> -getName() ?> +getName() ?> getProfiles() as $profile): ?> getProfile(); ?> diff --git a/apps/pc_backend/modules/member/templates/listSuccess.php b/apps/pc_backend/modules/member/templates/listSuccess.php index d310df1fd..b9a5d8c40 100644 --- a/apps/pc_backend/modules/member/templates/listSuccess.php +++ b/apps/pc_backend/modules/member/templates/listSuccess.php @@ -40,7 +40,7 @@ - + diff --git a/apps/pc_backend/modules/member/templates/rejectSuccess.php b/apps/pc_backend/modules/member/templates/rejectSuccess.php index d50ce617e..2b3fcf8f8 100644 --- a/apps/pc_backend/modules/member/templates/rejectSuccess.php +++ b/apps/pc_backend/modules/member/templates/rejectSuccess.php @@ -15,7 +15,7 @@ getId() ?> -getName() ?> +getName() ?> diff --git a/templates/_deleteAccountMail.php b/templates/_deleteAccountMail.php index 21d41fa0e..2228b27d9 100644 --- a/templates/_deleteAccountMail.php +++ b/templates/_deleteAccountMail.php @@ -1,7 +1,7 @@ : getId() ?> - : getName() ?> + : getName() ?> : getLastLoginTime()) : ?>getLastLoginTime()) ?> getProfiles() as $profile) : ?> From ee72cd2ae3c5dccd078767f4ebcc313a693462ff Mon Sep 17 00:00:00 2001 From: nishizoe Date: Wed, 22 Feb 2017 13:34:05 +0900 Subject: [PATCH 2/3] =?UTF-8?q?(fixed=20#4128-5)=20=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E3=81=AA=E7=BF=BB=E8=A8=B3=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/pc_backend/i18n/messages.ja.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml index be28386c7..3eebd5da7 100644 --- a/apps/pc_backend/i18n/messages.ja.xml +++ b/apps/pc_backend/i18n/messages.ja.xml @@ -2,10 +2,6 @@ - - %nickname% - %nickname% - Password パスワード From 8d72e2f8144aaa834a7ab0441f2815b59e3c444a Mon Sep 17 00:00:00 2001 From: nishizoe Date: Wed, 22 Feb 2017 14:06:18 +0900 Subject: [PATCH 3/3] =?UTF-8?q?(fixed=20#4128-5)=20%nickname%=20=E3=82=92?= =?UTF-8?q?=20%Nickname%=20=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/pc_backend/modules/member/actions/actions.class.php | 2 +- apps/pc_backend/modules/member/templates/deleteSuccess.php | 2 +- apps/pc_backend/modules/member/templates/listSuccess.php | 2 +- apps/pc_backend/modules/member/templates/rejectSuccess.php | 2 +- templates/_deleteAccountMail.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/pc_backend/modules/member/actions/actions.class.php b/apps/pc_backend/modules/member/actions/actions.class.php index d1fb40711..805f24a58 100644 --- a/apps/pc_backend/modules/member/actions/actions.class.php +++ b/apps/pc_backend/modules/member/actions/actions.class.php @@ -37,7 +37,7 @@ public function executeList(sfWebRequest $request) $params = $request->getParameter('member', array()); $this->form = new opMemberProfileSearchForm(array(), array('is_use_id' => true, 'is_check_public_flag' => false)); - $this->form->getWidgetSchema()->setLabel('name', '%nickname%'); + $this->form->getWidgetSchema()->setLabel('name', '%Nickname%'); $this->form->bind($params); $this->pager = new sfDoctrinePager('Member', 20); diff --git a/apps/pc_backend/modules/member/templates/deleteSuccess.php b/apps/pc_backend/modules/member/templates/deleteSuccess.php index 48679dcac..e5844ec3b 100644 --- a/apps/pc_backend/modules/member/templates/deleteSuccess.php +++ b/apps/pc_backend/modules/member/templates/deleteSuccess.php @@ -13,7 +13,7 @@ getId() ?> -getName() ?> +getName() ?> getProfiles() as $profile): ?> getProfile(); ?> diff --git a/apps/pc_backend/modules/member/templates/listSuccess.php b/apps/pc_backend/modules/member/templates/listSuccess.php index b9a5d8c40..67f48fabf 100644 --- a/apps/pc_backend/modules/member/templates/listSuccess.php +++ b/apps/pc_backend/modules/member/templates/listSuccess.php @@ -40,7 +40,7 @@ - + diff --git a/apps/pc_backend/modules/member/templates/rejectSuccess.php b/apps/pc_backend/modules/member/templates/rejectSuccess.php index 2b3fcf8f8..68254df8f 100644 --- a/apps/pc_backend/modules/member/templates/rejectSuccess.php +++ b/apps/pc_backend/modules/member/templates/rejectSuccess.php @@ -15,7 +15,7 @@ getId() ?> -getName() ?> +getName() ?> diff --git a/templates/_deleteAccountMail.php b/templates/_deleteAccountMail.php index 2228b27d9..6f041883f 100644 --- a/templates/_deleteAccountMail.php +++ b/templates/_deleteAccountMail.php @@ -1,7 +1,7 @@ : getId() ?> - : getName() ?> + : getName() ?> : getLastLoginTime()) : ?>getLastLoginTime()) ?> getProfiles() as $profile) : ?>