Fix interpolation issues in attribution text

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index e52a1ce8c2d0ca036542d8c59ccb25de0b49e2a9..3e4c4d996c8150304ff2db13551ab10ee65795c8 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -38,11 +38,7 @@
       <td class="attribution_project"><%= t'site.index.license.project_url' %></td>
     </tr>
     <tr>
       <td class="attribution_project"><%= t'site.index.license.project_url' %></td>
     </tr>
     <tr>

-      <td colspan="2" class="attribution_notice"><%=
-        t'site.index.license.notice',
-          :license_name => t('site.index.license.license_name'),
-          :project_name => t('site.index.license.project_name')
-        %></td>
+      <td colspan="2" class="attribution_notice"><%= t'site.index.license.copyright' %></td>

     </tr>
   </table>
 </div>
     </tr>
   </table>
 </div>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c77dbf5c9b431cbe24f841f15543a2fd0ea12279..f2b76f94a7ec28a6354d8dab9dc92b35c415c3c2 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1280,10 +1280,8 @@ en:
       permalink: Permalink
       shortlink: Shortlink
       license:
       permalink: Permalink
       shortlink: Shortlink
       license:

-        notice: "Data copyright %{project_name} and its contributors."
-        license_name: "Open Data Commons Open Database License (ODbL)"
+        copyright: "Copyright OpenStreetMap and contributors, under an open license"

         license_url: "http://openstreetmap.org/copyright"
         license_url: "http://openstreetmap.org/copyright"

-        project_name: "OpenStreetMap project"

         project_url: "http://openstreetmap.org"
       remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
     edit:
         project_url: "http://openstreetmap.org"
       remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
     edit:

diff --git a/db/structure.sql b/db/structure.sql
index 5f71a9fb4962a416bedb4d9125409a328f783efe..e0427e1d72948a3cf957219c83c91f0c6ec9d226 100644 (file)
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -44,8 +44,7 @@ SET search_path = public, pg_catalog;
 
 CREATE TYPE format_enum AS ENUM (
     'html',
 
 CREATE TYPE format_enum AS ENUM (
     'html',

-    'markdown',
-    'text'
+    'markdown'

 );
 
 
 );
 
 


@@ -101,7 +100,7 @@ CREATE TYPE user_status_enum AS ENUM (
 
 CREATE FUNCTION maptile_for_point(bigint, bigint, integer) RETURNS integer
     LANGUAGE c STRICT
 
 CREATE FUNCTION maptile_for_point(bigint, bigint, integer) RETURNS integer
     LANGUAGE c STRICT

-    AS '/srv/www/master.osm.compton.nu/db/functions/libpgosm.so', 'maptile_for_point';
+    AS '/srv/www/next.osm.compton.nu/db/functions/libpgosm.so', 'maptile_for_point';

 
 
 --
 
 
 --


@@ -110,7 +109,7 @@ CREATE FUNCTION maptile_for_point(bigint, bigint, integer) RETURNS integer
 
 CREATE FUNCTION tile_for_point(integer, integer) RETURNS bigint
     LANGUAGE c STRICT
 
 CREATE FUNCTION tile_for_point(integer, integer) RETURNS bigint
     LANGUAGE c STRICT

-    AS '/srv/www/master.osm.compton.nu/db/functions/libpgosm.so', 'tile_for_point';
+    AS '/srv/www/next.osm.compton.nu/db/functions/libpgosm.so', 'tile_for_point';

 
 
 --
 
 
 --


@@ -119,7 +118,7 @@ CREATE FUNCTION tile_for_point(integer, integer) RETURNS bigint
 
 CREATE FUNCTION xid_to_int4(xid) RETURNS integer
     LANGUAGE c IMMUTABLE STRICT
 
 CREATE FUNCTION xid_to_int4(xid) RETURNS integer
     LANGUAGE c IMMUTABLE STRICT

-    AS '/srv/www/master.osm.compton.nu/db/functions/libpgosm.so', 'xid_to_int4';
+    AS '/srv/www/next.osm.compton.nu/db/functions/libpgosm.so', 'xid_to_int4';

 
 
 SET default_tablespace = '';
 
 
 SET default_tablespace = '';


@@ -1000,11 +999,11 @@ CREATE TABLE users (
     status user_status_enum DEFAULT 'pending'::user_status_enum NOT NULL,
     terms_agreed timestamp without time zone,
     consider_pd boolean DEFAULT false NOT NULL,
     status user_status_enum DEFAULT 'pending'::user_status_enum NOT NULL,
     terms_agreed timestamp without time zone,
     consider_pd boolean DEFAULT false NOT NULL,

+    openid_url character varying(255),

     preferred_editor character varying(255),
     terms_seen boolean DEFAULT false NOT NULL,
     preferred_editor character varying(255),
     terms_seen boolean DEFAULT false NOT NULL,

-    openid_url character varying(255),
-    description_format format_enum DEFAULT 'html'::format_enum NOT NULL,

     image_fingerprint character varying(255),
     image_fingerprint character varying(255),

+    description_format format_enum DEFAULT 'html'::format_enum NOT NULL,

     changesets_count integer DEFAULT 0 NOT NULL,
     traces_count integer DEFAULT 0 NOT NULL
 );
     changesets_count integer DEFAULT 0 NOT NULL,
     traces_count integer DEFAULT 0 NOT NULL
 );