ここの情報は古いです。ご理解頂いた上でお取り扱いください。

Changeset 12915


Ignore:
Timestamp:
Sep 16, 2009, 9:21:49 PM (11 years ago)
Author:
ebihara
Message:

#3316:changed normal terms in the pc_frontend are now configurable (except special terms)

Location:
OpenPNE3/branches/ebihara_term
Files:
21 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE3/branches/ebihara_term/apps/pc_frontend/i18n/messages.ja.xml

    r12912 r12915  
    44    <body>
    55      <trans-unit id="">
    6         <source>Communities List</source>
    7         <target>コミュニティリスト</target>
    8       </trans-unit>
    9       <trans-unit id="">
    10         <source>Community Members</source>
    11         <target>コミュニティメンバー</target>
     6        <source>%community% List</source>
     7        <target>%community%リスト</target>
     8      </trans-unit>
     9      <trans-unit id="">
     10        <source>%community% Members</source>
     11        <target>%community%メンバー</target>
    1212      </trans-unit>
    1313      <trans-unit id="">
     
    2020      </trans-unit>
    2121      <trans-unit id="">
    22         <source>Edit the community</source>
    23         <target>コミュニティ編集</target>
     22        <source>Edit the %community%</source>
     23        <target>%community%編集</target>
    2424      </trans-unit>
    2525      <trans-unit id="">
     
    2828      </trans-unit>
    2929      <trans-unit id="">
    30         <source>Community Name</source>
    31         <target>コミュニティ名</target>
     30        <source>%community% Name</source>
     31        <target>%community%名</target>
    3232      </trans-unit>
    3333      <trans-unit id="">
     
    4848      </trans-unit>
    4949      <trans-unit id="">
    50         <source>Community</source>
    51         <target>コミュニティ</target>
    52       </trans-unit>
    53       <trans-unit id="">
    54         <source>Edit this community</source>
    55         <target>このコミュニティを編集する</target>
    56       </trans-unit>
    57       <trans-unit id="">
    58         <source>Leave this community</source>
    59         <target>このコミュニティを退会する</target>
    60       </trans-unit>
    61       <trans-unit id="">
    62         <source>Join this community</source>
    63         <target>このコミュニティに参加する</target>
    64       </trans-unit>
    65       <trans-unit id="">
    66         <source>You are already joined to this community.</source>
    67         <target>既にコミュニティに参加済みです。</target>
    68       </trans-unit>
    69       <trans-unit id="">
    70         <source>You have already sent the participation request to this community.</source>
    71         <target>既にコミュニティに参加申請済みです。</target>
    72       </trans-unit>
    73       <trans-unit id="">
    74         <source>You are waiting for the participation approval by community's administrator.</source>
    75         <target>コミュニティ管理者による参加承認待ちです。</target>
     50        <source>%community%</source>
     51        <target>%community%</target>
     52      </trans-unit>
     53      <trans-unit id="">
     54        <source>Edit this %community%</source>
     55        <target>この%community%を編集する</target>
     56      </trans-unit>
     57      <trans-unit id="">
     58        <source>Leave this %community%</source>
     59        <target>この%community%を退会する</target>
     60      </trans-unit>
     61      <trans-unit id="">
     62        <source>Join this %community%</source>
     63        <target>この%community%に参加する</target>
     64      </trans-unit>
     65      <trans-unit id="">
     66        <source>You are already joined to this %community%.</source>
     67        <target>既に%community%に参加済みです。</target>
     68      </trans-unit>
     69      <trans-unit id="">
     70        <source>You have already sent the participation request to this %community%.</source>
     71        <target>既に%community%に参加申請済みです。</target>
     72      </trans-unit>
     73      <trans-unit id="">
     74        <source>You are waiting for the participation approval by %community%'s administrator.</source>
     75        <target>%community%管理者による参加承認待ちです。</target>
    7676      </trans-unit>
    7777      <trans-unit id="">
     
    8080      </trans-unit>
    8181      <trans-unit id="">
    82         <source>Joined Communities</source>
    83         <target>参加コミュニティ</target>
    84       </trans-unit>
    85       <trans-unit id="">
    86         <source>You don't have any joined communities.</source>
    87         <target>参加しているコミュニティはありません。</target>
     82        <source>Joined %community%</source>
     83        <target>参加%community%</target>
     84      </trans-unit>
     85      <trans-unit id="">
     86        <source>You don't have any joined %community%.</source>
     87        <target>参加している%community%はありません。</target>
    8888      </trans-unit>
    8989      <trans-unit id="">
     
    9292      </trans-unit>
    9393      <trans-unit id="">
    94         <source>The administrator doesn't leave the community.</source>
     94        <source>The administrator doesn't leave the %community%.</source>
    9595        <target>管理者は退会できません。</target>
    9696      </trans-unit>
    9797      <trans-unit id="">
    98         <source>You haven't joined this community yet.</source>
    99         <target>まだコミュニティに参加していません。</target>
    100       </trans-unit>
    101       <trans-unit id="">
    102         <source>Community Notification</source>
    103         <target>コミュニティ書き込み通知設定</target>
     98        <source>You haven't joined this %community% yet.</source>
     99        <target>まだ%community%に参加していません。</target>
     100      </trans-unit>
     101      <trans-unit id="">
     102        <source>%community% Notification</source>
     103        <target>%community%書き込み通知設定</target>
    104104      </trans-unit>
    105105      <trans-unit id="">
     
    112112      </trans-unit>
    113113      <trans-unit id="">
    114         <source>Search Communities</source>
    115         <target>コミュニティ検索</target>
     114        <source>Search %community%</source>
     115        <target>%community%検索</target>
    116116      </trans-unit>
    117117      <trans-unit id="">
     
    128128      </trans-unit>
    129129      <trans-unit id="">
    130         <source>Your search queries did not match any communities.</source>
    131         <target>該当するコミュニティはありませんでした。</target>
     130        <source>Your search queries did not match any %community%.</source>
     131        <target>該当する%community%はありませんでした。</target>
    132132      </trans-unit>
    133133      <trans-unit id="">
     
    140140      </trans-unit>
    141141      <trans-unit id="">
    142         <source>%1% sent my friends request to you!</source>
    143         <target>%1%さんからフレンド申請がきています!</target>
     142        <source>%1% sent %friend% request to you!</source>
     143        <target>%1%さんから%friend%申請がきています!</target>
    144144      </trans-unit>
    145145      <trans-unit id="">
     
    156156      </trans-unit>
    157157      <trans-unit id="">
    158         <source>My Friends Setting</source>
    159         <target>フレンド管理</target>
    160       </trans-unit>
    161       <trans-unit id="">
    162         <source>This member already belongs to my friends.</source>
    163         <target>既にフレンドです。</target>
    164       </trans-unit>
    165       <trans-unit id="">
    166         <source>My friends request is already sent.</source>
    167         <target>現在フレンド申請中です。</target>
    168       </trans-unit>
    169       <trans-unit id="">
    170         <source>You have requested friend link.</source>
    171         <target>フレンド申請が完了しました。</target>
    172       </trans-unit>
    173       <trans-unit id="">
    174         <source>You don't have any friends.</source>
    175         <target>フレンドがいません。</target>
    176       </trans-unit>
    177       <trans-unit id="">
    178         <source>Delete from my friends.</source>
    179         <target>フレンドから外す</target>
    180       </trans-unit>
    181       <trans-unit id="">
    182         <source>Add friends</source>
    183         <target>マイフレンドに追加</target>
    184       </trans-unit>
    185       <trans-unit id="">
    186         <source>This member is not your friend.</source>
    187         <target>フレンドではありません。</target>
     158        <source>%my_friend% Setting</source>
     159        <target>%my_friend%管理</target>
     160      </trans-unit>
     161      <trans-unit id="">
     162        <source>This member already belongs to %my_friend%.</source>
     163        <target>既に%my_friend%です。</target>
     164      </trans-unit>
     165      <trans-unit id="">
     166        <source>%friend% request is already sent.</source>
     167        <target>現在%friend%申請中です。</target>
     168      </trans-unit>
     169      <trans-unit id="">
     170        <source>You have requested %friend% link.</source>
     171        <target>%friend%申請が完了しました。</target>
     172      </trans-unit>
     173      <trans-unit id="">
     174        <source>You don't have any %friend%.</source>
     175        <target>%friend%がいません。</target>
     176      </trans-unit>
     177      <trans-unit id="">
     178        <source>Delete from %my_friend%.</source>
     179        <target>%my_friend%から外す</target>
     180      </trans-unit>
     181      <trans-unit id="">
     182        <source>Add %my_friend%</source>
     183        <target>%my_friend%に追加</target>
     184      </trans-unit>
     185      <trans-unit id="">
     186        <source>This member is not your %friend%.</source>
     187        <target>%friend%ではありません。</target>
    188188      </trans-unit>
    189189      <trans-unit id="">
     
    244244      </trans-unit>
    245245      <trans-unit id="">
    246         <source>My Friends</source>
    247         <target>マイフレンドまで公開</target>
    248       </trans-unit>
    249       <trans-unit id="">
    250         <source>Only Open to My Friends</source>
    251         <target>マイフレンドまで公開</target>
     246        <source>%my_friend%</source>
     247        <target>%my_friend%まで公開</target>
     248      </trans-unit>
     249      <trans-unit id="">
     250        <source>Only Open to %my_friend%</source>
     251        <target>%my_friend%まで公開</target>
    252252      </trans-unit>
    253253      <trans-unit id="">
     
    276276      </trans-unit>
    277277      <trans-unit id="">
    278         <source>Friends List</source>
    279         <target>フレンドリスト</target>
     278        <source>%friend% List</source>
     279        <target>%friend%リスト</target>
    280280      </trans-unit>
    281281      <trans-unit id="">
     
    508508      </trans-unit>
    509509      <trans-unit id="">
    510         <source>If %1% is your friend, let us add to friends it!</source>
    511         <target>%1%さんと直接の知り合いの場合、マイフレンドに追加しましょう!</target>
     510        <source>If %1% is your friend, let us add to %my_friend% it!</source>
     511        <target>%1%さんと直接の知り合いの場合、%my_friend%に追加しましょう!</target>
    512512      </trans-unit>
    513513      <trans-unit id="">
     
    576576      </trans-unit>
    577577      <trans-unit id="">
    578         <source>Community's admin authorization needed</source>
    579         <target>コミュニティ管理者の承認が必要</target>
    580       </trans-unit>
    581       <trans-unit id="">
    582         <source>Community Category</source>
    583         <target>コミュニティカテゴリ</target>
     578        <source>%community%'s admin authorization needed</source>
     579        <target>%community%管理者の承認が必要</target>
     580      </trans-unit>
     581      <trans-unit id="">
     582        <source>%community% Category</source>
     583        <target>%community%カテゴリ</target>
    584584      </trans-unit>
    585585      <trans-unit id="">
     
    588588      </trans-unit>
    589589      <trans-unit id="">
    590         <source>delete this community.if you delete this community please to report in advance for all this community members.</source>
    591         <target>このコミュニティを削除します。このコミュニティを削除する場合は、事前にこのコミュニティのメンバーに報告してください。</target>
     590        <source>delete this %community%.if you delete this %community% please to report in advance for all this %community% members.</source>
     591        <target>この%community%を削除します。この%community%を削除する場合は、事前にこの%community%のメンバーに報告してください。</target>
    592592      </trans-unit>
    593593      <trans-unit id="">
     
    596596      </trans-unit>
    597597      <trans-unit id="">
    598         <source>Delete this community</source>
    599         <target>コミュニティを削除する</target>
    600       </trans-unit>
    601       <trans-unit id="">
    602         <source>Do you delete this community?</source>
     598        <source>Delete this %community%</source>
     599        <target>%community%を削除する</target>
     600      </trans-unit>
     601      <trans-unit id="">
     602        <source>Do you delete this %community%?</source>
    603603        <target>削除してよろしいですか?</target>
    604604      </trans-unit>
    605605      <trans-unit>
    606         <source>Do you drop %0% from this community?</source>
    607         <target>%0%さんをこのコミュニティから本当に退会させますか?</target>
     606        <source>Do you drop %0% from this %community%?</source>
     607        <target>%0%さんをこの%community%から本当に退会させますか?</target>
    608608      </trans-unit>
    609609      <trans-unit id="">
  • OpenPNE3/branches/ebihara_term/apps/pc_frontend/modules/community/templates/_joinListBox.php

    r11479 r12915  
    11<?php
    22$options = array(
    3   'title' => __('Communities List'),
     3  'title' => __('%community% List', array('%community%' => $op_term['community']->titleize())),
    44  'list' => $communities,
    55  'crownIds' => $sf_data->getRaw('crownIds'),
  • OpenPNE3/branches/ebihara_term/apps/pc_frontend/modules/community/templates/dropMemberInput.php

    r12790 r12915  
    11<?php op_include_parts('yesNo', 'dropMemberConfirmForm', array(
    2   'body'      => __('Do you drop %0% from this community?', array('%0%' => $member->getName())),
     2  'body'      => __('Do you drop %0% from this %community%?', array('%0%' => $member->getName(), '%community%' => $op_term['community'])),
    33  'yes_form'  => new sfForm(),
    44  'no_url'    => url_for('community/memberManage?id='.$community->getId()),
  • OpenPNE3/branches/ebihara_term/apps/pc_frontend/modules/community/templates/editSuccess.php

    r11635 r12915  
    66if ($communityForm->isNew())
    77{
    8   $options['title'] = __('Create a new community');
     8  $options['title'] = __('Create a new %community%', array('%community%' => $op_term['community']));
    99  $options['url'] = url_for('community/edit');
    1010}
    1111else
    1212{
    13   $options['title'] = __('Edit the community');
     13  $options['title'] = __('Edit the %community%', array('%community%' => $op_term['community']));
    1414  $options['url'] = url_for('community/edit?id='.$community->getId());
    1515}
     
    2020{
    2121  op_include_parts('buttonBox', 'deleteForm', array(
    22     'title' => __('Delete this community'),
    23     'body' => __('delete this community.if you delete this community please to report in advance for all this community members.'),
     22    'title' => __('Delete this %community%', array('%community%' => $op_term['community'])),
     23    'body' => __('delete this %community%.if you delete this %community% please to report in advance for all this %community% members.', array('%community%' => $op_term['community'])),
    2424    'button' => __('Delete'),
    2525    'method' => 'get',
  • OpenPNE3/branches/ebihara_term/apps/pc_frontend/modules/community/templates/homeSuccess.php

    r12818 r12915  
    99<?php
    1010$options = array(
    11   'title' => __('Community Members'),
     11  'title' => __('%community% Members', array('%community%' => $op_term['community']->titleize())),
    1212  'list' => $members,
    1313  'crownIds' => array($community_admin->getId()),
     
    2525<?php slot('op_top') ?>
    2626<?php if ($isCommunityPreMember) : ?>
    27 <?php op_include_parts('descriptionBox', 'informationAboutCommunity',  array('body' => __('You are waiting for the participation approval by community\'s administrator.'))) ?>
     27<?php op_include_parts('descriptionBox', 'informationAboutCommunity',  array('body' => __('You are waiting for the participation approval by %community%\'s administrator.', array('%community%' => $op_term['community'])))) ?>
    2828<?php endif; ?>
    2929<?php end_slot(); ?>
     
    3131<?php
    3232$list = array(
    33   __('Community Name')     => $community->getName(),
    34   __('Community Category') => $community->getCommunityCategory(),
     33  __('%community% Name', array('%community%' => $op_term['community']->titleize()))     => $community->getName(),
     34  __('%community% Category', array('%community%' => $op_term['community']->titleize())) => $community->getCommunityCategory(),
    3535  __('Date Created')       => op_format_date($community->getCreatedAt(), 'D'),
    3636  __('Administrator')      => $community_admin->getName(),
     
    4545
    4646$options = array(
    47   'title' => __('Community'),
     47  'title' => __('%community%', array('%community%' => $op_term['community']->titleize())),
    4848  'list' => $list,
    4949);
     
    5656<div class="parts">
    5757<div class="partsHeading">
    58 <h3><?php echo __('Community Notification') ?></h3>
     58<h3><?php echo __('%community% Notification', array('%community%' => $op_term['community']->titleize())) ?></h3>
    5959</div>
    6060<table>
     
    7373<ul>
    7474<?php if ($isEditCommunity): ?>
    75 <li><?php echo link_to(__('Edit this community'), 'community/edit?id=' . $community->getId()) ?></li>
     75<li><?php echo link_to(__('Edit this %community%', array('%community%' => $op_term['community'])), 'community/edit?id=' . $community->getId()) ?></li>
    7676<?php endif; ?>
    7777
    7878<?php if (!$isAdmin): ?>
    7979<?php if ($isCommunityMember): ?>
    80 <li><?php echo link_to(__('Leave this community'), 'community/quit?id=' . $community->getId()) ?></li>
     80<li><?php echo link_to(__('Leave this %community%',  array('%community%' => $op_term['community'])), 'community/quit?id=' . $community->getId()) ?></li>
    8181<?php else : ?>
    82 <li><?php echo link_to(__('Join this community'), 'community/join?id=' . $community->getId()) ?></li>
     82<li><?php echo link_to(__('Join this %community%',  array('%community%' => $op_term['community'])), 'community/join?id=' . $community->getId()) ?></li>
    8383<?php endif; ?>
    8484<?php endif; ?>
  • OpenPNE3/branches/ebihara_term/apps/pc_frontend/modules/community/templates/joinError.php

    r12767 r12915  
    11<?php if ($isCommunityMember): ?>
    2 <?php $body =  __('You are already joined to this community.') ?>
     2<?php $body =  __('You are already joined to this %community%.', array('%community%' => $op_term['community'])) ?>
    33<?php else: ?>
    4 <?php $body =  __('You have already sent the participation request to this community.') ?>
     4<?php $body =  __('You have already sent the participation request to this %community%.', array('%community%' => $op_term['community'])) ?>
    55<?php endif; ?>
    66<?php op_include_box('error', $body, array('title' => __('Errors'))) ?>
  • OpenPNE3/branches/ebihara_term/apps/pc_frontend/modules/community/templates/joinlistError.php

    r10445 r12915  
    1 <?php op_include_box('noJoinCommunity', __('You don\'t have any joined communities.'), array('title' => __('Joined Communities'))) ?>
     1<?php op_include_box('noJoinCommunity', __('You don\'t have any joined %community%.', array('%community%' => $op_term['community']->pluralize())), array('title' => __('Joined %community%', array('%community%' => $op_term['community']->pluralize()->titleize())))) ?>
    22
    33<?php use_helper('Javascript') ?>
  • OpenPNE3/branches/ebihara_term/apps/pc_frontend/modules/community/templates/joinlistSuccess.php

    r10906 r12915  
    11<?php
    22$options = array(
    3   'title' => __('Communities List'),
     3  'title' => __('%community% List', array('%community%' => $op_term['community']->titleize())),
    44  'list' => $pager->getResults(),
    55  'crownIds' => $sf_data->getRaw('crownIds'),
  • OpenPNE3/branches/ebihara_term/apps/pc_frontend/modules/community/templates/memberListSuccess.php

    r10906 r12915  
    11<?php
    22$options = array(
    3   'title' => __('Community Members'),
     3  'title' => __('%community% Members', array('%community%' => $op_term['community']->titleize())),
    44  'list' => $pager->getResults(),
    55  'crownIds' => $sf_data->getRaw('crownIds'),
  • OpenPNE3/branches/ebihara_term/apps/pc_frontend/modules/community/templates/quitError.php

    r12767 r12915  
    11<?php if ($isAdmin): ?>
    2 <?php $body =  __('The administrator doesn\'t leave the community.') ?>
     2<?php $body =  __('The administrator doesn\'t leave the %community%.', array('%community%' => $op_term['community'])) ?>
    33<?php else: ?>
    4 <?php $body =  __('You haven\'t joined this community yet.') ?>
     4<?php $body =  __('You haven\'t joined this %community% yet.', array('%community%' => $op_term['community'])) ?>
    55<?php endif; ?>
    66<?php op_include_box('error', $body, array('title' => __('Errors'))) ?>
  • OpenPNE3/branches/ebihara_term/apps/pc_frontend/modules/community/templates/searchSuccess.php

    r12912 r12915  
    11<?php
    22$options = array(
    3   'title'    => __('Search Communities'),
     3  'title'    => __('Search %community%', array('%community%' => $op_term['community']->titleize()->pluralize())),
    44  'url'      => url_for('community/search'),
    55  'button'   => __('Search'),
     
    1818{
    1919  $list[$key] = array();
    20   $list[$key][__('Community Name')] = $community->getName();
     20  $list[$key][__('%community% Name', array('%community%' => $op_term['community']->titleize()))] = $community->getName();
    2121  $list[$key][__('Count of Members')] = $community->countCommunityMembers();
    2222  $list[$key][__('Description')] = $community->getConfig('description');
     
    3434?>
    3535<?php else: ?>
    36 <?php op_include_box('searchCommunityResult', __('Your search queries did not match any communities.'), array('title' => __('Search Results'))) ?>
     36<?php op_include_box('searchCommunityResult', __('Your search queries did not match any %community%.', array('%community%' => $op_term['community']->pluralize())), array('title' => __('Search Results'))) ?>
    3737<?php endif; ?>
  • OpenPNE3/branches/ebihara_term/apps/pc_frontend/modules/default/templates/_searchBox.php

    r10593 r12915  
    33  'items' => array(
    44    'member' => __('Member'),
    5     'community' => __('Community'),
     5    'community' => __('%community%', array('%community%' => $op_term['community']->titleize())),
    66  ),
    77)) ?>
  • OpenPNE3/branches/ebihara_term/apps/pc_frontend/modules/friend/templates/_cautionAboutFriendPre.php

    r11697 r12915  
    33<?php
    44$member = $value->getMemberRelatedByMemberIdFrom();
    5 echo __('%1% sent my friends request to you!', array('%1%' => link_to($member->getName(), 'member/profile?id='.$member->getId()))) ?>
     5echo __('%1% sent %friend% request to you!', array(
     6  '%1%' => link_to($member->getName(), 'member/profile?id='.$member->getId()),
     7  '%friend%' => $op_term['friend'],
     8)) ?>
    69&nbsp;
    710<?php echo link_to(__('Permits'), 'friend/linkAccept?id='.$member->getId()) ?>
  • OpenPNE3/branches/ebihara_term/apps/pc_frontend/modules/friend/templates/_friendListBox.php

    r10593 r12915  
    11<?php
    22$options = array(
    3   'title' => __('Friends List'),
     3  'title' => __('%friend% List', array('%friend%' => $op_term['friend']->titleize())),
    44  'list' => $friends,
    55  'link_to' => 'member/profile?id=',
     
    1212if ($member->getId() == $sf_user->getMember()->getId())
    1313{
    14   $options['moreInfo'][] = link_to(__('My Friends Setting'), 'friend/manage');
     14  $options['moreInfo'][] = link_to(__('%my_friend% Setting', array(
     15    '%my_friend%' => $op_term['my_friend']->titleize()->pluralize(),
     16  )), 'friend/manage');
    1517}
    1618
  • OpenPNE3/branches/ebihara_term/apps/pc_frontend/modules/friend/templates/listError.php

    r10445 r12915  
    1 <?php op_include_box('noFriend', __('You don\'t have any friends.'), array('title' => __('Friend List'))) ?>
     1<?php op_include_box('noFriend',
     2  __('You don\'t have any %friend%.', array(
     3    '%friend%' => $op_term['friend']->pluralize(),
     4  )),
     5  array('title' => __('%friend% List', array(
     6    '%friend%' => $op_term['friend']->titleize(),
     7  )))) ?>
    28
    39<?php use_helper('Javascript') ?>
  • OpenPNE3/branches/ebihara_term/apps/pc_frontend/modules/friend/templates/listSuccess.php

    r10371 r12915  
    11<?php
    22$options = array(
    3   'title' => __('Friends List'),
     3  'title' => __('%friend% List', array('%friend%' => $op_term['friend']->titleize())),
    44  'list' => $pager->getResults(),
    55  'link_to' => 'member/profile?id=',
  • OpenPNE3/branches/ebihara_term/apps/pc_frontend/modules/friend/templates/manageSuccess.php

    r12667 r12915  
    44  'item_url' => 'obj_member_profile',
    55  'image_filename_method' => 'getImageFilename',
    6   'title' => __('My Friends Setting'),
     6  'title' => __('%my_friend% Setting', array(
     7    '%my_friend%' => $op_term['my_friend']->titleize()->pluralize(),
     8  )),
    79  'menus' => array(
    810    array('text' => __('Delete from my friends.'), 'url' => 'obj_friend_unlink', 'class' => 'delete'),
  • OpenPNE3/branches/ebihara_term/apps/pc_frontend/modules/member/templates/_profileListBox.php

    r12704 r12915  
    3131  if ($member->getId() == $sf_user->getMemberId() && $profile->getPublicFlag() == ProfileTable::PUBLIC_FLAG_FRIEND)
    3232  {
    33     $profileValue .= ' ('.__('Only Open to My Friends').')';
     33    $profileValue .= ' ('.__('Only Open to %my_friend%', array(
     34      '%my_friend%' => $op_term['my_friend']->titleize()->pluralize(),
     35    )).')';
    3436  }
    3537  $list[$caption] = $profileValue;
  • OpenPNE3/branches/ebihara_term/apps/pc_frontend/modules/member/templates/profileSuccess.php

    r12814 r12915  
    5656<?php if (!$relation->isFriend() && opConfig::get('enable_friend_link')): ?>
    5757<?php ob_start() ?>
    58 <p><?php echo __('If %1% is your friend, let us add to friends it!', array('%1%' => $member->getName())) ?><br />
     58<p><?php echo __('If %1% is your friend, let us add to %my_friend% it!', array('%1%' => $member->getName(), '%my_friend%' => $op_term['my_friend']->pluralize())) ?><br />
    5959<?php echo link_to(__('Add friends'), 'friend/link?id='.$member->getId()) ?>
    6060</p>
  • OpenPNE3/branches/ebihara_term/lib/action/sfOpenPNEFriendAction.class.php

    r12761 r12915  
    6666    if ($this->relation->isFriend())
    6767    {
    68       $this->getUser()->setFlash('error', 'This member already belongs to my friends.');
     68      $this->getUser()->setFlash('error', 'This member already belongs to %my_friend%.');
     69      $this->getUser()->setFlash('error_params', array('%my_friend%' => Doctrine::getTable('SnsTerm')->get('my_friend')->pluralize()));
    6970      $this->redirect('member/profile?id='.$this->id);
    7071    }
    7172    if ($this->relation->isFriendPreFrom())
    7273    {
    73       $this->getUser()->setFlash('error', 'My friends request is already sent.');
     74      $this->getUser()->setFlash('error', '%friend% request is already sent.');
     75      $this->getUser()->setFlash('error_params', array('%friend%' => Doctrine::getTable('SnsTerm')->get('friend')->fronting()));
    7476      $this->redirect('member/profile?id='.$this->id);
    7577    }
     
    8284      if ($this->form->isValid())
    8385      {
    84         $this->getUser()->setFlash('notice', 'You have requested friend link.');
     86        $this->getUser()->setFlash('notice', 'You have requested %friend% link.');
     87        $this->getUser()->setFlash('notice_params', array('%friend%' => Doctrine::getTable('SnsTerm')->get('friend')));
    8588        $this->redirectToHomeIfIdIsNotValid();
    8689        $this->relation->setFriendPre();
     
    141144    if (!$this->relation->isFriend())
    142145    {
    143       $this->getUser()->setFlash('error', 'This member is not your friend.');
     146      $this->getUser()->setFlash('error', 'This member is not your %friend%.');
     147      $this->getUser()->setFlash('error_params', array('%friend%' => Doctrine::getTable('SnsTerm')->get('friend')));
    144148      $this->redirect('friend/manage');
    145149    }
  • OpenPNE3/branches/ebihara_term/lib/filter/sfOpenPNEExecutionFilter.class.php

    r12266 r12915  
    3434      'actionInstance' => $actionInstance,
    3535    )));
     36
     37    Doctrine::getTable('SnsTerm')->configure(sfContext::getInstance()->getUser()->getCulture(), sfConfig::get('sf_app'));
    3638
    3739    try
Note: See TracChangeset for help on using the changeset viewer.