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

Changeset 10689


Ignore:
Timestamp:
Feb 8, 2009, 3:28:41 PM (12 years ago)
Author:
nagasawa
Message:

#3289:fixed invite message and message form

Location:
OpenPNE3/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE3/trunk/apps/mobile_frontend/i18n/messages.ja.xml

    r10679 r10689  
    295295        <target>メッセージ(任意)</target>
    296296      </trans-unit>
    297      </body>
     297      <trans-unit id="">
     298        <source>Hello! This is information from %1%.</source>
     299        <target>こんにちは!%1% からのお知らせです。</target>
     300      </trans-unit>
     301      <trans-unit id="">
     302        <source>%1% is inviting in %2% you.</source>
     303        <target>%1% があなたを%2% へ招待しています。</target>
     304      </trans-unit>
     305      <trans-unit id="">
     306        <source>---------- The message to you from &lt; %1% &gt; ----------</source>
     307        <target>---------- &lt; %1% &gt; からあなたへのメッセージ ----------</target>
     308      </trans-unit>
     309      <trans-unit id="">
     310        <source>---------------------------------------------------</source>
     311        <target>---------------------------------------------------</target>
     312      </trans-unit>
     313      <trans-unit id="">
     314        <source>If you register(free) of member by the following URL,%br%you can participate in %1%.</source>
     315        <target>下記のURLから、会員登録(無料)をおこなうと、%br%%1% に参加できます。</target>
     316      </trans-unit>
     317      <trans-unit id="">
     318        <source>* Participate in %1%</source>
     319        <target>■ %1% に参加する</target>
     320      </trans-unit>
     321    </body>
    298322  </file>
    299323</xliff>
  • OpenPNE3/trunk/apps/mobile_frontend/templates/_requestRegisterURLMail.php

    r10634 r10689  
     1<?php $sns_name = $op_config['sns_name'] ?>
     2<?php echo __('Hello! This is information from %1%.', array('%1%' => $sns_name)) ?>
     3
     4<?php if (isset($name)): ?>
     5
     6<?php echo __('%1% is inviting in %2% you.', array('%1%' => $name, '%2%' => $sns_name)) ?>
     7
     8<?php if (strlen($message)): ?>
     9
     10<?php echo __('---------- The message to you from < %1% > ----------', array('%1%' => $name)) ?>
     11
     12
     13<?php echo __('---------------------------------------------------') ?>
     14
     15
    116<?php echo $message ?>
    217
    318
    4 <?php echo __('Click following URL, please. You can register in %1%.', array('%1%' => $op_config['sns_name'])) ?>
     19<?php echo __('---------------------------------------------------') ?>
     20
     21<?php endif ?>
     22<?php endif ?>
     23
     24<?php echo __('If you register(free) of member by the following URL,%br%you can participate in %1%.', array('%1%' => $sns_name, '%br%' => "\n")) ?>
     25
     26
     27
     28<?php echo __('* Participate in %1%', array('%1%' => $sns_name)) ?>
    529
    630<?php if ($isMobile) : ?>
  • OpenPNE3/trunk/apps/pc_frontend/i18n/messages.ja.xml

    r10679 r10689  
    479479        <target>Y年m月d日</target>
    480480      </trans-unit>
     481      <trans-unit id="">
     482        <source>Hello! This is information from %1%.</source>
     483        <target>こんにちは!%1% からのお知らせです。</target>
     484      </trans-unit>
     485      <trans-unit id="">
     486        <source>%1% is inviting in %2% you.</source>
     487        <target>%1% があなたを%2% へ招待しています。</target>
     488      </trans-unit>
     489      <trans-unit id="">
     490        <source>---------- The message to you from &lt; %1% &gt; ----------</source>
     491        <target>---------- &lt; %1% &gt; からあなたへのメッセージ ----------</target>
     492      </trans-unit>
     493      <trans-unit id="">
     494        <source>---------------------------------------------------</source>
     495        <target>---------------------------------------------------</target>
     496      </trans-unit>
     497      <trans-unit id="">
     498        <source>If you register(free) of member by the following URL,%br%you can participate in %1%.</source>
     499        <target>下記のURLから、会員登録(無料)をおこなうと、%br%%1% に参加できます。</target>
     500      </trans-unit>
     501      <trans-unit id="">
     502        <source>* Participate in %1%</source>
     503        <target>■ %1% に参加する</target>
     504      </trans-unit>
    481505    </body>
    482506  </file>
  • OpenPNE3/trunk/apps/pc_frontend/templates/_requestRegisterURLMail.php

    r10634 r10689  
     1<?php $sns_name = $op_config['sns_name'] ?>
     2<?php echo __('Hello! This is information from %1%.', array('%1%' => $sns_name)) ?>
     3
     4<?php if (isset($name)): ?>
     5
     6<?php echo __('%1% is inviting in %2% you.', array('%1%' => $name, '%2%' => $sns_name)) ?>
     7
     8<?php if (strlen($message)): ?>
     9
     10<?php echo __('---------- The message to you from < %1% > ----------', array('%1%' => $name)) ?>
     11
     12
     13<?php echo __('---------------------------------------------------') ?>
     14
    115<?php echo $message ?>
    216
    317
    4 <?php echo __('Click following URL, please. You can register in %1%.', array('%1%' => $op_config['sns_name'])) ?>
     18<?php echo __('---------------------------------------------------') ?>
     19
     20<?php endif ?>
     21<?php endif ?>
     22
     23<?php echo __('If you register(free) of member by the following URL,%br%you can participate in %1%.', array('%1%' => $sns_name, '%br%' => "\n")) ?>
     24
     25
     26
     27<?php echo __('* Participate in %1%', array('%1%' => $sns_name)) ?>
    528
    629<?php if ($isMobile) : ?>
  • OpenPNE3/trunk/lib/action/sfOpenPNEMemberAction.class.php

    r10675 r10689  
    255255    }
    256256
    257     $this->form = new InviteForm();
     257    $this->form = new InviteForm(null, array('invited' => true));
    258258    $this->form->setOption('is_link', true);
    259259    if ($request->isMethod('post'))
  • OpenPNE3/trunk/lib/form/InviteForm.class.php

    r10675 r10689  
    2323    $this->setValidator('mail_address', new sfValidatorPass());
    2424
    25     $this->setWidget('message', new sfWidgetFormTextarea());
    26     $this->setValidator('message', new sfValidatorPass());
    27     $this->widgetSchema->setLabel('message', 'Message(Arbitrary)');
     25    if ($this->getOption('invited'))
     26    {
     27      $this->setWidget('message', new sfWidgetFormTextarea());
     28      $this->setValidator('message', new sfValidatorPass());
     29      $this->widgetSchema->setLabel('message', 'Message(Arbitrary)');
     30    }
    2831
    2932    $this->validatorSchema->setPostValidator(new sfValidatorCallback(array(
     
    9093      'authMode' => $authMode,
    9194      'isMobile' => opToolkit::isMobileEmailAddress($to),
    92       'message'  => $this->getValue('message')
     95      'name'     => $this->getOption('invited') ? sfContext::getInstance()->getUser()->getMember()->getName() : null,
     96      'message'  => $this->getOption('invited') ? $this->getValue('message') : null
    9397    );
    9498
    9599    $mail = new sfOpenPNEMailSend();
    96     $mail->setSubject(opConfig::get('sns_name').'招待状');
     100    $mail->setSubject(opConfig::get('sns_name') . '$B>7BT>u(B');
    97101    $mail->setTemplate('global/requestRegisterURLMail', $param);
    98102    $mail->send($to, opConfig::get('admin_mail_address'));
Note: See TracChangeset for help on using the changeset viewer.