From: Thomas Wood <grand.edgemaster@gmail.com>
Date: Fri, 19 Jun 2009 22:53:16 +0000 (+0000)
Subject: merge 15807:16012 from rails_port
X-Git-Tag: live~6847^2~17
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ff03138a978406b431da71aba64941d87b509098?hp=-c

merge 15807:16012 from rails_port
---

ff03138a978406b431da71aba64941d87b509098
diff --combined app/views/changeset/_changeset.html.erb
index 314510eb8,8ac433415..f8f00addb
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@@ -14,7 -14,7 +14,7 @@@
    <%if showusername %>  
      <td class="<%= cl %> user">
      <% if changeset.user.data_public? %>
 -      <%= link_to h(changeset.user.display_name), :controller => "changeset", :action => "list_user", :display_name => changeset.user.display_name %>
 +      <%= link_to h(changeset.user.display_name), :controller => "changeset", :action => "list", :display_name => changeset.user.display_name %>
      <% else %>
        <i><%= t'changeset.changeset.anonymous' %></i>
      <% end %>
@@@ -25,7 -25,7 +25,7 @@@
      <% if changeset.tags['comment'] %>
        <%= h(changeset.tags['comment']) %>
      <% else %>
 -      <i><%= t'changeset.changeset.no_comment' %></i>
 +      <%= t'changeset.changeset.no_comment' %>
      <% end %>
    </td>
  
@@@ -41,7 -41,7 +41,7 @@@
        <a href='/?minlon=<%= minlon %>&minlat=<%= minlat %>&maxlon=<%= maxlon %>&maxlat=<%= maxlat %>&box=yes' title='<%= t'changeset.changeset.show_area_box' %>'><%= format("%0.3f",minlon) -%>,<%= format("%0.3f",minlat) -%>,<%= format("%0.3f",maxlon) -%>,<%= format("%0.3f",maxlat) -%></a>
        <!--<%=changeset.area%>-->
      <%   if changeset.area > 1500000000000 %>
-       <% t'changeset.changeset.big_area' %>
+       <%= t'changeset.changeset.big_area' %>
      <%
           end
         end
diff --combined app/views/layouts/site.html.erb
index 37d2b1962,612c419c6..241bf1817
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@@ -47,14 -47,14 +47,14 @@@
          traceclass = ''
          viewclass = 'active' if params['controller'] == 'site' and params['action'] == 'index' 
          editclass = 'active' if params['controller'] == 'site' and params['action'] == 'edit' 
 -        historyclass = 'active' if params['controller'] == 'changeset' and params['action'] == 'list_bbox' 
 +        historyclass = 'active' if params['controller'] == 'changeset' and params['action'] == 'list' 
          exportclass = 'active' if params['controller'] == 'site' and params['action'] == 'export'
          traceclass = 'active' if params['controller'] == 'trace'
          diaryclass = 'active' if params['controller'] == 'diary_entry'
          %>
          <li><%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %></li>
          <li><%= link_to t('layouts.edit'), {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('layouts.edit_tooltip'), :class => editclass} %></li>
 -        <li><%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list_bbox' }, {:id => 'historyanchor', :title => t('layouts.history_tooltip'), :class => historyclass} %></li>
 +        <li><%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list' }, {:id => 'historyanchor', :title => t('layouts.history_tooltip'), :class => historyclass} %></li>
          <% if params['controller'] == 'site' and (params['action'] == 'index' or params['action'] == 'export') %>
          <li><%= link_to_remote t('layouts.export'), {:url => {:controller => 'export', :action => 'start'}}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %></li>
          <% else %>
@@@ -81,7 -81,7 +81,7 @@@
            <%= t 'layouts.intro_1' %>
          </p>
          <p>
-           <%= t 'layouts.intro_2' %>.
+           <%= t 'layouts.intro_2' %>
          </p>
          <p>
          <%= t 'layouts.intro_3', 
@@@ -93,11 -93,12 +93,12 @@@
  
        <% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
        <div id="alert">
-         <%= t 'layouts.offline' %>
+         <%= t 'layouts.osm_offline' %>
        </div>
        <% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
        <div id="alert">
-         <%= t 'layouts.read_only' %>
+         <%= t 'layouts.osm_read_only' %>
+       </div>
        <% end %>
  
        <% if false %>
diff --combined app/views/user/view.html.erb
index 6e54fbebb,5fdea140f..0dbc09dd3
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@@ -4,14 -4,14 +4,14 @@@
  <!-- Displaying user's own profile page -->
  <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
  | <%= link_to t('user.view.new diary entry'), :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
 -| <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list_user', :display_name => @user.display_name %>
 +| <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %>
  | <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %>
  | <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %>
  <% else %>
  <!-- Displaying another user's profile page -->
- <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => @this_user.id %>
+ <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %>
  | <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %>
 -| <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list_user', :display_name => @this_user.display_name %>
 +| <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %>
  | <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %>
  | <% if @user and @user.is_friends_with?(@this_user) %>
    <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name %>
diff --combined config/locales/en.yml
index fe5f0f926,58ca1d431..9581d83b7
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -117,9 -117,10 +117,10 @@@ en
      node:
        node: "Node"
        node_title: "Node: {{node_name}}"
-       download: "{{download_xml_link}} or {{view_history_link}}"
+       download: "{{download_xml_link}}, {{view_history_link}} or {{edit_link}}"
        download_xml: "Download XML"
        view_history: "view history"
+       edit: "edit"
      not_found:
        sorry: "Sorry, the {{type}} with the id {{id}}, could not be found."
        type:
@@@ -198,9 -199,10 +199,10 @@@
      way:
        way: "Way"
        way_title: "Way: {{way_name}}"
-       download: "{{download_xml_link}} or {{view_history_link}}"
+       download: "{{download_xml_link}}, {{view_history_link}} or {{edit_link}}"
        download_xml: "Download XML"
        view_history: "view history"
+       edit: "edit"
    changeset:
      changeset_paging_nav: 
        showing_page: "Showing page"
@@@ -220,18 -222,34 +222,19 @@@
        user: "User"
        comment: "Comment"
        area: "Area"
 -    list_bbox:
 -      history: "History"
 -      changesets_within_the_area: "Changesets within the area:"
 -      show_area_box: "show area box"
 -      no_changesets: "No changesets"
 -      all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}"
 -      recent_changes: "Recent Changes"
 -      no_area_specified: "No area specified"
 -      first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab."
 -      view_the_map: "view the map"
 -      view_tab: "view tab"
 -      alternatively_view: "Alternatively, view all {{recent_changes_link}}"
      list:
 -      recent_changes: "Recent Changes"
 -      recently_edited_changesets: "Recently edited changesets:"
 -      for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area."
 -    list_user:
 -      edits_by_username: "Edits by {{username_link}}"
 -      no_visible_edits_by: "No visible edits by {{name}}."
 -      for_all_changes: "For changes by all users see {{recent_changes_link}}"
 -      recent_changes: "Recent Changes"
 +      title: "Changesets"
 +      description: "Recent edits"
 +      description_user: "Recent edits by {{user}}"
 +      description_bbox: "Recent edits within {{bbox}}"
 +      description_user_bbox: "Recent edits by {{user}} within {{bbox}}"
    diary_entry:
      new:
        title: New Diary Entry
      list:
        title: "Users' diaries"
        user_title: "{{user}}'s diary"
+       in_language_title: "Diary Entries in {{language}}"
        new: New Diary Entry
        new_title: Compose a new entry in your user diary
        no_entries: No diary entries
@@@ -264,7 -282,7 +267,7 @@@
        heading: "The user {{user}} does not exist"
        body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
      diary_entry:
-       posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
+       posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
        comment_link: Comment on this entry
        reply_link: Reply to this entry
        comment_count:
@@@ -360,7 -378,7 +363,7 @@@
      news_blog: "News blog"
      news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
      shop: Shop
-     shop_tooltip: Shop with branded OpenStreetMap 
+     shop_tooltip: Shop with branded OpenStreetMap merchandise
      shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
      sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
      alt_donation: Make a Donation
@@@ -655,7 -673,7 +658,7 @@@
        no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
        contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible. '
        fill_form: "Fill in the form and we'll send you a quick email to activate your account."
-       license_agreement: 'By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools which connect to openstreetmap.org is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
+       license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
        email address: "Email Address: "
        confirm email address: "Confirm Email Address: "
        not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
diff --combined config/routes.rb
index 6656d0cd5,92bc493e1..afaec0403
--- a/config/routes.rb
+++ b/config/routes.rb
@@@ -83,14 -83,12 +83,14 @@@ ActionController::Routing::Routes.draw 
    map.connect '/browse/relation/:id/history', :controller => 'browse', :action => 'relation_history', :id => /\d+/
    map.connect '/browse/changeset/:id', :controller => 'browse', :action => 'changeset', :id => /\d+/
    map.connect '/browse/changesets', :controller => 'changeset', :action => 'list'
 +  map.connect '/browse/changesets/rss', :controller => 'changeset', :action => 'list', :format => :rss
    
    # web site
    map.root :controller => 'site', :action => 'index'
    map.connect '/', :controller => 'site', :action => 'index'
    map.connect '/edit', :controller => 'site', :action => 'edit'
 -  map.connect '/history', :controller => 'changeset', :action => 'list_bbox'
 +  map.connect '/history', :controller => 'changeset', :action => 'list'
 +  map.connect '/history/rss', :controller => 'changeset', :action => 'list', :format => :rss
    map.connect '/export', :controller => 'site', :action => 'export'
    map.connect '/login', :controller => 'user', :action => 'login'
    map.connect '/logout', :controller => 'user', :action => 'logout'
@@@ -144,8 -142,7 +144,8 @@@
  
    # user pages
    map.connect '/user/:display_name', :controller => 'user', :action => 'view'
 -  map.connect '/user/:display_name/edits', :controller => 'changeset', :action => 'list_user'
 +  map.connect '/user/:display_name/edits', :controller => 'changeset', :action => 'list'
 +  map.connect '/user/:display_name/edits/rss', :controller => 'changeset', :action => 'list', :format =>:rss
    map.connect '/user/:display_name/make_friend', :controller => 'user', :action => 'make_friend'
    map.connect '/user/:display_name/remove_friend', :controller => 'user', :action => 'remove_friend'
    map.connect '/user/:display_name/diary', :controller => 'diary_entry', :action => 'list'
@@@ -178,7 -175,7 +178,7 @@@
  
    map.connect '/user/:display_name/inbox', :controller => 'message', :action => 'inbox'
    map.connect '/user/:display_name/outbox', :controller => 'message', :action => 'outbox'
-   map.connect '/message/new/:user_id', :controller => 'message', :action => 'new'
+   map.connect '/message/new/:display_name', :controller => 'message', :action => 'new'
    map.connect '/message/read/:message_id', :controller => 'message', :action => 'read'
    map.connect '/message/mark/:message_id', :controller => 'message', :action => 'mark'
    map.connect '/message/reply/:message_id', :controller => 'message', :action => 'reply'