Update translation keys for renaming of user to users

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index bd1995014882452fab08990432203104f5701381..17658231f110c6684a11ece3284a7c9a9edd914a 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -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?
       # 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
         if params[:referer]
           redirect_to :controller => "users", :action => "terms", :referer => params[:referer]
         else

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 723fff17ec0e885c129087e003c343bfcf748bcd..54fe4dd1dc44a425d98d17ac22959e9264b4f44d 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -234,7 +234,7 @@ class DiaryEntryController < ApplicationController
   # and return them to the user page.
   def require_administrator
     unless current_user.administrator?
   # 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
       redirect_to :action => "show"
     end
   end

diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb
index ec39136968cbf490aedd4dbaf62e3158ba134a4b..ab56ce3e80a310f144611a47307d61e5bb6eb999 100644 (file)
--- a/app/views/users/_contact.html.erb
+++ b/app/views/users/_contact.html.erb
@@ -23,7 +23,7 @@
     <p>
       <% changeset = contact.changesets.first %>
       <% if changeset %>
     <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},
         <% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('browse.no_comment') %>
         "<%= link_to(comment,
                             {:controller => 'browse', :action => 'changeset', :id => changeset.id},

diff --git a/app/views/users/blocked.html.erb b/app/views/users/blocked.html.erb
index 93b4972d512809165efc12590f54d1e15796e4d9..d5be31ef649f278871bef192164d91f399424848 100644 (file)
--- a/app/views/users/blocked.html.erb
+++ b/app/views/users/blocked.html.erb
@@ -1,10 +1,10 @@
 <% content_for :heading do %>
 <% 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">
   <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>
 </div>