From: Tom Hughes <tom@compton.nu>
Date: Wed, 28 Jul 2010 20:30:55 +0000 (+0100)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~5111^2~204
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/52395b3cdf4d3cfae95730158edeeccf3d062a8e?hp=-c

Merge branch 'master' into openstreetbugs
---

52395b3cdf4d3cfae95730158edeeccf3d062a8e
diff --combined config/environment.rb
index 29b114836,61d068ab7..e339aca4d
--- a/config/environment.rb
+++ b/config/environment.rb
@@@ -89,7 -89,7 +89,7 @@@ Rails::Initializer.run do |config
    # Use the database for sessions instead of the cookie-based default,
    # which shouldn't be used to store highly confidential information
    # (create the session table with 'rake db:sessions:create')
-   unless  OSM_STATUS == :database_offline
+   unless OSM_STATUS == :database_offline or OSM_STATUS == :database_readonly
      config.action_controller.session_store = :sql_session_store
    end
  
@@@ -103,5 -103,4 +103,5 @@@
  
    # Make Active Record use UTC-base instead of local time
    config.active_record.default_timezone = :utc
 +
  end
diff --combined config/locales/en.yml
index 98a50ffd2,61616c562..6828e56c3
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -262,17 -262,6 +262,17 @@@ en
        download_xml: "Download XML"
        view_history: "view history"
        edit: "edit"
 +    bug:
 +      open_title: "Unresolved issue: {{bug_name}}"
 +      closed_title: "Resolved issue: {{bug_name}}"
 +      created_at: "Created at:"
 +      edited_at: "Edited at:"
 +      closed_at: "Closed at:"
 +      opened_by: "Opened by:"
 +      description: "Description:"
 +      comment_by: "Comment by: "
 +      comment: "Comment:"
 +      date: "Date:"
    changeset:
      changeset_paging_nav:
        showing_page: "Showing page {{page}}"
@@@ -944,7 -933,6 +944,6 @@@
      shop: Shop
      shop_tooltip: Shop with branded OpenStreetMap merchandise
      shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
-     sotm2010: 'Come to the 2010 OpenStreetMap Conference, The State of the Map, July 9-11 in Girona!'
      license:
        alt: CC by-sa 2.0
        title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License
@@@ -1073,6 -1061,7 +1072,7 @@@
        header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
        footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
      message_notification:
+       subject_header: "[OpenStreetMap] {{subject}}"
        hi: "Hi {{to_user}},"
        header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
        footer1: "You can also read the message at {{readurl}}"
@@@ -1362,7 -1351,8 +1362,8 @@@
        help: "Help"
        help_url: "http://wiki.openstreetmap.org/wiki/Upload"
      trace_header:
-       see_just_your_traces: "See just your traces, or upload a trace"
+       your_traces: "See just your traces"
+       upload_trace: "Upload a trace"
        see_all_traces: "See all traces"
        see_your_traces: "See all your traces"
        traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
@@@ -1806,20 -1796,6 +1807,20 @@@
        back: "View all blocks"
        revoker: "Revoker:"
        needs_view: "The user needs to log in before this block will be cleared."
 +  bugs:
 +    rss:
 +      description_area: "A list of bugs, reported, commented on or closed in your area [({{min_lat}}|{{min_lon}}) -- ({{max_lat}}|{{max_lon}})]"
 +      description_item: "An rss feed for bug {{id}}"
 +      closed: "closed bug (near {{place}})"
 +      new: "new bug (near {{place}})"
 +      comment: "new comment (near {{place}})"
 +    user:
 +      title_user: "Bugs submitted or commented on by {{user}}"
 +      heading_user: "{{user}}'s bugs"
 +      description_user: "Bugs submitted or commented on by {{user}}"
 +      id: "Id"
 +      last_changed: "Last changed"
 +
    javascripts:
      map:
        base: