Skip to content

Commit

Permalink
Merge branch 'feature/blog_comments' into 2.2/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Phil Sturgeon committed Aug 27, 2012
2 parents cee8686 + d808622 commit 4841efe
Show file tree
Hide file tree
Showing 94 changed files with 2,192 additions and 1,827 deletions.
8 changes: 4 additions & 4 deletions addons/shared_addons/themes/base/views/modules/comments/comments.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<hr>

<div id="comments">
<h6><?php echo lang('comments.title'); ?></h6>
<h6><?php echo lang('comments:title'); ?></h6>

<hr>

Expand Down Expand Up @@ -40,12 +40,12 @@
<?php endforeach; ?>

<?php else: ?>
<p><?php echo lang('comments.no_comments'); ?></p>
<p><?php echo lang('comments:no_comments'); ?></p>
<hr>
<?php endif; ?>

<?php echo form_open('comments/create/' . $module . '/' . $id, 'id="create-comment"'); ?>
<h6><?php echo lang('comments.your_comment'); ?></h6>
<h6><?php echo lang('comments:your_comment'); ?></h6>

<?php echo form_hidden('redirect_to', uri_string()); ?>
<noscript><?php echo form_input('d0ntf1llth1s1n', '', 'style="display:none"'); ?></noscript>
Expand All @@ -69,7 +69,7 @@
</div>

<div class="form_submit">
<?php echo form_submit('submit', lang('comments.send_label')); ?>
<?php echo form_submit('submit', lang('comments:send_label')); ?>
</div>
<?php echo form_close(); ?>
</div>
14 changes: 7 additions & 7 deletions addons/shared_addons/themes/base/views/modules/comments/form.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<h3><?php echo sprintf(lang('comments.edit_title'), $comment->id); ?></h3>
<h3><?php echo sprintf(lang('comments:edit_title'), $comment->id); ?></h3>

<?php echo form_open($this->uri->uri_string(), 'class="crud"'); ?>

Expand All @@ -8,32 +8,32 @@
<ul class="fields">
<?php if ( ! $comment->user_id > 0): ?>
<li class="even">
<label for="name"><?php echo lang('comments.name_label'); ?>:</label>
<label for="name"><?php echo lang('comments:name_label'); ?>:</label>
<?php echo form_input('name', $comment->name, 'maxlength="100"'); ?>
</li>

<li>
<label for="email"><?php echo lang('comments.email_label'); ?>:</label>
<label for="email"><?php echo lang('comments:email_label'); ?>:</label>
<?php echo form_input('email', $comment->email, 'maxlength="100"'); ?>
</li>
<?php else: ?>
<li class="even">
<label><?php echo lang('comments.name_label'); ?>:</label>
<label><?php echo lang('comments:name_label'); ?>:</label>
<p><?php echo $comment->name; ?></p>
</li>
<li>
<label><?php echo lang('comments.email_label'); ?>:</label>
<label><?php echo lang('comments:email_label'); ?>:</label>
<p><?php echo $comment->email; ?></p>
</li>
<?php endif; ?>

<li class="even">
<label for="body"><?php echo lang('comments.message_label'); ?>:</label><br />
<label for="body"><?php echo lang('comments:message_label'); ?>:</label><br />
<?php echo form_textarea(array('name'=>'comment', 'value' => $comment->comment, 'rows' => 5, 'class'=>'wysiwyg-simple')); ?>
</li>

<li>
<label for="website"><?php echo lang('comments.website_label'); ?>:</label>
<label for="website"><?php echo lang('comments:website_label'); ?>:</label>
<?php echo form_input('website', $comment->website); ?>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion system/cms/config/autoload.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

$autoload['helper'] = array(
'debug', 'url', 'form', 'text', 'string', 'language', 'html', 'pagination', 'array', 'gravatar',
'markdown', 'comments/comments', 'modules/module', 'users/user'
'markdown', 'modules/module', 'users/user'
);


Expand Down
7 changes: 7 additions & 0 deletions system/cms/language/arabic/global_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@
$lang['global:operators:less-than'] = 'أقل من';
$lang['global:operators:greater-than'] = 'أكثر من';

$lang['global:duration:1-day'] = 'One day'; #translate
$lang['global:duration:1-week'] = 'One week'; #translate
$lang['global:duration:2-weeks'] = 'Two weeks'; #translate
$lang['global:duration:1-month'] = 'One month'; #translate
$lang['global:duration:3-months'] = 'Three Months'; #translate
$lang['global:duration:always'] = 'Always'; #translate

$lang['navigation_headline'] = 'الروابط';
$lang['breadcrumb_base_label'] = 'الرئيسية';

Expand Down
42 changes: 25 additions & 17 deletions system/cms/language/brazilian/global_lang.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

$lang['global:control-panel'] = 'Painel de Controle';
$lang['global:control-panel'] = 'Painel de Controle';
$lang['global:profile'] = 'Profile'; #translate

$lang['global:title'] = 'Título';
Expand All @@ -10,23 +10,31 @@
$lang['global:author'] = 'Autor';
$lang['global:action'] = 'Ação';

$lang['dialog.delete_message'] = 'Tem certeza de que deseja remover? Isto não pode ser desfeito.';
$lang['dialog.confirm'] = 'Confirmar';
$lang['dialog.yes'] = 'Sim';
$lang['dialog.no'] = 'Não';
$lang['global:dialog:delete_message'] = 'Tem certeza de que deseja remover? Isto não pode ser desfeito.';
$lang['global:dialog:confirm'] = 'Confirmar';

$lang['global:select-none'] = '-- Nenhum --';
$lang['global:select-all'] = '-- Todos --';
$lang['global:select-any'] = '-- Qualquer --';
$lang['global:select-pick'] = '-- Selecione --';
$lang['global:yes'] = 'Sim';
$lang['global:no'] = 'Não';

$lang['global:check-none'] = 'Nenhum';
$lang['global:check-all'] = 'Todos';
$lang['global:select-none'] = '-- Nenhum --';
$lang['global:select-all'] = '-- Todos --';
$lang['global:select-any'] = '-- Qualquer --';
$lang['global:select-pick'] = '-- Selecione --';

$lang['operators.equal'] = 'Igual a';
$lang['operators.not_equal'] = 'Diferente de';
$lang['operators.less_than'] = 'Menor que';
$lang['operators.greater_than'] = 'Maior que';
$lang['global:check-all'] = 'Todos';
$lang['global:check-none'] = 'Nenhum';

$lang['global:operators:equal'] = 'Igual a';
$lang['global:operators:not-equal'] = 'Diferente de';
$lang['global:operators:less-than'] = 'Menor que';
$lang['global:operators:greater-than'] = 'Maior que';

$lang['global:duration:1-day'] = 'One day'; #translate
$lang['global:duration:1-week'] = 'One week'; #translate
$lang['global:duration:2-weeks'] = 'Two weeks'; #translate
$lang['global:duration:1-month'] = 'One month'; #translate
$lang['global:duration:3-months'] = 'Three Months'; #translate
$lang['global:duration:always'] = 'Always'; #translate

$lang['navigation_headline'] = 'Navegação';
$lang['breadcrumb_base_label'] = 'Início';
Expand Down Expand Up @@ -63,9 +71,9 @@
$lang['publish_label'] = 'Publicar';
$lang['upload_label'] = 'Enviar';
$lang['global:uninstall'] = 'Desinstalar';
$lang['global:install'] = 'Instalar';
$lang['global:install'] = 'Instalar';
$lang['global:enable'] = 'Ativar';
$lang['global:disable'] = 'Desativar';
$lang['global:disable'] = 'Desativar';

$lang['all_right_reserved'] = 'All Rights Reserved.'; #translate
$lang['powered_by_pyrocms'] = 'Powered by PyroCMS'; #translate
Expand Down
24 changes: 16 additions & 8 deletions system/cms/language/chinese_traditional/global_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
$lang['global:author'] = '作者'; //'Author';
$lang['global:action'] = '操作'; //'Action';

$lang['dialog.delete_message'] = '確定要刪除嗎？這將無法復原。'; //'Are you sure you want to delete this? It can not be undone.';
$lang['dialog.confirm'] = '確認'; //'Confirm';
$lang['dialog.yes'] = '是'; //'Yes';
$lang['dialog.no'] = '否'; //'No';
$lang['global:dialog:delete_message'] = '確定要刪除嗎？這將無法復原。'; //'Are you sure you want to delete this? It can not be undone.';
$lang['global:dialog:confirm'] = '確認'; //'Confirm';

$lang['global:yes'] = '是'; //'Yes';
$lang['global:no'] = '否'; //'No';

$lang['global:select-none'] = '-- 無 --';
$lang['global:select-all'] = '-- 全部 --';
Expand All @@ -23,10 +24,17 @@
$lang['global:check-none'] = '沒有';
$lang['global:check-all'] = '全部';

$lang['operators.equal'] = '等於';
$lang['operators.not_equal'] = '不等於';
$lang['operators.less_than'] = '小於';
$lang['operators.greater_than'] = '大於';
$lang['global:operators:equal'] = '等於';
$lang['global:operators:not-equal'] = '不等於';
$lang['global:operators:less-than'] = '小於';
$lang['global:operators:greater-than'] = '大於';

$lang['global:duration:1-day'] = 'One day'; #translate
$lang['global:duration:1-week'] = 'One week'; #translate
$lang['global:duration:2-weeks'] = 'Two weeks'; #translate
$lang['global:duration:1-month'] = 'One month'; #translate
$lang['global:duration:3-months'] = 'Three Months'; #translate
$lang['global:duration:always'] = 'Always'; #translate

$lang['navigation_headline'] = '導覽'; //'Navigation';
$lang['breadcrumb_base_label'] = '首頁'; //'Home';
Expand Down
7 changes: 7 additions & 0 deletions system/cms/language/czech/global_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@
$lang['global:operators:less-than'] = 'Méně než';
$lang['global:operators:greater-than'] = 'Více než';

$lang['global:duration:1-day'] = 'One day'; #translate
$lang['global:duration:1-week'] = 'One week'; #translate
$lang['global:duration:2-weeks'] = 'Two weeks'; #translate
$lang['global:duration:1-month'] = 'One month'; #translate
$lang['global:duration:3-months'] = 'Three Months'; #translate
$lang['global:duration:always'] = 'Always'; #translate

$lang['navigation_headline'] = 'Navigace';
$lang['breadcrumb_base_label'] = 'Domů';

Expand Down
38 changes: 23 additions & 15 deletions system/cms/language/danish/global_lang.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php defined('BASEPATH') OR exit('No direct script access allowed');

$lang['global:control-panel'] = 'Kontrolpanel';
$lang['global:control-panel'] = 'Kontrolpanel';
$lang['global:profile'] = 'Profile'; #translate

$lang['global:title'] = 'Titel';
Expand All @@ -10,23 +10,31 @@
$lang['global:author'] = 'Forfatter';
$lang['global:action'] = 'Handling';

$lang['dialog.delete_message'] = 'Er du sikker på, at du vil slette dette? Det kan ikke ændres.';
$lang['dialog.confirm'] = 'Bekræft';
$lang['dialog.yes'] = 'Ja';
$lang['dialog.no'] = 'Nej';
$lang['global:dialog:delete_message'] = 'Er du sikker på, at du vil slette dette? Det kan ikke ændres.';
$lang['global:dialog:confirm'] = 'Bekræft';

$lang['global:select-none'] = '-- Ingen --';
$lang['global:select-all'] = '-- Alt --';
$lang['global:select-any'] = '-- Enhver --';
$lang['global:select-pick'] = '-- Vælg --';
$lang['global:yes'] = 'Ja';
$lang['global:no'] = 'Nej';

$lang['global:check-none'] = 'Ingen';
$lang['global:check-all'] = 'Alt';
$lang['global:select-none'] = '-- Ingen --';
$lang['global:select-all'] = '-- Alt --';
$lang['global:select-any'] = '-- Enhver --';
$lang['global:select-pick'] = '-- Vælg --';

$lang['operators.equal'] = 'Lig med';
$lang['operators.not_equal'] = 'Ikke lig med';
$lang['operators.less_than'] = 'Mindre end';
$lang['operators.greater_than'] = 'Større end';
$lang['global:check-none'] = 'Ingen';
$lang['global:check-all'] = 'Alt';

$lang['global:operators:equal'] = 'Lig med';
$lang['global:operators:not-equal'] = 'Ikke lig med';
$lang['global:operators:less-than'] = 'Mindre end';
$lang['global:operators:greater-than'] = 'Større end';

$lang['global:duration:1-day'] = 'One day'; #translate
$lang['global:duration:1-week'] = 'One week'; #translate
$lang['global:duration:2-weeks'] = 'Two weeks'; #translate
$lang['global:duration:1-month'] = 'One month'; #translate
$lang['global:duration:3-months'] = 'Three Months'; #translate
$lang['global:duration:always'] = 'Always'; #translate

$lang['navigation_headline'] = 'Navigation';
$lang['breadcrumb_base_label'] = 'Hjem';
Expand Down
15 changes: 10 additions & 5 deletions system/cms/language/dutch/global_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@

$lang['global:dialog:delete_message'] = 'Weet u zeker dat u dit wilt verwijderen? Dit kan niet ongedaan worden gemaakt.';
$lang['global:dialog:confirm'] = 'Bevestigen';
$lang['global:dialog:delete_message'] = 'Are you sure you want to delete this? It cannot be undone.';
$lang['global:dialog:confirm'] = 'Confirm';

$lang['global:yes'] = 'Ja';
$lang['global:no'] = 'Nee';
Expand All @@ -28,9 +26,16 @@
$lang['global:check-none'] = 'Geen';

$lang['global:operators:equal'] = 'Gelijk aan';
$lang['global:operators:not_equal'] = 'Ongelijk aan';
$lang['global:operators:less_than'] = 'Kleiner dan';
$lang['global:operators:greater_than'] = 'Groter dan';
$lang['global:operators:not-equal'] = 'Ongelijk aan';
$lang['global:operators:less-than'] = 'Kleiner dan';
$lang['global:operators:greater-than'] = 'Groter dan';

$lang['global:duration:1-day'] = 'One day'; #translate
$lang['global:duration:1-week'] = 'One week'; #translate
$lang['global:duration:2-weeks'] = 'Two weeks'; #translate
$lang['global:duration:1-month'] = 'One month'; #translate
$lang['global:duration:3-months'] = 'Three Months'; #translate
$lang['global:duration:always'] = 'Always'; #translate

$lang['navigation_headline'] = 'Navigatie';
$lang['breadcrumb_base_label'] = 'Home';
Expand Down
7 changes: 7 additions & 0 deletions system/cms/language/english/global_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@
$lang['global:operators:less-than'] = 'Less than';
$lang['global:operators:greater-than'] = 'Greater than';

$lang['global:duration:1-day'] = 'One day';
$lang['global:duration:1-week'] = 'One week';
$lang['global:duration:2-weeks'] = 'Two weeks';
$lang['global:duration:1-month'] = 'One month';
$lang['global:duration:3-months'] = 'Three Months';
$lang['global:duration:always'] = 'Always';

$lang['navigation_headline'] = 'Navigation';
$lang['breadcrumb_base_label'] = 'Home';

Expand Down
42 changes: 25 additions & 17 deletions system/cms/language/finnish/global_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,31 @@
$lang['global:author'] = 'Tekijä';
$lang['global:action'] = 'Toiminto';

$lang['dialog.delete_message'] = 'Oletko varma, että haluat poista tämän? Tätä toimintoa ei voi peruuttaa.';
$lang['dialog.confirm'] = 'Vahvista';
$lang['dialog.yes'] = 'Kyllä';
$lang['dialog.no'] = 'Ei';

$lang['global:select-none'] = '-- Ei mikään --';
$lang['global:select-all'] = '-- Kaikki --';
$lang['global:select-any'] = '-- Any --'; // @todo: Not yet sure in which context we're using this
$lang['global:select-pick'] = '-- Valitse --';

$lang['global:check-none'] = 'Ei yhtään';
$lang['global:check-all'] = 'Kaikki';

$lang['operators.equal'] = 'Täsmää';
$lang['operators.not_equal'] = 'Ei täsmää';
$lang['operators.less_than'] = 'Vähemmän kuin';
$lang['operators.greater_than'] = 'Enemmän kuin';
$lang['global:dialog:delete_message'] = 'Oletko varma, että haluat poista tämän? Tätä toimintoa ei voi peruuttaa.';
$lang['global:dialog:confirm'] = 'Vahvista';

$lang['global:yes'] = 'Kyllä';
$lang['global:no'] = 'Ei';

$lang['global:select-none'] = '-- Ei mikään --';
$lang['global:select-all'] = '-- Kaikki --';
$lang['global:select-any'] = '-- Any --'; // @todo: Not yet sure in which context we're using this
$lang['global:select-pick'] = '-- Valitse --';

$lang['global:check-none'] = 'Ei yhtään';
$lang['global:check-all'] = 'Kaikki';

$lang['global:operators:equal'] = 'Täsmää';
$lang['global:operators:not-equal'] = 'Ei täsmää';
$lang['global:operators:less-than'] = 'Vähemmän kuin';
$lang['global:operators:greater-than'] = 'Enemmän kuin';

$lang['global:duration:1-day'] = 'One day'; #translate
$lang['global:duration:1-week'] = 'One week'; #translate
$lang['global:duration:2-weeks'] = 'Two weeks'; #translate
$lang['global:duration:1-month'] = 'One month'; #translate
$lang['global:duration:3-months'] = 'Three Months'; #translate
$lang['global:duration:always'] = 'Always'; #translate

$lang['navigation_headline'] = 'Navigointi';
$lang['breadcrumb_base_label'] = 'Etusivu';
Expand Down
7 changes: 7 additions & 0 deletions system/cms/language/french/global_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@
$lang['global:operators:less-than'] = 'Inférieur à';
$lang['global:operators:greater-than'] = 'Supérieur à';

$lang['global:duration:1-day'] = 'One day'; #translate
$lang['global:duration:1-week'] = 'One week'; #translate
$lang['global:duration:2-weeks'] = 'Two weeks'; #translate
$lang['global:duration:1-month'] = 'One month'; #translate
$lang['global:duration:3-months'] = 'Three Months'; #translate
$lang['global:duration:always'] = 'Always'; #translate

$lang['navigation_headline'] = 'Navigation';
$lang['breadcrumb_base_label'] = 'Accueil';

Expand Down
Loading

0 comments on commit 4841efe

Please sign in to comment.