Merge pull request #431 from nishizoe/t-4130

(fixed #4130, BP from #4128) ニックネームをSNS内名称設定に対応するよう修正
openpne · Mar 8, 2017 · 6ff9657 · 6ff9657
2 parents 2a55c62 + af81965
commit 6ff9657
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 9 deletions.
diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
@@ -2,10 +2,6 @@
 <xliff version="1.0">
   <file orginal="global" source-language="en" datatype="plaintext">
     <body>
-      <trans-unit id="">
-        <source>Nickname</source>
-        <target>ニックネーム</target>
-      </trans-unit>
       <trans-unit id="">
         <source>Password</source>
         <target>パスワード</target>

diff --git 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
@@ -13,7 +13,7 @@
 <th><?php echo __('ID') ?></th><td><?php echo $member->getId() ?></td>
 </tr>
 <tr>
-<th><?php echo __('Nickname') ?></th><td><?php echo $member->getName() ?></td>
+<th><?php echo __('%Nickname%') ?></th><td><?php echo $member->getName() ?></td>
 </tr>
 <?php foreach ($member->getProfiles() as $profile): ?>
 <?php $profileObj = $profile->getProfile(); ?>

diff --git a/apps/pc_backend/modules/member/templates/listSuccess.php b/apps/pc_backend/modules/member/templates/listSuccess.php
@@ -40,7 +40,7 @@
 <tr>
 <th colspan="4"><?php echo __('Operation') ?></th>
 <th><?php echo __('ID') ?></th>
-<th><?php echo __('Nickname') ?></th>
+<th><?php echo __('%Nickname%') ?></th>
 <th><?php echo __('Invited by') ?></th>
 <th><?php echo __('Last login') ?></th>
 <?php foreach ($profiles as $profile) : ?>

diff --git a/apps/pc_backend/modules/member/templates/rejectSuccess.php b/apps/pc_backend/modules/member/templates/rejectSuccess.php
@@ -15,7 +15,7 @@
 <th><?php echo __('ID') ?></th><td><?php echo $member->getId() ?></td>
 </tr>
 <tr>
-<th><?php echo __('Nickname') ?></th><td><?php echo $member->getName() ?></td>
+<th><?php echo __('%Nickname%') ?></th><td><?php echo $member->getName() ?></td>
 </tr>
 <?php echo $form ?>
 <tr>

diff --git a/templates/_deleteAccountMail.php b/templates/_deleteAccountMail.php
@@ -1,7 +1,7 @@
 <?php echo __('Information About the Withdrawal Member') ?> 
 
 <?php echo __('ID') ?> : <?php echo $member->getId() ?> 
-<?php echo __('Nickname') ?> : <?php echo $member->getName() ?> 
+<?php echo __('%Nickname%') ?> : <?php echo $member->getName() ?>
 
 <?php echo __('Last Login') ?> : <?php if ($member->getLastLoginTime()) : ?><?php echo date('y-m-d H:i:s', $member->getLastLoginTime()) ?><?php endif; ?> 
 <?php foreach ($member->getProfiles() as $profile) : ?>