Skip to content

(fixed #4128) ニックネームをSNS内名称設定に対応するよう修正 #429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nishizoe wants to merge 3 commits into
base: old-master
Choose a base branch
from
Open

(fixed #4128) ニックネームをSNS内名称設定に対応するよう修正 #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f308adb
(fixed #4128) ニックネームをSNS内名称設定に対応するよう修正
nishizoe Jan 16, 2017
ee72cd2
(fixed #4128-5) 不要な翻訳を削除
nishizoe Feb 22, 2017
8d72e2f
(fixed #4128-5) %nickname% を %Nickname% に修正
nishizoe Feb 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions apps/pc_backend/i18n/messages.ja.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/pc_backend/modules/member/actions/actions.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion apps/pc_backend/modules/member/templates/deleteSuccess.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(); ?>
Expand Down
2 changes: 1 addition & 1 deletion apps/pc_backend/modules/member/templates/listSuccess.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) : ?>
Expand Down
2 changes: 1 addition & 1 deletion apps/pc_backend/modules/member/templates/rejectSuccess.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion templates/_deleteAccountMail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) : ?>
Expand Down