From: Tom Hughes <tom@compton.nu>
Date: Mon, 29 Oct 2018 12:45:17 +0000 (+0000)
Subject: Update translation keys for renaming of user to users
X-Git-Tag: live~2800
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/22af018298047ece6a01daaa8ffc0b29f1bcaaed

Update translation keys for renaming of user to users
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index bd1995014..17658231f 100644
--- 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?
-        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
diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 723fff17e..54fe4dd1d 100644
--- 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?
-      flash[:error] = t("user.filter.not_an_administrator")
+      flash[:error] = t("users.filter.not_an_administrator")
       redirect_to :action => "show"
     end
   end
diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb
index ec3913696..ab56ce3e8 100644
--- 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 %>
-        <%= 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},
diff --git a/app/views/users/blocked.html.erb b/app/views/users/blocked.html.erb
index 93b4972d5..d5be31ef6 100644
--- a/app/views/users/blocked.html.erb
+++ b/app/views/users/blocked.html.erb
@@ -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>