Update translation keys for renaming of user to users
This commit is contained in:
parent
d75a09f5bb
commit
22af018298
4 changed files with 6 additions and 6 deletions
|
@ -22,7 +22,7 @@ class ApplicationController < ActionController::Base
|
|||
# don't allow access to any auth-requiring part of the site unless
|
||||
# the new CTs have been seen (and accept/decline chosen).
|
||||
elsif !current_user.terms_seen && flash[:skip_terms].nil?
|
||||
flash[:notice] = t "user.terms.you need to accept or decline"
|
||||
flash[:notice] = t "users.terms.you need to accept or decline"
|
||||
if params[:referer]
|
||||
redirect_to :controller => "users", :action => "terms", :referer => params[:referer]
|
||||
else
|
||||
|
|
|
@ -234,7 +234,7 @@ class DiaryEntryController < ApplicationController
|
|||
# and return them to the user page.
|
||||
def require_administrator
|
||||
unless current_user.administrator?
|
||||
flash[:error] = t("user.filter.not_an_administrator")
|
||||
flash[:error] = t("users.filter.not_an_administrator")
|
||||
redirect_to :action => "show"
|
||||
end
|
||||
end
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
<p>
|
||||
<% changeset = contact.changesets.first %>
|
||||
<% if changeset %>
|
||||
<%= t('user.show.latest edit', :ago => t('user.show.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %>
|
||||
<%= t('users.show.latest edit', :ago => t('users.show.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %>
|
||||
<% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('browse.no_comment') %>
|
||||
"<%= link_to(comment,
|
||||
{:controller => 'browse', :action => 'changeset', :id => changeset.id},
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<% content_for :heading do %>
|
||||
<h1><%= t 'user.new.title' %></h1>
|
||||
<h1><%= t 'users.new.title' %></h1>
|
||||
<div class='header-illustration new-user-main'></div>
|
||||
<div class='header-illustration new-user-arm'></div>
|
||||
<% end %>
|
||||
|
||||
<div class="message">
|
||||
<h1><%= t 'user.new.no_auto_account_create' %></h1>
|
||||
<h2><%= raw t 'user.new.contact_webmaster', :webmaster => "mailto:#{SUPPORT_EMAIL}" %></h2>
|
||||
<h1><%= t 'users.new.no_auto_account_create' %></h1>
|
||||
<h2><%= raw t 'users.new.contact_webmaster', :webmaster => "mailto:#{SUPPORT_EMAIL}" %></h2>
|
||||
</div>
|
||||
|
|
Loading…
Add table
Reference in a new issue