From: John Firebaugh Date: Thu, 18 Jul 2013 00:00:08 +0000 (-0700) Subject: Make all names translatable X-Git-Tag: live~4768^2~40 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b4b8154a80c7665b856ff649cdd8eb2720d93d94 Make all names translatable --- diff --git a/app/assets/images/welcome-sprite.png b/app/assets/images/welcome-sprite.png index a97b8e7fc..38a1f33c2 100644 Binary files a/app/assets/images/welcome-sprite.png and b/app/assets/images/welcome-sprite.png differ diff --git a/app/assets/images/welcome-sprite.svg b/app/assets/images/welcome-sprite.svg new file mode 100644 index 000000000..c258d31a5 --- /dev/null +++ b/app/assets/images/welcome-sprite.svg @@ -0,0 +1,477 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OpenStreetMap + + + + + + + + + + ? + + diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 72bb89ba1..0680a2fcb 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -2287,6 +2287,66 @@ a.button { padding: 20px; } + .one-map { + position: relative; + } + + .one-map-name { + position: absolute; + font-size: 15px; + font-weight: bold; + } + + .one-map-project-name { + font-size: 25px; + top: 70px; + left: 75px; + } + + .one-map-name-1, + .one-map-name-5, + .one-map-name-6 { + text-align: center; + display: inline-block; + width: 200px; + } + + .one-map-name-1 { + color: #c28d86; + top: 30px; + left: -70px; + } + + .one-map-name-2 { + color: #c28d86; + top: 25px; + left: 172px; + } + + .one-map-name-3 { + color: #94cacc; + top: 45px; + left: 140px; + } + + .one-map-name-4 { + color: #94cacc; + top: 48px; + left: 270px; + } + + .one-map-name-5 { + color: #85c589; + top: 105px; + left: 90px; + } + + .one-map-name-6 { + color: #94cacc; + top: 138px; + left: 20px; + } + .edit-located, .edit-geocoded, .edit-geolocated { diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb index f7a497925..56159e297 100644 --- a/app/views/site/welcome.html.erb +++ b/app/views/site/welcome.html.erb @@ -13,8 +13,13 @@

<%= t "welcome_page.section_1.title" %>

-
- +
+
+ <%= t "layouts.project_name.title" %> + <% 1.upto(6) do |i| %> + <%= t "welcome_page.section_1.name_#{i}" %> + <% end %> +

<%= t "welcome_page.section_1.paragraph_1_html" %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index 286661173..ccff31ad6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1164,6 +1164,12 @@ en: will be available to all of these sites and applications. Copying the map data from place to place can take from a few minutes to a few hours, so don't worry if it isn't instant. + name_1: MapBox + name_2: Craigslist + name_3: GPS Maps + name_4: Skobbler + name_5: Stamen + name_6: MapQuest Open section_2: title: What's on the Map on_html: |