Changeset 64 for trunk

Show
Ignore:
Timestamp:
12/23/05 09:56:18 (3 years ago)
Author:
fabien
Message:

day 23 modifications

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/frontend/config/settings.yml

    r57 r64  
    2828 
    2929    available:              on 
     30 
     31    standard_helpers:       Partial,Cache,Form,I18N 
     32 
     33    is_i18n:                on 
    3034 
    3135;    default_module:         default 
    …… 
    6569;    tidy:                   on 
    6670;     
    67 ;    is_i18n:                off 
    6871;    default_culture:        en 
    6972;     

  • trunk/frontend/lib/helper/AnswerHelper.php

    r55 r64  
    5353  use_helper('Javascript'); 
    5454 
    55   $text = '[report to moderator]'; 
     55  $text = '['.__('report to moderator').']'; 
    5656  if ($user->isAuthenticated()) 
    5757  { 
    …… 
    6060    { 
    6161      // already spam for this user 
    62       return '[reported as spam]'; 
     62      return '['.__('reported as spam').']'; 
    6363    } 
    6464    else 

  • trunk/frontend/lib/helper/GlobalHelper.php

    r38 r64  
    33function link_to_rss($name, $uri) 
    44{ 
    5   return link_to(image_tag('rss.gif', array('alt' => $name, 'title' => $name, 'align' => 'absmiddle')), $uri); 
     5  return link_to(image_tag('feed.gif', array('alt' => $name, 'title' => $name, 'align' => 'absmiddle')), $uri); 
    66} 
    77 

  • trunk/frontend/lib/helper/QuestionHelper.php

    r55 r64  
    2222  use_helper('Javascript'); 
    2323 
    24   $text = '[report to moderator]'; 
     24  $text = '['.__('report to moderator').']'; 
    2525  if ($user->isAuthenticated()) 
    2626  { 
    …… 
    2929    { 
    3030      // already spam for this user 
    31       return '[reported as spam]'; 
     31      return '['.__('reported as spam').']'; 
    3232    } 
    3333    else 

  • trunk/frontend/lib/helper/UserHelper.php

    r38 r64  
    1111    { 
    1212      // already interested 
    13       return 'interested!'; 
     13      return __('interested!'); 
    1414    } 
    1515    else 
    1616    { 
    1717      // didn't declare interest yet 
    18       return link_to_remote('interested?', array( 
     18      return link_to_remote(__('interested?'), array( 
    1919        'url'      => 'user/interested?id='.$question->getId(), 
    2020        'update'   => array('success' => 'block_'.$question->getId()), 
    …… 
    2626  else 
    2727  { 
    28     return link_to_login('interested?'); 
     28    return link_to_login(__('interested?')); 
    2929  } 
    3030} 
    …… 
    3434  if ($user->getNickname() == 'anonymous') 
    3535  { 
    36     return 'anonymous'; 
     36    return __('anonymous'); 
    3737  } 
    3838  else 

  • trunk/frontend/lib/myTagFilter.class.php

    r49 r64  
    4141        // add a custom stylesheet 
    4242        $request->setAttribute('app/tag_filter', $tag, 'helper/asset/auto/stylesheet'); 
     43 
     44        // is the tag a culture? 
     45        if (is_readable(SF_APP_I18N_DIR.'/global/messages.'.strtolower($tag).'.xml')) 
     46        { 
     47          $this->getContext()->getUser()->setCulture(strtolower($tag)); 
     48        } 
     49        else 
     50        { 
     51          $this->getContext()->getUser()->setCulture('en'); 
     52        } 
    4353      } 
    4454    } 

  • trunk/frontend/modules/administrator/templates/_user_options.php

    r55 r64  
    22<div class="options"> 
    33  <?php if ($subscriber->getDeletions()): ?> 
    4     [<strong><?php echo $subscriber->getDeletions() ?></strong> contributions removed] 
     4    [<?php echo __('%1% contributions removed', array('%1%' => $subscriber->getDeletions())) ?>] 
    55  <?php endif ?> 
    66 
    77  &nbsp; 
    88  <?php if ($subscriber->getIsModerator()): ?> 
    9     <?php echo link_to('[moderator -]', 'administrator/removeModerator?nickname='.$subscriber->getNickname()) ?> 
     9    <?php echo link_to('['.__('moderator').' -]', 'administrator/removeModerator?nickname='.$subscriber->getNickname()) ?> 
    1010  <?php else: ?> 
    11     <?php echo link_to('[moderator +]', 'administrator/promoteModerator?nickname='.$subscriber->getNickname()) ?> 
     11    <?php echo link_to('['.__('moderator').' +]', 'administrator/promoteModerator?nickname='.$subscriber->getNickname()) ?> 
    1212  <?php endif ?> 
    1313 
    1414  &nbsp; 
    1515  <?php if ($subscriber->getIsAdministrator()): ?> 
    16     <?php echo link_to('[administrator -]', 'administrator/removeAdministrator?nickname='.$subscriber->getNickname()) ?> 
     16    <?php echo link_to('['.__('administrator').' -]', 'administrator/removeAdministrator?nickname='.$subscriber->getNickname()) ?> 
    1717  <?php else: ?> 
    18     <?php echo link_to('[administrator +]', 'administrator/promoteAdministrator?nickname='.$subscriber->getNickname()) ?> 
     18    <?php echo link_to('['.__('administrator').' +]', 'administrator/promoteAdministrator?nickname='.$subscriber->getNickname()) ?> 
    1919  <?php endif ?> 
    2020 
    21   &nbsp;<?php echo link_to('[delete user]', 'administrator/deleteUser?nickname='.$subscriber->getNickname(), 'confirm=Are you sure you want to delete this user and all his contributions?') ?> 
     21  &nbsp;<?php echo link_to('['.__('delete user').']', 'administrator/deleteUser?nickname='.$subscriber->getNickname(), 'confirm='.__('Are you sure you want to delete this user and all his contributions?')) ?> 
    2222</div> 
    2323 

  • trunk/frontend/modules/answer/templates/_answer.php

    r55 r64  
    77<div class="answer_body"> 
    88  <?php echo $answer->getHtmlBody() ?> 
    9   <div class="subtitle" style="margin-top: -8px">answered by <?php echo link_to_profile($answer->getUser()) ?> on <?php echo format_date($answer->getCreatedAt(), 'f') ?></div> 
     9  <div class="subtitle" style="margin-top: -8px"><?php echo __('answered by %1% on %2%', array('%1%' => link_to_profile($answer->getUser()), '%2%' => format_date($answer->getCreatedAt(), 'f'))) ?></div> 
    1010  <div class="options" id="report_answer_<?php echo $answer->getId() ?>"> 
    1111    <?php echo link_to_report_answer($answer, $user) ?> 

  • trunk/frontend/modules/answer/templates/_list.php

    r38 r64  
    1818      <fieldset> 
    1919 
    20       <label for="author">author:</label> 
     20      <label for="author"><?php echo __('author:') ?></label> 
    2121      <div style="display: inline; float: left"> 
    2222      <?php if ($user->isAuthenticated()): ?> 
    2323        <?php echo $user->getNickname() ?> 
    2424      <?php else: ?> 
    25         <?php echo 'anonymous coward' ?> 
    26         <?php echo link_to_login('[login]') ?> 
     25        <?php echo __('anonymous coward') ?>&nbsp; 
     26        <?php echo link_to_login('['.__('login').']') ?> 
    2727      <?php endif ?> 
    2828      </div> 
    2929      <br class="clearleft" /> 
    3030 
    31       <label for="body">your answer:</label> 
     31      <label for="body"><?php echo __('your answer:') ?></label> 
    3232      <?php echo textarea_tag('body', $params->get('body'), 'size=40x10') ?> 
    3333      <br class="clearleft" /> 

  • trunk/frontend/modules/answer/templates/recentSuccess.php

    r38 r64  
    11<?php use_helpers('Date', 'Answer', 'Question') ?> 
    22 
    3 <h1>recent answers</h1> 
     3<h1><?php echo __('recent answers') ?></h1> 
    44 
    55<div id="answers"> 

  • trunk/frontend/modules/content/actions/actions.class.php

    r57 r64  
    1515    require_once('markdown.php'); 
    1616 
    17     $this->html = markdown(file_get_contents(SF_DATA_DIR.'/content/about.txt')); 
     17    $file = SF_DATA_DIR.'/content/about_'.$this->getUser()->getCulture().'.txt'; 
     18    if (!is_readable($file)) 
     19    { 
     20      $file = SF_DATA_DIR.'/content/about_en.txt'; 
     21    } 
     22 
     23    $this->html = markdown(file_get_contents($file)); 
    1824 
    1925    $this->setTitle('askeet! &raquo; about'); 
    …… 
    2430    require_once('markdown.php'); 
    2531 
    26     $this->html = markdown(file_get_contents(SF_DATA_DIR.'/content/unavailable.txt')); 
     32    $file = SF_DATA_DIR.'/content/unavailable_'.$this->getUser()->getCulture().'.txt'; 
     33    if (!is_readable($file)) 
     34    { 
     35      $file = SF_DATA_DIR.'/content/unavailable_en.txt'; 
     36    } 
    2737 
    2838    $this->setTitle('askeet! &raquo; maintenance'); 

  • trunk/frontend/modules/content/templates/_markdown_help.php

    r38 r64  
    66 
    77<div class="in_form"> 
    8   <div class="small">basic <?php echo link_to_function('markdown', "toggleMarkdownHelp()") ?> formatting allowed</div> 
     8  <div class="small"><?php echo __('basic %1% formatting allowed', array('%1%' => link_to_function('markdown', "toggleMarkdownHelp()"))) ?></div> 
    99  <div id="markdown_help" style="display: none"> 
    1010    <p>Phrase Emphasis</p> 

  • trunk/frontend/modules/moderator/templates/_answer_options.php

    r55 r64  
    11<?php if ($user->hasCredential('moderator')): ?> 
    22  <?php if ($answer->getReports()): ?> 
    3     &nbsp;[<strong><?php echo $answer->getReports() ?></strong> reports] 
    4     &nbsp;<?php echo link_to('[reset reports]', 'moderator/resetAnswerReports?id='.$answer->getId(), 'confirm=Are you sure you want to reset the report spam counter for this answer?') ?> 
     3    &nbsp;[<?php echo __('%1% reports', array('%1%' => $answer->getReports())) ?>] 
     4    &nbsp;<?php echo link_to('['.__('reset reports').']', 'moderator/resetAnswerReports?id='.$answer->getId(), 'confirm='.__('Are you sure you want to reset the report spam counter for this answer?')) ?> 
    55  <?php endif ?> 
    6   &nbsp;<?php echo link_to('[delete answer]', 'moderator/deleteAnswer?id='.$answer->getId(), 'confirm=Are you sure you want to delete this answer?') ?> 
     6  &nbsp;<?php echo link_to('['.__('delete answer').']', 'moderator/deleteAnswer?id='.$answer->getId(), 'confirm='.__('Are you sure you want to delete this answer?')) ?> 
    77<?php endif ?> 

  • trunk/frontend/modules/moderator/templates/_question_options.php

    r55 r64  
    11<?php if ($user->hasCredential('moderator')): ?> 
    22  <?php if ($question->getReports()): ?> 
    3     &nbsp;[<strong><?php echo $question->getReports() ?></strong> reports] 
    4     &nbsp;<?php echo link_to('[reset reports]', 'moderator/resetQuestionReports?stripped_title='.$question->getStrippedTitle(), 'confirm=Are you sure you want to reset the report spam counter for this question?') ?> 
     3    &nbsp;[<?php echo __('%1% reports', array('%1%' => $question->getReports())) ?>] 
     4    &nbsp;<?php echo link_to('['.__('reset reports').']', 'moderator/resetQuestionReports?stripped_title='.$question->getStrippedTitle(), 'confirm='.__('Are you sure you want to reset the report spam counter for this question?')) ?> 
    55  <?php endif ?> 
    6   &nbsp;<?php echo link_to('[delete question]', 'moderator/deleteQuestion?stripped_title='.$question->getStrippedTitle(), 'confirm=Are you sure you want to delete this question?') ?> 
     6  &nbsp;<?php echo link_to('['.__('delete question').']', 'moderator/deleteQuestion?stripped_title='.$question->getStrippedTitle(), 'confirm='.__('Are you sure you want to delete this question?')) ?> 
    77<?php endif ?> 

  • trunk/frontend/modules/moderator/templates/reportedAnswersSuccess.php

    r55 r64  
    11<?php use_helpers('Date', 'User', 'Global', 'Question') ?> 
    22 
    3 <h1>answers reported as spam</h1> 
     3<h1><?php echo __('answers reported as spam') ?></h1> 
    44 
    55<div id="answers"> 
    …… 
    88      <h2><?php echo link_to_question($answer->getQuestion()) ?></h2> 
    99      <?php echo $answer->getHtmlBody() ?> 
    10       <div class="subtitle" style="margin-top: -8px">answered by <?php echo link_to_profile($answer->getUser()) ?> on <?php echo format_date($answer->getCreatedAt(), 'f') ?></div> 
     10      <div class="subtitle" style="margin-top: -8px"> 
     11      <?php echo __('answered by %1% on %2%', array('%1%' => link_to_profile($answer->getUser()), '%2%' => format_date($answer->getCreatedAt(), 'f'))) ?> 
     12      </div> 
    1113      <div class="options"> 
    1214        <?php include_partial('moderator/answer_options', array('answer' => $answer)) ?> 

  • trunk/frontend/modules/moderator/templates/reportedQuestionsSuccess.php

    r55 r64  
    11<?php use_helpers('Text', 'Global', 'Question', 'Date', 'User') ?> 
    22 
    3 <h1>questions reported as spam</h1> 
     3<h1><?php echo __('questions reported as spam') ?></h1> 
    44 
    55<?php foreach($question_pager->getResults() as $question): ?> 
    66<div class="question"> 
    77  <h2><?php echo link_to_question($question) ?></h2> 
    8   <div class="subtitle">asked by <?php echo link_to_profile($question->getUser()) ?> on <?php echo format_date($question->getCreatedAt(), 'f') ?></div> 
     8  <div class="subtitle"> 
     9  <?php echo __('asked by %1% on %2%', array('%1%' => link_to_profile($question->getUser()), '%2%' => format_date($question->getCreatedAt(), 'f'))) ?> 
     10  </div> 
    911  <div><?php echo truncate_text(strip_tags($question->getHtmlBody()), 200) ?></div> 
    1012  <div class="options"> 

  • trunk/frontend/modules/moderator/templates/unpopularTagsSuccess.php

    r55 r64  
    1 <h1>unpopular tags</h1> 
     1<h1><?php echo __('unpopular tags') ?></h1> 
    22 
    33<ul> 
    44<?php foreach ($tags as $tag => $count): ?> 
    5   <li><?php echo $tag.' ('.$count.')' ?> <?php echo link_to('[delete tag]', 'moderator/deleteTag?tag='.$tag, 'confirm=Are you sure you want to delete this tag?') ?></li> 
     5  <li><?php echo $tag.' ('.$count.')' ?> <?php echo link_to('['.__('delete tag').']', 'moderator/deleteTag?tag='.$tag, 'confirm='.__('Are you sure you want to delete this tag?')) ?></li> 
    66<?php endforeach ?> 
    77</ul> 

  • trunk/frontend/modules/question/templates/_interested_user.php

    r38 r64  
    1818 
    1919<div class="interested_link"><?php echo link_to_user_interested($user, $question) ?></div> 
    20  

  • trunk/frontend/modules/question/templates/_question_block.php

    r58 r64  
    88  <h2><?php echo link_to_question($question) ?></h2> 
    99 
    10   <div class="subtitle">asked by <?php echo link_to_profile($question->getUser()) ?> on <?php echo format_date($question->getCreatedAt(), 'f') ?></div> 
     10  <div class="subtitle"> 
     11  <?php echo __('asked by %1% on %2%', array('%1%' => link_to_profile($question->getUser()), '%2%' => format_date($question->getCreatedAt(), 'f'))) ?> 
     12  </div> 
    1113 
    1214  <div class="question_body"> 
    …… 
    1618 
    1719    <?php if ($question->getAnswers()): ?> 
    18       <?php echo link_to(count($question->getAnswers()).' answer'.(count($question->getAnswers()) > 1 ? 's' : ''), '@question?stripped_title='.$question->getStrippedTitle()) ?> 
     20      <?php if (count($question->getAnswers()) > 1): ?> 
     21        <?php echo link_to(__('%1% answers', array('%1%' => count($question->getAnswers()))), '@question?stripped_title='.$question->getStrippedTitle()) ?> 
     22      <?php else: ?> 
     23      <?php echo link_to(__('%1% answer', array('%1%' => count($question->getAnswers()))), '@question?stripped_title='.$question->getStrippedTitle()) ?> 
     24      <?php endif ?> 
    1925    <?php else: ?> 
    20       <?php echo link_to('answer it', '@question?stripped_title='.$question->getStrippedTitle()) ?> 
     26      <?php echo link_to(__('answer it'), '@question?stripped_title='.$question->getStrippedTitle()) ?> 
    2127    <?php endif ?> 
    2228 
    …… 
    2430 
    2531    <?php if ($question->getTags()): ?> 
    26       tags: <?php echo tags_for_question($question) ?> 
     32      <?php echo __('tags:') ?> <?php echo tags_for_question($question) ?> 
    2733    <?php endif ?> 
    2834 

  • trunk/frontend/modules/question/templates/_search.php

    r58 r64  
    44 
    55<?php echo input_tag('search', htmlspecialchars($params->get('search')), array('style' => 'width: 150px')) ?>&nbsp; 
    6 <?php echo submit_tag('search it', 'class=small') ?> 
    7 <?php echo checkbox_tag('search_all', 1, $params->get('search_all')) ?>&nbsp;<label for="search_all" class="small">search with all words</label> 
     6<?php echo submit_tag(__('search it'), 'class=small') ?> 
     7<?php echo checkbox_tag('search_all', 1, $params->get('search_all')) ?>&nbsp;<label for="search_all" class="small"><?php echo __('search with all words') ?></label> 
    88 
    99</fieldset> 

  • trunk/frontend/modules/question/templates/addSuccess.php

    r38 r64  
    11<?php use_helper('Javascript') ?> 
    22 
    3 <h1>ask a question</h1> 
     3<h1><?php echo __('ask a question') ?></h1> 
    44 
    55<div class="in_form"> 
    66  <p> 
    7   Have you looked for similar questions? Check if a related question already exists: The more interesting a 
    8   question is, the more people will be willing to answer it. 
     7  <?php echo __('Have you looked for similar questions? Check if a related question already exists: The more interesting a question is, the more people will be willing to answer it.') ?> 
    98  </p> 
    109 
    1110  <p> 
    12   Be as accurate as you can when giving a title to your question. Keep it short and put the details 
    13   in the question body. 
     11  <?php echo __('Be as accurate as you can when giving a title to your question. Keep it short and put the details in the question body.') ?> 
    1412  </p> 
    1513</div> 
    …… 
    2018 
    2119  <?php echo form_error('title') ?> 
    22   <label for="title">question:</label> 
     20  <label for="title"><?php echo __('question:') ?></label> 
    2321  <?php echo input_tag('title', $params->get('title'), 'size=40') ?> 
    2422  <br class="clearleft" /> 
    2523 
    2624  <?php echo form_error('body') ?> 
    27   <label for="label">describe it:</label> 
     25  <label for="label"><?php echo __('describe it:') ?></label> 
    2826  <?php echo textarea_tag('body', $params->get('body'), 'size=40x10') ?> 
    2927  <br class="clearleft" /> 
    …… 
    3129 
    3230  <?php echo form_error('tag') ?> 
    33   <label for="tag">tags:</label> 
     31  <label for="tag"><?php echo __('tags:') ?></label> 
    3432  <?php echo input_auto_complete_tag('tag', '', '@tag_autocomplete', 'autocomplete=off', 'use_style=true') ?> 
    3533  <br class="clearleft" /> 
    36   <div class="small in_form">example: askeet "how to"</div> 
     34  <div class="small in_form"><?php echo __('example: askeet "how to"') ?></div> 
    3735 
    3836  </fieldset> 
    3937 
    4038  <div class="right"> 
    41     <?php echo submit_tag('ask it') ?> 
     39    <?php echo submit_tag(__('ask it')) ?> 
    4240  </div> 
    4341</form> 

  • trunk/frontend/modules/question/templates/listSuccess.php

    r14 r64  
    1 <h1>popular questions</h1> 
     1<h1><?php echo __('popular questions') ?></h1> 
    22 
    33<?php echo include_partial('question_list', array('question_pager' => $question_pager)) ?> 

  • trunk/frontend/modules/question/templates/recentSuccess.php

    r18 r64  
    1 <h1>recent questions</h1> 
     1<h1><?php echo __('recent questions') ?></h1> 
    22 
    33<?php echo include_partial('question_list', array('question_pager' => $question_pager)) ?> 

  • trunk/frontend/modules/question/templates/searchSuccess.php

    r58 r64  
    11<?php use_helpers('Global') ?> 
    22 
    3 <h1>questions matching "<?php echo htmlspecialchars($params->get('search')) ?>"</h1> 
     3<h1><?php echo __('questions matching "%1%"', array('%1%' => htmlspecialchars($params->get('search')))) ?></h1> 
    44 
    55<?php foreach($questions as $question): ?> 
    …… 
    88 
    99<?php if ($params->get('page') > 1 && !count($questions)): ?> 
    10   <div>There is no more result to your search.</div> 
     10  <div><?php echo __('There is no more result to your search.') ?></div> 
    1111<?php elseif (!count($questions)): ?> 
    12   <div>Sorry, there is no question matching your search terms.</div> 
     12  <div><?php echo __('Sorry, there is no question matching your search terms.') ?></div> 
    1313<?php endif ?> 
    1414 
    1515<?php if (count($questions) == APP_SEARCH_RESULTS_MAX): ?> 
    1616  <div class="right"> 
    17     <?php echo link_to('more results &raquo;', '@search_question?search='.$params->get('search').'&page='.($params->get('page', 1) + 1)) ?> 
     17    <?php echo link_to(__('more results').' &raquo;', '@search_question?search='.$params->get('search').'&page='.($params->get('page', 1) + 1)) ?> 
    1818  </div> 
    1919<?php endif ?> 

  • trunk/frontend/modules/question/templates/showSuccess.php

    r55 r64  
    1010  <h2><?php echo $question->getTitle() ?>&nbsp;<?php echo link_to_rss('this question feed', '@feed_question?stripped_title='.$question->getStrippedTitle()) ?></h2> 
    1111 
    12   <div class="subtitle">asked by <?php echo link_to_profile($question->getUser()) ?> on <?php echo format_date($question->getCreatedAt(), 'f') ?></div> 
     12  <div class="subtitle"> 
     13  <?php echo __('asked by %1% on %2%', array('%1%' => link_to_profile($question->getUser()), '%2%' => format_date($question->getCreatedAt(), 'f'))) ?> 
     14  </div> 
    1315 
    1416  <div class="question_body"> 
    …… 
    2123</div> 
    2224 
    23 <h2>Answers</h2> 
     25<h2><?php echo __('Answers') ?></h2> 
    2426 
    2527<?php include_partial('answer/list', array('question' => $question, 'answers' => $answers)) ?> 

  • trunk/frontend/modules/sidebar/templates/_administration.php

    r55 r64  
    11<?php if ($user->hasCredential('administrator')): ?> 
    2   <h2>administration</h2> 
     2  <h2><?php echo __('administration') ?></h2> 
    33 
    44  <ul> 
    5     <li><?php echo link_to('moderator candidates', 'administrator/moderatorCandidates') ?> (<?php echo UserPeer::getModeratorCandidatesCount() ?>)</li> 
    6     <li><?php echo link_to('moderator list', 'administrator/moderators') ?></li> 
    7     <li><?php echo link_to('administrator list', 'administrator/administrators') ?></li> 
    8     <li><?php echo link_to('problematic users', 'administrator/problematicUsers') ?> (<?php echo UserPeer::getProblematicUsersCount() ?>)</li> 
     5    <li><?php echo link_to(__('moderator candidates'), 'administrator/moderatorCandidates') ?> (<?php echo UserPeer::getModeratorCandidatesCount() ?>)</li> 
     6    <li><?php echo link_to(__('moderator list'), 'administrator/moderators') ?></li> 
     7    <li><?php echo link_to(__('administrator list'), 'administrator/administrators') ?></li> 
     8    <li><?php echo link_to(__('problematic users'), 'administrator/problematicUsers') ?> (<?php echo UserPeer::getProblematicUsersCount() ?>)</li> 
    99  </ul> 
    1010<?php endif ?> 

  • trunk/frontend/modules/sidebar/templates/_moderation.php

    r55 r64  
    11<?php if ($user->hasCredential('moderator')): ?> 
    2   <h2>moderation</h2> 
     2  <h2><?php echo __('moderation') ?></h2> 
    33 
    44  <ul> 
    5     <li><?php echo link_to('reported questions', 'moderator/reportedQuestions') ?> (<?php echo QuestionPeer::getReportCount() ?>)</li> 
    6     <li><?php echo link_to('reported answers', 'moderator/reportedAnswers') ?> (<?php echo AnswerPeer::getReportCount() ?>)</li> 
    7     <li><?php echo link_to('unpopular tags', 'moderator/unpopularTags') ?></li> 
     5    <li><?php echo link_to(__('reported questions'), 'moderator/reportedQuestions') ?> (<?php echo QuestionPeer::getReportCount() ?>)</li> 
     6    <li><?php echo link_to(__('reported answers'), 'moderator/reportedAnswers') ?> (<?php echo AnswerPeer::getReportCount() ?>)</li> 
     7    <li><?php echo link_to(__('unpopular tags'), 'moderator/unpopularTags') ?></li> 
    88  </ul> 
    99<?php endif ?> 

  • trunk/frontend/modules/sidebar/templates/_rss_links.php

    r38 r64  
    11<ul id="rss_links"> 
    2   <li><?php echo link_to('popular questions', '@homepage') ?> <?php echo link_to_rss('popular questions', 'feed/popular') ?></li> 
    3   <li><?php echo link_to('latest questions', '@recent_questions') ?> <?php echo link_to_rss('latest questions', '@feed_recent_questions') ?></li> 
    4   <li><?php echo link_to('latest answers', '@recent_answers') ?> <?php echo link_to_rss('latest answers', '@feed_recent_answers') ?></li> 
     2  <li><?php echo link_to(__('popular questions'), '@homepage') ?> <?php echo link_to_rss('popular questions', 'feed/popular') ?></li> 
     3  <li><?php echo link_to(__('latest questions'), '@recent_questions') ?> <?php echo link_to_rss('latest questions', '@feed_recent_questions') ?></li> 
     4  <li><?php echo link_to(__('latest answers'), '@recent_answers') ?> <?php echo link_to_rss('latest answers', '@feed_recent_answers') ?></li> 
    55</ul> 

  • trunk/frontend/modules/sidebar/templates/defaultSuccess.php

    r58 r64  
    22 
    33<div id="add_question"> 
    4   <?php echo link_to_login('ask a new question', '@add_question') ?> 
     4  <?php echo link_to_login(__('ask a new question'), '@add_question') ?> 
    55</div> 
    66 
    7 <h2>popular tags</h2> 
     7<h2><?php echo __('popular tags') ?></h2> 
    88<?php echo include_partial('tag/tag_cloud', array('tags' => QuestionTagPeer::getPopularTags(20))) ?> 
    9 <div class="right" style="padding-top: 5px"><?php echo link_to('more popular tags &raquo;', '@popular_tags') ?></div> 
     9<div class="right" style="padding-top: 5px"><?php echo link_to(__('more popular tags').' &raquo;', '@popular_tags') ?></div> 
    1010 
    11 <h2>find it</h2> 
     11<h2><?php echo __('find it') ?></h2> 
    1212<?php echo include_partial('question/search') ?> 
    1313 
    14 <h2>browse askeet</h2> 
     14<h2><?php echo __('browse askeet') ?></h2> 
    1515<?php echo include_partial('rss_links') ?> 
    1616 

  • trunk/frontend/modules/sidebar/templates/questionSuccess.php

    r58 r64  
    22 
    33<div id="add_question"> 
    4   <?php echo link_to_login('ask a new question', '@add_question') ?> 
     4  <?php echo link_to_login(__('ask a new question'), '@add_question') ?> 
    55</div> 
    66 
    7 <h2>find it</h2> 
     7<h2><?php echo __('find it') ?></h2> 
    88<?php echo include_partial('question/search') ?> 
    99 
    10 <h2>browse askeet</h2> 
     10<h2><?php echo __('browse askeet') ?></h2> 
    1111<?php echo include_partial('rss_links') ?> 
    1212 
    13 <h2>question tags</h2> 
     13<h2><?php echo __('question tags') ?></h2> 
    1414 
    1515<ul id="question_tags"> 
    …… 
    1818 
    1919<?php if ($user->isAuthenticated()): ?> 
    20   <div>add your own: 
     20  <div><?php echo __('add your own:') ?> 
    2121  <?php echo form_remote_tag(array( 
    2222    'url'      => '@tag_add', 

  • trunk/frontend/modules/tag/templates/_question_tags.php

    r55 r64  
    1919 
    2020      <?php if ($user->hasCredential('moderator')): ?> 
    21         &nbsp;<?php echo link_to('[remove tag]', 'moderator/deleteTagForQuestion?tag='.$tag.'&question_id='.$question->getId(), 'confirm=Are you sure you want to delete this tag for this question?') ?> 
     21        &nbsp;<?php echo link_to('['.__('delete tag').']', 'moderator/deleteTagForQuestion?tag='.$tag.'&question_id='.$question->getId(), 'confirm='.__('Are you sure you want to delete this tag for this question?')) ?> 
    2222      <?php endif ?> 
    2323    </li> 

  • trunk/frontend/modules/tag/templates/popularSuccess.php

    r38 r64  
    1 <h1>Popular tags</h1> 
     1<h1><?php echo __('popular tags') ?></h1> 
    22 
    33<?php echo include_partial('tag/tag_cloud', array('tags' => $tags)) ?> 

  • trunk/frontend/modules/tag/templates/showSuccess.php

    r38 r64  
    1 <h1>popular questions for tag '<?php echo $request->getParameter('tag') ?>'</h1> 
     1<h1><?php echo __('popular questions for tag "%1%"', array('%1%' => $request->getParameter('tag'))) ?></h1> 
    22 
    33<?php echo include_partial('question/question_list', array('question_pager' => $question_pager)) ?> 

  • trunk/frontend/modules/user/templates/listInterestedBySuccess.php

    r23 r64  
    22 
    33<h2><?php echo $question->getTitle() ?></h2> 
    4 <p>asked by <strong><?php echo $question->getUser() ?></strong> <?php echo time_ago_in_words($question->getCreatedAt('U')) ?> ago</p> 
     4<p><?php echo __('asked by %1% %2% ago', array('%1%' => '<strong>'.$question->getUser().'</strong>', '%2%' => time_ago_in_words($question->getCreatedAt('U')))) ?></p> 
    55  
    6 <?php echo $interested_users_pager->getNbResults() ?> askeet users are interested by this question 
     6<?php echo __('%1% askeet users are interested by this question', array('%1%' => $interested_users_pager->getNbResults())) ?> 
    77<ul> 
    88  <?php foreach ($interested_users_pager->getResults() as $interested_user): ?> 
    …… 
    1212 
    1313<div id="users_pager"> 
    14   <?php echo pager_navigation($interested_users_pager, '@user_interests?stripped_title='.$request->getParameter('stripped_title 
    15 ')) ?> 
     14  <?php echo pager_navigation($interested_users_pager, '@user_interests?stripped_title='.$request->getParameter('stripped_title')) ?> 
    1615</div> 

  • trunk/frontend/modules/user/templates/loginSuccess.php

    r38 r64  
    11<?php use_helpers('Validation', 'Javascript') ?> 
    22 
    3 <h1>sign in / register</h1> 
     3<h1><?php echo __('sign in / register') ?></h1> 
    44 
    55<div class="in_form"> 
    6   <p>Registration is free and required only to create a new question or rate an answer.</p> 
     6  <p><?php echo __('Registration is free and required only to create a new question or rate an answer.') ?></p> 
    77</div> 
    88 
    …… 
    1212 
    1313  <?php echo form_error('nickname') ?> 
    14   <label for="nickname">nickname:</label> 
     14  <label for="nickname"><?php echo __('nickname:') ?></label> 
    1515  <?php echo input_tag('nickname', $params->get('nickname')) ?> 
    1616  <br class="clearleft"/> 
    1717 
    1818  <?php echo form_error('password') ?> 
    19   <label for="password">password:</label> 
    20   <?php echo input_password_tag('password') ?>&nbsp;<?php echo link_to('forgot your password?', '@user_require_password') ?> 
     19  <label for="password"><?php echo __('password:') ?></label> 
     20  <?php echo input_password_tag('password') ?>&nbsp;<?php echo link_to(__('forgot your password?'), '@user_require_password') ?> 
    2121  <br class="clearleft"/> 
    2222 
    2323  <div class="in_form"> 
    2424  <?php echo checkbox_tag('new', 1, $request->getAttribute('newaccount', false) ? 1 : 0, array('onclick' => 'toggleForm()')) ?> 
    25   &nbsp;<label for="new" style="display: inline; float: none">click here to create a new account</label> 
     25  &nbsp;<label for="new" style="display: inline; float: none"><?php echo __('click here to create a new account') ?></label> 
    2626  </div> 
    2727  <br class="clearleft"/> 
    …… 
    2929  <div id="new_account"<?php echo $request->getAttribute('newaccount', false) ? '' : ' style="display: none"' ?>> 
    3030 
    31     <label for="password_bis">confirm your password:</label> 
     31    <label for="password_bis"><?php echo __('confirm your password:') ?></label> 
    3232    <?php echo input_password_tag('password_bis') ?> 
    3333    <br class="clearleft"/> 
    3434 
    3535    <?php echo form_error('email') ?> 
    36     <label for="email">your email:</label> 
     36    <label for="email"><?php echo __('your email:') ?></label> 
    3737    <?php echo input_tag('email', $params->get('email')) ?> 
    3838    <br class="clearleft"/> 
    39     <div class="small in_form">askeet will never disclose this address to a third party</div> 
     39    <div class="small in_form"><?php echo __('askeet will never disclose this address to a third party') ?></div> 
    4040 
    4141  </div> 
    …… 
    4545  <?php echo input_hidden_tag('referer', $request->getAttribute('referer')) ?> 
    4646  <div class="right"> 
    47     <?php echo submit_tag('sign in') ?> 
     47    <?php echo submit_tag(__('sign in')) ?> 
    4848  </div> 
    4949 

  • trunk/frontend/modules/user/templates/passwordRequestMailSent.php

    r29 r64  
    1 <h2>Confirmation - login information sent</h2> 
    2 <p>Your login information was sent to</p> 
     1<h1><?php echo __('Confirmation - login information sent') ?></h1> 
     2 
     3<p><?php echo __('Your login information was sent to') ?></p> 
    34<p><?php echo $request->getParameter('email') ?></p> 
    4 <p>You should receive it shortly, so you can proceed to the <?php echo link_to('login page','@login') ?>.</p> 
     5<p><?php echo __('You should receive it shortly, so you can proceed to the %1%.', array('%1%' => link_to(__('login page'),'@login'))) ?></p>