Use lazy lookups for user_blocks translations

This commit is contained in:
Andy Allan 2018-04-25 11:20:50 +08:00
parent 4a9846b078
commit a0de9b780d
11 changed files with 54 additions and 55 deletions

View file

@ -1,10 +1,10 @@
<% @title = t('user_block.blocks_by.title', :name => h(@user.display_name)) %>
<% @title = t('.title', :name => h(@user.display_name)) %>
<% content_for :heading do %>
<h1><%= raw(t('user_block.blocks_by.heading', :name => link_to(h(@user.display_name), user_path(@user)))) %></h1>
<h1><%= raw(t('.heading', :name => link_to(h(@user.display_name), user_path(@user)))) %></h1>
<% end %>
<% unless @user_blocks.empty? %>
<%= render :partial => 'blocks', :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => true, :show_creator_name => false } %>
<% else %>
<p><%= t "user_block.blocks_by.empty", :name => h(@user.display_name) %></p>
<p><%= t ".empty", :name => h(@user.display_name) %></p>
<% end %>

View file

@ -1,9 +1,9 @@
<% @title = t('user_block.blocks_on.title', :name => h(@user.display_name)) %>
<% @title = t('.title', :name => h(@user.display_name)) %>
<% content_for :heading do %>
<h1><%= raw(t('user_block.blocks_on.heading', :name => link_to(h(@user.display_name), user_path(@user)))) %></h1>
<h1><%= raw(t('.heading', :name => link_to(h(@user.display_name), user_path(@user)))) %></h1>
<% end %>
<% unless @user_blocks.empty? %>
<%= render :partial => 'blocks', :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => false, :show_creator_name => true } %>
<% else %>
<p><%= t "user_block.blocks_on.empty", :name => h(@user.display_name) %></p>
<p><%= t ".empty", :name => h(@user.display_name) %></p>
<% end %>

View file

@ -1,11 +1,11 @@
<% @title = t 'user_block.edit.title', :name => h(@user_block.user.display_name) %>
<% @title = t '.title', :name => h(@user_block.user.display_name) %>
<% content_for :heading do %>
<h1><%= raw t('user_block.edit.title',
<h1><%= raw t('.title',
:name => link_to(h(@user_block.user.display_name),
user_path(@user_block.user))) %></h1>
<ul class='secondary-actions clearfix'>
<li><%= link_to t('user_block.edit.show'), @user_block %></li>
<li><%= link_to t('user_block.edit.back'), user_blocks_path %></li>
<li><%= link_to t('.show'), @user_block %></li>
<li><%= link_to t('.back'), user_blocks_path %></li>
</ul>
<% end %>
@ -13,18 +13,18 @@
<%= f.error_messages %>
<p>
<%= f.label :reason, t('user_block.edit.reason', :name => h(@user_block.user.display_name)) %><br />
<%= f.label :reason, t('.reason', :name => h(@user_block.user.display_name)) %><br />
<%= richtext_area :user_block, :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
</p>
<p>
<%= label_tag 'user_block_period', t('user_block.edit.period') %><br />
<%= select_tag('user_block_period', options_for_select(UserBlock::PERIODS.collect { |h| [t('user_block.period', :count => h), h.to_s] }, params[:user_block_period])) %>
<%= label_tag 'user_block_period', t('.period') %><br />
<%= select_tag('user_block_period', options_for_select(UserBlock::PERIODS.collect { |h| [t('user_blocks.period', :count => h), h.to_s] }, params[:user_block_period])) %>
</p>
<p>
<%= f.check_box :needs_view %>
<%= f.label :needs_view, t('user_block.edit.needs_view') %>
<%= f.label :needs_view, t('.needs_view') %>
</p>
<p>
<%= f.submit t('user_block.edit.submit') %>
<%= f.submit t('.submit') %>
</p>
<% end %>

View file

@ -1,10 +1,10 @@
<% @title = t('user_block.index.title') %>
<% @title = t('.title') %>
<% content_for :heading do %>
<h1><%= t('user_block.index.heading') %></h1>
<h1><%= t('.heading') %></h1>
<% end %>
<% unless @user_blocks.empty? %>
<%= render :partial => 'blocks', :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => true, :show_creator_name => true } %>
<% else %>
<p><%= t "user_block.index.empty" %></p>
<p><%= t ".empty" %></p>
<% end %>

View file

@ -1,6 +1,6 @@
<% @title = t 'user_block.new.title', :name => h(@user.display_name) %>
<% @title = t '.title', :name => h(@user.display_name) %>
<% content_for :heading do %>
<h1><%= raw t('user_block.new.heading',
<h1><%= raw t('.heading',
:name => link_to(
h(@user.display_name),
user_path(@user))) %></h1>
@ -9,21 +9,21 @@
<%= f.error_messages %>
<p>
<%= f.label :reason, t('user_block.new.reason', :name => @user.display_name) %><br />
<%= f.label :reason, t('.reason', :name => @user.display_name) %><br />
<%= richtext_area :user_block, :reason, :cols => 80, :rows => 20 %>
</p>
<p>
<%= label_tag 'user_block_period', t('user_block.new.period') %><br />
<%= select_tag('user_block_period', options_for_select(UserBlock::PERIODS.collect { |h| [t('user_block.period', :count => h), h.to_s] }, params[:user_block_period] )) %>
<%= label_tag 'user_block_period', t('.period') %><br />
<%= select_tag('user_block_period', options_for_select(UserBlock::PERIODS.collect { |h| [t('user_blocks.period', :count => h), h.to_s] }, params[:user_block_period] )) %>
</p>
<p>
<%= f.check_box :needs_view %>
<%= f.label :needs_view, t('user_block.new.needs_view') %>
<%= f.label :needs_view, t('.needs_view') %>
</p>
<p>
<%= hidden_field_tag 'display_name', @user.display_name %>
<%= f.submit t('user_block.new.submit') %>
<%= f.submit t('.submit') %>
</p>
<% end %>
<%= link_to t('user_block.new.back'), user_blocks_path %>
<%= link_to t('.back'), user_blocks_path %>

View file

@ -1,3 +1,3 @@
<p><%= t'user_block.not_found.sorry', :id => params[:id] %></p>
<p><%= t'.sorry', :id => params[:id] %></p>
<%= link_to t('user_block.not_found.back'), user_blocks_path %>
<%= link_to t('.back'), user_blocks_path %>

View file

@ -1,9 +1,9 @@
<% @title = t('user_block.revoke.title',
<% @title = t('.title',
:block_on => h(@user_block.user.display_name),
:block_by => h(@user_block.creator.display_name)) %>
<% content_for :heading do %>
<h1><%= raw t('user_block.revoke.heading',
<h1><%= raw t('.heading',
:block_on => link_to(
h(@user_block.user.display_name),
user_path(@user_block.user)),
@ -14,22 +14,22 @@
<% if @user_block.ends_at > Time.now %>
<p><b>
<%= t('user_block.revoke.time_future', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
<%= t('.time_future', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
</b></p>
<%= form_for :revoke, :url => { :action => "revoke" } do |f| %>
<%= f.error_messages %>
<p>
<%= check_box_tag 'confirm', 'yes' %>
<%= label_tag 'confirm', t('user_block.revoke.confirm') %>
<%= label_tag 'confirm', t('.confirm') %>
</p>
<p>
<%= submit_tag t('user_block.revoke.revoke') %>
<%= submit_tag t('.revoke') %>
</p>
<% end %>
<% else %>
<p>
<%= t('user_block.revoke.past', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
<%= t('.past', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
</p>
<% end %>

View file

@ -1,9 +1,9 @@
<% @title = t('user_block.show.title',
<% @title = t('.title',
:block_on => @user_block.user.display_name,
:block_by => @user_block.creator.display_name) %>
<% content_for :heading do %>
<h1><%= raw t('user_block.show.heading',
<h1><%= raw t('.heading',
:block_on => link_to(
h(@user_block.user.display_name),
user_path(@user_block.user)),
@ -13,26 +13,26 @@
<ul class='secondary-actions clearfix'>
<% if @user_block.ends_at > Time.now.getutc %>
<% if current_user and current_user.id == @user_block.creator_id %>
<li><%= link_to t('user_block.show.edit'), edit_user_block_path(@user_block) %></li>
<li><%= link_to t('.edit'), edit_user_block_path(@user_block) %></li>
<% end %>
<% if current_user and current_user.moderator? %>
<li><%= link_to(t('user_block.show.revoke'),{:controller => 'user_blocks', :action => 'revoke', :id => @user_block.id}) %></li>
<li><%= link_to(t('.revoke'),{:controller => 'user_blocks', :action => 'revoke', :id => @user_block.id}) %></li>
<% end %>
<% end %>
<li><%= link_to t('user_block.show.back'), user_blocks_path %></li>
<li><%= link_to t('.back'), user_blocks_path %></li>
</ul>
<% end %>
<% if @user_block.revoker %>
<p>
<b><%= t'user_block.show.revoker' %></b>
<b><%= t'.revoker' %></b>
<%= link_to h(@user_block.revoker.display_name), user_path(@user_block.revoker) %>
</p>
<% end %>
<p><b><%= t'user_block.show.created' %></b>: <%= raw t'user_block.show.ago', :time => friendly_date(@user_block.created_at) %></p>
<p><b><%= t'.created' %></b>: <%= raw t'.ago', :time => friendly_date(@user_block.created_at) %></p>
<p><b><%= t'user_block.show.status' %></b>: <%= block_status(@user_block) %></p>
<p><b><%= t'.status' %></b>: <%= block_status(@user_block) %></p>
<p><b><%= t'user_block.show.reason' %></b></p>
<p><b><%= t'.reason' %></b></p>
<div class="richtext"><%= @user_block.reason.to_html %></div>