diff --git a/app/views/browse/_containing_relation.html.erb b/app/views/browse/_containing_relation.html.erb index de41d9247..1b26a89b6 100644 --- a/app/views/browse/_containing_relation.html.erb +++ b/app/views/browse/_containing_relation.html.erb @@ -1,8 +1,8 @@
  • <%= linked_name = link_to h(printable_name(containing_relation.relation)), :action => "relation", :id => containing_relation.relation.id.to_s if containing_relation.member_role.blank? - raw t 'browse.containing_relation.entry', :relation_name => linked_name + raw t '.entry', :relation_name => linked_name else - raw t 'browse.containing_relation.entry_role', :relation_name => linked_name, :relation_role => h(containing_relation.member_role) + raw t '.entry_role', :relation_name => linked_name, :relation_role => h(containing_relation.member_role) end -%>
    • \ No newline at end of file +%> diff --git a/app/views/browse/_relation.html.erb b/app/views/browse/_relation.html.erb index 235a7e91d..e187da6ca 100644 --- a/app/views/browse/_relation.html.erb +++ b/app/views/browse/_relation.html.erb @@ -16,7 +16,7 @@ <% end %> <% unless relation.relation_members.empty? %> -

    <%= t'browse.relation.members' %>

    +

    <%= t '.members' %>

    <% end %> diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb index 87b7e301b..cedc6f5e9 100644 --- a/app/views/browse/_relation_member.html.erb +++ b/app/views/browse/_relation_member.html.erb @@ -1,12 +1,12 @@ <% member_class = link_class(relation_member.member_type.downcase, relation_member.member) linked_name = link_to printable_name(relation_member.member), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, :title => link_title(relation_member.member), :rel => link_follow(relation_member.member) - type_str = t'browse.relation_member.type.' + relation_member.member_type.downcase + type_str = t '.type.' + relation_member.member_type.downcase %>
  • <%= if relation_member.member_role.blank? - raw t'browse.relation_member.entry', :type => type_str, :name => linked_name + raw t '.entry', :type => type_str, :name => linked_name else - raw t'browse.relation_member.entry_role', :type => type_str, :name => linked_name, :role => h(relation_member.member_role) + raw t '.entry_role', :type => type_str, :name => linked_name, :role => h(relation_member.member_role) end %>
    • diff --git a/app/views/browse/_tag_details.html.erb b/app/views/browse/_tag_details.html.erb index 16e3b51b2..9c3fbbfc2 100644 --- a/app/views/browse/_tag_details.html.erb +++ b/app/views/browse/_tag_details.html.erb @@ -1,5 +1,5 @@ <% unless tag_details.empty? %> -

    <%= t 'browse.tag_details.tags' %>

    +

    <%= t '.tags' %>

    <%= render :partial => "tag", :collection => tag_details.sort %>
    diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb index c2287a1cc..4f331b5e9 100644 --- a/app/views/browse/_way.html.erb +++ b/app/views/browse/_way.html.erb @@ -18,14 +18,14 @@ <% end %> <% unless way.way_nodes.empty? %> -

    <%= t'browse.way.nodes' %>

    +

    <%= t '.nodes' %>

    @@ -24,9 +24,9 @@ <% end %> <% if @entries.empty? %> -

    <%= t 'diary_entry.list.no_entries' %>

    +

    <%= t '.no_entries' %>

    <% else %> -

    <%= t 'diary_entry.list.recent_entries' %>

    +

    <%= t '.recent_entries' %>

    <% if @user %> <%= render :partial => 'diary_entry', :collection => @entries %> @@ -36,17 +36,17 @@ <% end %> diff --git a/app/views/diary_entry/no_such_entry.html.erb b/app/views/diary_entry/no_such_entry.html.erb index ff9a811c7..4fb5ca49d 100644 --- a/app/views/diary_entry/no_such_entry.html.erb +++ b/app/views/diary_entry/no_such_entry.html.erb @@ -1,5 +1,5 @@ <% content_for :heading do %> -

    <%= t 'diary_entry.no_such_entry.heading', :id => h(params[:id]) %>

    +

    <%= t '.heading', :id => h(params[:id]) %>

    <% end %> -

    <%= t 'diary_entry.no_such_entry.body', :id => h(params[:id]) %>

    +

    <%= t '.body', :id => h(params[:id]) %>

    diff --git a/app/views/diary_entry/view.html.erb b/app/views/diary_entry/view.html.erb index 3c2264d3e..3e8fbe990 100644 --- a/app/views/diary_entry/view.html.erb +++ b/app/views/diary_entry/view.html.erb @@ -1,7 +1,7 @@ <% content_for :heading do %>
    <%= user_image @entry.user %> -

    <%= link_to t('diary_entry.view.user_title', :user => h(@entry.user.display_name)), :action => :list %>

    +

    <%= link_to t('.user_title', :user => h(@entry.user.display_name)), :action => :list %>

    <%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %>

    <% end %> @@ -13,13 +13,13 @@ <%= render :partial => 'diary_comment', :collection => @entry.visible_comments %> <%= if_logged_in(:div) do %> -

    <%= t 'diary_entry.view.leave_a_comment' %>

    +

    <%= t '.leave_a_comment' %>

    <%= error_messages_for 'diary_comment' %> <%= form_for :diary_comment, :url => { :action => 'comment' } do |f| %> <%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %> - <%= submit_tag t('diary_entry.view.save_button') %> + <%= submit_tag t('.save_button') %> <% end %> <% if current_user and @entry.subscribers.exists?(current_user.id) %>
    <%= link_to t('javascripts.changesets.show.unsubscribe'), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %>
    @@ -29,7 +29,7 @@ <% end %> <%= if_not_logged_in(:div) do %> -

    <%= raw t("diary_entry.view.login_to_leave_a_comment", :login_link => link_to(t("diary_entry.view.login"), :controller => 'user', :action => 'login', :referer => request.fullpath)) %>

    +

    <%= raw t(".login_to_leave_a_comment", :login_link => link_to(t(".login"), :controller => 'user', :action => 'login', :referer => request.fullpath)) %>

    <% end %> <% content_for :auto_discovery_link_tag do -%> diff --git a/app/views/geocoder/results.html.erb b/app/views/geocoder/results.html.erb index d990b7f0e..052b8822e 100644 --- a/app/views/geocoder/results.html.erb +++ b/app/views/geocoder/results.html.erb @@ -1,5 +1,5 @@ <% if @results.empty? %> -

    <%= t 'geocoder.results.no_results' %>

    +

    <%= t '.no_results' %>

    <% else %> <% if @more_params %>
    - <%= link_to t('geocoder.results.more_results'), url_for(@more_params), :class => "button load_more" %> + <%= link_to t('.more_results'), url_for(@more_params), :class => "button load_more" %> <%= image_tag "searching.gif", :class => "loader", :style => "display: none;" %>
    <% end %> diff --git a/app/views/geocoder/search.html.erb b/app/views/geocoder/search.html.erb index 21484d4c0..2d2a25c97 100644 --- a/app/views/geocoder/search.html.erb +++ b/app/views/geocoder/search.html.erb @@ -3,7 +3,7 @@ <%= t('site.sidebar.search_results') %> <% @sources.each do |source| %> -

    <%= raw(t "geocoder.search.title.#{source}") %>

    +

    <%= raw(t ".title.#{source}") %>

    "> <%= image_tag "searching.gif", :class => "loader" %>
    diff --git a/app/views/message/_message_summary.html.erb b/app/views/message/_message_summary.html.erb index 5e1f17ef4..43a6a4bbf 100644 --- a/app/views/message/_message_summary.html.erb +++ b/app/views/message/_message_summary.html.erb @@ -2,7 +2,7 @@ <%= link_to h(message_summary.sender.display_name), user_path(message_summary.sender) %> <%= link_to h(message_summary.title), :controller => 'message', :action => 'read', :message_id => message_summary.id %> <%= l message_summary.sent_on, :format => :friendly %> - <%= button_to t('message.message_summary.unread_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'unread'}, { :remote => true } %> - <%= button_to t('message.message_summary.read_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'read'}, { :remote => true } %> - <%= button_to t('message.message_summary.delete_button'), {:controller => 'message', :action => 'delete', :message_id => message_summary.id, :referer => request.fullpath}, { :remote => true } %> + <%= button_to t('.unread_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'unread'}, { :remote => true } %> + <%= button_to t('.read_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'read'}, { :remote => true } %> + <%= button_to t('.delete_button'), {:controller => 'message', :action => 'delete', :message_id => message_summary.id, :referer => request.fullpath}, { :remote => true } %> diff --git a/app/views/message/_sent_message_summary.html.erb b/app/views/message/_sent_message_summary.html.erb index 6b4637708..8b6201247 100644 --- a/app/views/message/_sent_message_summary.html.erb +++ b/app/views/message/_sent_message_summary.html.erb @@ -2,5 +2,5 @@ <%= link_to h(sent_message_summary.recipient.display_name), user_path(sent_message_summary.recipient) %> <%= link_to h(sent_message_summary.title), :controller => 'message', :action => 'read', :message_id => sent_message_summary.id %> <%= l sent_message_summary.sent_on, :format => :friendly %> - <%= button_to t('message.sent_message_summary.delete_button'), :controller => 'message', :action => 'delete', :message_id => sent_message_summary.id, :referer => request.fullpath %> + <%= button_to t('.delete_button'), :controller => 'message', :action => 'delete', :message_id => sent_message_summary.id, :referer => request.fullpath %> diff --git a/app/views/message/inbox.html.erb b/app/views/message/inbox.html.erb index f9fc31149..56ed53c6d 100644 --- a/app/views/message/inbox.html.erb +++ b/app/views/message/inbox.html.erb @@ -1,5 +1,5 @@ <% content_for :heading do %> -

    <%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), outbox_path(current_user.display_name) %>

    +

    <%= t '.my_inbox'%>/<%= link_to t('.outbox'), outbox_path(current_user.display_name) %>

    <% end %>

    <%= render :partial => "message_count" %>

    @@ -8,9 +8,9 @@ - - - + + + @@ -20,5 +20,5 @@
    <%= t'message.inbox.from' %><%= t'message.inbox.subject' %><%= t'message.inbox.date' %><%= t '.from' %><%= t '.subject' %><%= t '.date' %>
    <% else %> -
    <%= raw(t'message.inbox.no_messages_yet', :people_mapping_nearby_link => link_to(t('message.inbox.people_mapping_nearby'), user_path(current_user))) %>
    +
    <%= raw(t '.no_messages_yet', :people_mapping_nearby_link => link_to(t('.people_mapping_nearby'), user_path(current_user))) %>
    <% end %> diff --git a/app/views/message/new.html.erb b/app/views/message/new.html.erb index 03454767a..44e919aa9 100644 --- a/app/views/message/new.html.erb +++ b/app/views/message/new.html.erb @@ -1,5 +1,5 @@ <% content_for :heading do %> -

    <%= raw(t'message.new.send_message_to', :name => link_to(h(@message.recipient.display_name), user_path(@message.recipient))) %>

    +

    <%= raw(t '.send_message_to', :name => link_to(h(@message.recipient.display_name), user_path(@message.recipient))) %>

    <% end %> <%= error_messages_for 'message' %> @@ -7,16 +7,16 @@ <%= form_for :message, :html => { :class => 'standard-form' }, :url => { :action => "new", :display_name => @message.recipient.display_name } do |f| %>
    - + <%= f.text_field :title, :size => 60, :class => "richtext_title" %>
    - + <%= richtext_area :message, :body, :cols => 80, :rows => 20 %>
    - <%= submit_tag t('message.new.send_button') %> - <%= link_to t('message.new.back_to_inbox'), { :controller => 'message', :action => 'inbox', :display_name => current_user.display_name }, :class => 'deemphasize button' %> + <%= submit_tag t('.send_button') %> + <%= link_to t('.back_to_inbox'), { :controller => 'message', :action => 'inbox', :display_name => current_user.display_name }, :class => 'deemphasize button' %>
    <% end %> diff --git a/app/views/message/no_such_message.html.erb b/app/views/message/no_such_message.html.erb index 9bf6ddbea..fd3b9075b 100644 --- a/app/views/message/no_such_message.html.erb +++ b/app/views/message/no_such_message.html.erb @@ -1,5 +1,5 @@ <% content_for :heading do %> -

    <%= t'message.no_such_message.heading' %>

    +

    <%= t '.heading' %>

    <% end %> -

    <%= t'message.no_such_message.body' %>

    +

    <%= t '.body' %>

    diff --git a/app/views/message/outbox.html.erb b/app/views/message/outbox.html.erb index a3a0dbbdf..38639cd99 100644 --- a/app/views/message/outbox.html.erb +++ b/app/views/message/outbox.html.erb @@ -1,16 +1,16 @@ <% content_for :heading do %> -

    <%= raw(t'message.outbox.my_inbox', :inbox_link => link_to(t('message.outbox.inbox'), inbox_path(current_user.display_name))) %>/<%= t'message.outbox.outbox' %>

    +

    <%= raw(t '.my_inbox', :inbox_link => link_to(t('.inbox'), inbox_path(current_user.display_name))) %>/<%= t'.outbox' %>

    <% end %> -

    <%= t'message.outbox.messages', :count => current_user.sent_messages.size %>

    +

    <%= t '.messages', :count => current_user.sent_messages.size %>

    <% if current_user.sent_messages.size > 0 %> - - - + + + @@ -19,5 +19,5 @@
    <%= t'message.outbox.to' %><%= t'message.outbox.subject' %><%= t'message.outbox.date' %><%= t '.to' %><%= t '.subject' %><%= t '.date' %>
    <% else %> -
    <%= raw(t'message.outbox.no_sent_messages', :people_mapping_nearby_link => link_to(t('message.outbox.people_mapping_nearby'), user_path(current_user))) %>
    +
    <%= raw(t '.no_sent_messages', :people_mapping_nearby_link => link_to(t('.people_mapping_nearby'), user_path(current_user))) %>
    <% end %> diff --git a/app/views/message/read.html.erb b/app/views/message/read.html.erb index c23eabe95..668094d33 100644 --- a/app/views/message/read.html.erb +++ b/app/views/message/read.html.erb @@ -14,9 +14,9 @@
    <%= @message.body.to_html %>
    - <%= button_to t('message.read.reply_button'), {:controller => 'message', :action => 'reply', :message_id => @message.id}, :class => 'reply-button' %> - <%= button_to t('message.read.unread_button'), {:controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread'}, :class => 'mark-unread-button' %> - <%= button_to t('message.read.delete_button'), {:controller => 'message', :action => 'delete', :message_id => @message.id}, :class => 'delete-button' %> + <%= button_to t('.reply_button'), {:controller => 'message', :action => 'reply', :message_id => @message.id}, :class => 'reply-button' %> + <%= button_to t('.unread_button'), {:controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread'}, :class => 'mark-unread-button' %> + <%= button_to t('.delete_button'), {:controller => 'message', :action => 'delete', :message_id => @message.id}, :class => 'delete-button' %> <% else %> @@ -36,5 +36,5 @@ <% end %> - <%= link_to t('message.read.back'), {:controller => 'message', :action => 'outbox', :display_name => current_user.display_name }, :class => "button deemphasize" %> + <%= link_to t('.back'), {:controller => 'message', :action => 'outbox', :display_name => current_user.display_name }, :class => "button deemphasize" %>
    diff --git a/app/views/notifier/changeset_comment_notification.html.erb b/app/views/notifier/changeset_comment_notification.html.erb index 80f9d8aa1..04bafb0d4 100644 --- a/app/views/notifier/changeset_comment_notification.html.erb +++ b/app/views/notifier/changeset_comment_notification.html.erb @@ -1,16 +1,16 @@

    - <%= t 'notifier.changeset_comment_notification.hi', :to_user => @to_user %> + <%= t '.hi', :to_user => @to_user %>

    <% if @owner %> - <%= raw t "notifier.changeset_comment_notification.commented.your_changeset", :commenter => link_to_user(@commenter), :time => @time %> + <%= raw t ".commented.your_changeset", :commenter => link_to_user(@commenter), :time => @time %> <% else %> - <%= raw t "notifier.changeset_comment_notification.commented.commented_changeset", :commenter => link_to_user(@commenter), :time => @time, :changeset_author => @changeset_author %> + <%= raw t ".commented.commented_changeset", :commenter => link_to_user(@commenter), :time => @time, :changeset_author => @changeset_author %> <% end %> <% if @changeset_comment %> - <%= raw t "notifier.changeset_comment_notification.commented.partial_changeset_with_comment", :changeset_comment => content_tag("em", @changeset_comment) %> + <%= raw t ".commented.partial_changeset_with_comment", :changeset_comment => content_tag("em", @changeset_comment) %> <% else %> - <%= t "notifier.changeset_comment_notification.commented.partial_changeset_without_comment" %> + <%= t ".commented.partial_changeset_without_comment" %> <% end %>

    @@ -19,11 +19,11 @@ <% end %>

    - <%= raw t 'notifier.changeset_comment_notification.details', :url => link_to(@changeset_url, @changeset_url) %> + <%= raw t '.details', :url => link_to(@changeset_url, @changeset_url) %>

    <% content_for :footer do %>

    - <%= raw t 'notifier.changeset_comment_notification.unsubscribe', :url => link_to(@changeset_url, @changeset_url, :style => "color: #222") %> + <%= raw t '.unsubscribe', :url => link_to(@changeset_url, @changeset_url, :style => "color: #222") %>

    <% end %> diff --git a/app/views/notifier/changeset_comment_notification.text.erb b/app/views/notifier/changeset_comment_notification.text.erb index 9919f2103..ce9c0099a 100644 --- a/app/views/notifier/changeset_comment_notification.text.erb +++ b/app/views/notifier/changeset_comment_notification.text.erb @@ -1,20 +1,20 @@ -<%= t 'notifier.changeset_comment_notification.hi', :to_user => @to_user %> +<%= t '.hi', :to_user => @to_user %> <% if @owner %> -<%= t "notifier.changeset_comment_notification.commented.your_changeset", :commenter => @commenter, :time => @time %> +<%= t ".commented.your_changeset", :commenter => @commenter, :time => @time %> <% else %> -<%= t "notifier.changeset_comment_notification.commented.commented_changeset", :commenter => @commenter, :time => @time, :changeset_author => @changeset_author %> +<%= t ".commented.commented_changeset", :commenter => @commenter, :time => @time, :changeset_author => @changeset_author %> <% end %> <% if @changeset_comment %> -<%= t "notifier.changeset_comment_notification.commented.partial_changeset_with_comment", :changeset_comment => @changeset_comment %> +<%= t ".commented.partial_changeset_with_comment", :changeset_comment => @changeset_comment %> <% else %> -<%= t "notifier.changeset_comment_notification.commented.partial_changeset_without_comment" %> +<%= t ".commented.partial_changeset_without_comment" %> <% end %> == <%= @comment.to_text %> == -<%= t 'notifier.changeset_comment_notification.details', :url => @changeset_url %> +<%= t '.details', :url => @changeset_url %> -<%= t 'notifier.changeset_comment_notification.unsubscribe', :url => @changeset_url %> +<%= t '.unsubscribe', :url => @changeset_url %> diff --git a/app/views/notifier/diary_comment_notification.html.erb b/app/views/notifier/diary_comment_notification.html.erb index 73bfe9a33..163223b44 100644 --- a/app/views/notifier/diary_comment_notification.html.erb +++ b/app/views/notifier/diary_comment_notification.html.erb @@ -1,8 +1,8 @@

    - <%= t'notifier.diary_comment_notification.hi', :to_user => @to_user %> + <%= t '.hi', :to_user => @to_user %>

    - <%= raw t'notifier.diary_comment_notification.header', :from_user => link_to_user(@from_user), :subject => content_tag("em", @title) %> + <%= raw t '.header', :from_user => link_to_user(@from_user), :subject => content_tag("em", @title) %>

    <%= message_body do %> @@ -10,7 +10,7 @@ <% end %> <% content_for :footer do %> -

    <%= raw t'notifier.diary_comment_notification.footer', +

    <%= raw t '.footer', :readurl => link_to(@readurl, @readurl) + tag(:br), :commenturl => link_to(@commenturl, @commenturl) + tag(:br), :replyurl => link_to(@replyurl, @replyurl) diff --git a/app/views/notifier/diary_comment_notification.text.erb b/app/views/notifier/diary_comment_notification.text.erb index 7d112a42b..b86c303ae 100644 --- a/app/views/notifier/diary_comment_notification.text.erb +++ b/app/views/notifier/diary_comment_notification.text.erb @@ -1,9 +1,9 @@ -<%= t'notifier.diary_comment_notification.hi', :to_user => @to_user %> +<%= t '.hi', :to_user => @to_user %> -<%= t'notifier.diary_comment_notification.header', :from_user => @from_user, :subject => @title %> +<%= t '.header', :from_user => @from_user, :subject => @title %> == <%= raw @text.to_text %> == -<%= t'notifier.diary_comment_notification.footer', :readurl => @readurl, :commenturl => @commenturl, :replyurl => @replyurl %> +<%= t '.footer', :readurl => @readurl, :commenturl => @commenturl, :replyurl => @replyurl %> diff --git a/app/views/notifier/friend_notification.html.erb b/app/views/notifier/friend_notification.html.erb index cfea97195..f6774f2dc 100644 --- a/app/views/notifier/friend_notification.html.erb +++ b/app/views/notifier/friend_notification.html.erb @@ -1,9 +1,9 @@ -

    <%= t 'notifier.friend_notification.had_added_you', :user => @friend.befriender.display_name %>

    +

    <%= t '.had_added_you', :user => @friend.befriender.display_name %>

    <%= message_body do %> -

    <%= raw t 'notifier.friend_notification.see_their_profile', :userurl => link_to(@viewurl, @viewurl) %>

    +

    <%= raw t '.see_their_profile', :userurl => link_to(@viewurl, @viewurl) %>

    <% unless @friend.befriendee.is_friends_with?(@friend.befriender) -%> -

    <%= raw t 'notifier.friend_notification.befriend_them', :befriendurl => link_to(@friendurl, @friendurl) %>

    +

    <%= raw t '.befriend_them', :befriendurl => link_to(@friendurl, @friendurl) %>

    <% end -%> <% end %> diff --git a/app/views/notifier/friend_notification.text.erb b/app/views/notifier/friend_notification.text.erb index ae89a4136..e1db966ab 100644 --- a/app/views/notifier/friend_notification.text.erb +++ b/app/views/notifier/friend_notification.text.erb @@ -1,7 +1,7 @@ -<%= t 'notifier.friend_notification.had_added_you', :user => @friend.befriender.display_name %> +<%= t '.had_added_you', :user => @friend.befriender.display_name %> -<%= t 'notifier.friend_notification.see_their_profile', :userurl => @viewurl %> +<%= t '.see_their_profile', :userurl => @viewurl %> <% unless @friend.befriendee.is_friends_with?(@friend.befriender) -%> -<%= t 'notifier.friend_notification.befriend_them', :befriendurl => @friendurl %> +<%= t '.befriend_them', :befriendurl => @friendurl %> <% end -%> diff --git a/app/views/notifier/message_notification.html.erb b/app/views/notifier/message_notification.html.erb index 97a352a49..4e4b2ea9a 100644 --- a/app/views/notifier/message_notification.html.erb +++ b/app/views/notifier/message_notification.html.erb @@ -1,8 +1,8 @@

    - <%= t'notifier.message_notification.hi', :to_user => @to_user %> + <%= t '.hi', :to_user => @to_user %>

    - <%= raw t'notifier.message_notification.header', + <%= raw t '.header', :from_user => link_to_user(@from_user), :subject => content_tag("em", @title) %> @@ -14,7 +14,7 @@ <% content_for :footer do %>

    - <%= t'notifier.message_notification.footer_html', + <%= t '.footer_html', :readurl => link_to(@readurl, @readurl) + tag(:br), :replyurl => link_to(@replyurl, @replyurl) %> diff --git a/app/views/notifier/message_notification.text.erb b/app/views/notifier/message_notification.text.erb index c006941d9..b3a74bb88 100644 --- a/app/views/notifier/message_notification.text.erb +++ b/app/views/notifier/message_notification.text.erb @@ -1,9 +1,9 @@ -<%= raw t'notifier.message_notification.hi', :to_user => @to_user %> +<%= raw t '.hi', :to_user => @to_user %> -<%= raw t'notifier.message_notification.header', :from_user => @from_user, :subject => @title %> +<%= raw t '.header', :from_user => @from_user, :subject => @title %> == <%= raw @text.to_text %> == -<%= word_wrap(t'notifier.message_notification.footer_html', :readurl => @readurl, :replyurl => @replyurl) %> +<%= word_wrap(t '.footer_html', :readurl => @readurl, :replyurl => @replyurl) %> diff --git a/app/views/notifier/note_comment_notification.html.erb b/app/views/notifier/note_comment_notification.html.erb index 909bffaa6..835168583 100644 --- a/app/views/notifier/note_comment_notification.html.erb +++ b/app/views/notifier/note_comment_notification.html.erb @@ -1,9 +1,9 @@ -

    <%= t 'notifier.note_comment_notification.greeting' %>

    +

    <%= t '.greeting' %>

    <% if @owner %> -

    <%= raw t "notifier.note_comment_notification.#{@event}.your_note", :commenter => link_to_user(@commenter), :place => @place %>

    +

    <%= raw t ".#{@event}.your_note", :commenter => link_to_user(@commenter), :place => @place %>

    <% else %> -

    <%= raw t "notifier.note_comment_notification.#{@event}.commented_note", :commenter => link_to_user(@commenter), :place => @place %>

    +

    <%= raw t ".#{@event}.commented_note", :commenter => link_to_user(@commenter), :place => @place %>

    <% end %> <% unless @comment.empty? %> @@ -12,4 +12,4 @@ <% end %> <% end %> -

    <%= raw t 'notifier.note_comment_notification.details', :url => link_to(@noteurl, @noteurl) %>

    +

    <%= raw t '.details', :url => link_to(@noteurl, @noteurl) %>

    diff --git a/app/views/notifier/note_comment_notification.text.erb b/app/views/notifier/note_comment_notification.text.erb index 5924c8a9d..7014a5057 100644 --- a/app/views/notifier/note_comment_notification.text.erb +++ b/app/views/notifier/note_comment_notification.text.erb @@ -1,9 +1,9 @@ -<%= t 'notifier.note_comment_notification.greeting' %> +<%= t '.greeting' %> <% if @owner %> -<%= t "notifier.note_comment_notification.#{@event}.your_note", :commenter => @commenter, :place => @place %> +<%= t ".#{@event}.your_note", :commenter => @commenter, :place => @place %> <% else %> -<%= t "notifier.note_comment_notification.#{@event}.commented_note", :commenter => @commenter, :place => @place %> +<%= t ".#{@event}.commented_note", :commenter => @commenter, :place => @place %> <% end %> <% unless @comment.empty? %> @@ -12,4 +12,4 @@ == <% end %> -<%= t 'notifier.note_comment_notification.details', :url => @noteurl %> +<%= t '.details', :url => @noteurl %> diff --git a/app/views/notifier/signup_confirm.html.erb b/app/views/notifier/signup_confirm.html.erb index 814deee91..a0e0079fc 100644 --- a/app/views/notifier/signup_confirm.html.erb +++ b/app/views/notifier/signup_confirm.html.erb @@ -1,9 +1,9 @@ -

    <%= t("notifier.signup_confirm.greeting") %>

    +

    <%= t(".greeting") %>

    -

    <%= t("notifier.signup_confirm.created", :site_url => SERVER_URL) %>

    +

    <%= t(".created", :site_url => SERVER_URL) %>

    -

    <%= t("notifier.signup_confirm.confirm") %>

    +

    <%= t(".confirm") %>

    <%= link_to @url, @url %>

    -

    <%= t("notifier.signup_confirm.welcome") %>

    +

    <%= t(".welcome") %>

    diff --git a/app/views/notifier/signup_confirm.text.erb b/app/views/notifier/signup_confirm.text.erb index aee44782d..e17056468 100644 --- a/app/views/notifier/signup_confirm.text.erb +++ b/app/views/notifier/signup_confirm.text.erb @@ -1,9 +1,9 @@ -<%= fp(t("notifier.signup_confirm.greeting")) %> +<%= fp(t(".greeting")) %> -<%= fp(t("notifier.signup_confirm.created", :site_url => SERVER_URL)) %> +<%= fp(t(".created", :site_url => SERVER_URL)) %> -<%= fp(t("notifier.signup_confirm.confirm")) %> +<%= fp(t(".confirm")) %> <%= @url %> -<%= fp(t("notifier.signup_confirm.welcome")) %> +<%= fp(t(".welcome")) %> diff --git a/app/views/oauth_clients/_form.html.erb b/app/views/oauth_clients/_form.html.erb index 96ab68ad7..bb0506671 100644 --- a/app/views/oauth_clients/_form.html.erb +++ b/app/views/oauth_clients/_form.html.erb @@ -1,29 +1,29 @@
    - + <%= f.text_field :name %>
    - + <%= f.text_field :url %>
    - + <%= f.text_field :callback_url %>
    - + <%= f.text_field :support_url %>
    -

    <%= t'oauth_clients.form.requests' %>

    +

    <%= t '.requests' %>

    <% ClientApplication.all_permissions.each do |perm| %>
    <%= f.check_box perm %> - +
    <% end %>
    -
    \ No newline at end of file + diff --git a/app/views/oauth_clients/edit.html.erb b/app/views/oauth_clients/edit.html.erb index 397849c44..2a5f99381 100644 --- a/app/views/oauth_clients/edit.html.erb +++ b/app/views/oauth_clients/edit.html.erb @@ -1,8 +1,8 @@ <% content_for :heading do %> -

    <%= t'oauth_clients.edit.title' %>

    +

    <%= t '.title' %>

    <% end %> <%= form_for @client_application, :url => oauth_client_path(@client_application.user.display_name, @client_application), :html => { :method => :put } do |f| %> <%= render :partial => "form", :locals => { :f => f } %> - <%= submit_tag t'oauth_clients.edit.submit' %> + <%= submit_tag t '.submit' %> <% end %> diff --git a/app/views/oauth_clients/index.html.erb b/app/views/oauth_clients/index.html.erb index f88d9316c..64a316718 100644 --- a/app/views/oauth_clients/index.html.erb +++ b/app/views/oauth_clients/index.html.erb @@ -1,13 +1,13 @@ <% content_for :heading do %> -

    <%= t'oauth_clients.index.title' %>

    +

    <%= t '.title' %>

    <% end %> <% unless @tokens.empty? %> -

    <%= t'oauth_clients.index.my_tokens' %>

    -

    <%= t'oauth_clients.index.list_tokens' %>

    +

    <%= t '.my_tokens' %>

    +

    <%= t '.list_tokens' %>

    - - + + <% @tokens.each do |token|%> <%= content_tag_for :tr, token do %> @@ -15,22 +15,22 @@ <% end %> <% end %>
    <%= t'oauth_clients.index.application' %><%= t'oauth_clients.index.issued_at' %> 
    <%= t '.application' %><%= t '.issued_at' %> 
    <%= link_to token.client_application.name, token.client_application.url %> <%= form_tag :controller => 'oauth', :action => 'revoke' do %> <%= hidden_field_tag 'token', token.token %> - <%= submit_tag t('oauth_clients.index.revoke') %> + <%= submit_tag t('.revoke') %> <% end %>
    <% end %> -

    <%= t'oauth_clients.index.my_apps' %>

    +

    <%= t '.my_apps' %>

    <% if @client_applications.empty? %> -

    <%= raw(t('oauth_clients.index.no_apps', :oauth => "OAuth")) %>

    +

    <%= raw(t('.no_apps', :oauth => "OAuth")) %>

    <% else %> -

    <%= t'oauth_clients.index.registered_apps' %>

    +

    <%= t '.registered_apps' %>

    <% @client_applications.each do |client|%> <%= div_for client do %> <%= link_to client.name, :action => :show, :id => client.id %> <% end %> <% end %> <% end %> -

    <%= link_to t('oauth_clients.index.register_new'), :action => :new %>

    +

    <%= link_to t('.register_new'), :action => :new %>

    diff --git a/app/views/oauth_clients/new.html.erb b/app/views/oauth_clients/new.html.erb index 7542d77b5..b5767e6ca 100644 --- a/app/views/oauth_clients/new.html.erb +++ b/app/views/oauth_clients/new.html.erb @@ -1,10 +1,10 @@ <% content_for :heading do %> -

    <%= t'oauth_clients.new.title' %>

    +

    <%= t '.title' %>

    <% end %>
    <%= form_for :client_application, :url => { :action => :create } do |f| %> <%= render :partial => "form", :locals => { :f => f } %> - <%= submit_tag t('oauth_clients.new.submit') %> + <%= submit_tag t('.submit') %> <% end %>
    diff --git a/app/views/oauth_clients/not_found.erb b/app/views/oauth_clients/not_found.erb index d5c6ca755..fda9ab06d 100644 --- a/app/views/oauth_clients/not_found.erb +++ b/app/views/oauth_clients/not_found.erb @@ -1 +1 @@ -

    <%= t('oauth_clients.not_found.sorry', :type => @type) %>

    +

    <%= t('.sorry', :type => @type) %>

    diff --git a/app/views/oauth_clients/show.html.erb b/app/views/oauth_clients/show.html.erb index a23ce082d..200fbc7be 100644 --- a/app/views/oauth_clients/show.html.erb +++ b/app/views/oauth_clients/show.html.erb @@ -1,33 +1,33 @@ <% content_for :heading do %> -

    <%= t('oauth_clients.show.title', :app_name => @client_application.name) %>

    +

    <%= t('.title', :app_name => @client_application.name) %>

    <% end %>

    - <%= t'oauth_clients.show.key' %> <%=@client_application.key %> + <%= t '.key' %> <%=@client_application.key %>

    - <%= t'oauth_clients.show.secret' %> <%=@client_application.secret %> + <%= t '.secret' %> <%=@client_application.secret %>

    - <%= t'oauth_clients.show.url' %> http<%='s' if request.ssl? %>://<%= request.host_with_port %><%=@client_application.oauth_server.request_token_path %> + <%= t '.url' %> http<%='s' if request.ssl? %>://<%= request.host_with_port %><%=@client_application.oauth_server.request_token_path %>

    - <%= t'oauth_clients.show.access_url' %> http<%='s' if request.ssl? %>://<%= request.host_with_port %><%=@client_application.oauth_server.access_token_path %> + <%= t '.access_url' %> http<%='s' if request.ssl? %>://<%= request.host_with_port %><%=@client_application.oauth_server.access_token_path %>

    - <%= t'oauth_clients.show.authorize_url' %> http<%='s' if request.ssl? %>://<%= request.host_with_port %><%=@client_application.oauth_server.authorize_path %> + <%= t '.authorize_url' %> http<%='s' if request.ssl? %>://<%= request.host_with_port %><%=@client_application.oauth_server.authorize_path %>

    -

    <%= t'oauth_clients.show.requests' %>

    +

    <%= t '.requests' %>

      <% @client_application.permissions.each do |perm| %>
    • <%= t('oauth_clients.form.' + perm.to_s) %>
      • <% end %>
    -

    <%= t'oauth_clients.show.support_notice' %>

    +

    <%= t '.support_notice' %>

    - <%= button_to t('oauth_clients.show.edit'), edit_oauth_client_path(@client_application.user.display_name, @client_application), :method => :get, :class=> "oauth-edit" %> - <%= button_to t('oauth_clients.show.delete'), oauth_client_path(@client_application.user.display_name, @client_application), :method => :delete, :data => { :confirm => t('oauth_clients.show.confirm') }, :class=> "oauth-delete deemphasize" %> + <%= button_to t('.edit'), edit_oauth_client_path(@client_application.user.display_name, @client_application), :method => :get, :class=> "oauth-edit" %> + <%= button_to t('.delete'), oauth_client_path(@client_application.user.display_name, @client_application), :method => :delete, :data => { :confirm => t('.confirm') }, :class=> "oauth-delete deemphasize" %>
    diff --git a/app/views/trace/_description.html.erb b/app/views/trace/_description.html.erb index 9b81283b2..30abbaba6 100644 --- a/app/views/trace/_description.html.erb +++ b/app/views/trace/_description.html.erb @@ -1,6 +1,6 @@ <%= image_tag(url_for(:controller => :trace, :action => :icon, :id => description.id, :display_name => description.user.display_name)) %> <% if description.size -%> -<%= t "trace.description.description_with_count", :count => description.size, :user => description.user.display_name %> +<%= t ".description_with_count", :count => description.size, :user => description.user.display_name %> <% else -%> -<%= t "trace.description.description_without_count", :user => description.user.display_name %> +<%= t ".description_without_count", :user => description.user.display_name %> <% end -%> diff --git a/app/views/trace/_trace.html.erb b/app/views/trace/_trace.html.erb index ecadacc64..0847ddaf1 100644 --- a/app/views/trace/_trace.html.erb +++ b/app/views/trace/_trace.html.erb @@ -5,25 +5,25 @@ <% if trace.inserted %> <% else %> - <%= t'trace.trace.pending' %> + <%= t '.pending' %> <% end %> <% end %> <%= link_to trace.name, {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id} %> ... <% if trace.inserted %> - (<%= t'trace.trace.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>) + (<%= t '.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>) <% end %> - ... <%= t'trace.trace.ago', :time_in_words_ago => time_ago_in_words(trace.timestamp) %> - <%= link_to_if trace.inserted?, t('trace.trace.map'), {:controller => 'site', :action => 'index', :mlat => trace.latitude, :mlon => trace.longitude, :anchor => "map=14/#{trace.latitude}/#{trace.longitude}"}, {:title => t('trace.trace.view_map')} %> / - <%= link_to t('trace.trace.edit'), {:controller => 'site', :action => 'edit', :gpx => trace.id }, {:title => t('trace.trace.edit_map')} %> - <%= t('trace.trace.' + trace.visibility) %> + ... <%= t '.ago', :time_in_words_ago => time_ago_in_words(trace.timestamp) %> + <%= link_to_if trace.inserted?, t('.map'), {:controller => 'site', :action => 'index', :mlat => trace.latitude, :mlon => trace.longitude, :anchor => "map=14/#{trace.latitude}/#{trace.longitude}"}, {:title => t('.view_map')} %> / + <%= link_to t('.edit'), {:controller => 'site', :action => 'edit', :gpx => trace.id }, {:title => t('.edit_map')} %> + <%= t('.' + trace.visibility) %>
    <%= trace.description %>
    - <%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), user_path(trace.user) %> + <%= t '.by' %> <%=link_to h(trace.user.display_name), user_path(trace.user) %> <% if !trace.tags.empty? %> - <%= t'trace.trace.in' %> + <%= t '.in' %> <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %> <% end %> diff --git a/app/views/trace/_trace_optionals.html.erb b/app/views/trace/_trace_optionals.html.erb index a20091c07..6f0c2130b 100644 --- a/app/views/trace/_trace_optionals.html.erb +++ b/app/views/trace/_trace_optionals.html.erb @@ -1,6 +1,6 @@ <% content_for :optionals do %>
    -

    <%= t'trace.trace_optionals.tags' %>

    +

    <%= t '.tags' %>

    <% if @all_tags %> <% @all_tags.each do |tag| %> <%= link_to_tag tag %>
    diff --git a/app/views/trace/_trace_paging_nav.html.erb b/app/views/trace/_trace_paging_nav.html.erb index 10a563fb4..4f4b83701 100644 --- a/app/views/trace/_trace_paging_nav.html.erb +++ b/app/views/trace/_trace_paging_nav.html.erb @@ -2,17 +2,17 @@ <% if @traces.size > 1 %> <% if @page > 1 %> -<%= link_to t('trace.trace_paging_nav.newer'), @params.merge({ :page => @page - 1 }) %> +<%= link_to t('.newer'), @params.merge({ :page => @page - 1 }) %> <% else %> -<%= t('trace.trace_paging_nav.newer') %> +<%= t('.newer') %> <% end %> -| <%= t('trace.trace_paging_nav.showing_page', :page => @page) %> | +| <%= t('.showing_page', :page => @page) %> | <% if @traces.size < @page_size %> -<%= t('trace.trace_paging_nav.older') %> +<%= t('.older') %> <% else %> -<%= link_to t('trace.trace_paging_nav.older'), @params.merge({ :page => @page + 1 }) %> +<%= link_to t('.older'), @params.merge({ :page => @page + 1 }) %> <% end %> <% end %>

    diff --git a/app/views/trace/create.html.erb b/app/views/trace/create.html.erb index 43d4eff37..0bc1bcde1 100644 --- a/app/views/trace/create.html.erb +++ b/app/views/trace/create.html.erb @@ -1,5 +1,5 @@ <% content_for :heading do %> -

    <%= t'trace.create.upload_trace' %>

    +

    <%= t '.upload_trace' %>

    <% end %> <%= error_messages_for 'trace' %> diff --git a/app/views/trace/edit.html.erb b/app/views/trace/edit.html.erb index b2254afdd..e890745ae 100644 --- a/app/views/trace/edit.html.erb +++ b/app/views/trace/edit.html.erb @@ -1,5 +1,5 @@ <% content_for :heading do %> -

    <%= t 'trace.edit.heading', :name => h(@trace.name) %>

    +

    <%= t '.heading', :name => h(@trace.name) %>

    <% end %> @@ -9,47 +9,47 @@
    - -

    <%= @trace.name %> (<%= link_to t('trace.edit.download'), trace_data_path(@trace) %>)

    + +

    <%= @trace.name %> (<%= link_to t('.download'), trace_data_path(@trace) %>)

    - +

    <%= l @trace.timestamp, :format => :friendly %>

    <% if @trace.inserted? %>
    - +

    <%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>

    - +
    <%= @trace.latitude %>; <%= @trace.longitude %>
    - (<%=link_to t('trace.edit.map'), :controller => 'site', :action => 'index', :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%=link_to t('trace.edit.edit'), :controller => 'site', :action => 'edit', :gpx=> @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>) + (<%=link_to t('.map'), :controller => 'site', :action => 'index', :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%=link_to t('.edit'), :controller => 'site', :action => 'edit', :gpx=> @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>) <% end %>
    - +

    <%= link_to h(@trace.user.display_name), user_path(@trace.user) %>

    - + <%= f.text_field :description %>
    - - <%= f.text_field :tagstring %> (<%= t'trace.edit.tags_help' %>) + + <%= f.text_field :tagstring %> (<%= t '.tags_help' %>)
    - - <%= f.select :visibility, [[t('trace.visibility.private'),"private"],[t('trace.visibility.public'),"public"],[t('trace.visibility.trackable'),"trackable"],[t('trace.visibility.identifiable'),"identifiable"]] %> (<%= t'trace.edit.visibility_help' %>) + + <%= f.select :visibility, [[t('trace.visibility.private'),"private"], [t('trace.visibility.public'),"public"], [t('trace.visibility.trackable'),"trackable"], [t('trace.visibility.identifiable'),"identifiable"]] %> (<%= t '.visibility_help' %>)
    -<%= submit_tag t'trace.edit.save_button' %> +<%= submit_tag t '.save_button' %> <% end %> diff --git a/app/views/trace/georss.rss.builder b/app/views/trace/georss.rss.builder index 8470e85cb..984284174 100644 --- a/app/views/trace/georss.rss.builder +++ b/app/views/trace/georss.rss.builder @@ -5,8 +5,8 @@ xml.rss("version" => "2.0", "xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#", "xmlns:georss" => "http://www.georss.org/georss") do xml.channel do - xml.title t("trace.georss.title") - xml.description t("trace.georss.title") + xml.title t(".title") + xml.description t(".title") xml.link url_for(:controller => :trace, :action => :list, :only_path => false) xml.image do diff --git a/app/views/trace/list.html.erb b/app/views/trace/list.html.erb index 7dcfacb80..376fc5511 100644 --- a/app/views/trace/list.html.erb +++ b/app/views/trace/list.html.erb @@ -1,7 +1,7 @@ <% content_for :heading do %>

    <%= h(@title) %>

      -
    • <%= t('trace.list.description') %>
      • +
    • <%= t('.description') %>
    • <%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %>
    • <%= link_to t('trace.trace_header.upload_trace'), :action => 'create' %>
      • <% if @tag %> @@ -39,7 +39,7 @@ <%= render :partial => 'trace_paging_nav' %> <% else %> -

      <%= t 'trace.list.empty_html', :upload_link => trace_create_path %>

      +

      <%= t '.empty_html', :upload_link => trace_create_path %>

      <% end %> <%= render :partial => 'trace_optionals' %> diff --git a/app/views/trace/offline.html.erb b/app/views/trace/offline.html.erb index ed6c1c58d..5959d0ec3 100644 --- a/app/views/trace/offline.html.erb +++ b/app/views/trace/offline.html.erb @@ -1,5 +1,5 @@ <% content_for :heading do %> -

      <%= t 'trace.offline.heading' %>

      +

      <%= t '.heading' %>

      <% end %> -

      <%= t 'trace.offline.message' %>

      +

      <%= t '.message' %>

      diff --git a/app/views/trace/view.html.erb b/app/views/trace/view.html.erb index 8fc17a1f2..2330edddf 100644 --- a/app/views/trace/view.html.erb +++ b/app/views/trace/view.html.erb @@ -1,54 +1,54 @@ <% content_for :heading do %> -

      <%= t 'trace.view.heading', :name => h(@trace.name) %>

      +

      <%= t '.heading', :name => h(@trace.name) %>

      <% end %> <% if STATUS != :gpx_offline %> <% if @trace.inserted %> <% else %> - <%= t'trace.view.pending' %> + <%= t '.pending' %> <% end %> <% end %> - - + + - + <% if @trace.inserted? %> - + - - + + <% end %> - + - + - + - - + +
      <%= t'trace.view.filename' %><%= @trace.name %> (<%= link_to t('trace.view.download'), trace_data_path(@trace) %>)<%= t '.filename' %><%= @trace.name %> (<%= link_to t('.download'), trace_data_path(@trace) %>)
      <%= t'trace.view.uploaded' %><%= t '.uploaded' %> <%= l @trace.timestamp, :format => :friendly %>
      <%= t'trace.view.points' %><%= t '.points' %> <%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>
      <%= t'trace.view.start_coordinates' %>
      <%= @trace.latitude %>; <%= @trace.longitude %>
      (<%=link_to t('trace.view.map'), :controller => 'site', :action => 'index', :mlat => @trace.latitude, :mlon => @trace.longitude, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%=link_to t('trace.view.edit'), :controller => 'site', :action => 'edit', :gpx=> @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)      		<%= t '.start_coordinates' %>
      <%= @trace.latitude %>; <%= @trace.longitude %>
      (<%=link_to t('.map'), :controller => 'site', :action => 'index', :mlat => @trace.latitude, :mlon => @trace.longitude, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%=link_to t('.edit'), :controller => 'site', :action => 'edit', :gpx=> @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)
      <%= t'trace.view.owner' %><%= t '.owner' %> <%= link_to h(@trace.user.display_name), user_path(@trace.user) %>
      <%= t'trace.view.description' %><%= t '.description' %> <%= h(@trace.description) %>
      <%= t'trace.view.tags' %><%= t '.tags' %> <% unless @trace.tags.empty? %> <%= raw(@trace.tags.collect { |tag| link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } }.join(", ")) %> <% else %> - <%= t'trace.view.none' %> + <%= t '.none' %> <% end %>
      <%= t'trace.view.visibility' %><%= t"trace.visibility.#{@trace.visibility}" %><%= t '.visibility' %><%= t "trace.visibility.#{@trace.visibility}" %>
      @@ -57,8 +57,8 @@ <% if current_user && (current_user==@trace.user || current_user.administrator? || current_user.moderator?)%>
      <%= if_user(@trace.user) do %> - <%= button_to t('trace.view.edit_track'), trace_edit_path(@trace) %> + <%= button_to t('.edit_track'), trace_edit_path(@trace) %> <% end %> - <%= button_to t('trace.view.delete_track'), { :controller => 'trace', :action => 'delete', :id => @trace.id }, :data => { :confirm => t('trace.view.confirm_delete') } %> + <%= button_to t('.delete_track'), { :controller => 'trace', :action => 'delete', :id => @trace.id }, :data => { :confirm => t('.confirm_delete') } %>
      <% end %> diff --git a/app/views/user/_auth_association.html.erb b/app/views/user/_auth_association.html.erb index abddf19d3..8932b7fef 100644 --- a/app/views/user/_auth_association.html.erb +++ b/app/views/user/_auth_association.html.erb @@ -1,3 +1,3 @@ -

      <%= t "user.auth_association.heading" %>

      -

      <%= t "user.auth_association.option_1" %>

      -

      <%= t "user.auth_association.option_2" %>

      +

      <%= t ".heading" %>

      +

      <%= t ".option_1" %>

      +

      <%= t ".option_2" %>

      diff --git a/app/views/user/_popup.html.erb b/app/views/user/_popup.html.erb index 80446b7a9..957664b3b 100644 --- a/app/views/user/_popup.html.erb +++ b/app/views/user/_popup.html.erb @@ -1,5 +1,5 @@
      <%= user_thumbnail popup %> -

      <%= t('user.popup.' + type) %>

      +

      <%= t('.' + type) %>

      <%= link_to popup.display_name, user_path(popup) %>

      diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index a493ade68..16fbc46ca 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -3,9 +3,9 @@ <% end %> <% content_for :heading do %> -

      <%= t 'user.account.my settings' %>

      +

      <%= t '.my settings' %>

        -
      • <%= link_to t('user.account.return to profile'), user_path(current_user) %>
        • +
      • <%= link_to t('.return to profile'), user_path(current_user) %>
      • <%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %>
      <% end %> @@ -21,15 +21,15 @@
      - + - <%= t 'user.account.email never displayed publicly' %> + <%= t '.email never displayed publicly' %>
      - + <%= f.email_field :new_email, :autocomplete => :off %> - <%= t 'user.account.email never displayed publicly' %> + <%= t '.email never displayed publicly' %>
      @@ -47,81 +47,81 @@
      - + <%= f.select :auth_provider, Auth::PROVIDERS %> <%= f.text_field :auth_uid %> - (<%= t 'user.account.openid.link text' %>) + (<%= t '.openid.link text' %>)
      - + <% if current_user.data_public? %> - <%= t 'user.account.public editing.enabled' %> - (<%= t 'user.account.public editing.enabled link text' %>) + <%= t '.public editing.enabled' %> + (<%= t '.public editing.enabled link text' %>) <% else %> - <%= t 'user.account.public editing.disabled' %> - (<%= t 'user.account.public editing.disabled link text' %>) + <%= t '.public editing.disabled' %> + (<%= t '.public editing.disabled link text' %>) <% end %>
      - + <% if current_user.terms_agreed? %> - <%= t 'user.account.contributor terms.agreed' %> - (<%= t 'user.account.contributor terms.link text' %>) + <%= t '.contributor terms.agreed' %> + (<%= t '.contributor terms.link text' %>) <% if current_user.consider_pd? %> - <%= t 'user.account.contributor terms.agreed_with_pd' %> + <%= t '.contributor terms.agreed_with_pd' %> <% end %> <% else %> - <%= t 'user.account.contributor terms.not yet agreed' %> - <%= link_to t('user.account.contributor terms.review link text'), :controller => 'user', :action => 'terms' %> + <%= t '.contributor terms.not yet agreed' %> + <%= link_to t('.contributor terms.review link text'), :controller => 'user', :action => 'terms' %> <% end %>
      - + <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
      - + <%= richtext_area :user, :description, :object => current_user, :cols => 80, :rows => 20 %>
      - + <%= f.text_field :languages %>
      - + <%= user_image current_user %>
        <% if current_user.image.file? %>
      • <%= radio_button_tag "image_action", "keep", !current_user.image_use_gravatar %> - +
        • <% end %> <% if current_user.image.file? || current_user.image_use_gravatar? %>
      • <%= radio_button_tag "image_action", "delete" %> - +
        • <% end %> <% if current_user.image.file? %>
      • <%= radio_button_tag "image_action", "new" %> <%= f.file_field :image %>
        • @@ -129,8 +129,8 @@
      • <%= radio_button_tag "image_action", "new" %> <%= f.file_field :image %>
        • @@ -138,8 +138,8 @@
      • <%= radio_button_tag "image_action", "gravatar", current_user.image_use_gravatar %>
      @@ -148,15 +148,15 @@
      - +
      class="nohome"<%end%> > -

      <%= t 'user.account.no home location' %>

      +

      <%= t '.no home location' %>

      - + <%= f.text_field :home_lat, :id => "home_lat" %>
      - + <%= f.text_field :home_lon, :id => "home_lon" %>
      @@ -164,17 +164,17 @@
      checked="checked" <% end %> id="updatehome" /> - +
      <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %>
      - <%= submit_tag t('user.account.save changes button') %> + <%= submit_tag t('.save changes button') %> <% end %> <% unless current_user.data_public? %> -

      <%= t 'user.account.public editing note.heading' %>

      -<%= raw t 'user.account.public editing note.text' %> - <%= button_to t('user.account.make edits public button'), :action => :go_public %> +

      <%= t '.public editing note.heading' %>

      +<%= raw t '.public editing note.text' %> + <%= button_to t('.make edits public button'), :action => :go_public %> <% end %> diff --git a/app/views/user/confirm.html.erb b/app/views/user/confirm.html.erb index f52098289..7b8d78d3f 100644 --- a/app/views/user/confirm.html.erb +++ b/app/views/user/confirm.html.erb @@ -1,5 +1,5 @@ <% content_for :heading do %> -

      <%= t 'user.confirm.heading' %>

      +

      <%= t '.heading' %>

      <% end %> @@ -8,23 +8,23 @@ <%= javascript_include_tag "user" %> <% end %> - <% content_for(:content_class) { "user_confirm" } %> + <% content_for(:content_class) { "user_confirm" } %> -

      <%= t 'user.confirm.press confirm button' %>

      +

      <%= t '.press confirm button' %>

      <%= form_tag({}, { :id => "confirm" }) do %> - + <% end %> <% else %>

      - <%= t "user.confirm.introduction_1" %> + <%= t ".introduction_1" %> - <%= t "user.confirm.introduction_2" %> + <%= t ".introduction_2" %>

      -

      <%= t "user.confirm.reconfirm_html", +

      <%= t ".reconfirm_html", :reconfirm => url_for(:action => 'confirm_resend')%>

      <% end %> diff --git a/app/views/user/confirm_email.html.erb b/app/views/user/confirm_email.html.erb index 1791cfc73..ecf3e1d3c 100644 --- a/app/views/user/confirm_email.html.erb +++ b/app/views/user/confirm_email.html.erb @@ -2,15 +2,15 @@ <%= javascript_include_tag "user" %> <% end %> -<% content_for(:content_class) { "user_confirm" } %> +<% content_for(:content_class) { "user_confirm" } %> <% content_for :heading do %> -

      <%= t 'user.confirm_email.heading' %>

      +

      <%= t '.heading' %>

      <% end %> -

      <%= t 'user.confirm_email.press confirm button' %>

      +

      <%= t '.press confirm button' %>

      <%= form_tag({}, { :id => "confirm" }) do %> - + <% end %> diff --git a/app/views/user/list.html.erb b/app/views/user/list.html.erb index 903a51c5b..960cf1128 100644 --- a/app/views/user/list.html.erb +++ b/app/views/user/list.html.erb @@ -1,11 +1,11 @@ -<% @title = t('user.list.title') %> +<% @title = t('.title') %> <% content_for :head do %> <%= javascript_include_tag "user" %> <% end %> <% content_for :heading do %> -

      <%= t('user.list.heading') %>

      +

      <%= t('.heading') %>

      <% end %> <% unless @users.empty? %> @@ -16,7 +16,7 @@
      - <%= t 'user.list.showing', + <%= t '.showing', :page => @user_pages.current_page.number, :first_item => @user_pages.current_page.first_item, :last_item => @user_pages.current_page.last_item, @@ -35,10 +35,10 @@
      - <%= submit_tag t('user.list.confirm'), :name => "confirm" %> - <%= submit_tag t('user.list.hide'), :name => "hide" %> + <%= submit_tag t('.confirm'), :name => "confirm" %> + <%= submit_tag t('.hide'), :name => "hide" %>
      <% end %> <% else %> -

      <%= t "user.list.empty" %>

      +

      <%= t ".empty" %>

      <% end %> diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb index 26bb80895..21705e358 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -3,49 +3,49 @@ <% end %> <% content_for :heading do %> -

      <%= t 'user.login.heading' %>

      +

      <%= t '.heading' %>

      <% end %>
      <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %> <%= hidden_field_tag('referer', h(params[:referer])) %> -

      <%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %>

      +

      <%= t '.no account' %> <%= link_to t('.register now'), :action => :new, :referer => params[:referer] %>

      <%= text_field_tag "username", params[:username], :tabindex => 1 %>
      <%= password_field_tag "password", "", :tabindex => 2 %>
      - <%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %> + <%= link_to t('.lost password link'), :controller => 'user', :action => 'lost_password' %>
      <%= check_box_tag "remember_me", "yes", params[:remember_me] == "yes", :tabindex => 3 %> - <%= submit_tag t('user.login.login_button'), :tabindex => 4 %> + <%= submit_tag t('.login_button'), :tabindex => 4 %>
      -

      <%= t 'user.login.with external' %>

      +

      <%= t '.with external' %>

        -
      • <%= link_to image_tag("openid.png", :alt => t("user.login.auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t("user.login.auth_providers.openid.title") %>
        • +
      • <%= link_to image_tag("openid.png", :alt => t(".auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t(".auth_providers.openid.title") %>
        • <% if defined?(GOOGLE_AUTH_ID) -%>
      • <%= auth_button "google", "google" %>
        • <% end -%> @@ -67,17 +67,17 @@
      - + <%= text_field_tag("openid_url", "", { :tabindex => 3, :class => "openid_url" }) %> (<%= t 'user.account.openid.link text' %>)
      <%= check_box_tag "remember_me_openid", "yes", false, :tabindex => 5 %> - +
      - <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %> + <%= submit_tag t('.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
      diff --git a/app/views/user/logout.html.erb b/app/views/user/logout.html.erb index 2620cdaa6..f0faae9c4 100644 --- a/app/views/user/logout.html.erb +++ b/app/views/user/logout.html.erb @@ -1,9 +1,9 @@ <% content_for :heading do %> -

      <%= t 'user.logout.heading' %>

      +

      <%= t '.heading' %>

      <% end %> <%= form_tag :action => "logout" do %> <%= hidden_field_tag("referer", h(params[:referer])) %> <%= hidden_field_tag("session", session.id) %> - <%= submit_tag t('user.logout.logout_button') %> + <%= submit_tag t('.logout_button') %> <% end %> diff --git a/app/views/user/lost_password.html.erb b/app/views/user/lost_password.html.erb index 19147e0b0..6f50526d9 100644 --- a/app/views/user/lost_password.html.erb +++ b/app/views/user/lost_password.html.erb @@ -1,13 +1,13 @@ <% content_for :heading do %> -

      <%= t 'user.lost_password.heading' %>

      +

      <%= t '.heading' %>

      <% end %> -

      <%= t 'user.lost_password.help_text' %>

      +

      <%= t '.help_text' %>

      <%= form_tag :action => 'lost_password' do %>
      - + <%= text_field('user', 'email', { :tabindex => 1} ) %> - <%= submit_tag t('user.lost_password.new password button'), :tabindex => 2 %> + <%= submit_tag t('.new password button'), :tabindex => 2 %>
      <% end %> diff --git a/app/views/user/make_friend.html.erb b/app/views/user/make_friend.html.erb index 9adffadd7..c02de91f0 100644 --- a/app/views/user/make_friend.html.erb +++ b/app/views/user/make_friend.html.erb @@ -1,10 +1,10 @@ <% content_for :heading do %> -

      <%= t "user.make_friend.heading", :user => @new_friend.display_name %>

      +

      <%= t ".heading", :user => @new_friend.display_name %>

      <% end %> <%= form_tag do %> <% if params[:referer] -%> <%= hidden_field_tag("referer", params[:referer]) %> <% end -%> - <%= submit_tag t("user.make_friend.button") %> + <%= submit_tag t(".button") %> <% end %> diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb index 5a207060e..7fd537d14 100644 --- a/app/views/user/new.html.erb +++ b/app/views/user/new.html.erb @@ -3,7 +3,7 @@ <% end %> <% content_for :heading do %> -

      <%= t 'user.new.title' %>

      +

      <%= t '.title' %>

      <% end %> @@ -14,55 +14,55 @@
      <%= f.email_field(:email, { :tabindex => 1 }) %> <%= f.error_message_on(:email) %>
      <%= f.email_field(:email_confirmation, { :tabindex => 2 }) %> <%= f.error_message_on(:email_confirmation) %>
      - <%= raw(t 'user.new.not displayed publicly') %> + <%= raw(t '.not displayed publicly') %>
      <%= f.text_field(:display_name, { :tabindex => 3 }) %> <%= f.error_message_on(:display_name) %>
      - <%= t 'user.new.display name description' %> + <%= t '.display name description' %>
      <%= f.select(:auth_provider, Auth::PROVIDERS, { :default => "", :tabindex => 4 }) %> <%= f.text_field(:auth_uid, { :tabindex => 5 }) %> <%= f.error_message_on(:auth_uid) %>
      - <%= t 'user.new.auth no password' %> + <%= t '.auth no password' %>
      <%= f.password_field(:pass_crypt, { :tabindex => 6 }) %> <%= f.error_message_on(:pass_crypt) %>
      <%= f.password_field(:pass_crypt_confirmation, { :tabindex => 7 }) %> <%= f.error_message_on(:pass_crypt_confirmation) %> @@ -70,13 +70,13 @@
      - <%= link_to raw(t("user.new.use external auth")), "#", :id => "auth_enable" %> + <%= link_to raw(t(".use external auth")), "#", :id => "auth_enable" %>
      - <%= submit_tag t('user.new.continue'), :tabindex => 8 %> + <%= submit_tag t('.continue'), :tabindex => 8 %> <% end %>
      -

      <%= t 'user.new.about.header' %>

      - <%= t 'user.new.about.html' %> +

      <%= t '.about.header' %>

      + <%= t '.about.html' %>
      diff --git a/app/views/user/no_such_user.html.erb b/app/views/user/no_such_user.html.erb index 062d18fb5..6cab0f54c 100644 --- a/app/views/user/no_such_user.html.erb +++ b/app/views/user/no_such_user.html.erb @@ -1,4 +1,4 @@ <% content_for :heading do %> -

      <%= t 'user.no_such_user.heading', :user => h(@not_found_user) %>

      +

      <%= t '.heading', :user => h(@not_found_user) %>

      <% end %> -

      <%= t 'user.no_such_user.body', :user => h(@not_found_user) %>

      +

      <%= t '.body', :user => h(@not_found_user) %>

      diff --git a/app/views/user/remove_friend.html.erb b/app/views/user/remove_friend.html.erb index 9e9a5e515..f87c78223 100644 --- a/app/views/user/remove_friend.html.erb +++ b/app/views/user/remove_friend.html.erb @@ -1,10 +1,10 @@ <% content_for :heading do %> -

      <%= t "user.remove_friend.heading", :user => @friend.display_name %>

      +

      <%= t ".heading", :user => @friend.display_name %>

      <% end %> <%= form_tag do %> <% if params[:referer] -%> <%= hidden_field_tag("referer", params[:referer]) %> <% end -%> - <%= submit_tag t("user.remove_friend.button") %> + <%= submit_tag t(".button") %> <% end %> diff --git a/app/views/user/reset_password.html.erb b/app/views/user/reset_password.html.erb index 895bd98b6..51983b94a 100644 --- a/app/views/user/reset_password.html.erb +++ b/app/views/user/reset_password.html.erb @@ -1,5 +1,5 @@ <% content_for :heading do %> -

      <%= t 'user.reset_password.heading', :user => current_user.display_name %>

      +

      <%= t '.heading', :user => current_user.display_name %>

      <% end %> <%= error_messages_for current_user %> @@ -8,13 +8,13 @@ <%= hidden_field_tag(:token, params[:token]) %>
      - + <%= password_field(:user, :pass_crypt, {:value => '', :tabindex => 4}) %>
      - + <%= password_field(:user, :pass_crypt_confirmation, {:value => '', :tabindex => 5}) %>
      - <%= submit_tag t('user.reset_password.reset'), :tabindex => 6 %> + <%= submit_tag t('.reset'), :tabindex => 6 %>
      <% end %> diff --git a/app/views/user/suspended.html.erb b/app/views/user/suspended.html.erb index 22d85e166..20547569d 100644 --- a/app/views/user/suspended.html.erb +++ b/app/views/user/suspended.html.erb @@ -1,7 +1,7 @@ -<% @title = t "user.suspended.title" %> +<% @title = t ".title" %> <% content_for :heading do %> -

      <%= t "user.suspended.heading" %>

      +

      <%= t ".heading" %>

      <% end %> -<%= raw t "user.suspended.body", :webmaster => link_to(t("user.suspended.webmaster"), "mailto:#{SUPPORT_EMAIL}") %> +<%= raw t ".body", :webmaster => link_to(t(".webmaster"), "mailto:#{SUPPORT_EMAIL}") %> diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb index 13fad8840..a836c8590 100644 --- a/app/views/user/terms.html.erb +++ b/app/views/user/terms.html.erb @@ -3,7 +3,7 @@ <% end %> <% content_for :heading do %> -

      <%= t 'user.terms.heading' %>

      +

      <%= t '.heading' %>

      <% end %> @@ -11,14 +11,14 @@
      <% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name, legale| %>
      <% end %> @@ -31,21 +31,21 @@
      - (<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>) + (<%= link_to(t('.consider_pd_why'), t('.consider_pd_why_url'), :target => :new)%>) <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
      -

      <%= t 'user.terms.read and accept' %>

      - <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %> - <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %> +

      <%= t '.read and accept' %>

      + <%= submit_tag(t('.agree'), :name => "agree", :id => "agree") %> + <%= submit_tag(t('.decline'), :name => "decline", :id => "decline") %>

      - <%= raw t 'user.terms.guidance', + <%= raw t '.guidance', :summary => 'https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary', :translations => 'https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %>

      diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index fedbad80e..bc70545f5 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -7,37 +7,37 @@
      • - <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => current_user.display_name %> + <%= link_to t('.my edits'), :controller => 'changeset', :action => 'list', :display_name => current_user.display_name %> <%= number_with_delimiter(current_user.changesets.size) %>
      • - <%= link_to t('user.view.my notes'), :controller => 'notes', :action=> 'mine' %> + <%= link_to t('.my notes'), :controller => 'notes', :action=> 'mine' %>
      • - <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %> + <%= link_to t('.my traces'), :controller => 'trace', :action=>'mine' %> <%= number_with_delimiter(current_user.traces.size) %>
      • - <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => current_user.display_name %> + <%= link_to t('.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => current_user.display_name %> <%= number_with_delimiter(current_user.diary_entries.size) %>
      • - <%= link_to t('user.view.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => current_user.display_name %> + <%= link_to t('.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => current_user.display_name %>
      • - <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => current_user.display_name %> + <%= link_to t('.my settings'), :controller => 'user', :action => 'account', :display_name => current_user.display_name %>
        • <% if current_user.blocks.exists? %>
      • - <%= link_to t('user.view.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => current_user.display_name %> + <%= link_to t('.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => current_user.display_name %> <%= number_with_delimiter(current_user.blocks.active.size) %>
        • <% end %> <% if current_user and current_user.moderator? and current_user.blocks_created.exists? %>
      • - <%= link_to t('user.view.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => current_user.display_name %> + <%= link_to t('.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => current_user.display_name %> <%= number_with_delimiter(current_user.blocks_created.active.size) %>
        • <% end %> @@ -49,56 +49,56 @@
        • - <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %> + <%= link_to t('.edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %> <%= number_with_delimiter(@user.changesets.size) %>
        • - <%= link_to t('user.view.notes'), :controller => 'notes', :action=> 'mine' %> + <%= link_to t('.notes'), :controller => 'notes', :action=> 'mine' %>
        • - <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'list', :display_name => @user.display_name %> + <%= link_to t('.traces'), :controller => 'trace', :action => 'list', :display_name => @user.display_name %> <%= number_with_delimiter(@user.traces.size) %>
        • - <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @user.display_name %> + <%= link_to t('.send message'), :controller => 'message', :action => 'new', :display_name => @user.display_name %>
        • - <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %> + <%= link_to t('.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %> <%= number_with_delimiter(@user.diary_entries.size) %>
        • - <%= link_to t('user.view.comments'), :controller => 'diary_entry', :action => 'comments', :display_name => @user.display_name %> + <%= link_to t('.comments'), :controller => 'diary_entry', :action => 'comments', :display_name => @user.display_name %>
        • <% if current_user and current_user.is_friends_with?(@user) %> - <%= link_to t('user.view.remove as friend'), remove_friend_path(:display_name => @user.display_name), :method => :post %> + <%= link_to t('.remove as friend'), remove_friend_path(:display_name => @user.display_name), :method => :post %> <% elsif current_user %> - <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => @user.display_name), :method => :post %> + <%= link_to t('.add as friend'), make_friend_path(:display_name => @user.display_name), :method => :post %> <% else %> - <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => @user.display_name) %> + <%= link_to t('.add as friend'), make_friend_path(:display_name => @user.display_name) %> <% end %>
          • <% if @user.blocks.exists? %>
        • - <%= link_to t('user.view.block_history'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @user.display_name %> + <%= link_to t('.block_history'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @user.display_name %> <%= number_with_delimiter(@user.blocks.active.size) %>
          • <% end %> <% if @user.moderator? and @user.blocks_created.exists? %>
        • - <%= link_to t('user.view.moderator_history'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @user.display_name %> + <%= link_to t('.moderator_history'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @user.display_name %> <%= number_with_delimiter(@user.blocks_created.active.size) %>
          • <% end %> <% if current_user and current_user.moderator? %>
        • - <%= link_to t('user.view.create_block'), :controller => 'user_blocks', :action => 'new', :display_name => @user.display_name %> + <%= link_to t('.create_block'), :controller => 'user_blocks', :action => 'new', :display_name => @user.display_name %>
          • <% end %> @@ -111,28 +111,28 @@
            <% if ["active", "confirmed"].include? @user.status %>
          • - <%= link_to t('user.view.deactivate_user'), set_status_user_path(:status => 'pending', :display_name => @user.display_name), :data => { :confirm => t('user.view.confirm') } %> + <%= link_to t('.deactivate_user'), set_status_user_path(:status => 'pending', :display_name => @user.display_name), :data => { :confirm => t('.confirm') } %>
            • <% elsif ["pending"].include? @user.status %>
          • - <%= link_to t('user.view.activate_user'), set_status_user_path(:status => 'active', :display_name => @user.display_name), :data => { :confirm => t('user.view.confirm') } %> + <%= link_to t('.activate_user'), set_status_user_path(:status => 'active', :display_name => @user.display_name), :data => { :confirm => t('.confirm') } %>
            • <% end %> <% if ["active", "suspended"].include? @user.status %>
          • - <%= link_to t('user.view.confirm_user'), set_status_user_path(:status => 'confirmed', :display_name => @user.display_name), :data => { :confirm => t('user.view.confirm') } %> + <%= link_to t('.confirm_user'), set_status_user_path(:status => 'confirmed', :display_name => @user.display_name), :data => { :confirm => t('.confirm') } %>
            • <% end %>
          • <% if ["pending", "active", "confirmed", "suspended"].include? @user.status %> - <%= link_to t('user.view.hide_user'), set_status_user_path(:status => 'deleted', :display_name => @user.display_name), :data => { :confirm => t('user.view.confirm') } %> + <%= link_to t('.hide_user'), set_status_user_path(:status => 'deleted', :display_name => @user.display_name), :data => { :confirm => t('.confirm') } %> <% else %> - <%= link_to t('user.view.unhide_user'), set_status_user_path(:status => 'active', :display_name => @user.display_name), :data => { :confirm => t('user.view.confirm') } %> + <%= link_to t('.unhide_user'), set_status_user_path(:status => 'active', :display_name => @user.display_name), :data => { :confirm => t('.confirm') } %>
            • <% end %>
          • - <%= link_to t('user.view.delete_user'), delete_user_path(:display_name => @user.display_name), :data => { :confirm => t('user.view.confirm') } %> + <%= link_to t('.delete_user'), delete_user_path(:display_name => @user.display_name), :data => { :confirm => t('.confirm') } %>
          @@ -140,14 +140,14 @@

          - <%= t 'user.view.mapper since' %> <%= l @user.creation_time.to_date, :format => :long %> + <%= t '.mapper since' %> <%= l @user.creation_time.to_date, :format => :long %> <% unless @user.terms_agreed %> | - <%= t 'user.view.ct status' %> + <%= t '.ct status' %> <% if @user.terms_seen? -%> - <%= t 'user.view.ct declined' %> + <%= t '.ct declined' %> <% else -%> - <%= t 'user.view.ct undecided' %> + <%= t '.ct undecided' %> <% end -%> <% end -%> @@ -160,12 +160,12 @@ <% if current_user and current_user.administrator? -%>

          <% end -%> @@ -174,7 +174,7 @@ <% if current_user and @user.id == current_user.id %> <% if @user.home_lat.nil? or @user.home_lon.nil? %>
          -

          <%= raw(t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => current_user.display_name)) %>

          +

          <%= raw(t '.if set location', :settings_link => (link_to t('.settings_link_text'), :controller => 'user', :action => 'account', :display_name => current_user.display_name)) %>

          <% else %> <% content_for :head do %> @@ -195,14 +195,14 @@ <% nearby = @user.nearby - friends %>
          -

          <%= t 'user.view.my friends' %>

          +

          <%= t '.my friends' %>

          <% if friends.empty? %> - <%= t 'user.view.no friends' %> + <%= t '.no friends' %> <% else %>
            -
          • <%= link_to t('user.view.friends_changesets'), friend_changesets_path %>
            • -
          • <%= link_to t('user.view.friends_diaries'), friend_diaries_path %>
            • +
          • <%= link_to t('.friends_changesets'), friend_changesets_path %>
            • +
          • <%= link_to t('.friends_diaries'), friend_diaries_path %>
          <%= render :partial => "contact", :collection => friends, :locals => {:type => "friend"} %> @@ -211,14 +211,14 @@
          -

          <%= t 'user.view.nearby users' %>

          +

          <%= t '.nearby users' %>

          <% if nearby.empty? %> - <%= t 'user.view.no nearby users' %> + <%= t '.no nearby users' %> <% else %>
            -
          • <%= link_to t('user.view.nearby_changesets'), nearby_changesets_path %>
            • -
          • <%= link_to t('user.view.nearby_diaries'), nearby_diaries_path %>
            • +
          • <%= link_to t('.nearby_changesets'), nearby_changesets_path %>
            • +
          • <%= link_to t('.nearby_diaries'), nearby_diaries_path %>
          <%= render :partial => "contact", :collection => nearby, :locals => {:type => "nearby mapper"} %>