Skip to content

Commit

Permalink
4.3 translations system
Browse files Browse the repository at this point in the history
  • Loading branch information
Tomasz Rondio committed Mar 12, 2014
1 parent ea0bd57 commit 8d7d7ec
Show file tree
Hide file tree
Showing 44 changed files with 361 additions and 353 deletions.
3 changes: 2 additions & 1 deletion 404.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@


<p>
{{#sorryNoFound#}}
{{ 'sorryNoFound'|translate }}


</p>

Expand Down
185 changes: 0 additions & 185 deletions _conf/English.conf
View file

This file was deleted.

22 changes: 11 additions & 11 deletions _tpl/_html-head.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,27 +73,27 @@
<div class="content content_text">
{{dynamic}}
<h3 class="popup_title bigger">{{ if $gimme->user->logged_in }}
{{#welcome#}} {{$gimme->user->name}}
{{else}}{{#login#}}{{/if}}</h3>
{{'welcome'|translate}} {{$gimme->user->name}}
{{else}}{{'login'|translate}}{{/if}}</h3>
<div class="styled_form login_form">
{{ if $gimme->user->logged_in }}
<ul>
<li><a href="{{ $view->url(['controller' => 'dashboard', 'action' => 'index'], 'default') }}">{{#dashboard#}}</a></li>
<li><a href="{{ $view->url(['controller' => 'auth', 'action' => 'logout'], 'default') }}">{{#logout#}}</a></li>
<li><a href="{{ $view->url(['controller' => 'dashboard', 'action' => 'index'], 'default') }}">{{'dashboard'|translate}}</a></li>
<li><a href="{{ $view->url(['controller' => 'auth', 'action' => 'logout'], 'default') }}">{{'logout'|translate}}</a></li>
</ul>
{{ else }}

<ul class="logininfo" style="display:none">
<li><a href="{{ $view->url(['controller' => 'dashboard', 'action' => 'index'], 'default') }}">{{#dashboard#}}</a></li>
<li><a href="{{ $view->url(['controller' => 'auth', 'action' => 'logout'], 'default') }}">{{#logout#}}</a></li>
<li><a href="{{ $view->url(['controller' => 'dashboard', 'action' => 'index'], 'default') }}">{{'dashboard'|translate}}</a></li>
<li><a href="{{ $view->url(['controller' => 'auth', 'action' => 'logout'], 'default') }}">{{'logout'|translate}}</a></li>
</ul>

<form name="login" action="/auth" method="post" id="loginform">



<div class="field_row row">
<label for="l_field_login" class="span2">{{#email#}}</label>
<label for="l_field_login" class="span2">{{'email'|translate}}</label>
<div class="span3">
<input type="email" name="email" >
<input type="hidden" name="ajax" value="1" />
Expand All @@ -102,7 +102,7 @@


<div class="field_row row">
<label for="l_field_password" class="span2">{{#password#}}</label>
<label for="l_field_password" class="span2">{{'password'|translate}}</label>
<div class="span3">
<input type="password" name="password">
</div>
Expand All @@ -111,10 +111,10 @@
<div class="field_row row">
<div class="span3 offset2">
<ul class="login_menu float_left">
<li><a href="/auth/password-restore">{{#forgotPassword#}}</a></li>
<li><a href="/register">{{#Register#}}</a></li>
<li><a href="/auth/password-restore">{{'forgotPassword'|translate}}</a></li>
<li><a href="/register">{{'Register'|translate}}</a></li>
</ul>
<input type="submit" value="{{#Login#}}" class="float_right">
<input type="submit" value="{{'Login'|translate}}" class="float_right">


</div>
Expand Down
49 changes: 25 additions & 24 deletions _tpl/article-comments-form.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,118 +6,119 @@
<!-- user is logged in -->
{{ if $gimme->article->number && $gimme->article->comments_locked == 0 && $gimme->article->comments_enabled == 1}}
{{ if $gimme->submit_comment_action->defined && $gimme->submit_comment_action->rejected }}
<p><em>{{ #commentNotAccepted# }}</em></p>
<p><em>{{'commentNotAccepted'|translate}}</em></p>
{{ /if }}

{{ if $gimme->submit_comment_action->is_error }}
<p><em>{{ $gimme->submit_comment_action->error_message }}</em></p>
{{ else }}
{{ if $gimme->submit_comment_action->defined }}
{{ if $gimme->publication->moderated_comments }}
<p><em>{{ #commentSentApproval# }}</em></p>
<p><em>{{'commentSentApproval'|translate}}</em></p>
{{ /if }}
{{ /if }}
{{ /if }}

<h3>{{ #leaveReply# }}</h3>
{{ comment_form html_code="id=\"commentform\"" submit_button="{{ #submit# }}" button_html_code="class=\"clearfix\" tabindex=\"6\"" }}
<h3>{{'leaveReply'|translate}}</h3>
{{ comment_form html_code="id=\"commentform\"" submit_button="{{'submit'|translate}}" button_html_code="class=\"clearfix\" tabindex=\"6\"" }}
<div class="form-element clearfix">
<label for="comment">{{ #comment# }}</label>
<label for="comment">{{'comment'|translate}}</label>
{{ camp_edit object="comment" attribute="content" html_code="id=\"comment\" tabindex=\"4\"" }}
</div>

<div class="form-element clearfix">
<label for="f_captcha_code">{{ #enterCode# }}</label>
<label for="f_captcha_code">{{'enterCode'|translate}}</label>
{{ recaptcha }}
</div>
{{ /comment_form }}

{{ else }}
<p>{{ #commentsLockedDisabled# }}</p>
<p>{{'commentsLockedDisabled'|translate}}</p>
{{ /if }}

{{ else }}
<!-- user is not logged in -->
<p>{{ #notLoggedInMessage# }}</p>
<p>{{'notLoggedInMessage'|translate}}</p>
{{ /if }}
{{ else }}
<!-- public comments are allowed-->
{{ if $gimme->user->logged_in }}
<!-- user is logged in -->
{{ if $gimme->article->number && $gimme->article->comments_locked == 0 && $gimme->article->comments_enabled == 1}}
{{ if $gimme->submit_comment_action->defined && $gimme->submit_comment_action->rejected }}
<p><em>{{ #commentNotAccepted# }}</em></p>
<p><em>{{'commentNotAccepted'|translate}}</em></p>
{{ /if }}

{{ if $gimme->submit_comment_action->is_error }}
<p><em>{{ $gimme->submit_comment_action->error_message }}</em></p>
{{ else }}
{{ if $gimme->submit_comment_action->defined }}
{{ if $gimme->publication->moderated_comments }}
<p><em>{{ #commentSentApproval# }}</em></p>
<p><em>{{'commentSentApproval'|translate}}</em></p>
{{ /if }}
{{ /if }}
{{ /if }}

<h3>{{ #leaveReply# }}</h3>
{{ comment_form html_code="id=\"commentform\"" submit_button="{{ #submit# }}" button_html_code="tabindex=\"6\" class=\"clearfix\" " }}
<h3>{{'leaveReply'|translate}}</h3>
{{ comment_form html_code="id=\"commentform\"" submit_button="{{'submit'|translate}}" button_html_code="tabindex=\"6\" class=\"clearfix\" " }}
<div class="form-element clearfix">
<label for="comment">{{ #comment# }}</label>
<label for="comment">{{'comment'|translate}}</label>
{{ camp_edit object="comment" attribute="content" html_code="id=\"comment\" tabindex=\"4\"" }}
</div>

<div class="form-element clearfix">
<label for="f_captcha_code">{{ #enterCode# }}</label>
<label for="f_captcha_code">{{'enterCode'|translate}}</label>
{{ recaptcha }}
</div>
{{ /comment_form }}

{{ else }}
<p>{{ #commentsLockedDisabled# }}</p>
<p>{{'commentsLockedDisabled'|translate}}</p>
{{ /if }}

{{ else }}
<!-- user is not logged in -->
{{ if $gimme->article->number && $gimme->article->comments_locked == 0 && $gimme->article->comments_enabled == 1}}
{{ if $gimme->submit_comment_action->defined && $gimme->submit_comment_action->rejected }}
<p><em>{{ #commentNotAccepted# }}</em></p>
<p><em>{{'commentNotAccepted'|translate}}</em></p>
{{ /if }}

{{ if $gimme->submit_comment_action->is_error }}
<p><em>{{ $gimme->submit_comment_action->error_message }}</em></p>
{{ else }}
{{ if $gimme->submit_comment_action->defined }}
{{ if $gimme->publication->moderated_comments }}
<p><em>{{ #commentSentApproval# }}</em></p>
<p><em>{{'commentSentApproval'|translate}}</em></p>
{{ /if }}
{{ /if }}
{{ /if }}

<h3>{{ #leaveReply# }}</h3>
{{ comment_form html_code="id=\"commentform\"" submit_button="{{ #submit# }}" button_html_code="tabindex=\"6\" class=\"clearfix\"" }}
<h3>{{'leaveReply'|translate}}</h3>
{{ comment_form html_code="id=\"commentform\"" submit_button="{{'submit'|translate}}" button_html_code="tabindex=\"6\" class=\"clearfix\"" }}
<div class="form-element clearfix">
<label for="author"><small>{{ #nameRequired# }}</small></label>
<label for="author"><small>{{'nameRequired'|translate}}</small></label>
{{ camp_edit object="comment" attribute="nickname" html_code="id=\"author\" tabindex=\"1\"" }}
</div>

<div class="form-element clearfix">
<label for="email"><small>{{ #emailRequired# }}</small></label>
<label for="email"><small>{{'emailRequired'|translate}}</small></label>
{{ camp_edit object="comment" attribute="reader_email" html_code="id=\"email\" tabindex=\"2\"" }}
</div>

<div class="form-element clearfix">
<label for="comment">{{ #comment# }}</label>
<label for="comment">{{'comment'|translate}}</label>
{{ camp_edit object="comment" attribute="content" html_code="id=\"comment\" tabindex=\"4\"" }}
</div>

<div class="form-element clearfix">
<label for="f_captcha_code">{{ #enterCode# }}</label>
<label for="f_captcha_code">{{'enterCode'|translate}}</label>
{{ recaptcha }}
</div>

{{ /comment_form }}

{{ else }}
<p>{{ #commentsLockedDisabled# }}</p>
<p>{{'commentsLockedDisabled'|translate}}</p>
{{ /if }}
{{ /if }}
{{ /if }}
Expand Down
Loading

0 comments on commit 8d7d7ec

Please sign in to comment.