From 76e658f0acdb82003bd35a8bede21667d7c8a21f Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Mon, 16 Jan 2017 18:01:42 +0900
Subject: [PATCH] =?UTF-8?q?(fixed=20#4127,=20BP=20from=20#3268)=20?=
 =?UTF-8?q?=E3=83=8B=E3=83=83=E3=82=AF=E3=83=8D=E3=83=BC=E3=83=A0=E3=82=92?=
 =?UTF-8?q?SNS=E5=86=85=E5=90=8D=E7=A7=B0=E8=A8=AD=E5=AE=9A=E3=81=AB?=
 =?UTF-8?q?=E5=AF=BE=E5=BF=9C=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E4=BF=AE?=
 =?UTF-8?q?=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 ++--
 .../lib/CommunityEventCommentSearchForm.class.php             | 2 +-
 .../lib/CommunityEventMemberSearchForm.class.php              | 2 +-
 .../lib/CommunityTopicCommentSearchForm.class.php             | 2 +-
 .../modules/communityTopic/templates/_eventCommentInfo.php    | 2 +-
 .../modules/communityTopic/templates/_eventMemberInfo.php     | 2 +-
 .../modules/communityTopic/templates/_topicCommentInfo.php    | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index 01fd889..57f80fa 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -123,8 +123,8 @@
         <target>%Community%イベント削除確認画面</target>
       </trans-unit>
       <trans-unit id="">
-        <source>Nickname</source>
-        <target>ニックネーム</target>
+        <source>%nickname%</source>
+        <target>%nickname%</target>
       </trans-unit>
       <trans-unit id="">
         <source>Event Member List</source>
diff --git a/apps/pc_backend/modules/communityTopic/lib/CommunityEventCommentSearchForm.class.php b/apps/pc_backend/modules/communityTopic/lib/CommunityEventCommentSearchForm.class.php
index ccd53e9..d077cb8 100644
--- a/apps/pc_backend/modules/communityTopic/lib/CommunityEventCommentSearchForm.class.php
+++ b/apps/pc_backend/modules/communityTopic/lib/CommunityEventCommentSearchForm.class.php
@@ -47,7 +47,7 @@ public function configure()
 
     $this->widgetSchema->setLabel('community_event_id', sfContext::getInstance()->getI18N()->__('Event ID'));
     $this->widgetSchema->setLabel('number', sfContext::getInstance()->getI18N()->__('Comment Number'));
-    $this->widgetSchema->setLabel('member_name', sfContext::getInstance()->getI18N()->__('Nickname'));
+    $this->widgetSchema->setLabel('member_name', sfContext::getInstance()->getI18N()->__('%nickname%'));
     $this->widgetSchema->setLabel('body', sfContext::getInstance()->getI18N()->__('Event Comment Description'));
 
     $this->errorSchema = new sfValidatorErrorSchema($this->validatorSchema);
diff --git a/apps/pc_backend/modules/communityTopic/lib/CommunityEventMemberSearchForm.class.php b/apps/pc_backend/modules/communityTopic/lib/CommunityEventMemberSearchForm.class.php
index 3596758..7322ca4 100644
--- a/apps/pc_backend/modules/communityTopic/lib/CommunityEventMemberSearchForm.class.php
+++ b/apps/pc_backend/modules/communityTopic/lib/CommunityEventMemberSearchForm.class.php
@@ -36,7 +36,7 @@ public function configure()
     ));
 
     $this->widgetSchema->setLabel('community_event_id', sfContext::getInstance()->getI18N()->__('Event ID'));
-    $this->widgetSchema->setLabel('member_name', sfContext::getInstance()->getI18N()->__('Nickname'));
+    $this->widgetSchema->setLabel('member_name', sfContext::getInstance()->getI18N()->__('%nickname%'));
 
     $this->errorSchema = new sfValidatorErrorSchema($this->validatorSchema);
     $this->widgetSchema->setNameFormat('communityEventMember[%s]');
diff --git a/apps/pc_backend/modules/communityTopic/lib/CommunityTopicCommentSearchForm.class.php b/apps/pc_backend/modules/communityTopic/lib/CommunityTopicCommentSearchForm.class.php
index 261f8ae..d420f6e 100644
--- a/apps/pc_backend/modules/communityTopic/lib/CommunityTopicCommentSearchForm.class.php
+++ b/apps/pc_backend/modules/communityTopic/lib/CommunityTopicCommentSearchForm.class.php
@@ -47,7 +47,7 @@ public function configure()
 
     $this->widgetSchema->setLabel('community_topic_id', sfContext::getInstance()->getI18N()->__('Topic ID'));
     $this->widgetSchema->setLabel('number', sfContext::getInstance()->getI18N()->__('Comment Number'));
-    $this->widgetSchema->setLabel('member_name', sfContext::getInstance()->getI18N()->__('Nickname'));
+    $this->widgetSchema->setLabel('member_name', sfContext::getInstance()->getI18N()->__('%nickname%'));
     $this->widgetSchema->setLabel('body', sfContext::getInstance()->getI18N()->__('Topic Comment Description'));
 
     $this->errorSchema = new sfValidatorErrorSchema($this->validatorSchema);
diff --git a/apps/pc_backend/modules/communityTopic/templates/_eventCommentInfo.php b/apps/pc_backend/modules/communityTopic/templates/_eventCommentInfo.php
index c68fabb..3ce8fc2 100644
--- a/apps/pc_backend/modules/communityTopic/templates/_eventCommentInfo.php
+++ b/apps/pc_backend/modules/communityTopic/templates/_eventCommentInfo.php
@@ -1,7 +1,7 @@
 <table>
 <tr><th><?php echo __('Event ID') ?></th><td><?php echo $eventComment->getCommunityEventId() ?></td></tr>
 <tr><th><?php echo __('Comment Number') ?></th><td><?php echo $eventComment->getNumber() ?></td></tr>
-<tr><th><?php echo __('Nickname') ?></th><td><?php echo $eventComment->Member->getName() ?></td></tr>
+<tr><th><?php echo __('%nickname%') ?></th><td><?php echo $eventComment->Member->getName() ?></td></tr>
 <tr><th><?php echo __('Event Comment Description') ?></th><td><?php echo $eventComment->getBody() ?></td></tr>
 <tr><th><?php echo __('Created Date') ?></th><td><?php echo $eventComment->getCreatedAt() ?></td></tr>
 <?php if ($moreInfo): ?>
diff --git a/apps/pc_backend/modules/communityTopic/templates/_eventMemberInfo.php b/apps/pc_backend/modules/communityTopic/templates/_eventMemberInfo.php
index f2c7704..a64d71a 100644
--- a/apps/pc_backend/modules/communityTopic/templates/_eventMemberInfo.php
+++ b/apps/pc_backend/modules/communityTopic/templates/_eventMemberInfo.php
@@ -1,7 +1,7 @@
 <table>
 <tr><th><?php echo __('Event ID') ?></th><td><?php echo $eventMember->getCommunityEventId() ?></td></tr>
 <tr><th><?php echo __('Event Title') ?></th><td><?php echo $eventMember->CommunityEvent->getName()?></td></tr>
-<tr><th><?php echo __('Nickname') ?></th><td><?php echo $eventMember->Member->getName() ?></td></tr>
+<tr><th><?php echo __('%nickname%') ?></th><td><?php echo $eventMember->Member->getName() ?></td></tr>
 <?php if ($moreInfo): ?>
 <tr><td colspan="2">
 <ul>
diff --git a/apps/pc_backend/modules/communityTopic/templates/_topicCommentInfo.php b/apps/pc_backend/modules/communityTopic/templates/_topicCommentInfo.php
index d7e69fe..0ffb238 100644
--- a/apps/pc_backend/modules/communityTopic/templates/_topicCommentInfo.php
+++ b/apps/pc_backend/modules/communityTopic/templates/_topicCommentInfo.php
@@ -1,7 +1,7 @@
 <table>
 <tr><th><?php echo __('Topic ID') ?></th><td><?php echo $topicComment->getCommunityTopicId() ?></td></tr>
 <tr><th><?php echo __('Comment Number') ?></th><td><?php echo $topicComment->getNumber() ?></td></tr>
-<tr><th><?php echo __('Nickname') ?></th><td><?php echo $topicComment->Member->getName() ?></td></tr>
+<tr><th><?php echo __('%nickname%') ?></th><td><?php echo $topicComment->Member->getName() ?></td></tr>
 <tr><th><?php echo __('Topic Comment Description') ?></th><td><?php echo $topicComment->getBody() ?></td></tr>
 <tr><th><?php echo __('Created Date') ?></th><td><?php echo $topicComment->getCreatedAt() ?></td></tr>
 <?php if ($moreInfo): ?>