Changeset 20359

Timestamp:

10/01/08 13:27:51 (3 months ago)

Author:

gen

Message:

やくみつる

Location:

events/phpframework/akelos/trunk

Files:

• app/controllers/help_controller.php (modified) (1 diff)
• app/installers/database_installer.php (deleted)
• app/locales/help (added)
• app/locales/help/en.php (added)
• app/locales/help/ja.php (added)
• app/views/help/_what_is_phwittr.tpl (modified) (1 diff)
• app/views/help/what.tpl (modified) (3 diffs)
• app/views/layouts/help.tpl (modified) (1 diff)
• config/boot.php (modified) (1 diff)
• config/config.php (modified) (1 diff)
• config/locales/en.php (modified) (1 diff)
• config/locales/ja.php (modified) (1 diff)
• script/migrate_reset (modified) (1 diff)
• tmp/installer_versions/development_database_version.txt (deleted)
• tmp/views/app/views/help/compiled/_what_is_phwittr.tpl.php (modified) (1 diff)
• tmp/views/app/views/help/compiled/what.tpl.php (modified) (3 diffs)
• tmp/views/app/views/layouts/compiled/help.tpl.php (modified) (1 diff)

events/phpframework/akelos/trunk/app/controllers/help_controller.php

@@ -3 +3 @@
 class HelpController extends ApplicationController
 {
-    public $model = null;
-    public $models = array('Endoser');
+    public $model = 'Introduction';
 
-    //toppage
     public function what()
     {

events/phpframework/akelos/trunk/app/views/help/_what_is_phwittr.tpl

@@ -4 +4 @@
   <li>
     <blockquote>
-      <p>{introduction.body}</p>
+      <p>{_introduction.body}</p>
     </blockquote>
-    <cite class="vcard">{introduction.author}</cite>
+    <cite class="vcard">{_introduction.author}</cite>
   </li>
   {end}

events/phpframework/akelos/trunk/app/views/help/what.tpl

@@ -6 +6 @@
         <input name="authenticity_token" type="hidden" value="e808747513e58ff7ff95fd3037ea6d2dbd6203bf" />
       </div>
-      <!--
       <select name="lang" onchange="$('lf').submit();">
         <option value="" selected="selected">Select Language ...&nbsp;</option>
@@ -12 +11 @@
         <option value="ja">日本語</option>
       </select>
-      -->
     </form>
   </div>
@@ -21 +19 @@
     <div class="wrapper">
       <div class="intro">
-        <h2>Phwittrとは？</h2>
+        <h2>_{What is Phwittr?}</h2>
         <ul id="menu">
-          <li class="act"><a href="/">なに？</a></li>
-          <li><a href="/help/why">なぜ？</a></li>
-          <li><a href="/help/how">どうやって？</a></li>
+          <li class="act"><a href="/">_{What?}</a></li>
+          <li><a href="/help/why">_{Why?}</a></li>
+          <li><a href="/help/how">_{How?}</a></li>
         </ul>
         <%= image_tag 'tour_1.gif', :alt => 'What is Phwittr?', :class => 'tour', :height => 154, :width => 508 %> 
-        <p class="teaser">Twitterは<strong>「いまなにしてる？」</strong>という質問に短い文章で答えることによって、友だちや家族、職場の同僚とつながり合うサービスです。</p>
-        <p><a id='signup_submit' class="join" href="/signup">Phwittrに登録する</a></p>
+        _{<p class="teaser">Phwittr is a service for friends, family, and co–workers to communicate and stay connected through the exchange of quick, frequent answers to one simple question: <strong> What are you doing?</strong></p>}
+        <p><a id='signup_submit' class="join" href="/signup">_{Get Started-join!}</a></p>
       </div>
       <hr />
-      <p><%= link_to "#{image_tag('arrow_on_red.gif')} ビデオを観る!", image_path('nomore.jpg'), :id => 'videobutton' %></p>
+      <p><%= link_to "#{image_tag('arrow_on_red.gif')} #{_('Watch a video!')}", image_path('nomore.jpg'), :id => 'videobutton' %></p>
       <form method="post" id="signin" action="https://twitter.com/sessions">
         <fieldset>
-          <legend>ここからログイン</legend>
+          <legend>_{Please sign in}</legend>
           <p>
-            <label class="inside" tabindex="1" for="username">ユーザー名かメールアドレス</label>
+            <label class="inside" tabindex="1" for="username">_{user name or email address:}</label>
             <input type="text" id="username" name="session[username_or_email]" value="" title="username"  />
           </p>
           <p>
-            <label class="inside" tabindex="2" for="password">パスワード</label>
+            <label class="inside" tabindex="2" for="password">_{Password}</label>
             <input type="password" id="password" name="session[password]" value="" title="password" />
           </p>
           <p class="remember">
             <input type="checkbox" id="remember" name="remember_me" value="1" />
-            <label for="remember">次回から入力を省略する</label>
+            <label for="remember">_{Remember me}</label>
           </p>
           <p class="submit">
-            <input type="submit" id="signin_submit" value="ログイン &raquo;" />
+            <input type="submit" id="signin_submit" value="_{Sign In} &raquo;" />
           </p>
-          <p class="forgot">パスワードを忘れた？<br/> <a id="resend_password_link" href="/account/resend_password">ここをクリック</a>.</p>
-          <p class="complete">インスタントメッセンジャー(IM)ですでにTwitterを使っていますか？ <a href="/account/complete">ここをクリック</a></p>
+          <p class="forgot">_{Forgot password?} <a id="resend_password_link" href="/account/resend_password">_{Click here.}</a>.</p>
         </fieldset>
       </form>

events/phpframework/akelos/trunk/app/views/layouts/help.tpl

@@ -3 +3 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta http-equiv="Content-Language" content="en-us" />
+  <meta http-equiv="Content-Language" content="en" />
   <meta name="viewport" content="width=780" />
-  <meta name="verify-v1" content="4FTTxY4uvo0RZTMQqIyhh18HsepyJOctQ+XTOu1zsfE=" />
-  <title>Phittr: What are you doing?</title>
+  <title>_{Phwittr: What are you doing?}</title>
   <link rel="shortcut icon" href="" type="image/x-icon" />
   <%= stylesheet_link_tag 'default' %>
-  <link href="http://assets2.twitter.com/stylesheets/lightwindow.css?1222396506" media="screen, projection" rel="stylesheet" type="text/css" />
   <style type="text/css">
     body {background: #9ae4e8 url(<%= image_path 'bg.gif' %>) fixed no-repeat top left; }
-    div.content-bubble-arrow { margin-top: 6px; padding-top: 11px; background: url(http://static.twitter.com/images/arr2.gif) no-repeat 25px 0px; }
+    div.content-bubble-arrow { margin-top: 6px; padding-top: 11px; background: url(<%= image_path 'arr2.gif' %>) no-repeat 25px 0px; }
   </style>
 </head>

events/phpframework/akelos/trunk/config/boot.php

@@ -23 +23 @@
 require_once(AK_LIB_DIR.DS.'constants.php');
 
+require_once(AK_LIB_DIR.DS.'Ak.php');
+Ak::db()->Execute('SET NAMES utf8;');
+
 ?>

events/phpframework/akelos/trunk/config/config.php

@@ -45 +45 @@
 define('AK_PUBLIC_LOCALES', 'ja,en');
 
+defined('AK_FRAMEWORK_DIR') ? null : define('AK_FRAMEWORK_DIR', dirname(dirname(__FILE__)));
+
 // The web configuration wizard could not detect if you have mod_rewrite enabled. 
 // If that is the case, you should uncomment the next line line for better performance. 

events/phpframework/akelos/trunk/config/locales/en.php

@@ -311 +311 @@
 $dictionary['File %file exists.'] = 'File %file exists.';
 
+// 2008-10-01 12:36:06
+
+
+$dictionary['methods'] = 'methods';
+
 
 ?>

events/phpframework/akelos/trunk/config/locales/ja.php

@@ -309 +309 @@
 $dictionary['File %file exists.'] = 'File %file exists.';
 
+// 2008-10-01 12:36:06
+
+
+$dictionary['methods'] = 'methods';
+
 
 ?>

events/phpframework/akelos/trunk/script/migrate_reset

@@ -6 +6 @@
     sed -e 's/_installer\.php//g'
 )
-resets=''
-construct=''
-destruct=''
+
 while read line
 do
-    if [ "$line" = "database" ]
-        $construct << 
-    then
-    else
-        echo $line
-    fi
+    script/migrate $line uninstall
+    script/migrate $line install
 done <<END
 $installers

events/phpframework/akelos/trunk/tmp/views/app/views/help/compiled/_what_is_phwittr.tpl.php

@@ -2 +2 @@
 <ul>
   <?php 
- empty($endosers) ? null : $endoser_loop_counter = 0;
- empty($endosers) ? null : $endosers_available = count($endosers);
- if(!empty($endosers))
-     foreach ($endosers as $endoser_loop_key=>$endoser){
-         $endoser_loop_counter++;
-         $endoser_is_first = $endoser_loop_counter === 1;
-         $endoser_is_last = $endoser_loop_counter === $endosers_available;
-         $endoser_odd_position = $endoser_loop_counter%2;
+ empty($introductions) ? null : $introduction_loop_counter = 0;
+ empty($introductions) ? null : $introductions_available = count($introductions);
+ if(!empty($introductions))
+     foreach ($introductions as $introduction_loop_key=>$introduction){
+         $introduction_loop_counter++;
+         $introduction_is_first = $introduction_loop_counter === 1;
+         $introduction_is_last = $introduction_loop_counter === $introductions_available;
+         $introduction_odd_position = $introduction_loop_counter%2;
 ?>
   <li>
     <blockquote>
-      <p><?php echo $endoser->body; ?></p>
+      <p><?php echo empty($introduction->body) || is_object($introduction->body) ? '' : $text_helper->translate($introduction->body); ?></p>
     </blockquote>
-    <cite class="vcard"><?php echo $endoser->author; ?></cite>
+    <cite class="vcard"><?php echo empty($introduction->author) || is_object($introduction->author) ? '' : $text_helper->translate($introduction->author); ?></cite>
   </li>
   <?php } ?>

events/phpframework/akelos/trunk/tmp/views/app/views/help/compiled/what.tpl.php

@@ -6 +6 @@
         <input name="authenticity_token" type="hidden" value="e808747513e58ff7ff95fd3037ea6d2dbd6203bf" />
       </div>
-      <!--
       <select name="lang" onchange="$('lf').submit();">
         <option value="" selected="selected">Select Language ...&nbsp;</option>
@@ -12 +11 @@
         <option value="ja">日本語</option>
       </select>
-      -->
     </form>
   </div>
@@ -21 +19 @@
     <div class="wrapper">
       <div class="intro">
-        <h2>Phwittrとは？</h2>
+        <h2><?php echo $text_helper->translate('What is Phwittr?', array()); ?></h2>
         <ul id="menu">
-          <li class="act"><a href="/">なに？</a></li>
-          <li><a href="/help/why">なぜ？</a></li>
-          <li><a href="/help/how">どうやって？</a></li>
+          <li class="act"><a href="/"><?php echo $text_helper->translate('What?', array()); ?></a></li>
+          <li><a href="/help/why"><?php echo $text_helper->translate('Why?', array()); ?></a></li>
+          <li><a href="/help/how"><?php echo $text_helper->translate('How?', array()); ?></a></li>
         </ul>
         <?php echo $asset_tag_helper->image_tag('tour_1.gif', array('alt' => 'What is Phwittr?', 'class' => 'tour', 'height' => 154, 'width' => 508)); ?> 
-        <p class="teaser">Twitterは<strong>「いまなにしてる？」</strong>という質問に短い文章で答えることによって、友だちや家族、職場の同僚とつながり合うサービスです。</p>
-        <p><a id='signup_submit' class="join" href="/signup">Phwittrに登録する</a></p>
+        <?php echo $text_helper->translate('<p class="teaser">Phwittr is a service for friends, family, and co–workers to communicate and stay connected through the exchange of quick, frequent answers to one simple question: <strong> What are you doing?</strong></p>', array()); ?>
+        <p><a id='signup_submit' class="join" href="/signup"><?php echo $text_helper->translate('Get Started-join!', array()); ?></a></p>
       </div>
       <hr />
-      <p><?php echo $url_helper->link_to("".$asset_tag_helper->image_tag('arrow_on_red.gif')." ビデオを観る!", $asset_tag_helper->image_path('nomore.jpg'), array('id' => 'videobutton')); ?></p>
+      <p><?php echo $url_helper->link_to("".$asset_tag_helper->image_tag('arrow_on_red.gif')." ".$text_helper->translate('Watch a video!')."", $asset_tag_helper->image_path('nomore.jpg'), array('id' => 'videobutton')); ?></p>
       <form method="post" id="signin" action="https://twitter.com/sessions">
         <fieldset>
-          <legend>ここからログイン</legend>
+          <legend><?php echo $text_helper->translate('Please sign in', array()); ?></legend>
           <p>
-            <label class="inside" tabindex="1" for="username">ユーザー名かメールアドレス</label>
+            <label class="inside" tabindex="1" for="username"><?php echo $text_helper->translate('user name or email address:', array()); ?></label>
             <input type="text" id="username" name="session[username_or_email]" value="" title="username"  />
           </p>
           <p>
-            <label class="inside" tabindex="2" for="password">パスワード</label>
+            <label class="inside" tabindex="2" for="password"><?php echo $text_helper->translate('Password', array()); ?></label>
             <input type="password" id="password" name="session[password]" value="" title="password" />
           </p>
           <p class="remember">
             <input type="checkbox" id="remember" name="remember_me" value="1" />
-            <label for="remember">次回から入力を省略する</label>
+            <label for="remember"><?php echo $text_helper->translate('Remember me', array()); ?></label>
           </p>
           <p class="submit">
-            <input type="submit" id="signin_submit" value="ログイン &raquo;" />
+            <input type="submit" id="signin_submit" value="<?php echo $text_helper->translate('Sign In', array()); ?> &raquo;" />
           </p>
-          <p class="forgot">パスワードを忘れた？<br/> <a id="resend_password_link" href="/account/resend_password">ここをクリック</a>.</p>
-          <p class="complete">インスタントメッセンジャー(IM)ですでにTwitterを使っていますか？ <a href="/account/complete">ここをクリック</a></p>
+          <p class="forgot"><?php echo $text_helper->translate('Forgot password?', array()); ?> <a id="resend_password_link" href="/account/resend_password"><?php echo $text_helper->translate('Click here.', array()); ?></a>.</p>
         </fieldset>
       </form>

events/phpframework/akelos/trunk/tmp/views/app/views/layouts/compiled/help.tpl.php

@@ -3 +3 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta http-equiv="Content-Language" content="en-us" />
+  <meta http-equiv="Content-Language" content="en" />
   <meta name="viewport" content="width=780" />
-  <meta name="verify-v1" content="4FTTxY4uvo0RZTMQqIyhh18HsepyJOctQ+XTOu1zsfE=" />
-  <title>Phittr: What are you doing?</title>
+  <title><?php echo $text_helper->translate('Phwittr: What are you doing?', array()); ?></title>
   <link rel="shortcut icon" href="" type="image/x-icon" />
   <?php echo $asset_tag_helper->stylesheet_link_tag('default'); ?>
-  <link href="http://assets2.twitter.com/stylesheets/lightwindow.css?1222396506" media="screen, projection" rel="stylesheet" type="text/css" />
   <style type="text/css">
     body {background: #9ae4e8 url(<?php echo $asset_tag_helper->image_path('bg.gif'); ?>) fixed no-repeat top left; }
-    div.content-bubble-arrow { margin-top: 6px; padding-top: 11px; background: url(http://static.twitter.com/images/arr2.gif) no-repeat 25px 0px; }
+    div.content-bubble-arrow { margin-top: 6px; padding-top: 11px; background: url(<?php echo $asset_tag_helper->image_path('arr2.gif'); ?>) no-repeat 25px 0px; }
   </style>
 </head>