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

Changeset 12768


Ignore:
Timestamp:
Aug 27, 2009, 7:31:21 PM (13 years ago)
Author:
ShogoKawahara
Message:

#4291:fixed message in the template of community/join and community/quit (3.0.x)

Location:
OpenPNE3/branches/STABLE/3.0.x
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE3/branches/STABLE/3.0.x/apps/mobile_frontend/i18n/messages.ja.xml

    r12750 r12768  
    164164      </trans-unit>
    165165      <trans-unit id="">
    166         <source>You are already joined in this community.</source>
     166        <source>You are already joined to this community.</source>
    167167        <target>既にコミュニティに参加済みです。</target>
    168168      </trans-unit>
    169169      <trans-unit id="">
    170         <source>You don\'t join this community yet.</source>
     170        <source>You have already sent the participation request to this community.</source>
     171        <target>既にコミュニティに参加申請済みです。</target>
     172      </trans-unit>
     173      <trans-unit id="">
     174        <source>The administrator doesn't leave the community.</source>
     175        <target>コミュニティ管理者は退会することができません。</target>
     176      </trans-unit>
     177      <trans-unit id="">
     178        <source>You don't join this community yet.</source>
    171179        <target>コミュニティに参加していません。</target>
    172180      </trans-unit>
  • OpenPNE3/branches/STABLE/3.0.x/apps/mobile_frontend/modules/community/templates/joinError.php

    r10304 r12768  
    11<?php op_mobile_page_title(__('Error')) ?>
    2 <?php echo __('You are already joined in this community.') ?>
     2<?php if ($isCommunityMember): ?>
     3<font color="<?php echo $op_color['core_color_22'] ?>"><?php echo __('You are already joined to this community.') ?></font>
     4<?php else: ?>
     5<font color="<?php echo $op_color['core_color_22'] ?>"><?php echo __('You have already sent the participation request to this community.') ?></font>
     6<?php endif; ?>
  • OpenPNE3/branches/STABLE/3.0.x/apps/mobile_frontend/modules/community/templates/quitError.php

    r10309 r12768  
    11<?php op_mobile_page_title(__('Error')) ?>
    2 <?php echo __('You don\'t join this community yet.');
     2<?php if ($isAdmin): ?>
     3<font color="<?php echo $op_color['core_color_22'] ?>"><?php echo __('The administrator doesn\'t leave the community.') ?></font>
     4<?php else: ?>
     5<font color="<?php echo $op_color['core_color_22'] ?>"><?php echo __('You don\'t join this community yet.') ?></font>
     6<?php endif; ?>
  • OpenPNE3/branches/STABLE/3.0.x/apps/pc_frontend/i18n/messages.ja.xml

    r12750 r12768  
    6868      </trans-unit>
    6969      <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="">
    7074        <source>Errors</source>
    7175        <target>エラー</target>
  • OpenPNE3/branches/STABLE/3.0.x/apps/pc_frontend/modules/community/templates/joinError.php

    r10545 r12768  
    1 <?php op_include_box('alreadyJoinCommunity', __('You are already joined to this community.'), array('title' => __('Error'))) ?>
     1<?php if ($isCommunityMember): ?>
     2<?php $body =  __('You are already joined to this community.') ?>
     3<?php else: ?>
     4<?php $body =  __('You have already sent the participation request to this community.') ?>
     5<?php endif; ?>
     6<?php op_include_box('error', $body, array('title' => __('Errors'))) ?>
    27
    38<?php use_helper('Javascript') ?>
  • OpenPNE3/branches/STABLE/3.0.x/apps/pc_frontend/modules/community/templates/quitError.php

    r10445 r12768  
    11<?php if ($isAdmin): ?>
    2 <?php op_include_box('admin', __('The administrator doesn\'t leave the community.'), array('title' => __('Errors'))) ?>
     2<?php $body =  __('The administrator doesn\'t leave the community.') ?>
    33<?php else: ?>
    4 <?php op_include_box('nonAdmin', __('You haven\'t joined this community yet.'), array('title' => __('Errors'))) ?>
     4<?php $body =  __('You haven\'t joined this community yet.') ?>
    55<?php endif; ?>
     6<?php op_include_box('error', $body, array('title' => __('Errors'))) ?>
    67
    78<?php use_helper('Javascript') ?>
  • OpenPNE3/branches/STABLE/3.0.x/lib/action/sfOpenPNECommunityAction.class.php

    r12750 r12768  
    192192  public function executeJoin($request)
    193193  {
    194     if ($this->isCommunityMember || $this->isCommunityPreMember) {
    195       return sfView::ERROR;
    196     }
    197 
    198194    $community = CommunityPeer::retrieveByPk($this->id);
    199195    $this->forward404Unless($community);
    200196
     197    if ($this->isCommunityMember || $this->isCommunityPreMember)
     198    {
     199      return sfView::ERROR;
     200    }
     201
    201202    CommunityMemberPeer::join($this->getUser()->getMemberId(), $this->id, $community->getConfig('register_poricy'));
    202     $this->redirect('community/home?id=' . $this->id);
     203    $this->redirect('community/home?id='.$this->id);
    203204  }
    204205
Note: See TracChangeset for help on using the changeset viewer.